From de061a6c61730df55c6f38d8d9ba964b6aee0b33 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. --- math/gcalctool/Makefile | 4 ++-- math/gnumeric/Makefile | 4 ++-- math/gnumeric0/Makefile | 5 ++--- math/graphopt/Makefile | 5 ++--- math/guppi/Makefile | 5 ++--- 5 files changed, 10 insertions(+), 13 deletions(-) (limited to 'math') diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index c9b73a2284f..d510f90694a 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/04/01 18:56:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gcalctool-4.3.51 @@ -11,10 +11,10 @@ HOMEPAGE= http://calctool.sourceforge.net/ COMMENT= Desktop calculator for GNOME BUILD_USES_MSGFMT= YES -DEPENDS+= gnome2-dirs>=1.5:../../misc/gnome2-dirs GNU_CONFIGURE= YES USE_BUILDLINK3= YES +USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make USE_X11= YES USE_PKGLOCALEDIR= yes diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 416c040c243..78ddee10533 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2004/03/31 16:18:53 reed Exp $ +# $NetBSD: Makefile,v 1.83 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gnumeric-1.0.13 @@ -10,12 +10,12 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/gnumeric/ COMMENT= Spreadsheet program from the GNOME project -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs # for Python support a shared libpython is required but not provided yet #BUILD_DEPENDS+= python>=2.0:../../lang/python BUILD_USES_MSGFMT= YES USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile index f406016ecd2..ce5c66571b7 100644 --- a/math/gnumeric0/Makefile +++ b/math/gnumeric0/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= gnumeric-0.75 @@ -10,9 +10,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/gnumeric/ COMMENT= Powerful and easy to use spreadsheet program from the GNOME project -DEPENDS+= gnome1-dirs>=1.5:../../misc/gnome1-dirs - USE_BUILDLINK2= YES +USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make diff --git a/math/graphopt/Makefile b/math/graphopt/Makefile index 3efb6302ec1..dd40e0aa159 100644 --- a/math/graphopt/Makefile +++ b/math/graphopt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:24 jmmv Exp $ # DISTNAME= graphopt-0.4.1 @@ -11,9 +11,8 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://schmuhl.org/graphopt/ COMMENT= Optimize graph layouts -DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs - USE_BUILDLINK2= YES +USE_DIRS+= xdg-1.1 USE_GCC_SHLIB= YES GNU_CONFIGURE= YES diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 204fa59b161..be0d2ef9b0f 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/03/08 19:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:24 jmmv Exp $ DISTNAME= Guppi-0.40.3 PKGNAME= ${DISTNAME:S/G/g/} @@ -11,8 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/guppi/ COMMENT= Plot program with integrated statistics capabilities -DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs - .if exists(/usr/include/wctype.h) # # "guppi" only accepts newer versions of the "gnumeric" package which @@ -28,6 +26,7 @@ PLIST_SUBST+= GNUMERIC="@comment " .endif USE_BUILDLINK2= YES +USE_DIRS+= xdg-x11-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make -- cgit v1.2.3