diff options
204 files changed, 593 insertions, 592 deletions
diff --git a/Packages.txt b/Packages.txt index 8439460cff4..1c4f8e524b6 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.146 2001/03/23 17:11:17 skrll Exp $ +# $NetBSD: Packages.txt,v 1.147 2001/03/27 03:19:43 hubertf Exp $ ########################################################################### ========================== @@ -1591,64 +1591,75 @@ not the same as FreeBSD's deprecated one, and NetBSD does not use the FreeBSD LIB_DEPENDS definition any more - it proved problematic on ELF NetBSD platforms). -[In the following examples, the BUILD_DEPENDS dependencies have the format: -<file>:<directory containing package to build>[:<stage>] If the <stage> -isn't specified, it defaults to ``install''. If the file contains a '/', it -is interpreted as a regular file - otherwise, the name is taken to be an -executable file, and the PATH is searched for <file>. If the regular file -is not found, or the executable file is not in the path, then the -pre-requisite package will be built from the sources in <directory -containing the package to build>. The DEPENDS definition specifies a -package name (which contains its version number), and the directory -containing the package to build if this version of the package is not -installed.] - -(a) If your package needs files from another package to build, see the -print/ghostscript5 package (it relies on the jpeg sources being -present in source form during the build): - -BUILD_DEPENDS+= ../../graphics/jpeg/${WRKDIR:T}/jpeg-6a:../../graphics/jpeg:extract - -(b) If your package needs to use another package to build itself, this -is specified using the BUILD_DEPENDS definition, but without -specifying the stage ``:extract'' in (a) above. An example is the -print/lyx package, which uses the latex binary during its build -process: - -BUILD_DEPENDS+= latex:../../print/teTeX - -(c) If your package needs a library with which to link, this is +The basic difference between the two definitions is as follows: the +DEPENDS definition registers that pre-requisite in the binary package, +whilst the BUILD_DEPENDS definition does not. + +This means that if you only need a package present whilst you are building, +it should be noted as a BUILD_DEPENDS. + +The format for a BUILD_DEPENDS and a DEPENDS definition is: + + <pre-req-package-name>:../../<category>/<pre-req-package> + +Please note that the "pre-req-package-name" may include any of the wildcard +version numbers recognised by pkg_info(1). + +(a) If your package needs to use another package to build itself, this +is specified using the BUILD_DEPENDS definition. + + BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf + +(b) If your package needs a library with which to link, this is specified using the DEPENDS definition. An example of this is the print/lyx package, which uses the xpm library, version 3.4j to build. -DEPENDS+= xpm-3.4j:../../graphics/xpm + DEPENDS+= xpm-3.4j:../../graphics/xpm You can also use wildcards in package dependences: -DEPENDS+= xpm-*:../../graphics/xpm + DEPENDS+= xpm-*:../../graphics/xpm + +Note that such wildcard dependencies are retained when creating binary +packages. The dependency is checked when installing the binary +package and any package which matches the pattern will be used. +Wildard dependencies should be used with care. -Note that such wildcard dependencies are retained when creating -binary package. The dependency is checked when installing the binary -package and any package which matches the pattern would be used. -Beware that wildard dependencies should be used with a bit of care. -Simple example for package which needs some version of Tk installed, -but doesn't care which exactly - dependency +For example, if a package needs any version of Tk installed, but does +not require an explicit version of Tk: -DEPENDS+= tk-*:../../x11/tk80 + DEPENDS+= tk-*:../../x11/tk80 would also match e.g. tk-postgresql-6.5.3, which is not what was -needed. ALWAYS ensure that the wildcard doesn't match more than it should. +needed. ALWAYS ensure that the wildcard doesn't match more than it should, +and perhaps use version numbers to make certain: + + BUILD_DEPENDS+= perl-5.*:../../lang/perl -(d) If your package needs some executable to be able to run correctly, this +(c) If your package needs some executable to be able to run correctly, this is specified using the DEPENDS definition. The print/lyx package needs to be able to execute the latex binary from the teTex package when it runs, and that is specified: -DEPENDS+= teTex-*:../../print/teTeX + DEPENDS+= teTex-*:../../print/teTeX The comment about wildcard dependencies from previous paragraph applies here, too. +If your package needs files from another package to build, see the +first part of the "do-configure" target print/ghostscript5 package (it +relies on the jpeg sources being present in source form during the +build): + + if [ ! -e ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ]; then \ + cd ../../graphics/jpeg && ${MAKE} extract; \ + fi + +Please also note the BUILD_USES_MSGFMT definition, which is provided +as a convenience definition. This definition works out whether +msgfmt(1) is part of the base system, and, if it isn't, installs the +devel/gettext package. + 9.13 Conflicts with other packages ================================== diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile index 7da9823a0d1..f642f068a6c 100644 --- a/archivers/gsharutils/Makefile +++ b/archivers/gsharutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 13:15:27 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:44 hubertf Exp $ DISTNAME= sharutils-4.2.1 PKGNAME= g${DISTNAME} @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/sharutils/sharutils.html COMMENT= Allow packing and unpacking of shell archives -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_LIBINTL= yes GNU_CONFIGURE= yes diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index f0802cde37e..a92462adc91 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/02/16 13:15:43 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2001/03/27 03:19:44 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp # @@ -13,7 +13,7 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://www.info-zip.org/pub/infozip/Zip.html COMMENT= Create/update ZIP files compatible with pkzip -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip EXTRACT_ONLY= zip23.tar.gz MAKEFILE= unix/Makefile diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile index 1ae702a13ec..498c41be78b 100644 --- a/archivers/zip1/Makefile +++ b/archivers/zip1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/16 13:15:44 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:45 hubertf Exp $ # DISTNAME= zip1-1.1 @@ -11,7 +11,7 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.info-zip.org/pub/infozip/ COMMENT= Create/update ZIP files compatible with pkzip version 1 -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip EXTRACT_CMD= unzip -qo ${DOWNLOADED_DISTFILE} diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile index f076290311b..30b98380927 100644 --- a/audio/aumix/Makefile +++ b/audio/aumix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 13:30:33 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:19:45 hubertf Exp $ DISTNAME= aumix-2.7 CATEGORIES= audio @@ -12,7 +12,8 @@ MAINTAINER= trevor@jpj.net HOMEPAGE= http://jpj.net/~trevor/aumix.html COMMENT= Set mix levels -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gtk+-1.2.*:../../x11/gtk USE_CURSES= yes diff --git a/audio/cdd/Makefile b/audio/cdd/Makefile index d2bdaca521e..90697586cfc 100644 --- a/audio/cdd/Makefile +++ b/audio/cdd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:33 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:45 hubertf Exp $ DISTNAME= cdd-1.0nb3 CATEGORIES= audio @@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= thorpej@netbsd.org COMMENT= Another program for reading CD digital audio from SCSI or ATAPI CD-ROM drives -BUILD_DEPENDS+= ${PREFIX}/lib/libscsi.a:../../devel/libscsi +BUILD_DEPENDS+= libscsi-1.6:../../devel/libscsi .include "../../mk/bsd.prefs.mk" diff --git a/audio/csound/Makefile b/audio/csound/Makefile index 22178b47512..0814678cf33 100644 --- a/audio/csound/Makefile +++ b/audio/csound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/27 03:19:45 hubertf Exp $ # DISTNAME= unofficial-csound-4.09.0.0b-linux.src @@ -10,7 +10,7 @@ MAINTAINER= collver@softhome.net HOMEPAGE= http://www.csound.org COMMENT= software synthesizer and sequencer -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf LICENSE= csound-license NO_SRC_ON_CDROM= "no for-fee-redistribution" diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile index 76f13e7a938..117da6535f8 100644 --- a/audio/eawpatches/Makefile +++ b/audio/eawpatches/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/16 12:52:31 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:45 hubertf Exp $ # DISTNAME= eawpats-full-10 @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.stardate.bc.ca/eawpatches/ COMMENT= Eric A. Welsh' patches (audio samples) for TiMidity -BUILD_DEPENDS= unrar:../../archivers/unrar +BUILD_DEPENDS= unrar-*:../../archivers/unrar CONFLICTS= guspatches-* diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile index 7ffb8e9455b..0e45f44e480 100644 --- a/audio/gogo/Makefile +++ b/audio/gogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 13:30:41 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:45 hubertf Exp $ # DISTNAME= gogo235 @@ -11,7 +11,7 @@ MAINTAINER= uebs@gmx.at HOMEPAGE= http://homepage1.nifty.com/herumi/gogo_e.html COMMENT= very fast lame-based mp3 encoder, i386 only -BUILD_DEPENDS+= nasm:../../devel/nasm +BUILD_DEPENDS+= nasm-0.98:../../devel/nasm ONLY_FOR_PLATFORM= *-*-i386 diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index 1c9ae228544..b0938e508d5 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/03/25 16:21:51 hubertf Exp $ +# $NetBSD: Makefile,v 1.33 2001/03/27 03:19:46 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp DISTNAME= gqmpeg-0.8.3 @@ -10,8 +10,9 @@ MAINTAINER= rxg@ms25.url.com.tw HOMEPAGE= http://gqmpeg.sourceforge.net/ COMMENT= GTK+ front end to mpg123 +BUILD_USES_MSGFMT= yes + DEPENDS+= gdk-pixbuf>=0.8.0nb1:../../graphics/gdk-pixbuf -BUILD_DEPENDS+= msgfmt:../../devel/gettext DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= mpg123-0.59r:../../audio/mpg123 diff --git a/audio/krio/Makefile b/audio/krio/Makefile index bde3e16e43c..f5c4756fac9 100644 --- a/audio/krio/Makefile +++ b/audio/krio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/04 09:06:09 tron Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:46 hubertf Exp $ DISTNAME= Krio-19990721 PKGNAME= krio-19990721 @@ -15,8 +15,6 @@ USE_X11BASE= yes RIODIR= ${PKGSRCDIR}/audio/rio/${WRKDIR:T}/rio107 -BUILD_DEPENDS+= ${RIODIR}/rio.cpp:../../audio/rio:configure - DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs DEPENDS+= png>1.0.9:../../graphics/png @@ -29,4 +27,12 @@ EVAL_PREFIX= QT1DIR=qt1 KDEDIR=kdelibs MAKE_ENV+= QT1DIR=${QT1DIR} KDEDIR=${KDEDIR} MAKE_ENV+= RIODIR=${RIODIR} X11PREFIX=${X11PREFIX} +pre-configure: + if [ ! -e ${RIODIR} ]; then \ + cd ../../audio/rio && ${MAKE} configure; \ + fi + +pre-clean: + cd ../../audio/rio && ${MAKE} clean + .include "../../mk/bsd.pkg.mk" diff --git a/audio/libao/Makefile b/audio/libao/Makefile index bb5ffc8527e..4e2ca5d5c39 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/03/20 09:57:36 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/03/27 03:19:46 hubertf Exp $ DISTNAME= libao-0.6.0 PKGNAME= ${DISTNAME}nb1 @@ -8,8 +8,8 @@ MASTER_SITES= http://www.vorbis.com/files/beta4/unix/ MAINTAINER= reed@reedmedia.net COMMENT= cross-platform audio library -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile index fcb68d13d4e..c15a0562486 100644 --- a/audio/madplay/Makefile +++ b/audio/madplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/03/25 11:34:57 simonb Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:46 hubertf Exp $ # DISTNAME= mad-0.12.5b @@ -11,7 +11,7 @@ MAINTAINER= simonb@netbsd.org HOMEPAGE= http://sourceforge.net/projects/mad/ COMMENT= High-quality MPEG audio decoder -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes GNU_CONFIGURE= YES USE_LIBINTL= YES diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 110a9be78b3..cda49109d56 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/02/16 13:30:49 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2001/03/27 03:19:46 hubertf Exp $ # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp # @@ -11,7 +11,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://rplay.doit.org/ COMMENT= Network audio player -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf + DEPENDS+= gsm-1.0.10:../../audio/gsm DEPENDS+= rx-1.5:../../devel/rx diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile index 93f8bee1b8f..7230fcdd0a8 100644 --- a/benchmarks/xengine/Makefile +++ b/benchmarks/xengine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:38 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:47 hubertf Exp $ # FreeBSD Id: ports/benchmarks/xengine/Makefile,v 1.9 2000/02/02 22:31:24 mharo Exp DISTNAME= xengine-1.0.1 @@ -11,7 +11,7 @@ PATCH_DIST_STRIP= -p1 # no ${PATCHFILES} but used below MAINTAINER= sakamoto@netbsd.org COMMENT= Reciprocating engine for X -BUILD_DEPENDS= gunshar:../../archivers/gsharutils +BUILD_DEPENDS= gsharutils-4.2.1:../../archivers/gsharutils DIST_SUBDIR= xengine NO_WRKSUBDIR= yes diff --git a/cad/ipal-current/Makefile b/cad/ipal-current/Makefile index ec2d86a01f0..4689e4f1d2b 100644 --- a/cad/ipal-current/Makefile +++ b/cad/ipal-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 13:46:24 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:19:47 hubertf Exp $ # DISTNAME= ipal-20001210 @@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.icarus.com/eda/ipal/index.html COMMENT= Libs and utils for manipulating PAL designs (development version) -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= gtk+>=1.2.7:../../x11/gtk GNU_CONFIGURE= YES diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile index 4466ae56e70..9e1d7a290c7 100644 --- a/cad/verilog-current/Makefile +++ b/cad/verilog-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 13:46:30 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:19:47 hubertf Exp $ # DISTNAME= verilog-20010113 @@ -10,8 +10,8 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://icarus.com/eda/verilog/index.html COMMENT= Verilog simulation and synthesis tool (development snapshot version) -BUILD_DEPENDS+= bison:../../devel/bison -BUILD_DEPENDS+= gperf:../../devel/gperf +BUILD_DEPENDS+= bison-*:../../devel/bison +BUILD_DEPENDS+= gperf-2.7.2:../../devel/gperf DEPENDS+= ipal-current>=20001210:../../cad/ipal-current CONFLICTS+= verilog diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile index 80c4a0aac8e..d3a0ea56896 100644 --- a/cad/verilog/Makefile +++ b/cad/verilog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 13:46:29 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:47 hubertf Exp $ # DISTNAME= verilog-0.4 @@ -9,8 +9,8 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://icarus.com/eda/verilog/index.html COMMENT= Verilog simulation and synthesis tool (stable release version) -BUILD_DEPENDS+= bison:../../devel/bison -BUILD_DEPENDS+= gperf:../../devel/gperf +BUILD_DEPENDS+= bison-*:../../devel/bison +BUILD_DEPENDS+= gperf-2.7.2:../../devel/gperf DEPENDS+= ipal-current>=20001210:../../cad/ipal-current CONFLICTS+= verilog-current diff --git a/chat/epic4/Makefile b/chat/epic4/Makefile index 7f17beedb95..84eb260ed72 100644 --- a/chat/epic4/Makefile +++ b/chat/epic4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/03/26 15:39:29 zuntum Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:48 hubertf Exp $ # DISTNAME= epic4-0.10.1 @@ -30,7 +30,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} GNU_CONFIGURE= YES .if defined(USE_INET6) && ${USE_INET6} == "YES" -BUILD_DEPENDS+= autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf post-patch: cd ${WRKSRC}; ${LOCALBASE}/bin/autoheader; ${LOCALBASE}/bin/autoconf diff --git a/chat/kicq/Makefile b/chat/kicq/Makefile index b826c82cfd0..95580c56492 100644 --- a/chat/kicq/Makefile +++ b/chat/kicq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 13:51:28 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:48 hubertf Exp $ DISTNAME= kicq-1.0.0 CATEGORIES= chat kde @@ -8,7 +8,7 @@ MAINTAINER= magick@bundy.lip.owl.de HOMEPAGE= http://kicq.sourceforge.net/ COMMENT= KDE ICQ client -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= icqlib>=1.0.0:../../chat/icqlib DEPENDS+= kdebase-1.1.2:../../x11/kdebase diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index bda9e39d8e9..358bf94c2a9 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/03/01 21:40:20 tron Exp $ +# $NetBSD: Makefile,v 1.15 2001/03/27 03:19:48 hubertf Exp $ # DISTNAME= jpilot-0.99 @@ -9,8 +9,9 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://jpilot.org/ COMMENT= desktop organizer application for the palm pilot -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= gtk+>=1.2.0:../../x11/gtk DEPENDS+= pilot-link>=0.9.3:../../comms/pilot-link diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index b85232e957f..6dfc5992715 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/02/16 14:30:10 agc Exp $ +# $NetBSD: Makefile,v 1.22 2001/03/27 03:19:48 hubertf Exp $ # FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp # @@ -12,7 +12,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.clinet.fi/~walker/minicom.html COMMENT= MS-DOS Telix serial communication program "workalike" -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gkermit-*:../../comms/gkermit DEPENDS+= lrzsz-*:../../comms/lrzsz diff --git a/cross/armv2-netbsd/Makefile b/cross/armv2-netbsd/Makefile index c19310546f2..f35ea9850c4 100644 --- a/cross/armv2-netbsd/Makefile +++ b/cross/armv2-netbsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/23 12:14:16 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:48 hubertf Exp $ # DISTVERSION= 1.3.0.0 @@ -18,7 +18,7 @@ EGCS_FAKE_RUNTIME= yes TARGET_ARCH= armv2-netbsd -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf post-patch: egcs-autoconf diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile index 0c4fc2a5c54..573c70b3ec8 100644 --- a/cross/i386-linux/Makefile +++ b/cross/i386-linux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/03/10 21:15:27 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:49 hubertf Exp $ # DISTVERSION= 2.0.7.1 @@ -9,8 +9,8 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/redhat/redhat-5.1/i386/RedHat/RPMS/ MAINTAINER= packages@netbsd.org COMMENT= Cross-compile environment for iX86 Linux, libc v6 -BUILD_DEPENDS+= rpm2cpio:../../misc/rpm -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoheader:../../devel/autoconf +BUILD_DEPENDS+= rpm-*:../../misc/rpm +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf CHECK_SHLIBS= no WRKSRC= ${WRKDIR} diff --git a/cross/i386-linuxglibc1/Makefile b/cross/i386-linuxglibc1/Makefile index 97b6c44fa52..aba6d57672c 100644 --- a/cross/i386-linuxglibc1/Makefile +++ b/cross/i386-linuxglibc1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/03/10 21:15:27 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:49 hubertf Exp $ # DISTVERSION= 5.3.12.1 @@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/redhat/redhat-4.2/i386/RedHat/RPMS/ MAINTAINER= packages@netbsd.org COMMENT= Cross-compile environment for iX86 Linux, libc v5 -BUILD_DEPENDS= rpm2cpio:../../misc/rpm +BUILD_DEPENDS= rpm-*:../../misc/rpm USE_CROSS_BINUTILS= yes BINUTILS_GNUTARGET= elf32-i386 diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile index 957ca82f5cd..ff308537192 100644 --- a/cross/i386-msdosdjgpp/Makefile +++ b/cross/i386-msdosdjgpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/03/10 21:15:27 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:49 hubertf Exp $ # DISTVERSION= 2.02.0 @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.delorie.com/djgpp/ COMMENT= Cross-compile environment for MS-DOS on 386 and higher -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip WRKSRC= ${WRKDIR}/djgpp diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index 218e3bd51bb..a94a236a20f 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/03/26 22:37:33 bad Exp $ +# $NetBSD: Makefile,v 1.20 2001/03/27 03:19:49 hubertf Exp $ # DISTNAME= mysql-3.23.35 @@ -12,7 +12,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mysql.com/ COMMENT= MySQL, a free SQL database (server) -BUILD_DEPENDS= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS= autoconf-2.13:../../devel/autoconf DEPENDS= ${DISTNAME:S/-/-client-/}:../../databases/mysql-client EXTRACT_USING_PAX= yes diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common index ef1761cc3ca..ed23a2a7e1c 100644 --- a/databases/postgresql/Makefile.common +++ b/databases/postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2001/02/10 22:37:47 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2001/03/27 03:19:49 hubertf Exp $ # # This file is included by the following packages: # @@ -21,7 +21,7 @@ MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/v${PG_VERS}/ \ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.PostgreSQL.ORG/ -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf USE_GMAKE= # defined GNU_CONFIGURE= # defined diff --git a/databases/quicklist/Makefile b/databases/quicklist/Makefile index d962817b970..131e4151a4b 100644 --- a/databases/quicklist/Makefile +++ b/databases/quicklist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 14:17:39 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/27 03:19:50 hubertf Exp $ # DISTNAME= quicklist-0.8.6 @@ -9,7 +9,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.quicklist.org/ COMMENT= Simple database like AppleWorks & MS Works -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gtk+-1.2.*:../../x11/gtk GNU_CONFIGURE= yes diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index b4428aac30c..ffb7f1a8e57 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/16 14:38:16 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/03/27 03:19:50 hubertf Exp $ # DISTNAME= GConf-0.11 @@ -12,7 +12,8 @@ COMMENT= configuration database system used by GNOME DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core DEPENDS+= oaf-*:../../devel/oaf DEPENDS+= guile>=1.3.4:../../lang/guile -BUILD_DEPENDS+= msgfmt:../../devel/gettext + +BUILD_USES_MSGFMT= yes GNU_CONFIGURE= YES USE_X11BASE= YES diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index f6463b93602..47ddc7456ed 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 14:38:17 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:50 hubertf Exp $ # DISTNAME= SDL-1.1.6 @@ -9,8 +9,8 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://www.libsdl.org/ COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library -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+= pth>=1.3.5:../../devel/pth #DEPENDS+= unproven-pthreads>=0.16 DEPENDS+= esound>=0.2.18:../../audio/esound diff --git a/devel/bison/Makefile b/devel/bison/Makefile index 7aa34c038c6..0aa62da77eb 100644 --- a/devel/bison/Makefile +++ b/devel/bison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/02/28 23:31:06 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/03/27 03:19:50 hubertf Exp $ DISTNAME= bison-1.28 CATEGORIES= devel @@ -8,7 +8,7 @@ MAINTAINER= thorpej@netbsd.org HOMEPAGE= http://www.gnu.org/software/bison/bison.html COMMENT= GNU yacc(1) replacement -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_LIBINTL= # defined GNU_CONFIGURE= # defined diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index fb810536634..7a3587a47ed 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 14:38:19 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:50 hubertf Exp $ # DISTNAME= bonobo-0.30 @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Architecture for creating reusable software components -BUILD_DEPENDS+= ${LOCALBASE}/bin/bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= ORBit>=0.5.6:../../net/ORBit DEPENDS+= gdk-pixbuf>=0.6.0:../../graphics/gdk-pixbuf DEPENDS+= oaf>=0.6.1:../../devel/oaf diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile index 079e78e9814..34620026cc1 100644 --- a/devel/cdk/Makefile +++ b/devel/cdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/16 14:38:19 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:51 hubertf Exp $ # DISTNAME= latestCDK @@ -12,7 +12,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.vexus.ca/CDK.html COMMENT= the Curses Development Kit -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index 01bf077abb9..62f905fd656 100644 --- a/devel/gmp/Makefile +++ b/devel/gmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/23 14:15:28 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:19:51 hubertf Exp $ # DISTNAME= gmp-3.1.1 @@ -9,7 +9,7 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.gnu.org/software/gmp/gmp.html COMMENT= Library for arbitrary precision arithmetic -BUILD_DEPENDS+= ${PREFIX}/bin/gm4:../../devel/m4 +BUILD_DEPENDS+= m4-1.4:../../devel/m4 GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile index c153bdd11fd..949a8f4a77d 100644 --- a/devel/gobo-eiffel/Makefile +++ b/devel/gobo-eiffel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/20 11:40:09 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:51 hubertf Exp $ # DISTNAME= gobo15 @@ -13,7 +13,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.gobosoft.com/ COMMENT= portable Eiffel structure libraries and tools -BUILD_DEPENDS+= ${LOCALBASE}/bin/smalleiffel:../../lang/smalleiffel +BUILD_DEPENDS+= smalleiffel-0.77:../../lang/smalleiffel NO_WRKSUBDIR= yes EXTRACT_CMD= ${LOCALBASE}/bin/unzip -uLa \ diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile index c900d38ab5d..14dddad11ca 100644 --- a/devel/id-utils/Makefile +++ b/devel/id-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/16 14:38:31 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:51 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp # @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/idutils/idutils.html COMMENT= The classic Berkeley gid/lid tools for looking up variables in code -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes INFO_FILES= id-utils.info GNU_CONFIGURE= yes diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index 86dc57f0131..745929dd531 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/03/04 16:38:46 tron Exp $ +# $NetBSD: Makefile,v 1.22 2001/03/27 03:19:52 hubertf Exp $ DISTNAME= kdbg-1.2.0 CATEGORIES= devel kde @@ -9,7 +9,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://members.telecom.at/~johsixt/kdbg.html COMMENT= Graphical User Interface around gdb using KDE -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= autoconf-2.13:../autoconf DEPENDS+= automake-1.4:../automake DEPENDS+= kdevelop-base-1.*:../kdevelop-base diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile index 65fd2f95646..72708f7e52d 100644 --- a/devel/kdevelop-base/Makefile +++ b/devel/kdevelop-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/10 03:16:41 wulf Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:52 hubertf Exp $ DISTNAME= kdevelop-1.3 PKGNAME= ${DISTNAME:S/-/-base-/} @@ -10,7 +10,8 @@ MAINTAINER= wulf@netbsd.org HOMEPAGE= http://www.kdevelop.org/ COMMENT= Base modules for IDE for Unix/X11/KDE -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= autoconf-*:../../devel/autoconf DEPENDS+= automake-*:../../devel/automake DEPENDS+= kdebase-1.*:../../x11/kdebase diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 959b630f248..f1cc2c6fabb 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2001/03/18 00:40:50 mjl Exp $ +# $NetBSD: Makefile,v 1.29 2001/03/27 03:19:52 hubertf Exp $ # DISTNAME= libglade-0.16 @@ -9,7 +9,8 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.daa.com.au/~james/gnome/ COMMENT= Runtime interpreter for GLADE gui files -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + # do not remove esound pre-requisite DEPENDS+= esound>=0.2.18:../../audio/esound DEPENDS+= gnome-libs>=1.2.1:../../x11/gnome-libs diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index ca045fd969c..dbdb5121435 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2001/02/16 14:38:36 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2001/03/27 03:19:52 hubertf Exp $ DISTNAME= libgtop-1.0.9 CATEGORIES= devel gnome @@ -8,8 +8,9 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.home-of-linux.org/gnome/libgtop/ COMMENT= library to retrieve system information, used in GNOME -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS= perl-5.*:../../lang/perl5 +BUILD_USES_MSGFMT= yes + DEPENDS+= gnome-libs-*:../../x11/gnome-libs DEPENDS+= guile-[0-9]*:../../lang/guile diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile index 69b8b31131c..0ba4ff8b2f9 100644 --- a/devel/maketool/Makefile +++ b/devel/maketool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/16 14:38:41 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2001/03/27 03:19:52 hubertf Exp $ # DISTNAME= maketool-0.6.1 @@ -10,7 +10,8 @@ MAINTAINER= fb@enteract.com HOMEPAGE= http://www.alphalink.com.au/~gnb/maketool/ COMMENT= Graphical front end to GNU make -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gtk+-1.2.*:../../x11/gtk USE_GMAKE= yes diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 250a3297402..f4602d32ec5 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 14:38:57 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:53 hubertf Exp $ # DISTNAME= popt-1.2 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.redhat.com/redhat/code/popt/ MAINTAINER= packages@netbsd.org COMMENT= Command line option parsing library -BUILD_DEPENDS+= xgettext:../../devel/gettext +BUILD_USES_MSGFMT= yes CONFLICTS= ORBit<=0.5.3 diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile index d4d5f6c664e..0ffe823a058 100644 --- a/devel/ptl2/Makefile +++ b/devel/ptl2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/02/16 14:38:58 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2001/03/27 03:19:53 hubertf Exp $ DISTNAME= PTL-2.1.7 PKGNAME= ptl-2.1.7 @@ -11,7 +11,7 @@ MAINTAINER= msaitoh@netbsd.org HOMEPAGE= http://www.media.osaka-cu.ac.jp/~k-abe/PTL/ COMMENT= Portable user-level Thread Library 2 written by Kota Abe -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 MAKE_ENV= INSTALL_PROGRAM="${INSTALL_SCRIPT}" PLIST_SRC= ${WRKDIR}/PLIST diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index bccecd9e1ce..0a578f79092 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/03/05 12:40:25 skrll Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:53 hubertf Exp $ # DISTNAME= pwlib_min_1.1pl17 @@ -19,7 +19,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.openh323.org/ COMMENT= Portable Windows Libary -BUILD_DEPENDS= ${LOCALBASE}/bin/bison:../../devel/bison +BUILD_DEPENDS= bison-*:../../devel/bison DEPENDS+= unproven-pthreads>=0.17:../../devel/unproven-pthreads WRKSRC= ${WRKDIR}/pwlib diff --git a/devel/tavrasm/Makefile b/devel/tavrasm/Makefile index 262ff988878..ae36aabd84c 100644 --- a/devel/tavrasm/Makefile +++ b/devel/tavrasm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:43 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:19:53 hubertf Exp $ # DISTNAME= tavrasm @@ -10,7 +10,7 @@ MAINTAINER= dillo@giga.or.at HOMEPAGE= http://www.tavrasm.org/ COMMENT= assembler for the Atmel AVR series of microcontrollers -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison WRKSRCTOP= ${WRKDIR}/tavrasm.115 WRKSRC= ${WRKSRCTOP}/src diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile index 97d9f6f5296..8f0e70a639c 100644 --- a/devel/w32api/Makefile +++ b/devel/w32api/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/28 10:45:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:53 hubertf Exp $ DISTNAME= w32api-0.4-20001122-bjy PKGNAME= w32api-0.4nb2 @@ -10,7 +10,7 @@ MAINTAINER= oki@yha.att.ne.jp HOMEPAGE= http://www.acc.umu.se/~anorland/gnu-win32/ COMMENT= Free headers and libraries for the Win32 API -BUILD_DEPENDS+= ${PREFIX}/cross/i386-netbsdpe/bin/gcc:../../cross/i386-netbsdpe +BUILD_DEPENDS+= cross-i386-netbsdpe-1.1.4:../../cross/i386-netbsdpe #HAS_CONFIGURE= yes #CONFIGURE_ARGS+= "--prefix=${PREFIX}/cross/i386-netbsdpe" diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 3451ba6bdce..b6cae9616c5 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/03/19 04:32:27 bad Exp $ +# $NetBSD: Makefile,v 1.19 2001/03/27 03:19:54 hubertf Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -17,7 +17,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.abisource.com/ COMMENT= Open Source cross-platform word processor -BUILD_DEPENDS+= ${LOCALBASE}/bin/unzip:../../archivers/unzip +BUILD_DEPENDS+= unzip-*:../../archivers/unzip DEPENDS+= ispell-base-*:../../textproc/ispell-base DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= png>1.0.9:../../graphics/png diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile index c255ec8b60e..203279a09f2 100644 --- a/editors/gnotepad/Makefile +++ b/editors/gnotepad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:40:49 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:19:54 hubertf Exp $ DISTNAME= gnotepad+-1.3.2 PKGNAME= ${DISTNAME:S/+//} @@ -10,7 +10,7 @@ HOMEPAGE= http://gnotepad.sourceforge.net/ COMMENT= easy-to-use, yet fairly feature-rich, simple HTML and text editor for X11 DEPENDS+= gnome-core-*:../../x11/gnome-core -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_X11BASE= YES USE_GMAKE= YES diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index fd1828563f4..c31f0f20811 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 18:38:11 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:54 hubertf Exp $ DISTNAME= Atari800-0.9.9a PKGNAME= atari800-0.9.9a @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://cas3.zlin.vutbr.cz/~stehlik/a800.htm COMMENT= Atari 8-bit computer, 5200 console emulator -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip RESTRICTED= "copyrighted ROM images" NO_SRC_ON_FTP= ${RESTRICTED} diff --git a/emulators/linux-locale/Makefile b/emulators/linux-locale/Makefile index 78d1a2a40e2..67666378205 100644 --- a/emulators/linux-locale/Makefile +++ b/emulators/linux-locale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/17 18:38:18 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:19:54 hubertf Exp $ # DISTNAME= locales-2.1-1mdk @@ -12,7 +12,7 @@ MAINTAINER= sakamoto@netbsd.org HOMEPAGE= http://www.linuxi18n.org/locales/ COMMENT= Locales for Linux -BUILD_DEPENDS+= rpm2cpio:../../misc/rpm +BUILD_DEPENDS+= rpm-*:../../misc/rpm .include "../../mk/bsd.prefs.mk" .if !defined(LINUX_LOCALES) diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile index a9aeacd806d..cff22aece8b 100644 --- a/emulators/linuxppc_lib/Makefile +++ b/emulators/linuxppc_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/03/16 15:52:57 kei Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:19:55 hubertf Exp $ DISTNAME= linuxppc_lib-2000.q4.2 CATEGORIES= emulators @@ -15,7 +15,7 @@ MAINTAINER= p99dreyf@criens.u-psud.fr HOMEPAGE= http://www.linuxppc.org/ COMMENT= libraries to run Linux binaries on NetBSD/powerpc (includes X11) -BUILD_DEPENDS+= rpm2pkg:../../pkgtools/rpm2pkg +BUILD_DEPENDS+= rpm2pkg-1.2:../../pkgtools/rpm2pkg ONLY_FOR_PLATFORM= NetBSD-*-macppc NetBSD-*-powerpc NetBSD-*-prep \ NetBSD-*-bebox NetBSD-*-ofppc NetBSD-*-amigappc diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile index 2e5dcd4123e..d1a1b029516 100644 --- a/emulators/osf1_lib/Makefile +++ b/emulators/osf1_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/11 23:22:50 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/27 03:19:55 hubertf Exp $ DISTNAME= netscape-4.7-3.alpha PKGNAME= osf1_lib-1.0 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.support.compaq.com/alpha-tools/software/index.html COMMENT= DEC/Compaq OSF-1/Tru64 compatibility package for netscape RPM2PKG= ${LOCALBASE}/sbin/rpm2pkg -BUILD_DEPENDS+= ${RPM2PKG}:../../pkgtools/rpm2pkg +BUILD_DEPENDS+= rpm2pkg-1.2:../../pkgtools/rpm2pkg ONLY_FOR_PLATFORM= NetBSD-*-alpha diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 1a8934db30a..6e55925684c 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 18:38:22 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/27 03:19:55 hubertf Exp $ DISTNAME= s9xs132 PKGNAME= snes9x-1.32 @@ -11,7 +11,7 @@ MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://www.snes9x.com/ COMMENT= Super Nintendo Entertainment System (SNES) emulator -BUILD_DEPENDS+= nasm:../../devel/nasm +BUILD_DEPENDS+= nasm-0.98:../../devel/nasm USE_X11= yes USE_GMAKE= yes diff --git a/emulators/suse_linux/Makefile.common b/emulators/suse_linux/Makefile.common index 0e3b1101496..001bb5993b4 100644 --- a/emulators/suse_linux/Makefile.common +++ b/emulators/suse_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2001/01/25 09:09:54 tron Exp $ +# $NetBSD: Makefile.common,v 1.5 2001/03/27 03:19:56 hubertf Exp $ SUSE_VERSION?= 6.4 @@ -13,7 +13,7 @@ EMULSUBDIR= emul/linux EMULDIR= ${PREFIX}/${EMULSUBDIR} RPM2PKG= ${PREFIX}/sbin/rpm2pkg -BUILD_DEPENDS+= ${RPM2PKG}:../../pkgtools/rpm2pkg +BUILD_DEPENDS+= rpm2pkg-1.2:../../pkgtools/rpm2pkg # The SuSE Linux packages have circular dependencies. LDD?= ${TRUE} diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile index 0c23923b201..f83b0bcd990 100644 --- a/emulators/xm7/Makefile +++ b/emulators/xm7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/28 10:47:23 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:19:56 hubertf Exp $ # DISTNAME= xm71010s @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://www.ipc-tokai.or.jp/~ytanaka/fm7/xm7.shtml COMMENT= X11-based FM-7 emulator -BUILD_DEPENDS+= nkf:../../japanese/nkf +BUILD_DEPENDS+= nkf-1.7:../../japanese/nkf WRKSRC= ${WRKDIR}/vm RESTRICTED= source archive is not redistributable diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile index cdd6486e512..19288040ea5 100644 --- a/finance/gnofin/Makefile +++ b/finance/gnofin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 14:46:34 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:56 hubertf Exp $ # DISTNAME= gnofin-0.8.4 @@ -9,7 +9,8 @@ MAINTAINER= mellon@isc.org HOMEPAGE= http://gnofin.sourceforge.net/ COMMENT= Personal checking/savings account management program -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= gnome-libs-*:../../x11/gnome-libs DEPENDS+= libxml>=1.8.10:../../textproc/libxml diff --git a/fonts/jisx0208fonts/Makefile b/fonts/jisx0208fonts/Makefile index a3764592240..0eb127b0de2 100644 --- a/fonts/jisx0208fonts/Makefile +++ b/fonts/jisx0208fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/03/17 16:49:38 jun Exp $ +# $NetBSD: Makefile,v 1.15 2001/03/27 03:19:56 hubertf Exp $ # DISTNAME= jisx0208fonts-20010112 @@ -12,7 +12,7 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org COMMENT= X11 fonts for JIS X0208 standard # not USE_GMAKE -BUILD_DEPENDS+= gmake:../../devel/gmake +BUILD_DEPENDS+= gmake-3.79.1:../../devel/gmake USE_NON_RECTANGULAR?= NO USE_SHINONOME?= YES @@ -53,7 +53,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.shinonome SHINONOME_CONFIGURE_ENV=${CONFIGURE_ENV} PERL="${PERL5}" SHINONOME_CONFIGURE_ARGS=${CONFIGURE_ARGS} --with-fontdir=${FONTDIR} --disable-progressbar -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 .endif MASTER_SITES+= ftp://ftp.jaist.ac.jp/pub/misc/character/fonts/kappa/ diff --git a/fonts/ksc5601fonts/Makefile b/fonts/ksc5601fonts/Makefile index 7ca4c5c6f27..9d1ab12eb94 100644 --- a/fonts/ksc5601fonts/Makefile +++ b/fonts/ksc5601fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:48 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:56 hubertf Exp $ # DISTNAME= ksc5601fonts-20001029 @@ -52,7 +52,7 @@ HANYANG_PCF= hgm10.pcf hgm12.pcf hgm14.pcf hgm16.pcf hgm18.pcf hgm20.pcf \ #EXTRACT_ONLY+= pinetree.precomposed-1.01-bdf.tar.gz .if defined(MIZI) -BUILD_DEPENDS+= rpm2cpio:../../misc/rpm +BUILD_DEPENDS+= rpm-*:../../misc/rpm .endif FONTDIR=${PREFIX}/lib/X11/fonts/local diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 740f99d7cc7..c490dfb2cfe 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/16 15:10:43 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/03/27 03:19:57 hubertf Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -8,7 +8,8 @@ MAINTAINER= bad@netbsd.org HOMEPAGE= http://soback.kornet21.net/~artist/baduk/baduki.html COMMENT= Go playing program based on xamigo -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gtk+-1.2.*:../../x11/gtk USE_X11= yes diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index c6877dd9a9a..4523617a08b 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:48 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:57 hubertf Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk-/} COMMENT= Freeciv client with GTK+ interface +BUILD_USES_MSGFMT= yes + DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share -BUILD_DEPENDS+= msgfmt:../../devel/gettext DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= imlib-*:../../graphics/imlib diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common index 8a491aa396c..4159a3156f3 100644 --- a/games/freeciv-share/Makefile.common +++ b/games/freeciv-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2001/02/26 17:01:59 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2001/03/27 03:19:57 hubertf Exp $ DISTNAME= freeciv-${FC_VERS} FC_VERS= 1.11.4 @@ -10,8 +10,8 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.freeciv.org/ -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_USES_MSGFMT= yes FILESDIR= ${.CURDIR}/../../games/freeciv-share/files PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 3f656f74f13..01ef0637363 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/02/26 20:19:44 tron Exp $ +# $NetBSD: Makefile,v 1.23 2001/03/27 03:19:57 hubertf Exp $ DISTNAME= gnome-games-1.2.0 CATEGORIES= games gnome @@ -8,9 +8,9 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME games collection -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -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-*:../../x11/gnome-core # Required for ports which don't build "libgtop". DEPENDS+= guile-[0-9]*:../../lang/guile diff --git a/games/quake6/Makefile b/games/quake6/Makefile index c1c340079c8..95147638abe 100644 --- a/games/quake6/Makefile +++ b/games/quake6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/16 15:10:58 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:57 hubertf Exp $ DISTNAME= quake-v6-bsd-kame PKGNAME= quake6-0.0 @@ -14,7 +14,7 @@ HOMEPAGE= http://www.viagenie.qc.ca/en/ipv6-quake.shtml COMMENT= Quake over IPv6 DEPENDS= quakedata-*:../../games/quakedata -BUILD_DEPENDS= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS= autoconf-2.13:../../devel/autoconf WRKSRC= ${WRKDIR}/quakeforge diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile index e8adfe08350..c07a6772f09 100644 --- a/games/quakedata/Makefile +++ b/games/quakedata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:10 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:58 hubertf Exp $ # Based on FreeBSD ports/games/quakeserver # FreeBSD: ports/games/quakeserver/Makefile,v 1.20 1999/08/31 06:44:23 mharo Exp # @@ -14,7 +14,7 @@ MAINTAINER= itojun@kame.net HOMEPAGE= http://www.idsoftware.com/ COMMENT= Game data files for Quake -BUILD_DEPENDS+= lha:../../archivers/lha +BUILD_DEPENDS+= lha-114f:../../archivers/lha LICENSE+= shareware RESTRICTED= "This software is shareware" diff --git a/games/sl/Makefile b/games/sl/Makefile index 31b3f40e7f6..31c32b2b510 100644 --- a/games/sl/Makefile +++ b/games/sl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:58 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:58 hubertf Exp $ # DISTNAME= sl @@ -15,7 +15,7 @@ MAINTAINER= minoura@netbsd.org HOMEPAGE= http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/ COMMENT= Animated SL that runs across the terminal when you type `sl' instead of `ls' -BUILD_DEPENDS= nkf:../../japanese/nkf +BUILD_DEPENDS= nkf-1.7:../../japanese/nkf post-build: nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 2c0e4272c5d..8072c0a7325 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:50 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:58 hubertf Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10nb1 @@ -12,7 +12,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.idsoftware.com/archives/doomarc.html COMMENT= 3D shoot-em-up for 8-bit X11 displays -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip LICENSE= shareware diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile index 90403d3e027..0e55c960a18 100644 --- a/games/xpuyopuyo/Makefile +++ b/games/xpuyopuyo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/16 15:11:04 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:58 hubertf Exp $ DISTNAME= xpuyopuyo-0.9.1 CATEGORIES= games x11 @@ -9,8 +9,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://chaos2.org/xpuyopuyo/ COMMENT= Tetris-like puzzle game -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= libmikmod>=3.1.9:../../audio/libmikmod diff --git a/games/xracer/Makefile b/games/xracer/Makefile index b6ff11873c6..eec24c9ea49 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/16 15:11:04 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:59 hubertf Exp $ # DISTNAME= xracer-0.96.9 @@ -9,10 +9,10 @@ MAINTAINER= bsieker@freenet.de HOMEPAGE= http://xracer.annexia.org/ COMMENT= XRacer is a clone of the popular Psygnosis game Wipeout -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+= jpeg-*:../../graphics/jpeg -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_X11= # defined USE_MESA= # defined diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile index 510dc2f7947..354fd03c69b 100644 --- a/graphics/GMT/Makefile +++ b/graphics/GMT/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/16 15:22:14 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:59 hubertf Exp $ DISTNAME= GMT3.3.6 PKGNAME= GMT-3.3.6 @@ -18,7 +18,7 @@ HOMEPAGE= http://imina.soest.hawaii.edu/gmt/ COMMENT= Generic Mapping Tools DEPENDS+= netcdf>=3.0:../../devel/netcdf -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf EXTRACT_SUFFIX= .tar.bz2 WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile index 8ffcd65e8b5..256d16a7a06 100644 --- a/graphics/Mesa-glx/Makefile +++ b/graphics/Mesa-glx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/03/14 10:20:32 tron Exp $ +# $NetBSD: Makefile,v 1.18 2001/03/27 03:19:59 hubertf Exp $ DISTNAME= glx-20000813 PKGNAME= Mesa-${DISTNAME} @@ -15,9 +15,9 @@ COMMENT= OpenGL like graphics library with GLX hardware acceleration BROKEN= Package is outdated and has security problems. -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base -BUILD_DEPENDS+= ${AUTOCONF}:../../devel/autoconf -BUILD_DEPENDS+= ${TCLSH}:../../lang/tcl +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= tcl-8.3.2nb1:../../lang/tcl CONFLICTS+= Mesa-* CONFLICTS+= MesaLib-* diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index 4706c08c8f9..9ef2818075d 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/03/04 09:06:11 tron Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:59 hubertf Exp $ DISTNAME= fly-1.6.5 CATEGORIES= graphics www @@ -8,7 +8,7 @@ MAINTAINER= bouyer@netbsd.org HOMEPAGE= http://www.unimelb.edu.au/fly/fly.html COMMENT= command-file interface for creating and modifying PNG images -BUILD_DEPENDS+= ${LOCALBASE}/bin/gif2png:../../graphics/gif2png +BUILD_DEPENDS+= gif2png-2.4.2:../../graphics/gif2png DEPENDS+= gd>=1.8.1:../../graphics/gd EVAL_PREFIX+= XPMDIR=xpm diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index e084e581fae..7ad6ea13bdf 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2000/11/04 07:05:09 itojun Exp $ +# $NetBSD: Makefile.common,v 1.8 2001/03/27 03:19:59 hubertf Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -10,7 +10,7 @@ MASTER_SITES= http://download.sourceforge.net/freetype/ \ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.freetype.org/ -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index 754fa4aafde..f0065e7e567 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2001/03/18 04:33:53 mjl Exp $ +# $NetBSD: Makefile.common,v 1.6 2001/03/27 03:20:00 hubertf Exp $ # DISTNAME= gdk-pixbuf-0.10.1 @@ -8,8 +8,8 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake DEPENDS+= gtk+>=1.2.8:../../x11/gtk DEPENDS+= png>=1.0.8:../../graphics/png DEPENDS+= tiff>=3.5.5:../../graphics/tiff diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index d3a1c1ae368..28a1880a33e 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/02/16 15:22:21 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:00 hubertf Exp $ # DISTNAME= giflib-4.1.0 @@ -11,7 +11,7 @@ COMMENT= Tools and library routines for working with GIF images CONFLICTS= libungif-* -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile index 07bd2f08ff4..2745218ccae 100644 --- a/graphics/gnome-iconedit/Makefile +++ b/graphics/gnome-iconedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:22:23 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:00 hubertf Exp $ # DISTNAME= gnome-iconedit-1.2.0 @@ -11,7 +11,7 @@ COMMENT= icon editor based on GNOME libraries DEPENDS+= gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf DEPENDS+= gnome-libs>=1.2.0:../../x11/gnome-libs DEPENDS+= oaf>=0.6.0:../../devel/oaf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes GNU_CONFIGURE= YES USE_GMAKE= YES diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 3ba809bd91e..e1bc6db7d33 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/03/15 14:55:23 zuntum Exp $ +# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:00 hubertf Exp $ # DISTNAME= gqview-0.10.1 @@ -11,7 +11,7 @@ COMMENT= another gtk-based graphic file viewer DEPENDS+= gdk-pixbuf>=0.9.0:../../graphics/gdk-pixbuf DEPENDS+= gtk+-1.2.*:../../x11/gtk -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_LIBINTL= yes USE_X11BASE= yes diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index f3577a1f98e..d516a2623be 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2001/03/10 13:04:07 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2001/03/27 03:20:01 hubertf Exp $ # DISTNAME= imlib-1.9.8.1 @@ -9,8 +9,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.nl.rasterman.com/imlib.html COMMENT= image manipulation library for X11 -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+= gtk+-1.2.*:../../x11/gtk DEPENDS+= libungif-*:../../graphics/libungif DEPENDS+= jpeg-6b:../../graphics/jpeg diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index df4b8099336..43eb4a93be5 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/16 15:22:26 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:01 hubertf Exp $ # DISTNAME= libggi-2.0b2.1 @@ -9,7 +9,7 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.ggi-project.org/ COMMENT= General Graphics Interface library is a flexible drawing library -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= ncurses>=4.2:../../devel/ncurses DEPENDS+= libgii-0.6:../libgii diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile index f59d52803a1..3b543782881 100644 --- a/graphics/libungif/Makefile +++ b/graphics/libungif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:26 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:01 hubertf Exp $ # DISTNAME= libungif-4.1.0 @@ -11,7 +11,7 @@ COMMENT= Tools and library routines for working with GIF images CONFLICTS= giflib-* -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 66e12361e00..6b4ecf75f96 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:30 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:01 hubertf Exp $ # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp # @@ -15,8 +15,7 @@ PATCHFILES= pixmap_2.6.patch1.gz \ MAINTAINER= packages@netbsd.org COMMENT= Pixmap editor based on XPM library -BUILD_DEPENDS+= rman:../../textproc/rman - +USE_RMAN= YES USE_IMAKE= YES USE_XPM= YES diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile index 0441319c23f..33c85b0bee3 100644 --- a/graphics/plplot/Makefile +++ b/graphics/plplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/26 22:22:49 jtb Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:02 hubertf Exp $ DISTNAME= plplot-5.0.2 CATEGORIES= graphics @@ -10,9 +10,9 @@ COMMENT= Scientific plotting package DEPENDS+= tcl>=8.3.0:../../lang/tcl DEPENDS+= tk>=8.3.0:../../x11/tk -BUILD_DEPENDS+= m4-[0-9]*:../../devel/m4 -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 +BUILD_DEPENDS+= m4-1.4:../../devel/m4 +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 GNU_CONFIGURE= #defined USE_GMAKE= #defined diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 89f39fa5039..e3905f6a3fa 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/03/04 09:06:15 tron Exp $ +# $NetBSD: Makefile,v 1.25 2001/03/27 03:20:02 hubertf Exp $ # DISTNAME= xsane-0.72 @@ -17,7 +17,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.xsane.org/ COMMENT= New improved frontend for SANE -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= gtk+>=1.2.5:../../x11/gtk DEPENDS+= png>1.0.9:../../graphics/png diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile index 7f01d8b980d..ef4ee978493 100644 --- a/japanese/ipadic/Makefile +++ b/japanese/ipadic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/03/23 23:33:12 taca Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:02 hubertf Exp $ # DISTNAME= ipadic-2.4.4 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://chasen.aist-nara.ac.jp/ COMMENT= Japanese Morphological Dictionary for ChaSen -BUILD_DEPENDS= ${LOCALBASE}/libexec/chasen/makemat:../../japanese/chasen-base +BUILD_DEPENDS= chasen-base-2.2.3:../../japanese/chasen-base GNU_CONFIGURE= # defined USE_LIBTOOL= # defined diff --git a/japanese/jhd/Makefile b/japanese/jhd/Makefile index 5ac91ab7b86..bc9e20bad68 100644 --- a/japanese/jhd/Makefile +++ b/japanese/jhd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 15:25:18 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:02 hubertf Exp $ # FreeBSD Id: Makefile,v 1.2 1999/05/01 04:00:25 taoka Exp $ DISTNAME= jhd-2.3 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.iamas.ac.jp/pub1/UNIX/File/ MAINTAINER= tech-pkg-ja@jp.netbsd.org COMMENT= Japanese Hexdecimal Dump -BUILD_DEPENDS= nkf:../../japanese/nkf +BUILD_DEPENDS= nkf-1.7:../../japanese/nkf post-build: @(cd ${WRKSRC}; ${MV} jhd.1 jhd.1.org; nkf -e jhd.1.org > jhd.1) diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common index 24e507bb48a..982050c754a 100644 --- a/japanese/vflib-lib/Makefile.common +++ b/japanese/vflib-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2001/02/26 17:01:59 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2001/03/27 03:20:02 hubertf Exp $ # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $ DISTNAME= VFlib2-${VFLIB_VERSION} @@ -11,7 +11,7 @@ VFLIB_SRC= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/ -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= freetype-lib>=1.3.1:../../graphics/freetype-lib VFLIB_VERSION= 2.24.2 diff --git a/lang/cim/Makefile b/lang/cim/Makefile index 5b8029f00dc..79639976009 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:01 agc Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:03 hubertf Exp $ DISTNAME= cim-3.30 CATEGORIES= lang @@ -8,7 +8,7 @@ MAINTAINER= jtb@netbsd.org HOMEPAGE= http://www.gnu.org/software/cim/cim.html COMMENT= Simula compiler based on the C programming language -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 048daf329a5..3ae2579a69f 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/03/01 02:10:22 hubertf Exp $ +# $NetBSD: Makefile,v 1.20 2001/03/27 03:20:03 hubertf Exp $ DISTNAME= gcc-2.95.2 CATEGORIES= lang @@ -8,7 +8,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/gcc/gcc.html COMMENT= GNU Compiler Collection -BUILD_DEPENDS+= ${LOCALBASE}/bin/bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison # The platforms listed below are the only tested platforms so far. # If you get gcc working on other platforms, then please add them. diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile index 86a33bc71e5..327690e27bf 100644 --- a/lang/moscow_ml/Makefile +++ b/lang/moscow_ml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/25 04:17:56 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 2001/03/27 03:20:03 hubertf Exp $ DISTNAME= mos20src PKGNAME= moscow_ml-2.00 @@ -11,7 +11,7 @@ MAINTAINER= lamj@stat.cmu.edu HOMEPAGE= http://www.dina.kvl.dk/~sestoft/mosml.html COMMENT= Moscow ML, a version of Standard ML -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 ALL_TARGET= clean world diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile index 6220997b08a..1a5b963c0f5 100644 --- a/lang/pgcc/Makefile +++ b/lang/pgcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/07 15:52:02 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:03 hubertf Exp $ DISTNAME= gcc-2.95.2 PKGNAME= pgcc-2.95.2.1 @@ -13,7 +13,7 @@ MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://goof.com/pcg/ COMMENT= Pentium GNU Compiler Collection -BUILD_DEPENDS+= ${LOCALBASE}/bin/bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison # 'Pentium GCC' is optimized for the Intel Pentium processor, but should # work on all platforms on which GCC works. diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index c5865eca4de..a05e6d225ac 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/02/25 04:17:56 hubertf Exp $ +# $NetBSD: Makefile,v 1.20 2001/03/27 03:20:03 hubertf Exp $ # DISTNAME= ruby-1.4.6 @@ -15,7 +15,7 @@ MAINTAINER= sakamoto@netbsd.org HOMEPAGE= http://www.ruby-lang.org/ COMMENT= the Object-Oriented Script Language -BUILD_DEPENDS= ${LOCALBASE}/bin/bison:../../devel/bison +BUILD_DEPENDS= bison-*:../../devel/bison DEPENDS+= gdbm>=1.7.3:../../databases/gdbm DEPENDS+= readline>=4.0:../../devel/readline diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile index 19a151e71c1..cffe4a46681 100644 --- a/lang/snobol/Makefile +++ b/lang/snobol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:30 agc Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:03 hubertf Exp $ # DISTNAME= snobol-0.99.4 @@ -12,7 +12,7 @@ MAINTAINER= refling@comet.lbl.gov HOMEPAGE= http://people.ne.mediaone.net/philbudne/snobol.html COMMENT= Macro implementation of SNOBOL4 in C -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index cc9e88f4314..7c2777034e2 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/25 04:17:56 hubertf Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:04 hubertf Exp $ # DISTNAME= Squeak2.7-src @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.squeak.org/ COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DIST_SUBDIR= squeak EXTRACT_ONLY= Squeak2.7-src.tar.gz diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile index eeef0d9071f..f3918561e68 100644 --- a/lang/swi-prolog/Makefile +++ b/lang/swi-prolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/03/20 13:43:26 jtb Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:04 hubertf Exp $ DISTNAME= pl-lite-4.0.0 PKGNAME= swi-prolog-4.0.0 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.swi.psy.uva.nl/projects/SWI-Prolog/ COMMENT= ISO/Edinburgh-style Prolog compiler DEPENDS+= readline-[0-9]*:../../devel/readline -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf WRKSRC= ${WRKDIR}/${DISTNAME:S,-lite,,} DIST_SUBDIR= swi-prolog diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 64c04bbee6a..580f0046971 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2001/03/23 10:01:01 wiz Exp $ +# $NetBSD: Makefile,v 1.90 2001/03/27 03:20:04 hubertf Exp $ # DISTNAME= fetchmail-5.7.2 @@ -11,8 +11,8 @@ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.tuxedo.org/~esr/fetchmail/ COMMENT= batch mail retrieval/forwarding utility for pop2, pop3, apop, imap -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_USES_MSGFMT= yes USE_LIBINTL= yes GNU_CONFIGURE= yes diff --git a/mail/mutt-unstable/Makefile b/mail/mutt-unstable/Makefile index 2ec23d1b08b..1c43d37328d 100644 --- a/mail/mutt-unstable/Makefile +++ b/mail/mutt-unstable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/26 20:19:46 tron Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:05 hubertf Exp $ DISTNAME= mutt-unstable-20010212 PKGNAME= mutt-1.3.14.20010212i @@ -9,9 +9,9 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.mutt.org/ COMMENT= text-based MIME mail client with PGP support -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_USES_MSGFMT= yes DEPENDS+= libiconv>=1.5:../../converters/libiconv USE_LIBINTL= YES diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 2c3345985ba..33dae6daf03 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2001/02/26 20:19:45 tron Exp $ +# $NetBSD: Makefile,v 1.69 2001/03/27 03:20:04 hubertf Exp $ DISTNAME= mutt-1.2.5i CATEGORIES= mail @@ -11,9 +11,9 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.mutt.org/ COMMENT= text-based MIME mail client with PGP support -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_USES_MSGFMT= yes USE_LIBINTL= YES MAKE_ENV+= CPPFLAGS=-I${LOCALBASE}/include LIBS=-lintl diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile index 18cdfe92b10..b937925ed4a 100644 --- a/mail/p5-MailTools/Makefile +++ b/mail/p5-MailTools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/03/25 07:23:18 mjl Exp $ +# $NetBSD: Makefile,v 1.10 2001/03/27 03:20:05 hubertf Exp $ DISTNAME= MailTools-1.15 PKGNAME= p5-${DISTNAME} @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} MAINTAINER= packages@netbsd.org COMMENT= perl5 modules related to mail applications -BUILD_DEPENDS+= ${PERL5_SITEARCH}/auto/Net/.packlist:../../net/p5-Net +BUILD_DEPENDS+= p5-Net-1.0703:../../net/p5-Net USE_PERL5= # defined PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Mail/.packlist diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index ced305a5281..043f58038d3 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/03/05 20:11:26 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2001/03/27 03:20:05 hubertf Exp $ # DISTNAME= xfmail-1.4.7 @@ -10,7 +10,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://xfmail.slappy.org/ COMMENT= Xforms based mail application for Unix operating systems -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoheader:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= gdbm>=1.7.3:../../databases/gdbm DEPENDS+= xforms>=0.88nb1:../../x11/xforms DEPENDS+= glib-*:../../devel/glib diff --git a/math/R/Makefile b/math/R/Makefile index fdcf9a0075d..71749b63a12 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/03/04 09:06:16 tron Exp $ +# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:05 hubertf Exp $ # DISTNAME= R-1.1.1 @@ -20,7 +20,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.R-project.org/ COMMENT= Statistical language for data analysis and graphics -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= readline>=4.0:../../devel/readline DEPENDS+= jpeg-*:../../graphics/jpeg DEPENDS+= png>1.0.9:../../graphics/png diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile index a9cb6cfa536..8ec6a0207cf 100644 --- a/math/cassowary/Makefile +++ b/math/cassowary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 18:22:17 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:05 hubertf Exp $ # DISTNAME= cassowary-0.60 @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cs.washington.edu/research/constraints/cassowary/ COMMENT= Constraint-solving toolkit for linear equalities and inequalities -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= guile>=1.3.2:../../lang/guile DEPENDS+= gtl>=0.3.2:../../devel/gtl diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 11c39914621..3ae25918236 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2001/03/19 13:23:43 tron Exp $ +# $NetBSD: Makefile,v 1.29 2001/03/27 03:20:06 hubertf Exp $ # DISTNAME= gnumeric-0.64 @@ -9,7 +9,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/gnumeric/ COMMENT= Powerful and easy to use spreadsheet program from the GNOME project -BUILD_DEPENDS+= ${LOCALBASE}/bin/python:../../lang/python +BUILD_DEPENDS+= python-2.0:../../lang/python DEPENDS+= libglade>=0.16:../../devel/libglade DEPENDS+= gal>=0.3:../../devel/gal DEPENDS+= gb>=0.0.17:../../lang/gb diff --git a/math/octave/Makefile b/math/octave/Makefile index 63508e6d7df..ebff1ae99c1 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/03/22 13:30:58 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2001/03/27 03:20:06 hubertf Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.16 @@ -13,8 +13,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.che.wisc.edu/octave/ COMMENT= High-level language, primarily intended for numerical computations -BUILD_DEPENDS+= tex:../../print/teTeX -BUILD_DEPENDS+= dvips:../../print/teTeX +BUILD_DEPENDS+= teTeX-1.0.7:../../print/teTeX DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot USE_X11= yes diff --git a/math/pari/Makefile b/math/pari/Makefile index ac46f8a501f..3024c2ba980 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/07 20:57:48 jtb Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/27 03:20:06 hubertf Exp $ DISTNAME= pari-2.1.0 CATEGORIES= math @@ -10,8 +10,8 @@ HOMEPAGE= http://www.parigp-home.de COMMENT= PARI-GP is a software package for computer-aided number theory DEPENDS+= readline>=4.0:../../devel/readline -BUILD_DEPENDS+= ${LOCALBASE}/bin/emacs:../../editors/emacs -BUILD_DEPENDS+= ${LOCALBASE}/bin/tex:../../print/teTeX +BUILD_DEPENDS+= {emacs-*,xemacs-*}:../../editors/emacs +BUILD_DEPENDS+= teTeX-*:../../print/teTeX USE_PERL5= #defined USE_X11= #defined diff --git a/math/pspp/Makefile b/math/pspp/Makefile index c6a1e119728..aac5eaa5aca 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 18:22:36 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:06 hubertf Exp $ # DISTNAME= pspp-0.3.0 @@ -16,8 +16,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/pspp/ COMMENT= Program for statistical analysis of sampled data -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_GTEXINFO= yes diff --git a/math/rlab/Makefile b/math/rlab/Makefile index 26db30e144e..3a6e5f748e5 100644 --- a/math/rlab/Makefile +++ b/math/rlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:22:40 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:06 hubertf Exp $ DISTNAME= rlab-2.1.05 CATEGORIES= math @@ -11,7 +11,7 @@ COMMENT= Matrix oriented, interactive programming environment DEPENDS+= boehm-gc>=5.3:../../devel/boehm-gc DEPENDS+= readline>=4.0:../../devel/readline -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= YES USE_FORTRAN= YES diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index 8406b14630a..c50e5d45e03 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 18:22:49 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:07 hubertf Exp $ # FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp # @@ -15,7 +15,7 @@ MAINTAINER= packages@NetBSD.org HOMEPAGE= http://plasma-gate.weizmann.ac.il/Xmgr/ COMMENT= Powerful XY plotting tool for workstations or X-terminals using X -BUILD_DEPENDS= bison:../../devel/bison +BUILD_DEPENDS= bison-*:../../devel/bison DEPENDS+= netcdf-3.4:../../devel/netcdf USE_FORTRAN= YES diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index 42a1656ab4e..a02e24dde7a 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/02/17 18:04:37 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2001/03/27 03:20:07 hubertf Exp $ # DISTNAME= vatsrc-4.0b2 @@ -11,7 +11,7 @@ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www-nrg.ee.lbl.gov/vat/ COMMENT= The Visual Audio Tool - multicast audioconferencing -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= tk-8.3.2:../../x11/tk DEPENDS+= gsm-1.0.10:../../audio/gsm diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index bf39225a47d..462d7c61933 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/17 18:04:37 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/03/27 03:20:07 hubertf Exp $ # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp # @@ -12,7 +12,7 @@ MAINTAINER= is@netbsd.org HOMEPAGE= http://www-nrg.ee.lbl.gov/vic/ COMMENT= MBONE video conferencing tool -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= tk-8.3.2:../../x11/tk GNU_CONFIGURE= yes diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile index fb059fbc8f8..5b02d953baf 100644 --- a/misc/gnome-pim/Makefile +++ b/misc/gnome-pim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/02/26 20:19:46 tron Exp $ +# $NetBSD: Makefile,v 1.26 2001/03/27 03:20:07 hubertf Exp $ # DISTNAME= gnome-pim-1.2.0 @@ -9,9 +9,9 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Personal Information Manager for GNOME -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= gnome-core-*:../../x11/gnome-core USE_GMAKE= # defined diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile index b417f8d1131..50c0e3ae703 100644 --- a/misc/gnome-utils/Makefile +++ b/misc/gnome-utils/Makefile @@ -1,4 +1,4 @@ -## $NetBSD: Makefile,v 1.31 2001/02/26 20:19:47 tron Exp $ +## $NetBSD: Makefile,v 1.32 2001/03/27 03:20:07 hubertf Exp $ DISTNAME= gnome-utils-1.2.0 CATEGORIES= misc x11 gnome @@ -8,9 +8,9 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Set of useful GNOME utilities and applications -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core DEPENDS+= libgtop>=1.0.9:../../devel/libgtop DEPENDS+= libglade>=0.13:../../devel/libglade diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile index b7160c44af9..329ace78402 100644 --- a/misc/gperiodic/Makefile +++ b/misc/gperiodic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:09:05 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:08 hubertf Exp $ # DISTNAME= gperiodic-1.2.6 @@ -10,7 +10,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://gperiodic.seul.org/ COMMENT= Displays a periodic table of the elements -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes DEPENDS+= gtk+-1.2.*:../../x11/gtk GNU_CONFIGURE= yes diff --git a/misc/root/Makefile b/misc/root/Makefile index 06756e42eaf..4c98ba3571b 100644 --- a/misc/root/Makefile +++ b/misc/root/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:02 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:08 hubertf Exp $ DISTNAME= root_v2.23.08.source PKGNAME= root-2.23 @@ -10,7 +10,7 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://root.cern.ch/ COMMENT= OO framework for data analysis and visualisation -BUILD_DEPENDS+= cint:../../lang/cint +BUILD_DEPENDS+= cint-5.14.40:../../lang/cint USE_GMAKE= YES USE_XPM= YES diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index fc56547847c..14eb601049d 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/03/07 07:07:11 kei Exp $ +# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:08 hubertf Exp $ # DISTNAME= rpm-2.5.4 @@ -10,7 +10,7 @@ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.rpm.org/ COMMENT= The Red Hat Package Manager -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes CONFLICTS+= rpm2cpio-* diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a57a2ab33ba..23957ff010f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.700 2001/03/26 21:36:02 manu Exp $ +# $NetBSD: bsd.pkg.mk,v 1.701 2001/03/27 03:20:08 hubertf Exp $ # # This file is in the public domain. # @@ -124,11 +124,7 @@ MOTIFBASE?= ${X11PREFIX} .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE) .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) -# XXX: actually, here we would need something like -# BUILD_DEPENDS+=xpkgwedge>=1.0:../../pkgtools/xpkgwedge -.if make(install-run-depends) -DEPENDS+= xpkgwedge>=1.0:../../pkgtools/xpkgwedge -.endif +BUILD_DEPENDS+= xpkgwedge>=1.0:../../pkgtools/xpkgwedge .endif PREFIX= ${X11PREFIX} .elif defined(USE_CROSSBASE) @@ -139,7 +135,7 @@ PREFIX= ${LOCALBASE} .endif .if defined(USE_GMAKE) -BUILD_DEPENDS+= ${GMAKE}:../../devel/gmake +BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake MAKE_PROGRAM= ${GMAKE} GMAKE?= gmake .else @@ -155,7 +151,7 @@ PERL5?= ${LOCALBASE}/bin/perl .if defined(USE_PERL5) DEPENDS+= perl-5.*:../../lang/perl5 .if exists(${PERL5}) -BUILD_DEPENDS+= ${LOCALBASE}/share/mk/bsd.perl.mk:../../pkgtools/perl-mk +BUILD_DEPENDS+= perl-mk-1.0:../../pkgtools/perl-mk .if exists(${LOCALBASE}/share/mk/bsd.perl.mk) .include "${LOCALBASE}/share/mk/bsd.perl.mk" .elif !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB) @@ -181,7 +177,7 @@ PKG_FC?= f2c-f77 # /usr/bin/f77, the default will remain as f2c-f77. PKG_FC?= f2c-f77 .if (${PKG_FC} == "f2c-f77") -BUILD_DEPENDS+= f2c-f77:../../lang/f2c +BUILD_DEPENDS+= f2c-20001205:../../lang/f2c .endif FC= ${PKG_FC} F77= ${PKG_FC} @@ -223,14 +219,9 @@ CONFIGURE_ENV+= LIBS="${LIBS} -L${LOCALBASE}/lib -lintl" .if defined(USE_LIBTOOL) LIBTOOL= ${LOCALBASE}/bin/libtool -# XXX Here we really need the following, but BUILD_DEPENDS doesn't -# XXX support it at the moment. -# BUILD_DEPENDS+=libtool>=1.4.20010219nb4:../../devel/libtool -.if make(install-run-depends) || make(fetch-list-recursive) || make(show-depends-dirs) -DEPENDS+= libtool>=1.4.20010219nb2:../../devel/libtool -.endif +BUILD_DEPENDS+= libtool>=1.4.20010219nb2:../../devel/libtool .if defined(USE_LTDL) -DEPENDS+= libtool>=1.4.20010219nb4:../../devel/libtool +BUILD_DEPENDS+= libtool>=1.4.20010219nb4:../../devel/libtool .endif .endif @@ -260,6 +251,10 @@ DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d .endif .endif +.if defined(BUILD_USES_MSGFMT) && !exists(/usr/bin/msgfmt) +BUILD_DEPENDS+= gettext-0.10.35nb1:../../devel/gettext +.endif + # Don't change these!!! These names are built into the _TARGET_USE macro, # there is no way to refer to them cleanly from within the macro AFAIK. EXTRACT_COOKIE= ${WRKDIR}/.extract_done @@ -340,16 +335,16 @@ EXTRACT_SUFX?= .tar.gz BZCAT= /usr/bin/bzcat < .else BZCAT= ${LOCALBASE}/bin/bzcat -BUILD_DEPENDS+= ${BZCAT}:../../archivers/bzip2 +BUILD_DEPENDS+= bzip2-0.9.0b:../../archivers/bzip2 .endif # !exists bzcat DECOMPRESS_CMD?= ${BZCAT} .elif ${EXTRACT_SUFX} == ".tar" DECOMPRESS_CMD?= ${CAT} .elif ${EXTRACT_SUFX} == ".zip" -BUILD_DEPENDS+= unzip:../../archivers/unzip +BUILD_DEPENDS+= unzip-5.42:../../archivers/unzip EXTRACT_CMD?= unzip -Laq ${DOWNLOADED_DISTFILE} .elif ${EXTRACT_SUFX} == ".lzh" -BUILD_DEPENDS+= lha:../../archivers/lha +BUILD_DEPENDS+= lha-114f:../../archivers/lha EXTRACT_CMD?= lha xq ${DOWNLOADED_DISTFILE} .else DECOMPRESS_CMD?= ${GZCAT} @@ -362,7 +357,7 @@ DECOMPRESS_CMD?= ${GZCAT} BZCAT= /usr/bin/bzcat .else BZCAT= ${LOCALBASE}/bin/bzcat -BUILD_DEPENDS+= ${BZCAT}:../../archivers/bzip2 +BUILD_DEPENDS+= bzip2-0.9.0b:../../archivers/bzip2 .endif # !exists bzcat .endif .endif # defined(PATCHFILES) @@ -1666,7 +1661,7 @@ delete-package: _PORT_USE: .USE .if make(real-extract) - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} install-build-depends install-run-depends DEPENDS_TARGET=${DEPENDS_TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} install-depends DEPENDS_TARGET=${DEPENDS_TARGET} .endif ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${.TARGET:S/^real-/pre-/} ${_PKG_SILENT}${_PKG_DEBUG}if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/} ]; then \ @@ -2695,64 +2690,17 @@ package-noinstall: ################################################################ .if !target(install-depends) -install-depends: install-run-depends install-build-depends - -install-build-depends: -.if defined(BUILD_DEPENDS) -.if !defined(NO_DEPENDS) -.for dep in ${BUILD_DEPENDS} - ${_PKG_SILENT}${_PKG_DEBUG} \ - prog="${dep:C/:.*//}"; \ - dir="${dep:C/^[^:]*://:C/:.*$//}"; \ - if [ "${_DEPENDS_TARGET_OVERRIDE}" != "" ]; then \ - target=${DEPENDS_TARGET}; \ - elif [ "${dep:M*\:*\:*}" != "" ]; then \ - target="${dep:C/^[^:]*:[^:]*://}"; \ - else \ - target=${DEPENDS_TARGET}; \ - fi; \ - found=not; \ - if expr "$$prog" : '.*/' >/dev/null; then \ - if ${TEST} -e "$$prog" ; then \ - ${ECHO_MSG} "${_PKGSRC_IN}> Required file $$prog: found"; \ - found=""; \ - else \ - ${ECHO_MSG} "${_PKGSRC_IN}> Required file $$prog: NOT found"; \ - fi; \ - else \ - for d in ${PATH:S/:/ /g}; do \ - if [ -x $$d/$$prog ]; then \ - found="$$d/$$prog"; \ - break; \ - fi \ - done; \ - ${ECHO_MSG} "${_PKGSRC_IN}> Required executable $$prog: $$found found"; \ - fi; \ - if [ "$$found" = "not" ]; then \ - ${ECHO_MSG} "${_PKGSRC_IN}> Verifying $$target for $$prog in $$dir"; \ - if [ ! -d "$$dir" ]; then \ - ${ECHO_MSG} "=> No directory for $$prog. Skipping.."; \ - else \ - cd $$dir ; \ - ${MAKE} ${MAKEFLAGS} $$target DEPENDS_TARGET=${DEPENDS_TARGET} ; \ - ${ECHO_MSG} "${_PKGSRC_IN}> Returning to build of ${PKGNAME}"; \ - fi; \ - fi -.endfor # BUILD_DEPENDS -.endif # !NO_DEPENDS -.else # !BUILD_DEPENDS - @${DO_NADA} -.endif # BUILD_DEPENDS - # Tells whether to halt execution if the object formats differ FATAL_OBJECT_FMT_SKEW?= yes WARN_NO_OBJECT_FMT?= yes -install-run-depends: uptodate-pkgtools -.if defined(DEPENDS) -.if !defined(NO_DEPENDS) -.for dep in ${DEPENDS} - ${_PKG_SILENT}${_PKG_DEBUG}\ +install-depends: uptodate-pkgtools +.if defined(DEPENDS) || defined(BUILD_DEPENDS) +.if defined(NO_DEPENDS) + @${DO_NADA} +.else # !DEPENDS +.for dep in ${DEPENDS} ${BUILD_DEPENDS} + ${_PKG_SILENT}${_PKG_DEBUG} \ pkg="${dep:C/:.*//}"; \ dir="${dep:C/[^:]*://:C/:.*$//}"; \ found="`${PKG_INFO} -e \"$$pkg\" || ${TRUE}`"; \ @@ -2791,8 +2739,6 @@ install-run-depends: uptodate-pkgtools fi .endfor # DEPENDS .endif # !NO_DEPENDS -.else # !DEPENDS - @${DO_NADA} .endif # DEPENDS .endif diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index e61ea2b4f1b..354a179e66b 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2001/03/10 23:36:22 tron Exp $ +# $NetBSD: Makefile,v 1.51 2001/03/27 03:20:09 hubertf Exp $ # DISTNAME= ORBit-0.5.6 @@ -11,9 +11,8 @@ COMMENT= high-performance CORBA ORB with support for the C language DEPENDS+= glib>=1.2.7:../../devel/glib DEPENDS+= gindent-*:../../devel/gindent -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= ${LOCALBASE}/share/aclocal/gettext.m4:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake USE_LIBINTL= YES USE_GMAKE= YES @@ -32,6 +31,10 @@ INFO_FILES= libIDL.info .include "../../mk/bsd.prefs.mk" +.if !exists(${LOCALBASE}/share/aclocal/gettext.m4) +BUILD_DEPENDS+= gettext-0.10.35nb1:../../devel/gettext +.endif + .if (${OPSYS} == SunOS) DEPENDS+= tcp_wrappers>=7.6.1nb1:../../security/tcp_wrappers .endif diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index c07b9ac8910..8576a74d483 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2001/03/13 15:44:21 tron Exp $ +# $NetBSD: Makefile,v 1.44 2001/03/27 03:20:09 hubertf Exp $ # ETHEREAL_VERSION= 0.8.16 @@ -13,7 +13,7 @@ COMMENT= Network protocol analyzer DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= ucd-snmp>=4.1.2:../../net/ucd-snmp -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 USE_X11= YES USE_SSL= YES diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile index 04a5eee3303..5a78ba33e36 100644 --- a/net/freewais-sf/Makefile +++ b/net/freewais-sf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 18:18:52 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:10 hubertf Exp $ # DISTNAME= freeWAIS-sf-2.2.12 @@ -10,7 +10,7 @@ MAINTAINER= bad@NetBSD.org HOMEPAGE= http://ls6-www.informatik.uni-dortmund.de/ir/projects/freeWAIS-sf/index.html COMMENT= Enhanced Wide Area Information Server -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 USE_LIBTOOL= # defined diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile index 09609495b29..543cd832f5d 100644 --- a/net/gnapster/Makefile +++ b/net/gnapster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/17 18:18:54 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:10 hubertf Exp $ DISTNAME= gnapster-1.4.2 CATEGORIES= net @@ -9,7 +9,7 @@ HOMEPAGE= http://www.faradic.net/~jasta/programs.html COMMENT= simple client for the online mp3 community DEPENDS+= gnome-core-*:../../x11/gnome-core -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_X11BASE= YES USE_GMAKE= YES diff --git a/net/irrd/Makefile b/net/irrd/Makefile index 3d991678353..28c6b603ed6 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/17 18:18:59 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:10 hubertf Exp $ # DISTNAME= irrd2.0a-Aug22-2000 @@ -11,8 +11,8 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.irrd.net/ COMMENT= Internet Routing Registry Daemon -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= gdbm-*:../../databases/gdbm DEPENDS+= pgp5-*:../../security/pgp5 DEPENDS+= wget-*:../../net/wget diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index 278bca702f4..361a0e179c5 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 18:19:01 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:11 hubertf Exp $ # DISTNAME= jwhois-2.4.1 @@ -9,8 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/jwhois/ COMMENT= Configurable WHOIS client -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= ${LOCALBASE}/share/autoconf/gettext.m4:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= # defined USE_LIBINTL= # defined @@ -20,6 +19,12 @@ CONFIGURE_ARGS+= --with-cache INFO_FILES= jwhois.info +.include "../../mk/bsd.prefs.mk" + +.if !exists(${LOCALBASE}/share/aclocal/gettext.m4) +BUILD_DEPENDS+= gettext-0.10.35nb1:../../devel/gettext +.endif + pre-configure: cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index 51e5fa9ff7f..a347fa1f4f4 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:04 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:11 hubertf Exp $ DISTNAME= libpcap-0.6.1 CATEGORIES= net @@ -8,8 +8,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.tcpdump.org/ COMMENT= System-independent interface for user-level packet capture -BUILD_DEPENDS+= bison:../../devel/bison -BUILD_DEPENDS+= flex:../../devel/flex +BUILD_DEPENDS+= bison-*:../../devel/bison +BUILD_DEPENDS+= flex-*:../../devel/flex ONLY_FOR_PLATFORM= SunOS-*-* # in NetBSD base system diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile index a3f5b2d6be8..5fef8d869d5 100644 --- a/net/md-whois/Makefile +++ b/net/md-whois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 18:19:06 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/03/27 03:20:11 hubertf Exp $ DISTNAME= whois_4.5.2 PKGNAME= md-whois-4.5.2 @@ -9,7 +9,7 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.linux.it/~md/software/ COMMENT= Improved whois client -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 WRKSRC= ${WRKDIR}/whois-4.5.2 diff --git a/net/ppp-mppe/Makefile b/net/ppp-mppe/Makefile index e84286ed150..88482246dfc 100644 --- a/net/ppp-mppe/Makefile +++ b/net/ppp-mppe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:29 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:11 hubertf Exp $ DISTNAME= ppp-2.3.9 PKGNAME= ppp-mppe-2.3.9 @@ -12,8 +12,6 @@ COMMENT= PPP daemon and LKM with MPPE - Microsoft Point-to-Point Encryption OPENSSL_VERS= 0.9.5a OPENSSL_SRC= ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VERS} -BUILD_DEPENDS= ${OPENSSL_SRC}/crypto/rc4:../../security/openssl:extract - HAS_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes @@ -35,9 +33,18 @@ post-extract: @${CP} ${OPENSSL_SRC}/crypto/sha/sha_locl.h ${WRKSRC}/netbsd-1.4/sha_locl.h @${CP} ${OPENSSL_SRC}/crypto/sha/sha.h ${WRKSRC}/netbsd-1.4/sha.h + +pre-configure: + if [ ! -e ${OPENSSL_SRC}/crypto/rc4 ]; then \ + cd ../../security/openssl && ${MAKE} extract; \ + fi + pre-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/lkm +pre-clean: + cd ../../security/openssl && ${MAKE} clean + SYSDIR?= /sys MAKE_ENV+= SYSDIR="${SYSDIR}" diff --git a/net/samba/Makefile b/net/samba/Makefile index e79aacfed28..95d80094502 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2001/02/25 04:18:08 hubertf Exp $ +# $NetBSD: Makefile,v 1.46 2001/03/27 03:20:11 hubertf Exp $ DISTNAME= samba-2.0.7-ja-1.3 PKGNAME= samba-2.0.7.1.3 @@ -10,8 +10,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.samba.org/ COMMENT= SMB/CIFS protocol server suite for UNIX -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_USES_MSGFMT= yes .if !exists(/usr/include/readline.h) DEPENDS+= readline>=4.0:../../devel/readline diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile index f2e481c750a..b665cc2005f 100644 --- a/net/trafshow/Makefile +++ b/net/trafshow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/03/22 06:46:11 itojun Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:12 hubertf Exp $ # $FreeBSD: ports/net/trafshow/Makefile,v 1.14 2000/06/28 12:53:15 alex Exp $ # @@ -15,7 +15,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://soft.risp.ru/trafshow/index.shtml COMMENT= Full screen visualization of the network traffic -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= yes ALL_TARGET= trafshow diff --git a/net/ucd-snmp-current/Makefile b/net/ucd-snmp-current/Makefile index b5dfb9b5e74..cc7d7c655be 100644 --- a/net/ucd-snmp-current/Makefile +++ b/net/ucd-snmp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:09 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:12 hubertf Exp $ # DISTNAME= ucd-snmp-4.0.1 @@ -19,7 +19,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ece.ucdavis.edu/ucd-snmp/ COMMENT= Extensible SNMP implementation -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-defaults diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile index 69a25886084..f83570199a3 100644 --- a/net/ucd-snmp/Makefile +++ b/net/ucd-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/03/05 19:06:47 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2001/03/27 03:20:12 hubertf Exp $ # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp # @@ -13,7 +13,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://net-snmp.sourceforge.net/ COMMENT= Extensible SNMP implementation -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEFS+= USE_INET6 diff --git a/net/unison/Makefile b/net/unison/Makefile index 2276a733ad9..a362ab2937e 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:50 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:12 hubertf Exp $ # DISTNAME= src @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ COMMENT= file-synchronization tool -BUILD_DEPENDS= ocamlc:../../lang/ocaml +BUILD_DEPENDS= ocaml-3.00:../../lang/ocaml DIST_SUBDIR= unison diff --git a/net/wget/Makefile b/net/wget/Makefile index 58c915962d2..d95666e96b2 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/02/17 18:19:55 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:12 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp # @@ -14,7 +14,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/wget/wget.html COMMENT= Retrieve files from the 'net via HTTP and FTP -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_LIBINTL= yes diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 5c751064513..afbb74c3b31 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/02/17 18:19:59 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:13 hubertf Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -11,7 +11,8 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.dtek.chalmers.se/~d3august/xt/index.html COMMENT= Graphical version of traceroute, which traces the route IP packets go -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gtkglarea-1.2.1:../../x11/gtkglarea DEPENDS+= tiff-*:../../graphics/tiff diff --git a/net/zebra/Makefile b/net/zebra/Makefile index a78620969ea..70e3d3e2081 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2001/03/09 12:55:48 itojun Exp $ +# $NetBSD: Makefile,v 1.36 2001/03/27 03:20:13 hubertf Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -12,8 +12,8 @@ MAINTAINER= itojun@itojun.org HOMEPAGE= http://www.zebra.org/ COMMENT= Free multithreaded routing daemon software -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf .include "../../mk/bsd.prefs.mk" diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 21e8a6bd4ab..ac0bcf2f242 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/03/20 20:18:07 manu Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:13 hubertf Exp $ DISTNAME= rpm2pkg-1.2 CATEGORIES= pkgtools @@ -9,7 +9,7 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/Packages.txt COMMENT= Convert RPM archives to NetBSD packages -BUILD_DEPENDS+= ${RPMLIB}:../../misc/rpm +BUILD_DEPENDS+= rpm-*:../../misc/rpm CONFLICTS+= suse-base<=6.4 diff --git a/print/cups/Makefile b/print/cups/Makefile index 177da84856b..c30beac5085 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/03/07 04:09:58 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2001/03/27 03:20:13 hubertf Exp $ # DISTNAME= cups-${VERS}-3-source @@ -19,7 +19,7 @@ COMMENT= Common UNIX Printing System CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png>1.0.9:../../graphics/png DEPENDS+= tiff-*:../../graphics/tiff diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index 2971f719ec4..4b2041c7a9a 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2000/09/04 16:37:05 wiz Exp $ +# $NetBSD: Makefile.common,v 1.6 2001/03/27 03:20:13 hubertf Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -18,8 +18,6 @@ DEPENDS+= png>=1.0.6:../../graphics/png # Adobe's JPEG implementation in their PDF/PS documents is non-standard, # so we can't use an already installed libjpeg.so. # -BUILD_DEPENDS+= ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jpeg:extract - GS_SOURCES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${GS_SOURCES} @@ -174,6 +172,9 @@ post-patch: < ${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps do-configure: + if [ ! -e ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ]; then \ + cd ../../graphics/jpeg && ${MAKE} extract; \ + fi # # Append build rules for extra drivers to contrib.mak # diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile index e51407f2f56..77d9cd2bac9 100644 --- a/print/teTeX-bin/Makefile +++ b/print/teTeX-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/03/04 09:06:17 tron Exp $ +# $NetBSD: Makefile,v 1.27 2001/03/27 03:20:14 hubertf Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp # @@ -12,7 +12,7 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.tug.org/tetex/ COMMENT= TeX distribution for UNIX compatible systems - executables -BUILD_DEPENDS+= ${LOCALBASE}/bin/bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= teTeX-share-1.0.*:../teTeX-share DEPENDS+= dialog-0.6z:../../misc/dialog DEPENDS+= libwww>=5.2.8:../../www/libwww diff --git a/print/xpp/Makefile b/print/xpp/Makefile index 0b0112c1d18..e9629ea42b0 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 17:51:58 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:14 hubertf Exp $ DISTNAME= xpp-1.0 CATEGORIES= print x11 @@ -8,7 +8,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://cups.sourceforge.net/xpp/index.html COMMENT= X Printing Panel -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= cups>=1.1.1:../../print/cups DEPENDS+= fltk>=1.0.9:../../x11/fltk diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 1ce5cfcbea3..d2767115607 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 17:49:38 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:14 hubertf Exp $ # DISTNAME= Linux-${PKGNAME} @@ -10,7 +10,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.kernel.org/pub/linux/libs/pam/ COMMENT= Pluggable Authentication Modules -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison DEPENDS+= libcrack-*:../../security/libcrack USE_GMAKE= YES diff --git a/security/aide/Makefile b/security/aide/Makefile index 22b2e2ac2c3..0cf56d66237 100644 --- a/security/aide/Makefile +++ b/security/aide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 17:49:39 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:14 hubertf Exp $ # DISTNAME= aide-0.6 @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html COMMENT= free intrusion detection system for checking file integrity -BUILD_DEPENDS+= bison:../../devel/bison +BUILD_DEPENDS+= bison-*:../../devel/bison GNU_CONFIGURE= yes #don't set YACC so configure can correctly find bison diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 63709f45c50..99e4dbd3571 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/03/04 03:26:51 assar Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:15 hubertf Exp $ DISTNAME= cyrus-sasl-1.5.24 PKGNAME= ${DISTNAME}nb3 @@ -10,7 +10,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://asg2.web.cmu.edu/sasl/ COMMENT= Simple Authentication and Security Layer -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake +BUILD_DEPENDS+= automake-1.4:../../devel/automake GNU_CONFIGURE= # defined USE_SSL= # defined diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile index 9b31a24fc67..5e6daa1ec60 100644 --- a/security/dsniff/Makefile +++ b/security/dsniff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 17:49:42 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:15 hubertf Exp $ # $OpenBSD: Makefile,v 1.13 2000/06/19 18:38:55 dugsong Exp $ DISTNAME= dsniff-2.3 @@ -13,7 +13,7 @@ DEPENDS+= libnet-*:../../devel/libnet # libnids provides static library only, thus it isn't necessary at run-time, # only at compile-time. # -BUILD_DEPENDS+= ${LOCALBASE}/lib/libnids.a:../../net/libnids +BUILD_DEPENDS+= libnids-1.14:../../net/libnids GNU_CONFIGURE= yes USE_X11= yes diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 0f9f5cb9dc6..cd7466b316d 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/02/17 17:49:45 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2001/03/27 03:20:15 hubertf Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp # @@ -17,7 +17,7 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://www.gnupg.org/ COMMENT= Privacy Guard, a public-Key encryption and digital signature utility -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes CRYPTO= yes GNU_CONFIGURE= yes diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 3369b664b7a..61e4c26ac88 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2001/03/22 08:49:28 itojun Exp $ +# $NetBSD: Makefile,v 1.44 2001/03/27 03:20:15 hubertf Exp $ DISTNAME= openssh-2.5.2p2 CATEGORIES= security @@ -12,8 +12,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.openssh.com/ COMMENT= Open Source Secure shell client and server (remote login program) -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf CRYPTO= yes diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile index 261f4b5c0ac..82ed3f6948e 100644 --- a/security/pakemon/Makefile +++ b/security/pakemon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 17:50:00 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:15 hubertf Exp $ DISTNAME= pakemon-0.3.1 CATEGORIES= security @@ -12,8 +12,8 @@ DEPENDS+= libnet-*:../../devel/libnet # libnids provides static library only, thus it isn't necessary at run-time, # only at compile-time. # -BUILD_DEPENDS+= ${LOCALBASE}/lib/libnids.a:../../net/libnids -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= libnids-1.14:../../net/libnids +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf GNU_CONFIGURE= yes diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index 83e971b1b9a..d5828115560 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:13 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:16 hubertf Exp $ # DISTNAME= pgp50i-unix-src @@ -16,9 +16,9 @@ MASTER_SITES= ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \ MAINTAINER= mjl@netbsd.org HOMEPAGE= http://www.pgpi.com/ -COMMENT= New, international, Public-Key encryption and digital signature utility +COMMENT= New, international, Public-Key encryption and digital signature utility -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 CRYPTO= YES GNU_CONFIGURE= YES diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile index ab76b5a0a33..f6899edd5c4 100644 --- a/security/srp_client/Makefile +++ b/security/srp_client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/03/23 10:31:51 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:16 hubertf Exp $ # DISTNAME= srp-1.4.4 @@ -10,8 +10,8 @@ MAINTAINER= jlam@netbsd.org #HOMEPAGE= http://srp.stanford.edu/srp/ COMMENT= client programs using Secure Remote Password protocol -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+= gmp>=2.0.2:../../devel/gmp CRYPTO= yes diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 19313cc574f..854df3daa46 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/17 17:50:12 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/03/27 03:20:16 hubertf Exp $ # DISTNAME= stunnel-3.13 @@ -9,7 +9,7 @@ MAINTAINER= martin@NetBSD.ORG HOMEPAGE= http://www.stunnel.org/ COMMENT= Universal SSL tunnel -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= pth>=1.3.5:../../devel/pth USE_SSL= # defined diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 10872442332..0f559dfcde8 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/03/04 03:26:52 assar Exp $ +# $NetBSD: Makefile,v 1.34 2001/03/27 03:20:16 hubertf Exp $ # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp # @@ -14,7 +14,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.courtesan.com/sudo/ COMMENT= Allow others to run commands as root -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf .include "../../mk/bsd.prefs.mk" 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 <david@maxwell.net> 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 diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile index 27cb92897f5..f05c4c436db 100644 --- a/textproc/docbook/Makefile +++ b/textproc/docbook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:16 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:18 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp # @@ -16,7 +16,7 @@ MAINTAINER= rh@NetBSD.ORG HOMEPAGE= http://www.ora.com/davenport/ COMMENT= SGML DTD designed for computer documentation -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip DEPENDS+= iso8879-1986:../../textproc/iso8879 NO_MTREE= yes diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile index 3d4b7236b71..7952330a804 100644 --- a/textproc/dsssl-docbook-modular/Makefile +++ b/textproc/dsssl-docbook-modular/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/25 04:18:16 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 2001/03/27 03:20:19 hubertf Exp $ # FreeBSD Id: Makefile,v 1.17 1999/04/24 09:25:32 kuriyama Exp DISTNAME= db157 @@ -11,7 +11,7 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://nwalsh.com/docbook/dsssl/ COMMENT= DSSSL stylesheets for the DocBook DTD by Norman Walsh -BUILD_DEPENDS= unzip:../../archivers/unzip +BUILD_DEPENDS= unzip-*:../../archivers/unzip DEPENDS+= docbook>=4.0:../../textproc/docbook EXTRACT_CMD= unzip ${DOWNLOADED_DISTFILE} diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile index 3a81316af4c..4b90f8f8018 100644 --- a/textproc/eperl/Makefile +++ b/textproc/eperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 17:37:23 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:19 hubertf Exp $ # DISTNAME= eperl-2.2.14 @@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.engelschall.com/sw/eperl/ COMMENT= Interpreter/preprocessor for Perl embedded in text documents -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS= libperl-5.*:../../lang/libperl USE_PERL5= # defined diff --git a/textproc/kdoc/Makefile b/textproc/kdoc/Makefile index 9654b9519d9..e101e79539b 100644 --- a/textproc/kdoc/Makefile +++ b/textproc/kdoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 17:37:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:19 hubertf Exp $ # DISTNAME= kdoc-2.0.1b @@ -13,7 +13,7 @@ MAINTAINER= wulf@netbsd.org HOMEPAGE= http://www.kde.org/ COMMENT= C++ and IDL Class Documentation Tool -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf USE_PERL5= yes USE_GMAKE= yes diff --git a/time/kworldwatch/Makefile b/time/kworldwatch/Makefile index dc0d5cbaf59..dadbdc6022b 100644 --- a/time/kworldwatch/Makefile +++ b/time/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:32:05 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:19 hubertf Exp $ # DISTNAME= kworldwatch-0.6 @@ -9,7 +9,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= hubertf@netbsd.org COMMENT= Revolving world map indicating the time in each part of the world -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= kdebase-1.1.2:../../x11/kdebase CONFLICTS+= kdetoys-* diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile index 291f37ba799..850cc2d3f1a 100644 --- a/wm/afterstep/Makefile +++ b/wm/afterstep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/03/11 19:58:58 fredb Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:19 hubertf Exp $ DISTNAME= AfterStep-1.8.8 PKGNAME= afterstep-1.8.8 @@ -11,7 +11,7 @@ MAINTAINER= fb@enteract.com HOMEPAGE= http://www.afterstep.org/ COMMENT= NeXT-like window manager for X11 -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png>1.0.9:../../graphics/png DEPENDS+= rplay>=3.3.2:../../audio/rplay diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 68c66863ab2..85e806586b6 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/03/11 16:59:03 mjl Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:20 hubertf Exp $ DISTNAME= WindowMaker-0.64.0 PKGNAME= windowmaker-0.64.0 @@ -11,8 +11,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.windowmaker.org/ COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= gettextize:../../devel/gettext +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_USES_MSGFMT= yes DEPENDS+= libproplist-0.10.*:../../devel/libproplist DEPENDS+= libungif-*:../../graphics/libungif DEPENDS+= jpeg-6b:../../graphics/jpeg diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile index fb51b1934a1..a9e5b22ca97 100644 --- a/www/ap-auth-cookie/Makefile +++ b/www/ap-auth-cookie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/17 17:21:43 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/03/27 03:20:20 hubertf Exp $ # # There are a few more mod_auth_cookie's out there doing slightly # different things. This one pkg would be a good place to dump them all in @@ -17,7 +17,7 @@ COMMENT= Cookie-based authentication for Apache DEPENDS+= apache-1.3.*:../../www/apache # For "apxs": -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 EXTRACT_CMD= ${DO_NADA} diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile index e96d21a381b..5a36b3cde80 100644 --- a/www/ap-auth-ldap/Makefile +++ b/www/ap-auth-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 17:21:44 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:20 hubertf Exp $ DISTNAME= auth_ldap-1.5.2 PKGNAME= ap-auth-ldap-1.5.2 @@ -13,7 +13,7 @@ DEPENDS+= apache-1.3.*:../../www/apache DEPENDS+= openldap-1.2.*:../../databases/openldap # For "apxs": -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 do-build: @cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -c \ diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile index 9bd22e1d311..553c7fbde78 100644 --- a/www/ap-auth-postgresql/Makefile +++ b/www/ap-auth-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 17:21:45 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:21 hubertf Exp $ DISTNAME= AuthPG-1.2b2 PKGNAME= ap-auth-postgresql-1.2b2 @@ -12,7 +12,7 @@ COMMENT= Module to allow apache authentication against a Postgresql database DEPENDS+= apache-1.3.*:../../www/apache DEPENDS+= postgresql-*:../../databases/postgresql # For "apxs": -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 CPPFLAGS+= -I${LOCALBASE}/include/pgsql LIBS= -lpq -lcrypt diff --git a/www/ap-csacek/Makefile b/www/ap-csacek/Makefile index 9524d1b4250..855f1a70b17 100644 --- a/www/ap-csacek/Makefile +++ b/www/ap-csacek/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 17:21:46 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:21 hubertf Exp $ # DISTNAME= csacek-2.1.4 @@ -14,7 +14,7 @@ COMMENT= on-fly code set recoder DEPENDS+= apache*-1.3*:../../www/apache # For "apxs": -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 HAS_CONFIGURE= yes diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile index 1401fbb0cb9..928a4f59a0f 100644 --- a/www/ap-dtcl/Makefile +++ b/www/ap-dtcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:22 hubertf Exp $ +# $NetBSD: Makefile,v 1.11 2001/03/27 03:20:21 hubertf Exp $ DISTNAME= mod_dtcl-0.8.12 PKGNAME= ap-dtcl-0.8.12 @@ -13,7 +13,7 @@ COMMENT= Simple, fast Tcl server side scripting for apache DEPENDS+= apache-1.3.*:../../www/apache DEPENDS+= tcl>=8.3.2:../../lang/tcl # For "apxs": -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 INCLUDES= -I${PREFIX}/include/ LIBS= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -ltcl83 -lm diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile index 9097e9144a0..461bd5fccf5 100644 --- a/www/ap-fastcgi/Makefile +++ b/www/ap-fastcgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 17:21:48 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/03/27 03:20:22 hubertf Exp $ # DISTNAME= mod_fastcgi_2.2.10 @@ -12,7 +12,7 @@ COMMENT= New, improved CGI-like interface module for Apache DEPENDS+= apache-1.3.*:../../www/apache # For "apxs": -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 do-build: @cd ${WRKSRC} && ${PREFIX}/sbin/apxs -c -o mod_fastcgi.so *.c diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile index 8e7e834f1c7..cd9c4f6da18 100644 --- a/www/ap-jserv/Makefile +++ b/www/ap-jserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 17:21:49 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:22 hubertf Exp $ DISTNAME= ApacheJServ-1.1.2 PKGNAME= ap-jserv-1.1.2 @@ -13,7 +13,7 @@ DEPENDS+= apache>=1.3.9:../../www/apache # yes, this needs _exactly_ version 2.0 DEPENDS+= jsdk-2.0:../../www/jsdk20 # For "apxs": -BUILD_DEPENDS= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS= perl-5.*:../../lang/perl5 .include "../../mk/bsd.prefs.mk" diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile index ca2195357eb..a19f890ad51 100644 --- a/www/ap-php4/Makefile +++ b/www/ap-php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 17:21:52 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:22 hubertf Exp $ .include "../../www/php4/Makefile.common" @@ -12,7 +12,7 @@ DEPENDS+= php-${PHP_VERS}:../../www/php4 DEPENDS+= apache>=1.3:../../www/apache # For "apxs": -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 7ca78abc4d0..2255070379e 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2001/03/13 20:54:47 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2001/03/27 03:20:22 hubertf Exp $ DISTNAME= mod_ssl-2.8.1-1.3.19 PKGNAME= ap-ssl-2.8.1 @@ -11,7 +11,7 @@ COMMENT= SSL/TLS protocols module for Apache DEPENDS+= apache-1.3.19:../../www/apache # For "apxs": -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 CONFLICTS= apache-1.3.[0-9] apache-*modssl-* apache6-* diff --git a/www/arena/Makefile b/www/arena/Makefile index ed5e150639b..c30a957066f 100644 --- a/www/arena/Makefile +++ b/www/arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/03/04 09:06:19 tron Exp $ +# $NetBSD: Makefile,v 1.33 2001/03/27 03:20:22 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp # @@ -11,8 +11,9 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.yggdrasil.com/Products/Arena/ COMMENT= Experimental HTML 3 browser, supports math and style sheets -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_USES_MSGFMT= yes + DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= libwww>=5.2.8:../../www/libwww DEPENDS+= png>1.0.9:../../graphics/png diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 168eec8a5d0..d683f67205e 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/02/22 14:57:41 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/03/27 03:20:23 hubertf Exp $ # DISTNAME= bluefish-0.6 @@ -15,8 +15,9 @@ MAINTAINER= wulf@ping.net.au HOMEPAGE= http://bluefish.openoffice.nl/ COMMENT= GTK HTML editor for the experienced web designer -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_USES_MSGFMT= yes + DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= imlib-*:../../graphics/imlib DEPENDS+= weblint-*:../../www/weblint diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile index d7ffda3d22a..1b45ab49b8f 100644 --- a/www/cgilib/Makefile +++ b/www/cgilib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:00 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/03/27 03:20:23 hubertf Exp $ # DISTNAME= cgilib-0.5 @@ -9,6 +9,6 @@ MAINTAINER= wulf@ping.net.au HOMEPAGE= http://www.infodrom.north.de/cgilib/ COMMENT= Common gateway interface library -BUILD_DEPENDS+= rman:../../textproc/rman +BUILD_DEPENDS+= rman-3.0.9:../../textproc/rman .include "../../mk/bsd.pkg.mk" diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile index 5f85f7c28ef..1db36e8e16c 100644 --- a/www/jsdk20/Makefile +++ b/www/jsdk20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:23 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:23 hubertf Exp $ # STOP! Don't update this to a later version of this software. # The JSDK and Apache Jakarta projects have merged, making the # jakarta-tomcat package the current version of this software. @@ -15,7 +15,7 @@ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://java.sun.com/products/servlet/index.html COMMENT= Sun's Java Servlet Development Kit, version 2.0 -BUILD_DEPENDS+= ${LOCALBASE}/bin/urlget:../../www/urlget +BUILD_DEPENDS+= urlget-1.3:../../www/urlget LICENSE= sun-jsdk20-license USE_JAVA= yes diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 01d59e1b5f0..916f1f24902 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/02/17 17:22:12 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:23 hubertf Exp $ # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp # @@ -12,7 +12,7 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.w3.org/Library/ COMMENT= The W3C Reference Library -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 5dfaba4f337..dd31a05e143 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/03/27 02:58:39 fredb Exp $ +# $NetBSD: Makefile,v 1.31 2001/03/27 03:20:24 hubertf Exp $ # DISTNAME= lynx2.8.4dev.19 @@ -13,7 +13,7 @@ MAINTAINER= fredb@netbsd.org HOMEPAGE= http://lynx.browser.org/ COMMENT= Alphanumeric display oriented World-Wide Web Client -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes WRKSRC= ${WRKDIR}/lynx2-8-4 diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 6f697947739..d8220c450b8 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/02/17 17:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2001/03/27 03:20:23 hubertf Exp $ # DISTNAME= lynx2.8.3rel.1 @@ -28,7 +28,7 @@ MAINTAINER= fb@enteract.com HOMEPAGE= http://lynx.browser.org/ COMMENT= Alphanumeric display oriented World-Wide Web Client -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_LIBINTL= yes diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 48f1718298b..b7e52296b85 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2001/03/04 09:06:20 tron Exp $ +# $NetBSD: Makefile,v 1.59 2001/03/27 03:20:24 hubertf Exp $ MOZ_VER= 0.8 DISTNAME= mozilla-source-${MOZ_VER} @@ -13,9 +13,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.mozilla.org/ COMMENT= The open-source version of the Netscape browser -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf -BUILD_DEPENDS+= zip:../../archivers/zip +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= zip-2.3:../../archivers/zip DEPENDS+= gtk+>=1.2.8:../../x11/gtk DEPENDS+= ORBit>=0.5.3:../../net/ORBit DEPENDS+= jpeg-6b:../../graphics/jpeg diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index b4221e2829e..292d5f20781 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2001/03/10 22:31:57 kei Exp $ +# $NetBSD: Makefile.common,v 1.32 2001/03/27 03:20:24 hubertf Exp $ # # Common include file for communicator and navigator packages @@ -86,7 +86,7 @@ WRKSRC= ${WRKDIR} MASTER_SITES= ftp://ftp.linuxppc.org/linuxppc-halloween/software/ EXTRACT_SUFX= .rpm HOMEPAGE= http://linuxppc.org/software/index/linuxppc_stable/software/netscape-4.7-3.ppc.html -BUILD_DEPENDS= ${RPM2PKG}:../../pkgtools/rpm2pkg +BUILD_DEPENDS= rpm2pkg-1.2:../../pkgtools/rpm2pkg DESCR_SRC= ${WRKDIR}/DESCR.linux-powerpc PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC EMULSUBDIR= emul/linux diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile index d8291461332..89ecf92bcc9 100644 --- a/www/p5-URI/Makefile +++ b/www/p5-URI/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/03/21 17:15:33 mjl Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:24 hubertf Exp $ # DISTNAME= URI-1.11 @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=URI/} MAINTAINER= packages@netbsd.org COMMENT= Perl5 class to represent Uniform Resource Identifier (URI, RFC 2396) -BUILD_DEPENDS= ${PERL5_SITEARCH}/auto/MIME/Base64/.packlist:../../converters/p5-MIME-Base64 +BUILD_DEPENDS= p5-MIME-Base64-2.12:../../converters/p5-MIME-Base64 CONFLICTS+= p5-libwww-5.36 # URI used to be part of that package diff --git a/www/php3/Makefile b/www/php3/Makefile index 66555871da8..8a572fb6c35 100644 --- a/www/php3/Makefile +++ b/www/php3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/02/25 04:18:23 hubertf Exp $ +# $NetBSD: Makefile,v 1.23 2001/03/27 03:20:25 hubertf Exp $ # DISTNAME= php-${PHP_VERSION} @@ -11,7 +11,7 @@ MAINTAINER= cjs@netbsd.org HOMEPAGE= http://www.php.net/ COMMENT= PHP3 HTML-embedded programming language with database connectivity -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 DEPENDS+= gdbm>=1.7.3:../../databases/gdbm .include "../../mk/bsd.prefs.mk" diff --git a/www/php4-imap/Makefile b/www/php4-imap/Makefile index 4dd3fbb4562..2ac4725fe5c 100644 --- a/www/php4-imap/Makefile +++ b/www/php4-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/03/14 00:10:00 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:25 hubertf Exp $ .include "../../www/php4/Makefile.module" @@ -8,10 +8,7 @@ PHP_PKG_VERS= nb2 COMMENT= PHP4 extension for IMAP (Internet Mailbox Access Protocol) -# We want something like: -# BUILD_DEPENDS+= imap-uw>=2000.0.3nb1:../../mail/imap-uw -# -BUILD_DEPENDS+= ${CCLIENT_PIC_LIB}:../../mail/imap-uw +BUILD_DEPENDS+= imap-uw>=2000.0.3nb1:../../mail/imap-uw CCLIENT_PIC_LIB= ${LOCALBASE}/lib/libc-client_pic.a diff --git a/www/squid/Makefile b/www/squid/Makefile index 00885024e26..cc1fb6b211f 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2001/02/25 04:18:24 hubertf Exp $ +# $NetBSD: Makefile,v 1.43 2001/03/27 03:20:25 hubertf Exp $ DISTNAME= squid-2.3.STABLE4-src PKGNAME= squid-2.3s4nb3 @@ -24,7 +24,7 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.squid-cache.org/ COMMENT= Post-Harvest_cached WWW proxy cache and accelerator -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --sysconfdir=/etc \ diff --git a/x11/9term/Makefile b/x11/9term/Makefile index 2933723410f..fcd0aeb73d4 100644 --- a/x11/9term/Makefile +++ b/x11/9term/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:06:11 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/03/27 03:20:25 hubertf Exp $ # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp # @@ -11,9 +11,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.psrg.cs.usyd.edu.au/~matty/9term/index.html COMMENT= X11 program which emulates a plan9 window -# needs library and private header, but not during runtime -BUILD_DEPENDS= ${BUILD_ROOT}/editors/sam/${WRKDIR:T}/libframe/libframe.a:../../editors/sam:all - USE_X11= yes NOT_FOR_PLATFORM= *-*-alpha #LP64 Problems @@ -22,4 +19,13 @@ MANCOMPRESSED= yes NO_WRKSUBDIR= yes MAKE_ENV+= WRKDIR=${WRKDIR} PKGSRCDIR=${PKGSRCDIR} +pre-configure: + if [ ! -e ${BUILD_ROOT}/editors/sam/${WRKDIR:T}/libframe/libframe.a ]; then \ + cd ../../editors/sam && ${MAKE} all; \ + fi + +pre-clean: + cd ../../editors/sam && ${MAKE} clean + + .include "../../mk/bsd.pkg.mk" diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile index d6f3c9e008f..18a778af783 100644 --- a/x11/XF86Setup/Makefile +++ b/x11/XF86Setup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/17 17:06:12 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2001/03/27 03:20:25 hubertf Exp $ DISTNAME= XF86Setup-3.3.6 CATEGORIES= x11 @@ -9,8 +9,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.xfree86.org/ COMMENT= Graphical configuration tool for XFree86 -BUILD_DEPENDS= ${TCLLIB}:../../lang/tcl -BUILD_DEPENDS+= ${TKLIB}:../../x11/tk +BUILD_DEPENDS= tcl-8.3.2nb1:../../lang/tcl +BUILD_DEPENDS+= tk-8.3.2:../../x11/tk ONLY_FOR_PLATFORM= *-*-i386 diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index 98935bf3267..ba0ab59b1a5 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/02/17 17:06:16 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:26 hubertf Exp $ DISTNAME= control-center-1.2.2 CATEGORIES= x11 gnome @@ -10,7 +10,7 @@ COMMENT= GNOME control-center development library DEPENDS+= gnome-libs>=1.2.0:../../x11/gnome-libs DEPENDS+= gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_X11BASE= # defined USE_GMAKE= # defined diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 32bef71f005..1e80138eee2 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:06:23 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:26 hubertf Exp $ # DISTNAME= gnome-applets-1.2.2 @@ -9,8 +9,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Applets for GNOME -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+= gnome-core>=1.2.1:../../x11/gnome-core DEPENDS+= libgtop>=1.0.0:../../devel/libgtop diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index a699f053798..7f65a54ee31 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2001/02/26 20:19:50 tron Exp $ +# $NetBSD: Makefile,v 1.60 2001/03/27 03:20:26 hubertf Exp $ DISTNAME= gnome-core-1.2.4 CATEGORIES= x11 gnome @@ -12,7 +12,7 @@ DEPENDS+= gdk-pixbuf-gnome>=0.9.0nb1:../../graphics/gdk-pixbuf-gnome DEPENDS+= libghttp>=1.0.4:../../www/libghttp DEPENDS+= libxml-*:../../textproc/libxml DEPENDS+= xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_LIBINTL= YES USE_X11BASE= YES diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 0b1ee68ea27..2f1713b77b7 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2001/02/25 04:18:26 hubertf Exp $ +# $NetBSD: Makefile,v 1.59 2001/03/27 03:20:26 hubertf Exp $ DISTNAME= gnome-libs-1.2.8 CATEGORIES= x11 gnome @@ -12,7 +12,7 @@ DEPENDS+= ORBit-*:../../net/ORBit DEPENDS+= esound>=0.2.18:../../audio/esound DEPENDS+= gtk+>=1.2.7:../gtk DEPENDS+= imlib-*:../../graphics/imlib -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes USE_LIBINTL= YES USE_X11BASE= YES diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile index b6285206ec8..91cd162c58d 100644 --- a/x11/gtk--/Makefile +++ b/x11/gtk--/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/02/17 17:06:27 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:27 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp # @@ -12,7 +12,7 @@ MAINTAINER= bsieker@freenet.de HOMEPAGE= http://gtkmm.sourceforge.net/ COMMENT= C++ wrapper for the gimp toolkit (gtk++) -BUILD_DEPENDS+= gm4:../../devel/m4 +BUILD_DEPENDS+= m4-1.4:../../devel/m4 DEPENDS+= gtk+>=1.2.7:../../x11/gtk DEPENDS+= libsigc++>=1.0.1:../../devel/libsigc++ diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 1dc7f2ebdf3..99c8137d744 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2001/03/10 10:50:37 drochner Exp $ +# $NetBSD: Makefile,v 1.53 2001/03/27 03:20:26 hubertf Exp $ DISTNAME= gtk+-1.2.9 CATEGORIES= x11 @@ -12,8 +12,8 @@ HOMEPAGE= http://www.gtk.org/ COMMENT= Gimp toolkit. Libraries for building X11 user interfaces DEPENDS+= glib>=1.2.9:../../devel/glib -BUILD_DEPENDS+= ${PERL5}:../../lang/perl5-base -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_DEPENDS+= perl-5.*:../../lang/perl5 +BUILD_USES_MSGFMT= yes USE_LIBINTL= yes USE_LIBTOOL= yes diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 71dd70d09c9..f43452c1ca8 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2001/03/20 00:20:41 fredb Exp $ +# $NetBSD: Makefile,v 1.79 2001/03/27 03:20:27 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -13,7 +13,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.kde.org/ COMMENT= Base modules for the KDE integrated X11 desktop -BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs # kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase # often do, so put the dependency here. diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 3b02a3cab86..2c9f3914cc8 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/03/26 02:38:32 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:27 hubertf Exp $ DISTNAME= kdebase-2.1 CATEGORIES= x11 kde @@ -7,8 +7,8 @@ COMMENT= Base modules for the KDE 2 integrated X11 desktop DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README -BUILD_DEPENDS+= ${LOCALBASE}/bin/automake:../../devel/automake -BUILD_DEPENDS+= ${QT2DIR}/qt2/bin/uic:../../x11/qt2-designer +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_DEPENDS+= qt2-designer-2.2.4:../../x11/qt2-designer DEPENDS+= kdelibs-2.1:../../x11/kdelibs2 USE_XPM= yes diff --git a/x11/kdelibdocs/Makefile b/x11/kdelibdocs/Makefile index 6d744fb1039..d1ab3611c18 100644 --- a/x11/kdelibdocs/Makefile +++ b/x11/kdelibdocs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/03/04 08:45:14 tron Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:27 hubertf Exp $ # DISTNAME= kdelibdocs_kdoc2-1.1 @@ -10,7 +10,8 @@ MAINTAINER= wulf@netbsd.org HOMEPAGE= http://www.kdevelop.org/ COMMENT= KDE library documentation -BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= kdelibs-1.*:../../x11/kdelibs USE_X11BASE= yes diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index 1adea902fb3..18e4a2f7bf2 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/02/17 17:06:34 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:27 hubertf Exp $ # DISTNAME= khostchooser-0.3 @@ -9,7 +9,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= root@garbled.net COMMENT= KDE Chooser replacement for X -BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs DEPENDS+= libungif-*:../../graphics/libungif diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common index 035a0ebdd0d..a865b28a582 100644 --- a/x11/lesstif/Makefile.common +++ b/x11/lesstif/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2001/03/11 04:32:16 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.7 2001/03/27 03:20:28 hubertf Exp $ DISTNAME= lesstif-${LESSTIF_VERSION} LESSTIF_VERSION= 0.92.6 @@ -15,8 +15,8 @@ HOMEPAGE= http://www.lesstif.org/ CONFLICTS+= openmotif-[0-9]* -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 USE_X11BASE= # defined USE_GMAKE= # defined diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index f44652101ac..8521052c67c 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/02/17 17:06:37 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2001/03/27 03:20:28 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp # @@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Tk/pod/overview.html COMMENT= perl5 interface to Tk-8.0.5 -BUILD_DEPENDS= ${PERL5_SITEARCH}/auto/HTML/Parser/.packlist:../../www/p5-HTML-Parser +BUILD_DEPENDS= p5-HTML-Parser-3.19:../../www/p5-HTML-Parser DEPENDS+= tk-8.3.2:../../x11/tk USE_X11= # defined diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common index 8c7dfa16b20..fe3db85d3e5 100644 --- a/x11/qt2-libs/Makefile.common +++ b/x11/qt2-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2001/03/24 21:14:40 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.8 2001/03/27 03:20:28 hubertf Exp $ # DISTNAME= qt-x11-${QTVERSION} @@ -33,7 +33,7 @@ PATCHDIR= ${PKGSRCDIR}/x11/qt2-libs/patches .if ${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_ARGS+=-platform solaris-g++ .endif diff --git a/x11/swing/Makefile b/x11/swing/Makefile index bf065e69e42..6b85931b13e 100644 --- a/x11/swing/Makefile +++ b/x11/swing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:27 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:28 hubertf Exp $ DISTNAME= swing1_1_1 PKGNAME= swing-1.1.1 @@ -10,7 +10,7 @@ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://www.javasoft.com/products/jfc/ COMMENT= Sun's Java Foundation Classes (the Swing UI toolkit), version 1.1.1 -BUILD_DEPENDS+= ${LOCALBASE}/bin/urlget:../../www/urlget +BUILD_DEPENDS+= urlget-1.3:../../www/urlget RESTRICTED= "Read license before redistributing the Java(tm) Foundation Classes" NO_SRC_ON_FTP= ${RESTRICTED} diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index f23747edfa4..f7a0ee83051 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/02/17 17:07:06 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2001/03/27 03:20:28 hubertf Exp $ DISTNAME= xfce-3.6.3 CATEGORIES= x11 @@ -8,7 +8,8 @@ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://www.xfce.org/ COMMENT= Lightweight desktop environment with a look and feel similar to CDE -BUILD_DEPENDS+= msgfmt:../../devel/gettext +BUILD_USES_MSGFMT= yes + DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= imlib-1.9.*:../../graphics/imlib |