- Update afio to 2.5.

- Use buildlink framework.
- NO_CONFIGURE=yes
- Enable pkgviews installation.

Changes in 2.5:

  - In afio.h ulo and ull macros, added L and LL letters in constants.
  - Documented `long long' issues in PORTING file.  Removed ifdeffed
    typedef ulonglong porting hacks from the afio.h file.
  - Changed mknod() call to mkfifo() call when creating named pipe from
    archive.  Freebsd cannot make named pipes with mknod.
  - Added some extra defines to suppress some warnings on sun platform.
    Also added some stuff around awk invocations in makefile and regtest
    to make things easier on sun -- the sun platform I tried it on had a
    default awk that was too ancient to understand things like gsub.
  - Added some discussion of sun and freebsd to PORTING file.
  - Fix to regression test: no longer complains if two compared directory
    inodes have a size difference.  Bases on bug report by vasudeva.
  - Changed sanity check on the stdin at the start of executing -o mode:
    now the check only happens if stdin is a tty.  This allows scripts to
    make empty archives, and is needed for compatibility with tob.  Based
    on problem report by Dirk Eddelbuettel.
  - Changed read() to readall() in outdata().
  - Updated SCRIPTS file.

3 files changed, 32 insertions, 23 deletions

diff --git a/archivers/afio/Makefile b/archivers/afio/Makefile
index db7aec9d08d..82853e1764d 100644
--- a/archivers/afio/Makefile
+++ b/archivers/afio/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2003/12/30 17:32:33 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/11 23:04:50 minskim Exp $
 
-DISTNAME=	afio-2.4.7
+DISTNAME=	afio-2.5
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.ibiblio.org/pub/Linux/system/backup/
 EXTRACT_SUFX=	.tgz
@@ -9,6 +9,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://freshmeat.net/projects/afio/
 COMMENT=	cpio-format archive creator with data corruption handling
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
+NO_CONFIGURE=	yes
 ALL_TARGET=	afio
 
+INSTALLATION_DIRS=	bin man/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/afio/distinfo b/archivers/afio/distinfo
index 2463a131ebb..5449945362b 100644
--- a/archivers/afio/distinfo
+++ b/archivers/afio/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/27 10:17:58 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/04/11 23:04:50 minskim Exp $
 
-SHA1 (afio-2.4.7.tgz) = 92e473f025cbc69893ccc46c4f91ffb52da2fef3
-Size (afio-2.4.7.tgz) = 91224 bytes
-SHA1 (patch-aa) = b7a1c3952d7b5265afa16f4e94585fa66518e2ee
+SHA1 (afio-2.5.tgz) = 051765f209fded60f94944da8a76ae37c3423a23
+Size (afio-2.5.tgz) = 179184 bytes
+SHA1 (patch-aa) = e35b47c2f10a6f80d8446e4c22a7a023dae55933
diff --git a/archivers/afio/patches/patch-aa b/archivers/afio/patches/patch-aa
index 32b979c8713..f3ad906feed 100644
--- a/archivers/afio/patches/patch-aa
+++ b/archivers/afio/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/27 10:17:58 agc Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/11 23:04:50 minskim Exp $
 
---- Makefile	2003/06/27 09:37:50	1.1
-+++ Makefile	2003/06/27 09:39:40
-@@ -26,7 +26,7 @@
+--- Makefile.orig	2003-12-21 04:23:51.000000000 -0600
++++ Makefile
+@@ -28,7 +28,7 @@ SHELL=/bin/sh
  c	= -DHAVEMEMCMP
  ##  Define DEFFMTCMD to being how to format the media you use the most
  ##		This is the DEFault FoRMat CoManD. 
@@ -11,27 +11,30 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/06/27 10:17:58 agc Exp $
  ##  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
-@@ -56,10 +56,10 @@
- 
- #CFLAGS1 = -ggdb
- #CFLAGS1 = -Wall -s -g -O2 -fomit-frame-pointer
--CFLAGS1 = -Wall -O2 -fomit-frame-pointer
-+#CFLAGS1 = -Wall -O2 -fomit-frame-pointer
+@@ -71,11 +71,12 @@ LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D
+ MW=
+ #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
  
+-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
++#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
++CFLAGS1 = ${LARGEFILEFLAGS}
  
 -CC=gcc
 +#CC=gcc
  
+-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
++CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
+ LDFLAGS =
  
- CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
-@@ -72,8 +72,8 @@
- 	rm -f *.o afio
+ afio : afio.o compfile.o exten.o match.o $M
+@@ -88,8 +89,8 @@ clean:
+ 	cd regtest; /bin/sh regtest.clean
  
  install: afio
--	cp afio /usr/bin
--	cp afio.1 /usr/man/man1
+-	cp afio /usr/local/bin
+-	cp afio.1 /usr/share/man/man1
 +	cp afio ${PREFIX}/bin
 +	cp afio.1 ${PREFIX}/man/man1
  
- 
- afio.o : afio.h patchlevel.h
+ # generate default list of -E extensions from manpage
+ # note: on sun, I had to change awk command below to nawk or gawk