From 883003aa023461c8c5e0fed356a7bd241e21efba Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Sun, 15 Sep 2002 11:59:36 +0000
Subject: Relax CONFLICTS a little bit: this only conflicts with
 gnome-core<1.4.2 if X11PREFIX == LOCALBASE

---
 graphics/gnome2-pixmaps/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'graphics/gnome2-pixmaps')

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
-- 
cgit v1.2.3