From f63de72ad91a5e675f6b4da410b4fc8333fc0d81 Mon Sep 17 00:00:00 2001 From: hubertf Date: Tue, 27 Mar 2001 03:19:43 +0000 Subject: Change BUILD_DEPENDS semantics: first component is now a package name+version/pattern, no more executable/patchname/whatnot. While there, introduce BUILD_USES_MSGFMT as shorthand to pull in devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current). Patch by Alistair Crooks --- sysutils/apcupsd/Makefile | 7 ++++--- sysutils/cdrdao/Makefile | 7 ++----- sysutils/gnome-vfs/Makefile | 6 +++--- sysutils/gtop/Makefile | 10 +++++----- sysutils/kdf/Makefile | 4 ++-- sysutils/mc/Makefile.common | 6 +++--- sysutils/ups-nut-cgi/Makefile | 4 ++-- sysutils/ups-nut/Makefile | 4 ++-- sysutils/xosview/Makefile | 4 ++-- sysutils/xps/Makefile | 4 ++-- 10 files changed, 27 insertions(+), 29 deletions(-) (limited to 'sysutils') diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 94d2964c3c9..cb50f193429 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 17:42:10 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:16 hubertf Exp $ # DISTNAME= apcupsd-3.6.2 @@ -9,8 +9,9 @@ MAINTAINER= bouyer@netbsd.org HOMEPAGE= http://www.sibbald.com/apcupsd/ COMMENT= UPS power management for APCC Products -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf + +BUILD_USES_MSGFMT= yes USE_GMAKE= # defined USE_LIBINTL= # defined diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index ad564ed408b..a7134d362bc 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 17:42:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:17 hubertf Exp $ # DISTNAME= ${PKGNAME}.src @@ -11,10 +11,7 @@ MAINTAINER= David Maxwell HOMEPAGE= http://www.ping.de/sites/daneb/cdrdao.html COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode -BUILD_DEPENDS+= antlr:../../devel/pccts -BUILD_DEPENDS+= dlg:../../devel/pccts -BUILD_DEPENDS+= genmk:../../devel/pccts -BUILD_DEPENDS+= sor:../../devel/pccts +BUILD_DEPENDS+= pccts-1.33.22:../../devel/pccts GNU_CONFIGURE= YES USE_GMAKE= YES diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index df90407670e..1b7d067cb10 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 17:42:13 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:17 hubertf Exp $ # DISTNAME= gnome-vfs-0.4.1 @@ -9,8 +9,8 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME Virtual File System -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake DEPENDS+= GConf>=0.11:../../devel/GConf USE_X11BASE= YES diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index c6941120a60..f16a7c0956f 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/26 20:19:48 tron Exp $ +# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:17 hubertf Exp $ DISTNAME= gtop-1.0.9 CATEGORIES= sysutils gnome @@ -7,10 +7,10 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gtop/} MAINTAINER= tron@netbsd.org COMMENT= GNOME system monitor - top like, memory graphs, processes detailed view -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= msgfmt:../../devel/gettext -BUILD_DEPENDS+= gettextize:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_USES_MSGFMT= yes + DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core DEPENDS+= libgtop>=1.0.9:../../devel/libgtop diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 69d3a306180..0e09f680834 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/17 17:42:14 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:17 hubertf Exp $ # DISTNAME= kdf-0.5.1 @@ -10,7 +10,7 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.edu.uni-klu.ac.at/~mkropfbe COMMENT= Shows disk usage graphically and lets you mount/umount devices -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes DEPENDS+= kde-1.1.2:../../x11/kde USE_LIBINTL= YES diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common index 2c1ff67df45..3ecad0e2926 100644 --- a/sysutils/mc/Makefile.common +++ b/sysutils/mc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2001/02/26 20:19:49 tron Exp $ +# $NetBSD: Makefile.common,v 1.8 2001/03/27 03:20:17 hubertf Exp $ DISTNAME= mc-4.5.51 CATEGORIES+= sysutils @@ -9,8 +9,8 @@ HOMEPAGE= http://www.gnome.org/mc/ DEPENDS+= libslang-*:../../devel/libslang DEPENDS+= glib>=1.2.0:../../devel/glib -BUILD_DEPENDS+= msgfmt:../../devel/gettext -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoheader:../../devel/autoconf +BUILD_USES_MSGFMT= yes +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf CONFLICTS+= mc-* gmc-* diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index ffe556fd377..1bb49c8e384 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/03/11 13:50:50 martin Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:18 hubertf Exp $ # DISTNAME= nut-0.44.3-pre5 @@ -12,7 +12,7 @@ COMMENT= Network UPS Tools CGI scripts DEPENDS+= gd-*:../../graphics/gd DEPENDS+= ups-nut-0*:../ups-nut -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf WRKSRC= ${WRKDIR}/nut-0.44.3 diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 466a57339a9..00a3f46a298 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/03/11 19:20:50 martin Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:18 hubertf Exp $ # DISTNAME= nut-0.44.3-pre5 @@ -33,7 +33,7 @@ GROUPDEL= groupdel WRKSRC= ${WRKDIR}/nut-0.44.3 DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -BUILD_DEPENDS+= autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= yes NUT_DOCDIR= ${LOCALBASE}/share/doc/nut diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 3741457ba2c..0d1246e9869 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/02/17 17:42:22 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2001/03/27 03:20:18 hubertf Exp $ # DISTNAME= xosview-1.7.0.b @@ -21,7 +21,7 @@ USE_XPM= YES .if ${OPSYS} == "NetBSD" BUILD_DEFS= UVM .elif ${OPSYS} == "SunOS" -BUILD_DEPENDS+= ${LOCALBASE}/egcs/bin/g++:../../lang/egcs +BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" CONFIGURE_ENV+= LIBS="${LIBS} -lsocket -lnsl" diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile index 3010b3963b3..d8f075d5808 100644 --- a/sysutils/xps/Makefile +++ b/sysutils/xps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:42:23 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:18 hubertf Exp $ DISTNAME= xps-3.14 CATEGORIES= sysutils @@ -8,7 +8,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.netwinder.org/~rocky/xps-home/ COMMENT= displays the Unix process list as a hierarchical tree -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 USE_GMAKE= # defined USE_X11BASE= # defined -- cgit v1.2.3