6 files changed, 56 insertions, 114 deletions

diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index 2e3923c6021b..6f904ea56bcf 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    afio
-# Version required:     2.4.1
+# Version required:     2.4.5
 # Date created:         4 October 1995
 # Whom:                 Juergen Lock <nox@jelal.hb.north.de>
 #
-# $Id: Makefile,v 1.5 1997/01/06 09:24:57 obrien Exp $
+# $Id: Makefile,v 1.6 1997/04/01 22:09:19 fenner Exp $
 #
 
-DISTNAME=       afio.2.4.2
-PKGNAME=        afio-2.4.2
+DISTNAME=       afio-2.4.5
 CATEGORIES=     sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/backup
@@ -15,6 +14,7 @@ EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	nox@jelal.hb.north.de
 
+WRKSRC=		${WRKDIR}/afio.2.4.5
 ALL_TARGET=	afio
 MAN1=		afio.1
 
@@ -24,10 +24,12 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/afio
 	@(cd ${WRKSRC} ; \
 		${INSTALL_MAN} README SCRIPTS ${PREFIX}/share/doc/afio)
-	@${MKDIR} ${PREFIX}/share/example/afio
-	@${INSTALL_SCRIPT} ${FILESDIR}/afiodump.example ${PREFIX}/share/example/afio
-	@${INSTALL_SCRIPT} ${WRKSRC}/script1/DONTDUMP ${PREFIX}/share/example/afio
-	@${INSTALL_SCRIPT} ${WRKSRC}/script2/* ${PREFIX}/share/example/afio
+	@${MKDIR} ${PREFIX}/share/examples/afio
+	@${INSTALL_SCRIPT} ${FILESDIR}/afiodump.example ${PREFIX}/share/examples/afio
+	@${INSTALL_DATA} ${WRKSRC}/script1/DONTDUMP ${PREFIX}/share/examples/afio
+	@${INSTALL_SCRIPT} ${WRKSRC}/script2/* ${PREFIX}/share/examples/afio
+	@${INSTALL_SCRIPT} ${WRKSRC}/script3/* ${PREFIX}/share/examples/afio
+	@${INSTALL_SCRIPT} ${WRKSRC}/script4/* ${PREFIX}/share/examples/afio
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/afio/distinfo b/sysutils/afio/distinfo
index 5194ffdde5f1..fac3e33ac9f9 100644
--- a/sysutils/afio/distinfo
+++ b/sysutils/afio/distinfo
@@ -1 +1 @@
-MD5 (afio.2.4.2.tgz) = 0b8351f9f0014aaa18e631473f9c8751
+MD5 (afio-2.4.5.tgz) = c9e5e76fa6df4522ee62abeffe78c9c0
diff --git a/sysutils/afio/files/patch-aa b/sysutils/afio/files/patch-aa
index cd1078adb748..44e2e568bae6 100644
--- a/sysutils/afio/files/patch-aa
+++ b/sysutils/afio/files/patch-aa
@@ -1,55 +1,52 @@
---- Makefile.orig	Tue Nov  7 13:16:12 1995
-+++ Makefile	Mon Jan  6 00:52:41 1997
-@@ -26,7 +26,8 @@
+--- Makefile.orig	Tue Sep 29 04:13:19 1998
++++ Makefile	Wed Dec  9 01:30:18 1998
+@@ -26,7 +26,7 @@
  c	= -DHAVEMEMCMP
  ##  Define DEFFMTCMD to being how to format the media you use the most
  ##		This is the DEFault FoRMat CoManD. 
 -d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
-+#d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
-+d	= -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0.1440"'
++d	= -DDEFFMTCMD='"/usr/bin/fdformat -f 1440 /dev/fd0.1440"'
  ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
  ##	file name (or longer for BSD) in the archive when the file is compressed
  #e	= -DLONGZFILE
-@@ -43,6 +44,11 @@
+@@ -43,6 +43,11 @@
  
  g	= -DHAVEFNMATCH
  
-+## Define HAVE_PARAM_H if your system has sys/param.h.  This is used for BSD
++## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD
 +#  detection.
 +
-+h	= -DHAVE_PARAM_H
++h 	= -DHAVE_PARAM_H
 +
  # fnmatch() is in the gnu C library, so it is directly available on
  # Linux.  If your system (e.g. SCO) does not have the gnu C library,
  # unpack the archive gnu.fnmatch.tar.gz and uncomment the following
-@@ -54,15 +60,16 @@
- # Please read the COPYING.LIB file in this archive if you plan to
+@@ -55,14 +60,15 @@
  # redistribute afio executables with this library linked in.
  
--CFLAGS1 = -s -O2 -fomit-frame-pointer
-+#CFLAGS1 = -s -O2 -fomit-frame-pointer
- #CFLAGS1 =  -fomit-frame-pointer
- #CFLAGS1 = -Wall  -fomit-frame-pointer
-+CFLAGS1 = -O2 -fomit-frame-pointer -fno-strength-reduce
+ #CFLAGS1 = -ggdb
+-CFLAGS1 = -Wformat -g -O2 -fomit-frame-pointer
++#FLAGS1 = -Wformat -g -O2 -fomit-frame-pointer
+ #CFLAGS1 = -Wformat -g -fomit-frame-pointer
++CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce
+ 
  
  CC=gcc
  
  
 -CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
--LDFLAGS = -s
-+CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I
-+#LDFLAGS = -s
++CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I
+ LDFLAGS = -s
  
  afio : afio.o compfile.o exten.o match.o $M
- 	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
-@@ -71,8 +78,8 @@
+@@ -72,8 +78,8 @@
  	rm -f *.o afio
  
  install: afio
 -	cp afio /usr/bin
 -	cp afio.1 /usr/man/man1
-+	install -cs -o bin -g bin afio ${PREFIX}/bin
-+	install -c -o bin -g bin afio.1 ${PREFIX}/man/man1
++	install -cs -o root -g wheel afio ${PREFIX}/bin
++	install -c -o root -g wheel afio.1 ${PREFIX}/man/man1
+ 
  
- tarfile: clean
- 	{ cd .. ; tar zcvf /root/src/tbackup/afio.2.4.2.tgz afio.2.4.2 }
+ afio.o : afio.h patchlevel.h
diff --git a/sysutils/afio/files/patch-ab b/sysutils/afio/files/patch-ab
index 27d9e92cff77..6fc5a9addb74 100644
--- a/sysutils/afio/files/patch-ab
+++ b/sysutils/afio/files/patch-ab
@@ -1,37 +1,11 @@
---- afio.c.orig	Sun Jan 21 11:39:35 1996
-+++ afio.c	Mon Jan  6 00:27:47 1997
-@@ -827,21 +827,21 @@
-     return (warnarch ("Bad ASCII header", (off_t) H_STRLEN));
- #else
-   /* this should be much more portable than the one above */
--  if (sscanf (header, PH_SCAN, &pasb.st_dev,
--	      &pasb.st_ino, &pasb.st_mode, &pasb.st_uid,
--	      &pasb.st_gid, &pasb.st_nlink, &pasb.st_rdev,
--	      &pasb.st_mtime, &namelen, &pasb.st_size) != H_COUNT)
-+  if (sscanf (header, PH_SCAN, &pasb.PSt_dev,
-+	      &pasb.PSt_ino, &pasb.PSt_mode, &pasb.PSt_uid,
-+	      &pasb.PSt_gid, &pasb.PSt_nlink, &pasb.PSt_rdev,
-+	      &pasb.PSt_mtime, &namelen, &pasb.PSt_size) != H_COUNT)
-     return (warnarch ("Bad ASCII header", (off_t) H_STRLEN));
-   /* now, we let the compiler cast the info to the right types (field sizes) */
--  asb->sb_dev = pasb.st_dev;
--  asb->sb_ino = pasb.st_ino;
--  asb->sb_mode = pasb.st_mode;
--  asb->sb_uid = pasb.st_uid;
--  asb->sb_gid = pasb.st_gid;
--  asb->sb_nlink = pasb.st_nlink;
--  asb->sb_rdev = pasb.st_rdev;
--  asb->sb_mtime = pasb.st_mtime;
--  asb->sb_size = pasb.st_size;
-+  asb->sb_dev = pasb.PSt_dev;
-+  asb->sb_ino = pasb.PSt_ino;
-+  asb->sb_mode = pasb.PSt_mode;
-+  asb->sb_uid = pasb.PSt_uid;
-+  asb->sb_gid = pasb.PSt_gid;
-+  asb->sb_nlink = pasb.PSt_nlink;
-+  asb->sb_rdev = pasb.PSt_rdev;
-+  asb->sb_mtime = pasb.PSt_mtime;
-+  asb->sb_size = pasb.PSt_size;
- #endif
-   if (namelen == 0 || namelen >= PATHSIZE)
-     return (warnarch ("Bad ASCII pathname length", (off_t) H_STRLEN));
+--- afio.c.orig	Tue Sep 29 04:05:54 1998
++++ afio.c	Wed Dec  9 01:38:58 1998
+@@ -427,7 +427,7 @@
+   if (aruntil && (aruntil < arbsize))
+     {
+       fprintf (stderr, "Media size %ld is less than buffer size %d\n",
+-	       (ulong) aruntil, arbsize);
++	       (u_long) aruntil, arbsize);
+       usage ();
+     }
+   if (arpad == 0)
diff --git a/sysutils/afio/files/patch-ac b/sysutils/afio/files/patch-ac
index 6c22cbcf1a61..efc88a9b950c 100644
--- a/sysutils/afio/files/patch-ac
+++ b/sysutils/afio/files/patch-ac
@@ -1,5 +1,5 @@
---- afio.h.orig	Sun Jan 21 04:58:12 1996
-+++ afio.h	Mon Jan  6 00:53:13 1997
+--- afio.h.orig	Sun Sep 20 04:04:54 1998
++++ afio.h	Wed Dec  9 01:33:32 1998
 @@ -1,5 +1,9 @@
  /* afio.h  defines for afio. */
  
@@ -10,37 +10,3 @@
  #ifdef	SYSTIME
  #include <sys/time.h>
  #else /* SYSTIME */
-@@ -107,15 +111,15 @@
- #define PH_SCAN  "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6o%11lo"
- 
- typedef struct {
--long unsigned int st_dev;
--long unsigned int st_ino;
--long unsigned int st_mode;
--long unsigned int st_uid;
--long unsigned int st_gid;
--long unsigned int st_nlink;
--long unsigned int st_rdev;
--long unsigned int st_mtime;
--long unsigned int st_size;
-+long unsigned int PSt_dev;
-+long unsigned int PSt_ino;
-+long unsigned int PSt_mode;
-+long unsigned int PSt_uid;
-+long unsigned int PSt_gid;
-+long unsigned int PSt_nlink;
-+long unsigned int PSt_rdev;
-+long unsigned int PSt_mtime;
-+long unsigned int PSt_size;
- } PStat;
- 
- #define	H_STRLEN 70		/* ASCII header string length */
-@@ -388,7 +392,7 @@
- #ifndef MKDIR
- int rmdir ();
- #endif
--#ifndef linux
-+#if !defined (linux) && !(defined(BSD) && (BSD >= 199103))
- VOIDFN (*signal ())();
- #endif
-      int fswrite ();
diff --git a/sysutils/afio/pkg-plist b/sysutils/afio/pkg-plist
index 1a85c82ca777..95a6cbc2bd91 100644
--- a/sysutils/afio/pkg-plist
+++ b/sysutils/afio/pkg-plist
@@ -1,12 +1,15 @@
 bin/afio
 share/doc/afio/README
 share/doc/afio/SCRIPTS
-share/example/afio/afiodump.example
-share/example/afio/DONTDUMP
-share/example/afio/README
-share/example/afio/backup
-share/example/afio/restore
-share/example/afio/x.dot
-share/example/afio/x.home
+share/examples/afio/afiodump.example
+share/examples/afio/DONTDUMP
+share/examples/afio/README
+share/examples/afio/backup
+share/examples/afio/pgp_read
+share/examples/afio/pgp_write
+share/examples/afio/restore
+share/examples/afio/tapechange
+share/examples/afio/x.dot
+share/examples/afio/x.home
 @dirrm share/doc/afio
-@dirrm share/example/afio
+@dirrm share/examples/afio