diff options
| author | rh <rh> | 2002-09-15 11:59:36 +0000 |
|---|---|---|
| committer | rh <rh> | 2002-09-15 11:59:36 +0000 |
| commit | a71abdabd16862bd7432f7a7da1a71cc99f010f4 (patch) | |
| tree | 23c65f88e0f7c6356396b1c8a64f74793652bca3 /graphics/gnome2-pixmaps | |
| parent | a59328453388ee9b4814474f773cc341aad171a1 (diff) | |
| download | pkgsrc-a71abdabd16862bd7432f7a7da1a71cc99f010f4.tar.gz | |
Relax CONFLICTS a little bit: this only conflicts with gnome-core<1.4.2 if
X11PREFIX == LOCALBASE
Diffstat (limited to 'graphics/gnome2-pixmaps')
| -rw-r--r-- | graphics/gnome2-pixmaps/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile index e4fb5357b56..cebca2ef7e8 100644 --- a/graphics/gnome2-pixmaps/Makefile +++ b/graphics/gnome2-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/15 05:58:57 rh Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/15 11:59:36 rh Exp $ # DISTNAME= gnome-desktop-2.0.8 @@ -13,8 +13,8 @@ COMMENT= Pixmaps for gnome-core .include "../../mk/bsd.prefs.mk" -CONFLICTS+= gnome-core<1.4.2 .if (${LOCALBASE} == ${X11PREFIX}) +CONFLICTS+= gnome-core<1.4.2 CONFLICTS+= gnome-pixmaps-[0-9]* .else CONFLICTS+= gnome-pixmaps-2.0.8 |