Update to 4.4.2, and clean up massively. No longer creates the /var dirs,

and doesn't have a template .conf files (but many examples in
share/examples/fidogate).  See documentation for changes.

19 files changed, 331 insertions, 545 deletions

diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 93bd9f80b28..a38a083ff8a 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,43 +1,51 @@
-# $NetBSD: Makefile,v 1.10 2001/02/16 13:56:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/02/22 03:00:14 tv Exp $
 #
 
-DISTNAME=	fidogate-4.2.9
+DISTNAME=	fidogate-4.4.2
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.fido.de/pub/fidogate/
 
-MAINTAINER=	tv@netbsd.org	# aka "Todd Vierling" @ 1:396/1.5
+MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.fido.de/fidogate/
 COMMENT=	FidoNet (FTN) <-> Internet mail and news gateway
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
-WRKSRC=		${WRKDIR}/fidogate
 
 INFO_FILES=	fidogate.info
+MAKE_ENV=	PKGPREFIX=${PREFIX} DEBUG="${CFLAGS} -Werror"
 
-pre-install:
-	${INSTALL_DATA_DIR} -m 0755 ${PREFIX}/lib/fidogate
+# This ugliness is because config.make is parsed by both make(1) and
+# subst.pl, which does only simplistic substitution.
+do-configure:
+	${SED} -e 's,@PREFIX@,${PREFIX},g' \
+		${WRKSRC}/config.make >${WRKSRC}/config.make.new
+	${MV} -f ${WRKSRC}/config.make.new ${WRKSRC}/config.make
 
-post-install:
+pre-build:
+	${RM} -f ${WRKSRC}/doc/fidogate.info*
+	cd ${WRKSRC}/doc && makeinfo --no-split fidogate.texi && \
+		${TOUCH} fidogate.txt html/fidogate_toc.html
+
+pre-install:
 	${INSTALL_DATA_DIR} \
+		${PREFIX}/lib/fidogate \
+		${PREFIX}/lib/fidogate/bin \
+		${PREFIX}/share/doc/fidogate \
+		${PREFIX}/share/examples/fidogate \
 		${PREFIX}/share/fidogate \
-		${PREFIX}/share/fidogate/inn \
-		${PREFIX}/share/fidogate/nodelist \
-		${PREFIX}/share/fidogate/scripts \
-		${PREFIX}/share/fidogate/sendmail
-	cd ${WRKSRC}/scripts/inn && \
-		${INSTALL_DATA} send-ffx send-fidogate viaffx ${PREFIX}/share/fidogate/inn/
-	cd ${WRKSRC}/scripts/nodelist && \
-		${INSTALL_DATA} latest nl-2hosts nl-2routing nl-autoupd \
-				nl-check nl-del nl-diff nl-html nl-isdn \
-				nl-print template.html ${PREFIX}/share/fidogate/nodelist/
-	cd ${WRKSRC}/scripts/outbound && \
-		${INSTALL_DATA} out-freq out-ls out-manip out-rm0 out-rmbsy ${PREFIX}/share/fidogate/scripts/
-	cd ${WRKSRC}/scripts/run && \
-		${INSTALL_DATA} run1 run2 runffx runpoll ${PREFIX}/share/fidogate/scripts/
-	cd ${WRKSRC}/sendmail/mailer && \
-		${INSTALL_DATA} ffx.m4 ftn.m4 ${PREFIX}/share/fidogate/sendmail/
-	${INSTALL_DATA} ${WRKSRC}/scripts/maintenance/rc.fidogate ${PREFIX}/etc/rc.d/fidogate
+		${PREFIX}/share/fidogate/sendmail \
+		${PREFIX}/share/fidogate/sendmail/mailer
+
+post-install:
+	cd ${WRKSRC}/examples && for f in `${FIND} [m-p]* -type d`; do \
+		${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fidogate/$$f; done
+	cd ${WRKSRC}/examples && for f in `${FIND} README [m-p]* -type f`; do \
+		${INSTALL_DATA} $$f ${PREFIX}/share/examples/fidogate/$$f; done
+	cd ${WRKSRC}/sendmail/mailer && ${INSTALL_DATA} ffx.m4 ftn.m4 \
+		${PREFIX}/share/fidogate/sendmail/mailer/
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/maintenance/rc.fidogate \
+		${PREFIX}/etc/rc.d/fidogate
+	${INSTALL_DATA} ${WRKSRC}/doc/fidogate.txt ${PREFIX}/share/doc/fidogate/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/fidogate/files/md5 b/comms/fidogate/files/md5
index ee06bb6eeb7..b8c75d8b2f8 100644
--- a/comms/fidogate/files/md5
+++ b/comms/fidogate/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:16:59 agc Exp $
+$NetBSD: md5,v 1.3 2001/02/22 03:00:15 tv Exp $
 
-MD5 (fidogate-4.2.9.tar.gz) = adc2ab02a57e3f9b878e2bdd192bb506
+MD5 (fidogate-4.4.2.tar.gz) = 055ff66f68455ff746d4974d7d072036
diff --git a/comms/fidogate/files/patch-sum b/comms/fidogate/files/patch-sum
index 5bd16958ebb..50af8d7b0fb 100644
--- a/comms/fidogate/files/patch-sum
+++ b/comms/fidogate/files/patch-sum
@@ -1,16 +1,10 @@
-$NetBSD: patch-sum,v 1.3 2000/08/28 09:36:31 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2001/02/22 03:00:15 tv Exp $
 
-MD5 (patch-aa) = cb4359386ffb7475b4fee4d06c74f3ba
-MD5 (patch-ab) = f3edf91e56ef8099fd3e9175e628b083
-MD5 (patch-ac) = f8b3c49852c1d6dd6d396715c295ed5b
-MD5 (patch-ad) = 71b14613674096e885f6fe2741a2e027
-MD5 (patch-ae) = eb756924681b1db7da480519948e83f2
-MD5 (patch-af) = 838edb2aef45c680575d80492fc4db66
-MD5 (patch-ag) = 5b02deb831f1f328d149d68b49e720eb
-MD5 (patch-ah) = f4d3206fa713cceef37c0cff79318652
-MD5 (patch-ai) = a8073e62d38eadbc111d85542b674f7a
-MD5 (patch-aj) = db7dbd71aeafa12d5d1a1d11e96f9720
-MD5 (patch-ak) = 3d970caec1844280f4bcde6d0963d3a0
-MD5 (patch-al) = 4b68b4222b1c673c948f6b690700bee7
-MD5 (patch-am) = dc678f1cfaeadae2f87a2e71ac9cfb2b
-MD5 (patch-an) = 7247a25bcefa146060c035dcfa395770
+MD5 (patch-aa) = 9617cf7c1bb0f8817445043ea8d5bd36
+MD5 (patch-ab) = cc96a047e67e88da5ff683515b77fc94
+MD5 (patch-ac) = b226c572c3537ce07436cddb0495293d
+MD5 (patch-ad) = 93db628b069304a5afaf3feddf8ae41b
+MD5 (patch-ae) = 84726b67dc58cbd2b1005c468f3fab48
+MD5 (patch-af) = 29b3e4bed0ff4102c671648eae15d2fd
+MD5 (patch-ag) = 49cfced275abdaa905e0e86dcfaa532e
+MD5 (patch-ah) = 16a49bfc5b559da88ddb7fd18143fe7d
diff --git a/comms/fidogate/patches/patch-aa b/comms/fidogate/patches/patch-aa
index 9392f5d18ee..ca7b4190e4e 100644
--- a/comms/fidogate/patches/patch-aa
+++ b/comms/fidogate/patches/patch-aa
@@ -1,106 +1,107 @@
-$NetBSD: patch-aa,v 1.3 1998/12/08 17:12:23 tv Exp $
+$NetBSD: patch-aa,v 1.4 2001/02/22 03:00:15 tv Exp $
 
---- config.make.orig	Sat Oct 11 17:24:15 1997
-+++ config.make	Tue Dec  8 10:54:14 1998
-@@ -14,35 +14,35 @@
- # OS2 = OS/2 with EMX GCC
+--- config.make.orig	Tue Apr 11 08:02:25 2000
++++ config.make	Wed Feb 21 20:03:27 2001
+@@ -56,13 +56,13 @@
+ #
  
- # FIDOGATE Directories
--BINDIR		= /usr/local/bin
--LIBDIR		= /usr/local/lib/fidogate
-+BINDIR		= ${PREFIX}/bin
-+LIBDIR		= ${PREFIX}/lib/fidogate
- SPOOLDIR	= /var/spool/fido
- LOGDIR		= /var/log/fido
+ # variable parameters, can be changed at run-time, DO NOT DELETE ANYTHING!!!
+-DEFAULT_V_CONFIGDIR	= /etc/fidogate
+-DEFAULT_V_LIBDIR	= /usr/lib/fidogate
+-DEFAULT_V_BINDIR	= $(DEFAULT_V_LIBDIR)/bin
+-DEFAULT_V_LOGDIR	= /var/log/fidogate
+-DEFAULT_V_VARDIR	= /var/lib/fidogate
+-DEFAULT_V_LOCKDIR	= /var/lock/fidogate
+-DEFAULT_V_SPOOLDIR	= /var/spool/fidogate
++DEFAULT_V_CONFIGDIR	= @PREFIX@/etc/fidogate
++DEFAULT_V_LIBDIR	= @PREFIX@/lib/fidogate
++DEFAULT_V_BINDIR	= @PREFIX@/lib/fidogate/bin
++DEFAULT_V_LOGDIR	= /var/log/fido
++DEFAULT_V_VARDIR	= /var/spool/fido
++DEFAULT_V_LOCKDIR	= /var/spool/fido/lock
++DEFAULT_V_SPOOLDIR	= /var/spool/fido
+ DEFAULT_V_BTBASEDIR	= /var/spool/bt
+ DEFAULT_V_INBOUND	= $(DEFAULT_V_BTBASEDIR)/in
+ DEFAULT_V_PINBOUND	= $(DEFAULT_V_BTBASEDIR)/pin
+@@ -83,17 +83,17 @@
  
- # Doc directories
--INFODIR		= /usr/local/info
-+INFODIR		= ${PREFIX}/info
- HTMLDIR		= /home/mj/public_html/fidogate
+ # fixed parameters, DO NOT DELETE ANYTHING!!!
+ # INN (Redhat 5.2)
+-DEFAULT_F_NEWSETCDIR	= /etc/news
+-DEFAULT_F_NEWSVARDIR	= /var/lib/news
++DEFAULT_F_NEWSETCDIR	= /var/news/etc
++DEFAULT_F_NEWSVARDIR	= /var/news
+ # INN 1.7
+ #DEFAULT_F_NEWSLIBDIR	= /usr/lib/news
+ #DEFAULT_F_NEWSSPOOLDIR	= /var/spool/news
+ # INN 2.2
+-DEFAULT_F_NEWSLIBDIR	= /usr/lib
+-DEFAULT_F_NEWSSPOOLDIR	= /var/spool/news/articles
++DEFAULT_F_NEWSLIBDIR	= @PREFIX@/inn/lib
++DEFAULT_F_NEWSSPOOLDIR	= /var/news/spool/articles
+ # ifcico-3.0.cm.alpha-4.1
+ #DEFAULT_F_IFMAILDIR     = /usr/lib/ifmail
+-DEFAULT_F_IFMAILDIR     = /usr/lib/ifcico
++DEFAULT_F_IFMAILDIR     = @PREFIX@/sbin
  
- # Outbound *base* directory, i.e. outbound is OUTBOUND/out.xxx
--OUTBOUND	= /var/spool/bt
-+OUTBOUND	= /var/spool/fido/bt
- # Normal (i.e. insecure) inbound
--INBOUND		= /var/spool/bt/in
-+INBOUND		= /var/spool/fido/bt/in
- # Protected inbound
--PINBOUND	= /var/spool/bt/pin
-+PINBOUND	= /var/spool/fido/bt/pin
- # Inbound for uuencoded mails (used by recvuu)
--UUINBOUND	= /var/spool/bt/uuin
-+UUINBOUND	= /var/spool/fido/bt/uuin
+ # old-style config
+ #DEFAULT_F_CONFIG_GATE	= %C/gate.conf
+@@ -146,15 +146,15 @@
  
- # INN directories
--NEWSETCDIR	= /etc/news
-+NEWSETCDIR	= ${PREFIX}/etc/news
- NEWSVARDIR	= /var/lib/news
--NEWSLIBDIR	= /usr/lib/news
-+NEWSLIBDIR	= ${PREFIX}/lib/news
- NEWSSPOOLDIR	= /var/spool/news
  
- # Ifmail directory
--IFMAILDIR       = /usr/local/lib/ifmail
-+IFMAILDIR       = ${PREFIX}/lib/ifmail
+ # The perl interpreter used by subst.pl
+-PERL			= /usr/bin/perl
++PERL			= @PREFIX@/bin/perl
  
- # perl
--PERL		= /usr/bin/perl
-+PERL		= ${PREFIX}/bin/perl
+ # Directory with sendmail m4 configuration files
+-SENDMAIL_CF_DIR		= /usr/lib/sendmail-cf
++SENDMAIL_CF_DIR		= /usr/share/sendmail
  
- # OS2: comment out
-  SHELL		= /bin/sh
-@@ -57,20 +57,20 @@
+ # Directories for installing documentation, not used by subst.pl
+-INFODIR			= /usr/info
+-HTMLDIR			= /html/fidogate
+-HTMLLOGDIR		= /html/log
++INFODIR			= @PREFIX@/info
++HTMLDIR			= @PREFIX@/share/doc/fidogate
++HTMLLOGDIR		= @PREFIX@/share/fidogate
+ 
+ # RedHat RPM related dirs
+ RPMBASEDIR	= /usr/src/redhat
+@@ -194,20 +194,17 @@
  # install permissions
-  PERM_PROG	= 755
-  PERM_DATA	= 644
-- PERM_SETUID	= 4755
-+ PERM_SETUID	= 4111
-  PERM_DIR	= 755
+ PERM_PROG	= 755
+ PERM_DATA	= 644
+-PERM_SETUID	= 4755
++PERM_SETUID	= 4111
+ PERM_DIR	= 755
  
  # C compiler / flags
-  CC		= gcc
+-CC		= gcc
 -# YACC		= yacc					# Use yacc, not bison
-- YACC		= bison -y
-+ YACC		= yacc					# Use yacc, not bison
-+# YACC		= bison -y
-  AR		= ar
+-YACC		= bison -y
++YACC		= yacc					# Use yacc, not bison
+ AR		= ar
  # RANLIB	= @echo >/dev/null			# No ranlib
-  RANLIB		= ranlib
+ RANLIB		= ranlib
  # RANLIB	= ar s					# OS2
  
--# DEBUG		= -O2
-- DEBUG		= -g
-+ DEBUG		= -O2
-+# DEBUG		= -g
- 
-  INCLUDE	= -I$(TOPDIR) -I$(TOPDIR)/src/include
+ # DEBUG		= -O2
+-DEBUG		= -g
  
-@@ -87,7 +87,7 @@
- # LFLAGS	= $(DEBUG) -L$(TOPDIR)/src/common -posix
- # OS2
- # LFLAGS	= -Zexe $(DEBUG) -L$(TOPDIR)/src/common
-- LFLAGS		= $(DEBUG) -L$(TOPDIR)/src/common
-+ LFLAGS		= $(DEBUG) -L$(TOPDIR)/src/common/.libs $(LDFLAGS)
+ INCLUDE		= -I$(TOPDIR) -I$(TOPDIR)/src/include
  
- # ISC 3.x
- # LIBS		= -lfidogate -linet -lPW -lcposix
-@@ -99,13 +99,12 @@
+@@ -236,10 +233,10 @@
  # MSDOS, OS2, WIN32
  # EXE		= .exe
-  EXE		=
-- INSTALL_PROG	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_PROG)
-- INSTALL_DATA	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_DATA)
-- INSTALL_SETUID	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
-- INSTALL_DIR	= $(INSTALL) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
--# extra prefix for installation
-- PREFIX         =
-+ INSTALL_PROG	= $(BSD_INSTALL_PROGRAM)
-+ INSTALL_SCRIPT	= $(BSD_INSTALL_SCRIPT)
-+ INSTALL_DATA	= $(BSD_INSTALL_DATA)
-+ INSTALL_SETUID	= $(BSD_INSTALL_PROGRAM) -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
-+ INSTALL_DIR	= $(BSD_INSTALL_DATA_DIR) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR)
+ EXE		=
+-INSTALL_PROG	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_PROG)
+-INSTALL_DATA	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_DATA)
+-INSTALL_SETUID	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
+-INSTALL_DIR	= $(INSTALL) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
++INSTALL_PROG	= $(BSD_INSTALL_SCRIPT)
++INSTALL_DATA	= $(BSD_INSTALL_DATA)
++INSTALL_SETUID	= $(BSD_INSTALL_PROGRAM) -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
++INSTALL_DIR	= $(BSD_INSTALL_DATA_DIR) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
+ # extra prefix for installation
+ PREFIX		=
  
- # library name
- # LIB		= fidogate.a			# OS2
-- LIB		= libfidogate.a
-+ LIB		= libfidogate.la
diff --git a/comms/fidogate/patches/patch-ab b/comms/fidogate/patches/patch-ab
index 119f9fcefb7..5ac0e8ccfe4 100644
--- a/comms/fidogate/patches/patch-ab
+++ b/comms/fidogate/patches/patch-ab
@@ -1,38 +1,12 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:36 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/02/22 03:00:15 tv Exp $
 
---- src/common/Makefile.orig	Wed Jul 15 22:33:40 1998
-+++ src/common/Makefile	Wed Jul 15 22:55:24 1998
-@@ -15,6 +15,7 @@
- include $(TOPDIR)/config.make
- include $(TOPDIR)/rules.make
- 
-+CC		= $(LIBTOOL) --mode=compile gcc
- 
- OBJS		= address.o aliases.o areas.o areasbbs.o binkley.o\
- 		  bounce.o bufstring.o charset.o config.o crc16.o crc32.o\
-@@ -25,14 +26,11 @@
- 		  sequencer.o textlist.o version.o wildmat.o\
- 		  xalloc.o xstrtok.o mime.o tick.o parsenode.o flo.o
- 
--LIBOBJS		= $(OBJS:%=$(LIB)(%))
--
--
- all:		$(LIB)
- 
- 
--$(LIB):		$(LIBOBJS)
--	$(RANLIB) $(LIB)
-+$(LIB):		$(OBJS)
-+	$(LIBTOOL) --mode=link gcc -o $(LIB) $(OBJS:.o=.lo) -rpath $(PREFIX)/lib -version-info 0:0
- 
- parsedate.c:	parsedate.y
- 	@echo "expect 6 shift/reduce conflicts"
-@@ -40,6 +38,8 @@
- 	mv y.tab.c parsedate.c
- 
- install:
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIB) $(PREFIX)/lib
-+	rm -f $(PREFIX)/lib/libfidogate.a
- 
- clean veryclean:
- 	rm -f $(PROGS) $(LIB)
+--- src/common/getopt.c.orig	Wed Feb 21 17:27:48 2001
++++ src/common/getopt.c	Wed Feb 21 17:29:26 2001
+@@ -73,6 +73,7 @@
+ #include <stdlib.h>
+ #else	/* Not GNU C library.  */
+ #define	__alloca	alloca
++#include <stdlib.h>
+ #endif	/* GNU C library.  */
+ 
+ /* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
diff --git a/comms/fidogate/patches/patch-ac b/comms/fidogate/patches/patch-ac
index 55418ddc5da..820b326c0a6 100644
--- a/comms/fidogate/patches/patch-ac
+++ b/comms/fidogate/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:36 agc Exp $
+$NetBSD: patch-ac,v 1.3 2001/02/22 03:00:15 tv Exp $
 
---- config.h.orig	Thu Jul 16 09:33:56 1998
-+++ config.h	Thu Jul 16 09:39:23 1998
-@@ -92,7 +92,7 @@
+--- config.h.orig	Wed Feb 21 16:59:45 2001
++++ config.h	Wed Feb 21 17:09:49 2001
+@@ -108,7 +108,7 @@
  /***** rfc2ftn configuration ************************************************/
  
  /** Passthru operation for NetMail: FIDO->Internet->FIDO **/
@@ -11,32 +11,29 @@ $NetBSD: patch-ac,v 1.2 1998/08/07 10:36:36 agc Exp $
  /** Passthru operation for EchoMail: FIDO->Internet->FIDO **/
  /*
   * Implemented, but requires ftntoss run after rfc2ftn to sort SEEN-BY
-@@ -153,20 +153,20 @@
-  *				"Received: by NeXT.Mailer"
-  */
- 
--/* Standard config: POSIX UNIX */
-+#ifdef __NetBSD__
- # define DO_HAVE_FCNTL_LOCK
--# undef  DO_HAVE_GETTIMEOFDAY
--# undef  DO_HAVE_TM_GMTOFF
--# undef  DO_HAVE_SYSEXITS_H
--# undef  DO_HAVE_TM_ZONE
--# define DO_HAVE_STRFTIME
-+# define DO_HAVE_GETTIMEOFDAY
-+# define DO_HAVE_TM_GMTOFF
-+# define DO_HAVE_SYSEXITS_H
-+# define DO_HAVE_TM_ZONE
-+# undef  DO_HAVE_STRFTIME
- # undef  DO_HAVE_TZNAME
--# undef  DO_HAVE_STRCASECMP
-+# define DO_HAVE_STRCASECMP
- # undef  DO_HAVE_STRICMP
- # define DO_HAVE_STRERROR
- # undef  DO_BINARY
- # undef  DO_DOSIFY
--
+@@ -300,6 +300,25 @@
+ # define HAS_SNPRINTF		/* ? */
+ # define HAS_HARDLINKS
+ # undef  HAS_POSIX_REGEX	/* ? */
 +#endif
++
++#ifdef __NetBSD__
++# define HAS_FCNTL_LOCK
++# define HAS_GETTIMEOFDAY
++# define HAS_TM_GMTOFF
++# define HAS_SYSEXITS_H
++# define HAS_TM_ZONE
++# define HAS_STRFTIME
++# define HAS_TZNAME
++# define HAS_STRCASECMP
++# undef  HAS_STRICMP
++# define HAS_STRERROR
++# undef  DO_BINARY
++# undef  DO_DOSIFY
++# define HAS_SYSLOG
++# define HAS_SNPRINTF
++# define HAS_HARDLINKS
++# define HAS_POSIX_REGEX
+ #endif
  
- #ifdef __sun__				/* SUNOS 4.1.x, GNU gcc */
- # define DO_HAVE_FCNTL_LOCK
+ #ifdef ISC			/* ISC 3.x, GNU gcc, -DISC necessary */
diff --git a/comms/fidogate/patches/patch-ad b/comms/fidogate/patches/patch-ad
index ba1317bf142..5dc1fb9fa7b 100644
--- a/comms/fidogate/patches/patch-ad
+++ b/comms/fidogate/patches/patch-ad
@@ -1,11 +1,13 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 10:36:36 agc Exp $
+$NetBSD: patch-ad,v 1.4 2001/02/22 03:00:15 tv Exp $
 
---- subst.pl.orig	Sat Sep 28 04:13:51 1996
-+++ subst.pl	Thu Jul 16 18:35:06 1998
-@@ -41,5 +41,6 @@
- 	s/<$s>/$r/g;
+--- src/tick/ftntick.c.orig	Wed Feb 21 17:37:28 2001
++++ src/tick/ftntick.c	Wed Feb 21 17:38:48 2001
+@@ -528,7 +528,7 @@
+ 	if(tic->size != st.st_size)
+ 	{
+ 	    log("ERROR: wrong size for file %s: got %lu, expected %lu",
+-		name, st.st_size, tic->size                           );
++		name, (unsigned long)st.st_size, tic->size);
+ 	    return ERROR;
+ 	}
      }
- 
-+    s/\$\{PREFIX\}/$ENV{'PREFIX'}/g;
-     print;
- }
diff --git a/comms/fidogate/patches/patch-ae b/comms/fidogate/patches/patch-ae
index fee7823b3df..e88b36e6e50 100644
--- a/comms/fidogate/patches/patch-ae
+++ b/comms/fidogate/patches/patch-ae
@@ -1,23 +1,13 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:36 agc Exp $
+$NetBSD: patch-ae,v 1.3 2001/02/22 03:00:15 tv Exp $
 
---- src/ffx/Makefile.orig	Thu Jul 16 10:48:36 1998
-+++ src/ffx/Makefile	Thu Jul 16 10:52:46 1998
-@@ -27,12 +27,12 @@
+--- Makefile.orig	Wed Feb 21 18:28:38 2001
++++ Makefile	Wed Feb 21 18:30:25 2001
+@@ -9,7 +9,7 @@
+ include $(TOPDIR)/config.make
+ include $(TOPDIR)/rules.make
  
+-SUBDIRS		= src scripts test doc sendmail
++SUBDIRS		= src scripts test doc
  
- install:
--	$(INSTALL_SETUID) ffx$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ffxqt$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ffxbatch$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ffxmail $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ffxrmail $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ffxrun $(PREFIX)$(LIBDIR)
-+	$(INSTALL_SETUID) ffx$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ffxqt$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ffxbatch$(EXE) $(LIBDIR)
-+	$(INSTALL_SCRIPT) ffxmail $(LIBDIR)
-+	$(INSTALL_SCRIPT) ffxrmail $(LIBDIR)
-+	$(INSTALL_SCRIPT) ffxrun $(LIBDIR)
- 
- 
- clean veryclean:
+ INSTALLDIRS	= $(DEFAULT_V_CONFIGDIR) \
+ 		  $(DEFAULT_V_LIBDIR) \
diff --git a/comms/fidogate/patches/patch-af b/comms/fidogate/patches/patch-af
index c0007e978bd..0d45f36a4d0 100644
--- a/comms/fidogate/patches/patch-af
+++ b/comms/fidogate/patches/patch-af
@@ -1,21 +1,13 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:36:37 agc Exp $
+$NetBSD: patch-af,v 1.3 2001/02/22 03:00:15 tv Exp $
 
---- src/gate/Makefile.orig	Thu Jul 16 10:49:22 1998
-+++ src/gate/Makefile	Thu Jul 16 10:53:10 1998
-@@ -27,11 +27,11 @@
+--- scripts/Makefile.orig	Wed Feb 21 20:20:36 2001
++++ scripts/Makefile	Wed Feb 21 20:20:43 2001
+@@ -16,7 +16,7 @@
+ include $(TOPDIR)/rules.make
  
  
- install:
--	$(INSTALL_SETUID) rfc2ftn$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftn2rfc$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnin$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftninpost $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftninrecomb $(PREFIX)$(LIBDIR)
-+	$(INSTALL_SETUID) rfc2ftn$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftn2rfc$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnin$(EXE) $(LIBDIR)
-+	$(INSTALL_SCRIPT) ftninpost $(LIBDIR)
-+	$(INSTALL_SCRIPT) ftninrecomb $(LIBDIR)
+-SUBDIRS		= filebase maintenance misc nodelist outbound run www
++SUBDIRS		= filebase maintenance misc nodelist outbound run
  
  
- clean veryclean:
+ all clean veryclean depend install::
diff --git a/comms/fidogate/patches/patch-ag b/comms/fidogate/patches/patch-ag
index c5fc2b41475..32a216a01c2 100644
--- a/comms/fidogate/patches/patch-ag
+++ b/comms/fidogate/patches/patch-ag
@@ -1,15 +1,16 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 10:36:37 agc Exp $
+$NetBSD: patch-ag,v 1.3 2001/02/22 03:00:15 tv Exp $
 
---- src/tick/Makefile.orig	Thu Jul 16 10:49:56 1998
-+++ src/tick/Makefile	Thu Jul 16 10:50:07 1998
-@@ -26,8 +26,8 @@
+--- doc/fidogate.texi.orig	Wed Feb 21 20:54:05 2001
++++ doc/fidogate.texi	Wed Feb 21 20:54:53 2001
+@@ -15,6 +15,11 @@
  
  
- install:
--	$(INSTALL_PROG) ftntick$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnhatch$(EXE) $(PREFIX)$(LIBDIR)
-+	$(INSTALL_PROG) ftntick$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnhatch$(EXE) $(LIBDIR)
+ @ifinfo
++@dircategory Miscellaneous
++@direntry
++* Fidogate: (fidogate).         FidoNet-Internet mail gateway system.
++@end direntry
++
+ This file documents the installation and usage of FIDOGATE version 4.4
  
- 
- clean veryclean:
+ Copyright (C) 1994-2000, Martin Junius
diff --git a/comms/fidogate/patches/patch-ah b/comms/fidogate/patches/patch-ah
index 32634458ad6..bc9a8c228c0 100644
--- a/comms/fidogate/patches/patch-ah
+++ b/comms/fidogate/patches/patch-ah
@@ -1,37 +1,18 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 10:36:37 agc Exp $
+$NetBSD: patch-ah,v 1.3 2001/02/22 03:00:15 tv Exp $
 
---- src/toss/Makefile.orig	Thu Jul 16 10:50:11 1998
-+++ src/toss/Makefile	Thu Jul 16 10:54:04 1998
-@@ -42,19 +42,19 @@
- 
- 
- install:
--	$(INSTALL_PROG) ftn2ftn$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftntoss$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnexpire$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnroute$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnpack$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) runtoss $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) rununpack $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) magic $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) runin $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) runout $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) rundf $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnaf$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_SETUID) ftnafmail$(EXE) $(PREFIX)$(LIBDIR)
-+	$(INSTALL_PROG) ftn2ftn$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftntoss$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnexpire$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnroute$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnpack$(EXE) $(LIBDIR)
-+	$(INSTALL_SCRIPT) runtoss $(LIBDIR)
-+	$(INSTALL_SCRIPT) rununpack $(LIBDIR)
-+	$(INSTALL_SCRIPT) magic $(LIBDIR)
-+	$(INSTALL_SCRIPT) runin $(LIBDIR)
-+	$(INSTALL_SCRIPT) runout $(LIBDIR)
-+	$(INSTALL_SCRIPT) rundf $(LIBDIR)
-+	$(INSTALL_PROG) ftnaf$(EXE) $(LIBDIR)
-+	$(INSTALL_SETUID) ftnafmail$(EXE) $(LIBDIR)
- 
- 
+--- examples/README.orig	Wed Feb 21 20:47:37 2001
++++ examples/README	Wed Feb 21 20:47:51 2001
+@@ -13,13 +13,4 @@
+ orodruin/	orodruin.fido.de, 2:2452/110.2, 242:1000/5
+ 		point configuration
  
+-win32/		Configuration examples for GNU-WIN32 environment.
+-
+ point/		examples for "standard" Fido point configuration.
+-
+-node/		examples for "standard" Fido node configuration.
+-
+-rpm/		example config files for creating binary rpm.
+-
+-
+-See also the sendmail configuration files in ../sendmail/cf/.
diff --git a/comms/fidogate/patches/patch-ai b/comms/fidogate/patches/patch-ai
deleted file mode 100644
index 82049110dc9..00000000000
--- a/comms/fidogate/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 10:36:37 agc Exp $
-
---- src/util/Makefile.orig	Thu Jul 16 10:51:19 1998
-+++ src/util/Makefile	Thu Jul 16 10:57:59 1998
-@@ -34,16 +34,16 @@
- 
- 
- install:
--	$(INSTALL_PROG) ftnbsy$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnconfig$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnseq$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnfattach$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnflo$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) sumcrc$(EXE) $(PREFIX)$(BINDIR)
--	$(INSTALL_PROG) ftnlock$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) ftnlog$(EXE) $(PREFIX)$(LIBDIR)
--	$(INSTALL_PROG) pktdebug$(EXE) $(PREFIX)$(BINDIR)
--	$(INSTALL_PROG) pktmore $(PREFIX)$(BINDIR)
-+	$(INSTALL_PROG) ftnbsy$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnconfig$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnseq$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnfattach$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnflo$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) sumcrc$(EXE) $(BINDIR)
-+	$(INSTALL_PROG) ftnlock$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) ftnlog$(EXE) $(LIBDIR)
-+	$(INSTALL_PROG) pktdebug$(EXE) $(BINDIR)
-+	$(INSTALL_SCRIPT) pktmore $(BINDIR)
- 
- 
- clean veryclean:
diff --git a/comms/fidogate/patches/patch-aj b/comms/fidogate/patches/patch-aj
deleted file mode 100644
index bd6984b3224..00000000000
--- a/comms/fidogate/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2000/08/28 09:36:32 wiz Exp $
-
---- doc/Makefile.orig	Sat Oct 11 23:24:15 1997
-+++ doc/Makefile
-@@ -14,7 +14,7 @@
- 
- all::		fidogate.info fidogate.txt
- 
--all clean veryclean check depend install::
-+all clean veryclean check depend::
- 	for d in $(SUBDIRS); do \
- 	  if [ -f $$d/Makefile ]; then $(MAKE) -C $$d $@ || exit 1; fi; \
- 	done
-@@ -47,6 +47,6 @@
- check::
- 
- install::
--	$(INSTALL_DATA) fidogate.info* $(PREFIX)$(INFODIR)
-+	$(INSTALL_DATA) fidogate.info fidogate.info-? $(INFODIR)
- 
- depend::
diff --git a/comms/fidogate/patches/patch-ak b/comms/fidogate/patches/patch-ak
deleted file mode 100644
index 0891263f75e..00000000000
--- a/comms/fidogate/patches/patch-ak
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 10:36:38 agc Exp $
-
---- Makefile.orig	Thu Jul 16 11:08:29 1998
-+++ Makefile	Thu Jul 16 11:09:38 1998
-@@ -11,7 +11,7 @@
- 
- SUBDIRS		= src scripts test doc sendmail
- 
--INSTALLDIRS	= $(LIBDIR) \
-+INSTALLDIRS	= \
- 		  $(SPOOLDIR) $(SPOOLDIR)/in \
- 		  $(SPOOLDIR)/in/tmpmail $(SPOOLDIR)/in/tmpnews \
- 		  $(SPOOLDIR)/in/bad $(SPOOLDIR)/insecure \
-@@ -21,8 +21,7 @@
- 		  $(SPOOLDIR)/toss $(SPOOLDIR)/toss/in \
- 		  $(SPOOLDIR)/toss/bad $(SPOOLDIR)/toss/tmp \
- 		  $(SPOOLDIR)/toss/out $(SPOOLDIR)/toss/pack $(LOGDIR) \
--		  $(OUTBOUND) $(INBOUND) $(PINBOUND) $(UUINBOUND) \
--		  $(BINDIR) $(INFODIR)
-+		  $(OUTBOUND) $(INBOUND) $(PINBOUND) $(UUINBOUND)
- 
- 
- 
-@@ -34,10 +33,7 @@
- clean veryclean::
- 	rm -f *~ *.bak *.o tags TAGS core
- 
--install-dirs:
-+install::
- 	for d in $(INSTALLDIRS); do if [ ! -d $$d ]; then \
--	    echo "Creating $$d ..."; $(INSTALL_DIR) $(PREFIX)$$d; \
-+	    echo "Creating $$d ..."; $(INSTALL_DIR) $$d; \
- 	fi; done
--
--install::
--	cp ANNOUNCE $(PREFIX)$(HTMLDIR)
diff --git a/comms/fidogate/patches/patch-al b/comms/fidogate/patches/patch-al
deleted file mode 100644
index ea970128f16..00000000000
--- a/comms/fidogate/patches/patch-al
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-al,v 1.2 1998/08/07 10:36:38 agc Exp $
-
---- src/toss/rununpack.sh.orig	Thu Jul 16 18:36:08 1998
-+++ src/toss/rununpack.sh	Thu Jul 16 18:38:09 1998
-@@ -17,7 +17,7 @@
- #  0	short		0x60ea		ARJ Archive
- #
- 
--# Programs are searched in: /bin, /usr/bin, /usr/local/bin
-+# Programs are searched in: /bin, /usr/bin, ${PREFIX}/bin
- 
- PRG=<LIBDIR>
- SPOOL=`$PRG/ftnconfig =spooldir`
-@@ -109,45 +109,45 @@
- 	ARJ | Arj | arj)
- 		[ -x /bin/unarj           ] && cmd=/bin/unarj
- 		[ -x /usr/bin/unarj       ] && cmd=/usr/bin/unarj
--		[ -x /usr/local/bin/unarj ] && cmd=/usr/local/bin/unarj
-+		[ -x ${PREFIX}/bin/unarj ] && cmd=${PREFIX}/bin/unarj
- 		xcmd="$cmd e $arc"
- 		lcmd="$cmd l $arc"
- 		;;
- 	ARC | Arc | arc)
- 		[ -x /bin/arc             ] && cmd=/bin/arc
- 		[ -x /usr/bin/arc         ] && cmd=/usr/bin/arc
--		[ -x /usr/local/bin/arc   ] && cmd=/usr/local/bin/arc
-+		[ -x ${PREFIX}/bin/arc   ] && cmd=${PREFIX}/bin/arc
- 		xcmd="$cmd e $arc"
- 		lcmd="$cmd l $arc"
- 		;;
- 	ZIP | Zip | zip)
- 		[ -x /bin/unzip           ] && cmd=/bin/unzip
- 		[ -x /usr/bin/unzip       ] && cmd=/usr/bin/unzip
--		[ -x /usr/local/bin/unzip ] && cmd=/usr/local/bin/unzip
-+		[ -x ${PREFIX}/bin/unzip ] && cmd=${PREFIX}/bin/unzip
- 		xcmd="$cmd -ojL $arc"
- 		lcmd="$cmd -l   $arc"
-                 ;;
-         RAR | Rar | rar)
-                 [ -x /bin/rar             ] && cmd=/bin/rar
-                 [ -x /usr/bin/rar         ] && cmd=/usr/bin/rar
--                [ -x /usr/local/bin/rar   ] && cmd=/usr/local/bin/rar
-+                [ -x ${PREFIX}/bin/rar   ] && cmd=${PREFIX}/bin/rar
-                 xcmd="$cmd e $arc"
-                 lcmd="$cmd l $arc"
- 		;;
- 	LHA | LHa | Lha | lha)
- 		[ -x /bin/lharc           ] && cmd=/bin/lharc
- 		[ -x /usr/bin/lharc       ] && cmd=/usr/bin/lharc
--		[ -x /usr/local/bin/lharc ] && cmd=/usr/local/bin/lharc
-+		[ -x ${PREFIX}/bin/lharc ] && cmd=${PREFIX}/bin/lharc
- 		[ -x /bin/lha             ] && cmd=/bin/lha
- 		[ -x /usr/bin/lha         ] && cmd=/usr/bin/lha
--		[ -x /usr/local/bin/lha   ] && cmd=/usr/local/bin/lha
-+		[ -x ${PREFIX}/bin/lha   ] && cmd=${PREFIX}/bin/lha
- 		xcmd="$cmd ei $arc"
- 		lcmd="$cmd l  $arc"
- 		;;
- 	ZOO | Zoo | zoo)
- 		[ -x /bin/zoo             ] && cmd=/bin/zoo
- 		[ -x /usr/bin/zoo         ] && cmd=/usr/bin/zoo
--		[ -x /usr/local/bin/zoo   ] && cmd=/usr/local/bin/zoo
-+		[ -x ${PREFIX}/bin/zoo   ] && cmd=${PREFIX}/bin/zoo
- 		xcmd="$cmd e: $arc"
- 		lcmd="$cmd l  $arc"
- 		;;
diff --git a/comms/fidogate/patches/patch-am b/comms/fidogate/patches/patch-am
deleted file mode 100644
index 62c43812530..00000000000
--- a/comms/fidogate/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 10:36:38 agc Exp $
-
---- src/toss/rundf.sh.orig	Thu Jul 16 19:31:38 1998
-+++ src/toss/rundf.sh	Thu Jul 16 19:32:02 1998
-@@ -9,9 +9,9 @@
- # Usage: rundf dir ...
- #
- 
--PATH=<BINDIR>:$PATH
-+PATH=/usr/bin:/bin:$PATH
- 
--free=`df -P $* 2>/dev/null  | \
-+free=`df -k $* 2>/dev/null  | \
-       awk '/^\/dev/ || /^[a-zA-Z0-9-]*:\// { print $4; }'`
- 
- if [ -z "$free" ]; then
diff --git a/comms/fidogate/patches/patch-an b/comms/fidogate/patches/patch-an
deleted file mode 100644
index 98a836b20cd..00000000000
--- a/comms/fidogate/patches/patch-an
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-an,v 1.2 2000/08/28 09:36:32 wiz Exp $
-
---- doc/fidogate.info.orig	Mon Aug 14 15:40:07 2000
-+++ doc/fidogate.info	Mon Aug 14 15:49:54 2000
-@@ -1,6 +1,12 @@
- This is Info file fidogate.info, produced by Makeinfo version 1.67 from
- the input file fidogate.texi.
- 
-+INFO-DIR-SECTION Fido
-+START-INFO-DIR-ENTRY
-+* FIDOGATE: (fidogate).              Fido-Internet gateway and a Fido tosser.
-+END-INFO-DIR-ENTRY
-+
-+
-    This file documents the usage of FIDOGATE version 4
- 
-    Copyright (C) 1994-1996, Martin Junius
diff --git a/comms/fidogate/pkg/DEINSTALL b/comms/fidogate/pkg/DEINSTALL
deleted file mode 100644
index 9d21bff46f5..00000000000
--- a/comms/fidogate/pkg/DEINSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 1998/08/07 10:36:38 agc Exp $
-#
-
-case "$2" in
-	DEINSTALL) cat <<EOF
-
-==========================================================================
-
-Note that the FIDOGATE spool directory (/var/spool/fido) and log directory
-(/var/log/fido) are NOT deleted by the pkg_delete process.  Please remove
-these directories and all their contents manually, if they are no longer
-needed. 
-
-==========================================================================
-
-EOF
-	;;
-esac
diff --git a/comms/fidogate/pkg/PLIST b/comms/fidogate/pkg/PLIST
index b6c93606ea1..51e5df810d2 100644
--- a/comms/fidogate/pkg/PLIST
+++ b/comms/fidogate/pkg/PLIST
@@ -1,27 +1,64 @@
-@comment $NetBSD: PLIST,v 1.7 2001/01/31 17:57:31 wiz Exp $
-bin/pktdebug
-bin/pktmore
-bin/sumcrc
+@comment $NetBSD: PLIST,v 1.8 2001/02/22 03:00:17 tv Exp $
 etc/rc.d/fidogate
-@unexec install-info --delete %D/info/fidogate.info %D/info/dir
+@comment @unexec install-info --delete %D/info/fidogate.info %D/info/dir
 info/fidogate.info
-info/fidogate.info-1
-info/fidogate.info-2
-@exec install-info %D/info/fidogate.info %D/info/dir
+@comment @exec install-info %D/info/fidogate.info %D/info/dir
+lib/fidogate/areafix.help
+lib/fidogate/bin/areasbbssync
+lib/fidogate/bin/ftnafutil
+lib/fidogate/bin/ftnfattach
+lib/fidogate/bin/ftnoutpkt
+lib/fidogate/bin/ftntickpost
+lib/fidogate/bin/hosts2dns
+lib/fidogate/bin/latest
+lib/fidogate/bin/logcheck
+lib/fidogate/bin/logdaily
+lib/fidogate/bin/logreport
+lib/fidogate/bin/logsendmail
+lib/fidogate/bin/logstat
+lib/fidogate/bin/nl-autoupd
+lib/fidogate/bin/nl-check
+lib/fidogate/bin/nl-del
+lib/fidogate/bin/nl-diff
+lib/fidogate/bin/out-ls
+lib/fidogate/bin/out-manip
+lib/fidogate/bin/out-rm0
+lib/fidogate/bin/out-rmbsy
+lib/fidogate/bin/pktdebug
+lib/fidogate/bin/pktmore
+lib/fidogate/bin/recvuu
+lib/fidogate/bin/runchklock
+lib/fidogate/bin/runffx
+lib/fidogate/bin/rungate
+lib/fidogate/bin/runin
+lib/fidogate/bin/runmail
+lib/fidogate/bin/runnews
+lib/fidogate/bin/runout
+lib/fidogate/bin/runpoll
+lib/fidogate/bin/runpoll-binkd
+lib/fidogate/bin/runpoll-orodruin
+lib/fidogate/bin/runtoss
+lib/fidogate/bin/rununpack
+lib/fidogate/bin/send-ffx
+lib/fidogate/bin/send-fidogate
+lib/fidogate/bin/senduu
+lib/fidogate/bin/senduumail
+lib/fidogate/bin/sumcrc
+lib/fidogate/charset.bin
+lib/fidogate/charset.map
 lib/fidogate/ffx
-lib/fidogate/ffxbatch
 lib/fidogate/ffxmail
+lib/fidogate/ffxnews
 lib/fidogate/ffxqt
 lib/fidogate/ffxrmail
-lib/fidogate/ffxrun
 lib/fidogate/ftn2ftn
 lib/fidogate/ftn2rfc
 lib/fidogate/ftnaf
 lib/fidogate/ftnafmail
+lib/fidogate/ftnafpkt
 lib/fidogate/ftnbsy
 lib/fidogate/ftnconfig
 lib/fidogate/ftnexpire
-lib/fidogate/ftnfattach
 lib/fidogate/ftnflo
 lib/fidogate/ftnhatch
 lib/fidogate/ftnin
@@ -29,52 +66,68 @@ lib/fidogate/ftninpost
 lib/fidogate/ftninrecomb
 lib/fidogate/ftnlock
 lib/fidogate/ftnlog
+lib/fidogate/ftnmail
 lib/fidogate/ftnpack
 lib/fidogate/ftnroute
 lib/fidogate/ftnseq
 lib/fidogate/ftntick
 lib/fidogate/ftntoss
-lib/fidogate/magic
 lib/fidogate/rfc2ftn
-lib/fidogate/rundf
-lib/fidogate/runin
-lib/fidogate/runout
-lib/fidogate/runtoss
-lib/fidogate/rununpack
-lib/libfidogate.la
-lib/libfidogate.so
-lib/libfidogate.so.0
-lib/libfidogate.so.0.0
-share/fidogate/inn/send-ffx
-share/fidogate/inn/send-fidogate
-share/fidogate/inn/viaffx
-share/fidogate/nodelist/latest
-share/fidogate/nodelist/nl-2hosts
-share/fidogate/nodelist/nl-2routing
-share/fidogate/nodelist/nl-autoupd
-share/fidogate/nodelist/nl-check
-share/fidogate/nodelist/nl-del
-share/fidogate/nodelist/nl-diff
-share/fidogate/nodelist/nl-html
-share/fidogate/nodelist/nl-isdn
-share/fidogate/nodelist/nl-print
-share/fidogate/nodelist/template.html
-share/fidogate/scripts/out-freq
-share/fidogate/scripts/out-ls
-share/fidogate/scripts/out-manip
-share/fidogate/scripts/out-rm0
-share/fidogate/scripts/out-rmbsy
-share/fidogate/scripts/run1
-share/fidogate/scripts/run2
-share/fidogate/scripts/runffx
-share/fidogate/scripts/runpoll
-share/fidogate/sendmail/ffx.m4
-share/fidogate/sendmail/ftn.m4
+@dirrm lib/fidogate/bin
 @dirrm lib/fidogate
-@dirrm share/fidogate/inn
-@dirrm share/fidogate/nodelist
-@dirrm share/fidogate/scripts
+share/doc/fidogate/ANNOUNCE
+share/doc/fidogate/fidogate_1.html
+share/doc/fidogate/fidogate_2.html
+share/doc/fidogate/fidogate_3.html
+share/doc/fidogate/fidogate_4.html
+share/doc/fidogate/fidogate_5.html
+share/doc/fidogate/fidogate_6.html
+share/doc/fidogate/fidogate_7.html
+share/doc/fidogate/fidogate_toc.html
+share/doc/fidogate/fidogate.txt
+share/doc/fidogate/msgid-1.html
+share/doc/fidogate/msgid-2.html
+share/doc/fidogate/msgid-3.html
+share/doc/fidogate/msgid-4.html
+share/doc/fidogate/msgid-5.html
+share/doc/fidogate/msgid-6.html
+share/doc/fidogate/msgid-7.html
+share/doc/fidogate/msgid.html
+@dirrm share/doc/fidogate
+share/examples/fidogate/morannon/aliases
+share/examples/fidogate/morannon/areas
+share/examples/fidogate/morannon/bounce.down
+share/examples/fidogate/morannon/bounce.insecure
+share/examples/fidogate/morannon/bounce.noto
+share/examples/fidogate/morannon/bounce.restricted
+share/examples/fidogate/morannon/fidogate.conf
+share/examples/fidogate/morannon/hosts
+share/examples/fidogate/morannon/packing
+share/examples/fidogate/morannon/passwd
+share/examples/fidogate/morannon/routing
+share/examples/fidogate/orodruin/README
+share/examples/fidogate/orodruin/aliases
+share/examples/fidogate/orodruin/areas
+share/examples/fidogate/orodruin/areas.bbs
+share/examples/fidogate/orodruin/fareas.bbs
+share/examples/fidogate/orodruin/fidogate.conf
+share/examples/fidogate/orodruin/hosts
+share/examples/fidogate/orodruin/packing
+share/examples/fidogate/orodruin/passwd
+share/examples/fidogate/orodruin/routing
+share/examples/fidogate/point/areas
+share/examples/fidogate/point/areas.bbs
+share/examples/fidogate/point/fidogate.conf
+share/examples/fidogate/point/newsfeeds
+share/examples/fidogate/point/packing
+share/examples/fidogate/point/routing
+share/examples/fidogate/README
+@dirrm share/examples/fidogate/morannon
+@dirrm share/examples/fidogate/orodruin
+@dirrm share/examples/fidogate/point
+@dirrm share/examples/fidogate
+share/fidogate/sendmail/mailer/ffx.m4
+share/fidogate/sendmail/mailer/ftn.m4
+@dirrm share/fidogate/sendmail/mailer
 @dirrm share/fidogate/sendmail
 @dirrm share/fidogate
-@exec install -d -m 755 -o news -g news /var/log/fido /var/spool/fido
-@exec for dir in in in/tmpmail in/tmpnews in/bad insecure out outpkt outpkt/mail locks seq toss toss/in toss/bad toss/tmp toss/out toss/pack bt bt/in bt/uuin bt/pin; do install -d -m 755 -o news -g news /var/spool/fido/$dir; done