[kde-freebsd] [PATCH] devel/cmake: update to 2.8.5
Pietro Cerutti
gahr at gahr.ch
Mon Sep 5 10:08:07 UTC 2011
>Submitter-Id: current-users
>Originator: Pietro Cerutti
>Organization: The FreeBSD Project
>Confidential: no
>Synopsis: [PATCH] devel/cmake: update to 2.8.5
>Severity: non-critical
>Priority: low
>Category: ports
>Class: update
>Release: FreeBSD 9.0-CURRENT i386
>Environment:
System: FreeBSD gahrlex.gahr.ch 9.0-CURRENT FreeBSD 9.0-CURRENT #2: Sat Jul 9 02:21:14 UTC
>Description:
- Update to 2.8.5
Port maintainer (kde at FreeBSD.org) is cc'd.
This patch includes a modification to files/patch-Modules_Compiler_GNU.cmake (see ports/159276).
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- cmake-2.8.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/cmake/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile 16 Jun 2011 14:46:44 -0000 1.47
+++ Makefile 5 Sep 2011 10:05:21 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= cmake
-PORTVERSION= 2.8.4
-PORTREVISION= 1
+PORTVERSION= 2.8.5
CATEGORIES= devel
MASTER_SITES= http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/cmake/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo 25 Feb 2011 01:32:02 -0000 1.28
+++ distinfo 5 Sep 2011 10:02:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-2.8.4.tar.gz) = d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc
-SIZE (cmake-2.8.4.tar.gz) = 5477628
+SHA256 (cmake-2.8.5.tar.gz) = 5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91
+SIZE (cmake-2.8.5.tar.gz) = 5517977
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/cmake/pkg-plist,v
retrieving revision 1.27
diff -u -r1.27 pkg-plist
--- pkg-plist 25 Feb 2011 01:32:02 -0000 1.27
+++ pkg-plist 5 Sep 2011 10:02:31 -0000
@@ -106,7 +106,10 @@
%%DATADIR%%/Modules/CPack.background.png.in
%%DATADIR%%/Modules/CPack.cmake
%%DATADIR%%/Modules/CPack.distribution.dist.in
+%%DATADIR%%/Modules/CPackBundle.cmake
+%%DATADIR%%/Modules/CPackComponent.cmake
%%DATADIR%%/Modules/CPackDeb.cmake
+%%DATADIR%%/Modules/CPackNSIS.cmake
%%DATADIR%%/Modules/CPackRPM.cmake
%%DATADIR%%/Modules/CPackZIP.cmake
%%DATADIR%%/Modules/CTest.cmake
@@ -129,6 +132,8 @@
%%DATADIR%%/Modules/CheckIncludeFiles.cmake
%%DATADIR%%/Modules/CheckLibraryExists.cmake
%%DATADIR%%/Modules/CheckLibraryExists.lists.in
+%%DATADIR%%/Modules/CheckPrototypeDefinition.c.in
+%%DATADIR%%/Modules/CheckPrototypeDefinition.cmake
%%DATADIR%%/Modules/CheckSizeOf.cmake
%%DATADIR%%/Modules/CheckStructHasMember.cmake
%%DATADIR%%/Modules/CheckSymbolExists.cmake
@@ -137,19 +142,23 @@
%%DATADIR%%/Modules/CheckTypeSizeMap.cmake.in
%%DATADIR%%/Modules/CheckVariableExists.c
%%DATADIR%%/Modules/CheckVariableExists.cmake
+%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
%%DATADIR%%/Modules/Compiler/Clang-C.cmake
%%DATADIR%%/Modules/Compiler/Clang-CXX.cmake
%%DATADIR%%/Modules/Compiler/Cray-C.cmake
%%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
%%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/GNU-ASM.cmake
%%DATADIR%%/Modules/Compiler/GNU-C.cmake
%%DATADIR%%/Modules/Compiler/GNU-CXX.cmake
%%DATADIR%%/Modules/Compiler/GNU-Fortran.cmake
%%DATADIR%%/Modules/Compiler/GNU.cmake
+%%DATADIR%%/Modules/Compiler/HP-ASM.cmake
%%DATADIR%%/Modules/Compiler/HP-C.cmake
%%DATADIR%%/Modules/Compiler/HP-CXX.cmake
%%DATADIR%%/Modules/Compiler/HP-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/Intel-ASM.cmake
%%DATADIR%%/Modules/Compiler/Intel-C.cmake
%%DATADIR%%/Modules/Compiler/Intel-CXX.cmake
%%DATADIR%%/Modules/Compiler/Intel-Fortran.cmake
@@ -168,15 +177,18 @@
%%DATADIR%%/Modules/Compiler/SCO-C.cmake
%%DATADIR%%/Modules/Compiler/SCO-CXX.cmake
%%DATADIR%%/Modules/Compiler/SCO.cmake
+%%DATADIR%%/Modules/Compiler/SunPro-ASM.cmake
%%DATADIR%%/Modules/Compiler/SunPro-C.cmake
%%DATADIR%%/Modules/Compiler/SunPro-CXX.cmake
%%DATADIR%%/Modules/Compiler/SunPro-Fortran.cmake
%%DATADIR%%/Modules/Compiler/VisualAge-C.cmake
%%DATADIR%%/Modules/Compiler/VisualAge-CXX.cmake
%%DATADIR%%/Modules/Compiler/VisualAge-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/XL-ASM.cmake
%%DATADIR%%/Modules/Compiler/XL-C.cmake
%%DATADIR%%/Modules/Compiler/XL-CXX.cmake
%%DATADIR%%/Modules/Compiler/XL-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/XL.cmake
%%DATADIR%%/Modules/Dart.cmake
%%DATADIR%%/Modules/DartConfiguration.tcl.in
%%DATADIR%%/Modules/Documentation.cmake
@@ -187,6 +199,7 @@
%%DATADIR%%/Modules/FindALSA.cmake
%%DATADIR%%/Modules/FindASPELL.cmake
%%DATADIR%%/Modules/FindAVIFile.cmake
+%%DATADIR%%/Modules/FindArmadillo.cmake
%%DATADIR%%/Modules/FindBISON.cmake
%%DATADIR%%/Modules/FindBLAS.cmake
%%DATADIR%%/Modules/FindBZip2.cmake
@@ -338,6 +351,7 @@
%%DATADIR%%/Modules/FortranCInterface/mymodule_.c
%%DATADIR%%/Modules/FortranCInterface/mysub.f
%%DATADIR%%/Modules/FortranCInterface/symbol.c.in
+%%DATADIR%%/Modules/GNUInstallDirs.cmake
%%DATADIR%%/Modules/GetPrerequisites.cmake
%%DATADIR%%/Modules/ITKCompatibility.cmake
%%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake
@@ -353,9 +367,11 @@
%%DATADIR%%/Modules/Platform/AIX-GNU.cmake
%%DATADIR%%/Modules/Platform/AIX-VisualAge-C.cmake
%%DATADIR%%/Modules/Platform/AIX-VisualAge-CXX.cmake
+%%DATADIR%%/Modules/Platform/AIX-XL-ASM.cmake
%%DATADIR%%/Modules/Platform/AIX-XL-C.cmake
%%DATADIR%%/Modules/Platform/AIX-XL-CXX.cmake
%%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/AIX-XL.cmake
%%DATADIR%%/Modules/Platform/AIX.cmake
%%DATADIR%%/Modules/Platform/BSDOS.cmake
%%DATADIR%%/Modules/Platform/BeOS.cmake
@@ -382,6 +398,7 @@
%%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
%%DATADIR%%/Modules/Platform/CYGWIN.cmake
%%DATADIR%%/Modules/Platform/Catamount.cmake
+%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
%%DATADIR%%/Modules/Platform/Darwin-GNU-C.cmake
%%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake
@@ -407,10 +424,16 @@
%%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake
%%DATADIR%%/Modules/Platform/HP-UX-GNU.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-ASM.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake
+%%DATADIR%%/Modules/Platform/HP-UX-HP.cmake
%%DATADIR%%/Modules/Platform/HP-UX.cmake
%%DATADIR%%/Modules/Platform/Haiku.cmake
%%DATADIR%%/Modules/Platform/IRIX.cmake
%%DATADIR%%/Modules/Platform/IRIX64.cmake
+%%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake
%%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake
%%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake
%%DATADIR%%/Modules/Platform/Linux-GNU-C.cmake
@@ -466,6 +489,7 @@
%%DATADIR%%/Modules/Platform/Windows-GNU-CXX.cmake
%%DATADIR%%/Modules/Platform/Windows-GNU-Fortran.cmake
%%DATADIR%%/Modules/Platform/Windows-GNU.cmake
+%%DATADIR%%/Modules/Platform/Windows-Intel-ASM.cmake
%%DATADIR%%/Modules/Platform/Windows-Intel-C.cmake
%%DATADIR%%/Modules/Platform/Windows-Intel-CXX.cmake
%%DATADIR%%/Modules/Platform/Windows-Intel-Fortran.cmake
@@ -484,6 +508,7 @@
%%DATADIR%%/Modules/Platform/gas.cmake
%%DATADIR%%/Modules/Platform/kFreeBSD.cmake
%%DATADIR%%/Modules/Platform/syllable.cmake
+%%DATADIR%%/Modules/ProcessorCount.cmake
%%DATADIR%%/Modules/Qt4ConfigDependentSettings.cmake
%%DATADIR%%/Modules/Qt4Macros.cmake
%%DATADIR%%/Modules/RepositoryInfo.txt.in
@@ -561,6 +586,7 @@
%%DOCSDIR%%/cmcompress/Copyright.txt
%%DOCSDIR%%/cmcurl/COPYING
%%DOCSDIR%%/cmexpat/COPYING
+%%DOCSDIR%%/cmlibarchive/COPYING
%%DOCSDIR%%/cmsys/Copyright.txt
%%DOCSDIR%%/cmzlib/Copyright.txt
%%DOCSDIR%%/cpack.docbook
@@ -571,6 +597,7 @@
%%DOCSDIR%%/ctest.txt
@dirrm %%DOCSDIR%%/cmzlib
@dirrm %%DOCSDIR%%/cmsys
+ at dirrm %%DOCSDIR%%/cmlibarchive
@dirrm %%DOCSDIR%%/cmexpat
@dirrm %%DOCSDIR%%/cmcurl
@dirrm %%DOCSDIR%%/cmcompress
Index: files/patch-Modules_Compiler_GNU.cmake
===================================================================
RCS file: /home/pcvs/ports/devel/cmake/files/patch-Modules_Compiler_GNU.cmake,v
retrieving revision 1.1
diff -u -r1.1 patch-Modules_Compiler_GNU.cmake
--- files/patch-Modules_Compiler_GNU.cmake 10 Apr 2011 08:38:50 -0000 1.1
+++ files/patch-Modules_Compiler_GNU.cmake 5 Sep 2011 10:05:13 -0000
@@ -1,11 +1,8 @@
---- ./Modules/Compiler/GNU.cmake.orig 2011-02-15 20:47:27.000000000 +0300
-+++ ./Modules/Compiler/GNU.cmake 2011-04-09 13:43:24.030760248 +0400
-@@ -26,9 +26,9 @@
-
- # Initial configuration flags.
+--- Modules/Compiler/GNU.cmake.orig 2011-07-08 12:21:44.000000000 +0000
++++ Modules/Compiler/GNU.cmake 2011-09-05 10:04:58.000000000 +0000
+@@ -28,7 +28,7 @@
set(CMAKE_${lang}_FLAGS_INIT "")
-- set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g")
-+ set(CMAKE_${lang}_FLAGS_DEBUG_INIT "")
+ set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g")
set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
- set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
+ set(CMAKE_${lang}_FLAGS_RELEASE_INIT "")
Index: files/patch-Modules_FindJava.cmake
===================================================================
RCS file: /home/pcvs/ports/devel/cmake/files/patch-Modules_FindJava.cmake,v
retrieving revision 1.1
diff -u -r1.1 patch-Modules_FindJava.cmake
--- files/patch-Modules_FindJava.cmake 11 May 2010 11:59:56 -0000 1.1
+++ files/patch-Modules_FindJava.cmake 5 Sep 2011 10:02:31 -0000
@@ -1,11 +1,11 @@
---- ./Modules/FindJava.cmake.orig 2010-04-16 16:49:52.000000000 +1100
-+++ ./Modules/FindJava.cmake 2010-04-16 16:51:27.398957616 +1100
-@@ -90,7 +90,7 @@
+--- Modules/FindJava.cmake.orig 2011-08-22 09:58:41.000000000 +0200
++++ Modules/FindJava.cmake 2011-08-22 09:59:07.000000000 +0200
+@@ -105,7 +105,7 @@
# 2. OpenJDK 1.6
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
-- IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_]+[oem-]*\".*")
-+ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_]+[oem-]*\".*")
+- IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*")
++ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
- STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_]+)[oem-]*\".*"
+ STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+)[oem-]*\".*"
"\\1" Java_VERSION_STRING "${var}" )
--- cmake-2.8.5.patch ends here ---
More information about the kde-freebsd
mailing list