[45158] trunk/dports/net/tuntaposx/Portfile

jmr at macports.org jmr at macports.org
Fri Jan 9 02:38:21 PST 2009


Revision: 45158
          http://trac.macports.org/changeset/45158
Author:   jmr at macports.org
Date:     2009-01-09 02:38:19 -0800 (Fri, 09 Jan 2009)
Log Message:
-----------
tuntaposx:
 * use configure.cc and configure.cxx rather than hardcoding a compiler
 * make universal vs non-universal building work more correctly

Modified Paths:
--------------
    trunk/dports/net/tuntaposx/Portfile

Modified: trunk/dports/net/tuntaposx/Portfile
===================================================================
--- trunk/dports/net/tuntaposx/Portfile	2009-01-09 09:52:24 UTC (rev 45157)
+++ trunk/dports/net/tuntaposx/Portfile	2009-01-09 10:38:19 UTC (rev 45158)
@@ -16,15 +16,21 @@
 distname                tuntap_${version}_src
 worksrcdir              tuntap
 checksums		sha1 2315388ac0e7e090c0e5322fbffb3a9b044e55f5
-use_configure		no
 destroot.violate_mtree  yes
 destroot.args           BASE=${destroot}${prefix}
 
-post-patch {
-	reinplace "s|CCP = g++|CCP = /usr/bin/g++|" ${worksrcpath}/src/tun/Makefile
-	reinplace "s|CC = gcc|CC = /usr/bin/gcc|" ${worksrcpath}/src/tun/Makefile
-	reinplace "s|CCP = g++|CCP = /usr/bin/g++|" ${worksrcpath}/src/tap/Makefile
-	reinplace "s|CC = gcc|CC = /usr/bin/gcc|" ${worksrcpath}/src/tap/Makefile
+configure {
+	reinplace "s|CCP = g++|CCP = ${configure.cxx}|" ${worksrcpath}/src/tun/Makefile \
+	                                                ${worksrcpath}/src/tap/Makefile
+	reinplace "s|CC = gcc|CC = ${configure.cc}|" ${worksrcpath}/src/tun/Makefile \
+	                                             ${worksrcpath}/src/tap/Makefile
+	if {[variant_isset universal]} {
+	    reinplace "s|/Developer/SDKs/MacOSX10.4u.sdk/|${universal_sysroot}|" \
+	        ${worksrcpath}/src/tun/Makefile ${worksrcpath}/src/tap/Makefile
+	} else {
+	    reinplace "s|-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk/| |" \
+	        ${worksrcpath}/src/tun/Makefile ${worksrcpath}/src/tap/Makefile
+	}
 }
 
 startupitem.create      yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090109/5f7709dc/attachment.html>


More information about the macports-changes mailing list