[pkgsrc/trunk]: pkgsrc/sysutils conflict between cdrkit and cdrtools. PR 40074.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/286bebcf31c7
branches:  trunk
changeset: 550885:286bebcf31c7
user:      obache <obache%pkgsrc.org@localhost>
date:      Tue Dec 02 13:03:22 2008 +0000

description:
conflict between cdrkit and cdrtools. PR 40074.

diffstat:

 sysutils/cdrkit/Makefile   |  4 +++-
 sysutils/cdrtools/Makefile |  4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 6c007eabad31 -r 286bebcf31c7 sysutils/cdrkit/Makefile
--- a/sysutils/cdrkit/Makefile  Tue Dec 02 12:58:59 2008 +0000
+++ b/sysutils/cdrkit/Makefile  Tue Dec 02 13:03:22 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:46 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/12/02 13:03:22 obache Exp $
 #
 
 DISTNAME=      cdrkit-1.1.6
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://cdrkit.org/
 COMMENT=       Portable command-line CD/DVD recorder software
 
+CONFLICTS=     cdrtools-[0-9]*
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=    gmake perl:run
diff -r 6c007eabad31 -r 286bebcf31c7 sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile        Tue Dec 02 12:58:59 2008 +0000
+++ b/sysutils/cdrtools/Makefile        Tue Dec 02 13:03:22 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2008/11/18 09:58:11 dsainty Exp $
+# $NetBSD: Makefile,v 1.48 2008/12/02 13:03:22 obache Exp $
 
 DISTNAME=      cdrtools-2.01.01a53
 PKGNAME=       ${DISTNAME:S/a/./}
@@ -11,7 +11,7 @@
 HOMEPAGE=      http://cdrecord.berlios.de/old/private/cdrecord.html
 COMMENT=       Software for creating ISO9660 images and writing CDs/CD-RWs
 
-CONFLICTS=     mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]*
+CONFLICTS=     mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]* cdrkit-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir