diff options
| author | wiz <wiz@pkgsrc.org> | 2007-02-26 21:37:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-02-26 21:37:16 +0000 |
| commit | d28439a933a9e437efc697ed6b21722c058f0552 (patch) | |
| tree | 5ce0e0564113b8ef561e9137c08383e9b587fac0 /devel/cmake | |
| parent | 392b96f40224427f5a6cc4b01c93087698d1ada4 (diff) | |
| download | pkgsrc-d28439a933a9e437efc697ed6b21722c058f0552.tar.gz | |
Use xmlrpc-c package instead of builtin version. Bump PKGREVISION.
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/Makefile | 7 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 4 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-ab | 23 |
3 files changed, 16 insertions, 18 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 521011eeeb3..c7e7fc1725f 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2007/02/25 08:50:14 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2007/02/26 21:37:16 wiz Exp $ DISTNAME= cmake-2.4.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v2.4/ @@ -36,8 +36,7 @@ post-extract: .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -# not packaged yet, see also patch-ab -#.include "../../textproc/xmlrpc-c/buildlink3.mk" +.include "../../textproc/xmlrpc-c/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index c1e5f64a8dd..93e2b0cbf98 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2007/02/24 21:17:19 wiz Exp $ +$NetBSD: distinfo,v 1.11 2007/02/26 21:37:16 wiz Exp $ SHA1 (cmake-2.4.6.tar.gz) = 5290aaf949413ee7f77275ba68e73cec1546364b RMD160 (cmake-2.4.6.tar.gz) = 61af13faecd10e85a0fee3252630b30b8781987a Size (cmake-2.4.6.tar.gz) = 2604547 bytes SHA1 (patch-aa) = 1652da758d103503d6cd657b7eb193a0174dab55 -SHA1 (patch-ab) = ece84d9110246c842e0b8e8a21d12830ce134e09 +SHA1 (patch-ab) = 40d1c172cb4ddb5f993279eaafbf68fdc37d62c5 SHA1 (patch-ac) = 69e026dcdf1aac1db54bcc8e73a8896f4831d345 diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab index 5102724fafe..6868c2135be 100644 --- a/devel/cmake/patches/patch-ab +++ b/devel/cmake/patches/patch-ab @@ -1,15 +1,14 @@ -$NetBSD: patch-ab,v 1.5 2007/02/24 21:17:19 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2007/02/26 21:37:16 wiz Exp $ -No pkgsrc package for xmlrpc-c yet. +From cmake CVS. ---- CMakeLists.txt.orig 2007-01-10 17:59:11.000000000 +0000 -+++ CMakeLists.txt -@@ -106,7 +106,7 @@ IF(CMAKE_ALLOW_SYSTEM_LIBRARIES) - IF(CMAKE_USE_SYSTEM_LIBRARIES_USER) - SET(CMAKE_USE_SYSTEM_CURL "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed curl" FORCE) - SET(CMAKE_USE_SYSTEM_EXPAT "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed expat" FORCE) -- SET(CMAKE_USE_SYSTEM_XMLRPC "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed xmlrpc" FORCE) -+ SET(CMAKE_USE_SYSTEM_XMLRPC OFF CACHE BOOL "Use system-installed xmlrpc" FORCE) - SET(CMAKE_USE_SYSTEM_ZLIB "${CMAKE_USE_SYSTEM_LIBRARIES}" CACHE BOOL "Use system-installed zlib" FORCE) - ENDIF(CMAKE_USE_SYSTEM_LIBRARIES_USER) +--- Modules/FindXMLRPC.cmake.orig 2007-01-10 17:59:12.000000000 +0000 ++++ Modules/FindXMLRPC.cmake +@@ -104,6 +104,7 @@ IF(XMLRPC_FOUND) + PATHS ${XMLRPC_LIBRARY_DIRS} + NO_DEFAULT_PATH + ) ++ FIND_LIBRARY(XMLRPC_${name}_LIBRARY NAMES ${name}) + MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY) + # If any library is not found then the whole package is not found. |