[51676] trunk/dports/x11/qt3

[jmr at macports.org]

Revision: 51676
          http://trac.macports.org/changeset/51676
Author:   jmr at macports.org
Date:     2009-05-31 03:51:46 -0700 (Sun, 31 May 2009)
Log Message:
-----------
qt3: build against macports X11

Modified Paths:
--------------
    trunk/dports/x11/qt3/Portfile
    trunk/dports/x11/qt3/files/CompileScript.sh

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

Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile	2009-05-31 09:54:46 UTC (rev 51675)
+++ trunk/dports/x11/qt3/Portfile	2009-05-31 10:51:46 UTC (rev 51676)
@@ -5,7 +5,7 @@
 PortSystem      1.0
 name            qt3
 version         3.3.8
-revision        6
+revision        7
 categories      x11
 maintainers     nomaintainer
 description     Qt Tool Kit
@@ -34,7 +34,7 @@
     eval copy [glob ${filespath}/qt-copy/*] ${workpath}/patches/
 }
 
-patchfiles      qt3-tiger.patch dp01.patch
+patchfiles      qt3-tiger.patch dp01.patch macports-x11.patch
 patch {
     foreach p ${patchfiles} {
         system "cd ${worksrcpath} && sed -e 's|@PREFIX@|${prefix}|g' < ${portpath}/${filesdir}/${p} | patch -p1"

Modified: trunk/dports/x11/qt3/files/CompileScript.sh
===================================================================
--- trunk/dports/x11/qt3/files/CompileScript.sh	2009-05-31 09:54:46 UTC (rev 51675)
+++ trunk/dports/x11/qt3/files/CompileScript.sh	2009-05-31 10:51:46 UTC (rev 51676)
@@ -93,7 +93,6 @@
         echo "yes" | ./configure \
 	    '-I$(QTDIR)/include' '-L$(QTDIR)/lib' \
 	    '-I%p/include' '-L%p/lib' \
-	    '-I/usr/X11R6/include' '-L/usr/X11R6/lib' \
 	    $LIBRESOLV %c
 
         # don't link against older versions of self

Added: trunk/dports/x11/qt3/files/macports-x11.patch
===================================================================
--- trunk/dports/x11/qt3/files/macports-x11.patch	                        (rev 0)
+++ trunk/dports/x11/qt3/files/macports-x11.patch	2009-05-31 10:51:46 UTC (rev 51676)
@@ -0,0 +1,19 @@
+--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf.orig	2009-05-31 20:31:18.000000000 +1000
++++ qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf	2009-05-31 20:30:34.000000000 +1000
+@@ -42,12 +42,12 @@
+ 
+ QMAKE_INCDIR		= @PREFIX@/lib/qt3/include
+ QMAKE_LIBDIR		= @PREFIX@/lib
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
++QMAKE_INCDIR_X11	= @PREFIX@/include
++QMAKE_LIBDIR_X11	= @PREFIX@/lib
+ QMAKE_INCDIR_QT		= $(QTDIR)/include
+ QMAKE_LIBDIR_QT		= $(QTDIR)/lib
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL	= @PREFIX@/include
++QMAKE_LIBDIR_OPENGL	= @PREFIX@/lib
+ 
+ QMAKE_LINK		= g++-4.0
+ QMAKE_LINK_SHLIB	= g++-4.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090531/cba32181/attachment.html>