diff options
| author | rh <rh@pkgsrc.org> | 2002-09-15 05:58:56 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2002-09-15 05:58:56 +0000 |
| commit | 3a06c2209896ebb6dcab72b87d2d161c033e97b5 (patch) | |
| tree | ae299323bb96b9e612d759f86eecee43fde6880e /graphics | |
| parent | 050b7b278bbd31581553bf2c16d28b50ccb18e4c (diff) | |
| download | pkgsrc-3a06c2209896ebb6dcab72b87d2d161c033e97b5.tar.gz | |
s/X11BASE/X11PREFIX/ for xpgwedge check
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gnome-pixmaps/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gnome2-pixmaps/Makefile | 4 |
2 files changed, 6 insertions, 4 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 |