* Honor PKGMANDIR and PKG_SYSCONFBASE.

* Install config files by CONF_FILES instead of install directly.
* Correct path of tools and config in sample config files and a manual page.
* Add DESTDIR support.

Bump PKGREVISION.

4 files changed, 67 insertions, 8 deletions

diff --git a/security/ssh-ip-tunnel/Makefile b/security/ssh-ip-tunnel/Makefile
index c8e71c944c5..0729e13003f 100644
--- a/security/ssh-ip-tunnel/Makefile
+++ b/security/ssh-ip-tunnel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/05/31 22:13:16 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2007/12/30 09:15:36 obache Exp $
 
 DISTNAME=	vpn-1.0
 PKGNAME=	ssh-ip-tunnel-1.0
+PKGREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://bleu.west.spy.net/~dustin/soft/
 
@@ -11,10 +12,34 @@ COMMENT=	Simple VPN system using pppd over ssh
 DEPENDS+=	pty-redir-0.1:../../misc/pty-redir
 .if !exists(/usr/bin/ssh)
 DEPENDS+=	{openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/openssh
+SSH=		${PREFIX}/bin/ssh
+.else
+SSH=		/usr/bin/ssh
 .endif
 
 CONFLICTS=	vpn-1.0
 
 GNU_CONFIGURE=	YES
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	post-configure
+SUBST_FILES.path=	etc/global.conf
+SUBST_SED.path=		-e 's,/usr/local/bin/ssh,${SSH},g'
+SUBST_SED.path+=	-e 's,/usr/pkg/bin/pty-redir,${PREFIX}/bin/pty-redir,g'
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	post-configure
+SUBST_FILES.conf=	man/vpn.8 etc/peers/sample.peer
+SUBST_SED.conf=		-e 's,/usr/pkg/etc/vpn,${PKG_SYSCONFDIR},g'
+
+PKG_SYSCONFSUBDIR=	vpn
+
+OWN_DIRS+=	${PKG_SYSCONFDIR}/peers
+CONF_FILES+=	${PREFIX}/share/examples/vpn/global.conf ${PKG_SYSCONFDIR}/global.conf
+CONF_FILES+=	${PREFIX}/share/examples/vpn/peers/sample.peer ${PKG_SYSCONFDIR}/peers/sample.peer
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh-ip-tunnel/PLIST b/security/ssh-ip-tunnel/PLIST
index 415fc63f791..35a8d57ce8d 100644
--- a/security/ssh-ip-tunnel/PLIST
+++ b/security/ssh-ip-tunnel/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:54 zuntum Exp $
-sbin/vpn
-etc/vpn/peers/sample.peer
-etc/vpn/global.conf
+@comment $NetBSD: PLIST,v 1.2 2007/12/30 09:15:36 obache Exp $
 man/man8/vpn.8
-@unexec /bin/rm -rf %D/etc/vpn/peers
-@dirrm etc/vpn
+sbin/vpn
+share/examples/vpn/global.conf
+share/examples/vpn/peers/sample.peer
+@dirrm share/examples/vpn/peers
+@dirrm share/examples/vpn
diff --git a/security/ssh-ip-tunnel/distinfo b/security/ssh-ip-tunnel/distinfo
index c567eaa9d42..0d60e47eee8 100644
--- a/security/ssh-ip-tunnel/distinfo
+++ b/security/ssh-ip-tunnel/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/12/30 09:15:36 obache Exp $
 
 SHA1 (vpn-1.0.tar.gz) = b0cdc510dda909fa76635896163ddebd35b8f1e1
 RMD160 (vpn-1.0.tar.gz) = 4f2d2f8b589ef21f27cb4f7568aa2def10c986b6
 Size (vpn-1.0.tar.gz) = 10652 bytes
+SHA1 (patch-aa) = e68b77038c2a5839b65be68ce24cdb5241e3c71c
diff --git a/security/ssh-ip-tunnel/patches/patch-aa b/security/ssh-ip-tunnel/patches/patch-aa
new file mode 100644
index 00000000000..4cb34915b6a
--- /dev/null
+++ b/security/ssh-ip-tunnel/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.1 2007/12/30 09:15:36 obache Exp $
+
+--- Makefile.in.orig	1999-02-22 07:22:29.000000000 +0000
++++ Makefile.in
+@@ -5,21 +5,16 @@ all: sbin/vpn.inst
+ 
+ 
+ sbin/vpn.inst:
+-	sed s,@CONFIGDIR@,$(PREFIX)/etc/vpn,g sbin/vpn > sbin/vpn.inst
++	sed s,@CONFIGDIR@,@sysconfdir@,g sbin/vpn > sbin/vpn.inst
+ 
+ # This would probably be a *little* nicer if I assumed a BSD install
+ install: sbin/vpn.inst
+-	mkdir -p $(PREFIX)/etc
+-	cp -r etc $(PREFIX)/etc/vpn
+-	chown root.wheel $(PREFIX)/etc/vpn
+-	chmod 750 $(PREFIX)/etc/vpn
+-	cp -r sbin/vpn.inst $(PREFIX)/sbin/vpn
+-	chown root.wheel $(PREFIX)/sbin/vpn
+-	chmod 750 $(PREFIX)/sbin/vpn
+-	mkdir -p $(PREFIX)/man/man8
+-	chmod 755 $(PREFIX)/man $(PREFIX)/man/man8
+-	cp man/vpn.8 $(PREFIX)/man/man8
+-	chmod 644 $(PREFIX)/man/man8/vpn.8
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(PREFIX)/share/examples/vpn
++	cd etc && pax -wr * $(DESTDIR)$(PREFIX)/share/examples/vpn
++	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(PREFIX)/sbin
++	${BSD_INSTALL_SCRIPT} sbin/vpn.inst $(DESTDIR)$(PREFIX)/sbin/vpn
++	${BSD_INSTALL_MAN_DIR} $(DESTDIR)@mandir@/man8
++	${BSD_INSTALL_MAN} man/vpn.8 $(DESTDIR)@mandir@/man8
+ 
+ clean:
+ 	rm -f sbin/vpn.inst