Stuff hanging around in my pkgsrc....

Major cleanup.  Minor update to "alpha4.1" -- no feature changes.
Remove iftelnetd, fdpass (not needed).  Fix -Wformat alerted fixes to
work on both LP64 and ILP32.  Use -Werror to keep code clean.

14 files changed, 219 insertions, 280 deletions

diff --git a/comms/ifcico-cm/Makefile b/comms/ifcico-cm/Makefile
index 175cda0c17c..d43be18f52b 100644
--- a/comms/ifcico-cm/Makefile
+++ b/comms/ifcico-cm/Makefile
@@ -1,29 +1,23 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 13:56:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/21 18:50:36 tv Exp $
 #
 
-DISTNAME=	ifcico-3.0.cm.alpha-4.0
-PKGNAME=	ifcico-cm-3.0.4.0.1
+DISTNAME=	ifcico-3.0.cm.alpha-4.1
+PKGNAME=	ifcico-cm-3.0a4.1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.cosy.sbg.ac.at/~cmeer/files/
 
-MAINTAINER=	tv@netbsd.org	# aka "Todd Vierling" @ 1:396/1.5
+MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.cosy.sbg.ac.at/~cmeer/ifcico/
 COMMENT=	FidoNet transport program using FTS protocols via dial or TCP
 
 post-build:
-	cd ${WRKSRC}/contrib/iftelnetd && ${MAKE} iftelnetd
-	cd ${WRKSRC}/contrib/fdpass && ${LINK.c} -o fdpass fdpass.c
+	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config >${WRKDIR}/config.dist
+	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config-global \
+		>${WRKDIR}/config-global.dist
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/ifmail ${PREFIX}/etc/ifmail/inouttabs
-	${INSTALL_DATA} ${WRKSRC}/misc/config ${PREFIX}/etc/ifmail/config.dist
-	${INSTALL_DATA} ${WRKSRC}/misc/config-global ${PREFIX}/etc/ifmail/
-	cd ${WRKSRC}/misc/inouttabs && ${INSTALL_DATA} fidom2iso ibmpc-latin1 \
-		iso2fidom latin1-ibmpc outaltkoi8 outkoi8alt \
-		${PREFIX}/etc/ifmail/inouttabs/
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/iftelnetd/iftelnetd ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/fdpass/fdpass ${PREFIX}/sbin/
-	cd ${WRKSRC}/ifcico && ${INSTALL_MAN} ifcico.8 ifindex.8 ifinfo.8 \
-		ifreq.8 ifroute.8 ifstat.8 nlpatch.8 ${PREFIX}/man/man8/
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/ifcico
+	${INSTALL_DATA} ${WRKDIR}/config* ${PREFIX}/etc/ifcico/
+	cd ${WRKSRC}/ifcico && ${INSTALL_MAN} *.8 ${PREFIX}/man/man8/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/ifcico-cm/files/md5 b/comms/ifcico-cm/files/md5
index 63e8fff0e8c..17a34f9832e 100644
--- a/comms/ifcico-cm/files/md5
+++ b/comms/ifcico-cm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/11/23 17:48:22 tv Exp $
+$NetBSD: md5,v 1.2 2001/02/21 18:50:37 tv Exp $
 
-MD5 (ifcico-3.0.cm.alpha-4.0.tar.gz) = 4bfd0d0b69ebac98f49d2b00de252318
+MD5 (ifcico-3.0.cm.alpha-4.1.tar.gz) = d6b27568640fb202bcddc37c668c396c
diff --git a/comms/ifcico-cm/files/patch-sum b/comms/ifcico-cm/files/patch-sum
index de239d1b68f..500c1742403 100644
--- a/comms/ifcico-cm/files/patch-sum
+++ b/comms/ifcico-cm/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:23 agc Exp $
+$NetBSD: patch-sum,v 1.2 2001/02/21 18:50:37 tv Exp $
 
-MD5 (patch-aa) = c7237625b43a32b516d5141536d91d5e
+MD5 (patch-aa) = c26244e76833f89fdc34bb5f4f7bf846
 MD5 (patch-ab) = 93eabfe5c116ab445f5178181eeb124b
 MD5 (patch-ac) = de1d9d3a5e18a36b929462a86a545b77
 MD5 (patch-ad) = 6d138796513a0f5f7a1c1c2e84f32675
@@ -9,14 +9,17 @@ MD5 (patch-af) = 02cdf6ee2ab417cfeae4c508285c5cd7
 MD5 (patch-ag) = 8486e1dc02bc9ea09d6e29207f4ab943
 MD5 (patch-ah) = 0448c674ed9997e15003c5efb5de7f55
 MD5 (patch-ai) = 6b69baa96f4b35c0f117a9be6bb476b5
-MD5 (patch-aj) = 0cae8cb86ef574255888cf56383ac108
+MD5 (patch-aj) = a1afb30a4b85d501370f802ade5da54b
 MD5 (patch-ak) = d68402c77c7c585f31f09700f698f95d
 MD5 (patch-al) = c6430caf128dcb1a8100794426e1e411
-MD5 (patch-am) = d3f4e9ffc09c390b86ceb196e97e9821
+MD5 (patch-am) = eca318296bf54b951369771ac6704d16
 MD5 (patch-an) = f84af712346e1757a0bacc4f22af8f38
-MD5 (patch-ao) = d3cacd30d5f91030567ef2cc722bb391
-MD5 (patch-ap) = 170c3c4cc17a069dd9ad03484ee3b55a
+MD5 (patch-ao) = 683692582d07caff106ef105ce4b9aa2
+MD5 (patch-ap) = d8f86bf2f9692a144ab929396805bfe4
 MD5 (patch-aq) = 1f2d906d0b1edfb4d8b49bb6f73e6b67
-MD5 (patch-ar) = bfdab986ff89b445c59c5694a98f7da2
-MD5 (patch-as) = 31ce1a9f2feda8238c613dbee20a7803
+MD5 (patch-ar) = 7ccd1ff833205ffb7a39d4cd45b6e7de
+MD5 (patch-as) = 70aee65ccb8430f053338c0af263474f
 MD5 (patch-at) = aaa9004a37e310e47b2c480353c51ea1
+MD5 (patch-au) = fe93664c434a6fc2a3178d1ffb3febfa
+MD5 (patch-av) = 5ae3d1f246d5f6433172b60f0123446e
+MD5 (patch-aw) = 04b1f38567350721020a281a158c4dfb
diff --git a/comms/ifcico-cm/patches/patch-aa b/comms/ifcico-cm/patches/patch-aa
index 2f813d23b77..c501f9a31ee 100644
--- a/comms/ifcico-cm/patches/patch-aa
+++ b/comms/ifcico-cm/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 1998/12/21 15:45:21 tv Exp $
+$NetBSD: patch-aa,v 1.3 2001/02/21 18:50:37 tv Exp $
 
---- CONFIG.orig	Fri Jul 10 17:06:34 1998
-+++ CONFIG	Mon Nov 23 09:57:21 1998
+--- CONFIG.orig	Sun Mar  7 15:51:36 1999
++++ CONFIG	Wed Feb 21 10:48:51 2001
 @@ -3,10 +3,10 @@
- VERSION     = "3.0.cm.alpha-4.0"
+ VERSION     = "3.0.cm.alpha-4.1"
  
  # Where to put binaries
 -BINDIR = "/usr/lib/ifmail"
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 1998/12/21 15:45:21 tv Exp $
  
  # Main configuration file. This default may be overwritten by -I key.
 -CONFIGFILE  = "/etc/ifmail/config"
-+CONFIGFILE  = "${PREFIX}/etc/ifmail/config"
++CONFIGFILE  = ${PREFIX}/etc/ifcico/config
  
  # Debug messages turned on by -x key are written here.
  # Some error messages may occationally appear here too.
@@ -24,66 +24,58 @@ $NetBSD: patch-aa,v 1.2 1998/12/21 15:45:21 tv Exp $
  #LOCKDIR     = "/var/spool/uucp"
  
  # Directory from which file requests are resolved.
-@@ -175,11 +175,11 @@
- #		-DHAS_SELECT -DREGEX_NEED_CARET -DPRE_21_LINUX
+@@ -180,11 +180,6 @@
+ #		-DHAS_SELECT -DREGEX_NEED_CARET -DPRE_21_KERNEL
  
  # Linux: (glibc 2 aka libc 6.x)
 -SOPTS        = -DHAS_STATFS -DSTATFS_IN_VFS_H -DHAS_SETSID -DHAS_NDBM_H \
 -		-DDONT_HAVE_TM_GMTOFF -DHAS_TERMIOS_H -DASCII_LOCKFILES \
 -		-DHAS_FSYNC -DHAS_IOCTL_H -DHAS_REGEX_H -DHAS_TCP \
 -		-DHAS_SYSLOG -DNEED_UUCPFROM -DNEED_TRAP -DSETPROCTITLE \
--		-DHAS_SELECT -DREGEX_NEED_CARET -DPRE_21_LINUX -DBSD_SIGNALS
-+#SOPTS        = -DHAS_STATFS -DSTATFS_IN_VFS_H -DHAS_SETSID -DHAS_NDBM_H \
-+#		-DDONT_HAVE_TM_GMTOFF -DHAS_TERMIOS_H -DASCII_LOCKFILES \
-+#		-DHAS_FSYNC -DHAS_IOCTL_H -DHAS_REGEX_H -DHAS_TCP \
-+#		-DHAS_SYSLOG -DNEED_UUCPFROM -DNEED_TRAP -DSETPROCTITLE \
-+#		-DHAS_SELECT -DREGEX_NEED_CARET -DPRE_21_LINUX -DBSD_SIGNALS
+-		-DHAS_SELECT -DREGEX_NEED_CARET -DBSD_SIGNALS
  
- # 386BSD:
- #SOPTS        = -DHAS_STATFS -DSTATFS_IN_MOUNT_H -DHAS_SETSID -DHAS_NDBM_H \
-@@ -188,6 +188,13 @@
+ # Linux: (bleeding edge options)
+ #SOPTS        = -DHAS_STATFS -DSTATFS_IN_VFS_H -DHAS_SETSID \
+@@ -201,6 +196,13 @@
  #		-DNEGATIVE_SEEK_BUG -DSETPROCTITLE -DBSD_SIGNALS \
  #		-DHAS_SELECT -DREGEX_NEED_CARET -DHAS_SYS_ERRLIST
  
 +# NetBSD:
-+SOPTS         = -DHAS_NDBM_H -DHAS_STATFS -DSTATFS_IN_MOUNT_H -DHAS_SETSID \
-+		-DHAS_TERMIOS_H -DASCII_LOCKFILES -DHAS_FSYNC \
-+		-DHAS_IOCTL_H -DHAS_TCP -DHAS_REGEX_H -DHAS_SYSLOG -DNEWDB \
-+		-DSETPROCTITLE -DBSD_SIGNALS -DHAS_SELECT \
-+		-DNEGATIVE_SEEK_BUG -DREGEX_NEED_CARET -DHAS_SYS_ERRLIST
++SOPTS        = -DHAS_STATFS -DSTATFS_IN_MOUNT_H -DHAS_SETSID -DHAS_NDBM_H \
++		-DHAS_TERMIOS_H -DASCII_LOCKFILES -DHAS_FSYNC -DHAS_IOCTL_H \
++		-DHAS_TCP -DHAS_SYSLOG -DNEED_UUCPFROM -DNEWDB \
++		-DNEGATIVE_SEEK_BUG -DSETPROCTITLE -DBSD_SIGNALS \
++		-DHAS_SELECT -DREGEX_NEED_CARET -DHAS_SYS_ERRLIST
 +
  # SVR4:
  #SOPTS        = -DHAS_STATVFS -DDONT_HAVE_TM_GMTOFF -DHAS_SETSID -DHAS_NDBM_H \
  #		-DHAS_TERMIOS_H -DHAS_DIAL -DHAS_DIAL_H -DASCII_LOCKFILES \
-@@ -253,8 +260,8 @@
+@@ -265,9 +267,7 @@
+ #RANLIB = touch
  SHELL = /bin/sh
  ECHO = echo -e
--CC = gcc -pipe
+-CC = cc -pipe
 -#YACC = yacc
 -YACC = bison -y
-+#CC = gcc -pipe
 +YACC = yacc
-+#YACC = bison -y
  #LEX = lex
  LEX = flex
  AWK = awk
-@@ -262,7 +269,7 @@
+@@ -275,7 +275,7 @@
  
  #CFLAGS = -g -Wall
  # Linux, 386BSD, SunOS:
--CFLAGS = -D_GNU_SOURCE -O2 -fomit-frame-pointer -Wall
-+CFLAGS += -D_GNU_SOURCE
+-CFLAGS = -D_GNU_SOURCE -O2 -Wall
++CFLAGS += -D_GNU_SOURCE -Wall -Werror -Wno-unused
  # SVR4:
  #CFLAGS = -O -Xa
  
-@@ -272,12 +279,12 @@
+@@ -285,12 +285,10 @@
  # If you need TERM also add e.g. "/usr/src/term112/client.a"
  
  # Linux
 -LIBS = -lgdbm
 -LIBRESOLV = -lresolv		# this is needed for glibc 2
-+#LIBS = -lgdbm
-+#LIBRESOLV = -lresolv		# this is needed for glibc 2
  # SunOS:
  #LIBS =
  # 386BSD:
diff --git a/comms/ifcico-cm/patches/patch-aj b/comms/ifcico-cm/patches/patch-aj
index 6451e7a8782..03de87b2b28 100644
--- a/comms/ifcico-cm/patches/patch-aj
+++ b/comms/ifcico-cm/patches/patch-aj
@@ -1,178 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
+$NetBSD: patch-aj,v 1.2 2001/02/21 18:50:37 tv Exp $
 
---- contrib/iftelnetd/iftelnetd.c.orig	Mon Nov 23 10:10:14 1998
-+++ contrib/iftelnetd/iftelnetd.c	Mon Nov 23 10:14:01 1998
-@@ -32,10 +32,10 @@
- #include <stdio.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <syslog.h>
- #include <string.h>
--#include <getopt.h>
-+#include <stdlib.h>
+--- ifcico/mxlookup.c.orig	Wed Feb 21 10:56:21 2001
++++ ifcico/mxlookup.c	Wed Feb 21 11:00:09 2001
+@@ -226,7 +226,7 @@
+ 	char *cp, *name;
+ 	querybuf   *msg;
+ {
+-	int n = dn_expand (msg, msg + 512, cp, name, MAXDNAME - 2);
++	int n = dn_expand ((char *)msg, ((char *)msg) + 512, cp, name, MAXDNAME - 2);
  
- #include <sys/socket.h>
- #include <sys/types.h>
-@@ -87,8 +87,6 @@
-     char *log_file=nil;
-     char *tmp=nil;
+ 	if (n < 0)	return NULL;
  
--    syslog(LOG_INFO,"iftelnetd: Starting...");
--
-     debug=0;
-     
-     while ((c = getopt(ac,av,"dl:h:p:")) != EOF)
-@@ -111,10 +109,9 @@
- 
- 	default:
- 	    ;
--		syslog(LOG_ERR,"iftelnetd: Wrong number of args!");
--		syslog(LOG_ERR,"iftelnetd: Usage:");
--		syslog(LOG_ERR,"iftelnetd: iftelnetd [-h remote_addr] [-p remote_port] [-l logfile] [-d]");
--		syslog(LOG_ERR,"iftelnetd: Aborting.");
-+		syslog(LOG_ERR,"Wrong number of args!");
-+		syslog(LOG_ERR,"Usage: iftelnetd [-h remote_addr] [-p remote_port] [-l logfile] [-d]");
-+		syslog(LOG_ERR,"Aborting.");
- 		if(log_file)    free(log_file);
- 		if(remote_name) free(remote_name);
- 		if(remote_port) free(remote_port);
-@@ -124,23 +121,23 @@
-     
-     if(!remote_name)
-     {
--	syslog(LOG_WARNING,"iftelnetd: Remote addr not set. Assuming 'localhost'");
-+	syslog(LOG_WARNING,"Remote addr not set. Assuming 'localhost'");
- 	remote_name=strdup("localhost");
-     }
-     
-     if(!remote_port)
-     {
--	syslog(LOG_WARNING,"iftelnetd: Remote port not set. Assuming 'fido'");
-+	syslog(LOG_WARNING,"Remote port not set. Assuming 'fido'");
- 	remote_port=strdup("fido");
-     }
- 
-     if(getpeername(0,(struct sockaddr*)&peeraddr,&addrlen) == 0)
-     {
- 	tmp=strdup(inet_ntoa(peeraddr.sin_addr));
--	syslog(LOG_INFO,"iftelnetd: incoming TCP connection from %s",
-+	syslog(LOG_INFO,"incoming TCP connection from %s",
- 	       tmp ? tmp : "Unknown"
- 	);
--	syslog(LOG_INFO,"iftelnetd: Rerouting to %s:%s",
-+	syslog(LOG_INFO,"Rerouting to %s:%s",
- 	       remote_name,
- 	       remote_port);
-     }
-@@ -163,8 +160,8 @@
-     
-     if((sp=getservbyname(remote_port,"tcp"))==NULL) 
-     {
--	syslog(LOG_ERR,"iftelnetd: Can't find service: %s",remote_port);
--	syslog(LOG_ERR,"iftelnetd: Aborting.");
-+	syslog(LOG_ERR,"Can't find service: %s",remote_port);
-+	syslog(LOG_ERR,"Aborting.");
- 	free(remote_name);
- 	free(remote_port);
- 	return 1;
-@@ -172,8 +169,8 @@
- 
-     if((s=socket(AF_INET,SOCK_STREAM,0))==-1)
-     {
--	syslog(LOG_ERR,"iftelnetd: Can't create Internet domain socket");
--	syslog(LOG_ERR,"iftelnetd: Aborting.");
-+	syslog(LOG_ERR,"Can't create Internet domain socket");
-+	syslog(LOG_ERR,"Aborting.");
- 	free(remote_name);
- 	free(remote_port);
- 	return  1;
-@@ -181,8 +178,8 @@
- 
-     if((hp=gethostbyname(remote_name))==NULL)
-     {
--	syslog(LOG_ERR,"iftelnetd: %s - Unknown host",remote_name);
--	syslog(LOG_ERR,"iftelnetd: Aborting.");
-+	syslog(LOG_ERR,"%s - Unknown host",remote_name);
-+	syslog(LOG_ERR,"Aborting.");
- 	free(remote_name);
- 	free(remote_port);
- 	return;
-@@ -196,8 +193,8 @@
-     
-     if(connect(s,(struct sockaddr *)&server,sizeof(server)) == -1)
-     {
--	syslog(LOG_ERR, "iftelnetd: Can't connect %s",remote_name);
--	syslog(LOG_ERR, "iftelnetd: Aborting.");
-+	syslog(LOG_ERR, "Can't connect %s",remote_name);
-+	syslog(LOG_ERR, "Aborting.");
- 	free(remote_name);
- 	free(remote_port);
- 	return;
-@@ -211,7 +208,7 @@
-     free(remote_name);
-     free(remote_port);
-     close(s);
--    syslog(LOG_INFO,"iftelnetd: Done.");
-+    syslog(LOG_INFO,"Done.");
- }
- 
- /* --- This is an artwork of serge terekhov, 2:5000/13@fidonet :) --- */
-@@ -239,13 +236,13 @@
- 	    r = "DONT";
- 	    break;
- 	}
--	syslog(LOG_SYSLOG, "iftelnetd: TELNET send %s %d", r, opt);
-+	syslog(LOG_SYSLOG, "TELNET send %s %d", r, opt);
-     }
-     buf[0] = IAC;
-     buf[1] = tag;
-     buf[2] = opt;
-     if (write (1, buf, 3) != 3)
--	syslog(LOG_ERR,"iftelnetd: $answer cant send");
-+	syslog(LOG_ERR,"$answer cant send");
- }
- 
- int init_telnet(void)
-@@ -293,7 +290,7 @@
- 		    case WILL:
- 			m = (unsigned char)*q++; --n;
- 			if(debug)
--			    syslog (TELNETD, "iftelnetd: TELNET: recv WILL %d", m);
-+			    syslog (TELNETD, "TELNET: recv WILL %d", m);
- 			
- 			if (m != TN_TRANSMIT_BINARY && m != TN_SUPPRESS_GA &&
- 			    m != TN_ECHO)
-@@ -302,12 +299,12 @@
- 		    case WONT:
- 			m = *q++; --n;
- 			if(debug)
--			    syslog (TELNETD, "iftelnetd: TELNET: recv WONT %d", m);
-+			    syslog (TELNETD, "TELNET: recv WONT %d", m);
- 			break;
- 		    case DO:
- 			m = (unsigned char)*q++; --n;
- 			if(debug)
--			    syslog (TELNETD, "iftelnetd: TELNET: recv DO %d", m);
-+			    syslog (TELNETD, "TELNET: recv DO %d", m);
- 			if (m != TN_TRANSMIT_BINARY && m != TN_SUPPRESS_GA &&
- 			    m != TN_ECHO)
- 			    answer (WONT, m);
-@@ -315,14 +312,14 @@
- 		    case DONT:
- 			m = (unsigned char)*q++; --n;
- 			if(debug)
--			    syslog (TELNETD, "iftelnetd: TELNET: recv DONT %d", m);
-+			    syslog (TELNETD, "TELNET: recv DONT %d", m);
- 			break;
- 		    case IAC:
- 			*p++ = IAC;
- 			break;
- 		    default:
- 			if(debug)
--			    syslog (TELNETD, "iftelnetd: TELNET: recv IAC %d", m);
-+			    syslog (TELNETD, "TELNET: recv IAC %d", m);
- 			break;
- 		    }
- 		}
diff --git a/comms/ifcico-cm/patches/patch-am b/comms/ifcico-cm/patches/patch-am
index 76aedb2c393..bb42765b9cd 100644
--- a/comms/ifcico-cm/patches/patch-am
+++ b/comms/ifcico-cm/patches/patch-am
@@ -1,22 +1,25 @@
-$NetBSD: patch-am,v 1.1 1998/12/21 15:45:21 tv Exp $
+$NetBSD: patch-am,v 1.2 2001/02/21 18:50:37 tv Exp $
 
---- iflib/callstat.c.orig	Mon Dec 21 09:36:24 1998
-+++ iflib/callstat.c	Mon Dec 21 09:37:08 1998
-@@ -21,7 +21,7 @@
+--- iflib/callstat.c.orig	Sun Oct  2 09:08:01 1994
++++ iflib/callstat.c	Wed Feb 21 10:40:23 2001
+@@ -21,7 +21,10 @@
  
  	if ((fp=fopen(stsname(addr,'f'),"r")))
  	{
 -		fscanf(fp,"%lu %u %u",&st.trytime,&st.tryno,&st.trystat);
-+		fscanf(fp,"%u %u %u",&st.trytime,&st.tryno,&st.trystat);
++		unsigned long trytime;
++
++		fscanf(fp,"%lu %u %u",&trytime,&st.tryno,&st.trystat);
++		st.trytime = trytime;
  		fclose(fp);
  	}
  
-@@ -44,7 +44,7 @@
- 		else st.tryno+=incr;
+@@ -45,7 +48,7 @@
  		st.trystat=sts;
  		(void)time(&st.trytime);
--		fprintf(fp,"%lu %u %u\n",
-+		fprintf(fp,"%u %u %u\n",
- 			st.trytime,st.tryno,(unsigned)st.trystat);
+ 		fprintf(fp,"%lu %u %u\n",
+-			st.trytime,st.tryno,(unsigned)st.trystat);
++			(unsigned long)st.trytime,st.tryno,(unsigned)st.trystat);
  		fclose(fp);
  	}
+ 	else
diff --git a/comms/ifcico-cm/patches/patch-ao b/comms/ifcico-cm/patches/patch-ao
index 499044339cc..2ae93ed3b22 100644
--- a/comms/ifcico-cm/patches/patch-ao
+++ b/comms/ifcico-cm/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.1 1998/12/21 15:45:21 tv Exp $
+$NetBSD: patch-ao,v 1.2 2001/02/21 18:50:37 tv Exp $
 
---- ifcico/emsidat.c.orig	Mon Dec 21 09:44:01 1998
-+++ ifcico/emsidat.c	Mon Dec 21 09:45:53 1998
+--- ifcico/emsidat.c.orig	Sun Mar  7 15:42:34 1999
++++ ifcico/emsidat.c	Wed Feb 21 10:47:56 2001
 @@ -110,7 +110,7 @@
  	p=xstrcat(p,reldate);
  	p=xstrcat(p,"}{TRX#}{[");
  	(void)time(&tt);
 -	sprintf(cbuf,"%08lX",mtime2sl(tt));
-+	sprintf(cbuf,"%08X",mtime2sl(tt));
++	sprintf(cbuf,"%08lX",(unsigned long)mtime2sl(tt));
  	p=xstrcat(p,cbuf);
  	p=xstrcat(p,"]}{TZUTC}{[");
  	p=xstrcat(p,gmtoffset(tt));
@@ -16,16 +16,16 @@ $NetBSD: patch-ao,v 1.1 1998/12/21 15:45:21 tv Exp $
  	p=xstrcat(p,"]}");
  
 -	sprintf(cbuf,"%04X",strlen(p+12));
-+	sprintf(cbuf,"%04lX",strlen(p+12));
++	sprintf(cbuf,"%04X",(unsigned)strlen(p+12));
  	memcpy(p+8,cbuf,4);
  	debug(DBG_HANDSHAKE, "prepared: \"%s\"",p);
  	return p;
-@@ -354,7 +354,7 @@
+@@ -355,7 +355,7 @@
+ 	}
+ 	else if (strcasecmp(p,"TRX#") == 0)
+ 	{
+-		time_t tt;
++		unsigned long tt;
+ 		char ctt[32];
  
  		p=sel_brace(NULL);
- 		p=sel_bracket(p);
--		if (sscanf(p,"%08lx",&tt) == 1)
-+		if (sscanf(p,"%08x",&tt) == 1)
- 		{
- 			strcpy(ctt,date(sl2mtime(tt)));
- 			loginf("remote     time: %s",ctt);
diff --git a/comms/ifcico-cm/patches/patch-ap b/comms/ifcico-cm/patches/patch-ap
index 53b7c0daff9..ad691a2ba28 100644
--- a/comms/ifcico-cm/patches/patch-ap
+++ b/comms/ifcico-cm/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 1998/12/21 15:45:21 tv Exp $
+$NetBSD: patch-ap,v 1.2 2001/02/21 18:50:37 tv Exp $
 
---- ifcico/hydra.c.orig	Mon Dec 21 09:46:45 1998
-+++ ifcico/hydra.c	Mon Dec 21 09:50:00 1998
+--- ifcico/hydra.c.orig	Sun Nov 15 15:13:14 1998
++++ ifcico/hydra.c	Wed Feb 21 10:51:23 2001
 @@ -89,7 +89,7 @@
  
  static char *put_long(char *buffer, long val)
@@ -20,15 +20,28 @@ $NetBSD: patch-ap,v 1.1 1998/12/21 15:45:21 tv Exp $
    return *(long *) buffer;
  #else
    return ((unsigned long) ((unsigned char) buffer[0])) |
-@@ -894,7 +894,7 @@
+@@ -530,8 +530,8 @@
+   char *inbuf, *outbuf;
+   int rxlen, txlen;		/* length of receive/transmit buffer */
+   long txwindow, rxwindow;	/* window sizes */
+-  long txpos, rxpos;		/* file positions */
+-  long stxpos, srxpos;
++  off_t txpos, rxpos;		/* file positions */
++  off_t stxpos, srxpos;
+   long longnum;
+   int hdxlink = 0;
+   int txretries, rxretries;
+@@ -894,8 +894,8 @@
  	if (to_send)
  	{
  	  txlen = sprintf(txbuf, "%08lx%08lx%08lx%08lx%08lx",
 -			  mtime2sl(txstat.st_mtime),
-+			  (long)mtime2sl(txstat.st_mtime),
- 			  txstat.st_size,
+-			  txstat.st_size,
++			  (unsigned long)mtime2sl(txstat.st_mtime),
++			  (unsigned long)txstat.st_size,
  			  0UL,
  			  0UL,
+ 			  0UL);
 @@ -1353,7 +1353,7 @@
  	 */
  	else if ((rxlen > 41) && (rxbuf[rxlen - 1] == 0))
diff --git a/comms/ifcico-cm/patches/patch-ar b/comms/ifcico-cm/patches/patch-ar
index 820ae66525a..524ffe0408e 100644
--- a/comms/ifcico-cm/patches/patch-ar
+++ b/comms/ifcico-cm/patches/patch-ar
@@ -1,7 +1,16 @@
-$NetBSD: patch-ar,v 1.1 1998/12/21 15:45:21 tv Exp $
+$NetBSD: patch-ar,v 1.2 2001/02/21 18:50:37 tv Exp $
 
---- ifcico/zmrecv.c.orig	Mon Dec 21 09:56:18 1998
-+++ ifcico/zmrecv.c	Mon Dec 21 09:57:09 1998
+--- ifcico/zmrecv.c.orig	Sun Jul  5 16:18:59 1998
++++ ifcico/zmrecv.c	Wed Feb 21 10:53:21 2001
+@@ -24,7 +24,7 @@
+ static FILE *fout=NULL;
+ 
+ static int Usevhdrs;
+-static long rxbytes;
++static off_t rxbytes;
+ static int Eofseen;		/* indicates cpm eof (^Z) has been received */
+ static int errors;
+ static time_t startime,etime;
 @@ -461,7 +461,7 @@
  	Bytesleft = DEFBYTL; Filemode = 0; Modtime = 0L;
  
diff --git a/comms/ifcico-cm/patches/patch-as b/comms/ifcico-cm/patches/patch-as
index bda40ebf01e..f85dd4e91d1 100644
--- a/comms/ifcico-cm/patches/patch-as
+++ b/comms/ifcico-cm/patches/patch-as
@@ -1,14 +1,23 @@
-$NetBSD: patch-as,v 1.1 1998/12/21 15:45:21 tv Exp $
+$NetBSD: patch-as,v 1.2 2001/02/21 18:50:37 tv Exp $
 
---- ifcico/tcpproto.c.orig	Mon Dec 21 09:57:54 1998
-+++ ifcico/tcpproto.c	Mon Dec 21 09:58:29 1998
+--- ifcico/tcpproto.c.orig	Sun Dec 29 10:26:28 1996
++++ ifcico/tcpproto.c	Wed Feb 21 10:55:13 2001
 @@ -31,7 +31,8 @@
  static char txbuf[2048];
  static char rxbuf[2048];
  static int rx_type;
 -static long startime,endtime,rxbytes,sbytes;
 +static time_t startime,endtime;
-+static long rxbytes,sbytes;
++static off_t rxbytes,sbytes;
  
  static int sendfile(char *,char *);
  static int finsend(void);
+@@ -175,7 +176,7 @@
+ 	}
+ 
+ 	sprintf(txbuf,"S %s %lu %lu",
+-		rn,st.st_size, (unsigned long) st.st_mtime);
++		rn, (unsigned long)st.st_size, (unsigned long)st.st_mtime);
+ 	bufl=strlen(txbuf);
+ 	rc=tcp_sblk(txbuf,bufl,TCP_CMD);
+ 	rc=tcp_rblk(rxbuf,&bufl);
diff --git a/comms/ifcico-cm/patches/patch-au b/comms/ifcico-cm/patches/patch-au
new file mode 100644
index 00000000000..bfdf48133a0
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-au
@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2001/02/21 18:50:37 tv Exp $
+
+--- ifcico/flagexp.y.orig	Wed Feb 21 10:42:32 2001
++++ ifcico/flagexp.y	Wed Feb 21 10:42:45 2001
+@@ -14,6 +14,7 @@
+ struct tm *now;
+ 
+ extern int yylex(void);
++extern int yyparse(void);
+ 
+ static int match(int fl);
+ static int logic(int e1, int op,int e2);
diff --git a/comms/ifcico-cm/patches/patch-av b/comms/ifcico-cm/patches/patch-av
new file mode 100644
index 00000000000..1077014dc21
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-av
@@ -0,0 +1,40 @@
+$NetBSD: patch-av,v 1.1 2001/02/21 18:50:37 tv Exp $
+
+--- misc/config.orig	Wed Feb 21 12:28:36 2001
++++ misc/config	Wed Feb 21 12:27:59 2001
+@@ -4,7 +4,7 @@
+ # Lines with the first nonblank character '#' are comments.
+ 
+ # Include config extension file (here: file with global configuration)
+-include		/etc/ifmail/config-global
++include		@PREFIX@/etc/ifcico/config-global
+ 
+ # Passwords for nodes. Not checked by iftoss (unless -DPARANOID specified
+ # at compile-time), checked by ifcico.
+@@ -14,7 +14,7 @@
+ # Include config extension file (here: file with real passwords).
+ # Includes may be nested. If the nesting is cyclic, the program cycles too.
+ # You are warned.
+-include		/etc/ifmail/passwds
++#include 	@PREFIX@/etc/ifcico/passwds
+ 
+ # Directory from which the file requests are satisfied
+ public		/home/ftp/pub
+@@ -26,7 +26,7 @@
+ # to many shortnames without problems.  If one shortname points to many
+ # fullnames, all matches are sent. The files are sent under their
+ # shortnames.
+-reqmap		/usr/lib/ifmail/reqmap
++reqmap		@PREFIX@/etc/ifcico/reqmap
+ 
+ # Directory with executables to satisfy "magic" file requests
+ # if requested a file present in this directory, it will be
+@@ -34,7 +34,7 @@
+ # is not executable, it is read line by line and the lines are
+ # processed as if they were received file requests (recusively).
+ # Execution of commands may compromize security!  You are warned.
+-magic		/usr/lib/ifmail/magic
++magic		@PREFIX@/etc/ifcico/magic
+ 
+ # From this line on, values may be prefixed by a logical expression in
+ # round brackets. Operators are: '!', '&', '|', 'Xor'.
diff --git a/comms/ifcico-cm/patches/patch-aw b/comms/ifcico-cm/patches/patch-aw
new file mode 100644
index 00000000000..97af8008bc9
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-aw
@@ -0,0 +1,38 @@
+$NetBSD: patch-aw,v 1.1 2001/02/21 18:50:37 tv Exp $
+
+--- misc/config-global.orig	Wed Feb 21 12:29:10 2001
++++ misc/config-global	Wed Feb 21 12:33:02 2001
+@@ -20,7 +20,7 @@
+ 
+ # Primary nodelist (serves "outbound" directory and domain from the
+ # first "address" statement). Name expanded with ".NNN" if neccessary.
+-nodelist	/var/spool/ifmail/nl.d/nodelist	2:0/0@fidonet
++nodelist	/var/spool/fido/nodelist/nodelist	2:0/0@fidonet
+ 
+ # Secondary nodelists and nodelists for other domains.
+ # use directory name from the first "nodelist" statement.
+@@ -28,19 +28,19 @@
+ nodelist	gernet		21:0/0@gernet
+ 
+ # Directory for incoming packets/files:
+-inbound		/var/spool/ifmail/inb
++inbound		/var/spool/fido/bt/in
+ # Directories for "listed" and "protected" sessions
+-listinbound	/var/spool/ifmail/inb
+-protinbound	/var/spool/ifmail/inb
++listinbound	/var/spool/fido/bt/in
++protinbound	/var/spool/fido/bt/pin
+ 
+ # Directory for outgoing packets (default domain and zone):
+ # other zones will be like "/usr/spool/fnet/outb.003",
+ # other domains will be like "/usr/spool/fnet/<domain>.<zone>"
+-outbound	/var/spool/ifmail/outb
++outbound	/var/spool/fido/bt/out
+ 
+ # If you specify this, outgoing arcmail files will go to `outbound',
+ # but be reffered as being in dosoutbound' in the .flo files
+ #dosoutbound	h:\spool\ifmail\outb
+ 
+ # Sequencer file (used to generate unique IDs)
+-sequencer	/var/spool/ifmail/seq
++sequencer	/var/spool/fido/seq/seq.ifcico
diff --git a/comms/ifcico-cm/pkg/PLIST b/comms/ifcico-cm/pkg/PLIST
index 0ca2cfc8bbf..14ec210abc6 100644
--- a/comms/ifcico-cm/pkg/PLIST
+++ b/comms/ifcico-cm/pkg/PLIST
@@ -1,14 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 1998/12/21 15:45:21 tv Exp $
-etc/ifmail/inouttabs/fidom2iso
-etc/ifmail/inouttabs/ibmpc-latin1
-etc/ifmail/inouttabs/iso2fidom
-etc/ifmail/inouttabs/latin1-ibmpc
-etc/ifmail/inouttabs/outaltkoi8
-etc/ifmail/inouttabs/outkoi8alt
-@dirrm etc/ifmail/inouttabs
-etc/ifmail/config.dist
-etc/ifmail/config-global
-@dirrm etc/ifmail
+@comment $NetBSD: PLIST,v 1.3 2001/02/21 18:50:38 tv Exp $
+etc/ifcico/config.dist
+etc/ifcico/config-global.dist
+@dirrm etc/ifcico
 man/man8/ifcico.8
 man/man8/ifindex.8
 man/man8/ifinfo.8
@@ -16,12 +9,10 @@ man/man8/ifreq.8
 man/man8/ifroute.8
 man/man8/ifstat.8
 man/man8/nlpatch.8
-sbin/fdpass
 sbin/ifcico
 sbin/ifindex
 sbin/ifinfo
 sbin/ifreq
 sbin/ifroute
 sbin/ifstat
-sbin/iftelnetd
 sbin/nlpatch