diff options
| author | wiz <wiz@pkgsrc.org> | 2007-02-24 21:17:19 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-02-24 21:17:19 +0000 |
| commit | 1784becc9315c26f701eea43b51f26229f228e7e (patch) | |
| tree | 777f2318e69982b24b5ec615ecdab0c91ec1af7f /devel | |
| parent | 198621bd8ca293e4d056d9d4e095005856726b55 (diff) | |
| download | pkgsrc-1784becc9315c26f701eea43b51f26229f228e7e.tar.gz | |
Revert parts of previous.
Morale: always run cvs diff before committing.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cmake/Makefile | 5 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 3 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-ab | 15 |
3 files changed, 20 insertions, 3 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 6416574676b..a546437c40b 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2007/02/24 21:13:50 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2007/02/24 21:17:19 wiz Exp $ DISTNAME= cmake-2.4.6 CATEGORIES= devel @@ -35,7 +35,8 @@ post-extract: .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../textproc/xmlrpc-c/buildlink3.mk" +# not packaged yet, see also patch-ab +#.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 7776283da0c..c1e5f64a8dd 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.9 2007/02/24 21:13:50 wiz Exp $ +$NetBSD: distinfo,v 1.10 2007/02/24 21:17:19 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-ac) = 69e026dcdf1aac1db54bcc8e73a8896f4831d345 diff --git a/devel/cmake/patches/patch-ab b/devel/cmake/patches/patch-ab new file mode 100644 index 00000000000..5102724fafe --- /dev/null +++ b/devel/cmake/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.5 2007/02/24 21:17:19 wiz Exp $ + +No pkgsrc package for xmlrpc-c yet. + +--- 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) + |