Create some semblance of a default config file, generated from compile-time

defaults.  Also minor cleanup and ability to strip binaries.

4 files changed, 86 insertions, 6 deletions

diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index a38a083ff8a..c0ca0aa36a3 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/22 03:00:14 tv Exp $
+# $NetBSD: Makefile,v 1.12 2001/02/22 15:28:56 tv Exp $
 #
 
 DISTNAME=	fidogate-4.4.2
@@ -13,7 +13,10 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 
 INFO_FILES=	fidogate.info
-MAKE_ENV=	PKGPREFIX=${PREFIX} DEBUG="${CFLAGS} -Werror"
+MAKE_ENV=	DEBUG="${CFLAGS} -Werror" CC="${CC} ${STRIPFLAG}"
+
+post-extract:
+	@${CP} ${WRKSRC}/examples/orodruin/fidogate.conf ${WRKSRC}/
 
 # This ugliness is because config.make is parsed by both make(1) and
 # subst.pl, which does only simplistic substitution.
@@ -26,9 +29,12 @@ pre-build:
 	${RM} -f ${WRKSRC}/doc/fidogate.info*
 	cd ${WRKSRC}/doc && makeinfo --no-split fidogate.texi && \
 		${TOUCH} fidogate.txt html/fidogate_toc.html
+	${PERL} ${WRKSRC}/subst.pl -t${WRKSRC} ${WRKSRC}/fidogate.conf \
+		>${WRKSRC}/fidogate.conf.dist
 
 pre-install:
 	${INSTALL_DATA_DIR} \
+		${PREFIX}/etc/fidogate \
 		${PREFIX}/lib/fidogate \
 		${PREFIX}/lib/fidogate/bin \
 		${PREFIX}/share/doc/fidogate \
@@ -47,5 +53,6 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/maintenance/rc.fidogate \
 		${PREFIX}/etc/rc.d/fidogate
 	${INSTALL_DATA} ${WRKSRC}/doc/fidogate.txt ${PREFIX}/share/doc/fidogate/
+	${INSTALL_DATA} ${WRKSRC}/fidogate.conf.dist ${PREFIX}/etc/fidogate/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/fidogate/files/patch-sum b/comms/fidogate/files/patch-sum
index 50af8d7b0fb..4733cf9366d 100644
--- a/comms/fidogate/files/patch-sum
+++ b/comms/fidogate/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2001/02/22 03:00:15 tv Exp $
+$NetBSD: patch-sum,v 1.5 2001/02/22 15:28:57 tv Exp $
 
 MD5 (patch-aa) = 9617cf7c1bb0f8817445043ea8d5bd36
 MD5 (patch-ab) = cc96a047e67e88da5ff683515b77fc94
@@ -8,3 +8,4 @@ MD5 (patch-ae) = 84726b67dc58cbd2b1005c468f3fab48
 MD5 (patch-af) = 29b3e4bed0ff4102c671648eae15d2fd
 MD5 (patch-ag) = 49cfced275abdaa905e0e86dcfaa532e
 MD5 (patch-ah) = 16a49bfc5b559da88ddb7fd18143fe7d
+MD5 (patch-ai) = 27a5e1350a8584d67c4f25d3f4ebeb27
diff --git a/comms/fidogate/patches/patch-ai b/comms/fidogate/patches/patch-ai
new file mode 100644
index 00000000000..bc210baec16
--- /dev/null
+++ b/comms/fidogate/patches/patch-ai
@@ -0,0 +1,70 @@
+$NetBSD: patch-ai,v 1.4 2001/02/22 15:28:57 tv Exp $
+
+--- fidogate.conf.orig	Thu Feb 22 09:58:02 2001
++++ fidogate.conf	Thu Feb 22 09:58:13 2001
+@@ -15,30 +15,30 @@
+ ##############################################################################
+ 
+ # directories
+-CONFIGDIR	/etc/fidogate
+-LIBDIR		/usr/lib/fidogate
+-BINDIR		/usr/lib/fidogate/bin
+-LOGDIR		/var/log/fidogate
+-VARDIR		/var/lib/fidogate
+-LOCKDIR		/var/lock/fidogate
+-SPOOLDIR	/var/spool/fidogate
+-BTBASEDIR	/var/spool/bt
+-
+-INBOUND		%B/in
+-PINBOUND	%B/pin
+-UUINBOUND	%B/uuin
+-#FTPINBOUND	%B/ftpin
++#CONFIGDIR	<CONFIGDIR> # aka %C
++#LIBDIR		<LIBDIR> # aka %L
++#BINDIR		<BINDIR> # aka %N
++#LOGDIR		<LOGDIR> # aka %G
++#VARDIR		<VARDIR> # aka %V
++#LOCKDIR 	<LOCKDIR> # aka %K
++#SPOOLDIR	<SPOOLDIR> # aka %S
++#BTBASEDIR	<BTBASEDIR> # aka %B
++
++#INBOUND 	<INBOUND> # aka %I
++#PINBOUND	<PINBOUND> # aka %P
++#UUINBOUND	<UUINBOUND> # aka %U
++#FTPINBOUND	<FTPINBOUND>
+ 
+ # files		
+-ALIASES		%C/aliases
+-AREAS		%C/areas
+-HOSTS		%C/hosts
+-PASSWD		%C/passwd
+-PACKING		%C/packing
+-ROUTING		%C/routing
+-HISTORY		%V/history
+-LOGFILE		%G/log
+-CHARSETMAP	%L/charset.bin
++#ALIASES 	<ALIASES>
++#AREAS		<AREAS>
++#HOSTS		<HOSTS>
++#PASSWD		<PASSWD>
++#PACKING 	<PACKING>
++#ROUTING 	<ROUTING>
++#HISTORY 	<HISTORY>
++#LOGFILE 	<LOGFILE>
++#CHARSETMAP	<CHARSETMAP>
+ 
+ # facility, level when using syslog support (LOGFILE = "syslog")
+ # NOT YET SUPPORTED by FIDOGATE C programs (used by Perl scripts)
+@@ -57,10 +57,10 @@
+ 
+ 
+ # AREAS.BBS EchoMail distribution list
+-AreasBBS	%V/areas.bbs
++AreasBBS	%C/areas.bbs
+ 
+ # FAREAS.BBS file distribution list
+-FAreasBBS	%V/fareas.bbs
++FAreasBBS	%C/fareas.bbs
+ 
+ 
+ 
diff --git a/comms/fidogate/pkg/PLIST b/comms/fidogate/pkg/PLIST
index 51e5df810d2..06241fb188d 100644
--- a/comms/fidogate/pkg/PLIST
+++ b/comms/fidogate/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2001/02/22 03:00:17 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/02/22 15:28:57 tv Exp $
+etc/fidogate/fidogate.conf.dist
+@dirrm etc/fidogate
 etc/rc.d/fidogate
-@comment @unexec install-info --delete %D/info/fidogate.info %D/info/dir
+@unexec install-info --delete %D/info/fidogate.info %D/info/dir
 info/fidogate.info
-@comment @exec install-info %D/info/fidogate.info %D/info/dir
+@exec install-info %D/info/fidogate.info %D/info/dir
 lib/fidogate/areafix.help
 lib/fidogate/bin/areasbbssync
 lib/fidogate/bin/ftnafutil