diff options
| author | lukem <lukem@pkgsrc.org> | 2002-09-29 08:58:37 +0000 |
|---|---|---|
| committer | lukem <lukem@pkgsrc.org> | 2002-09-29 08:58:37 +0000 |
| commit | a50c64302331f7fa25f2fd92b8f674fa9688eac7 (patch) | |
| tree | 51cc23be2a0f614f2db1f57a2ea7c3a7c77cb5d7 | |
| parent | f508957cbfdb7bbe742635cc8c31d896b6c2180b (diff) | |
| download | pkgsrc-a50c64302331f7fa25f2fd92b8f674fa9688eac7.tar.gz | |
add CONFLICT for the (non)-devel equivalent
| -rw-r--r-- | sysutils/cdrecord-devel/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/cdrecord/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sysutils/cdrecord-devel/Makefile b/sysutils/cdrecord-devel/Makefile index 734bbcdc3f4..e26cbe9b837 100644 --- a/sysutils/cdrecord-devel/Makefile +++ b/sysutils/cdrecord-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/09/29 08:26:54 lukem Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/29 08:58:37 lukem Exp $ DISTNAME= cdrtools-1.11a34 PKGNAME= cdrecord-devel-1.11a34 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/pr COMMENT= This program allows you to create CD's on a CD-Recorder CONFLICTS= mkisofs-[0-9]* +CONFLICTS+= cdrecord-[0-9]* .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index 6a0a6e85005..d131a58d4f1 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2002/09/26 11:32:02 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2002/09/29 08:58:37 lukem Exp $ DISTNAME= cdrtools-1.10 PKGNAME= cdrecord-1.10 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/pr COMMENT= This program allows you to create CD's on a CD-Recorder CONFLICTS= mkisofs-[0-9]* +CONFLICTS+= cdrecord-devel-[0-9]* .include "../../mk/bsd.prefs.mk" |