Fix paths in PLIST.

Lots of LP64 time_t fixes.  Now works on Alpha except for ZedZip (ZModem).

11 files changed, 188 insertions, 18 deletions

diff --git a/comms/ifcico-cm/Makefile b/comms/ifcico-cm/Makefile
index 00511656f5e..2540ac7e305 100644
--- a/comms/ifcico-cm/Makefile
+++ b/comms/ifcico-cm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/23 17:48:22 tv Exp $
+# $NetBSD: Makefile,v 1.2 1998/12/21 15:45:20 tv Exp $
 #
 
 DISTNAME=	ifcico-3.0.cm.alpha-4.0
@@ -16,12 +16,12 @@ post-build:
 	cd ${WRKSRC}/contrib/fdpass && ${LINK.c} -o fdpass fdpass.c
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/ifcico ${PREFIX}/etc/ifcico/inouttabs
-	${INSTALL_DATA} ${WRKSRC}/misc/config ${PREFIX}/etc/ifcico/config.dist
-	${INSTALL_DATA} ${WRKSRC}/misc/config-global ${PREFIX}/etc/ifcico/
+	${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/ifcico/inouttabs/
+		${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 \
diff --git a/comms/ifcico-cm/patches/patch-aa b/comms/ifcico-cm/patches/patch-aa
index baf67b6818e..2f813d23b77 100644
--- a/comms/ifcico-cm/patches/patch-aa
+++ b/comms/ifcico-cm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
+$NetBSD: patch-aa,v 1.2 1998/12/21 15:45:21 tv Exp $
 
 --- CONFIG.orig	Fri Jul 10 17:06:34 1998
 +++ CONFIG	Mon Nov 23 09:57:21 1998
@@ -58,9 +58,10 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/23 17:48:23 tv Exp $
 @@ -253,8 +260,8 @@
  SHELL = /bin/sh
  ECHO = echo -e
- CC = gcc -pipe
+-CC = gcc -pipe
 -#YACC = yacc
 -YACC = bison -y
++#CC = gcc -pipe
 +YACC = yacc
 +#YACC = bison -y
  #LEX = lex
diff --git a/comms/ifcico-cm/patches/patch-am b/comms/ifcico-cm/patches/patch-am
new file mode 100644
index 00000000000..76aedb2c393
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 1998/12/21 15:45:21 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 @@
+ 
+ 	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);
+ 		fclose(fp);
+ 	}
+ 
+@@ -44,7 +44,7 @@
+ 		else st.tryno+=incr;
+ 		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);
+ 		fclose(fp);
+ 	}
diff --git a/comms/ifcico-cm/patches/patch-an b/comms/ifcico-cm/patches/patch-an
new file mode 100644
index 00000000000..f9a69eb16ac
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-an
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..499044339cc
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-ao
@@ -0,0 +1,31 @@
+$NetBSD: patch-ao,v 1.1 1998/12/21 15:45:21 tv Exp $
+
+--- ifcico/emsidat.c.orig	Mon Dec 21 09:44:01 1998
++++ ifcico/emsidat.c	Mon Dec 21 09:45:53 1998
+@@ -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));
+ 	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,"%04lX",strlen(p+12));
+ 	memcpy(p+8,cbuf,4);
+ 	debug(DBG_HANDSHAKE, "prepared: \"%s\"",p);
+ 	return p;
+@@ -354,7 +354,7 @@
+ 
+ 		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
new file mode 100644
index 00000000000..53b7c0daff9
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-ap
@@ -0,0 +1,40 @@
+$NetBSD: patch-ap,v 1.1 1998/12/21 15:45:21 tv Exp $
+
+--- ifcico/hydra.c.orig	Mon Dec 21 09:46:45 1998
++++ ifcico/hydra.c	Mon Dec 21 09:50:00 1998
+@@ -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])) |
+@@ -894,7 +894,7 @@
+ 	if (to_send)
+ 	{
+ 	  txlen = sprintf(txbuf, "%08lx%08lx%08lx%08lx%08lx",
+-			  mtime2sl(txstat.st_mtime),
++			  (long)mtime2sl(txstat.st_mtime),
+ 			  txstat.st_size,
+ 			  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
new file mode 100644
index 00000000000..aa090414db4
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 1998/12/21 15:45:21 tv Exp $
+
+--- ifcico/zmsend.c.orig	Mon Dec 21 09:52:07 1998
++++ ifcico/zmsend.c	Mon Dec 21 09:53:20 1998
+@@ -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);
+@@ -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
new file mode 100644
index 00000000000..820ae66525a
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 1998/12/21 15:45:21 tv Exp $
+
+--- ifcico/zmrecv.c.orig	Mon Dec 21 09:56:18 1998
++++ ifcico/zmrecv.c	Mon Dec 21 09:57:09 1998
+@@ -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
new file mode 100644
index 00000000000..bda40ebf01e
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-as
@@ -0,0 +1,14 @@
+$NetBSD: patch-as,v 1.1 1998/12/21 15:45:21 tv Exp $
+
+--- ifcico/tcpproto.c.orig	Mon Dec 21 09:57:54 1998
++++ ifcico/tcpproto.c	Mon Dec 21 09:58:29 1998
+@@ -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 int sendfile(char *,char *);
+ static int finsend(void);
diff --git a/comms/ifcico-cm/patches/patch-at b/comms/ifcico-cm/patches/patch-at
new file mode 100644
index 00000000000..87d00569944
--- /dev/null
+++ b/comms/ifcico-cm/patches/patch-at
@@ -0,0 +1,14 @@
+$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/pkg/PLIST b/comms/ifcico-cm/pkg/PLIST
index 40a237b2de2..0ca2cfc8bbf 100644
--- a/comms/ifcico-cm/pkg/PLIST
+++ b/comms/ifcico-cm/pkg/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/11/23 17:48:24 tv Exp $
-etc/ifcico/inouttabs/fidom2iso
-etc/ifcico/inouttabs/ibmpc-latin1
-etc/ifcico/inouttabs/iso2fidom
-etc/ifcico/inouttabs/latin1-ibmpc
-etc/ifcico/inouttabs/outaltkoi8
-etc/ifcico/inouttabs/outkoi8alt
-@dirrm etc/ifcico/inouttabs
-etc/ifcico/config.dist
-etc/ifcico/config-global
-@dirrm etc/ifcico
+@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
 man/man8/ifcico.8
 man/man8/ifindex.8
 man/man8/ifinfo.8