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

[raimue at macports.org]

Revision: 58580
          http://trac.macports.org/changeset/58580
Author:   raimue at macports.org
Date:     2009-10-01 03:18:03 -0700 (Thu, 01 Oct 2009)
Log Message:
-----------
net/tuntaposx:
As it build for multiple archs on SL, use +universal.
Discussion: http://lists.macosforge.org/pipermail/macports-dev/2009-October/010285.html

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

Modified: trunk/dports/net/tuntaposx/Portfile
===================================================================
--- trunk/dports/net/tuntaposx/Portfile	2009-10-01 09:54:51 UTC (rev 58579)
+++ trunk/dports/net/tuntaposx/Portfile	2009-10-01 10:18:03 UTC (rev 58580)
@@ -4,6 +4,7 @@
 
 name			tuntaposx
 version			20090913
+revisionn		1
 categories		net
 maintainers		febeling openmaintainer
 description		Tun and tap virtual devices.
@@ -21,17 +22,17 @@
 patchfiles		patch-src__tap__Makefile patch-src__tun__Makefile
 
 configure {
-	if {[variant_isset darwin_10] && ![variant_isset universal]} {
-		# Kernel can be 32-bit or 64-bit, so build both
-		configure.cflags-append -arch i386 -arch x86_64
-	}
-
 	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
-	reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/src/tun/Makefile \
-	                                              ${worksrcpath}/src/tap/Makefile
+	if {[variant_isset universal]} {
+		reinplace "s|__CFLAGS__|${configure.universal_cflags}|" ${worksrcpath}/src/tun/Makefile \
+		                                              ${worksrcpath}/src/tap/Makefile
+	} else {
+		reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/src/tun/Makefile \
+		                                              ${worksrcpath}/src/tap/Makefile
+	}
 }
 
 startupitem.create      yes
@@ -61,3 +62,8 @@
 }
 
 platform darwin 10 {}
+if {[variant_isset darwin_10]} {
+    # Kernel can be 32-bit or 64-bit, so build both
+    default_variants +universal
+    configure.universal_archs i386 x86_64
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091001/a0bed213/attachment-0001.html>