Upgrade to 2.4.2.

Submitted by:	Juergen Lock <nox@jelal.hb.north.de> (w/many organizational
		changes by me)
Closes PR:	ports/1991

4 files changed, 113 insertions, 56 deletions

diff --git a/sysutils/afio/distinfo b/sysutils/afio/distinfo
index 79ba0e7d0f9..5194ffdde5f 100644
--- a/sysutils/afio/distinfo
+++ b/sysutils/afio/distinfo
@@ -1 +1 @@
-MD5 (afio.2.4.1.tgz) = a510e280764acbe31b88e31a09a953ac
+MD5 (afio.2.4.2.tgz) = 0b8351f9f0014aaa18e631473f9c8751
diff --git a/sysutils/afio/files/patch-aa b/sysutils/afio/files/patch-aa
index e1e94bc479f..cd1078adb74 100644
--- a/sysutils/afio/files/patch-aa
+++ b/sysutils/afio/files/patch-aa
@@ -1,38 +1,48 @@
-Index: Makefile
-@@ -26,7 +26,7 @@
+--- Makefile.orig	Tue Nov  7 13:16:12 1995
++++ Makefile	Mon Jan  6 00:52:41 1997
+@@ -26,7 +26,8 @@
  c	= -DHAVEMEMCMP
  ##  Define DEFFMTCMD to being how to format the media you use the most
  ##		This is the DEFault FoRMat CoManD. 
--d	= -DDEFFMTCMD='"/bin/fdformat /dev/fd0H1440"'
+-d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
++#d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
 +d	= -DDEFFMTCMD='"/usr/sbin/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
-@@ -54,24 +54,29 @@
+@@ -43,6 +44,11 @@
+ 
+ g	= -DHAVEFNMATCH
+ 
++## Define HAVE_PARAM_H if your system has sys/param.h.  This is used for BSD
++#  detection.
++
++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
  # redistribute afio executables with this library linked in.
  
--CFLAGS = -s -O2 -fomit-frame-pointer
-+CPPFLAGS = $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
-+
-+CFLAGS = -O2 -fomit-frame-pointer -fno-strength-reduce $(CPPFLAGS)
- #CFLAGS =  -fomit-frame-pointer
- #CFLAGS = -Wall  -fomit-frame-pointer
+-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
  
  CC=gcc
  
  
--CPPFLAGS = $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
--LDFLAGS = -s -N 
-+#LDFLAGS = -s -N 
+-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
-+
-+all : afio
  
  afio : afio.o compfile.o exten.o match.o $M
-+	$(CC) $(LDFLAGS) $? -o $@
- 
- clean:
+ 	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
+@@ -71,8 +78,8 @@
  	rm -f *.o afio
  
  install: afio
@@ -42,40 +52,4 @@ Index: Makefile
 +	install -c -o bin -g bin afio.1 ${PREFIX}/man/man1
  
  tarfile: clean
- 	{ cd .. ; tar zcvf /root/src/tbackup/afio.2.4.1.tgz afio.2.4.1 }
-Index: afio.h
-@@ -194,9 +194,9 @@
-   char sb_link[PATHSIZE];
- } Stat;
- 
--#define	STAT(name, asb)		stat(name, &(asb)->sb_stat)
--#define	FSTAT(fd, asb)		fstat(fd, &(asb)->sb_stat)
--#define	LSTAT(name, asb)	lstat(name, &(asb)->sb_stat)
-+#define	STAT(name, asb)		(stat(name, (((asb)->sb_stat.st_rdev = 0), &(asb)->sb_stat)) ? -1 : ((((asb)->sb_stat.st_mode & S_IFMT) == S_IFREG) ? ((asb)->sb_stat.st_rdev = 0) : 0))
-+#define	FSTAT(fd, asb)		(fstat(fd, (((asb)->sb_stat.st_rdev = 0), &(asb)->sb_stat)) ? -1 : ((((asb)->sb_stat.st_mode & S_IFMT) == S_IFREG) ? ((asb)->sb_stat.st_rdev = 0) : 0))
-+#define	LSTAT(name, asb)	(lstat(name, (((asb)->sb_stat.st_rdev = 0), &(asb)->sb_stat)) ? -1 : ((((asb)->sb_stat.st_mode & S_IFMT) == S_IFREG) ? ((asb)->sb_stat.st_rdev = 0) : 0))
- #define	sb_dev		sb_stat.st_dev
- #define	sb_ino		sb_stat.st_ino
- #define	sb_mode		sb_stat.st_mode
-@@ -215,9 +215,9 @@
-  * File status without symbolic links.
-  */
- typedef struct stat Stat;
--#define	STAT(name, asb)		stat(name, asb)
--#define	FSTAT(fd, asb)		fstat(fd, asb)
--#define	LSTAT(name, asb)	stat(name, asb)
-+#define	STAT(name, asb)		(stat(name, (((asb)->st_rdev = 0), asb)) ? -1 : ((((asb)->sb_stat.st_mode & S_IFMT) == S_IFREG) ? ((asb)->sb_stat.st_rdev = 0) : 0))
-+#define	FSTAT(fd, asb)		(fstat(fd, (((asb)->st_rdev = 0), asb)) ? -1 : ((((asb)->sb_stat.st_mode & S_IFMT) == S_IFREG) ? ((asb)->sb_stat.st_rdev = 0) : 0))
-+#define	LSTAT(name, asb)	(stat(name, (((asb)->st_rdev = 0), asb)) ? -1 : ((((asb)->sb_stat.st_mode & S_IFMT) == S_IFREG) ? ((asb)->sb_stat.st_rdev = 0) : 0))
- #define	sb_dev		st_dev
- #define	sb_ino		st_ino
- #define	sb_mode		st_mode
-@@ -371,7 +371,7 @@
- #ifndef MKDIR
- int rmdir ();
- #endif
--#ifndef linux
-+#if !defined (linux) && !defined(__FreeBSD__)
- VOIDFN (*signal ())();
- #endif
-      int fswrite ();
+ 	{ cd .. ; tar zcvf /root/src/tbackup/afio.2.4.2.tgz afio.2.4.2 }
diff --git a/sysutils/afio/files/patch-ab b/sysutils/afio/files/patch-ab
new file mode 100644
index 00000000000..27d9e92cff7
--- /dev/null
+++ b/sysutils/afio/files/patch-ab
@@ -0,0 +1,37 @@
+--- 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));
diff --git a/sysutils/afio/files/patch-ac b/sysutils/afio/files/patch-ac
new file mode 100644
index 00000000000..6c22cbcf1a6
--- /dev/null
+++ b/sysutils/afio/files/patch-ac
@@ -0,0 +1,46 @@
+--- afio.h.orig	Sun Jan 21 04:58:12 1996
++++ afio.h	Mon Jan  6 00:53:13 1997
+@@ -1,5 +1,9 @@
+ /* afio.h  defines for afio. */
+ 
++#ifdef HAVE_PARAM_H
++#include <sys/param.h>
++#endif
++
+ #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 ();