Index: head/net/vde2/Makefile =================================================================== --- head/net/vde2/Makefile (revision 289962) +++ head/net/vde2/Makefile (revision 289963) @@ -1,47 +1,64 @@ # New ports collection makefile for: vde2 # Date created: 20 January 2007 # Whom: Philip M. Gollucci # # $FreeBSD$ # PORTNAME= vde2 -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 CATEGORIES= net MASTER_SITES= SF/vde/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= User-mode virtual ethernet infrastructure +LICENSE= BSD GPLv2 LGPL21 +LICENSE_COMB= multi + +OPTIONS= PYTHON "Enable python bindings support" on + CONFLICTS= vde-[0-9]* USE_GNOME= gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes +MAKE_JOBS_UNSAFE=yes MLINKS= unixcmd.1 vdecmd.1 \ vdeq.1 vdeqemu.1 \ vdeq.1 vdekvm.1 MAN1= dpipe.1 slirpvde.1 unixcmd.1 unixterm.1 \ vde_autolink.1 vde_cryptcab.1 vde_l3.1 vde_over_ns.1 \ vde_pcapplug.1 vde_plug.1 vde_plug2tap.1 vde_switch.1 \ vdeq.1 vdetaplib.1 vdeterm.1 wirefilter.1 MAN8= vde_tunctl.8 + +.include + +.if defined(WITHOUT_PYTHON) +CONFIGURE_ARGS+=--disable-python +PLIST_SUB+= PYTHON="@comment " +.else +USE_PYTHON= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +PLIST_SUB+= PYTHON="" +.endif .include .if defined(BATCH) || defined(PACKAGE_BUILDING) MAKE_ENV+= V=1 .endif post-patch: @${REINPLACE_CMD} -e '/-Wall/s|-O2||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$(MAKE).*install-data-hook||g' \ ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e 's|^AM_CFLAGS|#AM_CFLAGS|g' \ ${WRKSRC}/src/slirpvde/Makefile.in .include Property changes on: head/net/vde2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/net/vde2/distinfo =================================================================== --- head/net/vde2/distinfo (revision 289962) +++ head/net/vde2/distinfo (revision 289963) @@ -1,2 +1,2 @@ -SHA256 (vde2-2.3.1.tar.gz) = 6778c4a302b8fa3d9e2664760c9cf0bed02384984cbc79f773c1b230916e79ed -SIZE (vde2-2.3.1.tar.gz) = 698059 +SHA256 (vde2-2.3.2.tar.gz) = 22df546a63dac88320d35d61b7833bbbcbef13529ad009c7ce3c5cb32250af93 +SIZE (vde2-2.3.2.tar.gz) = 770257 Property changes on: head/net/vde2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/net/vde2/files/patch-src__dpipe.c =================================================================== --- head/net/vde2/files/patch-src__dpipe.c (nonexistent) +++ head/net/vde2/files/patch-src__dpipe.c (revision 289963) @@ -0,0 +1,11 @@ +--- src/dpipe.c.orig 2011-11-24 01:41:18.000000000 +0900 ++++ src/dpipe.c 2011-11-28 03:05:11.000000000 +0900 +@@ -201,7 +201,7 @@ + + if (daemonize != 0) + daemon(0,0); +- else if (setpgrp() != 0) { ++ else if (setpgrp(0,getpid()) != 0) { + fprintf(stderr,"Err: cannot create pgrp\n"); + exit(1); + } Property changes on: head/net/vde2/files/patch-src__dpipe.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/net/vde2/pkg-plist =================================================================== --- head/net/vde2/pkg-plist (revision 289962) +++ head/net/vde2/pkg-plist (revision 289963) @@ -1,58 +1,61 @@ bin/dpipe bin/slirpvde bin/unixcmd bin/unixterm bin/vde_autolink bin/vde_cryptcab bin/vde_l3 bin/vde_over_ns bin/vde_pcapplug bin/vde_plug bin/vde_plug2tap bin/vde_switch bin/vdecmd bin/vdekvm bin/vdeq bin/vdeqemu bin/vdeterm bin/wirefilter etc/vde2/libvdemgmt/asyncrecv.rc etc/vde2/libvdemgmt/closemachine.rc etc/vde2/libvdemgmt/openmachine.rc etc/vde2/libvdemgmt/sendcmd.rc etc/vde2/vdecmd include/libvdehist.h include/libvdemgmt.h include/libvdeplug.h include/libvdeplug_dyn.h include/libvdesnmp.h lib/libvdehist.a lib/libvdehist.la lib/libvdehist.so lib/libvdehist.so.0 lib/libvdemgmt.a lib/libvdemgmt.la lib/libvdemgmt.so lib/libvdemgmt.so.0 lib/libvdeplug.a lib/libvdeplug.la lib/libvdeplug.so lib/libvdeplug.so.3 lib/libvdesnmp.a lib/libvdesnmp.la lib/libvdesnmp.so lib/libvdesnmp.so.0 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/VdePlug.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vdeplug_python.la +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vdeplug_python.so lib/vde2/vde_l3/bfifo.la lib/vde2/vde_l3/bfifo.so lib/vde2/vde_l3/pfifo.la lib/vde2/vde_l3/pfifo.so lib/vde2/vde_l3/tbf.la lib/vde2/vde_l3/tbf.so libdata/pkgconfig/vdehist.pc libdata/pkgconfig/vdemgmt.pc libdata/pkgconfig/vdeplug.pc libdata/pkgconfig/vdesnmp.pc @dirrm lib/vde2/vde_l3 @dirrm lib/vde2 @dirrm etc/vde2/libvdemgmt @dirrm etc/vde2 Property changes on: head/net/vde2/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property