Use separate patches are separate files, and mark as USE_BUILDLINK_ONLY.

6 files changed, 54 insertions, 56 deletions

diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 477f0463e81..692281e9a7f 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2001/04/01 20:28:42 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/20 02:15:36 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/04/26 23:55:23 asami Exp
 #
 
 DISTNAME=	mpack-1.5-src
 PKGNAME=	mpack-1.5
+WRKSRC=		${WRKDIR}/mpack
 CATEGORIES=	converters mail news
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
 EXTRACT_SUFX=	.tar.Z
@@ -11,6 +12,6 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	packages@netbsd.org
 COMMENT=	External MIME packer/unpacker
 
-WRKSRC=		${WRKDIR}/mpack
+USE_BUILDLINK_ONLY=	# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/mpack/distinfo b/converters/mpack/distinfo
index d23a2630d9a..f39c090dda2 100644
--- a/converters/mpack/distinfo
+++ b/converters/mpack/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:28:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/20 02:15:36 jlam Exp $
 
 SHA1 (mpack-1.5-src.tar.Z) = 1c5081edd9c7152d2a8c4585af2c5a3fc9f17d60
 Size (mpack-1.5-src.tar.Z) = 285360 bytes
-SHA1 (patch-aa) = aabaef05e76afdfdc4480251627fbd886c847b96
-SHA1 (patch-ab) = a5cc4244eb774455eef73c87753ea23fe5591804
+SHA1 (patch-aa) = 0f01411c1afbfc5588c607e33be32a46b30ec8b3
+SHA1 (patch-ab) = ef8e50d2f0c4caef41594a1d665274426981ecb0
+SHA1 (patch-ac) = a69986a5c1b7659fac6df05f4db9a44df3110892
+SHA1 (patch-ad) = 76f32d163021a81d73d8316f72b141ef3edf4f14
diff --git a/converters/mpack/patches/patch-aa b/converters/mpack/patches/patch-aa
index 78732db791c..9e323dfa285 100644
--- a/converters/mpack/patches/patch-aa
+++ b/converters/mpack/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1999/02/27 01:14:55 jwise Exp $
+$NetBSD: patch-aa,v 1.5 2001/08/20 02:15:37 jlam Exp $
+
 --- Makefile.orig	Thu Feb 16 16:39:41 1995
-+++ Makefile	Fri Feb 26 20:04:57 1999
++++ Makefile
 @@ -1,6 +1,6 @@
 -CFLAGS=$(OPT) $(DEFINES)
 -OPT=-O
@@ -20,18 +21,24 @@ $NetBSD: patch-aa,v 1.4 1999/02/27 01:14:55 jwise Exp $
  
  all: mpack munpack
  
-@@ -42,10 +42,10 @@
- 	-mkdir $(DESTDIR)/bin
- 	-mkdir $(DESTDIR)/man
- 	-mkdir $(DESTDIR)/man/man1
+@@ -39,13 +39,13 @@
+ 	$(CC) $(CFLAGS) -o munpack $(UNPACKOBJS) $(LIBS)
+ 
+ install: all
+-	-mkdir $(DESTDIR)/bin
+-	-mkdir $(DESTDIR)/man
+-	-mkdir $(DESTDIR)/man/man1
 -	install -s -m 755 mpack $(DESTDIR)/bin
 -	install -s -m 755 munpack $(DESTDIR)/bin
 -	install -m 644 unixpk.man $(DESTDIR)/man/man1/mpack.1
 -	install -m 644 unixunpk.man $(DESTDIR)/man/man1/munpack.1
-+	install -c -s -m 755 mpack $(DESTDIR)/bin
-+	install -c -s -m 755 munpack $(DESTDIR)/bin
-+	install -c -m 644 unixpk.man $(DESTDIR)/man/man1/mpack.1
-+	install -c -m 644 unixunpk.man $(DESTDIR)/man/man1/munpack.1
++	-${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)/bin
++	-${BSD_INSTALL_MAN_DIR} $(DESTDIR)/man
++	-${BSD_INSTALL_MAN_DIR} $(DESTDIR)/man/man1
++	${BSD_INSTALL_PROGRAM} mpack $(DESTDIR)/bin
++	${BSD_INSTALL_PROGRAM} munpack $(DESTDIR)/bin
++	${BSD_INSTALL_MAN} unixpk.man $(DESTDIR)/man/man1/mpack.1
++	${BSD_INSTALL_MAN} unixunpk.man $(DESTDIR)/man/man1/munpack.1
  
  clean:
  	rm -f *.o mpack munpack
diff --git a/converters/mpack/patches/patch-ab b/converters/mpack/patches/patch-ab
index 91b2f0992b5..19945af900c 100644
--- a/converters/mpack/patches/patch-ab
+++ b/converters/mpack/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:16 agc Exp $
+$NetBSD: patch-ab,v 1.4 2001/08/20 02:15:37 jlam Exp $
 
---- unixos.c.orig	Thu Feb 16 22:39:50 1995
-+++ unixos.c	Thu Feb 26 00:59:01 1998
+--- unixos.c.orig	Thu Feb 16 16:39:50 1995
++++ unixos.c
 @@ -29,6 +29,7 @@
  #include <sys/types.h>
  #include <sys/param.h>
@@ -22,41 +22,3 @@ $NetBSD: patch-ab,v 1.3 1998/08/07 10:40:16 agc Exp $
      }
      strcat(buf, "/m-prts-");
      p = getenv("USER");
-*** unixpk.man.bak	Fri Feb 17 00:39:50 1995
---- unixpk.man	Mon Nov 11 10:19:46 1996
-***************
-*** 136,142 ****
-  .SH ENVIRONMENT
-  .TP
-  .B TMPDIR
-! Directory to store temporary files.  Default is /usr/tmp.
-  .TP
-  .B SPLITSIZE
-  Default value of the -m switch.
---- 136,142 ----
-  .SH ENVIRONMENT
-  .TP
-  .B TMPDIR
-! Directory to store temporary files.  Default is /var/tmp.
-  .TP
-  .B SPLITSIZE
-  Default value of the -m switch.
-*** unixunpk.man.bak	Fri Feb 17 00:39:50 1995
---- unixunpk.man	Mon Nov 11 10:19:59 1996
-***************
-*** 107,113 ****
-  .SH ENVIRONMENT
-  .TP
-  .B TMPDIR
-! Directory to store temporary files.  Default is /usr/tmp.
-  .SH FILES
-  .TP
-  .B $TMPDIR/m-prts-$USER/
---- 107,113 ----
-  .SH ENVIRONMENT
-  .TP
-  .B TMPDIR
-! Directory to store temporary files.  Default is /var/tmp.
-  .SH FILES
-  .TP
-  .B $TMPDIR/m-prts-$USER/
diff --git a/converters/mpack/patches/patch-ac b/converters/mpack/patches/patch-ac
new file mode 100644
index 00000000000..5f7f6652589
--- /dev/null
+++ b/converters/mpack/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/08/20 02:15:37 jlam Exp $
+
+--- unixpk.man.orig	Thu Feb 16 16:39:50 1995
++++ unixpk.man
+@@ -136,7 +136,7 @@
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .TP
+ .B SPLITSIZE
+ Default value of the -m switch.
diff --git a/converters/mpack/patches/patch-ad b/converters/mpack/patches/patch-ad
new file mode 100644
index 00000000000..7b106d26b60
--- /dev/null
+++ b/converters/mpack/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/08/20 02:15:37 jlam Exp $
+
+--- unixunpk.man.orig	Thu Feb 16 16:39:50 1995
++++ unixunpk.man
+@@ -107,7 +107,7 @@
+ .SH ENVIRONMENT
+ .TP
+ .B TMPDIR
+-Directory to store temporary files.  Default is /usr/tmp.
++Directory to store temporary files.  Default is /var/tmp.
+ .SH FILES
+ .TP
+ .B $TMPDIR/m-prts-$USER/