Make this package install its configuration files under the examples tree

and honor PKG_SYSCONFDIR to configure the package.

4 files changed, 18 insertions, 13 deletions

diff --git a/comms/ifcico-cm/Makefile b/comms/ifcico-cm/Makefile
index 90dd6848802..98b477b1cc4 100644
--- a/comms/ifcico-cm/Makefile
+++ b/comms/ifcico-cm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/11/14 23:55:27 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/25 13:39:36 jmmv Exp $
 #
 
 DISTNAME=	ifcico-3.0.cm.alpha-4.1
 PKGNAME=	ifcico-cm-3.0a4.1
+PKGREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://cmeerw.org/files/
 
@@ -12,14 +13,18 @@ COMMENT=	FidoNet transport program using FTS protocols via dial or TCP
 
 USE_BUILDLINK2=	# defined
 
+PKG_SYSCONFSUBDIR=	ifcico-cm
+MAKE_ENV+=		PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
+
 post-build:
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config >${WRKDIR}/config.dist
+	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config \
+		>${WRKDIR}/config
 	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config-global \
-		>${WRKDIR}/config-global.dist
+		>${WRKDIR}/config-global
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/ifcico
-	${INSTALL_DATA} ${WRKDIR}/config* ${PREFIX}/etc/ifcico/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ifcico-cm
+	${INSTALL_DATA} ${WRKDIR}/config* ${PREFIX}/share/examples/ifcico-cm/
 	cd ${WRKSRC}/ifcico && for f in *.8; do \
 		tbl <$$f >$$f.t && ${INSTALL_DATA} $$f.t ${PREFIX}/man/man8/$$f; \
 	done
diff --git a/comms/ifcico-cm/PLIST b/comms/ifcico-cm/PLIST
index f660a68cdc4..b2f4d3b0856 100644
--- a/comms/ifcico-cm/PLIST
+++ b/comms/ifcico-cm/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:08 zuntum Exp $
-etc/ifcico/config.dist
-etc/ifcico/config-global.dist
-@dirrm etc/ifcico
+@comment $NetBSD: PLIST,v 1.2 2002/12/25 13:39:36 jmmv Exp $
 man/man8/ifcico.8
 man/man8/ifindex.8
 man/man8/ifinfo.8
@@ -16,3 +13,6 @@ sbin/ifreq
 sbin/ifroute
 sbin/ifstat
 sbin/nlpatch
+share/examples/ifcico-cm/config
+share/examples/ifcico-cm/config-global
+@dirrm share/examples/ifcico-cm
diff --git a/comms/ifcico-cm/distinfo b/comms/ifcico-cm/distinfo
index 7fa9f39188e..557571fde35 100644
--- a/comms/ifcico-cm/distinfo
+++ b/comms/ifcico-cm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/07/06 19:05:53 tv Exp $
+$NetBSD: distinfo,v 1.4 2002/12/25 13:39:36 jmmv Exp $
 
 SHA1 (ifcico-3.0.cm.alpha-4.1.tar.gz) = d17aefcde0da1b29249f7039305400d87f4eecf7
 Size (ifcico-3.0.cm.alpha-4.1.tar.gz) = 249029 bytes
-SHA1 (patch-aa) = f53f323dadf88dee064cd7c4c13f0a52581ed601
+SHA1 (patch-aa) = 4d9098365649037bfb7e4016fb62dc2f9bbfc9a0
 SHA1 (patch-ab) = daa8f8678549f2f5b5c175ff17e7331c68e59920
 SHA1 (patch-ac) = 0a097b8a75b61cafa70aac2154453f9c96213ff5
 SHA1 (patch-ad) = af477df6773ea60c9e420918e0b54bd0b994c97a
diff --git a/comms/ifcico-cm/patches/patch-aa b/comms/ifcico-cm/patches/patch-aa
index c501f9a31ee..e855345f47f 100644
--- a/comms/ifcico-cm/patches/patch-aa
+++ b/comms/ifcico-cm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/02/21 18:50:37 tv Exp $
+$NetBSD: patch-aa,v 1.4 2002/12/25 13:39:36 jmmv Exp $
 
 --- CONFIG.orig	Sun Mar  7 15:51:36 1999
 +++ CONFIG	Wed Feb 21 10:48:51 2001
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/21 18:50:37 tv Exp $
  
  # Main configuration file. This default may be overwritten by -I key.
 -CONFIGFILE  = "/etc/ifmail/config"
-+CONFIGFILE  = ${PREFIX}/etc/ifcico/config
++CONFIGFILE  = ${PKG_SYSCONFDIR}/config
  
  # Debug messages turned on by -x key are written here.
  # Some error messages may occationally appear here too.