- Update to 3.0.0

- Makefile cleanup
- NOPORTDOCS support, DOCSDIR in pkg-plist
- fixed startup scripts and knobs

PR:             109356
Submitted by:           Martin Matuska <martin@matuska.org>

6 files changed, 23 insertions, 42 deletions

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 214407cc1a64..1a1b6fe93ea1 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vtun
-PORTVERSION=	2.6
-PORTREVISION=	2
+PORTVERSION=	3.0.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,38 +21,32 @@ MAN8=		vtund.8
 MLINKS=		vtund.8 vtun.8
 
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-ssl-headers=${OPENSSLBASE}/include/openssl \
 		--with-ssl-lib=${OPENSSLBASE}/lib \
 		--with-lzo-headers=${LOCALBASE}/include \
 		--with-lzo-lib=${LOCALBASE}/lib
 CONFIGURE_ENV=	YACC=${YACC}
-USE_RC_SUBR=	yes
-
-WRKSRC=		${WRKDIR}/vtun
+USE_RC_SUBR=	vtunclient vtund
 
 ALL_TARGET=	vtund
-RC_SCRIPT_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
+DOCS=		ChangeLog Credits FAQ README README.LZO README.Setup \
+		README.Shaper TODO
 
 .if defined(VTUN_EXTENDED_MODE)
 # Obtained from http://home.jp.FreeBSD.org/~simokawa/vtun-v6.html
 EXTRA_PATCHES=	${FILESDIR}/extra-tun_dev.c
 .endif
 
-post-build:
-	@${SED} ${RC_SCRIPT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		<${FILESDIR}/vtund.sh >${WRKDIR}/vtund.sh
-	@${SED} ${RC_SCRIPT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		<${FILESDIR}/vtunclient.sh >${WRKDIR}/vtunclient.sh
-
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/vtund.conf ${PREFIX}/etc/vtund.conf.example
-	@${MKDIR} ${PREFIX}/share/doc/vtund
-.for doc in FAQ README README.Setup README.Shaper
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/vtund
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for doc in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
-	@${INSTALL_SCRIPT} ${WRKDIR}/vtund.sh ${PREFIX}/etc/rc.d
-	@${INSTALL_SCRIPT} ${WRKDIR}/vtunclient.sh ${PREFIX}/etc/rc.d
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index c09416c34c27..ef5be0bb8942 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,3 +1,3 @@
-MD5 (vtun-2.6.tar.gz) = 309534fd03c5d13a19c43916f61f4bbf
-SHA256 (vtun-2.6.tar.gz) = fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
-SIZE (vtun-2.6.tar.gz) = 95637
+MD5 (vtun-3.0.0.tar.gz) = 01210337eab054195ae3410a0e2c4510
+SHA256 (vtun-3.0.0.tar.gz) = 86ceadb2c3bfbcce6ec880bc5056a88f41d34aed0379fef6e4d09c4f26a82cca
+SIZE (vtun-3.0.0.tar.gz) = 123231
diff --git a/net/vtun/files/patch-configure.in b/net/vtun/files/patch-configure.in
deleted file mode 100644
index f06e9119f4ca..000000000000
--- a/net/vtun/files/patch-configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- configure.in.orig	Mon Jun  2 01:21:53 2003
-+++ configure.in	Mon Jun  2 01:22:02 2003
-@@ -134,7 +134,7 @@
-    AC_MSG_RESULT()
-    AC_CHECKING( for md5 Library and Header files ... )
- AC_SEARCH_HEADERS(md5.h,
--    $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include, /usr/include/sys, 
-+    $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys, 
-     ,
-     AC_MSG_ERROR( SSL headers not found. )
-    )
diff --git a/net/vtun/files/vtunclient.sh b/net/vtun/files/vtunclient.in
index 7679ac50724e..7679ac50724e 100644
--- a/net/vtun/files/vtunclient.sh
+++ b/net/vtun/files/vtunclient.in
diff --git a/net/vtun/files/vtund.sh b/net/vtun/files/vtund.in
index 0675996796fe..0675996796fe 100644
--- a/net/vtun/files/vtund.sh
+++ b/net/vtun/files/vtund.in
diff --git a/net/vtun/pkg-plist b/net/vtun/pkg-plist
index 8912ba9fca55..04f0a33ff918 100644
--- a/net/vtun/pkg-plist
+++ b/net/vtun/pkg-plist
@@ -1,12 +1,14 @@
 @unexec if cmp -s %D/etc/vtund.conf.example %D/etc/vtund.conf; then rm -f %D/etc/vtund.conf; fi
 etc/vtund.conf.example
-etc/rc.d/vtunclient.sh
-etc/rc.d/vtund.sh
 sbin/vtund
-share/doc/vtund/FAQ
-share/doc/vtund/README
-share/doc/vtund/README.Setup
-share/doc/vtund/README.Shaper
-@dirrm share/doc/vtund
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/Credits
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.LZO
+%%PORTDOCS%%%%DOCSDIR%%/README.Setup
+%%PORTDOCS%%%%DOCSDIR%%/README.Shaper
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec rm -rf /var/log/vtund
 @exec rm -rf /var/lock/vtund