From e32afb6fea693addf91cf6d2aebe68164062fc6c Mon Sep 17 00:00:00 2001 From: hubertf Date: Tue, 27 Mar 2001 03:19:43 +0000 Subject: Change BUILD_DEPENDS semantics: first component is now a package name+version/pattern, no more executable/patchname/whatnot. While there, introduce BUILD_USES_MSGFMT as shorthand to pull in devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current). Patch by Alistair Crooks --- x11/9term/Makefile | 14 ++++++++++---- x11/XF86Setup/Makefile | 6 +++--- x11/controlcenter/Makefile | 4 ++-- x11/gnome-applets/Makefile | 6 +++--- x11/gnome-core/Makefile | 4 ++-- x11/gnome-libs/Makefile | 4 ++-- x11/gtk--/Makefile | 4 ++-- x11/gtk/Makefile | 6 +++--- x11/kdebase/Makefile | 5 +++-- x11/kdebase2/Makefile | 6 +++--- x11/kdelibdocs/Makefile | 5 +++-- x11/khostchooser/Makefile | 5 +++-- x11/lesstif/Makefile.common | 6 +++--- x11/p5-Tk/Makefile | 4 ++-- x11/qt2-libs/Makefile.common | 4 ++-- x11/swing/Makefile | 4 ++-- x11/xfce/Makefile | 5 +++-- 17 files changed, 51 insertions(+), 41 deletions(-) (limited to 'x11') 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 -- cgit v1.2.3