From 1e22193d625cdffb2f4300e22fdf2bf447e7383e Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Fri, 19 May 2000 10:40:48 +0000
Subject: Build mkhybrid as part of mkisofs. So the mkhybrid* ports are
 included in mkisofs, now.

As of cdrecord version 1.9a01 the functionality of mkhybrid is
included in mkisofs anyway, i.e. there will be one binary only.

Submitted by:	Patrick Bihan-Faou <patrick@mindstep.com>
---
 sysutils/mkisofs-devel/Makefile  | 14 +++++++++++++-
 sysutils/mkisofs-devel/distinfo  |  1 +
 sysutils/mkisofs-devel/pkg-plist |  5 +++++
 sysutils/mkisofs/Makefile        | 14 +++++++++++++-
 sysutils/mkisofs/distinfo        |  1 +
 sysutils/mkisofs/pkg-plist       |  5 +++++
 6 files changed, 38 insertions(+), 2 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index a0e13e271018..e4f30e69ea3a 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -13,9 +13,12 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
 		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
 DISTNAME=	cdrecord-1.8.1
 
+PATCH_SITES=	http://people.FreeBSD.org/~dirk/ports/distfiles/
+PATCHFILES=	apple_driver.patch
+
 MAINTAINER=	dirk@FreeBSD.org
 
-MAN8=		mkisofs.8
+MAN8=		apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
 USE_GMAKE=	yes
 MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG"
 
@@ -27,6 +30,15 @@ post-extract:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${ARCH}-freebsd-cc/mkisofs ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkhybrid/OBJ/${ARCH}-freebsd-cc/mkhybrid ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkhybrid/OBJ/${ARCH}-freebsd-cc/apple_driver ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/devdump ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/isodump ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/isoinfo ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/isovfy ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/mkhybrid/mkhybrid.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/mkhybrid/apple_driver.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/mkisofs-devel/distinfo b/sysutils/mkisofs-devel/distinfo
index 9a547a364d52..9dbb0e007cd7 100644
--- a/sysutils/mkisofs-devel/distinfo
+++ b/sysutils/mkisofs-devel/distinfo
@@ -1 +1,2 @@
 MD5 (cdrecord-1.8.1.tar.gz) = b14fda2dc632b1270cac60a5882f7992
+MD5 (apple_driver.patch) = 342423fff775583ca1fdfc7b06af1784
diff --git a/sysutils/mkisofs-devel/pkg-plist b/sysutils/mkisofs-devel/pkg-plist
index e2a136bfe936..c3fd0359d9e9 100644
--- a/sysutils/mkisofs-devel/pkg-plist
+++ b/sysutils/mkisofs-devel/pkg-plist
@@ -1 +1,6 @@
+bin/devdump
+bin/isodump
+bin/isoinfo
+bin/isovfy
+bin/mkhybrid
 bin/mkisofs
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index a0e13e271018..e4f30e69ea3a 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -13,9 +13,12 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
 		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
 DISTNAME=	cdrecord-1.8.1
 
+PATCH_SITES=	http://people.FreeBSD.org/~dirk/ports/distfiles/
+PATCHFILES=	apple_driver.patch
+
 MAINTAINER=	dirk@FreeBSD.org
 
-MAN8=		mkisofs.8
+MAN8=		apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
 USE_GMAKE=	yes
 MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG"
 
@@ -27,6 +30,15 @@ post-extract:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/OBJ/${ARCH}-freebsd-cc/mkisofs ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkhybrid/OBJ/${ARCH}-freebsd-cc/mkhybrid ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkhybrid/OBJ/${ARCH}-freebsd-cc/apple_driver ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/devdump ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/isodump ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/isoinfo ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs/diag/OBJ/${ARCH}-freebsd-cc/isovfy ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/mkisofs/mkisofs.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/mkhybrid/mkhybrid.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/mkhybrid/apple_driver.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/mkisofs/diag/isoinfo.8 ${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/mkisofs/distinfo b/sysutils/mkisofs/distinfo
index 9a547a364d52..9dbb0e007cd7 100644
--- a/sysutils/mkisofs/distinfo
+++ b/sysutils/mkisofs/distinfo
@@ -1 +1,2 @@
 MD5 (cdrecord-1.8.1.tar.gz) = b14fda2dc632b1270cac60a5882f7992
+MD5 (apple_driver.patch) = 342423fff775583ca1fdfc7b06af1784
diff --git a/sysutils/mkisofs/pkg-plist b/sysutils/mkisofs/pkg-plist
index e2a136bfe936..c3fd0359d9e9 100644
--- a/sysutils/mkisofs/pkg-plist
+++ b/sysutils/mkisofs/pkg-plist
@@ -1 +1,6 @@
+bin/devdump
+bin/isodump
+bin/isoinfo
+bin/isovfy
+bin/mkhybrid
 bin/mkisofs
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0