diff options
| author | jmmv <jmmv> | 2004-04-14 16:15:20 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-04-14 16:15:20 +0000 |
| commit | ff816c1c20fc8b173c1acb7c120607e6bc348db9 (patch) | |
| tree | 3757535e0cffe141412b01910b7f14b0965825b2 /x11/gnome-core | |
| parent | 243e350edbc352e89b5021dd3fe7d7aa24a6c7de (diff) | |
| download | pkgsrc-ff816c1c20fc8b173c1acb7c120607e6bc348db9.tar.gz | |
Make use of the new USE_DIRS variable, instead of directly depending on the
*-dirs packages.
Diffstat (limited to 'x11/gnome-core')
| -rw-r--r-- | x11/gnome-core/Makefile | 5 | ||||
| -rw-r--r-- | x11/gnome-core/Makefile.common | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 1bfcda7c18d..87c2871bca9 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2004/03/26 02:27:59 wiz Exp $ +# $NetBSD: Makefile,v 1.99 2004/04/14 16:15:29 jmmv Exp $ # .include "Makefile.common" @@ -7,7 +7,6 @@ PKGREVISION= 13 COMMENT= Core component of GNU Network Object Management Environment -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs DEPENDS+= xscreensaver-gnome>=4.14:../xscreensaver-gnome DEPENDS+= gnome-session>=1.4.2:../../x11/gnome1-session DEPENDS+= gnome-panel>=1.4.2:../../x11/gnome1-panel @@ -16,6 +15,8 @@ BUILD_USES_MSGFMT= YES CONFLICTS+= gnome2-terminal-[0-9]* +USE_DIRS+= gnome1-1.5 + .include "../../mk/bsd.prefs.mk" .if (${LOCALBASE} == ${X11PREFIX}) BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2 diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common index 07e2573d1ac..3cbec78e9d1 100644 --- a/x11/gnome-core/Makefile.common +++ b/x11/gnome-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/03/08 19:40:43 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.8 2004/04/14 16:15:29 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 @@ -10,9 +10,9 @@ MAINTAINER?= rh@NetBSD.org HOMEPAGE?= http://www.gnome.org/ BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make |