Clean out my pkgsrc diffs:

Update unace to 1.2b, and make this compile and (mostly) run on LP64.

5 files changed, 65 insertions, 24 deletions

diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 5930822e307..32eb23f9851 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:11 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/31 14:44:42 tv Exp $
 #
 
-DISTNAME=	unacepub
-PKGNAME=	unace-1.2
+DISTNAME=	unace-1.2b
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.elf.stuba.sk/pub/pc/pack/ \
-		ftp://sunsite.univie.ac.at/pub/compression/ftp.elf.stuba.sk/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_SUNSITE:=utils/compress/}
 
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.winace.com/
@@ -15,9 +12,10 @@ COMMENT=	Extract, list and test files in ACE archives
 USE_BUILDLINK_ONLY=	yes
 USE_GMAKE=		yes
 
-DIST_SUBDIR=	unace-1.2
-WRKSRC=		${WRKDIR}
-MAKEFILE=	unix/makefile
+ALL_TARGET=	clean unace
+
+post-build:
+	false
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unace ${PREFIX}/bin
diff --git a/archivers/unace/distinfo b/archivers/unace/distinfo
index c2db44acfca..a0b6b9e5fc8 100644
--- a/archivers/unace/distinfo
+++ b/archivers/unace/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/07/16 10:21:15 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/10/31 14:44:42 tv Exp $
 
-SHA1 (unace-1.2/unacepub.zip) = 901dddb4f1c947371306b375408ae4494d18ff62
-Size (unace-1.2/unacepub.zip) = 30924 bytes
-SHA1 (patch-aa) = 41c0b5e0158fcd27a690588b903adea7973be6c9
+SHA1 (unace-1.2b.tar.gz) = 7a0cc01105551a84f15897b75749dd9bb2a26184
+Size (unace-1.2b.tar.gz) = 43423 bytes
+SHA1 (patch-aa) = bba4226db32be4f0e2217aad6ae38dabf9038ed1
 SHA1 (patch-ab) = f450aa34f650525ae36d90609393990ed650766a
+SHA1 (patch-ac) = bdf7ef7e3cd0e531ca88f465b2c3fc5b55dbfb03
+SHA1 (patch-ad) = 4e9b0a0bbcf6c673f7847048b015e0c488c52b0f
diff --git a/archivers/unace/patches/patch-aa b/archivers/unace/patches/patch-aa
index f85babdd650..c573fc997c2 100644
--- a/archivers/unace/patches/patch-aa
+++ b/archivers/unace/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2001/07/16 10:21:15 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/10/31 14:44:43 tv Exp $
 
---- unix/makefile.orig	Wed Jul  1 04:29:10 1998
-+++ unix/makefile
-@@ -16,11 +16,11 @@
+--- Makefile.orig	Wed May 12 03:10:27 1999
++++ Makefile	Mon Oct  8 11:00:24 2001
+@@ -15,12 +15,11 @@
+ 
  #CFLAGS = -Wall -O3 -s #-DNDEBUG
  #CFLAGS = -g -Wall -DMDEBUG
- #CFLAGS = -O3 -fno-strength-reduce -fomit-frame-pointer # These are for Linux
--CFLAGS = -O -g -Wall -dLO_HI_BYTE_ORDER
-+CFLAGS += -g -Wall
+-CFLAGS = -O3 -fno-strength-reduce -fomit-frame-pointer # These are for Linux
+ #CFLAGS = -O -g -Wall -dLO_HI_BYTE_ORDER
  CHALLOC = challoc.o
  CHALLOC =
  CHNEW = chnew.o challoc.o
@@ -16,11 +16,8 @@ $NetBSD: patch-aa,v 1.2 2001/07/16 10:21:15 jlam Exp $
  
  ifeq ($(OSTYPE), Linux)
  CFLAGS += -DUNIX -DCASEINSENSE
-@@ -36,9 +36,10 @@
- # not all systems require the math library
- #LIBS = -lm
+@@ -38,7 +37,7 @@
  
-+all: unace
  
  unace$(EXEEXT): $(OBJ) $(CHALLOC)
 -	gcc $(CFLAGS) -o $@ $^ $(LIBS)
diff --git a/archivers/unace/patches/patch-ac b/archivers/unace/patches/patch-ac
new file mode 100644
index 00000000000..818174d6d5d
--- /dev/null
+++ b/archivers/unace/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2001/10/31 14:44:43 tv Exp $
+
+--- declare.h.orig	Mon Oct  8 10:45:50 2001
++++ declare.h	Mon Oct  8 10:50:29 2001
+@@ -17,14 +17,14 @@
+ typedef short          SHORT ;
+ typedef unsigned short UWORD ;
+ typedef short          WORD  ;
+-typedef unsigned long  ULONG ;
+-typedef long           LONG  ;
++typedef unsigned int   ULONG ;
++typedef int            LONG  ;
+ 
+ #endif  /* !AMIGA */
+ 
+ typedef unsigned char  UCHAR ;
+ typedef char           CHAR  ;
+-typedef unsigned       UINT  ;
++typedef unsigned int   UINT  ;
+ typedef int            INT   ;
+ 
+ 
diff --git a/archivers/unace/patches/patch-ad b/archivers/unace/patches/patch-ad
new file mode 100644
index 00000000000..71eeefd9bf2
--- /dev/null
+++ b/archivers/unace/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2001/10/31 14:44:43 tv Exp $
+
+--- unace.c.orig	Mon Oct  8 10:49:26 2001
++++ unace.c	Mon Oct  8 10:50:15 2001
+@@ -512,7 +512,7 @@
+             tpsize+= fhead.PSIZE;
+          }
+          if (!f_err)
+-            printf("%02u.%02u.%02u|%02u:%02u|%c%c%9lu|%9lu|%4u%%|%c%s\n",
++            printf("%02u.%02u.%02u|%02u:%02u|%c%c%9u|%9u|%4u%%|%c%s\n",
+                    ts_day (ti), ts_month(ti), ts_year(ti)%100,
+                    ts_hour(ti), ts_min  (ti),
+                    fhead.HEAD_FLAGS & ACE_SP_BEF   ? '<' : ' ',
+@@ -525,7 +525,7 @@
+    }
+    if (!f_err)
+    {
+-      printf("\n                 %9lu|%9lu|%4u%%| %u file%s",
++      printf("\n                 %9u|%9u|%4u%%| %u file%s",
+              psize,
+              size,
+              percentage(psize, size),