- Update to 1.6

PR:		ports/92082 (based on)
Submitted by:	Paul Schmehl <pauls@utdallas.edu>

8 files changed, 16 insertions, 161 deletions

diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 776fdcf2f6ee..fcaa4a011a65 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	mpack
-PORTVERSION=	1.5
-PORTREVISION=	3
+PORTVERSION=	1.6
 CATEGORIES=	converters mail news
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-EXTRACT_SUFX=	.tar.Z
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	External MIME packer/unpacker
 
-WRKSRC=		${WRKDIR}/mpack
-MAKEFLAGS=	-f
-MAKE_ENV+=	DESTDIR=${PREFIX}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+GNU_CONFIGURE=	yes
+
 MAN1=		mpack.1 munpack.1
 
+PLIST_FILES=	bin/mpack bin/munpack
+
 .include <bsd.port.mk>
diff --git a/converters/mpack/distinfo b/converters/mpack/distinfo
index 73564313a00b..f512f581b52a 100644
--- a/converters/mpack/distinfo
+++ b/converters/mpack/distinfo
@@ -1,2 +1,3 @@
-MD5 (mpack-1.5-src.tar.Z) = f41f8aa2ae92d90e1ac03291973e65e4
-SIZE (mpack-1.5-src.tar.Z) = 285360
+MD5 (mpack-1.6.tar.gz) = a70fa5afa76539a9afb70b9d81568fe8
+SHA256 (mpack-1.6.tar.gz) = 274108bb3a39982a4efc14fb3a65298e66c8e71367c3dabf49338162d207a94c
+SIZE (mpack-1.6.tar.gz) = 179850
diff --git a/converters/mpack/files/patch-aa b/converters/mpack/files/patch-aa
deleted file mode 100644
index eca638fd34b9..000000000000
--- a/converters/mpack/files/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.orig	Thu Feb 16 13:39:41 1995
-+++ Makefile	Fri Jun 13 14:45:29 2003
-@@ -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()
-@@ -22,13 +22,14 @@
- #Uncomment the following lines on SVR4
- #LIBS=-lsocket -lnsl
- 
-+LIBS=-lmd
- 
- PACKOBJS = unixpk.o encode.o codes.o magic.o unixos.o string.o \
--		xmalloc.o md5c.o getopt.o
-+		xmalloc.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
- 
--DESTDIR=/usr/local
-+DESTDIR?=/usr/local
- 
- all: mpack munpack
- 
-@@ -42,10 +43,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/files/patch-ad b/converters/mpack/files/patch-ad
index 98cb3857ef6f..dfc56455b467 100644
--- a/converters/mpack/files/patch-ad
+++ b/converters/mpack/files/patch-ad
@@ -1,26 +1,14 @@
---- uudecode.c.orig	Fri Feb 17 00:39:50 1995
-+++ uudecode.c	Wed Aug 28 19:59:49 2002
-@@ -495,12 +495,12 @@
+--- uudecode.c.orig	Sat Jan 21 23:57:58 2006
++++ uudecode.c	Sun Jan 22 00:07:01 2006
+@@ -487,9 +487,9 @@
+  * split-uuencoded data.
   */
  int
- parseSubject(subject, fnamep, partp, npartsp)
--char *subject;
-+unsigned char *subject;
- char **fnamep;
- int *partp;
- int *npartsp;
+-parseSubject(char *subject, char **fnamep, int *partp, int *npartsp)
++parseSubject(unsigned char *subject, char **fnamep, int *partp, int *npartsp)
  {
 -    char *scan, *bak, *start;
 +    unsigned char *scan, *bak, *start;
      int part = -1, nparts = 0, hasdot = 0;
  
      /* No subject header */
-@@ -524,7 +524,7 @@
-      * representation syntax
-      */
-     do {
--	while (*scan != '\n' && isprint(*scan)
-+	while (*scan != '\n'
- 	       && !isalnum(*scan) && *scan != '_') ++scan;
- 	*fnamep = start = scan;
- 	while (isalnum(*scan) || *scan == '-' || *scan == '+' || *scan == '&'
diff --git a/converters/mpack/files/patch-codes_c b/converters/mpack/files/patch-codes_c
deleted file mode 100644
index fe70e2927934..000000000000
--- a/converters/mpack/files/patch-codes_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-codes_c,v 1.1 2002/08/09 01:15:19 naddy Exp $
---- codes.c.orig	Fri Aug  9 02:55:28 2002
-+++ codes.c	Fri Aug  9 02:56:20 2002
-@@ -38,8 +38,9 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
-+#include <sys/types.h>
-+#include <md5.h>
- #include "xmalloc.h"
--#include "md5.h"
- 
- static char basis_64[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/converters/mpack/files/patch-decode_c b/converters/mpack/files/patch-decode_c
deleted file mode 100644
index caaef4c709c6..000000000000
--- a/converters/mpack/files/patch-decode_c
+++ /dev/null
@@ -1,64 +0,0 @@
-$OpenBSD: patch-decode_c,v 1.1 2002/08/09 01:15:19 naddy Exp $
---- decode.c.orig	Thu Feb 16 22:39:44 1995
-+++ decode.c	Fri Aug  9 03:03:32 2002
-@@ -28,10 +28,11 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
-+#include <sys/types.h>
-+#include <md5.h>
- #include "xmalloc.h"
- #include "common.h"
- #include "part.h"
--#include "md5.h"
- 
- extern char *os_idtodir();
- extern FILE *os_newtypedfile();
-@@ -416,6 +416,15 @@ char **headerp;
- 	}
- 	if (*header) *header++ = '\0';
-     }
-+
-+    /*
-+     * Debian fix: if there was only an empty parameter list (a bare
-+     * semicolon) then there is no guarantee that param[nparam] exists.
-+     * Therefore, treat it as if there is no parameter list.
-+     */
-+    if (nparam == 0)
-+	return 0;
-+
-     param[nparam] = 0;
-     return param;
- }
-@@ -466,6 +475,7 @@ char *key;
- 	while (*from && *from != '\"') {
- 	    if (!--left) {
- 		alloced += VALUEGROWSIZE;
-+		left += VALUEGROWSIZE;
- 		value = xrealloc(value, alloced);
- 		to = value + alloced - left - 2;
- 	    }
-@@ -482,6 +492,7 @@ char *key;
- 	while (*from && !isspace(*from)) {
- 	    if (!--left) {
- 		alloced += VALUEGROWSIZE;
-+		left += VALUEGROWSIZE;
- 		value = xrealloc(value, alloced);
- 		to = value + alloced - left - 2;
- 	    }
-@@ -571,6 +582,7 @@ char *disposition;
- 	while (*disposition && *disposition != '\"') {
- 	    if (!--left) {
- 		alloced += VALUEGROWSIZE;
-+		left += VALUEGROWSIZE;
- 		value = xrealloc(value, alloced);
- 		to = value + alloced - left - 2;
- 	    }
-@@ -588,6 +600,7 @@ char *disposition;
- 	       *disposition != '(') {
- 	    if (!--left) {
- 		alloced += VALUEGROWSIZE;
-+		left += VALUEGROWSIZE;
- 		value = xrealloc(value, alloced);
- 		to = value + alloced - left - 2;
- 	    }
diff --git a/converters/mpack/files/patch-magic_c b/converters/mpack/files/patch-magic_c
deleted file mode 100644
index 100f1e2f1565..000000000000
--- a/converters/mpack/files/patch-magic_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-magic_c,v 1.1 2002/08/09 01:15:19 naddy Exp $
---- magic.c.orig	Fri Aug  9 02:36:58 2002
-+++ magic.c	Fri Aug  9 02:37:21 2002
-@@ -23,6 +23,7 @@
-  * SOFTWARE.
-  */
- #include <stdio.h>
-+#include <string.h>
- 
- /* Description of the various file formats and their magic numbers */
- struct magic {
diff --git a/converters/mpack/pkg-plist b/converters/mpack/pkg-plist
deleted file mode 100644
index 099fe27a0faa..000000000000
--- a/converters/mpack/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/mpack
-bin/munpack