Fix PR 35481 for cdrtools too.

Patches provided by Sergey Svishchev in private mail.

5 files changed, 53 insertions, 25 deletions

diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 599e79a409c..88073f7ad6b 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/06/08 23:05:15 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/06/21 18:16:16 wiz Exp $
 
 DISTNAME=	cdrtools-2.01.01a27
 PKGNAME=	cdrtools-2.01.01.27
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/
 EXTRACT_SUFX=	.tar.bz2
@@ -61,22 +62,22 @@ SUBST_SED.fix=		-e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
 SUBST_MESSAGE.fix=	Fixing paths.
 
 post-extract:
-	${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly
-	${LN} -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly
+	ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS/Defaults.dragonfly
+	ln -s Defaults.freebsd ${WRKSRC}/DEFAULTS_ENG/Defaults.dragonfly
 
 do-configure:
 	cd ${WRKSRC}/RULES;						\
 	for suffix in netbsd-cc.rul netbsd-gcc.rul; do			\
 		if [ ! -f ${MACHINE}-$$suffix ]; then			\
-			${LN} -sf i386-$$suffix ${MACHINE}-$$suffix;	\
+			ln -sf i386-$$suffix ${MACHINE}-$$suffix;	\
 		fi;							\
 	done
 
 post-build:
 	cd ${WRKSRC};							\
 	for manpage in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do	\
-		${TBL} $${manpage} > $${manpage}.tmp;			\
-		${MV} -f $${manpage}.tmp $${manpage};			\
+		tbl $${manpage} > $${manpage}.tmp;			\
+		mv -f $${manpage}.tmp $${manpage};			\
 	done
 
 do-install:
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index d3976deb0b4..845cef9c692 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/06/08 23:05:58 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/06/21 18:16:16 wiz Exp $
 
 SHA1 (cdrtools-2.01.01a27.tar.bz2) = fcb9bcdb697e474f2e60889fe64571b06442ffb4
 RMD160 (cdrtools-2.01.01a27.tar.bz2) = c009cf067318da565a66420009406265df12b645
@@ -6,10 +6,12 @@ Size (cdrtools-2.01.01a27.tar.bz2) = 1594145 bytes
 SHA1 (patch-aa) = fca9bcc4d4a7480cea9c9f6011f72afdf691a9ef
 SHA1 (patch-ac) = cde9bd57eef040d27734f6c86c55ac6153025d4f
 SHA1 (patch-ah) = fb6abfd0a2e92370f1fc8c00426852fb5f83ae18
-SHA1 (patch-ai) = 9a7b5530ca592e8bedaea6084f2f4e33f4ad5a4e
+SHA1 (patch-ai) = d35a742531e22dbc507f9881a76e4db3c2b20f17
 SHA1 (patch-aj) = 8f5c57f7b5ebc4ae9188212c9599d0431f0ce785
 SHA1 (patch-ba) = 8a1d6b7703e0885fe080e4a71aeabd0bb4302381
 SHA1 (patch-bb) = d9a94fc48430988b86b6a4a08a01e6a7ed95669f
 SHA1 (patch-cf) = 73fc95f53b85f637d4eb81a8b79355863c539ba7
 SHA1 (patch-cg) = cf65297ee7736a140dd9dfc7f2f395a3471ac30e
+SHA1 (patch-ch) = 65397614fe196709b26a789bdd34ed6776b4ef46
+SHA1 (patch-ci) = ff0d14544b0958f581a37c1b007fae581f871021
 SHA1 (patch-cj) = d1ebb5950ef434ff9b0e42d03e41e1bd247874d9
diff --git a/sysutils/cdrtools/patches/patch-ai b/sysutils/cdrtools/patches/patch-ai
index 2e24cea7762..6ade4ee71df 100644
--- a/sysutils/cdrtools/patches/patch-ai
+++ b/sysutils/cdrtools/patches/patch-ai
@@ -1,17 +1,25 @@
-$NetBSD: patch-ai,v 1.3 2007/05/29 15:32:17 obache Exp $
+$NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
 
---- libscg/scsi-bsd.c.orig	2006-11-26 18:12:57.000000000 +0100
+--- libscg/scsi-bsd.c.orig	2004-01-14 23:13:05.000000000 +0000
 +++ libscg/scsi-bsd.c
-@@ -52,7 +52,7 @@ static	char __sccsid[] =
+@@ -39,6 +39,7 @@ static	char __sccsid[] =
+ 
+ #undef	sense
+ #include <sys/scsiio.h>
++#include <util.h>
+ 
+ /*
+  *	Warning: you may change this source, but if you do that
+@@ -47,7 +48,7 @@ static	char __sccsid[] =
   *	Choose your name instead of "schily" and make clear that the version
   *	string is related to a modified source.
   */
 -LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.44";	/* The version for this transport*/
-+LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.44nb1";	/* The version for this transport*/
++LOCAL	char	_scg_trans_version[] = "scsi-bsd.c-1.44nb1";	/* The version for this transport */
  
  #define	MAX_SCG		16	/* Max # of SCSI controllers */
  #define	MAX_TGT		16
-@@ -112,7 +112,7 @@ scgo_version(scgp, what)
+@@ -107,7 +108,7 @@ scgo_version(scgp, what)
  		 * return "schily" for the SCG_AUTHOR request.
  		 */
  		case SCG_AUTHOR:
@@ -20,23 +28,18 @@ $NetBSD: patch-ai,v 1.3 2007/05/29 15:32:17 obache Exp $
  		case SCG_SCCS_ID:
  			return (__sccsid);
  		}
-@@ -144,6 +144,15 @@ scgo_open(scgp, device)
+@@ -139,6 +140,10 @@ scgo_open(scgp, device)
  	register int	l;
  	register int	nopen = 0;
  	char		devname[64];
 +#if defined(__NetBSD__)
 +	struct scsi_addr mysaddr;
-+#if defined(__i386__) || defined(__amd64__)
-+	char	slicename[] = "d";	/* i386 is special */
-+#else
-+	char	slicename[] = "c";	/* this is what the rest uses */
-+#endif
-+	char	*myslicename = slicename;
++	int		myslicename = getrawpartition();
 +#endif
  
  	if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
  		errno = EINVAL;
-@@ -170,6 +179,60 @@ scgo_open(scgp, device)
+@@ -165,6 +170,60 @@ scgo_open(scgp, device)
  	if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
  		goto openbydev;
  
@@ -58,7 +61,7 @@ $NetBSD: patch-ai,v 1.3 2007/05/29 15:32:17 obache Exp $
 +#if defined(__NetBSD__)
 +	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
 +		for (l=0; l < MAX_LUN ; l++) {
-+			sprintf(devname, "/dev/rcd%d%s", l, myslicename);
++			sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename);
 +			f = open(devname, O_RDWR);
 +			if (f >= 0) {
 +				if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
@@ -70,10 +73,10 @@ $NetBSD: patch-ai,v 1.3 2007/05/29 15:32:17 obache Exp $
 +					scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
 +					return(1);
 +				}
-+			} else goto openbydev;
++			}
 +		}
 +	} else for (l=0; l < MAX_LUN ; l++) {
-+			sprintf(devname, "/dev/rcd%d%s", l, myslicename);
++			sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename);
 +			f = open(devname, O_RDWR);
 +			if (f >= 0) {
 +				if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
@@ -97,7 +100,7 @@ $NetBSD: patch-ai,v 1.3 2007/05/29 15:32:17 obache Exp $
  	if (busno >= 0 && tgt >= 0 && tlun >= 0) {
  
  		js_snprintf(devname, sizeof (devname),
-@@ -206,6 +269,7 @@ scgo_open(scgp, device)
+@@ -201,6 +260,7 @@ scgo_open(scgp, device)
  			}
  		}
  	}
diff --git a/sysutils/cdrtools/patches/patch-ch b/sysutils/cdrtools/patches/patch-ch
new file mode 100644
index 00000000000..e2deb41053a
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ch
@@ -0,0 +1,11 @@
+$NetBSD: patch-ch,v 1.3 2007/06/21 18:16:16 wiz Exp $
+
+--- RULES/i386-netbsd-cc.rul.orig	2007-05-09 12:25:30.000000000 +0000
++++ RULES/i386-netbsd-cc.rul
+@@ -37,5 +37,6 @@ LIB_KVM=	
+ 
+ #LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
+ LDOPTS=		$(LIBS_PATH) $(LDPATH)
++LDLIBS=		$(LIBS) $(LIBX) -lutil
+ 
+ RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
diff --git a/sysutils/cdrtools/patches/patch-ci b/sysutils/cdrtools/patches/patch-ci
new file mode 100644
index 00000000000..a5729135fe1
--- /dev/null
+++ b/sysutils/cdrtools/patches/patch-ci
@@ -0,0 +1,11 @@
+$NetBSD: patch-ci,v 1.3 2007/06/21 18:16:16 wiz Exp $
+
+--- RULES/i386-netbsd-gcc.rul.orig	2007-05-09 12:25:30.000000000 +0000
++++ RULES/i386-netbsd-gcc.rul
+@@ -37,5 +37,6 @@ LIB_KVM=	
+ 
+ #LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
+ LDOPTS=		$(LIBS_PATH) $(LDPATH)
++LDLIBS=		$(LIBS) $(LIBX) -lutil
+ 
+ RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib