From 1f4495b33e4a8e2f4279f07f1dc90e949537c6bd Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 22 Apr 1998 14:22:39 +0000 Subject: 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. --- misc/dotfile/Makefile | 4 ++-- misc/ical/Makefile | 4 ++-- misc/kdeutils/Makefile | 15 +++++---------- misc/mc/Makefile | 4 +++- misc/most/Makefile | 4 ++-- misc/zorro/Makefile | 4 ++-- 6 files changed, 16 insertions(+), 19 deletions(-) (limited to 'misc') 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 -- cgit v1.2.3