diff options
| author | wiz <wiz@pkgsrc.org> | 2005-03-18 14:44:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-03-18 14:44:58 +0000 |
| commit | ce62648d51ab9568021f90cfc617930ba70780a1 (patch) | |
| tree | 4ae8f180069d4fdddbd172b5d0e716528ccd5dc9 | |
| parent | 3301efb5d32d9347b54358bc02afdd100dad81be (diff) | |
| download | pkgsrc-ce62648d51ab9568021f90cfc617930ba70780a1.tar.gz | |
graphics/barcode and x11/xscreensaver conflict (because of
man/man1/barcode.1). Noted by kleink in PR 29585.
| -rw-r--r-- | graphics/barcode/Makefile | 5 | ||||
| -rw-r--r-- | x11/xscreensaver/Makefile | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile index b65ed54452f..c53600a0fef 100644 --- a/graphics/barcode/Makefile +++ b/graphics/barcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/06/27 08:50:03 seb Exp $ +# $NetBSD: Makefile,v 1.8 2005/03/18 14:44:58 wiz Exp $ # DISTNAME= barcode-0.98 @@ -14,4 +14,7 @@ MAKE_ENV+= AWK="${AWK}" INFO_FILES= barcode.info +# man/man1/barcode.1 +CONFLICTS+= xscreensaver-[0-9]* + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 26d2f478da0..37155a54de8 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.66 2004/05/11 13:34:20 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2005/03/18 14:44:58 wiz Exp $ COMMENT= Screen saver and locker for the X window system CONFLICTS+= xscreensaver-gnome<4.14 +# man/man1/barcode.1 +CONFLICTS+= barcode-[0-9]* USE_BUILDLINK3= yes |