Update to 1.11.3.

6 files changed, 35 insertions, 52 deletions

diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index cef559387a9..60c53003363 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.6 1998/06/22 13:09:51 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/07/04 08:09:07 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/28 11:30:44 joerg Exp
 #
 
-DISTNAME=       mkisofs-1.11
+DISTNAME=       mkisofs-1.11.3
 CATEGORIES=	sysutils
 MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/packages/mkisofs/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	mycroft@netbsd.org
+
+CONFLICTS=	mkisofs-1.11
 
 GNU_CONFIGURE=	yes
-MAKE_FLAGS=	XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"'`uname -s | ${TR} [a-z] [A-Z]`'\"'
+ALL_TARGET=	World
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mkisofs/files/md5 b/sysutils/mkisofs/files/md5
index fa75ee04321..dc5465dce49 100644
--- a/sysutils/mkisofs/files/md5
+++ b/sysutils/mkisofs/files/md5
@@ -1 +1 @@
-MD5 (mkisofs-1.11.tar.gz) = d642d1a407488e6ac75c06a5d37206dd
+MD5 (mkisofs-1.11.3.tar.gz) = 6ac09ac298401a900fb37534888c16fb
diff --git a/sysutils/mkisofs/patches/patch-aa b/sysutils/mkisofs/patches/patch-aa
deleted file mode 100644
index 17bc3b5037c..00000000000
--- a/sysutils/mkisofs/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Thu Apr 10 04:41:41 1997
-+++ Makefile.in	Wed Oct  1 12:25:59 1997
-@@ -28,12 +28,12 @@
- 
- #### End of system configuration section. ####
- 
--CFLAGS=@CFLAGS@ -I.
-+CFLAGS= $(XCFLAGS)
- LDFLAGS=@LDFLAGS@
- OBJS=mkisofs.o tree.o write.o hash.o rock.o exclude.o multi.o \
- 		files.o match.o name.o fnmatch.o eltorito.o
- 
--World: mkisofs
-+all: mkisofs
- 
- Makefile: Makefile.in config.status
- 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/sysutils/mkisofs/patches/patch-ad b/sysutils/mkisofs/patches/patch-ad
deleted file mode 100644
index 2173383d082..00000000000
--- a/sysutils/mkisofs/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
---- eltorito.c.orig	Thu Apr 10 04:41:44 1997
-+++ eltorito.c	Wed Oct 29 12:13:33 1997
-@@ -28,11 +28,14 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "mkisofs.h"
- #include "iso9660.h"
- 
-+#undef MIN
-+#define MIN(a, b) (((a) < (b))? (a): (b))
-+
- static struct eltorito_validation_entry valid_desc;
- static struct eltorito_defaultboot_entry default_desc;
- 
-@@ -158,7 +161,7 @@
-      * but who really reads this stuff!
-      */
-     if (publisher)
--	memcpy_max(valid_desc.id,  publisher, strlen(publisher));
-+	memcpy_max(valid_desc.id,  publisher, MIN(31, strlen(publisher)));
-     
-     valid_desc.key1[0] = 0x55;
-     valid_desc.key2[0] = 0xAA;
diff --git a/sysutils/mkisofs/patches/patch-af b/sysutils/mkisofs/patches/patch-af
index 8f2c0830168..e89e480e5ba 100644
--- a/sysutils/mkisofs/patches/patch-af
+++ b/sysutils/mkisofs/patches/patch-af
@@ -1,6 +1,18 @@
---- mkisofs.c.old	Thu Jul  2 13:24:42 1998
-+++ mkisofs.c	Thu Jul  2 14:06:03 1998
-@@ -459,19 +459,6 @@
+--- mkisofs.c.orig	Mon Jun  1 23:36:16 1998
++++ mkisofs.c	Sat Jul  4 04:08:26 1998
+@@ -53,11 +53,6 @@
+ 
+ #include "exclude.h"
+ 
+-#ifdef __NetBSD__
+-#include <sys/time.h>
+-#include <sys/resource.h>
+-#endif
+-
+ struct directory * root = NULL;
+ 
+ static char version_string[] = "mkisofs v1.11.3";
+@@ -459,19 +454,6 @@
  	usage();
  	exit(1);
        }
diff --git a/sysutils/mkisofs/patches/patch-ag b/sysutils/mkisofs/patches/patch-ag
new file mode 100644
index 00000000000..ba2c723b667
--- /dev/null
+++ b/sysutils/mkisofs/patches/patch-ag
@@ -0,0 +1,13 @@
+--- defaults.h.orig	Wed Apr  9 23:31:53 1997
++++ defaults.h	Sat Jul  4 04:04:10 1998
+@@ -39,6 +39,10 @@
+ #define  SYSTEM_ID_DEFAULT 	"AIX"
+ #endif
+ 
++#ifdef __NetBSD__
++#define  SYSTEM_ID_DEFAULT 	"NetBSD"
++#endif
++
+ #ifndef SYSTEM_ID_DEFAULT
+ #define  SYSTEM_ID_DEFAULT 	"LINUX"
+ #endif