- upgrade to 2.4.6

- respect ${CC}
- use /usr/bin/gzip instead of gzip

(maintainer timeout)

6 files changed, 44 insertions, 23 deletions

diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index 995cc541086d..3733a08c1197 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    afio
-# Version required:     2.4.5
+# Version required:     2.4.6
 # Date created:         4 October 1995
 # Whom:                 Juergen Lock <nox@jelal.hb.north.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       afio-2.4.5
+DISTNAME=       afio-2.4.6
 CATEGORIES=     sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/backup
@@ -14,7 +14,7 @@ EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	nox@jelal.hb.north.de
 
-WRKSRC=		${WRKDIR}/afio.2.4.5
+WRKSRC=		${WRKDIR}/afio.2.4.6
 ALL_TARGET=	afio
 MAN1=		afio.1
 
diff --git a/sysutils/afio/distinfo b/sysutils/afio/distinfo
index fac3e33ac9f9..fa842ca2fc75 100644
--- a/sysutils/afio/distinfo
+++ b/sysutils/afio/distinfo
@@ -1 +1 @@
-MD5 (afio-2.4.5.tgz) = c9e5e76fa6df4522ee62abeffe78c9c0
+MD5 (afio-2.4.6.tgz) = b6547725156edb525ef080128037d74c
diff --git a/sysutils/afio/files/patch-aa b/sysutils/afio/files/patch-aa
index 44e2e568bae6..4f46eba8cab4 100644
--- a/sysutils/afio/files/patch-aa
+++ b/sysutils/afio/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Sep 29 04:13:19 1998
-+++ Makefile	Wed Dec  9 01:30:18 1998
-@@ -26,7 +26,7 @@
+--- Makefile.orig	Thu Nov 25 22:42:26 1999
++++ Makefile	Thu Jan 27 15:03:54 2000
+@@ -26,14 +26,14 @@
  c	= -DHAVEMEMCMP
  ##  Define DEFFMTCMD to being how to format the media you use the most
  ##		This is the DEFault FoRMat CoManD. 
@@ -9,6 +9,14 @@
  ##  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
+ 
+ ##  Define PRG_COMPRESS to get something other than `gzip'.
+ # you need to edit compfile.c (-G option) if you change this line.
+-f	= -DPRG_COMPRESS='"gzip"'
++f	= -DPRG_COMPRESS='"/usr/bin/gzip"'
+ 
+ ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
+ # -y -Y -w -W matching.
 @@ -43,6 +43,11 @@
  
  g	= -DHAVEFNMATCH
@@ -21,22 +29,22 @@
  # 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
-@@ -55,14 +60,15 @@
- # redistribute afio executables with this library linked in.
+@@ -56,13 +61,14 @@
  
  #CFLAGS1 = -ggdb
--CFLAGS1 = -Wformat -g -O2 -fomit-frame-pointer
-+#FLAGS1 = -Wformat -g -O2 -fomit-frame-pointer
- #CFLAGS1 = -Wformat -g -fomit-frame-pointer
+ #CFLAGS1 = -Wall -s -g -O2 -fomit-frame-pointer
+-CFLAGS1 = -Wall -O2 -fomit-frame-pointer
++#CFLAGS1 = -Wall -O2 -fomit-frame-pointer
 +CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce
  
  
- CC=gcc
+-CC=gcc
++#CC=gcc
  
  
 -CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
 +CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I
- LDFLAGS = -s
+ LDFLAGS =
  
  afio : afio.o compfile.o exten.o match.o $M
 @@ -72,8 +78,8 @@
diff --git a/sysutils/afio/files/patch-ab b/sysutils/afio/files/patch-ab
index 6fc5a9addb74..6dbf321690f4 100644
--- a/sysutils/afio/files/patch-ab
+++ b/sysutils/afio/files/patch-ab
@@ -1,11 +1,11 @@
---- 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",
+--- afio.c.orig	Fri Nov 26 01:24:39 1999
++++ afio.c	Thu Jan 27 14:23:28 2000
+@@ -609,7 +609,7 @@
+                aruntil, arbsize);    
+ #else
+       fprintf (stderr, "Media size %ld is less than block size %d\n",
 -	       (ulong) aruntil, arbsize);
 +	       (u_long) aruntil, arbsize);
-       usage ();
+ #endif
+    usage ();
      }
-   if (arpad == 0)
diff --git a/sysutils/afio/files/patch-ad b/sysutils/afio/files/patch-ad
new file mode 100644
index 000000000000..53c760f3c328
--- /dev/null
+++ b/sysutils/afio/files/patch-ad
@@ -0,0 +1,11 @@
+--- compfile.c.orig	Thu Nov 25 22:22:28 1999
++++ compfile.c	Thu Jan 27 14:36:31 2000
+@@ -207,7 +207,7 @@
+  * version;
+  */
+ 
+-#if ( defined(sun) && defined(__svr4__) )
++#if ( defined(sun) && defined(__svr4__) || defined(__FreeBSD__) )
+ #include <dirent.h>
+ #else
+ #include <sys/dir.h>
diff --git a/sysutils/afio/pkg-plist b/sysutils/afio/pkg-plist
index 95a6cbc2bd91..7ae24f79437a 100644
--- a/sysutils/afio/pkg-plist
+++ b/sysutils/afio/pkg-plist
@@ -1,10 +1,12 @@
 bin/afio
 share/doc/afio/README
 share/doc/afio/SCRIPTS
-share/examples/afio/afiodump.example
 share/examples/afio/DONTDUMP
 share/examples/afio/README
+share/examples/afio/afiodump.example
 share/examples/afio/backup
+share/examples/afio/gnupg_read
+share/examples/afio/gnupg_write
 share/examples/afio/pgp_read
 share/examples/afio/pgp_write
 share/examples/afio/restore