16 files changed, 190 insertions, 35 deletions

diff --git a/archivers/macutils/Makefile b/archivers/macutils/Makefile
index c4b2bbe92db4..21c1f30ca7f0 100644
--- a/archivers/macutils/Makefile
+++ b/archivers/macutils/Makefile
@@ -4,19 +4,19 @@
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
 # FreeBSD Version:	2.1.5-RELEASE
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/04 03:46:57 asami Exp $
+# $Id: Makefile,v 1.2 1998/02/01 23:23:57 fenner Exp $
 #
       
 DISTNAME=	macutils_2.0b3.orig
 PKGNAME=	macutils-2.0b3
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/debian/bo/source/otherosfs/
+MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/debian/main/source/otherosfs/
 # ${MASTER_SITE_SUNSITE} isn't appropriate because distributions/ isn't
 # mirrored.
 
 MAINTAINER=	sutton@aardvark.apana.org.au
 
-WRKSRC=		${WRKDIR}/macutils-2.0b3.orig
+WRKSRC=		${WRKDIR}/macutils
 MAKEFILE=	makefile
 
 MANDIR=		${PREFIX}/man/man
diff --git a/archivers/macutils/distinfo b/archivers/macutils/distinfo
index 50953b34fdf6..5b5190f3a32e 100644
--- a/archivers/macutils/distinfo
+++ b/archivers/macutils/distinfo
@@ -1 +1 @@
-MD5 (macutils_2.0b3.orig.tar.gz) = ee12e1c8d40567766d0733aa31f6f4bc
+MD5 (macutils_2.0b3.orig.tar.gz) = 4ff71b1634ea503398c33994458fbe40
diff --git a/archivers/macutils/files/patch-aa b/archivers/macutils/files/patch-aa
index 01b90af47cac..cd4dd6d60a03 100644
--- a/archivers/macutils/files/patch-aa
+++ b/archivers/macutils/files/patch-aa
@@ -1,31 +1,18 @@
-*** makefile.orig	Mon Apr 14 16:15:21 1997
---- makefile	Mon Apr 14 16:34:14 1997
-***************
-*** 1,5 ****
-! SHELL =	/bin/sh
-! BINDIR =	/ufs/dik/tmpbin
-  # Use the following flags on the CF macro definition as needed.
-  #
-  # -DBSD if you are on a BSD system
---- 1,4 ----
-! SHELL =		/bin/sh
-  # Use the following flags on the CF macro definition as needed.
-  #
-  # -DBSD if you are on a BSD system
-***************
-*** 24,30 ****
-  #
-  # -DAPPLEDOUBLE if you want to be able to use an AppleDouble file system
-  #
-! CF =	-DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DNODOT -DAPPLEDOUBLE
-  
-  all:
-  	(cd crc; make CF='$(CF)')
---- 23,29 ----
-  #
-  # -DAPPLEDOUBLE if you want to be able to use an AppleDouble file system
-  #
-! CF = -DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DAUFSPLUS 
-  
-  all:
-  	(cd crc; make CF='$(CF)')
+--- makefile.orig	Sat Oct  2 13:16:00 1993
++++ makefile	Fri Apr 16 00:10:58 1999
+@@ -1,5 +1,4 @@
+-SHELL =	/bin/sh
+-BINDIR =	/ufs/dik/tmpbin
++SHELL =		/bin/sh
+ # Use the following flags on the CF macro definition as needed.
+ #
+ # -DBSD if you are on a BSD system
+@@ -24,7 +23,7 @@
+ #
+ # -DAPPLEDOUBLE if you want to be able to use an AppleDouble file system
+ #
+-CF =	-DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DNODOT -DAPPLEDOUBLE
++CF = -DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DAUFSPLUS ${CFLAGS}
+ 
+ all:
+ 	(cd crc; make CF='$(CF)')
diff --git a/archivers/macutils/files/patch-ab b/archivers/macutils/files/patch-ab
new file mode 100644
index 000000000000..325ecdab60bd
--- /dev/null
+++ b/archivers/macutils/files/patch-ab
@@ -0,0 +1,9 @@
+--- util/transname.c.orig	Fri Apr 16 00:02:36 1999
++++ util/transname.c	Fri Apr 16 00:02:38 1999
+@@ -1,5 +1,5 @@
+ #include <sys/types.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ 
+ char *strncpy();
+ 
diff --git a/archivers/macutils/files/patch-ac b/archivers/macutils/files/patch-ac
new file mode 100644
index 000000000000..4eca92c2636b
--- /dev/null
+++ b/archivers/macutils/files/patch-ac
@@ -0,0 +1,11 @@
+--- macunpack/jdw.h.orig	Fri Apr 16 00:13:34 1999
++++ macunpack/jdw.h	Fri Apr 16 00:13:37 1999
+@@ -8,7 +8,7 @@
+ #define	J_MTIME		34
+ #define	J_FLENGTH	38
+ 
+-typedef struct fileHdr {
++struct fileHdr {
+ 	char		magic[6];
+ 	unsigned long	type;
+ 	unsigned long	auth;
diff --git a/archivers/macutils/files/patch-ad b/archivers/macutils/files/patch-ad
new file mode 100644
index 000000000000..8cfc5459da91
--- /dev/null
+++ b/archivers/macutils/files/patch-ad
@@ -0,0 +1,20 @@
+--- macunpack/sit.h.orig	Fri Apr 16 00:15:41 1999
++++ macunpack/sit.h	Fri Apr 16 00:15:56 1999
+@@ -24,7 +24,7 @@
+ 
+ typedef long OSType;
+ 
+-typedef struct sitHdr {			/* 22 bytes */
++struct sitHdr {			/* 22 bytes */
+ 	OSType	signature;		/* = 'SIT!' -- for verification */
+ 	unsigned short	numFiles;	/* number of files in archive */
+ 	unsigned long	arcLength;	/* length of entire archive incl.
+@@ -34,7 +34,7 @@
+ 	char reserved[7];
+ };
+ 
+-typedef struct fileHdr {		/* 112 bytes */
++struct fileHdr {		/* 112 bytes */
+ 	unsigned char	compRMethod;	/* rsrc fork compression method */
+ 	unsigned char	compDMethod;	/* data fork compression method */
+ 	unsigned char	fName[64];	/* a STR63 */
diff --git a/archivers/macutils/files/patch-ae b/archivers/macutils/files/patch-ae
new file mode 100644
index 000000000000..b5574ae7b748
--- /dev/null
+++ b/archivers/macutils/files/patch-ae
@@ -0,0 +1,11 @@
+--- macunpack/sit.c.orig	Fri Apr 16 00:18:28 1999
++++ macunpack/sit.c	Fri Apr 16 00:18:34 1999
+@@ -19,7 +19,7 @@
+ extern void de_lzah();
+ extern unsigned char (*lzah_getbyte)();
+ 
+-typedef struct methodinfo {
++struct methodinfo {
+ 	char *name;
+ 	int number;
+ };
diff --git a/archivers/macutils/files/patch-af b/archivers/macutils/files/patch-af
new file mode 100644
index 000000000000..20c7d02dea73
--- /dev/null
+++ b/archivers/macutils/files/patch-af
@@ -0,0 +1,11 @@
+--- macunpack/stf.h.orig	Fri Apr 16 00:22:12 1999
++++ macunpack/stf.h	Fri Apr 16 00:22:19 1999
+@@ -5,7 +5,7 @@
+ #define	S_RSRCLNGTH	3	/* + NAMELENGTH */
+ #define	S_DATALNGTH	7	/* + NAMELENGTH */
+ 
+-typedef struct fileHdr {
++struct fileHdr {
+ 	char		magic[3];
+ 	char		flength;
+ 	char		fname[32];	/* actually flength */
diff --git a/archivers/macutils/files/patch-ag b/archivers/macutils/files/patch-ag
new file mode 100644
index 000000000000..335cc473ff00
--- /dev/null
+++ b/archivers/macutils/files/patch-ag
@@ -0,0 +1,11 @@
+--- macunpack/lzh.c.orig	Fri Apr 16 00:23:03 1999
++++ macunpack/lzh.c	Fri Apr 16 00:23:13 1999
+@@ -23,7 +23,7 @@
+ extern unsigned char (*lzah_getbyte)();
+ extern void de_lzh();
+ 
+-typedef struct methodinfo {
++struct methodinfo {
+ 	char *name;
+ 	int number;
+ };
diff --git a/archivers/macutils/files/patch-ah b/archivers/macutils/files/patch-ah
new file mode 100644
index 000000000000..902138b785ff
--- /dev/null
+++ b/archivers/macutils/files/patch-ah
@@ -0,0 +1,11 @@
+--- macunpack/lzh.h.orig	Fri Apr 16 00:24:44 1999
++++ macunpack/lzh.h	Fri Apr 16 00:24:58 1999
+@@ -30,7 +30,7 @@
+ #define L_EEXTENDSZ	0
+ #define L_EEXTEND	1
+ 
+-typedef struct fileHdr { /* 58 bytes */
++struct fileHdr { /* 58 bytes */
+ 	unsigned char	hsize;
+ 	unsigned char	hcrc;
+ 	char		method[5];
diff --git a/archivers/macutils/files/patch-ai b/archivers/macutils/files/patch-ai
new file mode 100644
index 000000000000..1e60f45f1515
--- /dev/null
+++ b/archivers/macutils/files/patch-ai
@@ -0,0 +1,20 @@
+--- macunpack/dd.h.orig	Fri Apr 16 00:25:41 1999
++++ macunpack/dd.h	Fri Apr 16 00:25:55 1999
+@@ -52,7 +52,7 @@
+ 
+ typedef long OSType;
+ 
+-typedef struct fileHdr {		/* 124 bytes */
++struct fileHdr {		/* 124 bytes */
+ 	unsigned char	magic[4];	/* "DDAR" */
+ 	unsigned char	fill1[4];	/* ??? */
+ 	unsigned char	fName[64];	/* a STR63 */
+@@ -73,7 +73,7 @@
+ 	unsigned short	hdrcrc;		/* true crc */
+ };
+ 
+-typedef struct fileCHdr {		/* 84 bytes */
++struct fileCHdr {		/* 84 bytes */
+ 	unsigned char	magic[4];	/* "\253\315\000\124" */
+ 	unsigned long	dataLength;	/* lengths */
+ 	unsigned long	dataCLength;
diff --git a/archivers/macutils/files/patch-aj b/archivers/macutils/files/patch-aj
new file mode 100644
index 000000000000..83ae8b721f64
--- /dev/null
+++ b/archivers/macutils/files/patch-aj
@@ -0,0 +1,11 @@
+--- macunpack/dd.c.orig	Fri Apr 16 00:26:39 1999
++++ macunpack/dd.c	Fri Apr 16 00:26:45 1999
+@@ -45,7 +45,7 @@
+ #endif /* UNTESTED */
+ static void dd_cpt_compat();
+ 
+-typedef struct methodinfo {
++struct methodinfo {
+ 	char *name;
+ 	int number;
+ };
diff --git a/archivers/macutils/files/patch-ak b/archivers/macutils/files/patch-ak
new file mode 100644
index 000000000000..b5ec39483f06
--- /dev/null
+++ b/archivers/macutils/files/patch-ak
@@ -0,0 +1,11 @@
+--- hexbin/globals.h.orig	Fri Apr 16 00:28:16 1999
++++ hexbin/globals.h	Fri Apr 16 00:28:25 1999
+@@ -13,7 +13,7 @@
+ extern char info[];
+ extern char trname[];
+ 
+-typedef struct macheader {
++struct macheader {
+ 	char m_name[128];
+ 	char m_type[4];
+ 	char m_author[4];
diff --git a/archivers/macutils/files/patch-al b/archivers/macutils/files/patch-al
new file mode 100644
index 000000000000..d68cac214f63
--- /dev/null
+++ b/archivers/macutils/files/patch-al
@@ -0,0 +1,11 @@
+--- macunpack/lzc.h.orig	Fri Apr 16 00:29:28 1999
++++ macunpack/lzc.h	Fri Apr 16 00:29:36 1999
+@@ -12,7 +12,7 @@
+ #define C_AUTHOFF	36
+ #define C_FLAGOFF	40
+ 
+-typedef struct fileHdr {
++struct fileHdr {
+ 	unsigned long	magic1;
+ 	unsigned long	dataLength;
+ 	unsigned long	dataCLength;
diff --git a/archivers/macutils/files/patch-am b/archivers/macutils/files/patch-am
new file mode 100644
index 000000000000..0fbd808f7db8
--- /dev/null
+++ b/archivers/macutils/files/patch-am
@@ -0,0 +1,20 @@
+--- macunpack/cpt.h.orig	Fri Apr 16 00:31:28 1999
++++ macunpack/cpt.h	Fri Apr 16 00:32:07 1999
+@@ -31,7 +31,7 @@
+ 
+ typedef long	OSType;
+ 
+-typedef struct cptHdr {			/* 8 bytes */
++struct cptHdr {			/* 8 bytes */
+ 	unsigned char	signature;	/* = 1 -- for verification */
+ 	unsigned char	volume;		/* for multi-file archives */
+ 	unsigned short	xmagic;		/* verification multi-file consistency*/
+@@ -42,7 +42,7 @@
+ 	unsigned char	commentsize;	/* number of bytes comment that follow*/
+ };
+ 
+-typedef struct fileHdr {		/* 78 bytes */
++struct fileHdr {		/* 78 bytes */
+ 	unsigned char	fName[32];	/* a STR32 */
+ 	unsigned char	folder;		/* set to 1 if a folder */
+ 	unsigned short	foldersize;	/* number of entries in folder */
diff --git a/archivers/macutils/files/patch-an b/archivers/macutils/files/patch-an
new file mode 100644
index 000000000000..6dac05bda456
--- /dev/null
+++ b/archivers/macutils/files/patch-an
@@ -0,0 +1,11 @@
+--- macunpack/zma.h.orig	Fri Apr 16 01:04:19 1999
++++ macunpack/zma.h	Fri Apr 16 01:04:29 1999
+@@ -20,7 +20,7 @@
+ #define	Z_RCRC		44	/* Resource crc */
+ #define	Z_FNAME		46	/* File name length and name */
+ 
+-typedef struct fileHdr {		/* 78 bytes */
++struct fileHdr {		/* 78 bytes */
+ 	char		deleted;	/* Not in original, split off from: */
+ 	char		what;		/* What kind?  Negative if deleted */
+ 	unsigned char	hlen ;		/* Header length */