[36593] trunk/dports/lang

[ryandesign at macports.org]

Revision: 36593
          http://trac.macosforge.org/projects/macports/changeset/36593
Author:   ryandesign at macports.org
Date:     2008-05-07 03:44:06 -0700 (Wed, 07 May 2008)

Log Message:
-----------
tclcl, otcl: don't hard-code the X11 prefix

Modified Paths:
--------------
    trunk/dports/lang/otcl/Portfile
    trunk/dports/lang/tclcl/Portfile

Modified: trunk/dports/lang/otcl/Portfile
===================================================================
--- trunk/dports/lang/otcl/Portfile	2008-05-07 10:36:36 UTC (rev 36592)
+++ trunk/dports/lang/otcl/Portfile	2008-05-07 10:44:06 UTC (rev 36593)
@@ -37,14 +37,14 @@
 configure.args		--with-Tcl=${prefix} --with-Tcl-ver=${tclmaj} \
 			--with-tk=${prefix} --with-tk-ver=${tclmaj} \
 			--prefix=${prefix} \
-			CPPFLAGS='-I/usr/X11R6/include -I${workpath}/tcl${tclv}/generic/' \
-			CFLAGS='-I/usr/X11R6/include -I${workpath}/tcl${tclv}/generic/' \
-			LDFLAGS='-L/usr/X11R6/lib'
+			CPPFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+			CFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+			LDFLAGS='-L${x11prefix}/lib'
 
 post-configure          {
                         reinplace "s|-ltk8.4|-ltcl8.4 -ltk8.4|g" \
                                 ${worksrcpath}/Makefile
-                        reinplace "s|-lXext|-L/usr/X11R6/lib -lXext|g" \
+                        reinplace "s|-lXext|-L${x11prefix}/lib -lXext|g" \
                                 ${worksrcpath}/Makefile
 }
 

Modified: trunk/dports/lang/tclcl/Portfile
===================================================================
--- trunk/dports/lang/tclcl/Portfile	2008-05-07 10:36:36 UTC (rev 36592)
+++ trunk/dports/lang/tclcl/Portfile	2008-05-07 10:44:06 UTC (rev 36593)
@@ -40,9 +40,9 @@
 			--with-tk=${prefix} --with-tk-ver=${tclmaj} \
 			--with-otcl=${prefix} \
 			--prefix=${prefix} \
-			CPPFLAGS='-I/usr/X11R6/include -I${workpath}/tcl${tclv}/generic/' \
-			CFLAGS='-I/usr/X11R6/include -I${workpath}/tcl${tclv}/generic/' \
-			LDFLAGS='-L/usr/X11R6/lib'
+			CPPFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+			CFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+			LDFLAGS='-L${x11prefix}/lib'
 
 post-configure          {
 			reinplace "s|@V_TCLSH@|${prefix}/bin/tclsh8.4|g" \
@@ -51,7 +51,7 @@
                                 ${worksrcpath}/Makefile
                         reinplace "s|-ltk8.4|-ltcl8.4 -ltk8.4|g" \
                                 ${worksrcpath}/Makefile
-                        reinplace "s|-lXext|-L/usr/X11R6/lib -lXext|g" \
+                        reinplace "s|-lXext|-L${x11prefix}/lib -lXext|g" \
                                 ${worksrcpath}/Makefile
                         reinplace "s|http2.4|http2.5|g" \
                                 ${worksrcpath}/Makefile

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080507/8fe0cb66/attachment.html