[pkgsrc/trunk]: pkgsrc/devel/cmake Fix broken curl test.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7e84cce0c10
branches:  trunk
changeset: 538255:c7e84cce0c10
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Feb 03 13:01:11 2008 +0000

description:
Fix broken curl test.

diffstat:

 devel/cmake/Makefile         |   5 +++--
 devel/cmake/distinfo         |   3 ++-
 devel/cmake/patches/patch-ae |  18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r d81b6ab35b3c -r c7e84cce0c10 devel/cmake/Makefile
--- a/devel/cmake/Makefile      Sun Feb 03 12:23:33 2008 +0000
+++ b/devel/cmake/Makefile      Sun Feb 03 13:01:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/02/03 02:12:11 heinz Exp $
+# $NetBSD: Makefile,v 1.36 2008/02/03 13:01:11 tnn Exp $
 
 DISTNAME=      cmake-2.4.6
 PKGREVISION=   4
@@ -31,7 +31,8 @@
 SUBST_CLASSES+=                cmake
 SUBST_STAGE.cmake=     pre-configure
 SUBST_MESSAGE.cmake=   Fixing hard-coded prefix.
-SUBST_FILES.cmake=     Modules/FindCurses.cmake Modules/FindX11.cmake
+SUBST_FILES.cmake=     Modules/FindCurses.cmake Modules/FindCURL.cmake \
+                           Modules/FindX11.cmake
 SUBST_SED.cmake=       -e "s|@prefix@|${PREFIX}|g"
 SUBST_SED.cmake+=      -e "s|@x11base@|${X11BASE}|g"
 
diff -r d81b6ab35b3c -r c7e84cce0c10 devel/cmake/distinfo
--- a/devel/cmake/distinfo      Sun Feb 03 12:23:33 2008 +0000
+++ b/devel/cmake/distinfo      Sun Feb 03 13:01:11 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2007/03/12 06:42:12 wiz Exp $
+$NetBSD: distinfo,v 1.13 2008/02/03 13:01:11 tnn Exp $
 
 SHA1 (cmake-2.4.6.tar.gz) = 5290aaf949413ee7f77275ba68e73cec1546364b
 RMD160 (cmake-2.4.6.tar.gz) = 61af13faecd10e85a0fee3252630b30b8781987a
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = 40d1c172cb4ddb5f993279eaafbf68fdc37d62c5
 SHA1 (patch-ac) = 69e026dcdf1aac1db54bcc8e73a8896f4831d345
 SHA1 (patch-ad) = 24b2b70a4894783b77dbe19746e6afcb9c3689b6
+SHA1 (patch-ae) = 01be856bffb8d4407eabf4834fa88c0d6ac31e45
diff -r d81b6ab35b3c -r c7e84cce0c10 devel/cmake/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cmake/patches/patch-ae      Sun Feb 03 13:01:11 2008 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.3 2008/02/03 13:01:11 tnn Exp $
+
+--- Modules/FindCURL.cmake.orig        2007-01-10 18:59:12.000000000 +0100
++++ Modules/FindCURL.cmake
+@@ -6,11 +6,11 @@
+ #  CURL_FOUND        - True if curl found.
+ 
+ # Look for the header file.
+-FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h)
++FIND_PATH(CURL_INCLUDE_DIR curl/curl.h @prefix@/include)
+ MARK_AS_ADVANCED(CURL_INCLUDE_DIR)
+ 
+ # Look for the library.
+-FIND_LIBRARY(CURL_LIBRARY NAMES curl)
++FIND_LIBRARY(CURL_LIBRARY NAMES curl PATHS @prefix@/lib)
+ MARK_AS_ADVANCED(CURL_LIBRARY)
+ 
+ # Copy the results to the output variables.