mkhybrid is no longer, see ../../sysutils/cdrecord

12 files changed, 1 insertions, 177 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 92c455aa7e3..11a30b83472 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2002/06/02 08:52:19 cjep Exp $
+# $NetBSD: Makefile,v 1.141 2002/06/03 05:03:28 grant Exp $
 #
 
 COMMENT=	System utilities
@@ -68,7 +68,6 @@ SUBDIR+=	medusa
 SUBDIR+=	memconf
 SUBDIR+=	memtest86
 SUBDIR+=	mgm
-SUBDIR+=	mkhybrid
 #SUBDIR+=	mkisofs			# currently part of cdrecord
 SUBDIR+=	mksunbootcd
 SUBDIR+=	mtools
diff --git a/sysutils/mkhybrid/DESCR b/sysutils/mkhybrid/DESCR
deleted file mode 100644
index 4be4cd83f98..00000000000
--- a/sysutils/mkhybrid/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-mkhybrid is a pre-mastering program to create iso9660 cd images with
-optional Rockridge, Joliet, or HFS support.  It is based on mkisofs
-and generates a binary image which can be written onto a block device
-such as a CDR drive.
diff --git a/sysutils/mkhybrid/Makefile b/sysutils/mkhybrid/Makefile
deleted file mode 100644
index 548352ab62f..00000000000
--- a/sysutils/mkhybrid/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2001/02/17 17:42:16 wiz Exp $
-# FreeBSD Id: Makefile,v 1.1.1.1 1998/06/16 16:50:06 dburr Exp
-#
-
-DISTNAME=	mkhybrid-1.12b5.2
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.ge.ucl.ac.uk/pub/mkhfs/
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.ps.ucl.ac.uk/~jcpearso/mkhybrid.html
-COMMENT=	create a hybrid ISO9660/JOLIET/HFS/Rock Ridge filesystem
-
-GNU_CONFIGURE=	yes
-CFLAGS+=	-Dunix
-TBL?=		tbl
-ALL_TARGET=	World
-
-post-extract:
-		@cd ${WRKSRC}; \
-		${MV} mkhybrid.8 mkhybrid.tbl
-
-post-build:
-		${TBL} ${WRKSRC}/mkhybrid.tbl > ${WRKSRC}/mkhybrid.8
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mkhybrid/PLIST b/sysutils/mkhybrid/PLIST
deleted file mode 100644
index 4c4277083ac..00000000000
--- a/sysutils/mkhybrid/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:32 zuntum Exp $
-bin/mkhybrid
-man/man8/mkhybrid.8
diff --git a/sysutils/mkhybrid/distinfo b/sysutils/mkhybrid/distinfo
deleted file mode 100644
index 0d3e4a82f60..00000000000
--- a/sysutils/mkhybrid/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:05 agc Exp $
-
-SHA1 (mkhybrid-1.12b5.2.tar.gz) = 589c7bd95df114c1555b448a3d0b8e2251120a91
-Size (mkhybrid-1.12b5.2.tar.gz) = 275364 bytes
-SHA1 (patch-aa) = a58c1fbfd1c5de48aef5c9b0d9f7b86b8b39a56b
-SHA1 (patch-ab) = 09a6b40b597f9ed9d541403aac248ba25a576b5e
-SHA1 (patch-ac) = 9873a62ca86dc43dbd541ffe19d6aecff77aabcc
-SHA1 (patch-ad) = 59e765804ceca4539e5e80a2d93d36d3d977a6d1
-SHA1 (patch-ae) = 553db2b0896b38625a3919366dc4fc4a145b160d
-SHA1 (patch-af) = a306229ec8f01358b6176dd68520436b24eece56
-SHA1 (patch-ag) = 6f7862bcab4f867421fe352cfb5d660573851ae9
diff --git a/sysutils/mkhybrid/patches/patch-aa b/sysutils/mkhybrid/patches/patch-aa
deleted file mode 100644
index fce88de5d28..00000000000
--- a/sysutils/mkhybrid/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/05/15 07:27:49 hubertf Exp $
-
---- 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));
- 
- 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
deleted file mode 100644
index 16c622e82e7..00000000000
--- a/sysutils/mkhybrid/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/11/27 12:54:47 kei Exp $
-
---- mkhybrid.tbl.orig	Tue Apr 27 15:31:54 1999
-+++ mkhybrid.tbl	Sat May 15 09:02:27 1999
-@@ -228,8 +228,10 @@
- [
- .B \--dave
- ]
-+[
- .B \-o
- .I filename
-+]
- .I pathspec [pathspec]
- .SH DESCRIPTION
- .B mkhybrid
diff --git a/sysutils/mkhybrid/patches/patch-ac b/sysutils/mkhybrid/patches/patch-ac
deleted file mode 100644
index 3e43cafa884..00000000000
--- a/sysutils/mkhybrid/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/05/15 07:27:50 hubertf Exp $
-
---- 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 <stdlib.h>
-+#include <string.h>
- #include <mactypes.h>
- 
- #ifdef __sgi		/* bit of a hack ... need to investigate further */
diff --git a/sysutils/mkhybrid/patches/patch-ad b/sysutils/mkhybrid/patches/patch-ad
deleted file mode 100644
index 2860f02f0af..00000000000
--- a/sysutils/mkhybrid/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/05/07 07:11:17 ross Exp $
-
---- libhfs_iso/block.c.orig	Thu May  6 23:59:40 1999
-+++ libhfs_iso/block.c	Thu May  6 23:59:56 1999
-@@ -21,6 +21,7 @@
- # include <unistd.h>
- # include <errno.h>
- # include <time.h>
-+# include <string.h>
- 
- # include "internal.h"
- # include "data.h"
diff --git a/sysutils/mkhybrid/patches/patch-ae b/sysutils/mkhybrid/patches/patch-ae
deleted file mode 100644
index 375f0ba432b..00000000000
--- a/sysutils/mkhybrid/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/05/07 07:11:17 ross Exp $
-
---- libhfs_iso/hfs.h.orig	Fri May  7 00:04:46 1999
-+++ libhfs_iso/hfs.h	Fri May  7 00:04:50 1999
-@@ -18,6 +18,7 @@
-  */
- 
- # include <time.h>
-+# include <string.h>
- 
- #ifdef APPLE_HYB
- #include "hybrid.h"
diff --git a/sysutils/mkhybrid/patches/patch-af b/sysutils/mkhybrid/patches/patch-af
deleted file mode 100644
index 033656d57fe..00000000000
--- a/sysutils/mkhybrid/patches/patch-af
+++ /dev/null
@@ -1,36 +0,0 @@
-$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"
- 
--#ifdef __NetBSD__
--#include <sys/time.h>
--#include <sys/resource.h>
--#endif
--
- struct directory * root = NULL;
- 
- #ifdef APPLE_HYB
-@@ -1136,19 +1131,6 @@
- 
- parse_input_files:
- 
--#ifdef __NetBSD__
--    {
--	int resource;
--    struct rlimit rlp;
--	if (getrlimit(RLIMIT_DATA,&rlp) == -1) 
--		perror("Warning: getrlimit");
--	else {
--		rlp.rlim_cur=33554432;
--		if (setrlimit(RLIMIT_DATA,&rlp) == -1)
--			perror("Warning: setrlimit");
--		}
--	}
--#endif
- #ifdef HAVE_SBRK
-   mem_start = (unsigned long) sbrk(0);
- #endif
diff --git a/sysutils/mkhybrid/patches/patch-ag b/sysutils/mkhybrid/patches/patch-ag
deleted file mode 100644
index 5d05d87269a..00000000000
--- a/sysutils/mkhybrid/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2000/11/27 12:54:47 kei Exp $
-
---- Makefile.in.orig	Wed Mar 17 07:17:02 1999
-+++ Makefile.in	Mon Nov 27 21:35:50 2000
-@@ -15,7 +15,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
--LIBS = @LIBS@ -lhfs -lfile
-+LIBS = @LIBS@ $(LIBHFS) $(LIBFILE)
- 
- prefix = @prefix@
- exec_prefix =  @exec_prefix@
-@@ -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