[58577] trunk/dports/net/tuntaposx

[raimue at macports.org]

Revision: 58577
          http://trac.macports.org/changeset/58577
Author:   raimue at macports.org
Date:     2009-10-01 02:18:34 -0700 (Thu, 01 Oct 2009)
Log Message:
-----------
net/tuntaposx:
Update to version 20090913, adapting patches.
For Snow Leopard, build both i386 and x86_64 as the kernel can be run in 64-bit mode.

Modified Paths:
--------------
    trunk/dports/net/tuntaposx/Portfile
    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-10-01 08:36:23 UTC (rev 58576)
+++ trunk/dports/net/tuntaposx/Portfile	2009-10-01 09:18:34 UTC (rev 58577)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name			tuntaposx
-version			20080804
-revision                1
+version			20090913
 categories		net
 maintainers		febeling openmaintainer
 description		Tun and tap virtual devices.
@@ -15,16 +14,18 @@
 master_sites		sourceforge
 distname                tuntap_${version}_src
 worksrcdir              tuntap
-checksums		sha1 2315388ac0e7e090c0e5322fbffb3a9b044e55f5
+checksums		sha1 1a9fb5e077c6d21b7715c8cb26f2ebdcbd681202
 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 {
+	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
+	}
 
-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 \
@@ -58,3 +59,5 @@
 		ui_msg "**********************************************************************"
 	}
 }
+
+platform darwin 10 {}

Modified: trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile
===================================================================
--- trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile	2009-10-01 08:36:23 UTC (rev 58576)
+++ trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile	2009-10-01 09:18:34 UTC (rev 58577)
@@ -1,17 +1,16 @@
---- 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__ \
+--- src/tap/Makefile.orig	2009-10-01 10:53:55.000000000 +0200
++++ src/tap/Makefile	2009-10-01 10:54:22.000000000 +0200
+@@ -21,11 +21,11 @@
+ 
+ INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+ CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
+-	-fno-builtin -fno-stack-protector -arch ppc -arch i386 -arch x86_64 \
++	-fno-builtin -fno-stack-protector __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__
+ CCFLAGS = $(CFLAGS)
+-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch ppc -arch i386 -arch x86_64 -Xlinker -kext
++LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
  
- 
  CCP = g++
+ CC = gcc

Modified: trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile
===================================================================
--- trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile	2009-10-01 08:36:23 UTC (rev 58576)
+++ trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile	2009-10-01 09:18:34 UTC (rev 58577)
@@ -1,17 +1,16 @@
---- 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__ \
+--- src/tun/Makefile.orig	2009-10-01 10:54:40.000000000 +0200
++++ src/tun/Makefile	2009-10-01 10:55:02.000000000 +0200
+@@ -22,11 +22,11 @@
+ 
+ INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+ CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
+-	-fno-builtin -fno-stack-protector -arch ppc -arch i386 -arch x86_64 \
++	-fno-builtin -fno-stack-protector __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__
+ 	-DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
+ CCFLAGS = $(CFLAGS)
+-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch ppc -arch i386 -arch x86_64 -Xlinker -kext
++LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
  
  CCP = g++
  CC = gcc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091001/3f814a44/attachment.html>