summaryrefslogtreecommitdiff
path: root/sysutils/cdrtools-ossdvd/Makefile
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-06-08 17:30:09 +0000
committerwiz <wiz@pkgsrc.org>2007-06-08 17:30:09 +0000
commit57f5d5e4ae776474b939de31602065949ddf7b88 (patch)
tree935b02ac290fd189d39a6fa9a1cc5d27c9c20d80 /sysutils/cdrtools-ossdvd/Makefile
parentdb569445b0e68dc1dc06c4a25c6fa59f73237379 (diff)
downloadpkgsrc-57f5d5e4ae776474b939de31602065949ddf7b88.tar.gz
Sergevy Svishchev writes (in PR 35481):
k3b uses cdrecord for CD-R[W] writing tasks and invokes it with 'dev=<bus>,<target>,<lun>' argument. The code in scsi-bsd.c attempts to find a device node (/dev/rcd?d) that matches these <bus>, <target> and <lun>; this code stops after first failure. If cd0 does not exist, but cd1 does, the code will fail to match cd1. Also, the code doesn't use getrawpartition(). Apply his patches for both problems. Bump PKGREVISION.
Diffstat (limited to 'sysutils/cdrtools-ossdvd/Makefile')
-rw-r--r--sysutils/cdrtools-ossdvd/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index 8deb1b719c9..5f94166fa7e 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:10 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/06/08 17:30:09 wiz Exp $
DISTNAME= cdrtools-2.01.01a05
PKGNAME= cdrtools-ossdvd-2.01.1.36
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +16,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://crashrecovery.org/oss-dvd.html
COMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs/DVDs
-CONFLICTS= mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-*
+CONFLICTS= mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-[a-z0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -32,8 +32,8 @@ BUILDLINK_TRANSFORM+= rmdir:/opt/schily
# avoid picking up a bad ${ARCH} during the build
MAKE_ENV+= ARCH=""
MAKE_ENV+= MAKEPROG="gmake"
-MAKE_ENV+= COPTX=${CFLAGS:M*:Q}
-MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q}
+MAKE_ENV+= COPTX=${CFLAGS:Q}
+MAKE_ENV+= LDOPTX=${LDFLAGS:Q}
# if we're using a gcc which is named gcc, we need to set CCOM=gcc
# in MAKE_ENV so the make infrastructure picks the right options.