- remove the need for gmake

- use MAKE_FLAGS
- quiet two warnings
- bring in the header sys/types.h for the definition of BYTE_ORDER

archivers/unace/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/02/12 08:41:07 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/14 22:12:48 brad Exp $
 # $FreeBSD: Makefile,v 1.1.1.1 1999/04/02 04:19:20 steve Exp $
 
 DISTNAME=	unacepub
@@ -11,16 +11,18 @@ NEED_VERSION=	1.191
 MAINTAINER=	brad@openbsd.org
 
 LICENSE_TYPE=		NONE
-PERMIT_PKG_CDROM=	YES
-PERMIT_PKG_FTP=		YES
-PERMIT_DISTF_CDROM=	YES
-PERMIT_DISTF_FTP=	YES
+PERMIT_PKG_CDROM=	yes
+PERMIT_PKG_FTP=		yes
+PERMIT_DISTF_CDROM=	yes
+PERMIT_DISTF_FTP=	yes
 
 USE_ZIP=	yes
-USE_GMAKE=	yes
+
+MAKEFILE=	unix/makefile
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -Wall -DUNIX -DCASEINSENSE"
 
 ALL_TARGET=	unace
-MAKEFILE=	unix/makefile
+
 WRKDIST=	${WRKDIR}
 
 do-install:

archivers/unace/patches/patch-aa

@@ -1,25 +1,27 @@
 --- unix/makefile.orig	Wed Jul  1 04:29:10 1998
-+++ unix/makefile	Thu May 20 20:23:50 1999
-@@ -16,11 +16,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 = -O -g -Wall -dLO_HI_BYTE_ORDER
- CHALLOC = challoc.o
- CHALLOC =
++++ unix/makefile	Mon Feb 14 16:42:41 2000
+@@ -22,23 +22,12 @@
  CHNEW = chnew.o challoc.o
--CC = gcc
-+#CC = gcc
+ CC = gcc
  
- ifeq ($(OSTYPE), Linux)
- CFLAGS += -DUNIX -DCASEINSENSE
-@@ -38,7 +38,7 @@
+-ifeq ($(OSTYPE), Linux)
+-CFLAGS += -DUNIX -DCASEINSENSE
+-else
+-ifeq ($(OSTYPE), DOS)
+-EXEEXT = .exe
+-CFLAGS += -DDOS
+-else
+-CFLAGS += -DUNIX -DCASEINSENSE
+-endif
+-endif
+-
+ # not all systems require the math library
+ #LIBS = -lm
  
  
  unace$(EXEEXT): $(OBJ) $(CHALLOC)
 -	gcc $(CFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
  
  clean:
  	rm -f *.o a.out core unace unace.exe

archivers/unace/patches/patch-ac

@@ -1,6 +1,34 @@
---- uac_dcpr.c.orig	Thu Oct 21 18:31:14 1999
-+++ uac_dcpr.c	Thu Oct 21 18:38:15 1999
-@@ -102,7 +102,7 @@
+--- uac_dcpr.c.orig	Wed Jul  1 04:29:10 1998
++++ uac_dcpr.c	Mon Feb 14 16:46:29 2000
+@@ -64,7 +64,7 @@
+    while (zl < zr);
+ 
+    //sort partial ranges - when very small, sort directly
+-   if (left < zr)
++   if (left < zr) {
+       if (left < zr - 1)
+          sortrange(left, zr);
+       else if (sort_freq[left] < sort_freq[zr])
+@@ -72,8 +72,9 @@
+          xchg_def(sort_freq[left], sort_freq[zr]);
+          xchg_def(sort_org[left], sort_org[zr]);
+       }
++   }
+ 
+-   if (right > zl)
++   if (right > zl) {
+       if (zl < right - 1)
+          sortrange(zl, right);
+       else if (sort_freq[zl] < sort_freq[right])
+@@ -81,6 +82,7 @@
+          xchg_def(sort_freq[zl], sort_freq[right]);
+          xchg_def(sort_org[zl], sort_org[right]);
+       }
++   }
+ }
+ 
+ void quicksort(INT n)
+@@ -102,7 +104,7 @@
     buf_rd[0] = buf_rd[size_rdb - 2];
     buf_rd[1] = buf_rd[size_rdb - 1];
     read_adds_blk((CHAR *) & buf_rd[2], i);
@@ -9,7 +37,7 @@
     {
        ULONG *p;
        i>>=2;    // count LONGs not BYTEs
-@@ -137,7 +137,7 @@
+@@ -137,7 +139,7 @@
     i = comm_cpr_size > size_rdb * sizeof(LONG) ? size_rdb * sizeof(LONG) : comm_cpr_size;
     if (!f_err)
        memcpy(buf_rd, comm, i);
@@ -18,7 +46,7 @@
     {
        ULONG *p;
        i>>=2;    // count LONGs not BYTEs
-@@ -510,7 +510,7 @@
+@@ -510,7 +512,7 @@
  
        i = size_rdb * sizeof(LONG);
        read_adds_blk((CHAR *) buf_rd, i);

archivers/unace/patches/patch-ae

@@ -0,0 +1,10 @@
+--- os.h.orig	Mon Feb 14 17:05:29 2000
++++ os.h	Mon Feb 14 17:05:07 2000
+@@ -18,6 +18,7 @@
+ #endif
+ 
+ #if defined(UNIX)
++  #include <sys/types.h>
+   #define DIRSEP '/'
+ #endif
+