From 8cb4e3ec6c6ed4dd35e25b61013f80f182e40f1e Mon Sep 17 00:00:00 2001 From: obache Date: Sat, 14 Jan 2012 07:44:33 +0000 Subject: gsed related clean up. * Stop to treat NetBSD's sed as GNU sed, not full compatible. * Then, no need to reset TOOLS_PLATFORM.gsed for NetBSD if USE_TOOLS+=gsed and real GNU sed is required. * In addition, convert simple USE_TOOLS+=gsed to conditionally, without NetBSD. * convert {BUILD_,}DEPENDS+=gsed to USE_TOOLS, all tools from gsed are real gsed. --- math/gcalctool/Makefile | 6 ++---- math/octave/Makefile | 8 +------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'math') diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 6a95721a7f2..5c9f012c776 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2011/11/01 06:02:01 sbd Exp $ +# $NetBSD: Makefile,v 1.100 2012/01/14 07:44:34 obache Exp $ # DISTNAME= gcalctool-5.32.2 @@ -17,11 +17,9 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= HAVE_YACC=yes USE_LIBTOOL= yes -USE_TOOLS+= bison gmake intltool flex msgfmt pkg-config +USE_TOOLS+= bison gmake gsed intltool flex msgfmt pkg-config USE_PKGLOCALEDIR= yes -BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed - .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/schemas.mk" diff --git a/math/octave/Makefile b/math/octave/Makefile index ffd4f66c111..0218dfa01f8 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2012/01/14 03:36:42 hans Exp $ +# $NetBSD: Makefile,v 1.97 2012/01/14 07:44:34 obache Exp $ DISTNAME= octave-${OCTAVE_VER} CATEGORIES= math @@ -37,12 +37,6 @@ CONFIGURE_ARGS+= --enable-dl CONFIGURE_ARGS+= --enable-static CONFIGURE_ARGS+= --enable-shared -# trick pkgsrc into real gsed, needed for "mkf77def" -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" -TOOLS_PLATFORM.gsed= #empty -.endif - .include "options.mk" INFO_FILES= yes -- cgit v1.2.3