diff options
| author | rh <rh> | 2002-09-15 05:36:56 +0000 |
|---|---|---|
| committer | rh <rh> | 2002-09-15 05:36:56 +0000 |
| commit | 48f5eac0b948912a8c0b5f37f91d087ed568105e (patch) | |
| tree | 555d810e81c6f54f8a6bcdecee83a0a0b562f320 | |
| parent | 505191dd8b09b3ab1fa2b67ab108ca2d090e653f (diff) | |
| download | pkgsrc-48f5eac0b948912a8c0b5f37f91d087ed568105e.tar.gz | |
s/USE_X11BASE/USE_X11/ so this works on non-xpkgwedge systems
Rename the package to gnome2-pixmaps and let it co-exist with gnome-pixmaps
if LOCALBASE != X11BASE
| -rw-r--r-- | graphics/gnome2-pixmaps/Makefile | 15 | ||||
| -rw-r--r-- | graphics/gnome2-pixmaps/buildlink2.mk | 24 |
2 files changed, 23 insertions, 16 deletions
diff --git a/graphics/gnome2-pixmaps/Makefile b/graphics/gnome2-pixmaps/Makefile index 10140142f62..5d0e5a4d28b 100644 --- a/graphics/gnome2-pixmaps/Makefile +++ b/graphics/gnome2-pixmaps/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/09/14 06:57:33 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/15 05:36:56 rh Exp $ # DISTNAME= gnome-desktop-2.0.8 -PKGNAME= ${DISTNAME:S/desktop/pixmaps/} +PKGNAME= ${DISTNAME:S/-desktop/2-pixmaps/} CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME:=2.0.1/sources/gnome-desktop/} EXTRACT_SUFX= .tar.bz2 @@ -11,10 +11,17 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Pixmaps for gnome-core -CONFLICTS= gnome-core<1.4.2 +.include "../../mk/bsd.prefs.mk" + +CONFLICTS+= gnome-core<1.4.2 +.if (${LOCALBASE} == ${X11BASE}) +CONFLICTS+= gnome-pixmaps-[0-9]* +.else +CONFLICTS+= gnome-pixmaps-2.0.8 +.endif USE_BUILDLINK_ONLY= YES -USE_X11BASE= YES +USE_X11= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/graphics/gnome2-pixmaps/buildlink2.mk b/graphics/gnome2-pixmaps/buildlink2.mk index 1788a34a2af..32df8b1f34d 100644 --- a/graphics/gnome2-pixmaps/buildlink2.mk +++ b/graphics/gnome2-pixmaps/buildlink2.mk @@ -1,22 +1,22 @@ -# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/14 06:57:33 rh Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2002/09/15 05:36:56 rh Exp $ # -# This Makefile fragment is included by packages that use gnome-pixmaps. +# This Makefile fragment is included by packages that use gnome2-pixmaps. # # This file was created automatically using createbuildlink 2.0. # -.if !defined(GNOME_PIXMAPS_BUILDLINK2_MK) -GNOME_PIXMAPS_BUILDLINK2_MK= # defined +.if !defined(GNOME2_PIXMAPS_BUILDLINK2_MK) +GNOME2_PIXMAPS_BUILDLINK2_MK= # defined -BUILDLINK_PACKAGES+= gnome-pixmaps -BUILDLINK_DEPENDS.gnome-pixmaps?= gnome-pixmaps>=2.0.8 -BUILDLINK_PKGSRCDIR.gnome-pixmaps?= ../../graphics/gnome2-pixmaps +BUILDLINK_PACKAGES+= gnome2-pixmaps +BUILDLINK_DEPENDS.gnome2-pixmaps?= gnome2-pixmaps>=2.0.8 +BUILDLINK_PKGSRCDIR.gnome2-pixmaps?= ../../graphics/gnome2-pixmaps -EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-pixmaps=gnome-pixmaps -BUILDLINK_PREFIX.gnome-pixmaps_DEFAULT= ${X11PREFIX} +EVAL_PREFIX+= BUILDLINK_PREFIX.gnome2-pixmaps=gnome2-pixmaps +BUILDLINK_PREFIX.gnome2-pixmaps_DEFAULT= ${LOCALBASE} -BUILDLINK_TARGETS+= gnome-pixmaps-buildlink +BUILDLINK_TARGETS+= gnome2-pixmaps-buildlink -gnome-pixmaps-buildlink: _BUILDLINK_USE +gnome2-pixmaps-buildlink: _BUILDLINK_USE -.endif # GNOME_PIXMAPS_BUILDLINK2_MK +.endif # GNOME2_PIXMAPS_BUILDLINK2_MK |