Buildlink'ify and use the generic INSTALL scripts. Also move the lock

directory to /var/run/vtund.  This mirrors where samba installs its lock
files (/var/run/samba).  Lastly, make the vtund.8 manpage reflect where
everything is really located.

5 files changed, 90 insertions, 62 deletions

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 27a15f92f27..24f2ada7792 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/11/25 19:22:19 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/12/21 21:04:23 jlam Exp $
 
 DISTNAME=	vtun-2.4
 CATEGORIES=	net
@@ -8,52 +8,47 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://vtun.sourceforge.net/
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
-DEPENDS+=	liblzo-1.*:../../archivers/liblzo
-
-GNU_CONFIGURE=	YES
-USE_SSL=	YES
-CONFIGURE_ARGS+=--with-ssl-headers=${SSLBASE}/include/openssl \
-		--with-ssl-lib=${SSLBASE}/lib \
-		--with-lzo-headers=${LOCALBASE}/include \
-		--with-lzo-lib=${LOCALBASE}/lib
-LIBS+=		${LDFLAGS}
-
-ALL_TARGET=	vtund
-PLIST_SUBST+=	PREFIX=${PREFIX}
-
-DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-INSTALL_FILE=	${WRKDIR}/INSTALL
-
-.include "../../mk/bsd.prefs.mk"
-
+USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-
-FILES_SUBST=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-FILES_SUBST+=		CAT=${CAT:Q}
-FILES_SUBST+=		CHMOD=${CHMOD:Q}
-FILES_SUBST+=		CMP=${CMP:Q}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		MKDIR=${MKDIR:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST+=		RMDIR=${RMDIR:Q}
-FILES_SUBST+=		TRUE=${TRUE:Q}  
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+CONFIGURE_ARGS+=	--with-ssl-headers=${BUILDLINK_DIR}/include/openssl
+CONFIGURE_ARGS+=	--with-ssl-lib=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=	--with-lzo-headers=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=	--with-lzo-lib=${BUILDLINK_DIR}/lib
+ALL_TARGET=		vtund
+
+DOCDIR=			${PREFIX}/share/doc/vtun
+EGDIR=			${PREFIX}/share/examples/vtun
+LOCKDIR=		/var/run/vtund
+LOGDIR=			/var/log/vtund
+
+CONF_FILES_PERMS=	${EGDIR}/vtund.conf ${PKG_SYSCONFDIR}/vtund.conf \
+			${ROOT_USER} ${ROOT_GROUP} 0600
+OWN_DIRS=		${LOCKDIR} ${LOGDIR}
+
+post-build:
+	@cd ${WRKSRC}; for file in vtund.8; do				\
+		${SED}	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"	\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+	${SED}	-e "/^[^#]/s|^|#|" -e "s|^$$|#|" ${WRKSRC}/vtund.conf	\
+		> ${WRKDIR}/vtund.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vtund ${PREFIX}/sbin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vtun
-	${INSTALL_DATA} ${WRKSRC}/vtund.conf \
-		${PREFIX}/share/examples/vtun/vtund.conf.example
+	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.Setup ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.Shaper ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/vtund.conf ${EGDIR}/vtund.conf
 	${INSTALL_MAN} ${WRKSRC}/vtund.conf.5 ${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/vtund.8 ${PREFIX}/man/man8
 	${RM} -f ${PREFIX}/man/man8/vtun.8
 	${LN} -s vtund.8 ${PREFIX}/man/man8/vtun.8
 
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
+.include "../../archivers/liblzo/buildlink.mk"
+.include "../../devel/zlib/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vtun/PLIST b/net/vtun/PLIST
index 46596f6767e..d427e602106 100644
--- a/net/vtun/PLIST
+++ b/net/vtun/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:45 zuntum Exp $
-sbin/vtund
-share/examples/vtun/vtund.conf.example
+@comment $NetBSD: PLIST,v 1.2 2001/12/21 21:04:23 jlam Exp $
 man/man5/vtund.conf.5
-man/man8/vtund.8
 man/man8/vtun.8
+man/man8/vtund.8
+sbin/vtund
+share/doc/vtun/README.Setup
+share/doc/vtun/README.Shaper
+share/examples/vtun/vtund.conf
 @dirrm share/examples/vtun
+@dirrm share/doc/vtun
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index 9d97c98f2df..70d02fec2e9 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:39 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/12/21 21:04:23 jlam Exp $
 
 SHA1 (vtun-2.4.tar.gz) = 3ffbcc0864ca429ff37f39ffe30cb06e50144da7
 Size (vtun-2.4.tar.gz) = 82540 bytes
-SHA1 (patch-aa) = ce4bc46b05e7473cab43c062ab0b72157b438f01
+SHA1 (patch-aa) = b921a0b095848a49e79c81696324a6e67e8f07ba
+SHA1 (patch-ab) = e1891ef0c50ef79ee05967e06e110ce64891ab0a
diff --git a/net/vtun/patches/patch-aa b/net/vtun/patches/patch-aa
index 0ab11b3beb0..cec987760ba 100644
--- a/net/vtun/patches/patch-aa
+++ b/net/vtun/patches/patch-aa
@@ -1,21 +1,22 @@
-$NetBSD: patch-aa,v 1.2 2000/06/06 07:21:47 kleink Exp $
+$NetBSD: patch-aa,v 1.3 2001/12/21 21:04:23 jlam Exp $
 
---- Makefile.in.orig	Mon May 29 15:35:11 2000
-+++ Makefile.in	Tue Jun  6 08:58:08 2000
-@@ -36,7 +36,7 @@
- SBIN_DIR = @sbindir@
- MAN_DIR  = @mandir@
- ETC_DIR  = @sysconfdir@
--VAR_DIR  = @localstatedir@
-+VAR_DIR  = /var
+--- Makefile.in.orig	Mon May 29 09:35:11 2000
++++ Makefile.in
+@@ -19,7 +19,7 @@
+ #  
+ CC = @CC@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@
+-LDFLAGS = @LIBS@
++LDFLAGS = @LDFLAGS@ @LIBS@
  
+ YACC = @YACC@
+ YACCFLAGS = -d
+@@ -41,7 +41,7 @@
  PID_FILE = ${VAR_DIR}/run/vtund.pid
  CFG_FILE = ${ETC_DIR}/vtund.conf
-@@ -88,6 +88,7 @@
+ STAT_DIR = ${VAR_DIR}/log/vtund
+-LOCK_DIR = ${VAR_DIR}/lock/vtund
++LOCK_DIR = ${VAR_DIR}/run/vtund
  
- install_config: 
- 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(ETC_DIR)
-+	$(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(ETC_DIR)/vtund.conf.example; \
- 	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
- 	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(ETC_DIR); \
- 	fi
+ DEFS = -DVTUN_CONFIG_FILE=\"$(CFG_FILE)\" -DVTUN_PID_FILE=\"$(PID_FILE)\" \
+        -DVTUN_STAT_DIR=\"$(STAT_DIR)\" -DVTUN_LOCK_DIR=\"$(LOCK_DIR)\"
diff --git a/net/vtun/patches/patch-ab b/net/vtun/patches/patch-ab
new file mode 100644
index 00000000000..b81d0cc53bb
--- /dev/null
+++ b/net/vtun/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2001/12/21 21:04:23 jlam Exp $
+
+--- vtund.8.orig	Sun Oct 29 14:30:30 2000
++++ vtund.8
+@@ -68,7 +68,7 @@
+ .I -f file 
+ Read config information from the
+ .I file
+-(full path required). By default vtund uses /etc/vtund.conf
++(full path required). By default vtund uses @PKG_SYSCONFDIR@/vtund.conf
+ .TP
+ .I -n 
+ Do not become daemon.
+@@ -112,12 +112,12 @@
+ specified.
+ .SH FILES
+ .TP
+-.B /etc/vtund.conf
++.B @PKG_SYSCONFDIR@/vtund.conf
+ Main configuration file with sessions and other information. 
+ See vtund.conf example provided with distribution and vtund.conf(5) 
+ for more information.
+ .TP
+-.B /var/lock/vtund/
++.B /var/run/vtund/
+ Session lock files. 
+ .TP
+ .B /var/log/vtund/