cmake: fixed pkg-config issues and switched to use system libs rather than included ones (FS#836, thanks to Danny)

cmake/.md5sum

@@ -1 +1,2 @@
 ba74b22c788a0c8547976b880cd02b17  cmake-2.8.8.tar.gz
+469d56b412f8d6d1ea470e4e0396b29c  fix-pkg-config.patch

cmake/Pkgfile

@@ -2,18 +2,25 @@
 # URL: http://www.cmake.org/
 # Maintainer: Jose V Beneyto, sepen at crux dot nu
 # Packager: Mark Rosenstand, mark at borkware dot net
-# Depends on: ncurses
+# Depends on: curl libarchive shared-mime-info
 
 name=cmake
 version=2.8.8
-release=1
-source=(http://www.cmake.org/files/v${version%.*}/$name-$version.tar.gz)
+release=2
+source=(http://www.cmake.org/files/v${version%.*}/$name-$version.tar.gz
+	fix-pkg-config.patch)
 
 build() {
 	cd $name-$version
-	./bootstrap --prefix=/usr
+
+	patch -p 1 -i $SRC/fix-pkg-config.patch
+
+	./bootstrap \
+		--prefix=/usr \
+		--system-libs \
+		--parallel=$(sed -e 's/.*-j *\([0-9]\+\).*/\1/' <<< $MAKEFLAGS)
+
 	make
 	make DESTDIR=$PKG install
 	rm -r $PKG/usr/doc
 }
-

cmake/fix-pkg-config.patch

@@ -0,0 +1,31 @@
+X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 5d93ab1..39d3a76 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -13,11 +13,10 @@
+ # When the 'QUIET' argument is set, no status messages will be printed.
+ #
+ # It sets the following variables:
+-#   PKG_CONFIG_FOUND          ... true if pkg-config works on the system
++#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #   PKG_CONFIG_EXECUTABLE     ... pathname of the pkg-config program
+ #   PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
+ #                                 (since CMake 2.8.8)
+-#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #
+ # For the following variables two sets of values exist; first one is the
+ # common one and has the given PREFIX. The second set contains flags
+@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
+                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
+
++# This is needed because the module name is "PkgConfig" but the name of
++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
++# handled by FPHSA.
++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
++
+ # Unsets the given variables
+ macro(_pkgconfig_unset var)
+   set(${var} "" CACHE INTERNAL "")