Use mkisofs supplied with cdrecord.

Now the mkisofs port is a copy of the cdrecord port with some modifications.

8 files changed, 142 insertions, 80 deletions

diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index cae00c5dda55..a9f0a9297a6d 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -1,22 +1,34 @@
 # New ports collection makefile for:	mkisofs
-# Version required:	1.12b4
+# Version required:	1.12b5
 # Date created:		07 Aug 1996
 # Whom:			jhk
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mkisofs-1.12b5
+DISTNAME=	cdrecord-1.8a30
+PKGNAME=	mkisofs-${VERSION}
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/mkisofs/ \
-		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/mkisofs/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/
 
 MAINTAINER=	dirk@FreeBSD.org
 
-GNU_CONFIGURE=	yes
-MAKE_FLAGS=	XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
-ALL_TARGET=	World
+VERSION=	1.12b5
+WRKSRC=		${WRKDIR}/cdrecord-1.8
+USE_GMAKE=	yes
+MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG -DHAVE_SIZE_T"
 MAN8=		mkisofs.8
 
+.if ${MACHINE_ARCH} == "alpha"
+post-extract:
+	${LN} -s ${WRKSRC}/RULES/i386-freebsd-cc.rul \
+		${WRKSRC}/RULES/alpha-freebsd-cc.rul
+.endif
+
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs-${VERSION}/OBJ/${ARCH}-freebsd-cc/mkisofs ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/mkisofs-${VERSION}/mkisofs.8 ${PREFIX}/man/man8
+
 .include <bsd.port.mk>
diff --git a/sysutils/mkisofs-devel/distinfo b/sysutils/mkisofs-devel/distinfo
index 6309a1b6ac66..80b192de41f0 100644
--- a/sysutils/mkisofs-devel/distinfo
+++ b/sysutils/mkisofs-devel/distinfo
@@ -1 +1 @@
-MD5 (mkisofs-1.12b5.tar.gz) = 176b5f7f2499d8f2b32e55befdd13f69
+MD5 (cdrecord-1.8a30.tar.gz) = ca0e8ce08977cb2ec893fe605fe1657b
diff --git a/sysutils/mkisofs-devel/files/patch-ac b/sysutils/mkisofs-devel/files/patch-ac
new file mode 100644
index 000000000000..984db22aac20
--- /dev/null
+++ b/sysutils/mkisofs-devel/files/patch-ac
@@ -0,0 +1,20 @@
+--- include/schily.h.orig	Mon Aug 30 16:50:46 1999
++++ include/schily.h	Sat Sep 18 17:25:57 1999
+@@ -34,7 +34,7 @@
+ #define _SCHILY_H
+ 
+ #ifndef _STANDARD_H
+-#include <standard.h.h>
++#include <standard.h>
+ #endif
+ 
+ #if	defined(_SIZE_T)     || defined(_T_SIZE_) || defined(_T_SIZE) || \
+@@ -139,7 +139,7 @@
+ extern	int	geterrno __PR((void));
+ extern	void	raisecond __PR((const char *, long));
+ #ifdef	HAVE_SIZE_T
+-extern	int	snprintf __PR((char *, size_t, const char *, ...));
++/*extern	int	snprintf __PR((char *, size_t, const char *, ...));*/
+ #endif
+ /*extern	int	sprintf __PR((char *, const char *, ...)); ist woanders falsch deklariert !!!*/
+ extern	char	*strcatl __PR((char *, ...));
diff --git a/sysutils/mkisofs-devel/files/patch-ad b/sysutils/mkisofs-devel/files/patch-ad
index de43f3cd91f5..7b89394c29d7 100644
--- a/sysutils/mkisofs-devel/files/patch-ad
+++ b/sysutils/mkisofs-devel/files/patch-ad
@@ -1,32 +1,31 @@
---- multi.c.orig	Mon Jun  1 20:00:25 1998
-+++ multi.c	Fri Oct 30 22:36:03 1998
-@@ -296,7 +296,7 @@
-       idr = (struct iso_directory_record *) &dirbuff[i];
-       if(idr->length[0] == 0) 
- 	{
--	  i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
-+	  i = ROUND_UP(i);
- 	  continue;
- 	}
-       (*nent)++;
-@@ -324,7 +324,7 @@
-       idr = (struct iso_directory_record *) &dirbuff[i];
-       if(idr->length[0] == 0) 
- 	{
--	  i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
-+	  i = ROUND_UP(i);
- 	  continue;
- 	}
-       *pnt = (struct directory_entry *) e_malloc(sizeof(**rtn));
-@@ -436,8 +436,9 @@
-    */
-   if( tt_extent != 0 && tt_size != 0 )
-     {
--      tt_buf = (unsigned char *) e_malloc(tt_size);
--      readsecs(tt_extent, tt_buf, tt_size/SECTOR_SIZE);
-+      tt_buf = (unsigned char *) e_malloc(ROUND_UP(tt_size));
-+      memset(tt_buf, 0, tt_size);
-+      readsecs(tt_extent, tt_buf, (tt_size + SECTOR_SIZE - 1) / SECTOR_SIZE);
+--- RULES/i386-freebsd-cc.rul.orig	Sun Aug 29 16:09:56 1999
++++ RULES/i386-freebsd-cc.rul	Wed Sep 22 13:21:08 1999
+@@ -24,7 +24,8 @@
+ ###########################################################################
  
-       /*
-        * Loop through the file, examine each entry, and attempt to
+ CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
+-CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
++XCFLAGS:=	$(CFLAGS)
++CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX)
+ 
+ CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+ COPTS=
+@@ -57,14 +58,13 @@
+ 
+ FLOAT_OPTIONS=	
+ 
+-CC=		@echo "	==> COMPILING \"$@\""; gcc
+-LDCC=		@echo "	==> LINKING \"$@\""; gcc
+-DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
+-RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
++LDCC=		$(CC)
++DYNLD=		$(CC)
++RANLIB=		ranlib
+ ARFLAGS=	cr
+ LORDER=		lorder
+ TSORT=		tsort
+ 
+ RMDEP=		:
+-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP=		$(CC) -M
+ MKDEP_OUT=
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index cae00c5dda55..a9f0a9297a6d 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,22 +1,34 @@
 # New ports collection makefile for:	mkisofs
-# Version required:	1.12b4
+# Version required:	1.12b5
 # Date created:		07 Aug 1996
 # Whom:			jhk
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mkisofs-1.12b5
+DISTNAME=	cdrecord-1.8a30
+PKGNAME=	mkisofs-${VERSION}
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/mkisofs/ \
-		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/mkisofs/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/
 
 MAINTAINER=	dirk@FreeBSD.org
 
-GNU_CONFIGURE=	yes
-MAKE_FLAGS=	XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
-ALL_TARGET=	World
+VERSION=	1.12b5
+WRKSRC=		${WRKDIR}/cdrecord-1.8
+USE_GMAKE=	yes
+MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG -DHAVE_SIZE_T"
 MAN8=		mkisofs.8
 
+.if ${MACHINE_ARCH} == "alpha"
+post-extract:
+	${LN} -s ${WRKSRC}/RULES/i386-freebsd-cc.rul \
+		${WRKSRC}/RULES/alpha-freebsd-cc.rul
+.endif
+
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/mkisofs-${VERSION}/OBJ/${ARCH}-freebsd-cc/mkisofs ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/mkisofs-${VERSION}/mkisofs.8 ${PREFIX}/man/man8
+
 .include <bsd.port.mk>
diff --git a/sysutils/mkisofs/distinfo b/sysutils/mkisofs/distinfo
index 6309a1b6ac66..80b192de41f0 100644
--- a/sysutils/mkisofs/distinfo
+++ b/sysutils/mkisofs/distinfo
@@ -1 +1 @@
-MD5 (mkisofs-1.12b5.tar.gz) = 176b5f7f2499d8f2b32e55befdd13f69
+MD5 (cdrecord-1.8a30.tar.gz) = ca0e8ce08977cb2ec893fe605fe1657b
diff --git a/sysutils/mkisofs/files/patch-ac b/sysutils/mkisofs/files/patch-ac
new file mode 100644
index 000000000000..984db22aac20
--- /dev/null
+++ b/sysutils/mkisofs/files/patch-ac
@@ -0,0 +1,20 @@
+--- include/schily.h.orig	Mon Aug 30 16:50:46 1999
++++ include/schily.h	Sat Sep 18 17:25:57 1999
+@@ -34,7 +34,7 @@
+ #define _SCHILY_H
+ 
+ #ifndef _STANDARD_H
+-#include <standard.h.h>
++#include <standard.h>
+ #endif
+ 
+ #if	defined(_SIZE_T)     || defined(_T_SIZE_) || defined(_T_SIZE) || \
+@@ -139,7 +139,7 @@
+ extern	int	geterrno __PR((void));
+ extern	void	raisecond __PR((const char *, long));
+ #ifdef	HAVE_SIZE_T
+-extern	int	snprintf __PR((char *, size_t, const char *, ...));
++/*extern	int	snprintf __PR((char *, size_t, const char *, ...));*/
+ #endif
+ /*extern	int	sprintf __PR((char *, const char *, ...)); ist woanders falsch deklariert !!!*/
+ extern	char	*strcatl __PR((char *, ...));
diff --git a/sysutils/mkisofs/files/patch-ad b/sysutils/mkisofs/files/patch-ad
index de43f3cd91f5..7b89394c29d7 100644
--- a/sysutils/mkisofs/files/patch-ad
+++ b/sysutils/mkisofs/files/patch-ad
@@ -1,32 +1,31 @@
---- multi.c.orig	Mon Jun  1 20:00:25 1998
-+++ multi.c	Fri Oct 30 22:36:03 1998
-@@ -296,7 +296,7 @@
-       idr = (struct iso_directory_record *) &dirbuff[i];
-       if(idr->length[0] == 0) 
- 	{
--	  i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
-+	  i = ROUND_UP(i);
- 	  continue;
- 	}
-       (*nent)++;
-@@ -324,7 +324,7 @@
-       idr = (struct iso_directory_record *) &dirbuff[i];
-       if(idr->length[0] == 0) 
- 	{
--	  i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
-+	  i = ROUND_UP(i);
- 	  continue;
- 	}
-       *pnt = (struct directory_entry *) e_malloc(sizeof(**rtn));
-@@ -436,8 +436,9 @@
-    */
-   if( tt_extent != 0 && tt_size != 0 )
-     {
--      tt_buf = (unsigned char *) e_malloc(tt_size);
--      readsecs(tt_extent, tt_buf, tt_size/SECTOR_SIZE);
-+      tt_buf = (unsigned char *) e_malloc(ROUND_UP(tt_size));
-+      memset(tt_buf, 0, tt_size);
-+      readsecs(tt_extent, tt_buf, (tt_size + SECTOR_SIZE - 1) / SECTOR_SIZE);
+--- RULES/i386-freebsd-cc.rul.orig	Sun Aug 29 16:09:56 1999
++++ RULES/i386-freebsd-cc.rul	Wed Sep 22 13:21:08 1999
+@@ -24,7 +24,8 @@
+ ###########################################################################
  
-       /*
-        * Loop through the file, examine each entry, and attempt to
+ CPPFLAGS=	$(CPPOPTS) $(CPPOPTX)
+-CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
++XCFLAGS:=	$(CFLAGS)
++CFLAGS=		$(COPTS) $(CWARNOPTS) $(XCFLAGS) $(COPTX)
+ 
+ CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+ COPTS=
+@@ -57,14 +58,13 @@
+ 
+ FLOAT_OPTIONS=	
+ 
+-CC=		@echo "	==> COMPILING \"$@\""; gcc
+-LDCC=		@echo "	==> LINKING \"$@\""; gcc
+-DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
+-RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
++LDCC=		$(CC)
++DYNLD=		$(CC)
++RANLIB=		ranlib
+ ARFLAGS=	cr
+ LORDER=		lorder
+ TSORT=		tsort
+ 
+ RMDEP=		:
+-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP=		$(CC) -M
+ MKDEP_OUT=