After being able to reproduce and fix the coredumps i've got with this

version, now finally upgrade to mkisofs 1.10.

PR:		ports/3143
Submitted by:	partially by Brian Handy <handy@lambic.space.lockheed.com>

6 files changed, 74 insertions, 20 deletions

diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index 3cc78c7910d9..4901f60410eb 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -1,20 +1,17 @@
 # New ports collection makefile for:    mkisofs
-# Version required:     1.0.5
+# Version required:     1.10
 # Date created:         07 Aug 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.3 1997/01/06 12:13:31 jkh Exp $
+# $Id: Makefile,v 1.4 1997/03/15 00:04:01 asami Exp $
 #
 
-DISTNAME=       mkisofs-1.05
+DISTNAME=       mkisofs-1.10
 CATEGORIES=	sysutils
-MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/BETA/cdrom/
+MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/packages/mkisofs/
 
-NO_WRKSUBDIR=   yes     
-HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
-ALL_TARGET=
-MAKE_FLAGS=	CFLAGS='-c ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
+GNU_CONFIGURE=		yes
+MAKE_FLAGS=	XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
 MAN8=		mkisofs.8
 
 .include <bsd.port.mk>
diff --git a/sysutils/mkisofs-devel/distinfo b/sysutils/mkisofs-devel/distinfo
index 87f9822f686d..e904839c0d13 100644
--- a/sysutils/mkisofs-devel/distinfo
+++ b/sysutils/mkisofs-devel/distinfo
@@ -1 +1 @@
-MD5 (mkisofs-1.05.tar.gz) = a34d6c8364d78bfac10fb22de758d684
+MD5 (mkisofs-1.10.tar.gz) = a5c7022f606e3ad2e1c0e0247a5519b0
diff --git a/sysutils/mkisofs-devel/files/patch-ac b/sysutils/mkisofs-devel/files/patch-ac
new file mode 100644
index 000000000000..fe9584601618
--- /dev/null
+++ b/sysutils/mkisofs-devel/files/patch-ac
@@ -0,0 +1,30 @@
+--- name.c.orig	Sat Mar 15 04:02:46 1997
++++ name.c	Mon Apr 28 11:50:47 1997
+@@ -57,6 +57,7 @@
+   const char	* pnt;
+   int		  priority	   = 32767;
+   char		* result;
++  char		* copy;
+   int		  seen_dot	   = 0;
+   int		  seen_semic	   = 0;
+   int		  tildes	   = 0;
+@@ -104,12 +105,17 @@
+   last_dot = strrchr (pnt,'.');
+   if(    (last_dot != NULL)
+       && (    (last_dot[1] == '~')
+-	   || (last_dot[1] == '\0')
+ 	   || (last_dot[1] == '\0')) )
+     {
++      /*
++       * We gotta copy the string first, to work around its constness.
++       */
++      copy = alloca (strlen(name) + 1);
++      memcpy (copy, name, strlen(name) + 1);
++      pnt = copy;
++      last_dot = strrchr (pnt,'.');
+       *last_dot = '\0';
+       last_dot = strrchr (pnt,'.');
+-      *last_dot = '.';
+     }
+ 
+   while(*pnt)
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index 3cc78c7910d9..4901f60410eb 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,20 +1,17 @@
 # New ports collection makefile for:    mkisofs
-# Version required:     1.0.5
+# Version required:     1.10
 # Date created:         07 Aug 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.3 1997/01/06 12:13:31 jkh Exp $
+# $Id: Makefile,v 1.4 1997/03/15 00:04:01 asami Exp $
 #
 
-DISTNAME=       mkisofs-1.05
+DISTNAME=       mkisofs-1.10
 CATEGORIES=	sysutils
-MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/BETA/cdrom/
+MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/packages/mkisofs/
 
-NO_WRKSUBDIR=   yes     
-HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
-ALL_TARGET=
-MAKE_FLAGS=	CFLAGS='-c ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
+GNU_CONFIGURE=		yes
+MAKE_FLAGS=	XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
 MAN8=		mkisofs.8
 
 .include <bsd.port.mk>
diff --git a/sysutils/mkisofs/distinfo b/sysutils/mkisofs/distinfo
index 87f9822f686d..e904839c0d13 100644
--- a/sysutils/mkisofs/distinfo
+++ b/sysutils/mkisofs/distinfo
@@ -1 +1 @@
-MD5 (mkisofs-1.05.tar.gz) = a34d6c8364d78bfac10fb22de758d684
+MD5 (mkisofs-1.10.tar.gz) = a5c7022f606e3ad2e1c0e0247a5519b0
diff --git a/sysutils/mkisofs/files/patch-ac b/sysutils/mkisofs/files/patch-ac
new file mode 100644
index 000000000000..fe9584601618
--- /dev/null
+++ b/sysutils/mkisofs/files/patch-ac
@@ -0,0 +1,30 @@
+--- name.c.orig	Sat Mar 15 04:02:46 1997
++++ name.c	Mon Apr 28 11:50:47 1997
+@@ -57,6 +57,7 @@
+   const char	* pnt;
+   int		  priority	   = 32767;
+   char		* result;
++  char		* copy;
+   int		  seen_dot	   = 0;
+   int		  seen_semic	   = 0;
+   int		  tildes	   = 0;
+@@ -104,12 +105,17 @@
+   last_dot = strrchr (pnt,'.');
+   if(    (last_dot != NULL)
+       && (    (last_dot[1] == '~')
+-	   || (last_dot[1] == '\0')
+ 	   || (last_dot[1] == '\0')) )
+     {
++      /*
++       * We gotta copy the string first, to work around its constness.
++       */
++      copy = alloca (strlen(name) + 1);
++      memcpy (copy, name, strlen(name) + 1);
++      pnt = copy;
++      last_dot = strrchr (pnt,'.');
+       *last_dot = '\0';
+       last_dot = strrchr (pnt,'.');
+-      *last_dot = '.';
+     }
+ 
+   while(*pnt)