Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id C32EA7A264 for ; Fri, 13 Jan 2017 19:33:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 750BD8565C; Fri, 13 Jan 2017 19:33:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 06289855C1 for ; Fri, 13 Jan 2017 19:33:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ogpvdJ_n4fLH for ; Fri, 13 Jan 2017 19:33:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4140C8559B for ; Fri, 13 Jan 2017 19:33:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3F5D4FBA6; Fri, 13 Jan 2017 19:33:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148433602777180" MIME-Version: 1.0 Date: Fri, 13 Jan 2017 19:33:47 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2016Q4] pkgsrc/devel To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20170113193347.3F5D4FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148433602777180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Jan 13 19:33:47 UTC 2017 Modified Files: pkgsrc/devel/cmake [pkgsrc-2016Q4]: Makefile distinfo pkgsrc/devel/ncurses [pkgsrc-2016Q4]: builtin.mk Added Files: pkgsrc/devel/cmake/patches [pkgsrc-2016Q4]: patch-Modules_FindCurses.cmake Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.127.2.1 pkgsrc/devel/cmake/Makefile cvs rdiff -u -r1.94 -r1.94.2.1 pkgsrc/devel/cmake/distinfo cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake cvs rdiff -u -r1.39 -r1.39.2.1 pkgsrc/devel/ncurses/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148433602777180 Content-Disposition: inline Content-Length: 3601 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/cmake/Makefile diff -u pkgsrc/devel/cmake/Makefile:1.127 pkgsrc/devel/cmake/Makefile:1.127.2.1 --- pkgsrc/devel/cmake/Makefile:1.127 Sun Dec 18 23:32:29 2016 +++ pkgsrc/devel/cmake/Makefile Fri Jan 13 19:33:46 2017 @@ -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}/ Index: pkgsrc/devel/cmake/distinfo diff -u pkgsrc/devel/cmake/distinfo:1.94 pkgsrc/devel/cmake/distinfo:1.94.2.1 --- pkgsrc/devel/cmake/distinfo:1.94 Sun Dec 4 08:52:56 2016 +++ pkgsrc/devel/cmake/distinfo Fri Jan 13 19:33:46 2017 @@ -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 Index: pkgsrc/devel/ncurses/builtin.mk diff -u pkgsrc/devel/ncurses/builtin.mk:1.39 pkgsrc/devel/ncurses/builtin.mk:1.39.2.1 --- pkgsrc/devel/ncurses/builtin.mk:1.39 Tue Dec 20 15:06:52 2016 +++ pkgsrc/devel/ncurses/builtin.mk Fri Jan 13 19:33:47 2017 @@ -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-e 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 Added files: Index: pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake:1.1.2.2 --- /dev/null Fri Jan 13 19:33:47 2017 +++ pkgsrc/devel/cmake/patches/patch-Modules_FindCurses.cmake Fri Jan 13 19:33:46 2017 @@ -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) --_----------=_148433602777180--