summaryrefslogtreecommitdiff
path: root/devel/cmake
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-02-03 13:01:11 +0000
committertnn <tnn@pkgsrc.org>2008-02-03 13:01:11 +0000
commitb1fb85fc63cbbd7a5e4c5594052f4ffff4ba2038 (patch)
treee101f4546e9762db01ef0d45794f5b53fbc0df8e /devel/cmake
parente25f47d09691a493ca2cf70f4681de9152b16b2c (diff)
downloadpkgsrc-b1fb85fc63cbbd7a5e4c5594052f4ffff4ba2038.tar.gz
Fix broken curl test.
Diffstat (limited to 'devel/cmake')
-rw-r--r--devel/cmake/Makefile5
-rw-r--r--devel/cmake/distinfo3
-rw-r--r--devel/cmake/patches/patch-ae18
3 files changed, 23 insertions, 3 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 76c11fc4f21..ae73093f302 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -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 @@ TEST_TARGET= test
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 --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 03c2b595707..55bfff9f55e 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -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-aa) = 1652da758d103503d6cd657b7eb193a0174dab55
SHA1 (patch-ab) = 40d1c172cb4ddb5f993279eaafbf68fdc37d62c5
SHA1 (patch-ac) = 69e026dcdf1aac1db54bcc8e73a8896f4831d345
SHA1 (patch-ad) = 24b2b70a4894783b77dbe19746e6afcb9c3689b6
+SHA1 (patch-ae) = 01be856bffb8d4407eabf4834fa88c0d6ac31e45
diff --git a/devel/cmake/patches/patch-ae b/devel/cmake/patches/patch-ae
new file mode 100644
index 00000000000..b11a9c00a6e
--- /dev/null
+++ b/devel/cmake/patches/patch-ae
@@ -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.