4 files changed, 86 insertions, 23 deletions

diff --git a/archivers/macutils/Makefile b/archivers/macutils/Makefile
index 4ebffc0123dd..98a6b41146e8 100644
--- a/archivers/macutils/Makefile
+++ b/archivers/macutils/Makefile
@@ -1,22 +1,20 @@
-# New ports collection makefile for:   macutils
+# New ports collection makefile for:	macutils
 # Date created:		14th April 1997
 # Whom:			Joel Sutton <jsutton@bbcon.com.au>
-# FreeBSD Version:	2.1.5-RELEASE
 #
 # $FreeBSD$
 #
 
 PORTNAME=	macutils
 PORTVERSION=	2.0b3
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/debian/main/source/otherosfs/
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
-# ${MASTER_SITE_SUNSITE} isn't appropriate because distributions/ isn't
-# mirrored.
+CATEGORIES=	archivers emulators
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	utils/compress
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	jsutton@bbcon.com.au
 
-WRKSRC=		${WRKDIR}/macutils
+WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	makefile
 
 MAN1=		macunpack.1 hexbin.1 macsave.1 macstream.1 binhex.1 tomac.1 \
@@ -51,10 +49,10 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/macutil.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>  Installing supplementary documents..."
-	-${MKDIR} ${DOCDIR}/
-	for file in ${DOCFILES} ; do \
-	  ${INSTALL_DATA} ${WRKSRC}/doc/$$file ${DOCDIR}/ ;\
-	done
+	-${MKDIR} ${DOCDIR}
+.for file in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/archivers/macutils/distinfo b/archivers/macutils/distinfo
index 5b5190f3a32e..5a5624256e2b 100644
--- a/archivers/macutils/distinfo
+++ b/archivers/macutils/distinfo
@@ -1 +1 @@
-MD5 (macutils_2.0b3.orig.tar.gz) = 4ff71b1634ea503398c33994458fbe40
+MD5 (macutils.tar.gz) = 4ff71b1634ea503398c33994458fbe40
diff --git a/archivers/macutils/files/patch-aa b/archivers/macutils/files/patch-aa
index cd4dd6d60a03..080da53c7ae2 100644
--- a/archivers/macutils/files/patch-aa
+++ b/archivers/macutils/files/patch-aa
@@ -1,18 +1,83 @@
---- makefile.orig	Sat Oct  2 13:16:00 1993
-+++ makefile	Fri Apr 16 00:10:58 1999
+--- makefile.orig	Sun Oct  3 05:16:00 1993
++++ makefile	Sat Jun 10 13:35:16 2000
 @@ -1,5 +1,4 @@
--SHELL =	/bin/sh
+ 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 @@
+@@ -24,44 +23,44 @@
  #
  # -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}
++CF =	-DBSD -DTYPES_H -DDIRENT_H -DTERMIOS_H -DAUFSPLUS ${CFLAGS}
  
  all:
- 	(cd crc; make CF='$(CF)')
+-	(cd crc; make CF='$(CF)')
+-	(cd util; make CF='$(CF)')
+-	(cd fileio; make CF='$(CF)')
+-	(cd macunpack; make CF='$(CF)')
+-	(cd hexbin; make CF='$(CF)')
+-	(cd mixed; make CF='$(CF)')
+-	(cd binhex; make CF='$(CF)')
+-	(cd comm; make CF='$(CF)')
++	(cd crc; $(MAKE) CFLAGS='$(CF)')
++	(cd util; $(MAKE) CFLAGS='$(CF)')
++	(cd fileio; $(MAKE) CFLAGS='$(CF)')
++	(cd macunpack; $(MAKE) CFLAGS='$(CF)')
++	(cd hexbin; $(MAKE) CFLAGS='$(CF)')
++	(cd mixed; $(MAKE) CFLAGS='$(CF)')
++	(cd binhex; $(MAKE) CFLAGS='$(CF)')
++	(cd comm; $(MAKE) CFLAGS='$(CF)')
+ 
+ clean:
+-	(cd crc; make clean)
+-	(cd util; make clean)
+-	(cd fileio; make clean)
+-	(cd macunpack; make clean)
+-	(cd hexbin; make clean)
+-	(cd mixed; make clean)
+-	(cd binhex; make clean)
+-	(cd comm; make clean)
++	(cd crc; $(MAKE) clean)
++	(cd util; $(MAKE) clean)
++	(cd fileio; $(MAKE) clean)
++	(cd macunpack; $(MAKE) clean)
++	(cd hexbin; $(MAKE) clean)
++	(cd mixed; $(MAKE) clean)
++	(cd binhex; $(MAKE) clean)
++	(cd comm; $(MAKE) clean)
+ 
+ clobber:
+-	(cd crc; make clean)
+-	(cd util; make clean)
+-	(cd fileio; make clean)
+-	(cd macunpack; make clobber)
+-	(cd hexbin; make clobber)
+-	(cd mixed; make clobber)
+-	(cd binhex; make clobber)
+-	(cd comm; make clobber)
++	(cd crc; (MAKE) clean)
++	(cd util; (MAKE) clean)
++	(cd fileio; (MAKE) clean)
++	(cd macunpack; (MAKE) clobber)
++	(cd hexbin; (MAKE) clobber)
++	(cd mixed; (MAKE) clobber)
++	(cd binhex; (MAKE) clobber)
++	(cd comm; (MAKE) clobber)
+ 
+ lint:
+-	(cd macunpack; make CF='$(CF)' lint)
+-	(cd hexbin; make CF='$(CF)' lint)
+-	(cd mixed; make CF='$(CF)' lint)
+-	(cd binhex; make CF='$(CF)' lint)
+-	(cd comm; make CF='$(CF)' lint)
++	(cd macunpack; (MAKE) CFLAGS='$(CF)' lint)
++	(cd hexbin; (MAKE) CFLAGS='$(CF)' lint)
++	(cd mixed; (MAKE) CFLAGS='$(CF)' lint)
++	(cd binhex; (MAKE) CFLAGS='$(CF)' lint)
++	(cd comm; (MAKE) CFLAGS='$(CF)' lint)
+ 
+ install:
+ 	cp macunpack/macunpack $(BINDIR)/.
diff --git a/archivers/macutils/pkg-plist b/archivers/macutils/pkg-plist
index 87058c2a7bbc..1cdca3b2c1cd 100644
--- a/archivers/macutils/pkg-plist
+++ b/archivers/macutils/pkg-plist
@@ -1,10 +1,10 @@
-bin/macunpack
+bin/binhex
+bin/frommac
 bin/hexbin
 bin/macsave
 bin/macstream
-bin/binhex
+bin/macunpack
 bin/tomac
-bin/frommac
 share/doc/macutils/README
 share/doc/macutils/README.crc
 share/doc/macutils/README.crc.orig