From f369e3648bc3a00683e8a880196dba552f348809 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 30 Sep 2008 23:18:02 +0200
Subject: [PATCH] Use the pkg-config helper in libX11 required deps and fix
 libX11 deps db file.

--HG--
extra : convert_revision : 8604fbfd9918bfca3c3ceb2dbd068754f3b0d218
---
 dependencies/libX11-1.1.5-deps.db     | Bin 1024 -> 1024 bytes
 templates/bigreqsproto-1.0.2.tmpl     |   1 +
 templates/inputproto-1.4.4.tmpl       |   1 +
 templates/kbproto-1.0.3.tmpl          |   1 +
 templates/libX11-1.1.5.tmpl           |   1 +
 templates/libXau-1.0.4.tmpl           |   1 +
 templates/libXdmcp-1.0.2.tmpl         |   1 +
 templates/xcmiscproto-1.1.2.tmpl      |   1 +
 templates/xextproto-7.0.3.tmpl        |   1 +
 templates/xf86bigfontproto-1.1.2.tmpl |   1 +
 templates/xproto-7.0.13.tmpl          |   1 +
 templates/xtrans-1.2.1.tmpl           |   1 +
 12 files changed, 11 insertions(+)

diff --git a/dependencies/libX11-1.1.5-deps.db b/dependencies/libX11-1.1.5-deps.db
index de40d7a4d412f824e6dd2223be896ecf4a3f800e..ed781320f0cd3610f95fff63710e7ec3da995d36 100644
GIT binary patch
delta 156
zcmZqRXyDi&#KaQ87{Rzv(TS0jm4Sg_`s9Pm%JoT^=|!o9#RWzACHcCBdIow%3Kb<q
ziFw7khI&SNh6)wQxtYbuFlj@ObZSKjgm12Apl7U*odn^5G#e{q<`tAer498=^h^|T
ZGLs?_OTk7%I4QZw1z@fb0|Nsi0{}DfErS36

delta 30
mcmZqRXyDi&#Kf|PaS!80#bu1FtPBhcW|L!?l_x)BmH_~IfCsez

diff --git a/templates/bigreqsproto-1.0.2.tmpl b/templates/bigreqsproto-1.0.2.tmpl
index 0188136fd5f..eb1f45d7f49 100755
--- a/templates/bigreqsproto-1.0.2.tmpl
+++ b/templates/bigreqsproto-1.0.2.tmpl
@@ -3,6 +3,7 @@ pkgname=bigreqsproto-1.0.2
 extract_sufx=".tar.gz"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure
+pkgconfig_override="bigreqsproto.pc"
 short_desc="BigReqs extension headers from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=153bc6e44f7e41743c7a9607173fc2c52301bda4
diff --git a/templates/inputproto-1.4.4.tmpl b/templates/inputproto-1.4.4.tmpl
index 7967523f704..1b8a68c79b5 100755
--- a/templates/inputproto-1.4.4.tmpl
+++ b/templates/inputproto-1.4.4.tmpl
@@ -3,6 +3,7 @@ pkgname=inputproto-1.4.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure
+pkgconfig_override="inputproto.pc"
 short_desc="Input extension headers from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=771db687cab6f2e77f36e3efd1bc4793c73b152b
diff --git a/templates/kbproto-1.0.3.tmpl b/templates/kbproto-1.0.3.tmpl
index c11ee78ffb9..6d59b34648d 100755
--- a/templates/kbproto-1.0.3.tmpl
+++ b/templates/kbproto-1.0.3.tmpl
@@ -3,6 +3,7 @@ pkgname=kbproto-1.0.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure
+pkgconfig_override="kbproto.pc"
 short_desc="KB extension headers from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6547c6482a30c2b7feac09d71e9cc60dd97bc8b4
diff --git a/templates/libX11-1.1.5.tmpl b/templates/libX11-1.1.5.tmpl
index fe9b440ae78..503d948f432 100755
--- a/templates/libX11-1.1.5.tmpl
+++ b/templates/libX11-1.1.5.tmpl
@@ -3,6 +3,7 @@ pkgname=libX11-1.1.5
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure
+pkgconfig_override="x11.pc"
 make_cmd="$PKGFS_MASTERDIR/bin/gmake"
 configure_args="--enable-man-pages=3 --without-xcb
  --disable-malloc0returnsnull"
diff --git a/templates/libXau-1.0.4.tmpl b/templates/libXau-1.0.4.tmpl
index d30fe7d91ff..726dbba7b02 100755
--- a/templates/libXau-1.0.4.tmpl
+++ b/templates/libXau-1.0.4.tmpl
@@ -3,6 +3,7 @@ pkgname=libXau-1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure
+pkgconfig_override="xau.pc"
 short_desc="Authorization Protocol for X from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9ca0318c62b6bcf97b8460fd89b0788b07f459ca
diff --git a/templates/libXdmcp-1.0.2.tmpl b/templates/libXdmcp-1.0.2.tmpl
index 50fa6474dd6..5b286ac5099 100755
--- a/templates/libXdmcp-1.0.2.tmpl
+++ b/templates/libXdmcp-1.0.2.tmpl
@@ -3,6 +3,7 @@ pkgname=libXdmcp-1.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure
+pkgconfig_override="xdmcp.pc"
 short_desc="X Display Manager Control Protocol library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b1172f757623bd5f3671692d0ae920205404792b
diff --git a/templates/xcmiscproto-1.1.2.tmpl b/templates/xcmiscproto-1.1.2.tmpl
index 024b29f6cf3..fffaa79dc16 100755
--- a/templates/xcmiscproto-1.1.2.tmpl
+++ b/templates/xcmiscproto-1.1.2.tmpl
@@ -4,6 +4,7 @@ extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure
 short_desc="XCMisc extension headers from X.org"
+pkgconfig_override="xcmiscproto.pc"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=375efab5b1ba235687cc3cfa58d33fb690f76028
 long_desc="
diff --git a/templates/xextproto-7.0.3.tmpl b/templates/xextproto-7.0.3.tmpl
index ad3532a97aa..eefd35d0d65 100755
--- a/templates/xextproto-7.0.3.tmpl
+++ b/templates/xextproto-7.0.3.tmpl
@@ -3,6 +3,7 @@ pkgname=xextproto-7.0.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure
+pkgconfig_override="xextproto.pc"
 short_desc="XExt extension headers from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a39e2c42fec5fa7b6e5ac7517c8645dcfc1347a6
diff --git a/templates/xf86bigfontproto-1.1.2.tmpl b/templates/xf86bigfontproto-1.1.2.tmpl
index d1fbf6e42f9..48b78cd2d70 100755
--- a/templates/xf86bigfontproto-1.1.2.tmpl
+++ b/templates/xf86bigfontproto-1.1.2.tmpl
@@ -3,6 +3,7 @@ pkgname=xf86bigfontproto-1.1.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure
+pkgconfig_override="xf86bigfontproto.pc"
 short_desc="XF86BigFont extension headers from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=48d7bbedfaf5061e76f8207570ca547ff53f44e0
diff --git a/templates/xproto-7.0.13.tmpl b/templates/xproto-7.0.13.tmpl
index f7e6ea11d14..aa6007327d1 100755
--- a/templates/xproto-7.0.13.tmpl
+++ b/templates/xproto-7.0.13.tmpl
@@ -4,6 +4,7 @@ extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure
 short_desc="X protocol and ancillary headers from Xorg X11"
+pkgconfig_override="xproto.pc"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=24d55b70cd36dab9e5f08f7de59825c52b81beee
 long_desc="
diff --git a/templates/xtrans-1.2.1.tmpl b/templates/xtrans-1.2.1.tmpl
index 7927dacd893..3cf5fef670c 100755
--- a/templates/xtrans-1.2.1.tmpl
+++ b/templates/xtrans-1.2.1.tmpl
@@ -3,6 +3,7 @@ pkgname=xtrans-1.2.1
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure
+pkgconfig_override="xtrans.pc"
 short_desc="Network API translation layer to insulate X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=1998ba12f64cfc9563dcb20f9337e448a9e6a882