From e075c57e644a498aa88c92f46a8fbe2b09272650 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Fri, 13 Jan 2017 19:33:46 +0000 Subject: Pullup ticket #5183 - requested by joerg devel/cmake: build fix Revisions pulled up: - devel/cmake/Makefile 1.129 - devel/cmake/distinfo 1.95 - devel/cmake/patches/patch-Modules_FindCurses.cmake 1.1 - devel/ncurses/builtin.mk 1.40 --- Module Name: pkgsrc Committed By: joerg Date: Thu Jan 5 22:18:03 UTC 2017 Modified Files: pkgsrc/devel/ncurses: builtin.mk Log Message: Drop buildlink-ncurses-fake-libs, it didn't get applied due to a typo and it doesn't help with the directory scanning of cmake anyway, since that one only looks in the real prefix. --- Module Name: pkgsrc Committed By: joerg Date: Thu Jan 5 22:34:25 UTC 2017 Modified Files: pkgsrc/devel/cmake: Makefile distinfo Added Files: pkgsrc/devel/cmake/patches: patch-Modules_FindCurses.cmake Log Message: Recognize libgnuform as valid implementation of a form library to match devel/ncurses. This is necessary due to cmake's insistance of scanning PREFIX/lib directly. Bump revision. --- devel/cmake/Makefile | 4 ++-- devel/cmake/distinfo | 3 ++- devel/cmake/patches/patch-Modules_FindCurses.cmake | 15 +++++++++++++++ devel/ncurses/builtin.mk | 11 +---------- 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 devel/cmake/patches/patch-Modules_FindCurses.cmake diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 18ec1783a13..5869bf9512c 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.127 2016/12/18 23:32:29 joerg Exp $ +# $NetBSD: Makefile,v 1.127.2.1 2017/01/13 19:33:46 bsiegert Exp $ .include "Makefile.version" DISTNAME= cmake-${CMAKE_VERSION} -PKGREVISION= 1 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= https://cmake.org/files/v${CMAKE_API}/ diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 5485c15ff08..4ddacbf0dda 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.94 2016/12/04 08:52:56 adam Exp $ +$NetBSD: distinfo,v 1.94.2.1 2017/01/13 19:33:46 bsiegert Exp $ SHA1 (cmake-3.7.1.tar.gz) = d00c720847c0a2aff817c36377569efbb677fb08 RMD160 (cmake-3.7.1.tar.gz) = 6a1b7bfb15d882826ecafa5c74d5e4ae2f0530a4 SHA512 (cmake-3.7.1.tar.gz) = 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629 Size (cmake-3.7.1.tar.gz) = 7361172 bytes SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d +SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c SHA1 (patch-Source_CursesDialog_ccmake.cxx) = e1b6feca837013c715b4268f2ccb134f956f3193 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 diff --git a/devel/cmake/patches/patch-Modules_FindCurses.cmake b/devel/cmake/patches/patch-Modules_FindCurses.cmake new file mode 100644 index 00000000000..2af4fee8afe --- /dev/null +++ b/devel/cmake/patches/patch-Modules_FindCurses.cmake @@ -0,0 +1,15 @@ +$NetBSD: patch-Modules_FindCurses.cmake,v 1.1.2.2 2017/01/13 19:33:46 bsiegert Exp $ + +--- Modules/FindCurses.cmake.orig 2017-01-05 22:24:12.384738412 +0000 ++++ Modules/FindCurses.cmake +@@ -167,8 +167,8 @@ if(NOT DEFINED CURSES_HAVE_CURSES_H) + endif() + endif() + +-find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") +-find_library(CURSES_FORM_LIBRARY form ) ++find_library(CURSES_FORM_LIBRARY form gnuform HINTS "${_cursesLibDir}") ++find_library(CURSES_FORM_LIBRARY form gnuform) + + # Previous versions of FindCurses provided these values. + if(NOT DEFINED FORM_LIBRARY) diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index 4d4ef835417..a1aa5d22f7b 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.39 2016/12/20 15:06:52 joerg Exp $ +# $NetBSD: builtin.mk,v 1.39.2.1 2017/01/13 19:33:47 bsiegert Exp $ BUILTIN_PKG:= ncurses @@ -158,15 +158,6 @@ BUILDLINK_TARGETS+= buildlink-ncurses-extra-includes BUILDLINK_TRANSFORM+= l:form:gnuform BUILDLINK_TRANSFORM+= l:panel:gnupanel BUILDLINK_TRANSFORM+= l:menu:gnumenu - -.PHONY: buildlink-ncurses-fake-libs -buildlink-ncurses-fake-libs: - ${RUN} \ - for f in form panel menu; do \ - ${ECHO_BUILDLINK_MSG} "Touching fake ncurses library ($$f)"; \ - ${TOUCH} ${TOUCH_FLAGS} "$BUILDLINK_DIR/lib/lib$$f.a"; \ - done -BUILDLINK_TARGET+= buildlink-ncurses-fake-libs . endif # A full ncurses implementation provides more headers than some curses -- cgit v1.2.3