diff options
| author | agc <agc@pkgsrc.org> | 1998-04-22 14:22:39 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1998-04-22 14:22:39 +0000 |
| commit | 1f4495b33e4a8e2f4279f07f1dc90e949537c6bd (patch) | |
| tree | 1fa1007997976767bf1737186cbaead81fd8476f | |
| parent | ff3e48e78cd4eedbe7651bdd59c94a81ab8c9cd5 (diff) | |
| download | pkgsrc-1f4495b33e4a8e2f4279f07f1dc90e949537c6bd.tar.gz | |
Remove the old deprecated DEPENDS definition from bsd.pkg.mk.
Implement a new DEPENDS definition, which looks for an installed
package, building it if not present, and use it in preference to
LIB_DEPENDS. This should make the package collection more useful on
NetBSD ELF ports.
66 files changed, 209 insertions, 230 deletions
diff --git a/audio/cam/Makefile b/audio/cam/Makefile index 30bc10793d4..1007cbb6cf5 100644 --- a/audio/cam/Makefile +++ b/audio/cam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:19 frueauf Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:39 agc Exp $ # DISTNAME= cam-1.02 @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org -BUILD_DEPENDS= ${PREFIX}/lib/libncurses.a:${PORTSDIR}/devel/ncurses +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses MAN1= cam.1 diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index d6e65fbe7ef..506f73a2101 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:10 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:39 agc Exp $ # DISTNAME= mikmod-2.14-unix @@ -8,7 +8,7 @@ MASTER_SITES= http://www.chiark.greenend.org.uk/~stevem/mikmod/ MAINTAINER= mycroft@NetBSD.ORG -LIB_DEPENDS= ncurses.3.4:${PORTSDIR}/devel/ncurses +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses RESTRICTED= "Registration required for redistribution and commercial use." MIRROR_DISTFILE= no diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index ce107eb0cf6..7f9db745c0d 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/22 11:05:02 agc Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:39 agc Exp $ # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp # @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.sdsu.edu/pub/rplay/ MAINTAINER= rmallory@csusb.edu -LIB_DEPENDS= gsm.1.0:${PORTSDIR}/audio/gsm +DEPENDS+= gsm-1.0.10:../../audio/gsm HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=${PREFIX}" diff --git a/audio/snd/Makefile b/audio/snd/Makefile index 9e6eb5cf270..9d7907ec801 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $ +# $NetBSD: Makefile,v 1.4 1998/04/22 14:22:40 agc Exp $ # DISTNAME= snd @@ -9,8 +9,8 @@ MASTER_SITES= ftp://ccrma-ftp.stanford.edu/pub/Lisp/ MAINTAINER= hubertf@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm \ - Xm.0.:${PORTSDIR}/x11/lesstif +DEPENDS+= xpm-3.4j:../../graphics/xpm +BUILD_DEPENDS+= ${X11BASE}/include/Xm:${PORTSDIR}/x11/lesstif USE_X11= YES REQUIRES_MOTIF= YES diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 04fa1d91ee0..65a24a27928 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:11 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:40 agc Exp $ # DISTNAME= timidity-0.2i @@ -10,10 +10,10 @@ DISTFILES= ${TIINS} ${DISTNAME}.tar.gz MAINTAINER= mycroft@NetBSD.ORG -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ - wish8.0:${PORTSDIR}/x11/tk80 +BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 -LIB_DEPENDS= ncurses.3.4:${PORTSDIR}/devel/ncurses +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses +DEPENDS+= tk-8.0p2:../../x11/tk80 NO_CDROM= "Uses copyrighted patches" diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile index 89a1a0eb7c7..f41a766b45d 100644 --- a/audio/xcd/Makefile +++ b/audio/xcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:20 frueauf Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:40 agc Exp $ # FreeBSD Id: Makefile,v 1.18 1997/10/08 13:10:20 jmz Exp # @@ -9,6 +9,7 @@ MASTER_SITES= ftp://ftp.obs-besancon.fr/pub/outgoing/ MAINTAINER= packages@netbsd.org RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 WRKSRC= ${WRKDIR}/xcd MAN1= cdplayer.1 xcd.1 diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile index e8cb3026b4f..9d758833980 100644 --- a/converters/uudeview/Makefile +++ b/converters/uudeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:21 frueauf Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:40 agc Exp $ # FreeBSD Id: Makefile,v 1.15 1998/02/18 22:19:58 hoek Exp # @@ -9,7 +9,7 @@ MASTER_SITES= http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= uu.1.:${PORTSDIR}/converters/uulib +DEPENDS+= uulib-0.5.13:../../converters/uulib GNU_CONFIGURE= Yes CONFIGURE_ARGS= --enable-inews=inews --disable-tcl diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 51893af2497..fef8d252aa9 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:21 frueauf Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:40 agc Exp $ # FreeBSD Id: Makefile,v 1.11 1998/02/24 21:43:45 jseger Exp # @@ -10,8 +10,8 @@ MASTER_SITES= http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= tk80.1.:${PORTSDIR}/x11/tk80 \ - uu.1.:${PORTSDIR}/converters/uulib +DEPENDS+= tk-8.0p2:../../x11/tk80 +DEPENDS+= uulib-0.5.13:../../converters/uulib GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-tcl="${PREFIX}" --enable-tk="${PREFIX}" diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 9ecef15368e..51c1e33c916 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:22 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:40 agc Exp $ # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp DISTNAME= postgresql-6.2.1 @@ -9,8 +9,8 @@ MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/ \ MAINTAINER= packages@netbsd.org MAKE_ENV+= USE_TCL=true -LIB_DEPENDS+= tcl80.1.:${PORTSDIR}/lang/tcl80 \ - tk80.1.:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 +DEPENDS+= tcl-8.0p2:../../lang/tcl80 NO_PACKAGE= "Requires pgsql uid" WRKSRC= ${WRKDIR}/${DISTNAME}/src diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile index e56156f8714..41e9706abad 100644 --- a/devel/tkcvs/Makefile +++ b/devel/tkcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:21 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:41 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:24 jseger Exp # @@ -9,7 +9,7 @@ MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \ MAINTAINER= shanee@augusta.de -LIB_DEPENDS= tk80.1.:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 NO_BUILD= yes MAN1= tkcvs.1 tkdiff.1 diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile index 916d5386107..17a3ebab613 100644 --- a/editors/xemacs20/Makefile +++ b/editors/xemacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 1998/04/15 10:38:23 agc Exp $ +# $NetBSD: Makefile,v 1.21 1998/04/22 14:22:41 agc Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp # @@ -23,10 +23,10 @@ MAINTAINER= agc@netbsd.org WITH_SOUND= .endif -LIB_DEPENDS= Xaw3d.6.:${PORTSDIR}/x11/Xaw3d \ - Xpm.4.:${PORTSDIR}/graphics/xpm \ - jpeg.7.:${PORTSDIR}/graphics/jpeg \ - png.0.:${PORTSDIR}/graphics/png +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= Xaw3d-1.3:../../x11/Xaw3d +DEPENDS+= png-0.96:../../graphics/png HAS_CONFIGURE= yes diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 91a97f8017c..80f609b147b 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:24 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:41 agc Exp $ # DISTNAME= xmame-0.30.1_src @@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= mycroft@NetBSD.ORG RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm WRKSRC= ${WRKDIR}/xmame-0.30.1 USE_X11= yes diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile index b69911425f3..9190f1fbc3b 100644 --- a/games/kdegames/Makefile +++ b/games/kdegames/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/04/20 11:56:23 frueauf Exp $ +# $NetBSD: Makefile,v 1.10 1998/04/22 14:22:41 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp # @@ -13,15 +13,10 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= packages@netbsd.org BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt -LIB_DEPENDS= qt.1.3[0-9]:${PORTSDIR}/x11/qt \ - gif.[23].:${PORTSDIR}/graphics/giflib \ - jpeg.[67].:${PORTSDIR}/graphics/jpeg \ - kdecore.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kdeui.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - jscript.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - khtmlw.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kfm.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - mediatool.0.9[0-9]:${PORTSDIR}/x11/kdelibs +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= qt-1.33:../../x11/qt +DEPENDS+= kdelibs-3.1b:../../x11/kdelibs +DEPENDS+= giflib-3.0:../../graphics/giflib RUN_DEPENDS= kappfinder:${PORTSDIR}/x11/kdebase USE_X11= yes diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile index 17033a2a020..4716283e7cc 100644 --- a/games/xdemineur/Makefile +++ b/games/xdemineur/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:24 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:41 agc Exp $ # DISTNAME= xdemineur-2.1 @@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= games MAINTAINER= bouyer@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm USE_IMAKE= yes diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index d258abaa05a..69771007657 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1998/04/15 22:21:17 tron Exp $ +# $NetBSD: Makefile,v 1.18 1998/04/22 14:22:41 agc Exp $ # DISTNAME= ImageMagick-4.0.5 @@ -7,10 +7,10 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= tron@netbsd.org -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - mpeg.1.2:${PORTSDIR}/graphics/mpeg-lib \ - png.0.:${PORTSDIR}/graphics/png \ - tiff.3.4:${PORTSDIR}/graphics/tiff +DEPENDS+= tiff-3.4:../../graphics/tiff +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= png-0.96:../../graphics/png +DEPENDS+= mpeg-1.2.1:../../graphics/mpeg-lib USE_IMAKE= yes XMKMF= ${MAKE_ENV} xmkmf -a diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index f595f89f437..1180892a727 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/04/17 09:37:24 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:41 agc Exp $ DISTNAME= gimp-0.99.26 CATEGORIES= graphics @@ -11,12 +11,12 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= bsieker@techfak.uni-bielefeld.de -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - mpeg.1.2:${PORTSDIR}/graphics/mpeg-lib \ - png.0.96:${PORTSDIR}/graphics/png \ - tiff.3.4:${PORTSDIR}/graphics/tiff \ - gtk.1.0:${PORTSDIR}/x11/gtk \ - Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= tiff-3.4:../../graphics/tiff +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= png-0.96:../../graphics/png +DEPENDS+= mpeg-1.2.1:../../graphics/mpeg-lib +DEPENDS+= gtk+-1.0.0:../../x11/gtk USE_X11= yes GNU_CONFIGURE= yes diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index ffad607dda6..00287efe192 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:26 agc Exp $ +# $NetBSD: Makefile,v 1.14 1998/04/22 14:22:43 agc Exp $ # DISTNAME= netpbm @@ -14,9 +14,9 @@ DISTFILES= netpbm-1mar1994.tar.gz \ MAINTAINER= tron@netbsd.org -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - png.0.96:${PORTSDIR}/graphics/png \ - tiff.3.:${PORTSDIR}/graphics/tiff +DEPENDS+= tiff-3.4:../../graphics/tiff +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= png-0.96:../../graphics/png WRKSRC= ${WRKDIR}/netpbm MAKE_ENV += PREFIX=${PREFIX} INSTALL_MAN="${INSTALL_MAN}" diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 6bd7f918a4f..1d04e944d1d 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:24 frueauf Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:43 agc Exp $ # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp # @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= applications/pixmap MAINTAINER= packages@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm WRKSRC= ${WRKDIR}/pixmap USE_IMAKE= yes diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 4445d1cc663..47f5fa6ed4d 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:27 agc Exp $ +# $NetBSD: Makefile,v 1.10 1998/04/22 14:22:43 agc Exp $ DISTNAME= tiff-v3.4beta037 PKGNAME= tiff-3.4 @@ -10,7 +10,7 @@ EXTRACT_SUFX= -tar.gz MAINTAINER= tron@netbsd.org -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg +DEPENDS+= jpeg-6a:../../graphics/jpeg MAN1= fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 \ rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 tiff2ps.1 tiffcmp.1 \ diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile index 271947a0ffb..d4f5c8930de 100644 --- a/graphics/xart/Makefile +++ b/graphics/xart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 1998/04/21 00:46:57 hubertf Exp $ +# $NetBSD: Makefile,v 1.2 1998/04/22 14:22:43 agc Exp $ # DISTNAME= xart19980415 @@ -9,10 +9,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - tiff.3.:${PORTSDIR}/graphics/tiff \ - Xpm.4.:${PORTSDIR}/graphics/xpm \ - png.0.:${PORTSDIR}/graphics/png +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= tiff-3.4:../../graphics/tiff +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= png-0.96:../../graphics/png WRKSRC= ${WRKDIR}/19980415 USE_IMAKE= yes diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index c52371f21f8..be23c9a54c7 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:24 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:44 agc Exp $ # FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp # @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= utilities MAINTAINER= packages@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm USE_IMAKE= yes USE_GMAKE= yes diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index ec5f6017efd..90abdf103e8 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:27 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:44 agc Exp $ # DISTNAME= xfig.3.2 @@ -11,9 +11,9 @@ MASTER_SITE_SUBDIR= applications/drawing_tools/xfig MAINTAINER= root@garbled.futureone.com RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - Xpm.4.:${PORTSDIR}/graphics/xpm \ - Xaw3d.6.:${PORTSDIR}/x11/Xaw3d +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= Xaw3d-1.3:../../x11/Xaw3d USE_IMAKE= yes diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 436e0cb9ceb..7e77c484707 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:24 frueauf Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:44 agc Exp $ # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp # @@ -8,10 +8,10 @@ MASTER_SITES= http://www.danbbs.dk/~torsten/xpaint/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - tiff.3.:${PORTSDIR}/graphics/tiff \ - Xpm.4.:${PORTSDIR}/graphics/xpm \ - png.0.:${PORTSDIR}/graphics/png +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= tiff-3.4:../../graphics/tiff +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= png-0.96:../../graphics/png WRKSRC= ${WRKDIR}/xpaint USE_IMAKE= yes diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 52772e0ba65..d0eac2f71a3 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:28 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:44 agc Exp $ # FreeBSD Id: Makefile,v 1.14 1997/07/03 07:37:08 asami Exp # @@ -15,8 +15,8 @@ PATCHFILES= xv-3.10a.JPEG-patch xv-3.10a.TIFF-patch # (for tiff3.4) MAINTAINER= packages@netbsd.org -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - tiff.3.4:${PORTSDIR}/graphics/tiff +DEPENDS+= tiff-3.4:../../graphics/tiff +DEPENDS+= jpeg-6a:../../graphics/jpeg USE_IMAKE= yes diff --git a/lang/expect/Makefile b/lang/expect/Makefile index eff0194ff97..0b31fce65ab 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/04/20 11:56:24 frueauf Exp $ +# $NetBSD: Makefile,v 1.10 1998/04/22 14:22:44 agc Exp $ # FreeBSD Id: Makefile,v 1.29 1998/01/27 01:11:47 fenner Exp # @@ -9,7 +9,7 @@ MASTER_SITES= http://expect.nist.gov/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 WRKSRC= ${WRKDIR}/expect-5.25 diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile index bb4d8e0e4e7..9cb51bcd7f6 100644 --- a/lang/tclX80/Makefile +++ b/lang/tclX80/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:30 agc Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/22 14:22:44 agc Exp $ # DISTNAME= tclX8.0.2 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/ MAINTAINER= tron@netbsd.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 WRKSRC= ${WRKDIR}/tclX8.0.2/unix GNU_CONFIGURE= yes diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 4ea30d8d0d6..6d94930d8e1 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/15 16:57:11 tron Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:44 agc Exp $ DISTNAME= mutt-0.91.1i CATEGORIES= mail @@ -10,7 +10,7 @@ MASTER_SITES= ftp://riemann.iam.uni-bonn.de/pub/mutt/ \ MAINTAINER= tron@netbsd.org -LIB_DEPENDS= ncurses.3.4:${PORTSDIR}/devel/ncurses +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses RESTRICTED= "Uses PGP" MIRROR_DISTFILE= no diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile index 2621ccf814e..d369764c59d 100644 --- a/mbone/imm/Makefile +++ b/mbone/imm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:32 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:45 agc Exp $ # # NetBSD "imm" package # The original was based on the imm-3.5a1 FreeBSD port maintained @@ -13,7 +13,7 @@ DISTFILES= imm36a1.tar.Z MAINTAINER= is@netbsd.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 ALL_TARGET= netbsd MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile index ba97fc8aa46..1cd7e6b2584 100644 --- a/mbone/nte/Makefile +++ b/mbone/nte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/15 10:59:10 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:45 agc Exp $ # DISTNAME= nt.1.5a23 @@ -11,8 +11,8 @@ MAINTAINER= mycroft@NetBSD.ORG TK_DIR= ${PORTSDIR}/x11/tk80 TK_SRC= ${TK_DIR}/${WRKDIR:T}/tk8.0 -DEPENDS= ${TK_DIR}:configure -LIB_DEPENDS= tk80:${TK_DIR} +BUILD_DEPENDS= ${PORTSDIR}/x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure +DEPENDS+= tk-8.0p2:../../x11/tk80 RESTRICTED= "Contains DES encryption" MIRROR_DISTFILE=no diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index f14c1a6bc81..c0b94d1e3e1 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:32 agc Exp $ +# $NetBSD: Makefile,v 1.4 1998/04/22 14:22:45 agc Exp $ # DISTNAME= rat-3.0 @@ -8,7 +8,7 @@ DISTFILES= rat-3.0.23.tar.gz MAINTAINER= mycroft@NetBSD.ORG -LIB_DEPENDS= tk80:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 RESTRICTED= "Contains DES encryption" MIRROR_DISTFILE=no diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile index 55096db040a..c91e49d04f3 100644 --- a/mbone/sdr/Makefile +++ b/mbone/sdr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:33 agc Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:45 agc Exp $ # FreeBSD Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp # @@ -9,7 +9,7 @@ MASTER_SITES= ftp://cs.ucl.ac.uk/mice/sdr/ MAINTAINER= is@netbsd.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 RESTRICTED= "Contains DES encryption" MIRROR_DISTFILE= no diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index 13891673d74..6b1faaceda7 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:33 agc Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:45 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp # @@ -16,8 +16,8 @@ GSM_WORK= ${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10 # we can use this first BUILD_DEPENDS and save some work. #BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build -LIB_DEPENDS= tk80:${PORTSDIR}/x11/tk80 -#LIB_DEPENDS+= gsm:${GSM_DIR} +DEPENDS+= tk-8.0p2:../../x11/tk80 +#DEPENDS+= gsm-1.0.10:${GSM_DIR} GNU_CONFIGURE= yes CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-gsm=${GSM_WORK} diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index c0db6323cac..9f482756277 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:33 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:45 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp # @@ -9,7 +9,7 @@ DISTFILES= vicsrc-2.8.tar.gz MAINTAINER= is@netbsd.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 GNU_CONFIGURE= yes USE_X11= yes diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index a27d7ed4962..a73c8b4ecba 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:34 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:45 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp # @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.imada.ou.dk/pub/dotfile/ MAINTAINER= oly@world.std.com -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 GNU_CONFIGURE= yes diff --git a/misc/ical/Makefile b/misc/ical/Makefile index b390ecac462..5dbd924de0f 100644 --- a/misc/ical/Makefile +++ b/misc/ical/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:27 frueauf Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:46 agc Exp $ # $FreeBSD Id: Makefile,v 1.15 1998/02/07 22:59:16 hoek Exp # @@ -8,7 +8,7 @@ MASTER_SITES= http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index 8f5cee9a6e8..bd90be24a10 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/04/20 11:56:27 frueauf Exp $ +# $NetBSD: Makefile,v 1.10 1998/04/22 14:22:46 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -13,15 +13,10 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= packages@netbsd.org BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt -LIB_DEPENDS= qt.1.3[0-9]:${PORTSDIR}/x11/qt \ - gif.[23].:${PORTSDIR}/graphics/giflib \ - jpeg.[67].:${PORTSDIR}/graphics/jpeg \ - kdecore.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kdeui.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - jscript.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - khtmlw.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kfm.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - mediatool.0.9[0-9]:${PORTSDIR}/x11/kdelibs +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= qt-1.33:../../x11/qt +DEPENDS+= kdelibs-3.1b:../../x11/kdelibs +DEPENDS+= giflib-3.0:../../graphics/giflib RUN_DEPENDS= kappfinder:${PORTSDIR}/x11/kdebase USE_X11= yes diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 542989063ab..45d47112248 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:28 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:46 agc Exp $ # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp # @@ -11,6 +11,8 @@ MAINTAINER= packages@netbsd.org GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-ncurses --without-edit --without-subshell +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses + MAN1= mc.1 mcedit.1 MAN8= mcserv.8 diff --git a/misc/most/Makefile b/misc/most/Makefile index ba3fc45ef5b..42e41f10632 100644 --- a/misc/most/Makefile +++ b/misc/most/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:36 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:46 agc Exp $ # FreeBSD Id: Makefile,v 1.2 1997/06/03 21:52:01 asami Exp # @@ -10,7 +10,7 @@ MASTER_SITES= ftp://space.mit.edu/pub/davis/most/ \ MAINTAINER= rhwang@bigpanda.com -LIB_DEPENDS= slang.0.99[0-9][0-9]:${PORTSDIR}/devel/libslang +DEPENDS+= libslang-0.99.38:../../devel/libslang GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/most diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile index 56a7de3d45b..3e1e8be4228 100644 --- a/misc/zorro/Makefile +++ b/misc/zorro/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:38 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:46 agc Exp $ # FreeBSD Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp # @@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/ MAINTAINER= shanee@augusta.de -LIB_DEPENDS= tk80.1.:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 NO_BUILD= yes diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9ab2b7cd029..a7fc274c60e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.72 1998/04/22 11:05:03 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.73 1998/04/22 14:22:46 agc Exp $ # # This file is derived from bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -196,9 +196,10 @@ NetBSD_MAINTAINER= agc@netbsd.org # No special backslashes are needed to escape regular # expression metacharacters in NetBSD, and the old backslash # escapes are recognised for backwards compatibility. -# DEPENDS - A list of other ports this package depends on being -# made first. Use this for things that don't fall into -# the above two categories. +# DEPENDS - A list of prerequisite packages. The format of this +# entry is "pkgname:dir". If the package is not +# installed, then it will be built and installed from the +# source package in "dir". # EXTRACT_CMD - Command for extracting archive (default: tar). # EXTRACT_SUFX - Suffix for archive names (default: .tar.gz). # EXTRACT_BEFORE_ARGS - @@ -1219,8 +1220,8 @@ do-build: do-install: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) @for f in ${INFO_FILES}; do \ - ${ECHO} "${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f"; \ - ${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f; \ + ${ECHO} "install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f.info"; \ + install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f.info; \ done .endif @@ -1553,7 +1554,7 @@ fetch-list: fetch-list-recursive: @${MAKE} fetch-list-one-pkg .if ${RECURSIVE_FETCH_LIST} != "NO" - @for dir in `${ECHO} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u` `${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u`; do \ + @for dir in `${ECHO} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${DEPENDS} ${RUN_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u` ; do \ (cd $$dir; ${MAKE} fetch-list-recursive; ); \ done .endif # ${RECURSIVE_FETCH_LIST} != "NO" @@ -1679,7 +1680,7 @@ package-path: .if !target(package-depends) package-depends: - @for dir in `${ECHO} ${LIB_DEPENDS} ${RUN_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u` `${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u`; do \ + @for dir in `${ECHO} ${LIB_DEPENDS} ${DEPENDS} ${RUN_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u`; do \ if [ -d $$dir ]; then \ (cd $$dir ; ${MAKE} package-name package-depends PACKAGE_NAME_AS_LINK=${PACKAGE_NAME_AS_LINK}); \ else \ @@ -1812,22 +1813,22 @@ lib-depends: misc-depends: .if defined(DEPENDS) .if !defined(NO_DEPENDS) - @for dir in ${DEPENDS}; do \ - if expr "$$dir" : '.*:' > /dev/null; then \ - target=`${ECHO} $$dir | ${SED} -e 's/.*://'`; \ - dir=`${ECHO} $$dir | ${SED} -e 's/:.*//'`; \ - else \ - target=${DEPENDS_TARGET}; \ - fi; \ - ${ECHO_MSG} "===> ${PKGNAME} depends on: $$dir"; \ - ${ECHO_MSG} "===> Verifying $$target for $$dir"; \ - if [ ! -d $$dir ]; then \ - ${ECHO_MSG} ">> No directory for $$dir. Skipping.."; \ - else \ - (cd $$dir; ${MAKE} ${.MAKEFLAGS} $$target) ; \ - fi \ + @for dir in ${DEPENDS}; do \ + package=`${ECHO} $$dir | ${SED} -e 's/:.*//'`; \ + dir=`${ECHO} $$dir | ${SED} -e 's/.*://'`; \ + if `pkg_info -e $$package`; then \ + ${ECHO_MSG} "===> ${PKGNAME} depends on: installed package $$package"; \ + else \ + ${ECHO_MSG} "===> ${PKGNAME} depends on: package $$package"; \ + target=${DEPENDS_TARGET}; \ + ${ECHO_MSG} "===> Verifying $$target for $$dir"; \ + if [ ! -d $$dir ]; then \ + ${ECHO_MSG} ">> No directory for $$dir. Skipping.."; \ + else \ + (cd $$dir; ${MAKE} ${.MAKEFLAGS} $$target); \ + fi \ + fi \ done - @${ECHO_MSG} "===> Returning to build of ${PKGNAME}" .endif .else @${DO_NADA} @@ -1838,15 +1839,8 @@ misc-depends: .if !target(clean-depends) clean-depends: .if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) \ - || defined(RUN_DEPENDS) - @for dir in `${ECHO} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u`; do \ - if [ -d $$dir ] ; then \ - (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean clean-depends); \ - fi \ - done -.endif -.if defined(DEPENDS) - @for dir in `${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u`; do \ + || defined(DEPENDS) || defined(RUN_DEPENDS) + @for dir in `${ECHO} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${DEPENDS} ${RUN_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u`; do \ if [ -d $$dir ] ; then \ (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean clean-depends); \ fi \ @@ -1856,7 +1850,7 @@ clean-depends: .if !target(depends-list) depends-list: - @for dir in `${ECHO} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u` `${ECHO} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | sort -u`; do \ + @for dir in `${ECHO} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | sort -u`; do \ (cd $$dir; ${MAKE} package-name depends-list PACKAGE_NAME_AS_LINK=${PACKAGE_NAME_AS_LINK}; ); \ done .endif diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index fad9d073976..7eb75e68435 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:29 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:47 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -14,17 +14,12 @@ MAINTAINER= packages@netbsd.org BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt \ ${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm -LIB_DEPENDS= qt.1.3[0-9]:${PORTSDIR}/x11/qt \ - gif.[23].:${PORTSDIR}/graphics/giflib \ - jpeg.[67].:${PORTSDIR}/graphics/jpeg \ - mimelib.1.:${PORTSDIR}/converters/kdesupport \ - uu.1.:${PORTSDIR}/converters/uulib \ - kdecore.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kdeui.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - jscript.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - khtmlw.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kfm.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - mediatool.0.9[0-9]:${PORTSDIR}/x11/kdelibs +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= qt-1.33:../../x11/qt +DEPENDS+= uulib-0.5.13:../../converters/uulib +DEPENDS+= kdelibs-3.1b:../../x11/kdelibs +DEPENDS+= giflib-3.0:../../graphics/giflib +DEPENDS+= kdesupport-3.1b:../../converters/kdesupport RUN_DEPENDS= kappfinder:${PORTSDIR}/x11/kdebase USE_X11= yes diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile index 61bfb562057..4af1bca40ff 100644 --- a/net/ncftp2/Makefile +++ b/net/ncftp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:30 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:47 agc Exp $ # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp # @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.ncftp.com/ncftp/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= ncurses.3.4:${PORTSDIR}/devel/ncurses +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-readline diff --git a/net/scotty/Makefile b/net/scotty/Makefile index c6688b9759c..70462113161 100644 --- a/net/scotty/Makefile +++ b/net/scotty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:30 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:47 agc Exp $ # FreeBSD Id: Makefile,v 1.21 1997/08/27 23:01:53 cwt Exp # @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= tk80.1.:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl-config=${PREFIX}/lib/tcl8.0 \ diff --git a/news/knews/Makefile b/news/knews/Makefile index 1a22013fbf0..35754d2a8a0 100644 --- a/news/knews/Makefile +++ b/news/knews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:41 agc Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:47 agc Exp $ # DISTNAME= knews-0.9.8 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.nada.kth.se/home/su95-kjo/knews/ \ MAINTAINER= tron@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm USE_IMAKE= yes WRKSRC= ${WRKDIR}/knews diff --git a/print/gv/Makefile b/print/gv/Makefile index 687fc1f769d..77795207e3d 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:32 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:47 agc Exp $ # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp # @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= Xaw3d.6.:${PORTSDIR}/x11/Xaw3d +DEPENDS+= Xaw3d-1.3:../../x11/Xaw3d RUN_DEPENDS= ${LOCALBASE}/bin/gs:${PORTSDIR}/print/ghostscript5 USE_IMAKE= yes diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 8ace8ce0600..06ba98f3214 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:46 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:47 agc Exp $ # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp # @@ -12,8 +12,8 @@ MAINTAINER= frueauf@netbsd.org BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX \ ispell:${PORTSDIR}/textproc/ispell -LIB_DEPENDS= xforms.0.:${PORTSDIR}/x11/xforms \ - Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= xforms-0.88:../../x11/xforms ONLY_FOR_ARCHS= arm32 i386 m68k sparc diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 9570987d8bf..f46acff7be8 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:46 agc Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/22 14:22:48 agc Exp $ # DISTNAME= transfig.3.2 @@ -10,8 +10,8 @@ MASTER_SITE_SUBDIR= applications/drawing_tools/transfig MAINTAINER= root@garbled.futureone.com -LIB_DEPENDS= jpeg.7.:${PORTSDIR}/graphics/jpeg \ - Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= jpeg-6a:../../graphics/jpeg USE_IMAKE= yes diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile index 5b4e61a21c7..06bab9f980b 100644 --- a/security/pgp2/Makefile +++ b/security/pgp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:47 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:48 agc Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp # @@ -19,7 +19,7 @@ MAINTAINER= packages@NetBSD.ORG .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES PKGNAME= pgp-2.6.3a -LIB_DEPENDS+= rsaref.2.:${PORTSDIR}/security/rsaref +DEPENDS+= rsaref-2.0:../../security/rsaref RSAINC= -I${PREFIX}/include RSALIBS= -L${PREFIX}/lib -lrsaref RSAOBJS= rsaglue2.o diff --git a/security/ssh/Makefile b/security/ssh/Makefile index c2bb2310c28..aa4d7fc42d2 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1998/04/15 10:38:47 agc Exp $ +# $NetBSD: Makefile,v 1.17 1998/04/22 14:22:48 agc Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} --with-etcdir=${SSH_CONF_DIR} \ #CONFIGURE_ARGS+= --with-none .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES -LIB_DEPENDS+= rsaref.2.:${PORTSDIR}/security/rsaref +DEPENDS+= rsaref-2.0:../../security/rsaref CONFIGURE_ARGS+= --with-rsaref="${PREFIX}/lib" CFLAGS+= -I${PREFIX}/include .endif diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile index 542989063ab..45d47112248 100644 --- a/sysutils/mc/Makefile +++ b/sysutils/mc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:28 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:46 agc Exp $ # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp # @@ -11,6 +11,8 @@ MAINTAINER= packages@netbsd.org GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-ncurses --without-edit --without-subshell +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses + MAN1= mc.1 mcedit.1 MAN8= mcserv.8 diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 0af9a320fd1..9cd407f9e99 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:34 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:48 agc Exp $ # FreeBSD Id: Makefile,v 1.71 1997/11/24 19:35:30 ache Exp # @@ -10,7 +10,7 @@ MASTER_SITES= http://sol.slcc.edu/lynx/current/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= ncurses.3.4:${PORTSDIR}/devel/ncurses +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses CONFIGURE_ARGS+= --with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc" GNU_CONFIGURE= YES diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile index 4e5feb0faf6..cca6cf8208e 100644 --- a/x11/asclock/Makefile +++ b/x11/asclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:52 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:48 agc Exp $ # DISTNAME= asclock @@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= hubertf@netbsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm # Choose language from: # 1) english [DEFAULT] diff --git a/x11/ctwm/Makefile b/x11/ctwm/Makefile index 4008f6afdce..a8378a6c09d 100644 --- a/x11/ctwm/Makefile +++ b/x11/ctwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:52 agc Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:48 agc Exp $ # DISTNAME= ctwm-3.5 @@ -7,7 +7,7 @@ MASTER_SITES= ftp://slhp1.epfl.ch/pub/ MAINTAINER= tron@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm USE_IMAKE= yes diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile index 73c732fc4ba..8809f2cfaaf 100644 --- a/x11/filerunner/Makefile +++ b/x11/filerunner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:53 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:48 agc Exp $ # $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp # @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= X11/desktop MAINTAINER= packages@netbsd.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 USE_X11= yes diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile index 68a23fd1a2f..43c095f93ad 100644 --- a/x11/fvwm1/Makefile +++ b/x11/fvwm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:53 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:49 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/ MAINTAINER= cjs@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm RUN_DEPENDS= xpmroot:${PORTSDIR}/x11/xpmroot USE_IMAKE= yes diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile index deb456eea25..e5705950461 100644 --- a/x11/fvwm2/Makefile +++ b/x11/fvwm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:34 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz MAINTAINER= packages@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm RUN_DEPENDS= xpmroot:${PORTSDIR}/x11/xpmroot USE_IMAKE= yes diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile index b25059f3804..14da66fa3b2 100644 --- a/x11/fvwm95/Makefile +++ b/x11/fvwm95/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:35 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $ # FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp # @@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay RUN_DEPENDS= xpmroot:${PORTSDIR}/x11/xpmroot diff --git a/x11/kde/Makefile b/x11/kde/Makefile index d43afc82781..1eff7b073b0 100644 --- a/x11/kde/Makefile +++ b/x11/kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:35 frueauf Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:49 agc Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp # @@ -9,7 +9,7 @@ DISTFILES= # empty MAINTAINER= packages@netbsd.org -LIB_DEPENDS= kdecore.0.90:${PORTSDIR}/x11/kdelibs +DEPENDS+= kdelibs-3.1b:../../x11/kdelibs RUN_DEPENDS= kwm:${PORTSDIR}/x11/kdebase \ kcalc:${PORTSDIR}/misc/kdeutils \ kmahjongg:${PORTSDIR}/games/kdegames \ diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index d57a1f29bb4..a6f96e99ff3 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:35 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp # @@ -13,15 +13,10 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= packages@netbsd.org BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt -LIB_DEPENDS= qt.1.3[0-9]:${PORTSDIR}/x11/qt \ - gif.[23].:${PORTSDIR}/graphics/giflib \ - jpeg.[67].:${PORTSDIR}/graphics/jpeg \ - kdecore.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kdeui.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - jscript.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - khtmlw.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - kfm.0.9[0-9]:${PORTSDIR}/x11/kdelibs \ - mediatool.0.9[0-9]:${PORTSDIR}/x11/kdelibs +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= qt-1.33:../../x11/qt +DEPENDS+= kdelibs-3.1b:../../x11/kdelibs +DEPENDS+= giflib-3.0:../../graphics/giflib USE_X11= yes HAS_CONFIGURE= yes diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index 4dcc83d1bbc..aa59933c27c 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:35 frueauf Exp $ +# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -13,9 +13,9 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= packages@netbsd.org BUILD_DEPENDS= moc:${PORTSDIR}/x11/qt -LIB_DEPENDS= qt.1.3[0-9]:${PORTSDIR}/x11/qt \ - gif.[23].:${PORTSDIR}/graphics/giflib \ - jpeg.[67].:${PORTSDIR}/graphics/jpeg +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= qt-1.33:../../x11/qt +DEPENDS+= giflib-3.0:../../graphics/giflib USE_X11= yes HAS_CONFIGURE= yes diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index a3b7eaff232..1191eb05f68 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:35 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:49 agc Exp $ # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp # @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= Tk MAINTAINER= packages@netbsd.org BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/HTML/Parse.pm:${PORTSDIR}/www/p5-libwww -LIB_DEPENDS= tk80.1.:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 USE_PERL5= YES diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile index f8697cbe9ba..72179a54312 100644 --- a/x11/tk80/Makefile +++ b/x11/tk80/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/04/20 11:56:36 frueauf Exp $ +# $NetBSD: Makefile,v 1.14 1998/04/22 14:22:50 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp # @@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.sunlabs.com/pub/tcl/ MAINTAINER= packages@netbsd.org -LIB_DEPENDS= tcl80.1.:${PORTSDIR}/lang/tcl80 +DEPENDS+= tcl-8.0p2:../../lang/tcl80 WRKSRC= ${WRKDIR}/tk8.0/unix GNU_CONFIGURE= yes diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index 26c807177b2..64c5084b9a5 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/04/20 11:56:36 frueauf Exp $ +# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:50 agc Exp $ # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp # @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= packages@netbsd.org -LIB_DEPENDS= tk80.1.:${PORTSDIR}/x11/tk80 +DEPENDS+= tk-8.0p2:../../x11/tk80 RUN_DEPENDS= rman:${PORTSDIR}/textproc/rman \ glimpse:${PORTSDIR}/textproc/glimpse diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index 00c5ec15418..3d96f3ef6e6 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:56 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:50 agc Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/04 10:33:43 tg Exp # @@ -10,9 +10,9 @@ MASTER_SITES= http://isolation.ml.org/oxygen/wm/bin/ \ MAINTAINER= handy@physics.montana.edu -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm \ - png.0.:${PORTSDIR}/graphics/png \ - jpeg.7.:${PORTSDIR}/graphics/jpeg +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= jpeg-6a:../../graphics/jpeg +DEPENDS+= png-0.96:../../graphics/png USE_X11= yes GNU_CONFIGURE= yes diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index a8eec336244..ff8d244942e 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:58 agc Exp $ +# $NetBSD: Makefile,v 1.13 1998/04/22 14:22:50 agc Exp $ # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp # @@ -8,8 +8,8 @@ MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ MAINTAINER= hubertf@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm \ - MesaGL.2.:${PORTSDIR}/graphics/Mesa +DEPENDS+= xpm-3.4j:../../graphics/xpm +DEPENDS+= Mesa-2.6:../../graphics/Mesa GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \ diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index b3311c3d1ec..4275a34ebf1 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:58 agc Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/22 14:22:50 agc Exp $ # DISTNAME= fvwm-2.0.46 @@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \ MAINTAINER= tron@netbsd.org -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm +DEPENDS+= xpm-3.4j:../../graphics/xpm USE_IMAKE= yes CAT1= xpmroot.0 |