[pkgsrc/trunk]: pkgsrc/net/6to4 - honour PKG_SYSCONFDIR

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ebb5007576b
branches:  trunk
changeset: 459800:8ebb5007576b
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Aug 08 08:11:05 2003 +0000

description:
- honour PKG_SYSCONFDIR
- use automatic config file handling for 6to4.conf
- improve MESSAGE

bump to 1.4.

diffstat:

 net/6to4/DEINSTALL |  20 --------------------
 net/6to4/MESSAGE   |  11 +++++++----
 net/6to4/Makefile  |  17 ++++++++---------
 net/6to4/PLIST     |   5 +++--
 4 files changed, 18 insertions(+), 35 deletions(-)

diffs (99 lines):

diff -r 6aee53f3754f -r 8ebb5007576b net/6to4/DEINSTALL
--- a/net/6to4/DEINSTALL        Thu Aug 07 17:38:00 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 2003/05/06 17:42:05 jmmv Exp $
-#
-
-case "$2" in
-       DEINSTALL)
-               if [ -f ${PKG_PREFIX}/etc/6to4.conf ]; then
-               cat <<EOF
-
-=============================================================
-Note that the 6to4 configuration file (${PKG_PREFIX}/etc/6to4.conf)
-was not removed in the deinstallation process.  You should
-remove it by hand, if you no longer need it.
-=============================================================
-
-EOF
-               fi
-       ;;
-esac
diff -r 6aee53f3754f -r 8ebb5007576b net/6to4/MESSAGE
--- a/net/6to4/MESSAGE  Thu Aug 07 17:38:00 2003 +0000
+++ b/net/6to4/MESSAGE  Fri Aug 08 08:11:05 2003 +0000
@@ -1,8 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/05/06 17:42:05 jmmv Exp $
+$NetBSD: MESSAGE,v 1.3 2003/08/08 08:11:05 grant Exp $
 
-To configure this package, adjust ${PREFIX}/etc/6to4.conf from
-${PREFIX}/etc/6to4.conf-example, then start "6to4 -v start".
-You should be able to "ping6 www.kame.net" after that.
+To configure a 6to4 tunnel, modify the configuration file
+${PKG_SYSCONFDIR}/6to4.conf for your system, then run
+
+       ${RCD_SCRIPTS_DIR}/6to4 -v start
+
+You should then be able to ping6 www.kame.net.
 
 ===========================================================================
diff -r 6aee53f3754f -r 8ebb5007576b net/6to4/Makefile
--- a/net/6to4/Makefile Thu Aug 07 17:38:00 2003 +0000
+++ b/net/6to4/Makefile Fri Aug 08 08:11:05 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:50:55 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/08/08 08:11:05 grant Exp $
 #
 
-DISTNAME=              6to4-1.3
+DISTNAME=              6to4-1.4
 WRKSRC=                        ${WRKDIR}
 CATEGORIES=            net
 MASTER_SITES=          # empty
@@ -12,24 +12,23 @@
 COMMENT=               Enables 6to4 IPv6 automatic tunnels
 
 USE_PERL5=             YES
+USE_PKGINSTALL=                YES
 
 # This pkg doesn't regard USE_INET6 (leave this comment for README-IPv6.html!)
 EXTRACT_ONLY=  # empty
 NO_CHECKSUM=   yes
 NO_CONFIGURE=  yes
 
+CONF_FILES+=   ${PREFIX}/share/examples/6to4/6to4.conf ${PKG_SYSCONFDIR}/6to4.conf
+
 do-build:
-.for FILE in 6to4
-       ${SED} -e 's|@PREFIX@|${PREFIX}|g'              \
-               -e 's|@LOCALBASE@|${LOCALBASE}|g'       \
-               < ${FILESDIR}/${FILE}                   \
-               > ${WRKSRC}/${FILE}
-.endfor
+       @${SED} ${FILES_SUBST_SED} ${FILESDIR}/6to4 > ${WRKSRC}/6to4
 
 do-install:
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/6to4
        ${INSTALL_SCRIPT} ${WRKSRC}/6to4 ${PREFIX}/sbin/6to4
        ${INSTALL_MAN} ${FILESDIR}/6to4.8 ${PREFIX}/man/man8
-       ${INSTALL_DATA} ${FILESDIR}/6to4.conf ${PREFIX}/etc/6to4.conf-example
        ${INSTALL_DATA} ${FILESDIR}/6to4.html ${PREFIX}/share/doc/6to4.html
+       ${INSTALL_DATA} ${FILESDIR}/6to4.conf ${PREFIX}/share/examples/6to4
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6aee53f3754f -r 8ebb5007576b net/6to4/PLIST
--- a/net/6to4/PLIST    Thu Aug 07 17:38:00 2003 +0000
+++ b/net/6to4/PLIST    Fri Aug 08 08:11:05 2003 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:39 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/08 08:11:05 grant Exp $
 sbin/6to4
-etc/6to4.conf-example
 share/doc/6to4.html
+share/examples/6to4/6to4.conf
 man/man8/6to4.8
+@dirrm share/examples/6to4