diff options
author | obache <obache> | 2008-12-02 13:03:22 +0000 |
---|---|---|
committer | obache <obache> | 2008-12-02 13:03:22 +0000 |
commit | 9820b9a4f1731f86fd1204b3e7b6d9c59c4156f3 (patch) | |
tree | 0935fdb9f0dbb13b5332ab642fdb937152bf3c0c | |
parent | 8de674ab468bad854cabf10ed3eb1b4428d79c8d (diff) | |
download | pkgsrc-9820b9a4f1731f86fd1204b3e7b6d9c59c4156f3.tar.gz |
conflict between cdrkit and cdrtools. PR 40074.
-rw-r--r-- | sysutils/cdrkit/Makefile | 4 | ||||
-rw-r--r-- | sysutils/cdrtools/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index 05e43880db9..e8d51108294 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org 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 --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 6bdaca17edf..2f5045fec78 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org 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 |