5 files changed, 43 insertions, 18 deletions

diff --git a/net/vde/Makefile b/net/vde/Makefile
index cc50aa7e781e..0522bd21dbf4 100644
--- a/net/vde/Makefile
+++ b/net/vde/Makefile
@@ -10,17 +10,15 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	User-mode virtual ethernet infrastructure
 
+LICENSE=	GPLv2
+
 CONFLICTS=	vde2-[0-9]*
 
-USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}"
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu89
+USES=		gmake
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-CFLAGS+=	${CPPFLAGS} -fPIC
-
-MAN1=		dpipe.1 slirpvde.1 vdetaplib.1 vdeq.1 vde_plug.1 vde_switch.1
+CFLAGS+=	-fPIC
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/vde/files/patch-Makefile b/net/vde/files/patch-Makefile
index 5d0cf76b3e4b..333c8ee9f3dd 100644
--- a/net/vde/files/patch-Makefile
+++ b/net/vde/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile	Sat Jan 29 15:02:08 2005
-+++ Makefile	Sun Jan 30 13:46:59 2005
+--- Makefile.orig	2004-08-27 10:24:43.000000000 +0300
++++ Makefile	2014-01-03 07:27:47.000000000 +0200
 @@ -1,14 +1,15 @@
 -TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP)
 +TUNTAP = $(shell [ -e /usr/include/net/if_tun.h ] && echo -DTUNTAP)
@@ -15,9 +15,9 @@
 -LIB_DIR ?= /usr/local/lib
 -MAN_DIR ?= /usr/local/man
 +PREFIX ?= /usr/local
-+BIN_DIR ?= $(PREFIX)/bin
-+LIB_DIR ?= $(PREFIX)/lib
-+MAN_DIR ?= $(PREFIX)/man
++BIN_DIR ?= $(DESTDIR)$(PREFIX)/bin
++LIB_DIR ?= $(DESTDIR)$(PREFIX)/lib
++MAN_DIR ?= $(DESTDIR)$(PREFIX)/man
  
  ifneq ($(TUNTAP),)
  	OBJS += tuntap.o
diff --git a/net/vde/files/patch-qemu::Makefile b/net/vde/files/patch-qemu::Makefile
index 1b460436f1d3..5ee3bbcf8e92 100644
--- a/net/vde/files/patch-qemu::Makefile
+++ b/net/vde/files/patch-qemu::Makefile
@@ -1,8 +1,22 @@
---- qemu/Makefile	Sat Jan 29 15:02:08 2005
-+++ qemu/Makefile	Sun Jan 30 12:59:52 2005
+--- qemu/Makefile.orig	2004-08-27 10:34:33.000000000 +0300
++++ qemu/Makefile	2014-01-03 07:32:14.000000000 +0200
 @@ -1,4 +1,4 @@
 -ALL: vdeq
 +all: vdeq
  
  vdeq.o: vdeq.c ../vde.h
  
+@@ -6,10 +6,9 @@
+ 	$(CC) -o vdeq vdeq.o
+ 
+ install : vdeq
+-	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s vdeq $(DESTDIR)$(BIN_DIR)
+-	rm -f $(DESTDIR)$(BIN_DIR)/vdeqemu
+-	ln -s $(DESTDIR)$(BIN_DIR)/vdeq $(DESTDIR)$(BIN_DIR)/vdeqemu
++	install -d $(BIN_DIR)
++	install -s vdeq $(BIN_DIR)
++	ln -sf vdeq $(BIN_DIR)/vdeqemu
+ 
+ clean:
+ 	rm -f *.o vdeq
diff --git a/net/vde/files/patch-slirpvde::Makefile b/net/vde/files/patch-slirpvde::Makefile
index 05f3bea2367d..c7ac0e723503 100644
--- a/net/vde/files/patch-slirpvde::Makefile
+++ b/net/vde/files/patch-slirpvde::Makefile
@@ -1,5 +1,5 @@
---- slirpvde/Makefile	Sat Jan 29 15:02:08 2005
-+++ slirpvde/Makefile	Sun Jan 30 14:02:57 2005
+--- slirpvde/Makefile.orig	2004-06-03 18:19:40.000000000 +0300
++++ slirpvde/Makefile	2014-01-03 07:25:37.000000000 +0200
 @@ -3,7 +3,7 @@
  tcp_timer.o udp.o \
  bootp.o
@@ -9,7 +9,7 @@
  
  all: libslirp.a slirpvde
  
-@@ -34,7 +34,7 @@
+@@ -34,12 +34,12 @@
  udp.o: udp.c ip_icmp.h
  
  slirpvde: slirpvde.o libslirp.a
@@ -18,3 +18,10 @@
  
  clean:
  	rm -rf *.o slirpvde libslirp.a
+ 
+ install : slirpvde
+-	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s slirpvde $(DESTDIR)$(BIN_DIR)
++	install -d $(BIN_DIR)
++	install -s slirpvde $(BIN_DIR)
+ 
diff --git a/net/vde/pkg-plist b/net/vde/pkg-plist
index 5d6c79f75ade..c64da17522c2 100644
--- a/net/vde/pkg-plist
+++ b/net/vde/pkg-plist
@@ -6,3 +6,9 @@ bin/vdeq
 bin/vdeqemu
 bin/vdetap
 lib/libvdetap.so
+man/man1/dpipe.1.gz
+man/man1/slirpvde.1.gz
+man/man1/vdetaplib.1.gz
+man/man1/vdeq.1.gz
+man/man1/vde_plug.1.gz
+man/man1/vde_switch.1.gz