diff options
| -rw-r--r-- | graphics/gnome-pixmaps/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gnome2-pixmaps/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome-core/Makefile | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/graphics/gnome-pixmaps/Makefile b/graphics/gnome-pixmaps/Makefile index b2bce171d75..cc919163b2b 100644 --- a/graphics/gnome-pixmaps/Makefile +++ b/graphics/gnome-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/15 05:40:42 rh Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/15 05:58:57 rh Exp $ # DISTNAME= gnome-core-1.4.2 @@ -11,8 +11,10 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Pixmaps for gnome-core +.include "../../mk/bsd.prefs.mk" + CONFLICTS= gnome-core<1.4.2 -.if (${LOCALBASE} == ${X11BASE}) +.if (${LOCALBASE} == ${X11PREFIX}) CONFLICTS+= gnome2-pixmaps-[0-9]* .endif diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile index 5d0e5a4d28b..e4fb5357b56 100644 --- a/graphics/gnome2-pixmaps/Makefile +++ b/graphics/gnome2-pixmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/15 05:36:56 rh Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/15 05:58:57 rh Exp $ # DISTNAME= gnome-desktop-2.0.8 @@ -14,7 +14,7 @@ COMMENT= Pixmaps for gnome-core .include "../../mk/bsd.prefs.mk" CONFLICTS+= gnome-core<1.4.2 -.if (${LOCALBASE} == ${X11BASE}) +.if (${LOCALBASE} == ${X11PREFIX}) CONFLICTS+= gnome-pixmaps-[0-9]* .else CONFLICTS+= gnome-pixmaps-2.0.8 diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 52ca47451e6..e02b429abdb 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2002/09/15 05:39:11 rh Exp $ +# $NetBSD: Makefile,v 1.79 2002/09/15 05:58:56 rh Exp $ # DISTNAME= gnome-core-1.4.2 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= gtk-doc>=0.9:../../textproc/gtk-doc BUILD_USES_MSGFMT= YES .include "../../mk/bsd.prefs.mk" -.if (${LOCALBASE} == ${X11BASE}) +.if (${LOCALBASE} == ${X11PREFIX}) BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2 .endif |