Update to version 3.0.1

PR:		ports/116024
Submitted by:	KATO Tsuguru

4 files changed, 38 insertions, 22 deletions

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 1a1b6fe93ea1..5cf88815c952 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	vtun
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
@@ -21,7 +20,7 @@ MAN8=		vtund.8
 MLINKS=		vtund.8 vtun.8
 
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	autoconf:259
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-ssl-headers=${OPENSSLBASE}/include/openssl \
 		--with-ssl-lib=${OPENSSLBASE}/lib \
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index ef5be0bb8942..a9e2b132a4c5 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,3 +1,3 @@
-MD5 (vtun-3.0.0.tar.gz) = 01210337eab054195ae3410a0e2c4510
-SHA256 (vtun-3.0.0.tar.gz) = 86ceadb2c3bfbcce6ec880bc5056a88f41d34aed0379fef6e4d09c4f26a82cca
-SIZE (vtun-3.0.0.tar.gz) = 123231
+MD5 (vtun-3.0.1.tar.gz) = c342ffe77055d4248a38f0b380f28c1b
+SHA256 (vtun-3.0.1.tar.gz) = 22507499a8f650ef97157977e62fa632d5b0034070629a2d0fd0512e304eaeeb
+SIZE (vtun-3.0.1.tar.gz) = 124829
diff --git a/net/vtun/files/patch-Makefile.in b/net/vtun/files/patch-Makefile.in
index 36eeb8f586b7..fd2a38c80522 100644
--- a/net/vtun/files/patch-Makefile.in
+++ b/net/vtun/files/patch-Makefile.in
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Sun Jun  1 23:56:26 2003
-+++ Makefile.in	Sun Jun  1 23:56:37 2003
+--- Makefile.in.orig	Mon Dec 11 16:55:06 2006
++++ Makefile.in	Thu Aug  2 03:15:52 2007
 @@ -54,7 +54,7 @@
  
  CONFIGURE_FILES = Makefile config.status config.cache config.h config.log 
@@ -12,3 +12,33 @@ $FreeBSD$
  	$(CC) $(CFLAGS) $(DEFS) -c $<
  
  vtund: $(OBJS)
+@@ -77,24 +77,24 @@
+ 	rm -f `cat vtun.drivers`	
+ 
+ install_man: 
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
++#	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
+ 	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
++#	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
+ 	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
+ 	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
+ 	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
+ 
+ install_config: 
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
++#	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
+ 	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
+ 	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+ 	fi
+ 
+ install: vtund install_config install_man
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
++#	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
+ 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
+ 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
+-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
++#	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
+ 	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/net/vtun/files/patch-lfd__lzo.c b/net/vtun/files/patch-lfd__lzo.c
deleted file mode 100644
index 0cbe4982eefb..000000000000
--- a/net/vtun/files/patch-lfd__lzo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- lfd_lzo.c.orig	Mon Jun  2 01:22:14 2003
-+++ lfd_lzo.c	Mon Jun  2 01:22:29 2003
-@@ -36,6 +36,7 @@
- #ifdef HAVE_LZO
- 
- #include "lzo1x.h"
-+#include "lzoutil.h"
- 
- static lzo_byte *zbuf;
- static lzo_voidp wmem;