diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-01 18:02:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-01 18:02:37 +0000 |
| commit | 95fd1f6ec9ce583a46e4351179d93b744a17d1ad (patch) | |
| tree | 614ebca62dbe176d9c75cab1cfeef7c554a336c9 /x11 | |
| parent | 6469e231c2dabc4fdb3edae536776b2c90cf5616 (diff) | |
| download | pkgsrc-95fd1f6ec9ce583a46e4351179d93b744a17d1ad.tar.gz | |
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. <pthread.h>, 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.
Diffstat (limited to 'x11')
159 files changed, 1163 insertions, 662 deletions
diff --git a/x11/9term/Makefile b/x11/9term/Makefile index 53ffb635c86..1e3753ee16c 100644 --- a/x11/9term/Makefile +++ b/x11/9term/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:03 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:27 jlam Exp $ DISTNAME= 9term.1.6.3 PKGNAME= 9term-1.6.3 @@ -14,10 +14,10 @@ BUILDLINK_DEPMETHOD.sam= full NOT_FOR_PLATFORM= *-*-alpha #LP64 Problems WRKSRC= ${WRKDIR} -USE_X11= yes MANCOMPRESSED= yes MAKE_ENV+= SAM_DIR=${BUILDLINK_PREFIX.sam} .include "../../editors/sam/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile index f37c7c24bcb..f1fdd691013 100644 --- a/x11/XFree86-clients/Makefile +++ b/x11/XFree86-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:27 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-clients-${XF_VER} @@ -12,7 +12,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 client programs and related files -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches diff --git a/x11/XFree86-libs/builtin.mk b/x11/XFree86-libs/builtin.mk new file mode 100644 index 00000000000..de25ce940b9 --- /dev/null +++ b/x11/XFree86-libs/builtin.mk @@ -0,0 +1,73 @@ +# $NetBSD: builtin.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +BUILTIN_PKG:= XFree86-libs + +BUILTIN_FIND_FILES_VAR:= CF_XFREE86 +BUILTIN_FIND_FILES.CF_XFREE86= ${X11BASE}/lib/X11/config/xfree86.cf + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### +.if !defined(IS_BUILTIN.XFree86-libs) +IS_BUILTIN.XFree86-libs= no +. if exists(${CF_XFREE86}) +IS_BUILTIN.XFree86-libs= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.XFree86-libs + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.XFree86-libs) && \ + !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS]) && \ + exists(${CF_XFREE86}) +. include "${BUILDLINK_PKGSRCDIR.XFree86-libs}/version.mk" +BUILTIN_PKG.XFree86-libs= XFree86-libs-${BUILTIN_X11_VERSION.XFree86} +.endif +MAKEVARS+= BUILTIN_PKG.XFree86-libs + +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.XFree86-libs) +. if ${PREFER.XFree86-libs} == "pkgsrc" +USE_BUILTIN.XFree86-libs= no +. else +USE_BUILTIN.XFree86-libs= ${IS_BUILTIN.XFree86-libs} +. if defined(BUILTIN_PKG.XFree86-libs) && \ + !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS]) +USE_BUILTIN.XFree86-libs= yes +. for _dep_ in ${BUILDLINK_DEPENDS.XFree86-libs} +. if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS]) +USE_BUILTIN.XFree86-libs!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.XFree86-libs:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.XFree86-libs +.endif +MAKEVARS+= USE_BUILTIN.XFree86-libs + +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.XFree86-libs?= no +.if !empty(CHECK_BUILTIN.XFree86-libs:M[nN][oO]) + +. if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS]) +BUILDLINK_PREFIX.XFree86-libs= ${X11BASE} +BUILDLINK_FILES.XFree86-libs+= lib/pkgconfig/XFree86-libs.pc +. endif + +.endif # CHECK_BUILTIN.XFree86-libs diff --git a/x11/XFree86-libs/version.mk b/x11/XFree86-libs/version.mk new file mode 100644 index 00000000000..dace44d7750 --- /dev/null +++ b/x11/XFree86-libs/version.mk @@ -0,0 +1,41 @@ +# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ +# +# This Makefile fragment is included by Makefiles that need to access +# the X11_TYPE and version number of a XFree86 distribution. +# +# The following variables are provided by this file: +# +# BUILTIN_X11_TYPE.XFree86 is the X11_TYPE of the XFree86 distribution +# and is simply "XFree86". +# +# BUILTIN_X11_VERSION.XFree86 is the version number of the XFree86 +# distribution detected on the system. +# + +BUILTIN_X11_TYPE.XFree86= XFree86 + +BUILTIN_FILES_VAR:= CF_XFREE86 CF_XFREE86_VERSION +BUILTIN_FILES.CF_XFREE86= ${X11BASE}/lib/X11/config/xfree86.cf +BUILTIN_FILES.CF_XFREE86_VERSION= ${X11BASE}/lib/X11/config/version.def +.include "../../mk/buildlink3/find-files.mk" + +.if !defined(BUILTIN_X11_VERSION.XFree86) && \ + exists(${CF_XFREE86}) && exists(${CF_XFREE86_VERSION}) +BUILTIN_X11_VERSION.XFree86!= \ + ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { M = $$3 } \ + /\#define[ ]*XF86_VERSION_MINOR/ { m = "."$$3 } \ + /\#define[ ]*XF86_VERSION_PATCH/ { p = "."$$3 } \ + /\#define[ ]*XF86_VERSION_SNAP/ { s = "."$$3 } \ + /\#define[ ]*XFree86Version/ { \ + V = $$3; \ + if (M == "") M = int(V / 1000) % 10; \ + if (m == "") m = "."(int(V / 100) % 10); \ + if (p == "") p = "."(int(V / 10) % 10); \ + if (s == "") s = "."(V % 10); \ + } \ + END { if (s == ".0") s = ""; \ + if (p == ".0" && s == "") p = ""; \ + printf "%s%s%s%s\n", M, m, p, s }' \ + ${CF_XFREE86_VERSION} +.endif +MAKEVARS+= BUILTIN_X11_VERSION.XFree86 diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile index 1c6eb41fa8b..d7c2939921f 100644 --- a/x11/XFree86-server/Makefile +++ b/x11/XFree86-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:27 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-server-${XF_VER} @@ -12,7 +12,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 X server and related programs -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches @@ -52,5 +51,6 @@ post-install: .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../meta-pkgs/XFree86/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile index 71d95d25f83..46ba0df05ee 100644 --- a/x11/XaoS/Makefile +++ b/x11/XaoS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= XaoS-3.1 @@ -13,7 +13,6 @@ COMMENT= Zoomable fractal rendering doodad PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS= gmake USE_PKGLOCALEDIR= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-curses-driver=no # DGA fails to link somehow, XXX should be fixed @@ -28,4 +27,5 @@ SUBST_SED.paths= -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g' .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index 35de7df03ee..3e559a05d28 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/08/27 18:53:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XAW_XPM_BUILDLINK3_MK:= ${XAW_XPM_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm .endif # XAW_XPM_BUILDLINK3_MK .include "../../mk/bsd.prefs.mk" +.include "../../graphics/xpm/buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ @@ -23,6 +24,4 @@ LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.xpm}/lib \ -lXaw3d -lXpm -.include "../../graphics/xpm/buildlink3.mk" - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk index 4a9bcad57cd..ef00e29adc1 100644 --- a/x11/Xaw3d/buildlink3.mk +++ b/x11/Xaw3d/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/08/27 18:53:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XAW3D_BUILDLINK3_MK:= ${XAW3D_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d .endif # XAW3D_BUILDLINK3_MK .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib \ diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index 5b53a70c804..8491b26645e 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= xbae-4.51.01 @@ -10,7 +10,6 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://xbae.sourceforge.net/ COMMENT= Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile index 293aa7c009d..6db7d599c90 100644 --- a/x11/Xcomposite/Makefile +++ b/x11/Xcomposite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= libXcomposite-1.0.1 @@ -13,7 +13,6 @@ HOMEPAGE= http://freedesktop.org/ COMMENT= Xcomposite extension (library) USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xcomposite.pc.in diff --git a/x11/Xcomposite/builtin-imake.mk b/x11/Xcomposite/builtin-imake.mk new file mode 100644 index 00000000000..30158e304ca --- /dev/null +++ b/x11/Xcomposite/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildCompositeLibrary for the presence of + * Xcomposite in the X11 distribution. + */ +builtin-test: +#if BuildCompositeLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk index 2d1441d3330..790ae502112 100644 --- a/x11/Xcomposite/builtin.mk +++ b/x11/Xcomposite/builtin.mk @@ -1,13 +1,56 @@ -# $NetBSD: builtin.mk,v 1.4 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:03:27 jlam Exp $ -_XCOMPOSITE_H= ${X11BASE}/include/X11/extensions/xcomposite.h -_XCOMPOSITE_PC= ${X11BASE}/lib/pkgconfig/xcomposite.pc +BUILTIN_PKG:= Xcomposite +BUILTIN_FIND_FILES_VAR:= H_XCOMPOSITE +BUILTIN_FIND_FILES.H_XCOMPOSITE= \ + ${X11BASE}/include/X11/extensions/xcomposite.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.Xcomposite) -IS_BUILTIN.Xcomposite= no -. if exists(${_XCOMPOSITE_H}) && exists(${_XCOMPOSITE_PC}) -IS_BUILTIN.Xcomposite= yes +IS_BUILTIN.Xcomposite= no +. if exists(${H_XCOMPOSITE}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) +IS_BUILTIN.Xcomposite!= \ + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xcomposite}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif . endif -.endif # IS_BUILTIN.Xcomposite +.endif +MAKEVARS+= IS_BUILTIN.Xcomposite -USE_BUILTIN.Xcomposite?= ${IS_BUILTIN.Xcomposite} +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.Xcomposite) +. if ${PREFER.Xcomposite} == "pkgsrc" +USE_BUILTIN.Xcomposite= no +. else +USE_BUILTIN.Xcomposite= ${IS_BUILTIN.Xcomposite} +. if defined(BUILTIN_PKG.Xcomposite) && \ + !empty(IS_BUILTIN.Xcomposite:M[yY][eE][sS]) +USE_BUILTIN.Xcomposite= yes +. for _dep_ in ${BUILDLINK_DEPENDS.Xcomposite} +. if !empty(USE_BUILTIN.Xcomposite:M[yY][eE][sS]) +USE_BUILTIN.Xcomposite!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xcomposite:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.Xcomposite +.endif +MAKEVARS+= USE_BUILTIN.Xcomposite diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile index 8d6e17862b3..8c3f38735ce 100644 --- a/x11/Xfixes/Makefile +++ b/x11/Xfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= libXfixes-2.0.1 @@ -14,7 +14,6 @@ COMMENT= X Fixes extension of X RandR PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -22,4 +21,5 @@ PKGCONFIG_OVERRIDE+= xfixes.pc.in .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk index b295f9d0fbc..b4244804c45 100644 --- a/x11/Xfixes/buildlink3.mk +++ b/x11/Xfixes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:28 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+ @@ -16,6 +16,7 @@ BUILDLINK_RECOMMENDED.Xfixes+= Xfixes>=2.0.1nb1 BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes .endif # XFIXES_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xfixes/builtin-imake.mk b/x11/Xfixes/builtin-imake.mk new file mode 100644 index 00000000000..7963f807be3 --- /dev/null +++ b/x11/Xfixes/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildXfixesLibrary for the presence of + * Xfixes in the X11 distribution. + */ +builtin-test: +#if BuildXfixesLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk index 5ca24d4e319..c038a583c23 100644 --- a/x11/Xfixes/builtin.mk +++ b/x11/Xfixes/builtin.mk @@ -1,13 +1,55 @@ -# $NetBSD: builtin.mk,v 1.3 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:27 jlam Exp $ -_H_XFIXES= ${X11BASE}/include/X11/extensions/Xfixes.h -_FIXESEXT_PC= ${X11BASE}/lib/pkgconfig/xfixes.pc +BUILTIN_PKG:= Xfixes +BUILTIN_FIND_FILES_VAR:= H_XFIXES +BUILTIN_FIND_FILES.H_XFIXES= ${X11BASE}/include/X11/extensions/Xfixes.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.Xfixes) -IS_BUILTIN.Xfixes= no -. if exists(${_H_XFIXES}) && exists(${_FIXESEXT_PC}) -IS_BUILTIN.Xfixes= yes +IS_BUILTIN.Xfixes= no +. if exists(${H_XFIXES}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) +IS_BUILTIN.Xfixes!= \ + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xfixes}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif . endif -.endif # IS_BUILTIN.Xfixes +.endif +MAKEVARS+= IS_BUILTIN.Xfixes -USE_BUILTIN.Xfixes?= ${IS_BUILTIN.Xfixes} +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.Xfixes) +. if ${PREFER.Xfixes} == "pkgsrc" +USE_BUILTIN.Xfixes= no +. else +USE_BUILTIN.Xfixes= ${IS_BUILTIN.Xfixes} +. if defined(BUILTIN_PKG.Xfixes) && \ + !empty(IS_BUILTIN.Xfixes:M[yY][eE][sS]) +USE_BUILTIN.Xfixes= yes +. for _dep_ in ${BUILDLINK_DEPENDS.Xfixes} +. if !empty(USE_BUILTIN.Xfixes:M[yY][eE][sS]) +USE_BUILTIN.Xfixes!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xfixes:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.Xfixes +.endif +MAKEVARS+= USE_BUILTIN.Xfixes diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index caa2b0851b1..c1fe37e601f 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2004/11/08 12:38:19 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -16,8 +16,6 @@ BUILDLINK_RECOMMENDED.Xrandr+= Xrandr>=1.0.2nb1 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr .endif # XRANDR_BUILDLINK3_MK -USE_X11= yes - .include "../../x11/randrext/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" diff --git a/x11/Xrandr-mixedcase/builtin-imake.mk b/x11/Xrandr-mixedcase/builtin-imake.mk new file mode 100644 index 00000000000..7474999aba3 --- /dev/null +++ b/x11/Xrandr-mixedcase/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildRandRLibrary for the presence of + * Xrandr in the X11 distribution. + */ +builtin-test: +#if BuildRandRLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk index bf91f74e19e..6a9f3f9212d 100644 --- a/x11/Xrandr-mixedcase/builtin.mk +++ b/x11/Xrandr-mixedcase/builtin.mk @@ -1,130 +1,118 @@ -# $NetBSD: builtin.mk,v 1.7 2005/03/01 18:56:43 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:03:27 jlam Exp $ -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= Xrandr +BUILTIN_FIND_FILES_VAR:= H_XRANDR +BUILTIN_FIND_FILES.H_XRANDR= ${X11BASE}/include/X11/extensions/Xrandr.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.Xrandr) IS_BUILTIN.Xrandr= no -. if exists(${_X11_TMPL}) +. if exists(${H_XRANDR}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.Xrandr!= \ - if ${GREP} -q BuildRandRLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in Xrandr distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -# Xrandr doesn't provide a method of discovering the version number of -# the software. Match up Xrandr versions with XFree86 versions for an -# approximate determination of the Xrandr version. -# -_XRANDR_VERSIONS= 1.0.2 1.0.1 1.0 0.99 -_XRANDR_0.99= 4.2 4.2.* -_XRANDR_1.0= 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* -_XRANDR_1.0+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* -. if !defined(XF86_VERSION) -XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorgversion.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def -. elif exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf -_XORG_MAJOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_MINOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_PATCH!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_SNAP!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_TEENY= ${_XORG_PATCH}.${_XORG_SNAP} -. if !empty(_XORG_TEENY:M0.0) -XF86_VERSION= 4.4 -. else -XF86_VERSION= 4.4.${_XORG_TEENY} -. endif -. elif exists(${X11BASE}/lib/X11/config/version.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -_XF86_MAJOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_MINOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_PATCH!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_SNAP!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} -. if !empty(_XF86_TEENY:M0.0) -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} -. else -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} -. endif -. endif -BUILDLINK_VARS+= XF86_VERSION -. endif # defined(XF86_VERSION) -. for _xrandr_version_ in ${_XRANDR_VERSIONS} -. for _pattern_ in ${_XRANDR_${_xrandr_version_}} -. if !empty(XF86_VERSION:M${_pattern_}) -_XRANDR_VERSION?= ${_xrandr_version_} -. endif -. endfor -. endfor -_XRANDR_VERSION?= 1.0 -BUILTIN_PKG.Xrandr= Xrandr-${_XRANDR_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.Xrandr + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xrandr}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test . endif . endif -BUILDLINK_VARS+= IS_BUILTIN.Xrandr -.endif # IS_BUILTIN.Xrandr +.endif +MAKEVARS+= IS_BUILTIN.Xrandr -.if defined(USE_BUILTIN.randrext) && !empty(USE_BUILTIN.randrext:M[nN][oO]) -USE_BUILTIN.Xrandr= no +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.Xrandr) && \ + !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS]) && \ + exists(${H_XRANDR}) +# +# Xrandr doesn't provide a method of discovering the version number of +# the software. Match up Xrandr versions with X11 versions for an +# approximate determination of the Xrandr version. +# +_BLTN_XRANDR_VERSIONS= 1.0.2 1.0.1 1.0 0.99 +_BLTN_XRANDR_0.99.XFree86= 4.2 4.2.* +_BLTN_XRANDR_1.0.XFree86= 4.3 4.3.[0-9] 4.3.[0-9].* \ + 4.3.[1-8][0-9]* 4.3.9[0-8]* \ + 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* +_BLTN_XRANDR_1.0.xorg= 6.[7-9]* 6.[1-9][0-9]* +. for _version_ in ${_BLTN_XRANDR_VERSIONS} +. for _pattern_ in ${_BLTN_XRANDR_${_version_}.${BUILTIN_X11_TYPE.${X11_TYPE}}} +. if !empty(BUILTIN_X11_VERSION.${X11_TYPE}:M${_pattern_}) +BUILTIN_VERSION.Xrandr?= ${_version_} +. endif +. endfor +. endfor +. if defined(BUILTIN_VERSION.Xrandr) +BUILTIN_PKG.Xrandr= Xrandr-${BUILTIN_VERSION.Xrandr} +. endif .endif +MAKEVARS+= BUILTIN_PKG.Xrandr + +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +# +# These are dependencies of Xrandr. If we need to use the pkgsrc +# versions of any of these, then also use the pkgsrc version of +# Xrandr. +# .if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO]) -USE_BUILTIN.Xrandr= no +USE_BUILTIN.Xrender= no +.endif +.if defined(USE_BUILTIN.randrext) && !empty(USE_BUILTIN.randrext:M[nN][oO]) +USE_BUILTIN.randrext= no .endif .if !defined(USE_BUILTIN.Xrandr) -USE_BUILTIN.Xrandr?= ${IS_BUILTIN.Xrandr} - -. if defined(BUILTIN_PKG.Xrandr) +. if ${PREFER.Xrandr} == "pkgsrc" +USE_BUILTIN.Xrandr= no +. else +USE_BUILTIN.Xrandr= ${IS_BUILTIN.Xrandr} +. if defined(BUILTIN_PKG.Xrandr) && \ + !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS]) USE_BUILTIN.Xrandr= yes -. for _depend_ in ${BUILDLINK_DEPENDS.Xrandr} -. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) -USE_BUILTIN.Xrandr!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.Xrandr}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.Xrandr} +. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) +USE_BUILTIN.Xrandr!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrandr:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.Xrandr +. endif +. endfor +. endif +. endif # PREFER.Xrandr +.endif +MAKEVARS+= USE_BUILTIN.Xrandr +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.Xrandr?= no .if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO]) -.if !empty(USE_BUILTIN.Xrandr:M[nN][oO]) +. if !empty(USE_BUILTIN.Xrandr:M[nN][oO]) BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -.endif +. endif -.if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_PREFIX.Xrandr= ${X11BASE} -USE_BUILTIN.randrext= yes USE_BUILTIN.Xrender= yes -.endif +USE_BUILTIN.randrext= yes +. endif .endif # CHECK_BUILTIN.Xrandr diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index de28d094ca8..fb35eb2ba7a 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.32 2004/10/03 00:18:28 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2005/06/01 18:03:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -16,8 +16,6 @@ BUILDLINK_RECOMMENDED.Xrender+= Xrender>=0.8.4nb1 BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender .endif # XRENDER_BUILDLINK3_MK -USE_X11= yes - .include "../../x11/render/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xrender/builtin-imake.mk b/x11/Xrender/builtin-imake.mk new file mode 100644 index 00000000000..0e225d1d135 --- /dev/null +++ b/x11/Xrender/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $ + +/* + * Check the value of BuildRenderLibrary for the presence of + * Xrender in the X11 distribution. + */ +builtin-test: +#if BuildRenderLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk index 1e9d43b395a..ad709fc6b36 100644 --- a/x11/Xrender/builtin.mk +++ b/x11/Xrender/builtin.mk @@ -1,127 +1,116 @@ -# $NetBSD: builtin.mk,v 1.6 2005/03/01 18:56:43 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.7 2005/06/01 18:03:27 jlam Exp $ -_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl +BUILTIN_PKG:= Xrender +BUILTIN_FIND_FILES_VAR:= H_XRENDER +BUILTIN_FIND_FILES.H_XRENDER= ${X11BASE}/include/X11/extensions/Xrender.h +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.Xrender) IS_BUILTIN.Xrender= no -. if exists(${_X11_TMPL}) +. if exists(${H_XRENDER}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) IS_BUILTIN.Xrender!= \ - if ${GREP} -q BuildRenderLibrary ${_X11_TMPL}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. if !empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) -# -# Create an appropriate package name for the built-in Xrender distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.Xrender}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif +. endif +.endif +MAKEVARS+= IS_BUILTIN.Xrender + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.Xrender) && \ + !empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) && \ + exists(${H_XRENDER}) # # Xrender doesn't provide a method of discovering the version number of -# the software. Match up Xrender versions with XFree86 versions for an +# the software. Match up Xrender versions with X11 versions for an # approximate determination of the Xrender version. # -_XRENDER_VERSIONS= 0.8.3 0.8.2 0.8.1 0.8 0.2 0.1 -_XRENDER_0.1= 4.0 4.0.* 4.1 4.1.[0-9] 4.1.[0-9].* 4.1.[1-8][0-9]* 4.1.9[0-8]* -_XRENDER_0.2= 4.1.99.* 4.2 4.2.[0-9] 4.2.[0-9].* 4.2.[1-8][0-9]* 4.2.9[0-8]* -_XRENDER_0.8= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* -_XRENDER_0.8+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* -. if !defined(XF86_VERSION) -XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorgversion.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def -. elif exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf -_XORG_MAJOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_MINOR!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_PATCH!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_SNAP!= \ - ${AWK} '/\#define[ ]*XORG_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XORG_TEENY= ${_XORG_PATCH}.${_XORG_SNAP} -. if !empty(_XORG_TEENY:M0.0) -XF86_VERSION= 4.4 -. else -XF86_VERSION= 4.4.${_XORG_TEENY} -. endif -. elif exists(${X11BASE}/lib/X11/config/version.def) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -_XF86_MAJOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_MINOR!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_MINOR/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_PATCH!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_PATCH/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_SNAP!= \ - ${AWK} '/\#define[ ]*XF86_VERSION_SNAP/ { print $$3 }' \ - ${_X11_CONFIG_VERSION_DEF} -_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} -. if !empty(_XF86_TEENY:M0.0) -XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} -. else -_F86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} -. endif -. endif -BUILDLINK_VARS+= XF86_VERSION -. endif # defined(XF86_VERSION) -. for _xrender_version_ in ${_XRENDER_VERSIONS} -. for _pattern_ in ${_XRENDER_${_xrender_version_}} -. if !empty(XF86_VERSION:M${_pattern_}) -_XRENDER_VERSION?= ${_xrender_version_} -. endif -. endfor -. endfor -_XRENDER_VERSION?= 0.1 -BUILTIN_PKG.Xrender= Xrender-${_XRENDER_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.Xrender -. endif +_BLTN_XRENDER_VERSIONS= 0.8.3 0.8.2 0.8.1 0.8 0.2 0.1 +_BLTN_XRENDER_0.1.XFree86= 4.0 4.0.* 4.1 4.1.[0-9] 4.1.[0-9].* \ + 4.1.[1-8][0-9]* 4.1.9[0-8]* +_BLTN_XRENDER_0.2.XFree86= 4.1.99.* 4.2 4.2.[0-9] 4.2.[0-9].* \ + 4.2.[1-8][0-9]* 4.2.9[0-8]* +_BLTN_XRENDER_0.8.XFree86= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* \ + 4.3.[1-8][0-9]* 4.3.9[0-8]* \ + 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* +_BLTN_XRENDER_0.8.xorg= 6.[7-9]* 6.[1-9][0-9]* +. for _version_ in ${_BLTN_XRENDER_VERSIONS} +. for _pattern_ in ${_BLTN_XRENDER_${_version_}.${BUILTIN_X11_TYPE.${X11_TYPE}}} +. if !empty(BUILTIN_X11_VERSION.${X11_TYPE}:M${_pattern_}) +BUILTIN_VERSION.Xrender?= ${_version_} +. endif +. endfor +. endfor +. if defined(BUILTIN_VERSION.Xrender) +BUILTIN_PKG.Xrender= Xrender-${BUILTIN_VERSION.Xrender} . endif -BUILDLINK_VARS+= IS_BUILTIN.Xrender -.endif # IS_BUILTIN.Xrender +.endif +MAKEVARS+= BUILTIN_PKG.Xrender +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +# +# These are dependencies of Xrender. If we need to use the pkgsrc +# versions of any of these, then also use the pkgsrc version of +# Xrender. +# #.if defined(USE_BUILTIN.render) && !empty(USE_BUILTIN.render:M[nN][oO]) -#USE_BUILTIN.Xrender= no +#USE_BUILTIN.render= no #.endif .if !defined(USE_BUILTIN.Xrender) -USE_BUILTIN.Xrender?= ${IS_BUILTIN.Xrender} - -. if defined(BUILTIN_PKG.Xrender) +. if ${PREFER.Xrender} == "pkgsrc" +USE_BUILTIN.Xrender= no +. else +USE_BUILTIN.Xrender= ${IS_BUILTIN.Xrender} +. if defined(BUILTIN_PKG.Xrender) && \ + !empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) USE_BUILTIN.Xrender= yes -. for _depend_ in ${BUILDLINK_DEPENDS.Xrender} -. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) -USE_BUILTIN.Xrender!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.Xrender}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.Xrender} +. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) +USE_BUILTIN.Xrender!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrender:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.Xrender +. endif +. endfor +. endif +. endif # PREFER.Xrender +.endif +MAKEVARS+= USE_BUILTIN.Xrender +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.Xrender?= no .if !empty(CHECK_BUILTIN.Xrender:M[nN][oO]) -.if !empty(USE_BUILTIN.Xrender:M[nN][oO]) +. if !empty(USE_BUILTIN.Xrender:M[nN][oO]) BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2 -BUILDLINK_DEPENDS.render+= render>=0.8 -.endif +BUILDLINK_DEPENDS.render+= Xrender>=0.8 +. endif -.if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_PREFIX.Xrender= ${X11BASE} USE_BUILTIN.render= yes -.endif +. endif .endif # CHECK_BUILTIN.Xrender diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 20185fb89e4..b2c4e0fe44f 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= aterm-0.4.2 @@ -13,7 +13,6 @@ COMMENT= Aterm (Afterstep XVT) - a VT102 emulator for the X window system PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES -USE_X11= YES GNU_CONFIGURE= YES BUILD_DEFS+= ATERM_USE_KANJI ATERM_USE_XTERM_SCROLL BUILD_DEFS+= ATERM_USE_BIG5 ATERM_USE_GREEK diff --git a/x11/bbapm/Makefile b/x11/bbapm/Makefile index cd4ccb344ef..184d06bdc4b 100644 --- a/x11/bbapm/Makefile +++ b/x11/bbapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/03 17:41:21 gson Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:27 jlam Exp $ # based on # FreeBSD port: # ID: ports/x11-wm/bbapm/Makefile,v 1.5 2002/09/02 01:30:15 lioux Exp @@ -15,7 +15,6 @@ HOMEPAGE= http://bbtools.windsofstorm.net/ COMMENT= APM monitor for Blackbox GNU_CONFIGURE= yes -USE_X11= yes # For now: # We use i386/apmvar.h; other architectures will require modification @@ -23,6 +22,8 @@ USE_X11= yes # patch-ak ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-* +.include "../../mk/x11.buildlink3.mk" + post-patch: ${SED} -e 's,@PREFIX@,${PREFIX},' ${WRKSRC}/data/bbapm.1.tmp > \ ${WRKSRC}/data/bbapm.1 diff --git a/x11/blt/Makefile b/x11/blt/Makefile index a970b3faccd..1a88e004dce 100644 --- a/x11/blt/Makefile +++ b/x11/blt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:48:04 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $ # DISTNAME= BLT2.4z @@ -13,7 +13,6 @@ COMMENT= Extension to Tcl/Tk PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/blt2.4z -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --exec-prefix=${PREFIX} CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib diff --git a/x11/compositeext/builtin.mk b/x11/compositeext/builtin.mk index cba6ad6c6c3..af622262ed8 100644 --- a/x11/compositeext/builtin.mk +++ b/x11/compositeext/builtin.mk @@ -1,15 +1,55 @@ -# $NetBSD: builtin.mk,v 1.4 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:03:27 jlam Exp $ -_COMPOSITE_H= ${X11BASE}/include/X11/extensions/composite.h -_COMPOSITE_PROTO_H= ${X11BASE}/include/X11/extensions/compositeproto.h -_COMPOSITEEXT_PC= ${X11BASE}/lib/pkgconfig/compositeext.pc +BUILTIN_PKG:= compositeext +BUILTIN_FIND_FILES_VAR:= H_COMPOSITE H_COMPOSITEPROTO +BUILTIN_FIND_FILES.H_COMPOSITE= \ + ${X11BASE}/include/X11/extensions/composite.h +BUILTIN_FIND_FILES.H_COMPOSITEPROTO= \ + ${X11BASE}/include/X11/extensions/compositeproto.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.compositeext) -IS_BUILTIN.compositeext= no -. if exists(${_COMPOSITE_H}) && exists(${_COMPOSITE_PROTO_H}) && \ - exists(${_COMPOSITEEXT_PC}) -IS_BUILTIN.compositeext= yes +IS_BUILTIN.compositeext= no +# +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_COMPOSITE}) && exists(${H_COMPOSITEPROTO}) +IS_BUILTIN.compositeext= yes . endif -.endif # IS_BUILTIN.compositeext +.endif +MAKEVARS+= IS_BUILTIN.compositeext -USE_BUILTIN.compositeext?= ${IS_BUILTIN.compositeext} +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.compositeext) +. if ${PREFER.compositeext} == "pkgsrc" +USE_BUILTIN.compositeext= no +. else +USE_BUILTIN.compositeext= ${IS_BUILTIN.compositeext} +. if defined(BUILTIN_PKG.compositeext) && \ + !empty(IS_BUILTIN.compositeext:M[yY][eE][sS]) +USE_BUILTIN.compositeext= yes +. for _dep_ in ${BUILDLINK_DEPENDS.compositeext} +. if !empty(USE_BUILTIN.compositeext:M[yY][eE][sS]) +USE_BUILTIN.compositeext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.compositeext:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.compositeext +.endif +MAKEVARS+= USE_BUILTIN.compositeext diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile index afd4efb38a6..e5f38d6555f 100644 --- a/x11/devilspie/Makefile +++ b/x11/devilspie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/20 20:56:24 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:27 jlam Exp $ DISTNAME= devilspie-0.10 CATEGORIES= x11 @@ -12,7 +12,6 @@ BUILD_DEPENDS+= libxslt>=1.0:../../textproc/libxslt GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/devilspie @@ -26,5 +25,6 @@ post-install: .include "../../devel/libwnck/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common index 9174beba0b3..7e0f4417dea 100644 --- a/x11/dfm/Makefile.common +++ b/x11/dfm/Makefile.common @@ -1,11 +1,10 @@ -# $NetBSD: Makefile.common,v 1.11 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile.common,v 1.12 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= dfm-0.99.9 MASTER_SITES= http://www.kaisersite.de/dfm/ WRKSRC= ${WRKDIR}/dfm -USE_X11= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-imlib-icons diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile index 3026af644dc..71ff07c1838 100644 --- a/x11/dxpc/Makefile +++ b/x11/dxpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:28 jlam Exp $ DISTNAME= dxpc-3.8.2 CATEGORIES= x11 @@ -8,7 +8,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.vigor.nu/dxpc/ COMMENT= Differential X Protocol Compressor -USE_X11= yes GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" @@ -17,4 +16,5 @@ post-install: @strip ${PREFIX}/bin/dxpc .include "../../archivers/liblzo/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 791e164cf99..c39fbf3e373 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -11,7 +11,6 @@ HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library WRKSRC= ${WRKDIR}/${DISTNAME} -USE_X11= yes USE_TOOLS+= gmake MAKEFILE= GNUmakefile diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 58b15249f13..dc3b0ea6fed 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:03:28 jlam Exp $ DISTNAME= Eterm-0.9.3 PKGNAME= ${DISTNAME:S/^E/e/} @@ -22,7 +22,6 @@ PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \ USE_LIBTOOL= YES USE_PKGINSTALL= YES -USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -58,5 +57,6 @@ post-extract: .include "../../devel/libast/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile index ad94b12b2e5..8eee0060226 100644 --- a/x11/fbdesk/Makefile +++ b/x11/fbdesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/16 01:12:41 kristerw Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fbdesk-1.2.1 @@ -12,7 +12,6 @@ COMMENT= Application that creates and manage icons on your desktop USE_LIBTOOL= YES GNU_CONFIGURE= YES -USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fbdesk diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile index d8e9e2cdc00..a73005344c0 100644 --- a/x11/fixesext/Makefile +++ b/x11/fixesext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:05 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fixesext-2.0.1 @@ -12,10 +12,10 @@ COMMENT= X Fixes extension headers and specification PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= fixesext.pc.in .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesext/builtin.mk b/x11/fixesext/builtin.mk index 8f9f7e911d7..5c2be9fd331 100644 --- a/x11/fixesext/builtin.mk +++ b/x11/fixesext/builtin.mk @@ -1,15 +1,55 @@ -# $NetBSD: builtin.mk,v 1.3 2004/10/09 06:40:48 xtraeme Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:28 jlam Exp $ -_H_XFIXESPROTO= ${X11BASE}/include/X11/extensions/xfixesproto.h -_H_XFIXESWIRE= ${X11BASE}/include/X11/extensions/xfixeswire.h -_FIXESEXT_PC= ${X11BASE}/lib/pkgconfig/fixesext.pc +BUILTIN_PKG:= fixesext +BUILTIN_FIND_FILES_VAR:= H_XFIXESPROTO H_XFIXESWIRE +BUILTIN_FIND_FILES.H_XFIXESPROTO= \ + ${X11BASE}/include/X11/extensions/xfixesproto.h +BUILTIN_FIND_FILES.H_XFIXESWIRE= \ + ${X11BASE}/include/X11/extensions/xfixeswire.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.fixesext) -IS_BUILTIN.fixesext= no -. if exists(${_H_XFIXESPROTO}) && exists(${_H_XFIXESWIRE}) && \ - exists(${_FIXESEXT_PC}) -IS_BUILTIN.fixesext= yes +IS_BUILTIN.fixesext= no +# +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_XFIXESPROTO}) && exists(${H_XFIXESWIRE}) +IS_BUILTIN.fixesext= yes . endif -.endif # IS_BUILTIN.fixesext +.endif +MAKEVARS+= IS_BUILTIN.fixesext -USE_BUILTIN.fixesext?= ${IS_BUILTIN.fixesext} +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.fixesext) +. if ${PREFER.fixesext} == "pkgsrc" +USE_BUILTIN.fixesext= no +. else +USE_BUILTIN.fixesext= ${IS_BUILTIN.fixesext} +. if defined(BUILTIN_PKG.fixesext) && \ + !empty(IS_BUILTIN.fixesext:M[yY][eE][sS]) +USE_BUILTIN.fixesext= yes +. for _dep_ in ${BUILDLINK_DEPENDS.fixesext} +. if !empty(USE_BUILTIN.fixesext:M[yY][eE][sS]) +USE_BUILTIN.fixesext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fixesext:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.fixesext +.endif +MAKEVARS+= USE_BUILTIN.fixesext diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 574a49e0b33..59c5e565a24 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/06/01 18:03:28 jlam Exp $ DISTNAME= fltk-1.1.6-source PKGNAME= ${DISTNAME:S/-source//} @@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} USE_LANGUAGES= c c++ USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes TEST_TARGET= test GNU_CONFIGURE= yes @@ -31,4 +30,5 @@ CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL} .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk index 38de9df5065..972b83b765c 100644 --- a/x11/fltk/buildlink3.mk +++ b/x11/fltk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:18:29 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/06/01 18:03:28 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+ @@ -19,5 +19,6 @@ BUILDLINK_FILES.fltk+= include/Fl/* .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/fox/Makefile b/x11/fox/Makefile index 739da3b46c4..d3b4c067bc1 100644 --- a/x11/fox/Makefile +++ b/x11/fox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:06 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fox-1.0.43 @@ -10,7 +10,6 @@ MAINTAINER= sakamoto@NetBSD.org HOMEPAGE= http://www.fox-toolkit.org/ COMMENT= Fast and extensive C++ GUI toolkit -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined USE_LANGUAGES= c c++ @@ -25,4 +24,5 @@ CONFIGURE_ARGS+= --enable-release .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile index 2453f0b2146..160e2721ab7 100644 --- a/x11/fspanel/Makefile +++ b/x11/fspanel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:06 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= fspanel-0.8beta1 @@ -13,7 +13,6 @@ COMMENT= F***ing Small Panel for listing X11 windows PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= YES HAS_CONFIGURE= YES CFLAGS+= -DHAVE_XPM -DXFT diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index aa72e73ee62..9956f1c6019 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2005/05/31 11:24:33 dillo Exp $ +# $NetBSD: Makefile,v 1.79 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gdm-2.6.0.9 @@ -23,7 +23,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -USE_X11= YES USE_LIBTOOL= YES PKG_OPTIONS_VAR= PKG_OPTIONS.gdm diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index d6537516fba..30894c3d4b3 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-desktop-2.10.1 @@ -17,7 +17,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake USE_PERL5= yes -USE_X11= yes USE_LIBTOOL= yes BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 01cd63333ae..8210f1c0077 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.110 2005/06/01 18:03:28 jlam Exp $ DISTNAME= gnome-libs-1.4.2 PKGREVISION= 4 @@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews BUILD_USES_MSGFMT= YES USE_DIRS+= gnome1-1.5 -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index d337102e0df..9e003accbea 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-mag-0.12.0 @@ -14,7 +14,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 5a1b044f149..3d077dfbdfd 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-panel-2.10.1 @@ -15,7 +15,6 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PERL5= YES USE_PKGLOCALEDIR= YES -USE_X11= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index c84ec1d3e95..9d0d687c7d2 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-session-2.10.0 @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes USE_PERL5= build USE_LIBTOOL= yes diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile index 6b7679dcd9d..2529a71bd7b 100644 --- a/x11/gnome-themes-extras/Makefile +++ b/x11/gnome-themes-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-themes-extras-0.8.1 @@ -21,7 +21,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile index d345fecaffc..07724e1779d 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-themes-2.10.1 @@ -16,7 +16,6 @@ USE_DIRS+= gnome2-1.5 theme-1.0 USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index 0262354bd0a..52359b65abd 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-applets-2.10.1 @@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 -USE_X11= yes USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index cc7c578d146..629682d24d6 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= control-center-2.10.1 @@ -20,7 +20,6 @@ USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_X11= yes CONFIGURE_ARGS+= --disable-alsa CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index 99140b77cf0..6cf94fc5fe6 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnome-terminal-2.10.0 @@ -20,7 +20,6 @@ GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES GCONF2_SCHEMAS= gnome-terminal.schemas diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index e857d8d5a4c..130929a1e88 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:28 jlam Exp $ # DISTNAME= gnopernicus-0.10.6 @@ -15,7 +15,6 @@ USE_TOOLS+= gmake USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile index 1b105c08d30..32e51a7034d 100644 --- a/x11/gnustep-back/Makefile +++ b/x11/gnustep-back/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/16 08:59:57 rh Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:28 jlam Exp $ DISTNAME= gnustep-back-0.9.6 CATEGORIES= x11 gnustep @@ -8,7 +8,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= X11 AppKit backend for GNUstep -USE_X11= yes CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep pre-install: diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile index 9e9db59fc43..1abff14cdb6 100644 --- a/x11/gnustep-gui/Makefile +++ b/x11/gnustep-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/12 15:54:21 adam Exp $ +# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gnustep-gui-0.9.5 CATEGORIES= x11 gnustep @@ -8,7 +8,6 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= GNUstep AppKit Implementation -USE_X11= yes CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep .include "../../audio/libaudiofile/buildlink3.mk" @@ -29,4 +28,5 @@ PLIST_SUBST+= GSND= .endif .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile index 1bdc4c43ff4..15fd72ff74f 100644 --- a/x11/gnustep-preferences/Makefile +++ b/x11/gnustep-preferences/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= Preferences-1.2.0 @@ -14,7 +14,6 @@ COMMENT= Application for setting preferences for the GNUstep system NO_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES MAKEFILE= GNUmakefile .include "../../x11/gnustep-back/buildlink3.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 4c308930624..6964f741f52 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.108 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 8 @@ -73,4 +73,5 @@ pre-configure: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index 5b9a35b5c4f..98bd873830f 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/10/03 00:18:33 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2005/06/01 18:03:29 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+ @@ -16,9 +16,8 @@ BUILDLINK_RECOMMENDED.gtk+= gtk+>=1.2.10nb8 BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk .endif # GTK_BUILDLINK3_MK -USE_X11= yes - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index d65e34cd3ec..9b5b19cceea 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/05/10 20:24:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtk-engines-2.6.3 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -19,7 +19,6 @@ BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.4 GNU_CONFIGURE= yes USE_DIRS+= theme-1.1 xdg-1.1 -USE_X11= yes USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= gtk-engines-2.pc.in diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 1219f61c1c3..e07511411e1 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.84 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= gtk+-2.6.7 @@ -24,7 +24,6 @@ BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2nb2 USE_DIRS+= xdg-1.1 USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes PTHREAD_AUTO_VARS= yes diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk index dc012fad48a..f3acf212f1d 100644 --- a/x11/gtk2/buildlink3.mk +++ b/x11/gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2005/04/01 10:51:50 salo Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2005/06/01 18:03:29 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+ @@ -23,8 +23,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gtk-2.0\/2.4.0\/(engines|filesystems|immodules|l { print "@comment in gtk2: " $$0; next; } .endif # GTK2_BUILDLINK3_MK -USE_X11= yes - .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index b96da9e6516..03096cc817c 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= gtkmm-2.2.12 @@ -14,7 +14,6 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= gmake USE_PERL5= YES -USE_X11= YES USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE= atk/atkmm-1.0.pc.in diff --git a/x11/gtkmm24/Makefile b/x11/gtkmm24/Makefile index 7f55f46b062..3e84382aebe 100644 --- a/x11/gtkmm24/Makefile +++ b/x11/gtkmm24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtkmm-2.4.8 PKGNAME= gtkmm24-2.4.8 @@ -14,7 +14,6 @@ USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PERL5= yes -USE_X11= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= atk/atkmm-1.6.pc.in diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile index 3aea7a190b6..c8a876dd740 100644 --- a/x11/gtkterm2/Makefile +++ b/x11/gtkterm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:29 jlam Exp $ DISTNAME= gtkterm2-0.2.3 CATEGORIES= x11 @@ -10,7 +10,6 @@ COMMENT= Simple GTK-2 terminal with tabs USE_LIBTOOL= YES GNU_CONFIGURE= YES -USE_X11= YES USE_PKGLOCALEDIR= YES .include "../../devel/pkgconfig/buildlink3.mk" diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common index 85cefd1b21f..fa2d5c97961 100644 --- a/x11/gtoolkit/Makefile.common +++ b/x11/gtoolkit/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= gtoolkit-0.9.5 @@ -8,7 +8,8 @@ MASTER_SITES?= ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/ MAINTAINER?= tech-pkg@NetBSD.org HOMEPAGE?= http://www.informatik.uni-osnabrueck.de/elmar/projects/gtoolkit/ -USE_X11= yes USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-gnustep GNUSTEP_MAKEFILE= Makefile.gnustep + +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile index fb00bd109d6..3480c3bf14a 100644 --- a/x11/hot-babe/Makefile +++ b/x11/hot-babe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:29 jlam Exp $ DISTNAME= hot-babe-0.1.2 PKGREVISION= 7 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://dindinx.net/hotbabe/ COMMENT= System load monitor -USE_X11= yes .include "../../x11/gtk/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" diff --git a/x11/hsetroot/Makefile b/x11/hsetroot/Makefile index 7b5d1d83d67..32f4be76bfa 100644 --- a/x11/hsetroot/Makefile +++ b/x11/hsetroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/22 09:16:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= hsetroot-1.0.2 @@ -10,7 +10,7 @@ HOMEPAGE= http://thegraveyard.org/hsetroot.php COMMENT= Allows you to compose wallpapers for X GNU_CONFIGURE= yes -USE_X11= yes .include "../../graphics/imlib2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile index 12486c099ab..2bd1ca22f2f 100644 --- a/x11/imwheel/Makefile +++ b/x11/imwheel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:08 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= imwheel-0.9.9 @@ -14,4 +14,5 @@ USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-gpm +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile index 59172d44c1c..4ef4cfcbea9 100644 --- a/x11/keylaunch/Makefile +++ b/x11/keylaunch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= keylaunch-1.3.0 @@ -10,9 +10,10 @@ HOMEPAGE= http://www.kensden.pwp.blueyonder.co.uk/Oroborus/download.htm COMMENT= X utility for binding commands to a hot key WRKSRC= ${WRKDIR}/keylaunch -USE_X11= YES USE_TOOLS+= gmake +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/keylaunch diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 5d348fbd684..854d93a1138 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:29 jlam Exp $ DISTNAME= lablgtk-1.2.7 CATEGORIES= x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html COMMENT= GTK+ bindings for ocaml USE_TOOLS+= gmake -USE_X11= YES BUILDLINK_DEPMETHOD.ocaml= full BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.5 diff --git a/x11/labltk/Makefile b/x11/labltk/Makefile index 8f13f0cdeb8..bab3b8e6cde 100644 --- a/x11/labltk/Makefile +++ b/x11/labltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/12/24 17:19:06 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:29 jlam Exp $ .include "../../lang/ocaml/Makefile.common" @@ -6,7 +6,6 @@ PKGNAME= ${DISTNAME:S/ocaml/labltk/} COMMENT= Tk bindings for ocaml -USE_X11= yes CONFIGURE_ARGS+= -x11include ${X11BASE}/include CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index a26a1274e84..95c30262834 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= libxklavier-2.0 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_X11= YES PKGCONFIG_OVERRIDE= libxklavier.pc.in @@ -24,4 +23,5 @@ BUILDLINK_TRANSFORM+= rm:-Werror .include "../../devel/pkgconfig/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile index 07f0e180f95..c756ae9076b 100644 --- a/x11/libzvt/Makefile +++ b/x11/libzvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= libzvt-2.0.1 @@ -13,7 +13,6 @@ COMMENT= Virtual Terminal Widget Library for GNOME2 GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index a6544fe6eac..083acaab824 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:29 jlam Exp $ DISTNAME= mlterm-2.9.2 CATEGORIES= x11 @@ -11,7 +11,6 @@ COMMENT= Multilingual terminal emulator # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile index 9643ed6ad0b..d9006d10de4 100644 --- a/x11/mowitz/Makefile +++ b/x11/mowitz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:29 jlam Exp $ DISTNAME= Mowitz-0.2.2 PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= "More widgets" library USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index c0aaa1d0b46..31f8b81a2a1 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/28 07:09:59 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= mrxvt-0.4.1 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_PKGINSTALL= YES -USE_X11= YES USE_TOOLS+= gmake CONFIGURE_ARGS+= --enable-xft diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile index c1ac42a055e..c22ad3533c4 100644 --- a/x11/multi-aterm/Makefile +++ b/x11/multi-aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= multi-aterm-0.0.4 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.materm.tuxfamily.org/ COMMENT= Multi-terminal for the X Window System based on aterm GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+= --enable-mousewheel CONFIGURE_ARGS+= --enable-swapscreen diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile index 7c2c7791dbc..065ba28dd36 100644 --- a/x11/neXtaw/Makefile +++ b/x11/neXtaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:11 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:29 jlam Exp $ DISTNAME= neXtaw-0.15.1 PKGREVISION= 1 @@ -22,6 +22,8 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} GCC_REQD+= 2.95 .endif +.include "../../mk/x11.buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index dd239ea0ef1..35936e76428 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:36 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/06/01 18:03:29 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+ @@ -17,6 +17,7 @@ BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw .endif # NEXTAW_BUILDLINK3_MK .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile index f687ff91b47..5b950a176ed 100644 --- a/x11/numlockx/Makefile +++ b/x11/numlockx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:29 jlam Exp $ # DISTNAME= numlockx-1.0 @@ -10,7 +10,8 @@ HOMEPAGE= http://ktown.kde.org/~seli/numlockx/ COMMENT= Allows you to start X with numlock turned on GNU_CONFIGURE= yes -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/numlockx diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index bcaa7c73186..76b2b45eb46 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/03/24 11:33:24 adam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:30 jlam Exp $ .include "../../lang/ocaml/Makefile.common" @@ -6,7 +6,6 @@ PKGNAME= ${DISTNAME:S/ocaml/ocaml-graphics/} COMMENT+= (graphics library) -USE_X11= yes CONFIGURE_ARGS+= -x11include ${X11BASE}/include CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib CONFIGURE_ARGS+= -no-tk @@ -38,6 +37,7 @@ SUBST_SED.depend= -e 's,/usr/X11R6,${X11BASE},g' SUBST_MESSAGE.depend= "Fixing .depend in otherlibs/graph" .include "../../lang/ocaml/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" post-build: @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index a20ccf24619..7ce8bff7569 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/22 21:04:42 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 18:03:30 jlam Exp $ PKGVER= 2.1.30 DISTNAME= openmotif${PKGVER} @@ -49,6 +49,8 @@ USE_TOOLS+= gmake INSTALLATION_DIRS= lib/X11/config man/man1 man/man3 man/man5 +.include "../../mk/x11.buildlink3.mk" + post-extract: ${CP} ${FILESDIR}/NoInstall.rules ${WRKSRC}/config/cf/NoInstall.rules ${CP} ${FILESDIR}/OpenMotif.def ${WRKSRC}/config/cf/Motif.def diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index ab10a40444c..622a7130ede 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:30 jlam Exp $ DISTNAME= Tk-804.027 PKGNAME= p5-Tk-804.027 @@ -15,7 +15,6 @@ BUILD_DEPENDS= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= YES PERL5_REQD= 5.8 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Tk/.packlist @@ -24,4 +23,5 @@ MAKE_PARAMS= X11=${X11BASE} .include "../../lang/perl5/module.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/p5-gtk/Makefile.common b/x11/p5-gtk/Makefile.common index ae87eeb252f..a3072f13c5d 100644 --- a/x11/p5-gtk/Makefile.common +++ b/x11/p5-gtk/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/06/01 18:03:30 jlam Exp $ # # common things for p5-gtk based packages @@ -12,4 +12,4 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Gtk/} \ BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser BUILD_DEPENDS+= p5-XML-Writer-[0-9]*:../../textproc/p5-XML-Writer -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/p5-gtk2/Makefile b/x11/p5-gtk2/Makefile index de66a750c28..89b31f1d672 100644 --- a/x11/p5-gtk2/Makefile +++ b/x11/p5-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:30 jlam Exp $ DISTNAME= Gtk2-1.042 PKGNAME= p5-gtk2-1.042 @@ -14,7 +14,6 @@ DEPENDS+= p5-ExtUtils-Depends>=0.2:../../devel/p5-ExtUtils-Depends DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig USE_TOOLS+= gmake -USE_X11= yes PERL5_REQD= 5.8 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Gtk2/.packlist diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 2d7784b1e52..474d4c3760d 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:03:30 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-Tk-0 @@ -9,7 +9,6 @@ MAINTAINER= tsarna@NetBSD.org HOMEPAGE= http://www.python.org/topics/tkinter/ COMMENT= Tkinter -- Python interface to Tcl/Tk -USE_X11= yes EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ ${PYSUBDIR}/Modules/tkappinit.c diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile index 491e64367a1..64b3aa23b94 100644 --- a/x11/py-qt2-sip/Makefile +++ b/x11/py-qt2-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:12 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= sip-3.1 @@ -11,7 +11,6 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/sip/index.php COMMENT= Tool to create Python bindings for C++ libraries -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile index 89e90f68e6f..d19890a1f20 100644 --- a/x11/py-qt2/Makefile +++ b/x11/py-qt2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/16 00:42:38 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-3.1-Qt-2.3.1 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/index.php COMMENT= Python bindings for the Qt toolkit WRKSRC= ${WRKDIR}/PyQt-3.1 -USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile index ae060e0ae5c..a7f540d28c4 100644 --- a/x11/py-qt3-base/Makefile +++ b/x11/py-qt3-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-x11-gpl-3.14.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/ COMMENT= Python binding for qt3 -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile index e820e477d12..ba1e4647429 100644 --- a/x11/py-qt3-modules/Makefile +++ b/x11/py-qt3-modules/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-x11-gpl-3.14.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/ COMMENT= Python binding for qt3 -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile index 76db0b29929..73394abd0d5 100644 --- a/x11/py-qt3-qscintilla/Makefile +++ b/x11/py-qt3-qscintilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= PyQt-x11-gpl-3.14.1 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/ COMMENT= Python binding for qt3 -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile index 3b26a5aead1..5984fde1b76 100644 --- a/x11/py-qt3-sip/Makefile +++ b/x11/py-qt3-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= sip-4.2.1 @@ -15,7 +15,6 @@ CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-* # needs qmake BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools -USE_X11= yes USE_LIBTOOL= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile index 5b6831cc153..f13e0607bb8 100644 --- a/x11/qt1/Makefile +++ b/x11/qt1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qt-1.44 @@ -25,6 +25,8 @@ BUILD_TARGET= src .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" + do-configure: @cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${LOWER_OPSYS}-g++-static diff --git a/x11/qt1/buildlink3.mk b/x11/qt1/buildlink3.mk index 90364c40eaa..85df8e1e8d0 100644 --- a/x11/qt1/buildlink3.mk +++ b/x11/qt1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:37 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/06/01 18:03:30 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT1_BUILDLINK3_MK:= ${QT1_BUILDLINK3_MK}+ @@ -22,4 +22,6 @@ BUILDLINK_TRANSFORM.qt1+= -e s,/qt1/bin/,/bin/, QT1DIR= ${LOCALBASE}/qt1 .endif # QT1_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common index b670b3e3a56..10fc4e3bade 100644 --- a/x11/qt2-libs/Makefile.common +++ b/x11/qt2-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2005/05/22 20:08:50 jlam Exp $ +# $NetBSD: Makefile.common,v 1.23 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qt-x11-${QTVERSION} @@ -46,6 +46,8 @@ FILES_SUBST+= QTDIR=${QTPREFIX} FILES_SUBST+= X11BASE=${X11BASE} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +.include "../../mk/x11.buildlink3.mk" + post-extract: cd ${WRKSRC}/configs; \ for file in netbsd-g++-static solaris-g++-static; do \ diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common index 70bf3fa16b4..35c26e7a0f8 100644 --- a/x11/qt2/Makefile.common +++ b/x11/qt2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/03/09 21:00:09 skrll Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/06/01 18:03:30 jlam Exp $ # QTVERSION= 2.3.1 @@ -7,3 +7,4 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.trolltech.com/products/qt.html USE_X11BASE= yes +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index f5c94003aaf..251e4594f51 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.48 2005/05/22 22:06:28 jlam Exp $ +# $NetBSD: Makefile.common,v 1.49 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -13,7 +13,6 @@ FILESDIR= ${.CURDIR}/../../x11/qt3-libs/files PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches HAS_CONFIGURE= yes -USE_X11= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_LIBTOOL= yes @@ -87,6 +86,8 @@ BUILD_DEFS+= USE_CUPS CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline .endif +.include "../../mk/x11.buildlink3.mk" + post-patch: ${SED} \ -e 's:@LOCALBASE@:${LOCALBASE}:g' \ diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index a7f16046845..a4c2e8aca1f 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:30 jlam Exp $ DISTNAME= qt3-${QTVERSION} CATEGORIES= x11 @@ -13,7 +13,6 @@ DEPENDS+= qt3-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt3-libs DEPENDS+= qt3-tools-${QTVERSION}{,nb[0-9]*}:../../x11/qt3-tools DEPENDS+= qt3-docs-${QTVERSION}{,nb[0-9]*}:../../x11/qt3-docs -USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile index b42d7d5f300..6fa8e912b1d 100644 --- a/x11/qtarch/Makefile +++ b/x11/qtarch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:50 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 18:03:30 jlam Exp $ # DISTNAME= qtarch-2.2-1 @@ -13,7 +13,6 @@ HOMEPAGE= http://qtarch.sourceforge.net/ COMMENT= Graphical dialog editor for the Qt widget set WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_X11= yes USE_TOOLS+= gmake do-install: diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile index 31388d25d5c..79b9ae60462 100644 --- a/x11/qwspritefield/Makefile +++ b/x11/qwspritefield/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:50 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:30 jlam Exp $ DISTNAME= QwSpriteField1.6 PKGNAME= qwspritefield-1.6 @@ -12,7 +12,6 @@ COMMENT= Efficiently redrawn sprites in the Qt GUI Toolkit CONFLICTS= kdesupport-1.0 WRKSRC= ${WRKDIR}/QwSpriteField -USE_X11= yes USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/x11/randrext/buildlink3.mk b/x11/randrext/buildlink3.mk index 21a4efa2d03..bbb82b174ac 100644 --- a/x11/randrext/buildlink3.mk +++ b/x11/randrext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/03/05 18:16:21 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/06/01 18:03:30 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RANDREXT_BUILDLINK3_MK:= ${RANDREXT_BUILDLINK3_MK}+ @@ -14,11 +14,9 @@ BUILDLINK_PACKAGES+= randrext BUILDLINK_DEPENDS.randrext+= randrext>=1.0 BUILDLINK_PKGSRCDIR.randrext?= ../../x11/randrext BUILDLINK_DEPMETHOD.randrext?= build +.endif # RANDREXT_BUILDLINK3_MK .include "../../x11/xextensions/buildlink3.mk" - -USE_X11= yes - -.endif # RANDREXT_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/randrext/builtin.mk b/x11/randrext/builtin.mk index 1ccb6e9655c..f4604f81fa8 100644 --- a/x11/randrext/builtin.mk +++ b/x11/randrext/builtin.mk @@ -1,58 +1,87 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:30 jlam Exp $ -_X11_EXTENSIONS_RANDR_H= ${X11BASE}/include/X11/extensions/randr.h +BUILTIN_PKG:= randrext +BUILTIN_FIND_FILES_VAR:= H_RANDR +BUILTIN_FIND_FILES.H_RANDR= ${X11BASE}/include/X11/extensions/randr.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.randrext) IS_BUILTIN.randrext= no -. if exists(${_X11_EXTENSIONS_RANDR_H}) -IS_BUILTIN.randrext= yes -# -# Create an appropriate package name for the built-in randr distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. # -_RANDR_MAJOR!= \ - ${AWK} '/\#define[ ]*RANDR_MAJOR/ { print $$3 }' \ - ${_X11_EXTENSIONS_RANDR_H} -_RANDR_MINOR!= \ - ${AWK} '/\#define[ ]*RANDR_MINOR/ { print "."$$3 }' \ - ${_X11_EXTENSIONS_RANDR_H} -_RANDR_VERSION= ${_RANDR_MAJOR}${_RANDR_MINOR} -BUILTIN_PKG.randrext= randrext-${_RANDR_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.randrext +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_RANDR}) +IS_BUILTIN.randrext= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.randrext -.endif # IS_BUILTIN.randrext +.endif +MAKEVARS+= IS_BUILTIN.randrext -.if !defined(USE_BUILTIN.randrext) -USE_BUILTIN.randrext?= ${IS_BUILTIN.randrext} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.randrext) && \ + !empty(IS_BUILTIN.randrext:M[yY][eE][sS]) && \ + exists(${H_RANDR}) +BUILTIN_VERSION.randrext!= \ + ${AWK} '/\#define[ ]*RANDR_MAJOR/ { M = $$3 } \ + /\#define[ ]*RANDR_MINOR/ { m = "."$$3 } \ + END { printf "%s%s\n", M, m }' \ + ${H_RANDR} +BUILTIN_PKG.randrext= randrext-${BUILTIN_VERSION.randrext} +.endif +MAKEVARS+= BUILTIN_PKG.randrext -. if defined(BUILTIN_PKG.randrext) +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.randrext) +. if ${PREFER.randrext} == "pkgsrc" +USE_BUILTIN.randrext= no +. else +USE_BUILTIN.randrext= ${IS_BUILTIN.randrext} +. if defined(BUILTIN_PKG.randrext) && \ + !empty(IS_BUILTIN.randrext:M[yY][eE][sS]) USE_BUILTIN.randrext= yes -. for _depend_ in ${BUILDLINK_DEPENDS.randrext} -. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) -USE_BUILTIN.randrext!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.randrext}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.randrext} +. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) +USE_BUILTIN.randrext!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.randrext:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.randrext +. endif +. endfor +. endif +. endif # PREFER.randrext +.endif +MAKEVARS+= USE_BUILTIN.randrext +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.randrext?= no .if !empty(CHECK_BUILTIN.randrext:M[nN][oO]) -.if !empty(USE_BUILTIN.randrext:M[nN][oO]) +. if !empty(USE_BUILTIN.randrext:M[nN][oO]) BUILDLINK_DEPENDS.randrext+= randrext>=1.0 -.endif +. endif -.if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.randrext:M[yY][eE][sS]) BUILDLINK_PREFIX.randrext= ${X11BASE} -USE_X11= yes -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.randrext diff --git a/x11/render/buildlink3.mk b/x11/render/buildlink3.mk index 4698900316e..ecf6422bf62 100644 --- a/x11/render/buildlink3.mk +++ b/x11/render/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/06/01 18:03:30 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RENDER_BUILDLINK3_MK:= ${RENDER_BUILDLINK3_MK}+ @@ -14,9 +14,8 @@ BUILDLINK_PACKAGES+= render BUILDLINK_DEPENDS.render+= render>=0.2 BUILDLINK_PKGSRCDIR.render?= ../../x11/render BUILDLINK_DEPMETHOD.render?= build - -USE_X11= yes - .endif # RENDER_BUILDLINK3_MK +.include "../../mk/x11.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/render/builtin.mk b/x11/render/builtin.mk index e80d1e3e2f1..fbbe9b7338c 100644 --- a/x11/render/builtin.mk +++ b/x11/render/builtin.mk @@ -1,58 +1,87 @@ -# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:30 jlam Exp $ -_X11_EXTENSIONS_RENDER_H= ${X11BASE}/include/X11/extensions/render.h +BUILTIN_PKG:= render +BUILTIN_FIND_FILES_VAR:= H_RENDER +BUILTIN_FIND_FILES.H_RENDER= ${X11BASE}/include/X11/extensions/render.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.render) IS_BUILTIN.render= no -. if exists(${_X11_EXTENSIONS_RENDER_H}) -IS_BUILTIN.render= yes -# -# Create an appropriate package name for the built-in render distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. # -_RENDER_MAJOR!= \ - ${AWK} '/\#define[ ]*RENDER_MAJOR/ { print $$3 }' \ - ${_X11_EXTENSIONS_RENDER_H} -_RENDER_MINOR!= \ - ${AWK} '/\#define[ ]*RENDER_MINOR/ { print "."$$3 }' \ - ${_X11_EXTENSIONS_RENDER_H} -_RENDER_VERSION= ${_RENDER_MAJOR}${_RENDER_MINOR} -BUILTIN_PKG.render= render-${_RENDER_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.render +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_RENDER}) +IS_BUILTIN.render= yes . endif -BUILDLINK_VARS+= IS_BUILTIN.render -.endif # IS_BUILTIN.render +.endif +MAKEVARS+= IS_BUILTIN.render -.if !defined(USE_BUILTIN.render) -USE_BUILTIN.render?= ${IS_BUILTIN.render} +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.render) && \ + !empty(IS_BUILTIN.render:M[yY][eE][sS]) && \ + exists(${H_RENDER}) +BUILTIN_VERSION.render!= \ + ${AWK} '/\#define[ ]*RENDER_MAJOR/ { M = $$3 } \ + /\#define[ ]*RENDER_MINOR/ { m = "."$$3 } \ + END { printf "%s%s\n", M, m }' \ + ${H_RENDER} +BUILTIN_PKG.render= render-${BUILTIN_VERSION.render} +.endif +MAKEVARS+= BUILTIN_PKG.render -. if defined(BUILTIN_PKG.render) +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.render) +. if ${PREFER.render} == "pkgsrc" +USE_BUILTIN.render= no +. else +USE_BUILTIN.render= ${IS_BUILTIN.render} +. if defined(BUILTIN_PKG.render) && \ + !empty(IS_BUILTIN.render:M[yY][eE][sS]) USE_BUILTIN.render= yes -. for _depend_ in ${BUILDLINK_DEPENDS.render} -. if !empty(USE_BUILTIN.render:M[yY][eE][sS]) -USE_BUILTIN.render!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.render}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.render} +. if !empty(USE_BUILTIN.render:M[yY][eE][sS]) +USE_BUILTIN.render!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.render:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.render +. endif +. endfor +. endif +. endif # PREFER.render +.endif +MAKEVARS+= USE_BUILTIN.render +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.render?= no .if !empty(CHECK_BUILTIN.render:M[nN][oO]) -.if !empty(USE_BUILTIN.render:M[nN][oO]) +. if !empty(USE_BUILTIN.render:M[nN][oO]) BUILDLINK_DEPENDS.render+= render>=0.8 -.endif +. endif -.if !empty(USE_BUILTIN.render:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.render:M[yY][eE][sS]) BUILDLINK_PREFIX.render= ${X11BASE} -USE_X11= yes -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.render diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile index 29683375266..ed59a526cda 100644 --- a/x11/ruby-fox/Makefile +++ b/x11/ruby-fox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 18:03:30 jlam Exp $ DISTNAME= FXRuby-1.0.29 PKGNAME= ${RUBY_PKGPREFIX}-fox-1.0.29 @@ -15,7 +15,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-opengl>=0.32:../../graphics/ruby-opengl RUBY_HAS_ARCHLIB= yes USE_RUBY_EXTCONF= yes -USE_X11= yes INSTALL_TARGET= site-install WRKDIST= ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIST}/ext/fox @@ -45,4 +44,5 @@ post-install: .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../lang/ruby/modules.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile index 8b108b32a7f..d4b01b871a4 100644 --- a/x11/ruby-gtk/Makefile +++ b/x11/ruby-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.33 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ruby-gtk-${VERSION} PKGNAME= ${RUBY_PKGPREFIX}-gtk-${VERSION} @@ -13,7 +13,6 @@ COMMENT= Ruby interface to Gtk+ toolkits VERSION= 0.34 RUBY_HAS_ARCHLIB= yes USE_RUBY_EXTCONF= yes -USE_X11= yes INSTALL_TARGET= site-install DOCS_EN= README README.EXT doc/rbbr.rb DOCS_JA= README.ja README.EXT.ja diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile index b407a8a9eef..130e62e0c3f 100644 --- a/x11/ruby-tcltklib/Makefile +++ b/x11/ruby-tcltklib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION} @@ -13,7 +13,6 @@ COMMENT= Ruby interface to Tcl/Tk libraries RUBY_HAS_ARCHLIB= yes RUBY_VERSION_SUPPORTED= 18 USE_RUBY_EXTCONF= yes -USE_X11= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tcltklib WRKSRC= ${RUBY_WRKSRC}/ext/tcltklib diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile index fed5344d942..7e2bf13a074 100644 --- a/x11/ruby-tk/Makefile +++ b/x11/ruby-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tk-${RUBY_VERSION} @@ -15,7 +15,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib RUBY_HAS_ARCHLIB= yes RUBY_VERSION_SUPPORTED= 18 USE_RUBY_EXTCONF= yes -USE_X11= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tk WRKSRC= ${RUBY_WRKSRC}/ext/tk diff --git a/x11/ruby16-tcltklib/Makefile b/x11/ruby16-tcltklib/Makefile index e222fa5d650..e265259a8d4 100644 --- a/x11/ruby16-tcltklib/Makefile +++ b/x11/ruby16-tcltklib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION} @@ -13,7 +13,6 @@ COMMENT= Ruby interface to Tcl/Tk libraries RUBY_HAS_ARCHLIB= yes RUBY_VERSION= ${RUBY16_VERSION} USE_RUBY_EXTCONF= yes -USE_X11= yes DISTINFO_FILE= ${RUBY_DISTINFO_FILE} EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tcltklib WRKSRC= ${RUBY_WRKSRC}/ext/tcltklib diff --git a/x11/ruby16-tk/Makefile b/x11/ruby16-tk/Makefile index 4c52e5b3c96..a3e20bb4756 100644 --- a/x11/ruby16-tk/Makefile +++ b/x11/ruby16-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:31 jlam Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tk-${RUBY_VERSION} @@ -15,7 +15,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-tcltklib>=${RUBY_VERSION}:../../x11/${RUBY_PKGPREFIX RUBY_HAS_ARCHLIB= yes RUBY_VERSION= ${RUBY16_VERSION} USE_RUBY_EXTCONF= yes -USE_X11= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tk WRKSRC= ${RUBY_WRKSRC}/ext/tk diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile index 13eb729d2cb..93787b9a654 100644 --- a/x11/ssystem/Makefile +++ b/x11/ssystem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:31 jlam Exp $ # DISTNAME= ssystem-1.6 @@ -31,4 +31,5 @@ do-install: .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 79527613063..6a339a59bd5 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:13 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:31 jlam Exp $ DISTNAME= startup-notification-0.8 CATEGORIES= x11 gnome @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes PKGCONFIG_OVERRIDE= libstartup-notification-1.0.pc.in @@ -24,4 +23,5 @@ post-install: ${PREFIX}/share/doc/startup-notification/ .include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile index 39d03eeb7f9..a99b2f06349 100644 --- a/x11/tk-Tix/Makefile +++ b/x11/tk-Tix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= tix8.2.0b1 @@ -12,7 +12,6 @@ HOMEPAGE= http://tixlibrary.sourceforge.net/ COMMENT= Powerful widget library for Tcl/Tk WRKSRC= ${WRKDIR}/tix8.2.0/unix -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ --with-tk=${BUILDLINK_PREFIX.tk}/lib \ diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 2f77d69e382..28dd8f77ca4 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/04/13 20:41:03 jschauma Exp $ +# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:31 jlam Exp $ DISTNAME= tk8.4.9-src PKGNAME= tk-8.4.9 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib @@ -30,6 +29,7 @@ CONFIGURE_ARGS+= --mandir=${WRKDIR:Q}/man .include "../../lang/tcl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" post-build: ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index c4d2457551f..4a100846d09 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/10/03 00:18:38 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2005/06/01 18:03:31 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -22,12 +22,11 @@ BUILDLINK_FILES.tk= bin/wish* # BUILDLINK_TRANSFORM+= l:tk:tk84 BUILDLINK_TRANSFORM+= l:tk8.4:tk84 - .endif # TK_BUILDLINK3_MK -USE_X11= yes TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh .include "../../lang/tcl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile index 2b24a85b47c..5ce3e178868 100644 --- a/x11/tk83/Makefile +++ b/x11/tk83/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/13 20:41:03 jschauma Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib MAKE_ENV+= TOUCH="${TOUCH}" -USE_X11= yes USE_LIBTOOL= yes TEST_TARGET= test @@ -96,4 +95,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix .include "../../lang/tcl83/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk index d52bb997c47..2ef5dd24f40 100644 --- a/x11/tk83/buildlink3.mk +++ b/x11/tk83/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/04/24 22:41:21 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/06/01 18:03:32 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -20,12 +20,11 @@ BUILDLINK_FILES.tk= bin/wish* # many Makefiles. # BUILDLINK_TRANSFORM+= l:tk:tk83 - .endif # TK_BUILDLINK3_MK -USE_X11= yes TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh .include "../../lang/tcl83/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile index e4c9be919c4..803081514b6 100644 --- a/x11/tkman/Makefile +++ b/x11/tkman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/03/24 21:13:04 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:32 jlam Exp $ DISTNAME= tkman PKGNAME= tkman-2.1 @@ -15,7 +15,8 @@ DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_RMAN= yes -USE_X11= yes + +.include "../../mk/x11.buildlink3.mk" post-install: ${SED} -e 's|@@LOCALBASE@@|${LOCALBASE}|' \ diff --git a/x11/vte/Makefile b/x11/vte/Makefile index 4aec2b06dd4..23b30638ada 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:51 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= vte-0.11.13 @@ -17,7 +17,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --disable-python diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile index 2f6d6cef4f5..56f8f0e879e 100644 --- a/x11/wmfire/Makefile +++ b/x11/wmfire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= wmfire-0.0.3.9pre4 @@ -9,7 +9,6 @@ MASTER_SITES= http://staff.xmms.org/zinx/misc/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Displays generated fire according to system load -USE_X11= YES GNU_CONFIGURE= YES post-install: diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile index ca08e0a111d..2a3128d8f97 100644 --- a/x11/wmfstatus/Makefile +++ b/x11/wmfstatus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:32 jlam Exp $ DISTNAME= wmfstatus-0.4 CATEGORIES= x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://www.finik.net/software.html COMMENT= General purpose 8x5 LCD screen for WindowMaker WRKSRC= ${WRKDIR}/${DISTNAME}/wmfstatus -USE_X11= YES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmfstatus ${PREFIX}/bin diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index c9a45b535f3..dd84ae47733 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= wmweather-2.4.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.godisch.de/debian/wmweather/ COMMENT= WindowMaker DockApp showing local weather conditions WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_X11= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index dd655d01937..2f41bfe1f3d 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= wxGTK-2.4.2 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.wxwidgets.org/ COMMENT= GTK-based implementation of the wxWidgets GUI library USE_PKGLOCALEDIR= YES -USE_X11= YES USE_LIBTOOL= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile index 89b3b615067..827d726a8f7 100644 --- a/x11/wxhaskell/Makefile +++ b/x11/wxhaskell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:32 jlam Exp $ DISTNAME= wxhaskell-src-0.9.4 PKGNAME= ${DISTNAME:S/-src//} @@ -11,7 +11,6 @@ HOMEPAGE= http://wxhaskell.sourceforge.net/index.html COMMENT= wxGTK binding for Haskell USE_TOOLS+= gmake -USE_X11= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/x11/xbindkeys/Makefile.common b/x11/xbindkeys/Makefile.common index 5ed123de70c..29868937c0d 100644 --- a/x11/xbindkeys/Makefile.common +++ b/x11/xbindkeys/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xbindkeys-1.7.1 @@ -12,5 +12,6 @@ COMMENT= Launches shell commands with your keyboard or your mouse DISTINFO_FILE= ${.CURDIR}/../../x11/xbindkeys/distinfo PATCHDIR= ${.CURDIR}/../../x11/xbindkeys/patches -USE_X11= yes GNU_CONFIGURE= yes + +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile index ea6fac2846d..83018f184f6 100644 --- a/x11/xcompmgr/Makefile +++ b/x11/xcompmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xcompmgr-1.1.1 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.freedesktop.org/ COMMENT= Sample compositing manager for X.org >= 6.8.0 GNU_CONFIGURE= yes -USE_X11= yes .include "../../mk/bsd.prefs.mk" diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile index 367e5a024e8..7f756483cc7 100644 --- a/x11/xcursor/Makefile +++ b/x11/xcursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:14 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= libXcursor-1.1.2 @@ -13,7 +13,6 @@ COMMENT= Client-side cursor loading library for X PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 73c8f36a284..bc979ef3dd9 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/10/03 00:18:39 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2005/06/01 18:03:32 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -16,8 +16,6 @@ BUILDLINK_RECOMMENDED.xcursor+= xcursor>=1.1.1nb2 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor .endif # XCURSOR_BUILDLINK3_MK -USE_X11= yes - # Xfixes/buildlink3.mk is included by xcursor/builtin.mk #.include "../../x11/Xfixes/buildlink3.mk" diff --git a/x11/xcursor/builtin-imake.mk b/x11/xcursor/builtin-imake.mk new file mode 100644 index 00000000000..0d398fd827a --- /dev/null +++ b/x11/xcursor/builtin-imake.mk @@ -0,0 +1,12 @@ +XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:32 jlam Exp $ + +/* + * Check the value of BuildXcursorLibrary for the presence of + * Xcursor in the X11 distribution. + */ +builtin-test: +#if BuildXcursorLibrary + @echo yes +#else + @echo no +#endif diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk index efb56f4eb37..f4ceddfe964 100644 --- a/x11/xcursor/builtin.mk +++ b/x11/xcursor/builtin.mk @@ -1,33 +1,53 @@ -# $NetBSD: builtin.mk,v 1.4 2004/07/24 06:48:51 grant Exp $ +# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:03:32 jlam Exp $ -_X11_XCURSOR_XCURSOR_H= ${X11BASE}/include/X11/Xcursor/Xcursor.h +BUILTIN_PKG:= xcursor +BUILTIN_FIND_FILES_VAR:= H_XCURSOR +BUILTIN_FIND_FILES.H_XCURSOR= ${X11BASE}/include/X11/Xcursor/Xcursor.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.xcursor) IS_BUILTIN.xcursor= no -. if exists(${_X11_XCURSOR_XCURSOR_H}) -IS_BUILTIN.xcursor= yes -# -# Create an appropriate package name for the built-in Xcursor distributed -# with the system. This package name can be used to check against -# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version -# or if the built-in one is sufficient. -# -_XCURSOR_MAJOR!= \ - ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MAJOR/ { print $$3 }' \ - ${_X11_XCURSOR_XCURSOR_H} -_XCURSOR_MINOR!= \ - ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MINOR/ { print "."$$3 }' \ - ${_X11_XCURSOR_XCURSOR_H} -_XCURSOR_REVISION!= \ - ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MINOR/ { print "."$$3 }' \ - ${_X11_XCURSOR_XCURSOR_H} -_XCURSOR_VERSION= ${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION} -BUILTIN_PKG.xcursor= xcursor-${_XCURSOR_VERSION} -BUILDLINK_VARS+= BUILTIN_PKG.xcursor +. if exists(${H_XCURSOR}) +PKGSRC_USE_TOOLS+= imake # XXX +IMAKE?= ${X11BASE}/bin/imake # XXX +. if defined(IMAKE) && exists(${IMAKE}) +IS_BUILTIN.xcursor!= \ + ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ + -f ${BUILDLINK_PKGSRCDIR.xcursor}/builtin-imake.mk \ + -s - | \ + ${MAKE} -f - builtin-test +. endif . endif -BUILDLINK_VARS+= IS_BUILTIN.xcursor -.endif # IS_BUILTIN.xcursor +.endif +MAKEVARS+= IS_BUILTIN.xcursor +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.xcursor) && \ + !empty(IS_BUILTIN.xcursor:M[yY][eE][sS]) && \ + exists(${H_XCURSOR}) +BUILTIN_VERSION.xcursor!= \ + ${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MAJOR/ { M = $$3 } \ + /\#define[ ]*XCURSOR_(LIB_)?MINOR/ { m = "."$$3 } \ + /\#define[ ]*XCURSOR_(LIB_)?REVISION/ { r = "."$$3 } \ + END { printf "%s%s%s\n", M, m, r }' \ + ${H_XCURSOR} +BUILTIN_PKG.xcursor= xcursor-${BUILTIN_VERSION.xcursor} +.endif +MAKEVARS+= BUILTIN_PKG.xcursor + +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### .if defined(USE_BUILTIN.Xfixes) && !empty(USE_BUILTIN.Xfixes:M[nN][oO]) USE_BUILTIN.xcursor= no .endif @@ -36,42 +56,49 @@ USE_BUILTIN.xcursor= no .endif .if !defined(USE_BUILTIN.xcursor) -USE_BUILTIN.xcursor?= ${IS_BUILTIN.xcursor} - -. if defined(BUILTIN_PKG.xcursor) +. if ${PREFER.xcursor} == "pkgsrc" +USE_BUILTIN.xcursor= no +. else +USE_BUILTIN.xcursor= ${IS_BUILTIN.xcursor} +. if defined(BUILTIN_PKG.xcursor) && \ + !empty(IS_BUILTIN.xcursor:M[yY][eE][sS]) USE_BUILTIN.xcursor= yes -. for _depend_ in ${BUILDLINK_DEPENDS.xcursor} -. if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) -USE_BUILTIN.xcursor!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.xcursor}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.xcursor} +. if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) +USE_BUILTIN.xcursor!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xcursor:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.xcursor +. endif +. endfor +. endif +. endif # PREFER.xcursor +.endif +MAKEVARS+= USE_BUILTIN.xcursor +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.xcursor?= no .if !empty(CHECK_BUILTIN.xcursor:M[nN][oO]) -.if !empty(USE_BUILTIN.xcursor:M[nN][oO]) +. if !empty(USE_BUILTIN.xcursor:M[nN][oO]) BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -. for _mkfile_ in buildlink3.mk builtin.mk -. if exists(../../x11/Xfixes/${_mkfile_}) +. for _mkfile_ in buildlink3.mk builtin.mk BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -. include "../../x11/Xfixes/${_mkfile_}" +. sinclude "../../x11/Xfixes/${_mkfile_}" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -. endif -. endfor -.endif +. endfor +. endif -.if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_PREFIX.xcursor= ${X11BASE} BUILDLINK_FILES.xcursor+= lib/pkgconfig/xcursor.pc USE_BUILTIN.Xrender= yes -.endif +. endif .endif # CHECK_BUILTIN.xcursor diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile index 127d9125c9b..9e9e67f8681 100644 --- a/x11/xdesktopwaves/Makefile +++ b/x11/xdesktopwaves/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xdesktopwaves-1.1 @@ -10,13 +10,14 @@ HOMEPAGE= http://xdesktopwaves.sourceforge.net/ COMMENT= Simulates water waves on the X Windows desktop USE_DIRS+= xdg-1.1 -USE_X11= YES MAKE_FLAGS+= CFLAGS="${CFLAGS}" MAKE_FLAGS+= LFLAGS="${LDFLAGS}" INSTALLATION_DIRS= bin man/man1 share/doc/xdesktopwaves +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdesktopwaves ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/xdesktopwaves.1 ${PREFIX}/man/man1/ diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile index 8768cc03d57..bc835ed8e5d 100644 --- a/x11/xdialog/Makefile +++ b/x11/xdialog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= Xdialog-2.1.1 @@ -17,7 +17,6 @@ BUILD_USES_MSGFMT= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -USE_X11= YES DOCDIR= ${PREFIX}/share/doc/html/xdialog EGDIR= ${PREFIX}/share/examples/xdialog @@ -35,5 +34,4 @@ post-install: done .include "../../x11/gtk/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xextensions/builtin.mk b/x11/xextensions/builtin.mk index a6032c4747e..b4fbc38c006 100644 --- a/x11/xextensions/builtin.mk +++ b/x11/xextensions/builtin.mk @@ -1,47 +1,68 @@ -# $NetBSD: builtin.mk,v 1.2 2005/03/22 15:52:35 jmmv Exp $ +# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:32 jlam Exp $ -_X11_EXTENSIONS_EXTUTIL_H= ${X11BASE}/include/X11/extensions/extutil.h -_X11_EXTENSIONS_PC= ${X11BASE}/lib/pkgconfig/xextensions.pc +BUILTIN_PKG:= xextensions +BUILTIN_FIND_FILES_VAR:= H_XEXTENSIONS +BUILTIN_FIND_FILES.H_XEXTENSIONS= \ + ${X11BASE}/include/X11/extensions/extutil.h + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### .if !defined(IS_BUILTIN.xextensions) IS_BUILTIN.xextensions= no -. if exists(${_X11_EXTENSIONS_EXTUTIL_H}) && exists(${_X11_EXTENSIONS_PC}) +# +# Here, we skip checking whether the files are under ${LOCALBASE} since +# we'll consider this X11 package to be built-in even if it's a part +# of one of the pkgsrc-installed X11 distributions. +# +. if exists(${H_XEXTENSIONS}) IS_BUILTIN.xextensions= yes -# hardcode version for now, since there currently is only one, really -BUILTIN_PKG.xextensions= xextensions-1.0.1 -BUILDLINK_VARS+= BUILTIN_PKG.xextensions . endif -BUILDLINK_VARS+= IS_BUILTIN.xextensions -.endif # IS_BUILTIN.xextensions +.endif +MAKEVARS+= IS_BUILTIN.xextensions +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### .if !defined(USE_BUILTIN.xextensions) -USE_BUILTIN.xextensions?= ${IS_BUILTIN.xextensions} - -. if defined(BUILTIN_PKG.xextensions) +. if ${PREFER.xextensions} == "pkgsrc" +USE_BUILTIN.xextensions= no +. else +USE_BUILTIN.xextensions= ${IS_BUILTIN.xextensions} +. if defined(BUILTIN_PKG.xextensions) && \ + !empty(IS_BUILTIN.xextensions:M[yY][eE][sS]) USE_BUILTIN.xextensions= yes -. for _depend_ in ${BUILDLINK_DEPENDS.xextensions} -. if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) -USE_BUILTIN.xextensions!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.xextensions}; then \ - ${ECHO} "yes"; \ +. for _dep_ in ${BUILDLINK_DEPENDS.xextensions} +. if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) +USE_BUILTIN.xextensions!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xextensions:Q}; then \ + ${ECHO} yes; \ else \ - ${ECHO} "no"; \ + ${ECHO} no; \ fi -. endif -. endfor -. endif -.endif # USE_BUILTIN.xextensions +. endif +. endfor +. endif +. endif # PREFER.xextensions +.endif +MAKEVARS+= USE_BUILTIN.xextensions +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### CHECK_BUILTIN.xextensions?= no .if !empty(CHECK_BUILTIN.xextensions:M[nN][oO]) -.if !empty(USE_BUILTIN.xextensions:M[nN][oO]) -BUILDLINK_DEPENDS.xextensions+= xextensions>=1.0 -.endif - -.if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS]) BUILDLINK_PREFIX.xextensions= ${X11BASE} -USE_X11= yes -.endif +. include "../../mk/x11.buildlink3.mk" +. include "../../mk/x11.builtin.mk" +. endif .endif # CHECK_BUILTIN.xextensions diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index 313c1adb3bc..cfce1dcbb9f 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xfstt-1.6 @@ -22,6 +22,8 @@ CXXFLAGS+= -fomit-frame-pointer -ffast-math RCD_SCRIPTS= xfstt +.include "../../mk/x11.buildlink3.mk" + post-patch: @( \ cd ${WRKSRC} ; \ diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile index 27ab13a6ab1..e79448600a9 100644 --- a/x11/xjman/Makefile +++ b/x11/xjman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/03/24 21:13:04 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ DISTNAME= xjman-0.5 CATEGORIES= japanese x11 @@ -22,6 +22,7 @@ NO_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" post-extract: .for f in Makefile Makefile.inc diff --git a/x11/xkbd/Makefile b/x11/xkbd/Makefile index 0361db39316..90997d34f5a 100644 --- a/x11/xkbd/Makefile +++ b/x11/xkbd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xkbd-0.8.5 @@ -13,7 +13,6 @@ COMMENT= On-screen keyboard for X, useful for palmtops CONFIGURE_ARGS+=--enable-xpm GNU_CONFIGURE= YES -USE_X11= YES .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile index 26cfbcc6a42..6846c3a6bde 100644 --- a/x11/xkbset/Makefile +++ b/x11/xkbset/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $ # DISTNAME= xkbset-0.3 @@ -14,4 +14,5 @@ USE_PERL5= build USE_X11BASE= yes REPLACE_PERL= mskacc-gui +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index c79e2cb2163..6a3bf649dce 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2005/05/30 23:34:49 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.28 2005/06/01 18:03:32 jlam Exp $ # # This Makefile.common is included by: # @@ -61,6 +61,8 @@ CONFIGURE_ARGS+= --enable-def-play="${XLOCK_AUDIOPLAY}" CONFIGURE_ARGS+= --without-dpms .endif +.include "../../mk/x11.buildlink3.mk" + # Set the complete paths to the sound files and set the default xlock # mode/screensaver. # diff --git a/x11/xmindpath/Makefile b/x11/xmindpath/Makefile index 53a540be241..8a9994bc6fb 100644 --- a/x11/xmindpath/Makefile +++ b/x11/xmindpath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:28 agc Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:32 jlam Exp $ DISTNAME= magicpoint-1.09a PKGNAME= xmindpath-1.09a @@ -10,6 +10,6 @@ COMMENT= MindPath PocketPoint user-level driver for X11 WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/xmindpath GNU_CONFIGURE= yes -USE_X11= yes +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile index d97d1fdfa40..cc0a1d69fff 100644 --- a/x11/xneko/Makefile +++ b/x11/xneko/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/03/24 21:13:04 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xneko PKGNAME= xneko-4.4 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Classic BSD4.4 cat-and-mouse WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko -USE_X11= yes MANCOMPRESSED_IF_MANZ= yes PLIST_SRC= ${WRKDIR}/PLIST @@ -19,6 +18,8 @@ PLIST_SRC= ${WRKDIR}/PLIST BUILD_DEFS+= MANINSTALL +.include "../../mk/x11.buildlink3.mk" + post-install: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @for OPT in ${MANINSTALL} x; do \ diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile index 0a250074b10..853caa9f55d 100644 --- a/x11/xnodecor/Makefile +++ b/x11/xnodecor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xnodecor-0.1 CATEGORIES= x11 @@ -12,6 +12,8 @@ COMMENT= Borderless or undecorated window support utility USE_X11BASE= yes NO_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" + do-extract: @${MKDIR} ${WRKSRC} ${CP} ${FILESDIR}/Makefile ${WRKSRC} diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 2008b29abf6..19b89791483 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/04/15 15:31:14 hira Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:33 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} @@ -13,7 +13,6 @@ HOMEPAGE= http://www.x.org/ COMMENT= X.org client programs and related files USE_PKGINSTALL= yes -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches diff --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk new file mode 100644 index 00000000000..f600b89da58 --- /dev/null +++ b/x11/xorg-libs/builtin.mk @@ -0,0 +1,81 @@ +# $NetBSD: builtin.mk,v 1.1 2005/06/01 18:03:33 jlam Exp $ + +BUILTIN_PKG:= xorg-libs + +BUILTIN_FIND_FILES_VAR:= CF_XORG +BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf + +.include "../../mk/buildlink3/bsd.builtin.mk" + +### +### Determine if there is a built-in implementation of the package and +### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). +### +.if !defined(IS_BUILTIN.xorg-libs) +IS_BUILTIN.xorg-libs= no +. if exists(${CF_XORG}) +IS_BUILTIN.xorg-libs= yes +. endif +.endif +MAKEVARS+= IS_BUILTIN.xorg-libs + +### +### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to +### a package name to represent the built-in package. +### +.if !defined(BUILTIN_PKG.xorg-libs) && \ + !empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS]) && \ + exists(${CF_XORG}) +. include "${BUILDLINK_PKGSRCDIR.xorg-libs}/version.mk" +BUILTIN_PKG.xorg-libs= xorg-libs-${BUILTIN_X11_VERSION.xorg} +.endif +MAKEVARS+= BUILTIN_PKG.xorg-libs + +### +### Determine whether we should use the built-in implementation if it +### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). +### +.if !defined(USE_BUILTIN.xorg-libs) +. if ${PREFER.xorg-libs} == "pkgsrc" +USE_BUILTIN.xorg-libs= no +. else +USE_BUILTIN.xorg-libs= ${IS_BUILTIN.xorg-libs} +. if defined(BUILTIN_PKG.xorg-libs) && \ + !empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS]) +USE_BUILTIN.xorg-libs= yes +. for _dep_ in ${BUILDLINK_DEPENDS.xorg-libs} +. if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS]) +USE_BUILTIN.xorg-libs!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xorg-libs:Q}; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +. endif +. endfor +. endif +. endif # PREFER.xorg-libs +.endif +MAKEVARS+= USE_BUILTIN.xorg-libs + +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.xorg-libs?= no +.if !empty(CHECK_BUILTIN.xorg-libs:M[nN][oO]) + +. if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS]) +BUILDLINK_PREFIX.xorg-libs= ${X11BASE} +BUILDLINK_FILES.xorg-libs+= lib/pkgconfig/xorg-libs.pc +. endif + +# XXX +# XXX xorg-libs provides some X11 pieces that pkgsrc should currently +# XXX treat as "built-in" so that extra dependencies on the pkgsrc +# XXX versions aren't pulled in. +# XXX +USE_BUILTIN.Xfixes= yes +USE_BUILTIN.Xcomposite= yes + +.endif # CHECK_BUILTIN.xorg-libs diff --git a/x11/xorg-libs/version.mk b/x11/xorg-libs/version.mk new file mode 100644 index 00000000000..0ee5141cb8f --- /dev/null +++ b/x11/xorg-libs/version.mk @@ -0,0 +1,44 @@ +# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:33 jlam Exp $ +# +# This Makefile fragment is included by Makefiles that need to access +# the X11_TYPE and version number of an X.org distribution. +# +# The following variables are provided by this file: +# +# BUILTIN_X11_TYPE.xorg is the X11_TYPE of the X.org distribution +# and is simply "xorg". +# +# BUILTIN_X11_VERSION.xorg is the version number of the X.org +# distribution detected on the system. +# + +BUILTIN_X11_TYPE.xorg= xorg + +BUILTIN_FILES_VAR:= CF_XORGVERSION CF_XORG +BUILTIN_FILES.CF_XORGVERSION= ${X11BASE}/lib/X11/config/xorgversion.def +BUILTIN_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf +.include "../../mk/buildlink3/find-files.mk" + +.if !defined(BUILTIN_XORG_VERSION_FILE) +BUILTIN_XORG_VERSION_FILE= __nonexistent__ +. if exists(${BUILTIN_X11_CONFIG_XORGVERSION_DEF}) +BUILTIN_XORG_VERSION_FILE= ${BUILTIN_X11_CONFIG_XORGVERSION_DEF} +. elif exists(${BUILTIN_X11_CONFIG_XORG_CF}) +BUILTIN_XORG_VERSION_FILE= ${BUILTIN_X11_CONFIG_XORG_CF} +. endif +.endif +MAKEVARS+= BUILTIN_XORG_VERSION_FILE + +.if !defined(BUILTIN_X11_VERSION.xorg) && \ + exists(${BUILTIN_XORG_VERSION_FILE}) +BUILTIN_X11_VERSION.xorg!= \ + ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { M = $$3 } \ + /\#define[ ]*XORG_VERSION_MINOR/ { m = "."$$3 } \ + /\#define[ ]*XORG_VERSION_PATCH/ { p = "."$$3 } \ + /\#define[ ]*XORG_VERSION_SNAP/ { s = "."$$3 } \ + END { if (s == ".0") s = ""; \ + if (p == ".0" && s == "") p = ""; \ + printf "%s%s%s%s\n", M, m, p, s }' \ + ${BUILTIN_XORG_VERSION_FILE} +.endif +MAKEVARS+= BUILTIN_X11_VERSION.xorg diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index d02a800087f..7d8ca477188 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/04/15 21:53:38 hira Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:33 jlam Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} @@ -13,7 +13,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org X server and related programs -USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches @@ -90,4 +89,5 @@ BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.8.2nb1 .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/xorg/Makefile.common" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index 0c772b4bb85..002249a89d1 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xosd-2.2.12 CATEGORIES= x11 @@ -13,7 +13,6 @@ PATCHDIR= ${.CURDIR}/../../x11/xosd/patches GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_X11= yes SHLIBTOOL_OVERRIDE= libtool-disable-static @@ -30,3 +29,4 @@ SUBST_SED.fixme= -e "s|-lpthread|${PTHREAD_LIBS}|g" PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile index 4ac1ea13341..042908e7fd3 100644 --- a/x11/xpad/Makefile +++ b/x11/xpad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xpad-1.12 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes LIBS.SunOS= -lX11 diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile index de1252fd9f3..b499e7f41cb 100644 --- a/x11/xpenguins/Makefile +++ b/x11/xpenguins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xpenguins-2.2 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://xpenguins.seul.org/ COMMENT= Little penguins walking along the tops of your windows -USE_X11= YES GNU_CONFIGURE= YES .include "../../graphics/xpm/buildlink3.mk" diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile index 5a50f281e53..a3a7ffd9374 100644 --- a/x11/xplanet/Makefile +++ b/x11/xplanet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xplanet-1.1.2 CATEGORIES= x11 @@ -9,7 +9,6 @@ HOMEPAGE= http://xplanet.sourceforge.net/ COMMENT= Rotating rendered map of the Earth in X11 root window USE_TOOLS+= gmake -USE_X11= yes GNU_CONFIGURE= yes # directory creation should be fixed in the future release of xplanet diff --git a/x11/xpmicons/Makefile b/x11/xpmicons/Makefile index a1634426536..f5b3290718b 100644 --- a/x11/xpmicons/Makefile +++ b/x11/xpmicons/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:29 agc Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xpmicons-1.0 CATEGORIES= x11 @@ -21,6 +21,8 @@ DIST_SUBDIR= icons USE_X11BASE= yes NO_BUILD= yes +.include "../../mk/x11.buildlink3.mk" + post-extract: ${FIND} ${WRKSRC} -type d -name .xvpics -exec ${RM} -rf {} \; -prune diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile index 2dcb76c2413..9b17be89fa4 100644 --- a/x11/xpns/Makefile +++ b/x11/xpns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:33 jlam Exp $ DISTNAME= pns_source PKGNAME= xpns-1.0 @@ -15,6 +15,8 @@ USE_X11BASE= yes MAKEFILE= makefile BUILD_TARGET= pns +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/xpns ${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/ diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile index 1971de98f6a..95ba1a5b6ed 100644 --- a/x11/xrestop/Makefile +++ b/x11/xrestop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/04 20:03:40 reed Exp $ +# $NetBSD: Makefile,v 1.2 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xrestop-0.3 @@ -9,8 +9,8 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.freedesktop.org/Software/xrestop COMMENT= X11 clients' server-side resource usage monitor -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile index 14e760c85fb..30281ab810b 100644 --- a/x11/xservers/Makefile +++ b/x11/xservers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/25 11:54:55 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xservers-3.3.6.3 CATEGORIES= x11 @@ -33,6 +33,7 @@ X11_SRCS= Imakefile Makefile config fonts include lib nls \ MESSAGE_SUBST+= X11_SUBDIR=${X11_SUBDIR} .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" do-fetch: .if defined(BSDXSRCDIR) diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile index b53930bddb0..6ded9bcc261 100644 --- a/x11/xteddy/Makefile +++ b/x11/xteddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xteddy-1.1 CATEGORIES= x11 games @@ -8,7 +8,6 @@ MAINTAINER= johnam@mail.kemper.org HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy COMMENT= Xteddy is a cuddly teddy bear for your X Windows desktop -USE_X11= YES GNU_CONFIGURE= YES pre-install: @@ -16,5 +15,4 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps .include "../../graphics/xpm/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index cd4ef2b3558..3b77d27163a 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xteddy-2.0.1 PKGREVISION= 6 @@ -11,7 +11,6 @@ COMMENT= Teddy bear for your desktop CONFLICT+= xteddy-1.* -USE_X11= yes GNU_CONFIGURE= yes pre-configure: diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 7dd56a90c56..d72db05e149 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xterm-200 PKGREVISION= 1 @@ -11,10 +11,10 @@ HOMEPAGE= http://dickey.his.com/xterm/xterm.html COMMENT= Latest terminal emulator for the X Window System GNU_CONFIGURE= yes -USE_X11= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .include "../../mk/bsd.prefs.mk" +.include "../../mk/x11.buildlink3.mk" .if ${OPSYS} == "SunOS" INSTALL_FILE= ${WRKDIR}/INSTALL diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile index 35fd1a7167b..8108dabefea 100644 --- a/x11/xtermset/Makefile +++ b/x11/xtermset/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:16 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xtermset-0.5.2 @@ -12,6 +12,8 @@ COMMENT= Change things like foreground color, size etc. on an xterm #USE_X11BASE= YES GNU_CONFIGURE= yes +.include "../../mk/x11.buildlink3.mk" + xpost-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xtermset ${INSTALL_DATA} ${WRKSRC}/ctlseqs.ms ${PREFIX}/share/doc/xtermset diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index 94087cdf970..104b0387a8c 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xvattr-1.3 PKGREVISION= 3 @@ -9,7 +9,6 @@ MAINTAINER= veego@NetBSD.org HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= Modify Xv attributes -USE_X11= # defined GNU_CONFIGURE= # defined .include "../../mk/bsd.prefs.mk" diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common index 82a2c5b0f3c..bd89b0f0add 100644 --- a/x11/xvidcap/Makefile.common +++ b/x11/xvidcap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/06/01 18:03:33 jlam Exp $ # # Note: when upgrading version, be sure to update distinfo in xvidcap-gtk2 also @@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xvidcap/} MAINTAINER= reed@reedmedia.net HOMEPAGE= http://xvidcap.sourceforge.net/ -USE_X11= yes GNU_CONFIGURE= yes .include "../../devel/zlib/buildlink3.mk" @@ -17,3 +16,4 @@ GNU_CONFIGURE= yes .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index 29dae3c15ad..8553120e700 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= xworld-2.0 @@ -11,7 +11,6 @@ MAINTAINER= wennmach@NetBSD.org COMMENT= Earth as seen from the direction of the sun HAS_CONFIGURE= yes -USE_X11= yes CONFIGURE_ENV+= PREFIX="${PREFIX}" CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11" @@ -23,4 +22,5 @@ SUBST_STAGE.install= post-patch SUBST_FILES.install= Makefile.in SUBST_SED.install= -e 's,-g bin -o bin,-g ${BINGRP} -o ${BINOWN},g' +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile index 139d5a7efb2..a88ae95c64e 100644 --- a/x11/xwrits/Makefile +++ b/x11/xwrits/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:17 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:33 jlam Exp $ DISTNAME= xwrits-2.21 CATEGORIES= x11 @@ -9,6 +9,6 @@ HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/ COMMENT= Wrist break reminder for prevention of repetitive stress injuries GNU_CONFIGURE= YES -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 22a9c006af1..01adede0eaa 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:52 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:33 jlam Exp $ # DISTNAME= zenity-2.10.0 @@ -16,7 +16,6 @@ USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 |