[90486] trunk/dports/net/tuntaposx

ryandesign at macports.org ryandesign at macports.org
Tue Mar 6 15:48:03 PST 2012


Revision: 90486
          http://trac.macports.org/changeset/90486
Author:   ryandesign at macports.org
Date:     2012-03-06 15:48:02 -0800 (Tue, 06 Mar 2012)
Log Message:
-----------
tuntaposx: update to 20111101 (#33498); use an unversioned docdir

Modified Paths:
--------------
    trunk/dports/net/tuntaposx/Portfile
    trunk/dports/net/tuntaposx/files/patch-leopard.diff
    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	2012-03-06 23:34:52 UTC (rev 90485)
+++ trunk/dports/net/tuntaposx/Portfile	2012-03-06 23:48:02 UTC (rev 90486)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                tuntaposx
-version             20090913
-revision            1
+version             20111101
 categories          net
 platforms           darwin
 license             BSD
@@ -21,7 +20,8 @@
 distname            tuntap_${version}_src
 worksrcdir          tuntap
 
-checksums           sha1    1a9fb5e077c6d21b7715c8cb26f2ebdcbd681202
+checksums           rmd160  d7ec7fbea29d05de3a1532737b74970d9bbcc2ed \
+                    sha256  d5a21b326e95afc7db3c6683d3860f3192e3260fae12f74e8404a8fd0764558f
 
 destroot.violate_mtree  yes
 destroot.args       BASE=${destroot}${prefix}
@@ -30,12 +30,11 @@
                     patch-src__tun__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
-    
-    reinplace "s|__CFLAGS__|[get_canonical_archflags cc]|"  ${worksrcpath}/src/tun/Makefile \
+    reinplace "s|@CC@|${configure.cc}|g"    ${worksrcpath}/src/tun/Makefile \
+                                            ${worksrcpath}/src/tap/Makefile
+    reinplace "s|@CXX@|${configure.cxx}|g"  ${worksrcpath}/src/tun/Makefile \
+                                            ${worksrcpath}/src/tap/Makefile
+    reinplace "s|@ARCHFLAGS@|[get_canonical_archflags cc]|" ${worksrcpath}/src/tun/Makefile \
                                                             ${worksrcpath}/src/tap/Makefile
 }
 
@@ -46,7 +45,7 @@
 startupitem.stop    "kextunload ${kext_dir}/tap.kext ; kextunload  ${kext_dir}/tun.kext"
 
 post-destroot {
-    set docs ${destroot}${prefix}/share/doc/${name}-${version}
+    set docs ${destroot}${prefix}/share/doc/${name}
     xinstall -m 755 -d ${docs}
     xinstall -m 644 -W ${worksrcpath} README Changelog ${docs}
 }

Modified: trunk/dports/net/tuntaposx/files/patch-leopard.diff
===================================================================
--- trunk/dports/net/tuntaposx/files/patch-leopard.diff	2012-03-06 23:34:52 UTC (rev 90485)
+++ trunk/dports/net/tuntaposx/files/patch-leopard.diff	2012-03-06 23:48:02 UTC (rev 90486)
@@ -1,27 +1,27 @@
---- ./src/tap/Makefile.orig	2009-09-09 23:27:04.000000000 +0200
-+++ ./src/tap/Makefile	2009-10-02 23:02:00.000000000 +0200
+--- src/tap/Makefile.orig	2012-03-06 17:40:29.000000000 -0600
++++ src/tap/Makefile	2012-03-06 17:42:20.000000000 -0600
 @@ -25,7 +25,7 @@
  	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
  	-DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
  CCFLAGS = $(CFLAGS)
--LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
-+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__
+-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
++LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@
  
- CCP = g++
- CC = gcc
---- ./src/tun/Makefile.orig	2009-09-09 23:26:44.000000000 +0200
-+++ ./src/tun/Makefile	2009-10-02 23:02:10.000000000 +0200
+ CCP = @CXX@
+ CC = @CC@
+--- src/tun/Makefile.orig	2012-03-06 17:40:29.000000000 -0600
++++ src/tun/Makefile	2012-03-06 17:42:10.000000000 -0600
 @@ -26,7 +26,7 @@
  	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
  	-DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
  CCFLAGS = $(CFLAGS)
--LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
-+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__
+-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
++LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@
  
- CCP = g++
- CC = gcc
---- ./src/tuntap.cc.orig	2009-09-09 22:08:10.000000000 +0200
-+++ ./src/tuntap.cc	2009-10-02 23:01:13.000000000 +0200
+ CCP = @CXX@
+ CC = @CC@
+--- src/tuntap.cc.orig	2011-11-01 12:31:20.000000000 -0500
++++ src/tuntap.cc	2012-03-06 17:44:14.000000000 -0600
 @@ -75,7 +75,7 @@
  }
  
@@ -31,9 +31,9 @@
  {
  	if (ifp != NULL) {
  		tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
---- ./src/tuntap.h.orig	2009-09-09 22:07:15.000000000 +0200
-+++ ./src/tuntap.h	2009-10-02 23:00:55.000000000 +0200
-@@ -54,7 +54,7 @@
+--- src/tuntap.h.orig	2011-11-01 12:31:20.000000000 -0500
++++ src/tuntap.h	2012-03-06 17:43:21.000000000 -0600
+@@ -53,7 +53,7 @@
  extern "C" {
  
  errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);
@@ -42,7 +42,7 @@
  errno_t tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, int (*cb)(ifnet_t, mbuf_t));
  errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header, protocol_family_t *proto);
  errno_t tuntap_if_framer(ifnet_t ifp, mbuf_t *m, const struct sockaddr *dest,
-@@ -264,7 +264,7 @@
+@@ -268,7 +268,7 @@
  
  		/* interface functions. friends and implementation methods */
  		friend errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);

Modified: trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile
===================================================================
--- trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile	2012-03-06 23:34:52 UTC (rev 90485)
+++ trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile	2012-03-06 23:48:02 UTC (rev 90486)
@@ -1,16 +1,21 @@
---- 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 @@
+--- src/tap/Makefile.orig	2011-08-21 12:24:45.000000000 -0500
++++ src/tap/Makefile	2012-03-06 17:37:25.000000000 -0600
+@@ -21,14 +21,14 @@
  
  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__ \
+-	-fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
++	-fno-builtin -fno-stack-protector @ARCHFLAGS@ \
  	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
  	-DTAP_KEXT_VERSION=\"$(TAP_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
+-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker -kext
++LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
  
- CCP = g++
- CC = gcc
+-CCP = g++
+-CC = gcc
++CCP = @CXX@
++CC = @CC@
+ 
+ all: $(KMOD_BIN) bundle
+ 

Modified: trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile
===================================================================
--- trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile	2012-03-06 23:34:52 UTC (rev 90485)
+++ trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile	2012-03-06 23:48:02 UTC (rev 90486)
@@ -1,16 +1,21 @@
---- 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 @@
+--- src/tun/Makefile.orig	2011-08-21 12:24:59.000000000 -0500
++++ src/tun/Makefile	2012-03-06 17:39:36.000000000 -0600
+@@ -22,14 +22,14 @@
  
  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__ \
+-	-fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
++	-fno-builtin -fno-stack-protector @ARCHFLAGS@ \
  	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
  	-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
+-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker -kext
++LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
  
- CCP = g++
- CC = gcc
+-CCP = g++
+-CC = gcc
++CCP = @CXX@
++CC = @CC@
+ 
+ all: $(KMOD_BIN) bundle
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120306/ebb32ade/attachment.html>


More information about the macports-changes mailing list