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

4 files changed, 46 insertions, 51 deletions

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/