[51906] trunk/dports/net/tuntaposx

[toby at macports.org]

Revision: 51906
          http://trac.macports.org/changeset/51906
Author:   toby at macports.org
Date:     2009-06-06 01:43:10 -0700 (Sat, 06 Jun 2009)
Log Message:
-----------
simplify setting of flags, and remove usage of universal_sysroot

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

Added Paths:
-----------
    trunk/dports/net/tuntaposx/files/
    trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile
    trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile

Modified: trunk/dports/net/tuntaposx/Portfile
===================================================================
--- trunk/dports/net/tuntaposx/Portfile	2009-06-06 08:29:04 UTC (rev 51905)
+++ trunk/dports/net/tuntaposx/Portfile	2009-06-06 08:43:10 UTC (rev 51906)
@@ -19,18 +19,18 @@
 destroot.violate_mtree  yes
 destroot.args           BASE=${destroot}${prefix}
 
+patchfiles		patch-src__tap__Makefile patch-src__tun__Makefile
+
+# doesn't build 64-bit
+configure.universal_archs-delete x86_64 ppc64
+
 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
-	}
+	reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/src/tun/Makefile \
+	                                              ${worksrcpath}/src/tap/Makefile
 }
 
 startupitem.create      yes

Added: trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile
===================================================================
--- trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile	                        (rev 0)
+++ trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile	2009-06-06 08:43:10 UTC (rev 51906)
@@ -0,0 +1,17 @@
+--- src/tap/Makefile.orig	2008-07-22 13:42:09.000000000 -0700
++++ src/tap/Makefile	2009-06-06 01:41:58.000000000 -0700
+@@ -23,12 +23,12 @@
+ 	-I/System/Library/Frameworks/Kernel.framework/Headers \
+ 	-I/System/Library/Frameworks/Kernel.framework/Headers/bsd
+ CFLAGS = -static -nostdinc -Wall -msoft-float -mlong-branch -force_cpusubtype_ALL -fno-builtin \
+-	-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk/ \
++	__CFLAGS__ \
+ 	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
+ 	-DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
+ CCFLAGS = $(CFLAGS) -nostdinc++ -fapple-kext -fno-exceptions -fno-rtti
+ LDFLAGS = -static -Wall -nostdlib -r -lcc_kext \
+-	-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk/
++	__CFLAGS__
+ 
+ 
+ CCP = g++

Added: trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile
===================================================================
--- trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile	                        (rev 0)
+++ trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile	2009-06-06 08:43:10 UTC (rev 51906)
@@ -0,0 +1,17 @@
+--- src/tun/Makefile.orig	2008-07-22 13:42:09.000000000 -0700
++++ src/tun/Makefile	2009-06-06 01:41:51.000000000 -0700
+@@ -23,12 +23,12 @@
+ 	-I/System/Library/Frameworks/Kernel.framework/Headers \
+ 	-I/System/Library/Frameworks/Kernel.framework/Headers/bsd
+ CFLAGS = -static -nostdinc -Wall -msoft-float -mlong-branch -force_cpusubtype_ALL -fno-builtin \
+-	-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk/ \
++	__CFLAGS__ \
+ 	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
+ 	-DTAP_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
+ CCFLAGS = $(CFLAGS) -nostdinc++ -fapple-kext -fno-exceptions -fno-rtti
+ LDFLAGS = -static -Wall -nostdlib -r -lcc_kext \
+-	-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk/
++	__CFLAGS__
+ 
+ CCP = g++
+ CC = gcc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090606/db61c0f7/attachment.html>