From bedae6c90ccf11bddb3b3bdde8d2652e72eeeed3 Mon Sep 17 00:00:00 2001 From: jmmv Date: Wed, 14 Apr 2004 16:15:20 +0000 Subject: Make use of the new USE_DIRS variable, instead of directly depending on the *-dirs packages. --- editors/abiword/Makefile | 4 ++-- editors/beaver/Makefile | 5 ++--- editors/conglomerate/Makefile | 4 ++-- editors/dasher/Makefile | 5 ++--- editors/gconf-editor/Makefile | 4 ++-- editors/gedit/Makefile | 4 ++-- editors/kile/Makefile | 5 ++--- editors/mlview/Makefile | 4 ++-- editors/vim-kde/Makefile | 5 ++--- 9 files changed, 18 insertions(+), 22 deletions(-) (limited to 'editors') diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index c3a3d9b0e7d..762f9ad88d4 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2004/03/31 04:59:18 xtraeme Exp $ +# $NetBSD: Makefile,v 1.77 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= abiword-2.0.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.abisource.com/ COMMENT= Open Source cross-platform word processor BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs # GTK1 version and previous name of the GTK2 version CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* @@ -19,6 +18,7 @@ CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* MAKEFILE= GNUmakefile GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_PERL5= run USE_X11= yes diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile index 70cafdd29f2..8cdcac1374b 100644 --- a/editors/beaver/Makefile +++ b/editors/beaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/11 08:03:29 snj Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= beaver-0.2.6 @@ -10,10 +10,9 @@ MAINTAINER= vincent.derrien@ahoup.net HOMEPAGE= http://www.nongnu.org/beaver/ COMMENT= Lightweight GTK+ text editor with syntax highlighting -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_X11= YES .include "../../x11/gtk/buildlink3.mk" diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile index 2d313fa4fdf..46e0391e3a7 100644 --- a/editors/conglomerate/Makefile +++ b/editors/conglomerate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:39 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= conglomerate-0.7.12 @@ -11,12 +11,12 @@ HOMEPAGE= http://www.conglomerate.org/ COMMENT= XML editor for GNOME2 BUILD_USES_MSGFMT= yes -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs DEPENDS+= docbook-xsl>=1.64.1:../../textproc/docbook-xsl DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_LIBTOOL= yes USE_GNU_TOOLS+= make USE_PERL5= yes diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index 7d8ad5f2d2d..97dba52c35d 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/04/03 07:30:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= dasher-3.2.8 @@ -10,10 +10,9 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.inference.phy.cam.ac.uk/dasher/ COMMENT= Easy typing without using keyboard -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs - GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index 0d4a8fcd6b1..3c22c534107 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/04/01 18:51:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gconf-editor-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Editor for the GConf configuration system BUILD_USES_MSGFMT= YES -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 25a0e907066..11336c6e669 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/04/01 18:51:56 jmmv Exp $ +# $NetBSD: Makefile,v 1.33 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= gedit-2.6.0 @@ -11,10 +11,10 @@ HOMEPAGE= http://gedit.sourceforge.net/ COMMENT= Lightweight GNOME2 text editor BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs USE_PERL5= build USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES diff --git a/editors/kile/Makefile b/editors/kile/Makefile index 9d32481bda7..0ac5b8cda90 100644 --- a/editors/kile/Makefile +++ b/editors/kile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/04/05 11:21:05 markd Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= kile-1.6.2 CATEGORIES= editors kde @@ -8,9 +8,8 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://kile.sourceforge.net/ COMMENT= LaTeX source editor - TeX shell - Gnuplot front end -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK2= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ GNU_CONFIGURE= yes diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index 2743ceec52e..0bc3652380b 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:39 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/14 16:15:22 jmmv Exp $ # DISTNAME= mlview-0.6.2 @@ -12,10 +12,10 @@ HOMEPAGE= http://www.freespiders.org/projects/gmlview/ COMMENT= XML editor for the GNOME environment BUILD_USES_MSGFMT= yes -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs GNU_CONFIGURE= yes USE_BUILDLINK3= yes +USE_DIRS+= xdg-1.1 USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile index 267c00ce2cd..8fcc32f1e03 100644 --- a/editors/vim-kde/Makefile +++ b/editors/vim-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/03/31 04:31:20 snj Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/14 16:15:22 jmmv Exp $ DISTNAME= kvim-${KVIM_VERSION} PKGNAME= vim-kde-${KVIM_VERSION} @@ -17,10 +17,9 @@ KVIM_VERSION= 6.2.14 CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]* -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - WRKSRC= ${WRKDIR}/kvim-${KVIM_VERSION}/src USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gui=kde -- cgit v1.2.3