summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrh <rh>2002-09-15 05:40:42 +0000
committerrh <rh>2002-09-15 05:40:42 +0000
commitda3914bd0143b7d3cd30aa4aea5cbf98cc7a34f0 (patch)
tree873a08ef0ab8a37d745b1b746485af6dde89cfa5
parentf3dbb30e4b1f29a93480538291fd8eae972b16bd (diff)
downloadpkgsrc-da3914bd0143b7d3cd30aa4aea5cbf98cc7a34f0.tar.gz
Conflict with gnome2-pixmaps if LOCALBASE == X11BASE
-rw-r--r--graphics/gnome-pixmaps/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/gnome-pixmaps/Makefile b/graphics/gnome-pixmaps/Makefile
index a974eb85fcc..b2bce171d75 100644
--- a/graphics/gnome-pixmaps/Makefile
+++ b/graphics/gnome-pixmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/14 02:37:39 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/15 05:40:42 rh Exp $
#
DISTNAME= gnome-core-1.4.2
@@ -12,6 +12,9 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Pixmaps for gnome-core
CONFLICTS= gnome-core<1.4.2
+.if (${LOCALBASE} == ${X11BASE})
+CONFLICTS+= gnome2-pixmaps-[0-9]*
+.endif
USE_BUILDLINK_ONLY= YES
USE_X11BASE= YES