Changeset 90486


Ignore:
Timestamp:
Mar 6, 2012, 11:48:02 PM (7 years ago)
Author:
ryandesign@…
Message:

tuntaposx: update to 20111101 (#33498); use an unversioned docdir

Location:
trunk/dports/net/tuntaposx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/net/tuntaposx/Portfile

    r90485 r90486  
    55
    66name                tuntaposx
    7 version             20090913
    8 revision            1
     7version             20111101
    98categories          net
    109platforms           darwin
     
    2221worksrcdir          tuntap
    2322
    24 checksums           sha1    1a9fb5e077c6d21b7715c8cb26f2ebdcbd681202
     23checksums           rmd160  d7ec7fbea29d05de3a1532737b74970d9bbcc2ed \
     24                    sha256  d5a21b326e95afc7db3c6683d3860f3192e3260fae12f74e8404a8fd0764558f
    2525
    2626destroot.violate_mtree  yes
     
    3131
    3232configure {
    33     reinplace "s|CCP = g++|CCP = ${configure.cxx}|" ${worksrcpath}/src/tun/Makefile \
    34                                                     ${worksrcpath}/src/tap/Makefile
    35     reinplace "s|CC = gcc|CC = ${configure.cc}|"    ${worksrcpath}/src/tun/Makefile \
    36                                                     ${worksrcpath}/src/tap/Makefile
    37    
    38     reinplace "s|__CFLAGS__|[get_canonical_archflags cc]|"  ${worksrcpath}/src/tun/Makefile \
     33    reinplace "s|@CC@|${configure.cc}|g"    ${worksrcpath}/src/tun/Makefile \
     34                                            ${worksrcpath}/src/tap/Makefile
     35    reinplace "s|@CXX@|${configure.cxx}|g"  ${worksrcpath}/src/tun/Makefile \
     36                                            ${worksrcpath}/src/tap/Makefile
     37    reinplace "s|@ARCHFLAGS@|[get_canonical_archflags cc]|" ${worksrcpath}/src/tun/Makefile \
    3938                                                            ${worksrcpath}/src/tap/Makefile
    4039}
     
    4746
    4847post-destroot {
    49     set docs ${destroot}${prefix}/share/doc/${name}-${version}
     48    set docs ${destroot}${prefix}/share/doc/${name}
    5049    xinstall -m 755 -d ${docs}
    5150    xinstall -m 644 -W ${worksrcpath} README Changelog ${docs}
  • trunk/dports/net/tuntaposx/files/patch-leopard.diff

    r67586 r90486  
    1 --- ./src/tap/Makefile.orig     2009-09-09 23:27:04.000000000 +0200
    2 +++ ./src/tap/Makefile  2009-10-02 23:02:00.000000000 +0200
     1--- src/tap/Makefile.orig       2012-03-06 17:40:29.000000000 -0600
     2+++ src/tap/Makefile    2012-03-06 17:42:20.000000000 -0600
    33@@ -25,7 +25,7 @@
    44        -DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
    55        -DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
    66 CCFLAGS = $(CFLAGS)
    7 -LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
    8 +LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__
     7-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
     8+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@
    99 
    10  CCP = g++
    11  CC = gcc
    12 --- ./src/tun/Makefile.orig     2009-09-09 23:26:44.000000000 +0200
    13 +++ ./src/tun/Makefile  2009-10-02 23:02:10.000000000 +0200
     10 CCP = @CXX@
     11 CC = @CC@
     12--- src/tun/Makefile.orig       2012-03-06 17:40:29.000000000 -0600
     13+++ src/tun/Makefile    2012-03-06 17:42:10.000000000 -0600
    1414@@ -26,7 +26,7 @@
    1515        -DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
    1616        -DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
    1717 CCFLAGS = $(CFLAGS)
    18 -LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
    19 +LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__
     18-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
     19+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@
    2020 
    21  CCP = g++
    22  CC = gcc
    23 --- ./src/tuntap.cc.orig        2009-09-09 22:08:10.000000000 +0200
    24 +++ ./src/tuntap.cc     2009-10-02 23:01:13.000000000 +0200
     21 CCP = @CXX@
     22 CC = @CC@
     23--- src/tuntap.cc.orig  2011-11-01 12:31:20.000000000 -0500
     24+++ src/tuntap.cc       2012-03-06 17:44:14.000000000 -0600
    2525@@ -75,7 +75,7 @@
    2626 }
     
    3232        if (ifp != NULL) {
    3333                tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
    34 --- ./src/tuntap.h.orig 2009-09-09 22:07:15.000000000 +0200
    35 +++ ./src/tuntap.h      2009-10-02 23:00:55.000000000 +0200
    36 @@ -54,7 +54,7 @@
     34--- src/tuntap.h.orig   2011-11-01 12:31:20.000000000 -0500
     35+++ src/tuntap.h        2012-03-06 17:43:21.000000000 -0600
     36@@ -53,7 +53,7 @@
    3737 extern "C" {
    3838 
     
    4343 errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header, protocol_family_t *proto);
    4444 errno_t tuntap_if_framer(ifnet_t ifp, mbuf_t *m, const struct sockaddr *dest,
    45 @@ -264,7 +264,7 @@
     45@@ -268,7 +268,7 @@
    4646 
    4747                /* interface functions. friends and implementation methods */
  • trunk/dports/net/tuntaposx/files/patch-src__tap__Makefile

    r58577 r90486  
    1 --- src/tap/Makefile.orig       2009-10-01 10:53:55.000000000 +0200
    2 +++ src/tap/Makefile    2009-10-01 10:54:22.000000000 +0200
    3 @@ -21,11 +21,11 @@
     1--- src/tap/Makefile.orig       2011-08-21 12:24:45.000000000 -0500
     2+++ src/tap/Makefile    2012-03-06 17:37:25.000000000 -0600
     3@@ -21,14 +21,14 @@
    44 
    55 INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
    66 CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
    7 -       -fno-builtin -fno-stack-protector -arch ppc -arch i386 -arch x86_64 \
    8 +       -fno-builtin -fno-stack-protector __CFLAGS__ \
     7-       -fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
     8+       -fno-builtin -fno-stack-protector @ARCHFLAGS@ \
    99        -DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
    1010        -DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
    1111 CCFLAGS = $(CFLAGS)
    12 -LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch ppc -arch i386 -arch x86_64 -Xlinker -kext
    13 +LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
     12-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker -kext
     13+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
    1414 
    15  CCP = g++
    16  CC = gcc
     15-CCP = g++
     16-CC = gcc
     17+CCP = @CXX@
     18+CC = @CC@
     19 
     20 all: $(KMOD_BIN) bundle
     21 
  • trunk/dports/net/tuntaposx/files/patch-src__tun__Makefile

    r58577 r90486  
    1 --- src/tun/Makefile.orig       2009-10-01 10:54:40.000000000 +0200
    2 +++ src/tun/Makefile    2009-10-01 10:55:02.000000000 +0200
    3 @@ -22,11 +22,11 @@
     1--- src/tun/Makefile.orig       2011-08-21 12:24:59.000000000 -0500
     2+++ src/tun/Makefile    2012-03-06 17:39:36.000000000 -0600
     3@@ -22,14 +22,14 @@
    44 
    55 INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
    66 CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
    7 -       -fno-builtin -fno-stack-protector -arch ppc -arch i386 -arch x86_64 \
    8 +       -fno-builtin -fno-stack-protector __CFLAGS__ \
     7-       -fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
     8+       -fno-builtin -fno-stack-protector @ARCHFLAGS@ \
    99        -DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
    1010        -DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
    1111 CCFLAGS = $(CFLAGS)
    12 -LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch ppc -arch i386 -arch x86_64 -Xlinker -kext
    13 +LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext __CFLAGS__ -Xlinker -kext
     12-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker -kext
     13+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext @ARCHFLAGS@ -Xlinker -kext
    1414 
    15  CCP = g++
    16  CC = gcc
     15-CCP = g++
     16-CC = gcc
     17+CCP = @CXX@
     18+CC = @CC@
     19 
     20 all: $(KMOD_BIN) bundle
     21 
Note: See TracChangeset for help on using the changeset viewer.