From b44be980ff293e63ba71084d02898015163ab1cd Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 1 Jun 2005 18:02:37 +0000 Subject: Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc. Several changes are involved since they are all interrelated. These changes affect about 1000 files. The first major change is rewriting bsd.builtin.mk as well as all of the builtin.mk files to follow the new example in bsd.builtin.mk. The loop to include all of the builtin.mk files needed by the package is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk is now included by each of the individual builtin.mk files and provides some common logic for all of the builtin.mk files. Currently, this includes the computation for whether the native or pkgsrc version of the package is preferred. This causes USE_BUILTIN.* to be correctly set when one builtin.mk file includes another. The second major change is teach the builtin.mk files to consider files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most of the builtin.mk files test for the presence of built-in software by checking for the existence of certain files, e.g. , and we now assume that if that file is under ${LOCALBASE}, then it must be from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The exceptions to this new check are the X11 distribution packages, which are handled specially as noted below. The third major change is providing builtin.mk and version.mk files for each of the X11 distribution packages in pkgsrc. The builtin.mk file can detect whether the native X11 distribution is the same as the one provided by pkgsrc, and the version.mk file computes the version of the X11 distribution package, whether it's built-in or not. The fourth major change is that the buildlink3.mk files for X11 packages that install parts which are part of X11 distribution packages, e.g. Xpm, Xcursor, etc., now use imake to query the X11 distribution for whether the software is already provided by the X11 distribution. This is more accurate than grepping for a symbol name in the imake config files. Using imake required sprinkling various builtin-imake.mk helper files into pkgsrc directories. These files are used as input to imake since imake can't use stdin for that purpose. The fifth major change is in how packages note that they use X11. Instead of setting USE_X11, package Makefiles should now include x11.buildlink3.mk instead. This causes the X11 package buildlink3 and builtin logic to be executed at the correct place for buildlink3.mk and builtin.mk files that previously set USE_X11, and fixes packages that relied on buildlink3.mk files to implicitly note that X11 is needed. Package buildlink3.mk should also include x11.buildlink3.mk when linking against the package libraries requires also linking against the X11 libraries. Where it was obvious, redundant inclusions of x11.buildlink3.mk have been removed. --- wm/3ddesktop/Makefile | 4 ++-- wm/aewm++/Makefile | 4 ++-- wm/afterstep/Makefile | 4 ++-- wm/afterstep1/Makefile | 3 +-- wm/amaterus/Makefile | 3 +-- wm/amiwm/Makefile | 4 ++-- wm/bbconf/Makefile | 3 +-- wm/bbkeys/Makefile | 4 ++-- wm/bbpager/Makefile | 5 +++-- wm/bbrun/Makefile | 3 +-- wm/blackbox/Makefile | 4 ++-- wm/bsetroot/Makefile | 4 ++-- wm/e16menuedit2/Makefile | 3 +-- wm/econf/Makefile | 3 +-- wm/enlightenment/Makefile | 3 +-- wm/ethemes/Makefile | 5 +++-- wm/evilwm/Makefile | 5 +++-- wm/fluxbox/Makefile | 4 ++-- wm/flwm/Makefile | 3 +-- wm/fvwm-devel/Makefile | 3 +-- wm/fvwm2-themes/Makefile | 3 ++- wm/golem/Makefile | 3 +-- wm/icewm/Makefile.common | 3 +-- wm/ion/Makefile | 4 ++-- wm/ion3-devel/Makefile | 4 ++-- wm/matchbox/Makefile | 3 +-- wm/metacity/Makefile | 3 +-- wm/novawm/Makefile | 3 +-- wm/openbox/Makefile | 3 +-- wm/openbox2/Makefile | 3 +-- wm/oroborus/Makefile | 4 +--- wm/pekwm/Makefile | 3 +-- wm/pwm/Makefile | 4 ++-- wm/qvwm/Makefile | 3 +-- wm/ratpoison/Makefile | 4 ++-- wm/sawfish-themes/Makefile | 4 +++- wm/sawfish/Makefile | 4 +++- wm/sawfish/Makefile.common | 3 +-- wm/skippy/Makefile | 3 +-- wm/waimea/Makefile | 3 +-- wm/wampager/Makefile | 3 +-- wm/weewm/Makefile | 5 +++-- wm/whiteBOX/Makefile | 3 +-- wm/windowlab/Makefile | 3 +-- wm/windowmaker/Makefile | 3 +-- wm/wm2/Makefile | 4 +++- wm/wmctrl/Makefile | 4 ++-- wm/wmextra/Makefile | 3 ++- wm/wmi/Makefile | 3 +-- wm/wmthemes/Makefile | 4 +++- 50 files changed, 81 insertions(+), 95 deletions(-) (limited to 'wm') diff --git a/wm/3ddesktop/Makefile b/wm/3ddesktop/Makefile index 58d13ef166d..881776af79b 100644 --- a/wm/3ddesktop/Makefile +++ b/wm/3ddesktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= 3ddesktop-0.2.8 @@ -10,7 +10,6 @@ HOMEPAGE= http://desk3d.sourceforge.net/ COMMENT= 3D Virtual Desktop Switcher USE_PKGINSTALL= yes -USE_X11= yes GNU_CONFIGURE= yes EGDIR= ${PREFIX}/share/examples/3ddesktop @@ -23,4 +22,5 @@ pre-install: .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/aewm++/Makefile b/wm/aewm++/Makefile index c8b00effd81..3c46c9e832e 100644 --- a/wm/aewm++/Makefile +++ b/wm/aewm++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= aewm++-1.0.24 @@ -10,6 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://sapphire.sourceforge.net/ COMMENT= Fork of the popular minimal window manager aewm -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile index be6ca59207a..a622e923558 100644 --- a/wm/afterstep/Makefile +++ b/wm/afterstep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= AfterStep-2.00.01 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PERL5= run -USE_X11= YES .include "../../graphics/freetype2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile index e7f5e38bcae..6bbaf401b53 100644 --- a/wm/afterstep1/Makefile +++ b/wm/afterstep1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 05:35:33 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:24 jlam Exp $ DISTNAME= AfterStep-1.8.11 PKGNAME= ${DISTNAME:S/AfterStep/afterstep/} @@ -18,7 +18,6 @@ DEPENDS+= xp-[0-9]*:../../x11/xp AUTOCONF_REQD= 2.13 GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES CONFIGURE_ARGS+= --disable-staticlibs CONFIGURE_ARGS+= --disable-xinerama diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile index 3b26c2f11b5..f0b3826dcc8 100644 --- a/wm/amaterus/Makefile +++ b/wm/amaterus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:45 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:24 jlam Exp $ DISTNAME= amaterus-0.34.1 PKGREVISION= 4 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.taiyaki.org/ COMMENT= GTK+ window manager GNU_CONFIGURE= YES -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amaterus diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile index b63828f2a00..ab7d770b344 100644 --- a/wm/amiwm/Makefile +++ b/wm/amiwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= amiwm0.20pl48 @@ -15,7 +15,6 @@ RESTRICTED= "Restrictive copyright (non-commerical use only)" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \ X_PRE_LIBS="${X_PRE_LIBS}" \ @@ -24,4 +23,5 @@ CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \ X_PRE_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib FIX_RPATH+= X_PRE_LIBS +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbconf/Makefile b/wm/bbconf/Makefile index ce5c0cc002f..e8e7f679924 100644 --- a/wm/bbconf/Makefile +++ b/wm/bbconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/16 23:09:00 kristerw Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= bbconf-1.4 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://bbconf.sourceforge.net/ COMMENT= Configuration tool for the blackbox window manager -USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile index e266c6d620c..50b199bc69e 100644 --- a/wm/bbkeys/Makefile +++ b/wm/bbkeys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= bbkeys-0.8.6 @@ -10,9 +10,9 @@ HOMEPAGE= http://bbkeys.sourceforge.net/ COMMENT= General X Window keygrabber GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c++ .include "../../lang/perl5/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile index a0510a13d0d..11cc858ec1b 100644 --- a/wm/bbpager/Makefile +++ b/wm/bbpager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= bbpager-0.3.1 @@ -11,9 +11,10 @@ HOMEPAGE= http://bbtools.windsofstorm.net/available.phtml COMMENT= Pager for the blackbox window manager GNU_CONFIGURE= YES -USE_X11= YES USE_LANGUAGES= c++ +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/man/man5 diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile index af408471185..2c816daa981 100644 --- a/wm/bbrun/Makefile +++ b/wm/bbrun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:24 jlam Exp $ DISTNAME= bbrun-1.3 PKGREVISION= 3 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.dwave.net/~jking/bbrun/ COMMENT= Run utility for BlackBox WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun -USE_X11= YES USE_TOOLS+= gmake BUILD_TARGET= bbrun diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile index 9b25eb925f3..715f7b8a7d8 100644 --- a/wm/blackbox/Makefile +++ b/wm/blackbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= blackbox-0.65.0 @@ -13,8 +13,8 @@ COMMENT= Small and fast X11R6 window manager DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot USE_LANGUAGES= c c++ -USE_X11= YES GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile index 3b78a3226bf..57dd7563da9 100644 --- a/wm/bsetroot/Makefile +++ b/wm/bsetroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:46 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= blackbox-0.65.0 @@ -12,7 +12,6 @@ HOMEPAGE= http://blackboxwm.sourceforge.net/ COMMENT= Tools to set the root windows background USE_LANGUAGES= c c++ -USE_X11= YES GNU_CONFIGURE= YES BUILD_DIRS= ${WRKSRC}/nls ${WRKSRC}/util @@ -25,4 +24,5 @@ do-install: ( cd ${WRKSRC}/nls && ${MAKE} install ) .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile index aa5c637b20a..19ddb9b573b 100644 --- a/wm/e16menuedit2/Makefile +++ b/wm/e16menuedit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= e16menuedit2-0.0.1 @@ -16,7 +16,6 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes -USE_X11= yes pre-configure: cd ${WRKSRC}; \ diff --git a/wm/econf/Makefile b/wm/econf/Makefile index 338075320e6..0cc621dc235 100644 --- a/wm/econf/Makefile +++ b/wm/econf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/31 22:12:18 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:24 jlam Exp $ # DISTNAME= enlightenment-conf-0.15 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.enlightenment.org/ COMMENT= Configuration tool for easily setting up Enlightenment USE_LANGUAGES= c c++ -USE_X11= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index f05e08bc6fe..3f3537cb83d 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $ DISTNAME= enlightenment-0.16.7.2 CATEGORIES= x11 gnome wm @@ -11,7 +11,6 @@ COMMENT= Highly themeable and configurable window manager USE_TOOLS+= bison USE_PERL5= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-fsstd CONFIGURE_ARGS+= --enable-xrandr diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile index a6b542cfc73..5930fae38fe 100644 --- a/wm/ethemes/Makefile +++ b/wm/ethemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/16 01:15:33 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:24 jlam Exp $ DISTNAME= ethemes-0.1 PKGREVISION= 2 @@ -13,7 +13,6 @@ COMMENT= Themes for the window manager Enlightenment DEPENDS+= enlightenment>=0.16.2:../../wm/enlightenment DIST_SUBDIR= ethemes -USE_X11= yes NO_BUILD= yes NO_CONFIGURE= yes EXTRACT_ONLY= @@ -38,6 +37,8 @@ E_THEMES?= Absolute_E-DR16-199911060830.etheme \ arctic-DR16-200006050720.etheme \ eMac-DR16-199912101635.etheme small-e-DR16-199908230041.etheme +.include "../../mk/x11.buildlink3.mk" + do-install: .for FILE in ${E_THEMES} NAME=`echo ${FILE} | ${SED} -e s/-DR16.*//` ; \ diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile index 76f7815b52f..f4580c409e0 100644 --- a/wm/evilwm/Makefile +++ b/wm/evilwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= evilwm_0.99.17.orig @@ -11,10 +11,11 @@ HOMEPAGE= http://evilwm.sourceforge.net/ COMMENT= Minimalist Window Manager for X WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -USE_X11= yes BUILD_TARGET= allinone +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm cd ${WRKSRC} && \ diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index ab6e58ff89a..7bfb8822947 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= fluxbox-0.9.12 @@ -12,7 +12,6 @@ COMMENT= Window Manager for X based on Blackbox DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot -USE_X11= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_TOOLS= gmake @@ -28,4 +27,5 @@ CONFIGURE_ARGS+= --enable-xinerama .include "options.mk" .include "../../converters/libiconv/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile index a68615fbdd6..fb68c58db48 100644 --- a/wm/flwm/Makefile +++ b/wm/flwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= flwm-1.00 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://flwm.sourceforge.net/ COMMENT= The Fast, Light Window Manager -USE_X11= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= X_LIBS="-lGL" diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile index 57d29772e3a..ccf35085ec2 100644 --- a/wm/fvwm-devel/Makefile +++ b/wm/fvwm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:25 jlam Exp $ DISTNAME= fvwm-2.5.12 PKGNAME= ${DISTNAME:S/fvwm/&-devel/} @@ -16,7 +16,6 @@ CONFLICTS= fvwm-[0-9]* fvwm1-[0-9]* fvwm2-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES USE_GNU_READLINE= YES diff --git a/wm/fvwm2-themes/Makefile b/wm/fvwm2-themes/Makefile index 3e7770fae38..952cb1ae6b2 100644 --- a/wm/fvwm2-themes/Makefile +++ b/wm/fvwm2-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:47 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= fvwm-themes-${THEM_VER} @@ -30,4 +30,5 @@ post-install: ${DISTDIR}/fvwm-themes-extra-${THEM_VER}.tar.bz2 .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/golem/Makefile b/wm/golem/Makefile index 8e429b50b4a..1492d003a8a 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= golem-0.0.5 @@ -12,7 +12,6 @@ COMMENT= Fast and lightweight yet customizable window manager USE_PKGINSTALL= YES USE_TOOLS+= gmake -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --enable-i18n diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 6639ec13ac1..34129d85557 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2005/05/31 14:05:57 rillig Exp $ +# $NetBSD: Makefile.common,v 1.45 2005/06/01 18:03:25 jlam Exp $ DISTNAME= icewm-1.2.20 CATEGORIES= x11 wm @@ -8,7 +8,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://icewm.sourceforge.net/ GNU_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes diff --git a/wm/ion/Makefile b/wm/ion/Makefile index b51c8233ef8..95638614244 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= ion-2-20040729 @@ -14,7 +14,6 @@ COMMENT= Keyboard friendly tiling window manager PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES @@ -40,5 +39,6 @@ INSTALLATION_DIRS+= share/doc/ion share/examples/ion share/ion .include "../../lang/lua/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile index 98ce4892493..e2617fa593f 100644 --- a/wm/ion3-devel/Makefile +++ b/wm/ion3-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= ion-3ds-20040906 @@ -13,7 +13,6 @@ COMMENT= Keyboard friendly tiling window manager PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES @@ -41,6 +40,7 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f .include "../../devel/gettext-lib/buildlink3.mk" .include "../../lang/lua/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" # This is necessary because gettext's builtin.mk add stuff there, diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile index 7cfb60f8bfe..8de7dbb477a 100644 --- a/wm/matchbox/Makefile +++ b/wm/matchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= matchbox-window-manager-0.9.3 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://projects.o-hand.com/matchbox/ COMMENT= Window manager designed for computers with small displays -USE_X11= yes USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index 1bb261d97c5..991b6866b3a 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= metacity-2.10.1 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES USE_DIRS+= gnome2-1.5 theme-1.0 USE_PKGLOCALEDIR= YES -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile index 7e6667a1034..21b1fb5f2b6 100644 --- a/wm/novawm/Makefile +++ b/wm/novawm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= NovaWM-0.8_alpha @@ -12,7 +12,6 @@ COMMENT= Nova window manager GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index bd1e4192d63..63035d07515 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:25 jlam Exp $ DISTNAME= openbox-3.2 PKGREVISION= 1 @@ -18,7 +18,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -USE_X11= YES PKGCONFIG_OVERRIDE= parser/obparser-3.0.pc.in PKGCONFIG_OVERRIDE+= render/obrender-3.0.pc.in diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile index 6c9d19b8699..7326a07ca8a 100644 --- a/wm/openbox2/Makefile +++ b/wm/openbox2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= openbox-2.2.3 @@ -12,7 +12,6 @@ COMMENT= Window manager based on Blackbox (2.x branch) DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot -USE_X11= YES GNU_CONFIGURE= YES CPPFLAGS+= -DHAVE_STRFTIME=1 diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile index cad25edd3f0..afd2a13588c 100644 --- a/wm/oroborus/Makefile +++ b/wm/oroborus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= oroborus_2.0.12-1 @@ -12,8 +12,6 @@ COMMENT= Small and simple window manager for X WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= YES -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile index 5f2c103357c..4732a02fc00 100644 --- a/wm/pekwm/Makefile +++ b/wm/pekwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= pekwm-0.1.3 @@ -13,7 +13,6 @@ COMMENT= Window manager based on aewm++ GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES USE_PERL5= run USE_PKGINSTALL= YES USE_LANGUAGES+= c++ diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile index 32a889245db..ba03b97f9c0 100644 --- a/wm/pwm/Makefile +++ b/wm/pwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= pwm-20030617 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews CONFLICTS+= ion<=20040729nb2 USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" @@ -35,4 +34,5 @@ SUPPORT_FILES= # empty SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} .endfor +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile index 96edf7630dd..4157f06af35 100644 --- a/wm/qvwm/Makefile +++ b/wm/qvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= qvwm-1.1.12 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.qvwm.org/ COMMENT= Windows 95/98/NT like window manager for X11 -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c++ diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile index 9260eeb612b..f80c9f687d7 100644 --- a/wm/ratpoison/Makefile +++ b/wm/ratpoison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:48 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= ratpoison-1.3.0 @@ -9,11 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.nongnu.org/ratpoison/ COMMENT= Simple window manager with no fat library dependencies -USE_X11= YES GNU_CONFIGURE= YES USE_GNU_READLINE= YES INFO_FILES= ratpoison.info .include "../../devel/readline/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/sawfish-themes/Makefile b/wm/sawfish-themes/Makefile index f64533f281b..9aca907027e 100644 --- a/wm/sawfish-themes/Makefile +++ b/wm/sawfish-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/11/30 18:26:40 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:25 jlam Exp $ DISTNAME= sawfish-themes-0.2 PKGREVISION= 2 @@ -22,6 +22,8 @@ USE_X11BASE= yes .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" + pre-fetch: @${ECHO} "===========================================================" @${ECHO} diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index dbed0657cf4..0396b90c653 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/12/28 23:18:18 reed Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:25 jlam Exp $ # PKGNAME= sawfish-${SF_VERS} @@ -20,6 +20,8 @@ INFO_FILES= sawfish.info PLIST_SUBST+= SF_VERS=${SF_VERS} +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/sawfish/themes ${TOUCH} ${PREFIX}/share/sawfish/themes/.directory diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common index 165b9e3f430..bd422fa2ace 100644 --- a/wm/sawfish/Makefile.common +++ b/wm/sawfish/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2005/05/31 22:12:18 wiz Exp $ +# $NetBSD: Makefile.common,v 1.26 2005/06/01 18:03:25 jlam Exp $ DISTNAME= sawfish-${SF_VERS}-gtk1 SF_VERS= 1.2 @@ -10,7 +10,6 @@ HOMEPAGE= http://sawmill.sourceforge.net/ DEPENDS+= rep-gtk>=0.15nb2:../../x11/rep-gtk -USE_X11= # defined USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= # defined USE_TOOLS+= gmake diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile index f562b6115f3..ee30a4756ba 100644 --- a/wm/skippy/Makefile +++ b/wm/skippy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= skippy-0.5.0 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://thegraveyard.org/skippy.php COMMENT= Fullscreen task switcher for X11 -USE_X11= yes EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile index 0f0d4e5ad15..78b70cb4bfd 100644 --- a/wm/waimea/Makefile +++ b/wm/waimea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:25 jlam Exp $ # DISTNAME= waimea-0.4.0 @@ -13,7 +13,6 @@ COMMENT= Fast and highly customizable virtual window manager GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_PERL5= run -USE_X11= YES .include "../../mk/bsd.prefs.mk" diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile index 6e4fc3e4d42..99af0077c30 100644 --- a/wm/wampager/Makefile +++ b/wm/wampager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= wampager-0.9.1 @@ -11,7 +11,6 @@ COMMENT= Virtual pager dockapp for the Waimea Window Manager DEPENDS= waimea>=0.4.0:../../wm/waimea -USE_X11= YES do-build: @${ECHO} "${CC} ${CFLAGS} wampager.c -o wampager ${LDFLAGS} \ diff --git a/wm/weewm/Makefile b/wm/weewm/Makefile index dab8d940d50..9c8b1b09b10 100644 --- a/wm/weewm/Makefile +++ b/wm/weewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= weewm-0.0.2 @@ -10,11 +10,12 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.weewm.org/ COMMENT= Fast and ultra light windowmanager with total keyboard control -USE_X11= yes EXAMPLESDIR= ${PREFIX}/share/examples/weewm DOCDIR= ${PREFIX}/share/doc/weewm +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/weewm ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/weewm.1 ${PREFIX}/man/man1 diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile index 85f86a89780..52e3a296108 100644 --- a/wm/whiteBOX/Makefile +++ b/wm/whiteBOX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= whiteBOX-0.5 @@ -10,7 +10,6 @@ MAINTAINER= jschauma@NetBSD.org HOMEPAGE= http://whitebox.sourceforge.net/ COMMENT= Multi-purpose configuration tool for Blackbox -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile index 739dd179ca1..9a4d96c5a89 100644 --- a/wm/windowlab/Makefile +++ b/wm/windowlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= windowlab-1.12 @@ -13,7 +13,6 @@ COMMENT= Small and simple window manager USE_PKGINSTALL= YES USE_TOOLS+= gmake -USE_X11= YES PKG_SYSCONFSUBDIR= windowlab diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index c441d4da6ac..7dd1ec8fed8 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2005/04/16 22:55:22 kristerw Exp $ +# $NetBSD: Makefile,v 1.53 2005/06/01 18:03:26 jlam Exp $ DISTNAME= WindowMaker-0.91.0 PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} @@ -15,7 +15,6 @@ COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone BUILD_USES_MSGFMT= YES USE_PKGINSTALL= YES -USE_X11= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile index ce165402188..8ff43b58dfa 100644 --- a/wm/wm2/Makefile +++ b/wm/wm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:26 jlam Exp $ DISTNAME= wm2-4 PKGNAME= wm2-4.0 @@ -15,6 +15,8 @@ USE_LANGUAGES= c c++ USE_X11BASE= YES MAKE_ENV+= CCC="${CXX}" +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/man/cat1/wm2.0 diff --git a/wm/wmctrl/Makefile b/wm/wmctrl/Makefile index 5c4e32f0160..0bcc9c40742 100644 --- a/wm/wmctrl/Makefile +++ b/wm/wmctrl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:26 jlam Exp $ DISTNAME= wmctrl-1.05 PKGREVISION= 1 @@ -11,9 +11,9 @@ COMMENT= Command line interface to an EWMH-compliant WM GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -USE_X11= YES .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmextra/Makefile b/wm/wmextra/Makefile index f930854558f..8b8498a545c 100644 --- a/wm/wmextra/Makefile +++ b/wm/wmextra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/04/24 22:46:12 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= WindowMaker-extra-0.1 @@ -16,4 +16,5 @@ DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker USE_X11BASE= yes GNU_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmi/Makefile b/wm/wmi/Makefile index 404841516c3..a5be4b1cba2 100644 --- a/wm/wmi/Makefile +++ b/wm/wmi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:49 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:26 jlam Exp $ # DISTNAME= wmi-10 @@ -10,7 +10,6 @@ HOMEPAGE= http://wmi.modprobe.de/ COMMENT= Minimalist, flexible and highly customizable window manager USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes .include "../../fonts/Xft2/buildlink3.mk" diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile index a0cd96e65c7..9824c2a23b1 100644 --- a/wm/wmthemes/Makefile +++ b/wm/wmthemes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/20 12:27:35 agc Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:26 jlam Exp $ # # There is no distinfo file because users can specify alternate themes @@ -38,6 +38,8 @@ SITES_${theme}.tar.gz= http://download.freshmeat.net/themes/${theme:C/-[^-]*$//} .endfor .undef theme +.include "../../mk/x11.buildlink3.mk" + do-install: @${RM} -f ${PLIST_SRC} @${TOUCH} ${PLIST_SRC} -- cgit v1.2.3