--- /usr/ports/devel/cmake-gui/Makefile 2013-09-20 20:03:26.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake-gui/Makefile 2013-10-14 16:19:00.000000000 +0300 @@ -1,7 +1,7 @@ -# $FreeBSD: devel/cmake-gui/Makefile 327722 2013-09-20 17:03:26Z bapt $ +# $FreeBSD$ PORTNAME= cmake -PORTVERSION= 2.8.11.2 +PORTVERSION= 2.8.12 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v2.8/ PKGNAMESUFFIX= -gui @@ -14,14 +14,12 @@ CMAKE_ARGS= -DBUILD_QtDialog:bool=on \ -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" -MAN1= cmake-gui.1 BUILD_WRKSRC= ${WRKSRC}/Source/QtDialog INSTALL_WRKSRC= ${BUILD_WRKSRC} DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo -NO_STAGE= yes post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ @@ -33,7 +31,7 @@ ${WRKSRC}/bin/cmake-gui --help-man > ${WRKSRC}/cmake-gui.1 post-install: - ${MKDIR} ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/cmake-gui.1 ${MANPREFIX}/man/man1 + ${MKDIR} ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/cmake-gui.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include --- /usr/ports/devel/cmake-gui/pkg-plist 2012-07-14 16:54:48.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake-gui/pkg-plist 2013-10-14 14:44:14.000000000 +0300 @@ -1,4 +1,5 @@ bin/cmake-gui +man/man1/cmake-gui.1.gz share/applications/CMake.desktop share/mime/packages/cmakecache.xml share/pixmaps/CMakeSetup32.png --- /usr/ports/devel/cmake-modules/Makefile 2013-09-29 17:41:11.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake-modules/Makefile 2013-10-14 14:44:14.000000000 +0300 @@ -1,7 +1,7 @@ # Created by: gahr -# $FreeBSD: devel/cmake-modules/Makefile 328700 2013-09-29 14:41:11Z rakuco $ +# $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -modules LATEST_LINK= cmake-modules @@ -9,12 +9,11 @@ CMAKE_MODULES= yes -NO_STAGE= yes do-install: - ${MKDIR} ${DATADIR}/Modules - ${MKDIR} ${DATADIR}/Templates - cd ${WRKSRC}/Modules && ${COPYTREE_SHARE} \* ${DATADIR}/Modules - cd ${WRKSRC}/Templates && ${COPYTREE_SHARE} \* ${DATADIR}/Templates + ${MKDIR} ${STAGEDIR}${DATADIR}/Modules + ${MKDIR} ${STAGEDIR}${DATADIR}/Templates + cd ${WRKSRC}/Modules && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/Modules + cd ${WRKSRC}/Templates && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/Templates NO_BUILD= yes --- /usr/ports/devel/cmake-modules/pkg-plist 2013-07-10 11:15:49.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake-modules/pkg-plist 2013-10-14 16:44:29.000000000 +0300 @@ -62,6 +62,7 @@ %%DATADIR%%/Modules/CMakeFortranCompilerId.F.in %%DATADIR%%/Modules/CMakeFortranInformation.cmake %%DATADIR%%/Modules/CMakeGenericSystem.cmake +%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake %%DATADIR%%/Modules/CMakeJOMFindMake.cmake %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in @@ -74,6 +75,7 @@ %%DATADIR%%/Modules/CMakeParseArguments.cmake %%DATADIR%%/Modules/CMakeParseImplicitLinkInfo.cmake %%DATADIR%%/Modules/CMakePlatformId.h.in +%%DATADIR%%/Modules/CMakePrintHelpers.cmake %%DATADIR%%/Modules/CMakePrintSystemInformation.cmake %%DATADIR%%/Modules/CMakePushCheckState.cmake %%DATADIR%%/Modules/CMakeRCCompiler.cmake.in @@ -178,6 +180,10 @@ %%DATADIR%%/Modules/Compiler/HP-C.cmake %%DATADIR%%/Modules/Compiler/HP-CXX.cmake %%DATADIR%%/Modules/Compiler/HP-Fortran.cmake +%%DATADIR%%/Modules/Compiler/IAR-ASM.cmake +%%DATADIR%%/Modules/Compiler/IAR-C.cmake +%%DATADIR%%/Modules/Compiler/IAR-CXX.cmake +%%DATADIR%%/Modules/Compiler/IAR.cmake %%DATADIR%%/Modules/Compiler/Intel-ASM.cmake %%DATADIR%%/Modules/Compiler/Intel-C.cmake %%DATADIR%%/Modules/Compiler/Intel-CXX.cmake @@ -453,6 +459,7 @@ %%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake %%DATADIR%%/Modules/Platform/Darwin-GNU.cmake +%%DATADIR%%/Modules/Platform/Darwin-Intel-Fortran.cmake %%DATADIR%%/Modules/Platform/Darwin-NAG-Fortran.cmake %%DATADIR%%/Modules/Platform/Darwin-VisualAge-C.cmake %%DATADIR%%/Modules/Platform/Darwin-VisualAge-CXX.cmake --- /usr/ports/devel/cmake/Makefile 2013-09-20 20:03:26.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/Makefile 2013-10-14 16:18:52.000000000 +0300 @@ -1,8 +1,8 @@ # Created by: Kyle Martin -# $FreeBSD: devel/cmake/Makefile 327722 2013-09-20 17:03:26Z bapt $ +# $FreeBSD$ PORTNAME= cmake -PORTVERSION= 2.8.11.2 +PORTVERSION= 2.8.12 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v2.8/ @@ -24,20 +24,8 @@ .if !defined(CMAKE_MODULES) HAS_CONFIGURE= yes RUN_DEPENDS= ${DATADIR}/Modules/CMake.cmake:${PORTSDIR}/devel/cmake-modules - -MAN1= ccmake.1 \ - cmake.1 \ - cmakecommands.1 \ - cmakecompat.1 \ - cmakemodules.1 \ - cmakepolicies.1 \ - cmakeprops.1 \ - cmakevars.1 \ - cpack.1 \ - ctest.1 .endif -NO_STAGE= yes post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ @@ -55,7 +43,7 @@ .if !defined(CMAKE_MODULES) post-install: - ${INSTALL_DATA} ${WRKSRC}/Docs/cmake-mode.el ${PREFIX}/share/emacs/site-lisp + ${INSTALL_DATA} ${WRKSRC}/Docs/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp .endif .include --- /usr/ports/devel/cmake/distinfo 2013-07-10 11:15:49.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/distinfo 2013-10-14 16:19:29.000000000 +0300 @@ -1,2 +1,2 @@ -SHA256 (cmake-2.8.11.2.tar.gz) = b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562 -SIZE (cmake-2.8.11.2.tar.gz) = 5887016 +SHA256 (cmake-2.8.12.tar.gz) = d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287 +SIZE (cmake-2.8.12.tar.gz) = 6064138 diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/cmake/files/patch-CMakeLists.txt /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-CMakeLists.txt --- /usr/ports/devel/cmake/files/patch-CMakeLists.txt 2013-03-19 20:00:07.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-CMakeLists.txt 2013-10-14 16:30:56.000000000 +0300 @@ -1,12 +1,12 @@ ---- CMakeLists.txt.orig 2012-11-27 22:20:59.000000000 +0200 -+++ CMakeLists.txt 2012-11-27 22:23:04.000000000 +0200 -@@ -605,17 +605,17 @@ - install(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}) +--- CMakeLists.txt.orig 2013-10-14 16:29:44.055730052 +0300 ++++ CMakeLists.txt 2013-10-14 16:30:05.395729128 +0300 +@@ -629,17 +629,17 @@ + install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}) # Install script directories. -install( - DIRECTORY Modules Templates -- DESTINATION "${CMake_DATA_DEST}" +- DESTINATION ${CMAKE_DATA_DIR} - FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE - GROUP_READ GROUP_EXECUTE @@ -17,7 +17,7 @@ - ) +# install( +# DIRECTORY Modules Templates -+# DESTINATION "${CMake_DATA_DEST}" ++# DESTINATION ${CMAKE_DATA_DIR} +# FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +# DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE +# GROUP_READ GROUP_EXECUTE diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/cmake/files/patch-Modules_FindGTK2.cmake /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-Modules_FindGTK2.cmake --- /usr/ports/devel/cmake/files/patch-Modules_FindGTK2.cmake 2013-09-29 17:41:11.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-Modules_FindGTK2.cmake 1970-01-01 02:00:00.000000000 +0200 @@ -1,25 +0,0 @@ -commit 508e8ca024e47baea342da85c7bbd014c7fd6c30 -Author: Daniele E. Domenichelli -Date: Mon Jun 17 17:31:10 2013 +0200 - - FindGTK2: Detect gthread library - -commit 76c72b9f14258933e4cf810da275bd2b931c5ac9 -Author: Daniele E. Domenichelli -Date: Wed Jul 31 17:39:38 2013 +0200 - - FindGTK2: gthread-2.0 folder does not exist - - Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30 - ---- Modules/FindGTK2.cmake.orig 2013-09-29 17:29:09.000000000 +0300 -+++ Modules/FindGTK2.cmake 2013-09-29 17:29:42.000000000 +0300 -@@ -463,6 +463,8 @@ - _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) - _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) - -+ _GTK2_FIND_LIBRARY (GTK2_GTHREAD_LIBRARY gthread false true) -+ - _GTK2_FIND_LIBRARY (GTK2_GIO_LIBRARY gio false true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h) diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/cmake/files/patch-Modules_FindwxWidgets.cmake /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-Modules_FindwxWidgets.cmake --- /usr/ports/devel/cmake/files/patch-Modules_FindwxWidgets.cmake 2013-03-19 20:00:07.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-Modules_FindwxWidgets.cmake 2013-10-14 16:39:15.000000000 +0300 @@ -1,11 +1,11 @@ ---- ./Modules/FindwxWidgets.cmake.orig 2010-06-28 19:15:57.000000000 +0400 -+++ ./Modules/FindwxWidgets.cmake 2010-07-06 02:06:02.277945209 +0400 -@@ -689,7 +689,7 @@ +--- Modules/FindwxWidgets.cmake.orig 2013-10-14 16:39:11.995705456 +0300 ++++ Modules/FindwxWidgets.cmake 2013-10-14 16:39:31.315704621 +0300 +@@ -702,7 +702,7 @@ # UNIX: Start actual work. #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. - find_program(wxWidgets_CONFIG_EXECUTABLE wx-config + find_program(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config + DOC "Location of wxWidgets library configuration provider binary (wx-config)." ONLY_CMAKE_FIND_ROOT_PATH ) - diff -Nru -I '$FreeBSD.*$' /usr/ports/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx --- /usr/ports/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx 1970-01-01 02:00:00.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/files/patch-Source__kwsys__SystemInformation.cxx 2013-10-15 00:26:21.000000000 +0300 @@ -0,0 +1,41 @@ +From e0b5a0523e6ba75efc97d5fc0bc5299b5f3d3bca Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +Date: Mon, 14 Oct 2013 23:35:05 +0300 +Subject: [PATCH] KWSys: Include backtrace-related headers on FreeBSD. + +This was probably broken for a long while, but the problem was not apparent +because the check for execinfo.h would fail by default because +-I/usr/local/include was not being passed to the compiler when making the +checks for the header's existence. + +Now that very recent FreeBSD versions (ie. 10-CURRENT) have NetBSD's +libexecinfo in base (and it is thus installed into /usr), the +backtrace-related checks would pass, but the required headers were not being +included in SystemInformation.cxx. +--- + Source/kwsys/SystemInformation.cxx | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx +index 7c31f3a..2672730 100644 +--- Source/kwsys/SystemInformation.cxx ++++ Source/kwsys/SystemInformation.cxx +@@ -88,6 +88,15 @@ typedef int siginfo_t; + # include + # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN + # endif ++# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) ++# include ++# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) ++# include ++# endif ++# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) ++# include ++# endif ++# endif + #endif + + #if defined(__OpenBSD__) || defined(__NetBSD__) +-- +1.8.4 + --- /usr/ports/devel/cmake/pkg-plist 2012-09-14 22:22:51.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/PORTS/devel/cmake/pkg-plist 2013-10-14 14:44:14.000000000 +0300 @@ -2,6 +2,16 @@ bin/cmake bin/cpack bin/ctest +man/man1/ccmake.1.gz +man/man1/cmake.1.gz +man/man1/cmakecommands.1.gz +man/man1/cmakecompat.1.gz +man/man1/cmakemodules.1.gz +man/man1/cmakepolicies.1.gz +man/man1/cmakeprops.1.gz +man/man1/cmakevars.1.gz +man/man1/cpack.1.gz +man/man1/ctest.1.gz share/aclocal/cmake.m4 %%DATADIR%%/completions/cmake %%DATADIR%%/completions/cpack