Date: Wed, 14 Jul 2010 03:01:42 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/148568: Update port: net/vde2 to 2.2.3 Message-ID: <20100714030142.3dbdcd5b.tkato432@yahoo.com> Resent-Message-ID: <201007131810.o6DIADj8084817@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148568
>Category: ports
>Synopsis: Update port: net/vde2 to 2.2.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 13 18:10:13 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.2.3
Remove file:
files/patch-configure
files/patch-doc__Makefile.am
files/patch-vde_cryptcab__crc32.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/vde2/Makefile net/vde2/Makefile
--- /usr/ports/net/vde2/Makefile 2010-04-05 16:15:30.000000000 +0900
+++ net/vde2/Makefile 2010-05-19 23:34:22.000000000 +0900
@@ -6,33 +6,32 @@
#
PORTNAME= vde2
-PORTVERSION= 2.1.6
+PORTVERSION= 2.2.3
CATEGORIES= net
MASTER_SITES= SF/vde/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= User-mode virtual ethernet infrastructure
-MAKE_JOBS_SAFE= yes
-
CONFLICTS= vde-[0-9]*
+USE_GNOME= gnomehack
USE_GMAKE= yes
-USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --datarootdir=${PREFIX}
-
-SHLIB_MAJOR= 2
-PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
+USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
-.include <bsd.port.pre.mk>
+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
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|$$(MAKE).*install-data-hook||g' \
+ ${WRKSRC}/man/Makefile.in
-CFLAGS+= ${CPPFLAGS} -fPIC
-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
-
-MAN1= dpipe.1 slirpvde.1 unixterm.1 \
- vde_cryptcab.1 vde_plug.1 vde_plug2tap.1 \
- vde_switch.1 vdeq.1 vdetaplib.1 \
- wirefilter.1
-MLINKS= vdeq.1 vdeqemu.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/net/vde2/distinfo net/vde2/distinfo
--- /usr/ports/net/vde2/distinfo 2007-02-19 04:21:37.000000000 +0900
+++ net/vde2/distinfo 2010-05-13 18:19:13.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (vde2-2.1.6.tar.gz) = 15a13ac5c109d088eb302a4e9d81d65e
-SHA256 (vde2-2.1.6.tar.gz) = c5c1ba6c7b89cf36a01a7955c0da89c68d6601accaa45e054eac5b9f9e4ae49e
-SIZE (vde2-2.1.6.tar.gz) = 536666
+MD5 (vde2-2.2.3.tar.gz) = a6f2ae167d7460ea17d83b1cb977736c
+SHA256 (vde2-2.2.3.tar.gz) = 3b3a96369dee5657aaed3581d6f7bb4eaf02342b81b5ec3ad069e8795efbcedb
+SIZE (vde2-2.2.3.tar.gz) = 682014
diff -urN /usr/ports/net/vde2/files/patch-configure net/vde2/files/patch-configure
--- /usr/ports/net/vde2/files/patch-configure 2007-02-19 02:49:36.000000000 +0900
+++ net/vde2/files/patch-configure 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- ./configure.orig Thu Dec 21 13:01:27 2006
-+++ ./configure Sun Feb 18 12:49:30 2007
-@@ -25746,7 +25746,7 @@
- _ACEOF
-
- ;;
-- darwin*)
-+ freebsd*)
-
- cat >>confdefs.h <<\_ACEOF
- #define VDE_DARWIN 1
diff -urN /usr/ports/net/vde2/files/patch-doc__Makefile.am net/vde2/files/patch-doc__Makefile.am
--- /usr/ports/net/vde2/files/patch-doc__Makefile.am 2007-02-19 02:49:36.000000000 +0900
+++ net/vde2/files/patch-doc__Makefile.am 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- ./doc/Makefile.am.orig Mon Dec 18 10:30:19 2006
-+++ ./doc/Makefile.am Sun Feb 18 12:49:30 2007
-@@ -6,8 +6,6 @@
- sed 's/%LIBEXECDIR%/$(subst /,\/,$(libexecdir))/g' $< > $@
-
- install-data-hook:
-- rm -f $(DESTDIR)$(mandir)/man1/vdeqemu.1
-- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) vdeq.1 vdeqemu.1)
-
- uninstall-local:
- rm -f $(DESTDIR)$(mandir)/man1/vdeqemu.1
diff -urN /usr/ports/net/vde2/files/patch-vde_cryptcab__crc32.c net/vde2/files/patch-vde_cryptcab__crc32.c
--- /usr/ports/net/vde2/files/patch-vde_cryptcab__crc32.c 2007-02-19 02:49:36.000000000 +0900
+++ net/vde2/files/patch-vde_cryptcab__crc32.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,25 +0,0 @@
---- ./vde_cryptcab/crc32.c.orig Fri Jul 7 11:54:39 2006
-+++ ./vde_cryptcab/crc32.c Sun Feb 18 12:50:56 2007
-@@ -15,19 +15,20 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/types.h>
-
- /* crc_tab[] -- this crcTable is being build by chksum_crc32GenTab().
- * so make sure, you call it before using the other
- * functions!
- */
--u_int32_t crc_tab[256];
-+uint32_t crc_tab[256];
-
- /* chksum_crc() -- to a given block, this one calculates the
- * crc32-checksum until the length is
- * reached. the crc32-checksum will be
- * the result.
- */
--u_int32_t chksum_crc32 (unsigned char *block, unsigned int length)
-+uint32_t chksum_crc32 (unsigned char *block, unsigned int length)
- {
- register unsigned long crc;
- unsigned long i;
diff -urN /usr/ports/net/vde2/pkg-plist net/vde2/pkg-plist
--- /usr/ports/net/vde2/pkg-plist 2007-02-19 04:21:38.000000000 +0900
+++ net/vde2/pkg-plist 2010-05-19 23:17:54.000000000 +0900
@@ -1,15 +1,58 @@
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.%%SHLIB_MAJOR%%
+lib/libvdeplug.so.2
+lib/libvdesnmp.a
+lib/libvdesnmp.la
+lib/libvdesnmp.so
+lib/libvdesnmp.so.0
+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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100714030142.3dbdcd5b.tkato432>