summaryrefslogtreecommitdiff
path: root/sysutils/mkisofs
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1997-10-29 12:28:55 +0000
committeragc <agc@pkgsrc.org>1997-10-29 12:28:55 +0000
commitb01f304d890437a4d432ce8dfe1e862b5f058c9c (patch)
tree62e88a06b4f8ce9688f1448503739838b451bb6b /sysutils/mkisofs
parent3faf8f34df0b3503201ac19973089e46ca14180f (diff)
downloadpkgsrc-b01f304d890437a4d432ce8dfe1e862b5f058c9c.tar.gz
Upgrade to mkisofs-1.11. Bring patches forward to newer version.
Diffstat (limited to 'sysutils/mkisofs')
-rw-r--r--sysutils/mkisofs/patches/patch-aa14
-rw-r--r--sysutils/mkisofs/patches/patch-ab27
-rw-r--r--sysutils/mkisofs/patches/patch-ac14
-rw-r--r--sysutils/mkisofs/patches/patch-ad12
4 files changed, 28 insertions, 39 deletions
diff --git a/sysutils/mkisofs/patches/patch-aa b/sysutils/mkisofs/patches/patch-aa
index 9abbfa3eb3c..17bc3b5037c 100644
--- a/sysutils/mkisofs/patches/patch-aa
+++ b/sysutils/mkisofs/patches/patch-aa
@@ -1,17 +1,17 @@
---- Makefile.in.orig Sat Mar 15 04:02:45 1997
-+++ Makefile.in Tue Mar 18 11:50:24 1997
+--- 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=-g -O -c -I.
-+CFLAGS=$(XCFLAGS)
- LDFLAGS=
+-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 configure
- ./configure
+ Makefile: Makefile.in config.status
+ CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/sysutils/mkisofs/patches/patch-ab b/sysutils/mkisofs/patches/patch-ab
index f0801a5d921..5b93302cc36 100644
--- a/sysutils/mkisofs/patches/patch-ab
+++ b/sysutils/mkisofs/patches/patch-ab
@@ -1,25 +1,6 @@
-*** eltorito.c.orig Sat Mar 29 22:44:34 1997
---- eltorito.c Sat Mar 29 22:45:12 1997
-***************
-*** 28,34 ****
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-! #include <malloc.h>
-
- #include "mkisofs.h"
- #include "iso9660.h"
---- 28,34 ----
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-! #include <stdlib.h>
-
- #include "mkisofs.h"
- #include "iso9660.h"
---- ./mkisofs.h.org Wed Dec 20 08:56:02 1995
-+++ ./mkisofs.h Thu Apr 24 15:25:31 1997
-@@ -34,6 +34,8 @@
+--- mkisofs.h.orig Thu Apr 10 04:41:48 1997
++++ mkisofs.h Wed Oct 29 12:14:38 1997
+@@ -38,6 +38,8 @@
#define NON_UNIXFS
#endif
@@ -28,7 +9,7 @@
#ifdef VMS
#include <sys/dir.h>
#define dirent direct
-@@ -42,7 +44,6 @@
+@@ -46,7 +48,6 @@
#endif
#include <string.h>
diff --git a/sysutils/mkisofs/patches/patch-ac b/sysutils/mkisofs/patches/patch-ac
index fe958460161..033ec19e961 100644
--- a/sysutils/mkisofs/patches/patch-ac
+++ b/sysutils/mkisofs/patches/patch-ac
@@ -1,6 +1,6 @@
---- name.c.orig Sat Mar 15 04:02:46 1997
-+++ name.c Mon Apr 28 11:50:47 1997
-@@ -57,6 +57,7 @@
+--- name.c.orig Thu Apr 10 04:41:48 1997
++++ name.c Wed Oct 29 12:11:01 1997
+@@ -58,6 +58,7 @@
const char * pnt;
int priority = 32767;
char * result;
@@ -8,13 +8,15 @@
int seen_dot = 0;
int seen_semic = 0;
int tildes = 0;
-@@ -104,12 +105,17 @@
+@@ -105,13 +106,17 @@
last_dot = strrchr (pnt,'.');
if( (last_dot != NULL)
&& ( (last_dot[1] == '~')
- || (last_dot[1] == '\0')
|| (last_dot[1] == '\0')) )
{
+- c = last_dot;
+- *c = '\0';
+ /*
+ * We gotta copy the string first, to work around its constness.
+ */
@@ -22,9 +24,9 @@
+ memcpy (copy, name, strlen(name) + 1);
+ pnt = copy;
+ last_dot = strrchr (pnt,'.');
- *last_dot = '\0';
++ *last_dot = '\0';
last_dot = strrchr (pnt,'.');
-- *last_dot = '.';
+- *c = '.';
}
while(*pnt)
diff --git a/sysutils/mkisofs/patches/patch-ad b/sysutils/mkisofs/patches/patch-ad
index f7f28be8326..2173383d082 100644
--- a/sysutils/mkisofs/patches/patch-ad
+++ b/sysutils/mkisofs/patches/patch-ad
@@ -1,6 +1,12 @@
---- eltorito.c.orig Mon May 5 15:46:11 1997
-+++ eltorito.c Mon May 5 16:11:42 1997
-@@ -33,6 +33,9 @@
+--- 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"