diff options
| author | joerg <joerg@pkgsrc.org> | 2015-09-15 13:08:37 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-09-15 13:08:37 +0000 |
| commit | f6bed38af86d914f421d732e2d5aeefca4176168 (patch) | |
| tree | 99d38a4dd5ce6c2f8c9469229fbe4c3f54cc1afd /devel/cmake | |
| parent | dd7547a9775f03169c0c744edb279f9e159ac274 (diff) | |
| download | pkgsrc-f6bed38af86d914f421d732e2d5aeefca4176168.tar.gz | |
Depend on ncurses for !NetBSD and NetBSD before 6.0. Do not force
ncurses on the cmake side. Avoids picking up ncurses from pkgsrc when it
is installed, but not intended to be used by cmake.
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/Makefile | 6 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 3 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-CMakeLists.txt | 12 |
3 files changed, 18 insertions, 3 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index ef6c69993af..febea535b14 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2015/09/12 15:15:49 joerg Exp $ +# $NetBSD: Makefile,v 1.105 2015/09/15 13:08:37 joerg Exp $ DISTNAME= cmake-${CMAKE_API}.1 CATEGORIES= devel @@ -59,10 +59,12 @@ pre-configure: ${RM} -f ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig ${LN} -f ${WRKSRC}/Modules/Platform/OpenBSD.cmake ${WRKSRC}/Modules/Platform/MirBSD.cmake +INCOMPAT_CURSES= NetBSD-[0-5].* + BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.0.0 .include "../../archivers/libarchive/buildlink3.mk" .include "../../devel/libexecinfo/buildlink3.mk" -.include "../../mk/curses.buildlink3.mk" +.include "../../devel/ncurses/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 2c59d169071..b82d3157816 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.77 2015/09/12 16:46:11 wiz Exp $ +$NetBSD: distinfo,v 1.78 2015/09/15 13:08:37 joerg Exp $ SHA1 (cmake-3.3.1.tar.gz) = 799aff559e9f330fefc60e6509f1d025fc3d9c8c RMD160 (cmake-3.3.1.tar.gz) = 39f63aef3c9ba9711f736fd8e51972429ceca527 Size (cmake-3.3.1.tar.gz) = 6577869 bytes +SHA1 (patch-CMakeLists.txt) = ae722c41e0d9a1396fe80f1000266a33e406e2f6 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 diff --git a/devel/cmake/patches/patch-CMakeLists.txt b/devel/cmake/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..ae7c06372fc --- /dev/null +++ b/devel/cmake/patches/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +$NetBSD: patch-CMakeLists.txt,v 1.4 2015/09/15 13:08:38 joerg Exp $ + +--- CMakeLists.txt.orig 2015-09-14 13:22:28.000000000 +0000 ++++ CMakeLists.txt +@@ -423,7 +423,6 @@ macro (CMAKE_BUILD_UTILITIES) + if (UNIX) + # there is a bug in the Syllable libraries which makes linking ccmake fail, Alex + if(NOT CMAKE_SYSTEM_NAME MATCHES syllable) +- set(CURSES_NEED_NCURSES TRUE) + find_package(Curses QUIET) + if (CURSES_LIBRARY) + option(BUILD_CursesDialog "Build the CMake Curses Dialog ccmake" ON) |