Upgrade to mkisofs included in cdrecord-1.8.

6 files changed, 18 insertions, 38 deletions

diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index 0b42fe2ed57a..84629fd559a0 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:	mkisofs
-# Version required:	1.12b5
+# Version required:	1.12 (from cdrecord-1.8)
 # Date created:		07 Aug 1996
 # Whom:			jhk
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cdrecord-1.8a40
-PKGNAME=	mkisofs-1.12b5
+DISTNAME=	cdrecord-1.8
+PKGNAME=	mkisofs-1.12
 CATEGORIES=	sysutils
-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/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
 
 MAINTAINER=	dirk@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/cdrecord-1.8
-USE_GMAKE=	yes
-MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG -DHAVE_SIZE_T"
 MAN8=		mkisofs.8
+USE_GMAKE=	yes
+MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG"
 
 .if ${MACHINE_ARCH} == "alpha"
 post-extract:
diff --git a/sysutils/mkisofs-devel/distinfo b/sysutils/mkisofs-devel/distinfo
index 254ef8135080..ff83565a7754 100644
--- a/sysutils/mkisofs-devel/distinfo
+++ b/sysutils/mkisofs-devel/distinfo
@@ -1 +1 @@
-MD5 (cdrecord-1.8a40.tar.gz) = db64b9d98e86685cc1c01e34b9da6648
+MD5 (cdrecord-1.8.tar.gz) = ec22b0b1d9a7da2976dee40d2f2cb9e7
diff --git a/sysutils/mkisofs-devel/files/patch-ac b/sysutils/mkisofs-devel/files/patch-ac
index 984db22aac20..c729a75dfe76 100644
--- a/sysutils/mkisofs-devel/files/patch-ac
+++ b/sysutils/mkisofs-devel/files/patch-ac
@@ -9,12 +9,3 @@
  #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/Makefile b/sysutils/mkisofs/Makefile
index 0b42fe2ed57a..84629fd559a0 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:	mkisofs
-# Version required:	1.12b5
+# Version required:	1.12 (from cdrecord-1.8)
 # Date created:		07 Aug 1996
 # Whom:			jhk
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cdrecord-1.8a40
-PKGNAME=	mkisofs-1.12b5
+DISTNAME=	cdrecord-1.8
+PKGNAME=	mkisofs-1.12
 CATEGORIES=	sysutils
-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/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
 
 MAINTAINER=	dirk@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/cdrecord-1.8
-USE_GMAKE=	yes
-MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG -DHAVE_SIZE_T"
 MAN8=		mkisofs.8
+USE_GMAKE=	yes
+MAKE_ENV=	COPTX="-DBSD_SCSI_SENSE_BUG"
 
 .if ${MACHINE_ARCH} == "alpha"
 post-extract:
diff --git a/sysutils/mkisofs/distinfo b/sysutils/mkisofs/distinfo
index 254ef8135080..ff83565a7754 100644
--- a/sysutils/mkisofs/distinfo
+++ b/sysutils/mkisofs/distinfo
@@ -1 +1 @@
-MD5 (cdrecord-1.8a40.tar.gz) = db64b9d98e86685cc1c01e34b9da6648
+MD5 (cdrecord-1.8.tar.gz) = ec22b0b1d9a7da2976dee40d2f2cb9e7
diff --git a/sysutils/mkisofs/files/patch-ac b/sysutils/mkisofs/files/patch-ac
index 984db22aac20..c729a75dfe76 100644
--- a/sysutils/mkisofs/files/patch-ac
+++ b/sysutils/mkisofs/files/patch-ac
@@ -9,12 +9,3 @@
  #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 *, ...));