diff options
| author | is <is@pkgsrc.org> | 2002-12-05 16:45:21 +0000 |
|---|---|---|
| committer | is <is@pkgsrc.org> | 2002-12-05 16:45:21 +0000 |
| commit | 377219660f0224c7179010071f70e1a8f5b03542 (patch) | |
| tree | 19c0cdca94fef93f988dcf831e713261742ce4fc /converters/mpack | |
| parent | 048045835fc86945e71b8ceae69b3b47a3a0d62d (diff) | |
| download | pkgsrc-377219660f0224c7179010071f70e1a8f5b03542.tar.gz | |
Make this compile under Solaris, too. Reviewed by wiz@netbsd.org
Diffstat (limited to 'converters/mpack')
| -rw-r--r-- | converters/mpack/Makefile | 8 | ||||
| -rw-r--r-- | converters/mpack/distinfo | 6 | ||||
| -rw-r--r-- | converters/mpack/patches/patch-aa | 22 | ||||
| -rw-r--r-- | converters/mpack/patches/patch-ab | 14 |
4 files changed, 27 insertions, 23 deletions
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile index 985d993f059..a16eef95d9d 100644 --- a/converters/mpack/Makefile +++ b/converters/mpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/11/14 23:43:48 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/12/05 16:45:21 is Exp $ # FreeBSD Id: Makefile,v 1.7 1997/04/26 23:55:23 asami Exp # @@ -14,4 +14,10 @@ COMMENT= External MIME packer/unpacker USE_BUILDLINK2= # defined +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == SunOS +LDFLAGS+= -lsocket -lnsl +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/converters/mpack/distinfo b/converters/mpack/distinfo index f39c090dda2..3546d9f3f9a 100644 --- a/converters/mpack/distinfo +++ b/converters/mpack/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/08/20 02:15:36 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/12/05 16:45:21 is Exp $ SHA1 (mpack-1.5-src.tar.Z) = 1c5081edd9c7152d2a8c4585af2c5a3fc9f17d60 Size (mpack-1.5-src.tar.Z) = 285360 bytes -SHA1 (patch-aa) = 0f01411c1afbfc5588c607e33be32a46b30ec8b3 -SHA1 (patch-ab) = ef8e50d2f0c4caef41594a1d665274426981ecb0 +SHA1 (patch-aa) = d08d4f7f3e44b1ddc71c0838c014b4a2aed61811 +SHA1 (patch-ab) = d221ba16f24843eb9d53ce91f487d6e857d21ddd SHA1 (patch-ac) = a69986a5c1b7659fac6df05f4db9a44df3110892 SHA1 (patch-ad) = 76f32d163021a81d73d8316f72b141ef3edf4f14 diff --git a/converters/mpack/patches/patch-aa b/converters/mpack/patches/patch-aa index 9e323dfa285..3af22ab11b6 100644 --- a/converters/mpack/patches/patch-aa +++ b/converters/mpack/patches/patch-aa @@ -1,27 +1,33 @@ -$NetBSD: patch-aa,v 1.5 2001/08/20 02:15:37 jlam Exp $ - ---- Makefile.orig Thu Feb 16 16:39:41 1995 -+++ Makefile -@@ -1,6 +1,6 @@ +$NetBSD: patch-aa,v 1.6 2002/12/05 16:45:21 is Exp $ +--- Makefile.orig Thu Feb 16 22:39:41 1995 ++++ Makefile Thu Dec 5 16:57:10 2002 +@@ -1,6 +1,7 @@ -CFLAGS=$(OPT) $(DEFINES) -OPT=-O - +CFLAGS+=$(OPT) $(DEFINES) +#OPT=-O +DEFINES=-Dunix ++LIBS=${LDFLAGS} #Uncomment the following line if your system does not have strchr() #DEFINES=-Dstrchr=index -Dstrrchr=rindex -@@ -28,7 +28,7 @@ +@@ -24,11 +25,11 @@ + + + PACKOBJS = unixpk.o encode.o codes.o magic.o unixos.o string.o \ +- xmalloc.o md5c.o getopt.o ++ xmalloc.o md5c.o UNPACKOBJS = unixunpk.o decode.o uudecode.o codes.o unixos.o string.o \ - part.o xmalloc.o md5c.o getopt.o +- part.o xmalloc.o md5c.o getopt.o ++ part.o xmalloc.o md5c.o -DESTDIR=/usr/local +DESTDIR=${PREFIX} all: mpack munpack -@@ -39,13 +39,13 @@ +@@ -39,13 +40,13 @@ $(CC) $(CFLAGS) -o munpack $(UNPACKOBJS) $(LIBS) install: all diff --git a/converters/mpack/patches/patch-ab b/converters/mpack/patches/patch-ab index 19945af900c..d775bca264c 100644 --- a/converters/mpack/patches/patch-ab +++ b/converters/mpack/patches/patch-ab @@ -1,21 +1,13 @@ -$NetBSD: patch-ab,v 1.4 2001/08/20 02:15:37 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2002/12/05 16:45:21 is Exp $ --- unixos.c.orig Thu Feb 16 16:39:50 1995 +++ unixos.c -@@ -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); ++#if defined(P_tmpdir) ++ strcpy(buf, P_tmpdir); +#else strcpy(buf, "/usr/tmp"); +#endif |