[pkgsrc/trunk]: pkgsrc/devel/cmake Use xmlrpc-c package instead of builtin ve...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ead79eb6ba4
branches:  trunk
changeset: 525977:9ead79eb6ba4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Feb 26 21:37:16 2007 +0000

description:
Use xmlrpc-c package instead of builtin version. Bump PKGREVISION.

diffstat:

 devel/cmake/Makefile         |   7 +++----
 devel/cmake/distinfo         |   4 ++--
 devel/cmake/patches/patch-ab |  23 +++++++++++------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diffs (67 lines):

diff -r fab0ec219bf2 -r 9ead79eb6ba4 devel/cmake/Makefile
--- a/devel/cmake/Makefile      Mon Feb 26 21:03:55 2007 +0000
+++ b/devel/cmake/Makefile      Mon Feb 26 21:37:16 2007 +0000
@@ -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 @@
 
 .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 -r fab0ec219bf2 -r 9ead79eb6ba4 devel/cmake/distinfo
--- a/devel/cmake/distinfo      Mon Feb 26 21:03:55 2007 +0000
+++ b/devel/cmake/distinfo      Mon Feb 26 21:37:16 2007 +0000
@@ -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 -r fab0ec219bf2 -r 9ead79eb6ba4 devel/cmake/patches/patch-ab
--- a/devel/cmake/patches/patch-ab      Mon Feb 26 21:03:55 2007 +0000
+++ b/devel/cmake/patches/patch-ab      Mon Feb 26 21:37:16 2007 +0000
@@ -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.