[51681] trunk/dports/kde/kdelibs3

[jmr at macports.org]

Revision: 51681
          http://trac.macports.org/changeset/51681
Author:   jmr at macports.org
Date:     2009-05-31 06:07:56 -0700 (Sun, 31 May 2009)
Log Message:
-----------
kdelibs3: build against macports X11

Modified Paths:
--------------
    trunk/dports/kde/kdelibs3/Portfile

Added Paths:
-----------
    trunk/dports/kde/kdelibs3/files/macports-x11.patch

Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile	2009-05-31 12:54:45 UTC (rev 51680)
+++ trunk/dports/kde/kdelibs3/Portfile	2009-05-31 13:07:56 UTC (rev 51681)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdelibs3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -62,7 +63,7 @@
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
-patchfiles	kdelibs3-unified.patch
+patchfiles	kdelibs3-unified.patch macports-x11.patch
 patch		{
 		foreach f $patchfiles {
 		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"

Added: trunk/dports/kde/kdelibs3/files/macports-x11.patch
===================================================================
--- trunk/dports/kde/kdelibs3/files/macports-x11.patch	                        (rev 0)
+++ trunk/dports/kde/kdelibs3/files/macports-x11.patch	2009-05-31 13:07:56 UTC (rev 51681)
@@ -0,0 +1,64 @@
+--- kdelibs-3.5.10/environment-helper.sh.orig	2009-04-15 04:53:34.000000000 +1000
++++ kdelibs-3.5.10/environment-helper.sh	2009-05-31 22:41:45.000000000 +1000
+@@ -6,12 +6,6 @@
+ 	exit 1
+ fi
+ 
+-[ "$FINK_X11" = "true"  ] && export FINK_X11=1
+-[ "$FINK_X11" = "yes"   ] && export FINK_X11=1
+-[ "$FINK_X11" = "false" ] && export FINK_X11=0
+-[ "$FINK_X11" = "no"    ] && export FINK_X11=0
+-[ -z "$FINK_X11"        ] && export FINK_X11=0
+-
+ export LDFLAGS=""
+ 
+ # set some basic OS stuff
+@@ -72,7 +66,6 @@
+ 
+ 
+ SEARCHDIRS="$PREFIX/lib/system-openssl $PREFIX/lib/freetype219 $PREFIX/lib/flex $PREFIX/lib/doxygen1.3"
+-[ "$FINK_X11" -eq 1 ] && SEARCHDIRS="$SEARCHDIRS $PREFIX/X11"
+ 
+ for dir in $SEARCHDIRS; do
+ 	if [ -d "$dir" ]; then
+@@ -99,17 +92,10 @@
+ export SED="sed"
+ export CONFIGURE_PARAMS="--includedir=$PREFIX/include --libdir=$PREFIX/lib --prefix=$PREFIX --with-extra-libs=$PREFIX/lib --with-extra-includes=$PREFIX/include --enable-mt --with-pic --enable-rpath --enable-shared=yes --enable-static=no --mandir=$PREFIX/share/man --with-xinerama --with-pam --disable-final --with-ssl-dir=/usr --with-ssl --disable-dependency-tracking --enable-gcc-hidden-visibility"
+ 
+-if [ "$FINK_X11" -eq 1 ]; then
+-	CPPFLAGS="$CPPFLAGS -I$PREFIX/X11/include"
+-	LIBS="$LIBS -L$PREFIX/X11/lib"
+-	export ac_cv_have_x="have_x=yes ac_x_includes=$PREFIX/X11/include ac_x_libraries=$PREFIX/X11/lib"
+-	export kde_cv_have_x="have_x=yes kde_x_includes=$PREFIX/X11/include kde_x_libraries=$PREFIX/X11/lib"
+-	export x_includes="$PREFIX/X11/include" x_libraries="$PREFIX/X11/lib"
+-	export XMKMF="$PREFIX/X11/bin/xorg-xmkmf" IMAKE="$PREFIX/X11/bin/xorg-imake"
+-else
+-	CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+-	LIBS="$LIBS -L/usr/X11R6/lib"
+-fi
++export ac_cv_have_x="have_x=yes ac_x_includes=$PREFIX/include ac_x_libraries=$PREFIX/lib"
++export kde_cv_have_x="have_x=yes kde_x_includes=$PREFIX/include kde_x_libraries=$PREFIX/lib"
++export x_includes="$PREFIX/include" x_libraries="$PREFIX/lib"
++export XMKMF="$PREFIX/bin/xmkmf" IMAKE="$PREFIX/bin/imake"
+ 
+ # miscellaneous stuff that packages use
+ export lt_cv_sys_max_cmd_len=65536
+@@ -130,15 +116,9 @@
+ 	export IMAKEINCLUDE="-I$PREFIX/lib/X11/config"
+ fi
+ 
+-if [ "$FINK_X11" -eq 1 ]; then
+-	export PATH="$PATH:$PREFIX/X11/bin"
+-
+-	if [ `grep -r /usr/X11R6 admin 2>/dev/null | wc -l` -gt 0 ]; then
+-		echo "*** replacing /usr/X11R6 with $PREFIX/X11 in the admin/ directory ***"
+-		find admin -type f | xargs perl -pi -e "s,/usr/X11R6,$PREFIX/X11,g"
+-	fi
+-else
+-	export PATH="$PATH:/usr/X11R6/bin"
++if [ `grep -r /usr/X11R6 admin 2>/dev/null | wc -l` -gt 0 ]; then
++	echo "*** replacing /usr/X11R6 with $PREFIX in the admin/ directory ***"
++	find admin -type f | xargs perl -pi -e "s,/usr/X11R6,$PREFIX,g"
+ fi
+ 
+ if [ -x "/usr/bin/gcc-4.2" ]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090531/cde35108/attachment.html>