diff options
| author | cube <cube> | 2008-09-26 21:15:18 +0000 |
|---|---|---|
| committer | cube <cube> | 2008-09-26 21:15:18 +0000 |
| commit | 4805bae1a089d84484f935be7717f4c3db1c15f6 (patch) | |
| tree | fa0ba34919472c65742edfaa7d9f43cee7a71455 | |
| parent | 61fd2f50f0cca2a8c61042937e1cdeea4dff95fc (diff) | |
| download | pkgsrc-4805bae1a089d84484f935be7717f4c3db1c15f6.tar.gz | |
Make all X11-related builtin.mk files include x11.builtin.mk to make sure
all the necessary logic to use x11-links is included no matter what bl3
files a given pacakge includes.
56 files changed, 139 insertions, 68 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index ac3dba3bf8e..bc4c26f8794 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.16 2008/01/05 17:24:12 tron Exp $ +# $NetBSD: builtin.mk,v 1.16.8.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= Xft2 @@ -86,6 +86,9 @@ MAKEVARS+= USE_BUILTIN.Xft2 ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. ### + +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.Xft2?= no .if !empty(CHECK_BUILTIN.Xft2:M[nN][oO]) @@ -93,9 +96,4 @@ CHECK_BUILTIN.Xft2?= no BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1nb2 . endif -. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) -BUILDLINK_PREFIX.Xft2= ${X11BASE} -BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc -. endif - .endif # CHECK_BUILTIN.Xft2 diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk index d046f36709a..a7d24fcf302 100644 --- a/fonts/fontconfig/builtin.mk +++ b/fonts/fontconfig/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $ +# $NetBSD: builtin.mk,v 1.9.22.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= fontconfig @@ -85,6 +85,9 @@ MAKEVARS+= USE_BUILTIN.fontconfig ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. ### + +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.fontconfig?= no .if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO]) @@ -94,9 +97,6 @@ BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3 . endif . if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) -BUILDLINK_PREFIX.fontconfig= ${X11BASE} -BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc - USE_BUILTIN.expat= yes USE_BUILTIN.freetype2= yes USE_BUILTIN.zlib= yes diff --git a/fonts/libfontenc/builtin.mk b/fonts/libfontenc/builtin.mk index f14230c083f..91ba21f56b9 100644 --- a/fonts/libfontenc/builtin.mk +++ b/fonts/libfontenc/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libfontenc PKGCONFIG_FILE.libfontenc= ${X11BASE}/lib/pkgconfig/fontenc.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk index 9ca874b471d..0c65a69345f 100644 --- a/x11/Xcomposite/builtin.mk +++ b/x11/Xcomposite/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.12 2006/04/19 15:39:06 reed Exp $ +# $NetBSD: builtin.mk,v 1.12.22.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= Xcomposite @@ -48,3 +48,5 @@ USE_BUILTIN.Xcomposite!= \ . endif # PREFER.Xcomposite .endif MAKEVARS+= USE_BUILTIN.Xcomposite + +.include "../../mk/x11.builtin.mk" diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk index 506d4a6b937..0c01ba17b09 100644 --- a/x11/Xfixes/builtin.mk +++ b/x11/Xfixes/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:56 reed Exp $ +# $NetBSD: builtin.mk,v 1.10.22.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= Xfixes @@ -47,3 +47,5 @@ USE_BUILTIN.Xfixes!= \ . endif # PREFER.Xfixes .endif MAKEVARS+= USE_BUILTIN.Xfixes + +.include "../../mk/x11.builtin.mk" diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk index b596f5eb625..480e63c92ac 100644 --- a/x11/Xrender/builtin.mk +++ b/x11/Xrender/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.17 2006/04/06 06:22:57 reed Exp $ +# $NetBSD: builtin.mk,v 1.17.22.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= Xrender @@ -96,6 +96,9 @@ 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. ### + +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.Xrender?= no .if !empty(CHECK_BUILTIN.Xrender:M[nN][oO]) diff --git a/x11/bigreqsproto/builtin.mk b/x11/bigreqsproto/builtin.mk index 317b00c37a3..f539e7b31b8 100644 --- a/x11/bigreqsproto/builtin.mk +++ b/x11/bigreqsproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 04:28:12 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= bigreqsproto PKGCONFIG_FILE.bigreqsproto= ${X11BASE}/lib/pkgconfig/bigreqsproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/compositeproto/builtin.mk b/x11/compositeproto/builtin.mk index 576e52af0fc..411068af12a 100644 --- a/x11/compositeproto/builtin.mk +++ b/x11/compositeproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2006/12/16 01:04:43 joerg Exp $ +# $NetBSD: builtin.mk,v 1.4.18.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= compositeproto @@ -57,6 +57,8 @@ USE_BUILTIN.compositeproto!= \ .endif MAKEVARS+= USE_BUILTIN.compositeproto +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.compositeproto?= no .if !empty(CHECK_BUILTIN.compositeproto:M[nN][oO]) diff --git a/x11/damageproto/builtin.mk b/x11/damageproto/builtin.mk index 4631c4f12a2..1db2c5ddcf2 100644 --- a/x11/damageproto/builtin.mk +++ b/x11/damageproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/16 03:04:48 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= damageproto PKGCONFIG_FILE.damageproto= ${X11BASE}/lib/pkgconfig/damageproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/evieext/builtin.mk b/x11/evieext/builtin.mk index dddbcadbed4..cbe3d6c4934 100644 --- a/x11/evieext/builtin.mk +++ b/x11/evieext/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:29:27 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= evieext PKGCONFIG_FILE.evieext= ${X11BASE}/lib/pkgconfig/evieproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/fixesproto/builtin.mk b/x11/fixesproto/builtin.mk index faa3b6bbb16..124f99c852d 100644 --- a/x11/fixesproto/builtin.mk +++ b/x11/fixesproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.6 2007/02/22 19:27:26 wiz Exp $ +# $NetBSD: builtin.mk,v 1.6.16.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= fixesproto @@ -57,6 +57,8 @@ USE_BUILTIN.fixesproto!= \ .endif MAKEVARS+= USE_BUILTIN.fixesproto +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.fixesproto?= no .if !empty(CHECK_BUILTIN.fixesproto:M[nN][oO]) diff --git a/x11/fontcacheproto/builtin.mk b/x11/fontcacheproto/builtin.mk index 71b1e5a9e9c..83dfd845796 100644 --- a/x11/fontcacheproto/builtin.mk +++ b/x11/fontcacheproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 14:37:15 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= fontcacheproto PKGCONFIG_FILE.fontcacheproto= ${X11BASE}/lib/pkgconfig/fontcacheproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/fontsproto/builtin.mk b/x11/fontsproto/builtin.mk index f36d3fe5e6d..63b9d6b3235 100644 --- a/x11/fontsproto/builtin.mk +++ b/x11/fontsproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 15:13:01 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= fontsproto PKGCONFIG_FILE.fontsproto= ${X11BASE}/lib/pkgconfig/fontsproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/glproto/builtin.mk b/x11/glproto/builtin.mk index 6d3b2a2991a..f6325985cf2 100644 --- a/x11/glproto/builtin.mk +++ b/x11/glproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 16:29:52 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= glproto PKGCONFIG_FILE.glproto= ${X11BASE}/lib/pkgconfig/glproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/inputproto/builtin.mk b/x11/inputproto/builtin.mk index 46e1ba6f329..3875a967b74 100644 --- a/x11/inputproto/builtin.mk +++ b/x11/inputproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2008/01/05 16:00:08 tron Exp $ +# $NetBSD: builtin.mk,v 1.2.8.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= inputproto @@ -59,3 +59,5 @@ USE_BUILTIN.inputproto!= \ . endif # PREFER.inputproto .endif MAKEVARS+= USE_BUILTIN.inputproto + +.include "../../mk/x11.builtin.mk" diff --git a/x11/kbproto/builtin.mk b/x11/kbproto/builtin.mk index cac336fe076..67b0a60975e 100644 --- a/x11/kbproto/builtin.mk +++ b/x11/kbproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/15 15:34:51 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= kbproto @@ -47,3 +47,5 @@ USE_BUILTIN.kbproto!= \ . endif # PREFER.kbproto .endif MAKEVARS+= USE_BUILTIN.kbproto + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libFS/builtin.mk b/x11/libFS/builtin.mk index 8dc0f005bc1..a1ccfad6691 100644 --- a/x11/libFS/builtin.mk +++ b/x11/libFS/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 20:46:48 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libFS PKGCONFIG_FILE.libFS= ${X11BASE}/lib/pkgconfig/libfs.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libICE/builtin.mk b/x11/libICE/builtin.mk index 43dcd9348a3..09beead662f 100644 --- a/x11/libICE/builtin.mk +++ b/x11/libICE/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/17 13:27:29 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libICE @@ -47,3 +47,5 @@ USE_BUILTIN.libICE!= \ . endif # PREFER.libICE .endif MAKEVARS+= USE_BUILTIN.libICE + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libSM/builtin.mk b/x11/libSM/builtin.mk index 2cf24688655..d9899726387 100644 --- a/x11/libSM/builtin.mk +++ b/x11/libSM/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/17 14:24:06 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libSM @@ -47,3 +47,5 @@ USE_BUILTIN.libSM!= \ . endif # PREFER.libSM .endif MAKEVARS+= USE_BUILTIN.libSM + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libX11/builtin.mk b/x11/libX11/builtin.mk index 024567319e5..1a497c3ef79 100644 --- a/x11/libX11/builtin.mk +++ b/x11/libX11/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2008/04/01 13:46:13 tron Exp $ +# $NetBSD: builtin.mk,v 1.3.8.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libX11 @@ -48,7 +48,4 @@ USE_BUILTIN.libX11!= \ .endif MAKEVARS+= USE_BUILTIN.libX11 -.if !empty(USE_BUILTIN.libX11:M[yY][eE][sS]) -BUILDLINK_PREFIX.libX11= ${X11BASE} -BUILDLINK_PASSTHRU_DIRS+= ${X11BASE}/include ${X11BASE}/lib -.endif +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXScrnSaver/builtin.mk b/x11/libXScrnSaver/builtin.mk index 4df8fb5c846..39d0da0fa66 100644 --- a/x11/libXScrnSaver/builtin.mk +++ b/x11/libXScrnSaver/builtin.mk @@ -1,7 +1,8 @@ -# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/18 02:23:04 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.3 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libXScrnSaver PKGCONFIG_FILE.libXScrnSaver= ${X11BASE}/lib/pkgconfig/xscrnsaver.pc \ ${X11BASE}/lib/libXss.so .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXTrap/builtin.mk b/x11/libXTrap/builtin.mk index 4ee39b97526..e60a247757c 100644 --- a/x11/libXTrap/builtin.mk +++ b/x11/libXTrap/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 02:40:26 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libXTrap PKGCONFIG_FILE.libXTrap= ${X11BASE}/lib/pkgconfig/xtrap.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXau/builtin.mk b/x11/libXau/builtin.mk index cef415ac8b4..583c153a086 100644 --- a/x11/libXau/builtin.mk +++ b/x11/libXau/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/15 15:41:36 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libXau @@ -47,3 +47,5 @@ USE_BUILTIN.libXau!= \ . endif # PREFER.libXau .endif MAKEVARS+= USE_BUILTIN.libXau + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXdamage/builtin.mk b/x11/libXdamage/builtin.mk index 5835d6717b6..8ff1c74a3ba 100644 --- a/x11/libXdamage/builtin.mk +++ b/x11/libXdamage/builtin.mk @@ -1,7 +1,8 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/21 17:04:13 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXdamage PKGCONFIG_FILE.libXdamage= ${X11BASE}/lib/pkgconfig/xdamage.pc \ ${X11BASE}/lib/libXdamage.so .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXdmcp/builtin.mk b/x11/libXdmcp/builtin.mk index 98d4349c3cc..f4f2656e45e 100644 --- a/x11/libXdmcp/builtin.mk +++ b/x11/libXdmcp/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/15 15:44:24 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXdmcp @@ -47,3 +47,5 @@ USE_BUILTIN.libXdmcp!= \ . endif # PREFER.libXdmcp .endif MAKEVARS+= USE_BUILTIN.libXdmcp + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXevie/builtin.mk b/x11/libXevie/builtin.mk index b1a5a720ef8..49b0f772d7e 100644 --- a/x11/libXevie/builtin.mk +++ b/x11/libXevie/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 03:09:52 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXevie PKGCONFIG_FILE.libXevie= ${X11BASE}/lib/pkgconfig/xevie.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXext/builtin.mk b/x11/libXext/builtin.mk index b7a3244d25a..9dd4fb62f29 100644 --- a/x11/libXext/builtin.mk +++ b/x11/libXext/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/13 04:45:46 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.10.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXext @@ -47,3 +47,5 @@ USE_BUILTIN.libXext!= \ . endif # PREFER.libXext .endif MAKEVARS+= USE_BUILTIN.libXext + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXfont/builtin.mk b/x11/libXfont/builtin.mk index dd7e245b4a0..2e7b17e61ef 100644 --- a/x11/libXfont/builtin.mk +++ b/x11/libXfont/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXfont PKGCONFIG_FILE.libXfont= ${X11BASE}/lib/pkgconfig/xfont.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXinerama/builtin.mk b/x11/libXinerama/builtin.mk index 6368e219ffb..08129ff1c7d 100644 --- a/x11/libXinerama/builtin.mk +++ b/x11/libXinerama/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.10.2 2008/09/21 22:58:06 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.10.3 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXinerama PKGCONFIG_FILE.libXinerama= ${X11BASE}/lib/pkgconfig/xinerama.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXmu/builtin.mk b/x11/libXmu/builtin.mk index b2429237d90..0c0ee526ab4 100644 --- a/x11/libXmu/builtin.mk +++ b/x11/libXmu/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/16 19:04:28 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXmu @@ -47,3 +47,5 @@ USE_BUILTIN.libXmu!= \ . endif # PREFER.libXmu .endif MAKEVARS+= USE_BUILTIN.libXmu + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXprintUtil/builtin.mk b/x11/libXprintUtil/builtin.mk index 4e0ca209031..44186e46e4f 100644 --- a/x11/libXprintUtil/builtin.mk +++ b/x11/libXprintUtil/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXprintUtil PKGCONFIG_FILE.libXprintUtil= ${X11BASE}/lib/pkgconfig/xprintutil.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXrandr/builtin.mk b/x11/libXrandr/builtin.mk index c5715afa354..484276054d2 100644 --- a/x11/libXrandr/builtin.mk +++ b/x11/libXrandr/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/16 20:19:11 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXrandr @@ -47,3 +47,5 @@ USE_BUILTIN.libXrandr!= \ . endif # PREFER.libXrandr .endif MAKEVARS+= USE_BUILTIN.libXrandr + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXrender/builtin.mk b/x11/libXrender/builtin.mk index 0cf3219f91a..e8bc97e3282 100644 --- a/x11/libXrender/builtin.mk +++ b/x11/libXrender/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/16 19:38:25 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXrender @@ -47,3 +47,5 @@ USE_BUILTIN.libXrender!= \ . endif # PREFER.libXrender .endif MAKEVARS+= USE_BUILTIN.libXrender + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXres/builtin.mk b/x11/libXres/builtin.mk index 74307648b58..361d16052ed 100644 --- a/x11/libXres/builtin.mk +++ b/x11/libXres/builtin.mk @@ -1,7 +1,8 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/21 21:36:41 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXres PKGCONFIG_FILE.libXres= ${X11BASE}/lib/pkgconfig/xres.pc \ ${X11BASE}/lib/libXres.so .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/libXt/builtin.mk b/x11/libXt/builtin.mk index 197567e1765..cd8b57d2a1e 100644 --- a/x11/libXt/builtin.mk +++ b/x11/libXt/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/12/17 15:02:26 tron Exp $ +# $NetBSD: builtin.mk,v 1.1.10.1 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libXt @@ -47,3 +47,5 @@ USE_BUILTIN.libXt!= \ . endif # PREFER.libXt .endif MAKEVARS+= USE_BUILTIN.libXt + +.include "../../mk/x11.builtin.mk" diff --git a/x11/libdrm/builtin.mk b/x11/libdrm/builtin.mk index 2ffda43fa66..254dd4eddf2 100644 --- a/x11/libdrm/builtin.mk +++ b/x11/libdrm/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= libdrm PKGCONFIG_FILE.libdrm= ${X11BASE}/lib/pkgconfig/libdrm.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/liblbxutil/builtin.mk b/x11/liblbxutil/builtin.mk index 3343a557347..c2e7f164836 100644 --- a/x11/liblbxutil/builtin.mk +++ b/x11/liblbxutil/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= liblbxutil PKGCONFIG_FILE.liblbxutil= ${X11BASE}/lib/pkgconfig/lbxutil.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/liboldXrandr/builtin.mk b/x11/liboldXrandr/builtin.mk index dd66fe919d6..3c4bb723c48 100644 --- a/x11/liboldXrandr/builtin.mk +++ b/x11/liboldXrandr/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2007/05/30 01:22:13 schmonz Exp $ +# $NetBSD: builtin.mk,v 1.1.16.1 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= Xrandr @@ -96,6 +96,9 @@ 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. ### + +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.Xrandr?= no .if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO]) diff --git a/x11/pixman/builtin.mk b/x11/pixman/builtin.mk index a8f130b3339..a5a9903afcd 100644 --- a/x11/pixman/builtin.mk +++ b/x11/pixman/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/16 03:04:48 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= pixman PKGCONFIG_FILE.pixman= ${X11BASE}/lib/pkgconfig/pixman-1.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/printproto/builtin.mk b/x11/printproto/builtin.mk index c682950394c..3b1b8a6b3bc 100644 --- a/x11/printproto/builtin.mk +++ b/x11/printproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 16:38:58 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= printproto PKGCONFIG_FILE.printproto= ${X11BASE}/lib/pkgconfig/printproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/recordproto/builtin.mk b/x11/recordproto/builtin.mk index 84bf40b5589..74c407f2d66 100644 --- a/x11/recordproto/builtin.mk +++ b/x11/recordproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 17:22:02 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= recordproto PKGCONFIG_FILE.recordproto= ${X11BASE}/lib/pkgconfig/recordproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/resourceproto/builtin.mk b/x11/resourceproto/builtin.mk index b1827df4dd6..8ea332cf9d5 100644 --- a/x11/resourceproto/builtin.mk +++ b/x11/resourceproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 17:35:11 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= resourceproto PKGCONFIG_FILE.resourceproto= ${X11BASE}/lib/pkgconfig/resourceproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/scrnsaverproto/builtin.mk b/x11/scrnsaverproto/builtin.mk index b679165197b..ca8c58bb1fc 100644 --- a/x11/scrnsaverproto/builtin.mk +++ b/x11/scrnsaverproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 17:29:50 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= scrnsaverproto PKGCONFIG_FILE.scrnsaverproto= ${X11BASE}/lib/pkgconfig/scrnsaverproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/trapproto/builtin.mk b/x11/trapproto/builtin.mk index c3d801ce172..43238d3ff5e 100644 --- a/x11/trapproto/builtin.mk +++ b/x11/trapproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:01 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= trapproto PKGCONFIG_FILE.trapproto= ${X11BASE}/lib/pkgconfig/trapproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/videoproto/builtin.mk b/x11/videoproto/builtin.mk index 5623ef5db07..2cf9e6c617c 100644 --- a/x11/videoproto/builtin.mk +++ b/x11/videoproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:01 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= videoproto PKGCONFIG_FILE.videoproto= ${X11BASE}/lib/pkgconfig/videoproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xcmiscproto/builtin.mk b/x11/xcmiscproto/builtin.mk index 9762032c2e4..35d013cf4f3 100644 --- a/x11/xcmiscproto/builtin.mk +++ b/x11/xcmiscproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:36:12 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= xcmiscproto PKGCONFIG_FILE.xcmiscproto= ${X11BASE}/lib/pkgconfig/xcmiscproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk index df3f01f6947..8bd32147c52 100644 --- a/x11/xcursor/builtin.mk +++ b/x11/xcursor/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:23:04 reed Exp $ +# $NetBSD: builtin.mk,v 1.12.22.1 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= xcursor @@ -76,6 +76,9 @@ 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. ### + +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.xcursor?= no .if !empty(CHECK_BUILTIN.xcursor:M[nN][oO]) diff --git a/x11/xf86bigfontproto/builtin.mk b/x11/xf86bigfontproto/builtin.mk index 30902a400fa..cb374b7594e 100644 --- a/x11/xf86bigfontproto/builtin.mk +++ b/x11/xf86bigfontproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:19 cube Exp $ BUILTIN_PKG:= xf86bigfontproto PKGCONFIG_FILE.xf86bigfontproto= ${X11BASE}/lib/pkgconfig/xf86bigfontproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86dgaproto/builtin.mk b/x11/xf86dgaproto/builtin.mk index 2ea646ced13..336d5a4e0c0 100644 --- a/x11/xf86dgaproto/builtin.mk +++ b/x11/xf86dgaproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xf86dgaproto PKGCONFIG_FILE.xf86dgaproto= ${X11BASE}/lib/pkgconfig/xf86dgaproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86driproto/builtin.mk b/x11/xf86driproto/builtin.mk index 0e36686a6d4..2f7562e1a73 100644 --- a/x11/xf86driproto/builtin.mk +++ b/x11/xf86driproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xf86driproto PKGCONFIG_FILE.xf86driproto= ${X11BASE}/lib/pkgconfig/xf86driproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86miscproto/builtin.mk b/x11/xf86miscproto/builtin.mk index 02c734b993d..4c412021053 100644 --- a/x11/xf86miscproto/builtin.mk +++ b/x11/xf86miscproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xf86miscproto PKGCONFIG_FILE.xf86miscproto= ${X11BASE}/lib/pkgconfig/xf86miscproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xf86vidmodeproto/builtin.mk b/x11/xf86vidmodeproto/builtin.mk index 476eb77cf8a..d19f993123e 100644 --- a/x11/xf86vidmodeproto/builtin.mk +++ b/x11/xf86vidmodeproto/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xf86vidmodeproto PKGCONFIG_FILE.xf86vidmodeproto= ${X11BASE}/lib/pkgconfig/xf86vidmodeproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xineramaproto/builtin.mk b/x11/xineramaproto/builtin.mk index 6349f48f096..94a8c5be0d6 100644 --- a/x11/xineramaproto/builtin.mk +++ b/x11/xineramaproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2008/01/05 16:05:52 tron Exp $ +# $NetBSD: builtin.mk,v 1.2.8.1 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xineramaproto @@ -59,3 +59,5 @@ USE_BUILTIN.xineramaproto!= \ . endif # PREFER.xineramaproto .endif MAKEVARS+= USE_BUILTIN.xineramaproto + +.include "../../mk/x11.builtin.mk" diff --git a/x11/xproto/builtin.mk b/x11/xproto/builtin.mk index dd13de90f77..9413274e64b 100644 --- a/x11/xproto/builtin.mk +++ b/x11/xproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $ +# $NetBSD: builtin.mk,v 1.3.18.1 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xproto @@ -47,3 +47,5 @@ USE_BUILTIN.xproto!= \ . endif # PREFER.xproto .endif MAKEVARS+= USE_BUILTIN.xproto + +.include "../../mk/x11.builtin.mk" diff --git a/x11/xproxymanagementprotocol/builtin.mk b/x11/xproxymanagementprotocol/builtin.mk index 3c6602b62de..15febecbaf6 100644 --- a/x11/xproxymanagementprotocol/builtin.mk +++ b/x11/xproxymanagementprotocol/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/17 18:31:02 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xproxymanagementprotocol PKGCONFIG_FILE.xproxymanagementprotocol= ${X11BASE}/lib/pkgconfig/xproxymngproto.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" diff --git a/x11/xtrans/builtin.mk b/x11/xtrans/builtin.mk index ca17ae59b4b..54a2d0b7c60 100644 --- a/x11/xtrans/builtin.mk +++ b/x11/xtrans/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 19:30:37 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:20 cube Exp $ BUILTIN_PKG:= xtrans PKGCONFIG_FILE.xtrans= ${X11BASE}/lib/pkgconfig/xtrans.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" |