diff options
| author | cube <cube> | 2008-09-21 21:36:41 +0000 |
|---|---|---|
| committer | cube <cube> | 2008-09-21 21:36:41 +0000 |
| commit | 42cb0379f61e732b5fb0da901885e1e7118ae148 (patch) | |
| tree | 010ad04e0a1c376f49f8b0672e7021ced77acaa4 | |
| parent | c2fe4bf65d86bb7dc53153bcd67a5776a6788dae (diff) | |
| download | pkgsrc-42cb0379f61e732b5fb0da901885e1e7118ae148.tar.gz | |
libXres's bl3.mk file referenced Xrender for some unknown reason. More,
nothing in x11-links would reference it.
So make libXres a "normal" package with a builtin.mk file and list its
files in x11-links.
| -rw-r--r-- | pkgtools/x11-links/files/xorg.libXres | 8 | ||||
| -rw-r--r-- | pkgtools/x11-links/xorg.mk | 3 | ||||
| -rw-r--r-- | x11/libXres/buildlink3.mk | 8 | ||||
| -rw-r--r-- | x11/libXres/builtin.mk | 7 |
4 files changed, 18 insertions, 8 deletions
diff --git a/pkgtools/x11-links/files/xorg.libXres b/pkgtools/x11-links/files/xorg.libXres new file mode 100644 index 00000000000..8a1be2ea28d --- /dev/null +++ b/pkgtools/x11-links/files/xorg.libXres @@ -0,0 +1,8 @@ +# $NetBSD: xorg.libXres,v 1.1.2.1 2008/09/21 21:36:41 cube Exp $ +# +include/X11/extensions/XRes.h +lib/libXres.a +lib/libXres.so +lib/libXres.so.1 +lib/libXres.so.1.0 +lib/pkgconfig/xres.pc diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index 22c9e92c69b..aeec90ecb7e 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.9.8.19 2008/09/21 17:04:13 cube Exp $ +# $NetBSD: xorg.mk,v 1.9.8.20 2008/09/21 21:36:41 cube Exp $ # # This is for X.org, but use "xfree" files also. @@ -43,6 +43,7 @@ FILES_LIST= ${FILESDIR}/xorg .include "../../x11/libXprintUtil/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" +.include "../../x11/libXres/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" .include "../../x11/liblbxutil/buildlink3.mk" diff --git a/x11/libXres/buildlink3.mk b/x11/libXres/buildlink3.mk index 1fd73c6f312..015b3599c2c 100644 --- a/x11/libXres/buildlink3.mk +++ b/x11/libXres/buildlink3.mk @@ -1,11 +1,7 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/01/14 11:04:27 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2.16.1 2008/09/21 21:36:41 cube Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if ${X11_TYPE} != "modular" -.include "../../x11/Xrender/buildlink3.mk" -.else - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXRES_BUILDLINK3_MK:= ${LIBXRES_BUILDLINK3_MK}+ @@ -27,5 +23,3 @@ BUILDLINK_PKGSRCDIR.libXres?= ../../x11/libXres .include "../../x11/xproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} - -.endif diff --git a/x11/libXres/builtin.mk b/x11/libXres/builtin.mk new file mode 100644 index 00000000000..74307648b58 --- /dev/null +++ b/x11/libXres/builtin.mk @@ -0,0 +1,7 @@ +# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/21 21:36:41 cube Exp $ + +BUILTIN_PKG:= libXres +PKGCONFIG_FILE.libXres= ${X11BASE}/lib/pkgconfig/xres.pc \ + ${X11BASE}/lib/libXres.so + +.include "../../mk/buildlink3/pkgconfig-builtin.mk" |