Attachment #107745 for bug #148568

View | Details | Raw Unified | Return to bug 148568
Collapse All | Expand All




#

PORTNAME=	vde2
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
USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes
SHLIB_MAJOR=	2
PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"

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

.include <bsd.port.mk>
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>

Lines 1-3 Link Here

(-)net/vde2/distinfo (-3 / +3 lines)
1	MD5 (vde2-2.1.6.tar.gz) = 15a13ac5c109d088eb302a4e9d81d65e	1	MD5 (vde2-2.2.3.tar.gz) = a6f2ae167d7460ea17d83b1cb977736c
2	SHA256 (vde2-2.1.6.tar.gz) = c5c1ba6c7b89cf36a01a7955c0da89c68d6601accaa45e054eac5b9f9e4ae49e	2	SHA256 (vde2-2.2.3.tar.gz) = 3b3a96369dee5657aaed3581d6f7bb4eaf02342b81b5ec3ad069e8795efbcedb
3	SIZE (vde2-2.1.6.tar.gz) = 536666	3	SIZE (vde2-2.2.3.tar.gz) = 682014

Lines 1-11 Link Here

(-)net/vde2/files/patch-configure (-11 lines)
1	--- ./configure.orig Thu Dec 21 13:01:27 2006
2	+++ ./configure Sun Feb 18 12:49:30 2007
3	@@ -25746,7 +25746,7 @@
4	_ACEOF
5
6	;;
7	- darwin*)
8	+ freebsd*)
9
10	cat >>confdefs.h <<\_ACEOF
11	#define VDE_DARWIN 1

Lines 1-11 Link Here

(-)net/vde2/files/patch-doc__Makefile.am (-11 lines)
1	--- ./doc/Makefile.am.orig Mon Dec 18 10:30:19 2006
2	+++ ./doc/Makefile.am Sun Feb 18 12:49:30 2007
3	@@ -6,8 +6,6 @@
4	sed 's/%LIBEXECDIR%/$(subst /,\/,$(libexecdir))/g' $< > $@
5
6	install-data-hook:
7	- rm -f $(DESTDIR)$(mandir)/man1/vdeqemu.1
8	- (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) vdeq.1 vdeqemu.1)
9
10	uninstall-local:
11	rm -f $(DESTDIR)$(mandir)/man1/vdeqemu.1




--- ./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;

Lines 1-15 Link Here

(-)net/vde2/pkg-plist (-1 / +44 lines)
1	bin/dpipe	1	bin/dpipe
2	bin/slirpvde	2	bin/slirpvde
		3	bin/unixcmd
3	bin/unixterm	4	bin/unixterm
		5	bin/vde_autolink
4	bin/vde_cryptcab	6	bin/vde_cryptcab
		7	bin/vde_l3
		8	bin/vde_over_ns
		9	bin/vde_pcapplug
5	bin/vde_plug	10	bin/vde_plug
6	bin/vde_plug2tap	11	bin/vde_plug2tap
7	bin/vde_switch	12	bin/vde_switch
		13	bin/vdecmd
		14	bin/vdekvm
8	bin/vdeq	15	bin/vdeq
9	bin/vdeqemu	16	bin/vdeqemu
		17	bin/vdeterm
10	bin/wirefilter	18	bin/wirefilter
		19	etc/vde2/libvdemgmt/asyncrecv.rc
		20	etc/vde2/libvdemgmt/closemachine.rc
		21	etc/vde2/libvdemgmt/openmachine.rc
		22	etc/vde2/libvdemgmt/sendcmd.rc
		23	etc/vde2/vdecmd
		24	include/libvdehist.h
		25	include/libvdemgmt.h
11	include/libvdeplug.h	26	include/libvdeplug.h
		27	include/libvdeplug_dyn.h
		28	include/libvdesnmp.h
		29	lib/libvdehist.a
		30	lib/libvdehist.la
		31	lib/libvdehist.so
		32	lib/libvdehist.so.0
		33	lib/libvdemgmt.a
		34	lib/libvdemgmt.la
		35	lib/libvdemgmt.so
		36	lib/libvdemgmt.so.0
12	lib/libvdeplug.a	37	lib/libvdeplug.a
13	lib/libvdeplug.la	38	lib/libvdeplug.la
14	lib/libvdeplug.so	39	lib/libvdeplug.so
15	lib/libvdeplug.so.%%SHLIB_MAJOR%%	40	lib/libvdeplug.so.2
		41	lib/libvdesnmp.a
		42	lib/libvdesnmp.la
		43	lib/libvdesnmp.so
		44	lib/libvdesnmp.so.0
		45	lib/vde2/vde_l3/bfifo.la
		46	lib/vde2/vde_l3/bfifo.so
		47	lib/vde2/vde_l3/pfifo.la
		48	lib/vde2/vde_l3/pfifo.so
		49	lib/vde2/vde_l3/tbf.la
		50	lib/vde2/vde_l3/tbf.so
		51	libdata/pkgconfig/vdehist.pc
		52	libdata/pkgconfig/vdemgmt.pc
		53	libdata/pkgconfig/vdeplug.pc
		54	libdata/pkgconfig/vdesnmp.pc
		55	@dirrm lib/vde2/vde_l3
		56	@dirrm lib/vde2
		57	@dirrm etc/vde2/libvdemgmt
		58	@dirrm etc/vde2

Return to bug 148568

Lines 6-38 Link Here

(-)net/vde2/Makefile (-18 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= vde2	8	PORTNAME= vde2
9	PORTVERSION= 2.1.6	9	PORTVERSION= 2.2.3
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= SF/vde/${PORTNAME}/${PORTVERSION}	11	MASTER_SITES= SF/vde/${PORTNAME}/${PORTVERSION}
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= User-mode virtual ethernet infrastructure	14	COMMENT= User-mode virtual ethernet infrastructure
15		15
16	MAKE_JOBS_SAFE= yes
17
18	CONFLICTS= vde-[0-9]*	16	CONFLICTS= vde-[0-9]*
19		17
		18	USE_GNOME= gnomehack
20	USE_GMAKE= yes	19	USE_GMAKE= yes
21	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --datarootdir=${PREFIX}	21	USE_LDCONFIG= yes
24		22	MAKE_JOBS_SAFE= yes
25	SHLIB_MAJOR= 2
26	PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
27		23
28	.include <bsd.port.pre.mk>	24	MLINKS= unixcmd.1 vdecmd.1 \
		25	vdeq.1 vdeqemu.1 \
		26	vdeq.1 vdekvm.1
		27	MAN1= dpipe.1 slirpvde.1 unixcmd.1 unixterm.1 \
		28	vde_autolink.1 vde_cryptcab.1 vde_l3.1 vde_over_ns.1 \
		29	vde_pcapplug.1 vde_plug.1 vde_plug2tap.1 vde_switch.1 \
		30	vdeq.1 vdetaplib.1 vdeterm.1 wirefilter.1
		31	MAN8= vde_tunctl.8
		32
		33	post-patch:
		34	@${REINPLACE_CMD} -e 's\|$$(MAKE).*install-data-hook\|\|g' \
		35	${WRKSRC}/man/Makefile.in
29		36
30	CFLAGS+= ${CPPFLAGS} -fPIC	37	.include <bsd.port.mk>
31	MAKE_ENV+= LDFLAGS="${LDFLAGS}"
32
33	MAN1= dpipe.1 slirpvde.1 unixterm.1 \
34	vde_cryptcab.1 vde_plug.1 vde_plug2tap.1 \
35	vde_switch.1 vdeq.1 vdetaplib.1 \
36	wirefilter.1
37	MLINKS= vdeq.1 vdeqemu.1
38	.include <bsd.port.post.mk>

Lines 1-25 Link Here

(-)net/vde2/files/patch-vde_cryptcab__crc32.c (-25 lines)
1	--- ./vde_cryptcab/crc32.c.orig Fri Jul 7 11:54:39 2006
2	+++ ./vde_cryptcab/crc32.c Sun Feb 18 12:50:56 2007
3	@@ -15,19 +15,20 @@
4
5	#include <stdio.h>
6	#include <stdlib.h>
7	+#include <sys/types.h>
8
9	/* crc_tab[] -- this crcTable is being build by chksum_crc32GenTab().
10	* so make sure, you call it before using the other
11	* functions!
12	*/
13	-u_int32_t crc_tab[256];
14	+uint32_t crc_tab[256];
15
16	/* chksum_crc() -- to a given block, this one calculates the
17	* crc32-checksum until the length is
18	* reached. the crc32-checksum will be
19	* the result.
20	*/
21	-u_int32_t chksum_crc32 (unsigned char *block, unsigned int length)
22	+uint32_t chksum_crc32 (unsigned char *block, unsigned int length)
23	{
24	register unsigned long crc;
25	unsigned long i;