Adapt this package for NetBSD.

4 files changed, 67 insertions, 62 deletions

diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index ad01c17a688..b7e0f4f12e2 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -3,19 +3,21 @@
 # Date created:         1 May 1995
 # Whom:                 ache
 #
+# $NetBSD: Makefile,v 1.2 1998/02/26 00:11:06 tron Exp $
 # $FreeBSD Id: Makefile,v 1.7 1997/04/26 23:55:23 asami Exp
 #
 
-DISTNAME=       mpack-1.5-src
-PKGNAME=        mpack-1.5
-CATEGORIES=     converters mail news
-MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/mpack/
-EXTRACT_SUFX=   .tar.Z
+DISTNAME=	mpack-1.5-src
+PKGNAME=	mpack-1.5
+CATEGORIES=	converters mail news
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
+EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=     ache@FreeBSD.ORG
+MAINTAINER=	ache@FreeBSD.ORG
+
+WRKSRC=		${WRKDIR}/mpack
+MAKE_ENV=	PREFIX=${PREFIX}
 
-WRKSRC=         ${WRKDIR}/mpack
-MAKEFLAGS=      -DDESTDIR=${PREFIX} -f
 MAN1=		mpack.1 munpack.1
 
 .include <bsd.port.mk>
diff --git a/converters/mpack/patches/patch-aa b/converters/mpack/patches/patch-aa
index 08171df7667..8b50ead616b 100644
--- a/converters/mpack/patches/patch-aa
+++ b/converters/mpack/patches/patch-aa
@@ -1,38 +1,34 @@
-*** Makefile.bak	Fri Feb 17 00:39:41 1995
---- Makefile	Mon May  1 18:09:04 1995
-***************
-*** 1,5 ****
-! CFLAGS=$(OPT) $(DEFINES)
-! OPT=-O
-  
-  
-  #Uncomment the following line if your system does not have strchr()
---- 1,5 ----
-! CFLAGS+=$(OPT) $(DEFINES)
-! #OPT=-O
-  
-  
-  #Uncomment the following line if your system does not have strchr()
-***************
-*** 42,51 ****
-  	-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
-  
-  clean:
-  	rm -f *.o mpack munpack
---- 42,51 ----
-  	-mkdir $(DESTDIR)/bin
-  	-mkdir $(DESTDIR)/man
-  	-mkdir $(DESTDIR)/man/man1
-! 	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
-  
-  clean:
-  	rm -f *.o mpack munpack
+--- Makefile.orig	Thu Feb 16 22:39:41 1995
++++ Makefile	Thu Feb 26 01:03:28 1998
+@@ -1,5 +1,5 @@
+-CFLAGS=$(OPT) $(DEFINES)
+-OPT=-O
++CFLAGS+=$(OPT) $(DEFINES)
++#OPT=-O
+ 
+ 
+ #Uncomment the following line if your system does not have strchr()
+@@ -28,7 +28,7 @@
+ UNPACKOBJS = unixunpk.o decode.o uudecode.o codes.o unixos.o string.o \
+ 		part.o xmalloc.o md5c.o getopt.o
+ 
+-DESTDIR=/usr/local
++DESTDIR=${PREFIX}
+ 
+ all: mpack munpack
+ 
+@@ -42,10 +42,10 @@
+ 	-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
+ 
+ clean:
+ 	rm -f *.o mpack munpack
diff --git a/converters/mpack/patches/patch-ab b/converters/mpack/patches/patch-ab
index 81754bad4ed..775ed51d21c 100644
--- a/converters/mpack/patches/patch-ab
+++ b/converters/mpack/patches/patch-ab
@@ -1,19 +1,25 @@
-*** unixos.c.bak	Fri Feb 17 00:39:50 1995
---- unixos.c	Mon Nov 11 10:19:28 1996
-***************
-*** 89,95 ****
---- 89,99 ----
-  	strcpy(buf, getenv("TMPDIR"));
-      }
-      else {
-+ #ifdef __FreeBSD__
-+ 	strcpy(buf, "/var/tmp");
-+ #else
-  	strcpy(buf, "/usr/tmp");
-+ #endif
-      }
-      strcat(buf, "/m-prts-");
-      p = getenv("USER");
+--- unixos.c.orig	Thu Feb 16 22:39:50 1995
++++ unixos.c	Thu Feb 26 00:59:01 1998
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <netdb.h>
++#include <paths.h>
+ #include "xmalloc.h"
+ #include "common.h"
+ 
+@@ -89,7 +90,11 @@
+ 	strcpy(buf, getenv("TMPDIR"));
+     }
+     else {
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++	strcpy(buf, _PATH_VARTMP);
++#else
+ 	strcpy(buf, "/usr/tmp");
++#endif
+     }
+     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
 ***************
diff --git a/converters/mpack/pkg/PLIST b/converters/mpack/pkg/PLIST
index 32d6cc559cd..03df86d4ab5 100644
--- a/converters/mpack/pkg/PLIST
+++ b/converters/mpack/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1998/02/26 00:11:07 tron Exp $
 bin/mpack
 bin/munpack
 man/man1/mpack.1.gz