Per announcement to tech-pkg, ifcico-cm is now history. Stay tuned for

import and update of a couple packages that replace ifcico's functionality.

30 files changed, 1 insertions, 689 deletions

diff --git a/comms/Makefile b/comms/Makefile
index 9405736cbb4..5bc191a9882 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2004/04/19 14:08:38 markd Exp $
+# $NetBSD: Makefile,v 1.52 2004/06/20 20:07:03 tv Exp $
 #
 
 COMMENT=	Communication utilities
@@ -17,7 +17,6 @@ SUBDIR+=	gnome-pilot
 SUBDIR+=	gscmxx
 SUBDIR+=	gsmlib
 SUBDIR+=	hylafax
-SUBDIR+=	ifcico-cm
 SUBDIR+=	jpilot
 SUBDIR+=	jpilot-syncmal
 SUBDIR+=	kermit
diff --git a/comms/ifcico-cm/DESCR b/comms/ifcico-cm/DESCR
deleted file mode 100644
index 82792769fb0..00000000000
--- a/comms/ifcico-cm/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-This is an ALPHA version, it is far from being fully tested.
-
-What's new in the 3.0.cm releases?
-
- * a variation of the HYDRA file transfer protocol (some less
-   frequently used features aren't implemented)
- * better nodelist indices
- * incorporated tx-patches up to tx8.7
- * 'ifstat' moved from gating part to ifcico part
- * 'ifinfo' for querying nodelist information
- * 'ifreq' implementation in C (instead of Perl)
-
- * gating part is no longer distributed with this archive (either get
-an 2.x version of ifmail or use FidoGate for gating)
diff --git a/comms/ifcico-cm/Makefile b/comms/ifcico-cm/Makefile
deleted file mode 100644
index b9dce8c3dd7..00000000000
--- a/comms/ifcico-cm/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2004/04/25 09:00:33 snj 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/
-
-MAINTAINER=	tv@pobox.com
-HOMEPAGE=	http://cmeerw.org/ifcico/
-COMMENT=	FidoNet transport program using FTS protocols via dial or TCP
-
-USE_BUILDLINK3=	yes
-
-PKG_SYSCONFSUBDIR=	ifcico-cm
-MAKE_ENV+=		PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
-
-post-build:
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config \
-		>${WRKDIR}/config
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${WRKSRC}/misc/config-global \
-		>${WRKDIR}/config-global
-
-post-install:
-	${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
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/comms/ifcico-cm/PLIST b/comms/ifcico-cm/PLIST
deleted file mode 100644
index b2f4d3b0856..00000000000
--- a/comms/ifcico-cm/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@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
-man/man8/ifreq.8
-man/man8/ifroute.8
-man/man8/ifstat.8
-man/man8/nlpatch.8
-sbin/ifcico
-sbin/ifindex
-sbin/ifinfo
-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
deleted file mode 100644
index 557571fde35..00000000000
--- a/comms/ifcico-cm/distinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-$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) = 4d9098365649037bfb7e4016fb62dc2f9bbfc9a0
-SHA1 (patch-ab) = daa8f8678549f2f5b5c175ff17e7331c68e59920
-SHA1 (patch-ac) = 0a097b8a75b61cafa70aac2154453f9c96213ff5
-SHA1 (patch-ad) = af477df6773ea60c9e420918e0b54bd0b994c97a
-SHA1 (patch-ae) = f71221aa2f508b4aef025345dde8734351444783
-SHA1 (patch-af) = b28f9dad85c69b4b58efac0ee27eba318211890a
-SHA1 (patch-ag) = dc95ccda273d81dba549ecf755e1c3c0324519cf
-SHA1 (patch-ah) = 5bb3a98e1e8706fd09294f8e2d13b0f1ee874170
-SHA1 (patch-ai) = 3960c2155a02ac03d99eb997ffc416a46220c81d
-SHA1 (patch-aj) = b95fb6e11d18dfd49bf6f17ac9facd3d6ea34a6c
-SHA1 (patch-ak) = 48f8ab8310e7076b85a9e7b6aab0aff5a0f22d1f
-SHA1 (patch-al) = a2aff0fcefe08190cf2e60dd92757059448a09ea
-SHA1 (patch-am) = a357747f786412fe68554b1c5b7da7a0cbeb7081
-SHA1 (patch-an) = 1b048657f695fde30051279c3138c5cefc090a3e
-SHA1 (patch-ao) = 48c78901425bd277cc316b1b9423b95f4e1d5518
-SHA1 (patch-ap) = db8fce04289a2a1c5444445b6e79d804642dde3d
-SHA1 (patch-aq) = 055bcba7d8775ca1610776d49f2d52e41d855b88
-SHA1 (patch-ar) = 625e75807f3ad9f5a2994b0e17b3eece341d846a
-SHA1 (patch-as) = fbc0feffb760e3a642041623325fdedf7f178398
-SHA1 (patch-at) = 53bc2cfc48f3daa5bab39353e75c2c120f11bd47
-SHA1 (patch-au) = ca22dea45fec8ff6d72143e2f589dad5b1b77164
-SHA1 (patch-av) = cc27cc0fca0b797fc14e9f4461c04d390627ce09
-SHA1 (patch-aw) = ce9d75da78ae17c896f74de1a8db7f5ccad47d30
-SHA1 (patch-ax) = 849241fa699c49e9e755879631698911cb3bee9c
-SHA1 (patch-ay) = 7aad2cc36d5179ec1004874686232cc1134b2b49
diff --git a/comms/ifcico-cm/patches/patch-aa b/comms/ifcico-cm/patches/patch-aa
deleted file mode 100644
index e855345f47f..00000000000
--- a/comms/ifcico-cm/patches/patch-aa
+++ /dev/null
@@ -1,86 +0,0 @@
-$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
-@@ -3,10 +3,10 @@
- VERSION     = "3.0.cm.alpha-4.1"
- 
- # Where to put binaries
--BINDIR = "/usr/lib/ifmail"
-+BINDIR = ${PREFIX}/sbin
- 
- # Main configuration file. This default may be overwritten by -I key.
--CONFIGFILE  = "/etc/ifmail/config"
-+CONFIGFILE  = ${PKG_SYSCONFDIR}/config
- 
- # Debug messages turned on by -x key are written here.
- # Some error messages may occationally appear here too.
-@@ -26,7 +26,7 @@
- CICOLOG    = LOG_LOCAL0
- 
- # Directory where UUCP lock files reside.
--LOCKDIR     = "/var/lock"
-+LOCKDIR     = "/var/spool/lock"
- #LOCKDIR     = "/var/spool/uucp"
- 
- # Directory from which file requests are resolved.
-@@ -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 -DBSD_SIGNALS
- 
- # 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_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 \
-@@ -265,9 +267,7 @@
- #RANLIB = touch
- SHELL = /bin/sh
- ECHO = echo -e
--CC = cc -pipe
--#YACC = yacc
--YACC = bison -y
-+YACC = yacc
- #LEX = lex
- LEX = flex
- AWK = awk
-@@ -275,7 +275,7 @@
- 
- #CFLAGS = -g -Wall
- # Linux, 386BSD, SunOS:
--CFLAGS = -D_GNU_SOURCE -O2 -Wall
-+CFLAGS += -D_GNU_SOURCE -Wall -Werror -Wno-unused
- # SVR4:
- #CFLAGS = -O -Xa
- 
-@@ -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
- # SunOS:
- #LIBS =
- # 386BSD:
--#LIBS = -lcompat
-+LIBS = -lcompat
- # SVR4
- #LIBS = -ldbm -lform -lnsl -lsocket -lc -L/usr/ucblib -lucb
- # SCO
diff --git a/comms/ifcico-cm/patches/patch-ab b/comms/ifcico-cm/patches/patch-ab
deleted file mode 100644
index 90d86ee9773..00000000000
--- a/comms/ifcico-cm/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- iflib/cspace.c.orig	Sun Nov 22 16:25:33 1998
-+++ iflib/cspace.c	Sun Nov 22 16:25:46 1998
-@@ -18,6 +18,7 @@
- #elif defined(STATFS_IN_STATVFS_H)
- #include <sys/statvfs.h>
- #elif defined(STATFS_IN_MOUNT_H)
-+#include <sys/param.h>
- #include <sys/mount.h>
- #else
- #error No include for statfs() call defined
diff --git a/comms/ifcico-cm/patches/patch-ac b/comms/ifcico-cm/patches/patch-ac
deleted file mode 100644
index ba65a16986c..00000000000
--- a/comms/ifcico-cm/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- iflib/Makefile.orig	Sun Nov 22 17:00:10 1998
-+++ iflib/Makefile	Sun Nov 22 17:00:19 1998
-@@ -21,7 +21,7 @@
- 		rdconfig.o ftn.o packet.o pktname.o bwrite.o \
- 		bread.o getheader.o scanout.o matchaka.o atoul.o \
- 		nodelock.o trap.o rfcaddr.o expipe.o callstat.o \
--		cspace.o setprocn.o \
-+		cspace.o \
- 		${NEEDED}
- SRCS = lutil.c xutil.c ulock.c rfcdate.c sequencer.c ftnmsg.c crc.c \
- 		strncasecmp.c strcasecmp.c \
diff --git a/comms/ifcico-cm/patches/patch-ad b/comms/ifcico-cm/patches/patch-ad
deleted file mode 100644
index cf5b53bc06b..00000000000
--- a/comms/ifcico-cm/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- ifcico/call.c.orig	Sun Nov 22 16:31:17 1998
-+++ ifcico/call.c	Sun Nov 22 16:31:32 1998
-@@ -37,7 +37,6 @@
- extern void rdoptions(node*);
- extern int nodelock(faddr*);
- extern int nodeulock(faddr*);
--extern void setproctitle(char*);
- 
- int checkretry(st)
- callstat *st;
diff --git a/comms/ifcico-cm/patches/patch-ae b/comms/ifcico-cm/patches/patch-ae
deleted file mode 100644
index 6227c3c8a6c..00000000000
--- a/comms/ifcico-cm/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- ifcico/emsi.c.orig	Sun Nov 22 16:31:44 1998
-+++ ifcico/emsi.c	Sun Nov 22 16:31:50 1998
-@@ -28,7 +28,6 @@
- extern int txwazoo(void);
- extern unsigned short crc16xmodem(char*,int);
- extern void rdoptions(node *);
--extern void setproctitle(char*);
- 
- static int rxemsi(void);
- static int txemsi(void);
diff --git a/comms/ifcico-cm/patches/patch-af b/comms/ifcico-cm/patches/patch-af
deleted file mode 100644
index 5e2a8f702ed..00000000000
--- a/comms/ifcico-cm/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- ifcico/ftsc.c.orig	Sun Nov 22 16:32:03 1998
-+++ ifcico/ftsc.c	Sun Nov 22 16:32:09 1998
-@@ -22,7 +22,6 @@
- extern int sendbark(void);
- extern int recvbark(void);
- extern void rdoptions(node*);
--extern int setproctitle(char*);
- 
- static int rxftsc(void);
- static int txftsc(void);
diff --git a/comms/ifcico-cm/patches/patch-ag b/comms/ifcico-cm/patches/patch-ag
deleted file mode 100644
index b4bef96005f..00000000000
--- a/comms/ifcico-cm/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- ifcico/ifcico.c.orig	Sun Jan  4 09:52:37 1998
-+++ ifcico/ifcico.c	Sun Nov 22 16:57:51 1998
-@@ -41,8 +41,6 @@
- fa_list *callall(void);
- int answer(char *);
- void mkdirs(char*);
--void setargspace(char**,char**);
--void setproctitle(char*);
- 
- void usage(void)
- {
-@@ -86,8 +84,6 @@
- 	char *answermode=NULL,*p;
- 	pid_t child,waitret;
- 	int status;
--
--	setargspace(argv,envp);
- 
- #if defined(HAS_SYSLOG) && defined(CICOLOG)
- 	logfacility=CICOLOG;
diff --git a/comms/ifcico-cm/patches/patch-ah b/comms/ifcico-cm/patches/patch-ah
deleted file mode 100644
index ab52d9cf32e..00000000000
--- a/comms/ifcico-cm/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- ifcico/yoohoo.c.orig	Sun Nov 22 16:32:42 1998
-+++ ifcico/yoohoo.c	Sun Nov 22 16:32:48 1998
-@@ -51,7 +51,6 @@
- extern int txdietifna(void);
- extern void rdoptions(node*);
- extern int nodelock(faddr*);
--extern void setproctitle(char*);
- 
- static int rxyoohoo(void);
- static int txyoohoo(void);
diff --git a/comms/ifcico-cm/patches/patch-ai b/comms/ifcico-cm/patches/patch-ai
deleted file mode 100644
index 8d864a922c8..00000000000
--- a/comms/ifcico-cm/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- ifcico/Makefile.orig	Sun Nov 22 16:45:24 1998
-+++ ifcico/Makefile	Sun Nov 22 17:05:29 1998
-@@ -76,13 +76,7 @@
- flaglex.o:	flaglex.c flagexp.c
- 
- install: all
--	${INSTALL} -o ${OWNER} -g ${GROUP} -m ${SMODE} ifcico ${BINDIR}/ifcico
--	${INSTALL} -o ${OWNER} -g ${GROUP} -m ${SMODE} ifindex ${BINDIR}/ifindex
--	${INSTALL} -o ${OWNER} -g ${GROUP} -m ${SMODE} ifinfo ${BINDIR}/ifinfo
--	${INSTALL} -o ${OWNER} -g ${GROUP} -m ${SMODE} ifreq ${BINDIR}/ifreq
--	${INSTALL} -o ${OWNER} -g ${GROUP} -m ${SMODE} ifroute ${BINDIR}/ifroute
--	${INSTALL} -o ${OWNER} -g ${GROUP} -m ${SMODE} ifstat ${BINDIR}/ifstat
--	${INSTALL} -o ${OWNER} -g ${GROUP} -m ${SMODE} nlpatch ${BINDIR}/nlpatch
-+	${BSD_INSTALL_PROGRAM} ifcico ifindex ifinfo ifreq ifroute ifstat nlpatch ${BINDIR}
- 
- lc:
- 	wc -l ${SRCS} ${HDRS} ${OTHER}
diff --git a/comms/ifcico-cm/patches/patch-aj b/comms/ifcico-cm/patches/patch-aj
deleted file mode 100644
index 2e29994b194..00000000000
--- a/comms/ifcico-cm/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2001/03/09 12:08:25 dmcmahill Exp $
-
---- ifcico/mxlookup.c.orig	Sat Jul 13 17:17:12 1996
-+++ ifcico/mxlookup.c	Fri Mar  9 07:01:38 2001
-@@ -170,5 +170,8 @@
- 	}
- 	else	{
--	    	hp = (int)gethostbyaddr ((char*)&addr, 4, AF_INET);
-+	    	if ( gethostbyaddr ((char*)&addr, 4, AF_INET) == NULL )
-+			hp = 0;
-+		else
-+			hp = 1;
- 	   	break;
- 	}
-@@ -227,5 +230,5 @@
- 	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);
- 
- 	if (n < 0)	return NULL;
diff --git a/comms/ifcico-cm/patches/patch-ak b/comms/ifcico-cm/patches/patch-ak
deleted file mode 100644
index 0bdce535aaa..00000000000
--- a/comms/ifcico-cm/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
-
---- contrib/fdpass/fdpass.c.orig	Mon Nov 23 10:19:55 1998
-+++ contrib/fdpass/fdpass.c	Mon Nov 23 10:20:10 1998
-@@ -9,7 +9,7 @@
- #include "session.h" /* session.h from fddev220.arj */
- 
- 
--void main (int argc,char *argv[]) 
-+int main (int argc,char *argv[]) 
- {
- 	int fd;
- 	_PSW koko;
-@@ -55,4 +55,5 @@
- 		}
- 	}
- 	close (fd);
-+	return 0;
- }
diff --git a/comms/ifcico-cm/patches/patch-al b/comms/ifcico-cm/patches/patch-al
deleted file mode 100644
index 87d0809a87b..00000000000
--- a/comms/ifcico-cm/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.1 1998/12/17 16:19:20 tv Exp $
-
---- iflib/config.h.orig	Thu Dec 17 10:26:12 1998
-+++ iflib/config.h	Thu Dec 17 10:27:03 1998
-@@ -6,6 +6,7 @@
- #define _CONFIG_H
- 
- #include "ftn.h"
-+#include <sys/time.h>
- 
- #ifndef AREA_LIST_TYPE
- #define AREA_LIST_TYPE
-@@ -58,7 +59,7 @@
- extern area_list *badgroups;
- 
- extern long configverbose;
--extern long configtime;
-+extern time_t configtime;
- extern long maxfsize;
- extern long maxpsize;
- extern long speed;
diff --git a/comms/ifcico-cm/patches/patch-am b/comms/ifcico-cm/patches/patch-am
deleted file mode 100644
index bb42765b9cd..00000000000
--- a/comms/ifcico-cm/patches/patch-am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-am,v 1.2 2001/02/21 18:50:37 tv Exp $
-
---- 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);
-+		unsigned long trytime;
-+
-+		fscanf(fp,"%lu %u %u",&trytime,&st.tryno,&st.trystat);
-+		st.trytime = trytime;
- 		fclose(fp);
- 	}
- 
-@@ -45,7 +48,7 @@
- 		st.trystat=sts;
- 		(void)time(&st.trytime);
- 		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-an b/comms/ifcico-cm/patches/patch-an
deleted file mode 100644
index f9a69eb16ac..00000000000
--- a/comms/ifcico-cm/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 1998/12/21 15:45:21 tv Exp $
-
---- iflib/xutil.h.orig	Mon Dec 21 09:40:25 1998
-+++ iflib/xutil.h	Mon Dec 21 09:40:44 1998
-@@ -1,6 +1,5 @@
--#ifndef size_t
--#define size_t unsigned int
--#endif
-+#include <stdlib.h>
-+#include <string.h>
- 
- char *xmalloc(size_t);
- char *xstrcpy(char *);
diff --git a/comms/ifcico-cm/patches/patch-ao b/comms/ifcico-cm/patches/patch-ao
deleted file mode 100644
index 2ae93ed3b22..00000000000
--- a/comms/ifcico-cm/patches/patch-ao
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2001/02/21 18:50:37 tv Exp $
-
---- 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,"%08lX",(unsigned long)mtime2sl(tt));
- 	p=xstrcat(p,cbuf);
- 	p=xstrcat(p,"]}{TZUTC}{[");
- 	p=xstrcat(p,gmtoffset(tt));
-@@ -130,7 +130,7 @@
- 	p=xstrcat(p,flags?flags:"");
- 	p=xstrcat(p,"]}");
- 
--	sprintf(cbuf,"%04X",strlen(p+12));
-+	sprintf(cbuf,"%04X",(unsigned)strlen(p+12));
- 	memcpy(p+8,cbuf,4);
- 	debug(DBG_HANDSHAKE, "prepared: \"%s\"",p);
- 	return p;
-@@ -355,7 +355,7 @@
- 	}
- 	else if (strcasecmp(p,"TRX#") == 0)
- 	{
--		time_t tt;
-+		unsigned long tt;
- 		char ctt[32];
- 
- 		p=sel_brace(NULL);
diff --git a/comms/ifcico-cm/patches/patch-ap b/comms/ifcico-cm/patches/patch-ap
deleted file mode 100644
index ad691a2ba28..00000000000
--- a/comms/ifcico-cm/patches/patch-ap
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2001/02/21 18:50:37 tv Exp $
-
---- 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)
- {
--#if defined(__i386__)
-+#if defined(__i386__) || (defined(__NetBSD__) && (BYTE_ORDER == LITTLE_ENDIAN))
-   *(unsigned long *) buffer = (unsigned long) val;
- #else
-   buffer[0] = (unsigned long) val & 0xff;
-@@ -104,7 +104,7 @@
- 
- static long get_long(char *buffer)
- {
--#if defined(__i386__)
-+#if defined(__i386__) || (defined(__NetBSD__) && (BYTE_ORDER == LITTLE_ENDIAN))
-   return *(long *) buffer;
- #else
-   return ((unsigned long) ((unsigned char) buffer[0])) |
-@@ -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),
--			  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))
- 	{
--	  time_t timestamp;
-+	  long timestamp;
- 	  long filesize;
- 	  char dosname[8 + 1 + 3 + 1], *name;
- 
diff --git a/comms/ifcico-cm/patches/patch-aq b/comms/ifcico-cm/patches/patch-aq
deleted file mode 100644
index 8e2b0049270..00000000000
--- a/comms/ifcico-cm/patches/patch-aq
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2002/07/06 19:05:54 tv Exp $
-
---- ifcico/zmsend.c.orig	Sun Jul  5 16:17:34 1998
-+++ ifcico/zmsend.c	Sat Jul  6 15:09:02 2002
-@@ -49,7 +49,7 @@
- static int Lzconv=0;
- static int Beenhereb4;
- static char Myattn[]={0};
--static long startime,endtime;
-+static time_t startime,endtime;
- static long skipsize;
- 
- extern void get_frame_buffer(void);
-@@ -107,7 +107,7 @@
- 
- static int finsend(void)
- {
--	int i,rc;
-+	int i,rc = ZFIN;
- 
- 	debug(DBG_PROTOCOL, "finsend");
- 	while (GETCHAR(1) >= 0) /*nothing*/;
-@@ -162,7 +162,7 @@
- 
- 	sprintf(txbuf,"%s %lu %lo %o 0 0 0",
- 		rn, (unsigned long) st.st_size,
--		st.st_mtime+(st.st_mtime%2),
-+		(unsigned long)(st.st_mtime+(st.st_mtime%2)),
- 		st.st_mode);
- 	bufl=strlen(txbuf);
- 	*(strchr(txbuf,' '))='\0'; /*hope no blanks in filename*/
diff --git a/comms/ifcico-cm/patches/patch-ar b/comms/ifcico-cm/patches/patch-ar
deleted file mode 100644
index 524ffe0408e..00000000000
--- a/comms/ifcico-cm/patches/patch-ar
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2001/02/21 18:50:37 tv Exp $
-
---- 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;
- 
- 	p = name + 1 + strlen(name);
--	sscanf(p, "%ld%lo%o%lo%d%ld%d%d",
-+	sscanf(p, "%ld%lo%o%lo%ld%ld%ld%ld",
- 	  &Bytesleft, &Modtime, &Filemode,
- 	  &dummy, &dummy, &dummy, &dummy, &dummy);
- 	strcpy(ctt,date(Modtime));
diff --git a/comms/ifcico-cm/patches/patch-as b/comms/ifcico-cm/patches/patch-as
deleted file mode 100644
index f85dd4e91d1..00000000000
--- a/comms/ifcico-cm/patches/patch-as
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-as,v 1.2 2001/02/21 18:50:37 tv Exp $
-
---- 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 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-at b/comms/ifcico-cm/patches/patch-at
deleted file mode 100644
index 87d00569944..00000000000
--- a/comms/ifcico-cm/patches/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-at,v 1.1 1998/12/21 15:45:21 tv Exp $
-
---- iflib/rdconfig.c.orig	Mon Dec 21 10:15:33 1998
-+++ iflib/rdconfig.c	Mon Dec 21 10:16:34 1998
-@@ -404,7 +404,9 @@
- 			fprintf(stderr,"configtime: %s",ctime(&configtime));
- 		}
- 
-+#ifndef __NetBSD__
- 		if (debugfile) freopen(debugfile,"a",stderr);
-+#endif
- 		debug(0,"start %s ver %s of %s, verbose 0x%08lx",
- 			myname,version,reldate,verbose);
- 	}
diff --git a/comms/ifcico-cm/patches/patch-au b/comms/ifcico-cm/patches/patch-au
deleted file mode 100644
index bfdf48133a0..00000000000
--- a/comms/ifcico-cm/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 1077014dc21..00000000000
--- a/comms/ifcico-cm/patches/patch-av
+++ /dev/null
@@ -1,40 +0,0 @@
-$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
deleted file mode 100644
index 1b2da615756..00000000000
--- a/comms/ifcico-cm/patches/patch-aw
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2001/02/21 20:40:57 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/bt/in
- # Directories for "listed" and "protected" sessions
--listinbound	/var/spool/ifmail/inb
--protinbound	/var/spool/ifmail/inb
-+listinbound	/var/spool/bt/in
-+protinbound	/var/spool/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/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/patches/patch-ax b/comms/ifcico-cm/patches/patch-ax
deleted file mode 100644
index 9c17d59129c..00000000000
--- a/comms/ifcico-cm/patches/patch-ax
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2001/02/24 20:43:56 tv Exp $
-
---- ifcico/nodebld.c.orig	Sat Feb 24 15:39:31 2001
-+++ ifcico/nodebld.c	Sat Feb 24 15:40:30 2001
-@@ -79,6 +79,7 @@
-   nm = xstrcat(nm, ".dir");
- #endif
- 
-+#ifndef NEWDB
-   if ((ifp = fopen(nm, "w")))
-     fclose(ifp);
-   else
-@@ -86,7 +87,6 @@
-     logerr("$cannot create new %s", S(nm));
-     return 1;
-   }
--#ifndef NEWDB
-   strcpy(nm+strlen(nm)-3,"pag");
-   if ((ifp=fopen(nm,"w"))) fclose(ifp);
-   else
diff --git a/comms/ifcico-cm/patches/patch-ay b/comms/ifcico-cm/patches/patch-ay
deleted file mode 100644
index 84518819e75..00000000000
--- a/comms/ifcico-cm/patches/patch-ay
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2001/03/09 12:08:26 dmcmahill Exp $
-
-needed for alpha when compiling with -Werror
-
---- ifcico/recvbark.c.orig	Mon Jul 15 14:02:34 1996
-+++ ifcico/recvbark.c	Fri Mar  9 06:51:47 2001
-@@ -1,3 +1,4 @@
- #include <stdio.h>
-+#include <string.h>
- #include "lutil.h"
- #include "ttyio.h"