Update to 1.12b5

Changes: many, including one to merge several (unrealted) dirs into one
         tree, using /foo=/bar/baz syntax (used by gcombust).

7 files changed, 56 insertions, 36 deletions

diff --git a/sysutils/mkhybrid/Makefile b/sysutils/mkhybrid/Makefile
index 1c85c3f4d64..f5fdc73df5a 100644
--- a/sysutils/mkhybrid/Makefile
+++ b/sysutils/mkhybrid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 1999/05/07 07:11:16 ross Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/15 07:27:49 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/06/16 16:50:06 dburr Exp
 #
 
-DISTNAME=	mkhybrid-1.11.1
+DISTNAME=	mkhybrid-1.12b5.2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.ge.ucl.ac.uk/pub/mkhfs/
 
diff --git a/sysutils/mkhybrid/files/md5 b/sysutils/mkhybrid/files/md5
index 298fe870c26..92db783a1c7 100644
--- a/sysutils/mkhybrid/files/md5
+++ b/sysutils/mkhybrid/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/11 12:20:58 agc Exp $
+$NetBSD: md5,v 1.3 1999/05/15 07:27:49 hubertf Exp $
 
-MD5 (mkhybrid-1.11.1.tar.gz) = 80b0e9b274c67c5ac088eba40a2c94a2
+MD5 (mkhybrid-1.12b5.2.tar.gz) = 30de5a1cec363936f66bba0ba876fc65
diff --git a/sysutils/mkhybrid/patches/patch-aa b/sysutils/mkhybrid/patches/patch-aa
index 83781f3cc60..fce88de5d28 100644
--- a/sysutils/mkhybrid/patches/patch-aa
+++ b/sysutils/mkhybrid/patches/patch-aa
@@ -1,17 +1,22 @@
-$NetBSD: patch-aa,v 1.2 1998/12/28 09:22:25 tron Exp $
+$NetBSD: patch-aa,v 1.3 1999/05/15 07:27:49 hubertf Exp $
 
---- iso9660.h.orig      Fri Aug  7 13:22:22 1998
-+++ iso9660.h   Fri Aug  7 13:20:49 1998
-@@ -180,5 +180,5 @@
-        char  parent[2];        /* 721 */
-        char name[1];
+--- iso9660.h.orig	Sat May 17 17:46:44 1997
++++ iso9660.h	Sat May 15 09:01:27 1999
+@@ -137,7 +137,7 @@
+ 	char extent[4];		/* 731 */
+ 	char  parent[2];	/* 721 */
+ 	char name[1];
 -};
 +} __attribute((packed));
- #ifdef JOLIET
- #define J_NAME_EXTRA   100     /* need space for longer Joliet filename */
-@@ -199,5 +199,5 @@
-        unsigned char name_len          [ISODCL (33, 33)]; /* 711 */
-        char name                       [34 + J_NAME_EXTRA]; /* Not really, but we need something here */
+ 
+ struct iso_directory_record {
+ 	unsigned char length			[ISODCL (1, 1)]; /* 711 */
+@@ -151,7 +151,7 @@
+ 	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
+ 	unsigned char name_len		[ISODCL (33, 33)]; /* 711 */
+ 	char name			[34]; /* Not really, but we need something here */
 -};
 +} __attribute((packed));
  #endif
+ 
+ 
diff --git a/sysutils/mkhybrid/patches/patch-ab b/sysutils/mkhybrid/patches/patch-ab
index ab169dfed00..26c2a737aad 100644
--- a/sysutils/mkhybrid/patches/patch-ab
+++ b/sysutils/mkhybrid/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1 1999/04/07 23:35:56 tron Exp $
+$NetBSD: patch-ab,v 1.2 1999/05/15 07:27:50 hubertf Exp $
 
---- mkhybrid.8.orig	Thu Dec  4 18:18:08 1997
-+++ mkhybrid.8	Thu Apr  8 01:33:53 1999
-@@ -99,8 +99,10 @@
- .B \-m
- .I glob
+--- mkhybrid.8.orig	Tue Apr 27 15:31:54 1999
++++ mkhybrid.8	Sat May 15 09:02:27 1999
+@@ -228,8 +228,10 @@
+ [
+ .B \--dave
  ]
 +[
  .B \-o
  .I filename
 +]
- .I path
+ .I pathspec [pathspec]
  .SH DESCRIPTION
  .B mkhybrid
diff --git a/sysutils/mkhybrid/patches/patch-ac b/sysutils/mkhybrid/patches/patch-ac
index 1b0af769f7a..3e43cafa884 100644
--- a/sysutils/mkhybrid/patches/patch-ac
+++ b/sysutils/mkhybrid/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 1999/05/07 07:11:17 ross Exp $
+$NetBSD: patch-ac,v 1.2 1999/05/15 07:27:50 hubertf Exp $
 
---- apple.h.orig	Thu May  6 23:54:19 1999
-+++ apple.h	Thu May  6 23:41:02 1999
-@@ -5,6 +5,8 @@
+--- apple.h.orig	Thu May  6 11:51:12 1999
++++ apple.h	Sat May 15 09:04:11 1999
+@@ -4,6 +4,8 @@
+ #ifndef _APPLE_H
  
  #include <sys/param.h>
- #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
+ #include <mactypes.h>
  
- #ifndef MIN
- #define MIN(a,b) (((a)<(b))?(a):(b))
+ #ifdef __sgi		/* bit of a hack ... need to investigate further */
diff --git a/sysutils/mkhybrid/patches/patch-af b/sysutils/mkhybrid/patches/patch-af
index 548dbb424a0..033656d57fe 100644
--- a/sysutils/mkhybrid/patches/patch-af
+++ b/sysutils/mkhybrid/patches/patch-af
@@ -1,5 +1,7 @@
---- mkisofs.c.orig	Mon Feb  2 06:01:40 1998
-+++ mkisofs.c	Thu May 13 05:30:27 1999
+$NetBSD: patch-af,v 1.2 1999/05/15 07:27:50 hubertf Exp $
+
+--- mkisofs.c.orig	Tue Apr 27 15:16:03 1999
++++ mkisofs.c	Sat May 15 09:06:35 1999
 @@ -57,11 +57,6 @@
  
  #include "exclude.h"
@@ -11,11 +13,11 @@
 -
  struct directory * root = NULL;
  
- static char version_string[] = "mkhybrid v1.11.1";
-@@ -521,19 +516,6 @@
- 	usage();
- 	exit(1);
-       }
+ #ifdef APPLE_HYB
+@@ -1136,19 +1131,6 @@
+ 
+ parse_input_files:
+ 
 -#ifdef __NetBSD__
 -    {
 -	int resource;
diff --git a/sysutils/mkhybrid/patches/patch-ag b/sysutils/mkhybrid/patches/patch-ag
new file mode 100644
index 00000000000..9e94ce2df57
--- /dev/null
+++ b/sysutils/mkhybrid/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 1999/05/15 07:27:50 hubertf Exp $
+
+--- Makefile.in.orig	Sat May 15 09:16:08 1999
++++ Makefile.in	Sat May 15 09:16:21 1999
+@@ -68,7 +68,7 @@
+ apple_driver.o: apple_driver.c mac_label.h
+ 	$(CC) -c $(CFLAGS) $(srcdir)/apple_driver.c
+ 
+-install: mkisofs mkisofs.8
++install: mkhybrid mkhybrid.8
+ 	[ -d $(bindir) ] || mkdir $(bindir)
+ 	[ -d $(mandir) ] || mkdir $(mandir)
+ 	$(INSTALL_PROGRAM) mkhybrid $(bindir)/mkhybrid