mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

- Update cmake to 2.8.10.2

Browse Source 
- Trim Makefile header
- Drop indefinite article from COMMENT

Obtained from:	area51
Tested by:	exp-run (bapt)
This commit is contained in:
Max Brazhnikov 2013-03-19 18:00:07 +00:00
parent f8a306de30
commit bcb7889345
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=314669
8 changed files with 72 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/cmake/Makefile
View File

@ -1,17 +1,13 @@
# New ports collection makefile for: cmake
# Date created: March 18 2002
# Whom: Kyle Martin <mkm@ieee.org>
#
# Created by: Kyle Martin <mkm@ieee.org>
# $FreeBSD$
#
PORTNAME= cmake
PORTVERSION= 2.8.9
PORTVERSION= 2.8.10.2
CATEGORIES= devel
MASTER_SITES= http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
MASTER_SITES= http://www.cmake.org/files/v2.8/
MAINTAINER= kde@FreeBSD.org
COMMENT?= A cross-platform Makefile generator
COMMENT?= Cross-platform Makefile generator
LICENSE= BSD

4
devel/cmake/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cmake-2.8.9.tar.gz) = dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9
SIZE (cmake-2.8.9.tar.gz) = 5658837
SHA256 (cmake-2.8.10.2.tar.gz) = ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1
SIZE (cmake-2.8.10.2.tar.gz) = 5768373

36
devel/cmake/files/patch-CMakeLists.txt
View File

@ -1,10 +1,10 @@
--- CMakeLists.txt.orig 2012-04-18 20:10:54.000000000 +0200
+++ CMakeLists.txt 2012-07-12 11:43:03.000000000 +0200
@@ -621,17 +621,17 @@
INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST})
--- 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})
# Install script directories.
-INSTALL(
-install(
- DIRECTORY Modules Templates
- DESTINATION "${CMake_DATA_DEST}"
- FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
@ -15,17 +15,17 @@
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
- )
+#INSTALL(
+# DIRECTORY Modules Templates
+# DESTINATION "${CMake_DATA_DEST}"
+# FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+# DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+# GROUP_READ GROUP_EXECUTE
+# WORLD_READ WORLD_EXECUTE
+# PATTERN "*.sh*" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+# GROUP_READ GROUP_EXECUTE
+# WORLD_READ WORLD_EXECUTE
+# )
+# install(
+# DIRECTORY Modules Templates
+# DESTINATION "${CMake_DATA_DEST}"
+# FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+# DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+# GROUP_READ GROUP_EXECUTE
+# WORLD_READ WORLD_EXECUTE
+# PATTERN "*.sh*" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+# GROUP_READ GROUP_EXECUTE
+# WORLD_READ WORLD_EXECUTE
+# )
#-----------------------------------------------------------------------
# End of the main section of the CMakeLists file
# process docs related install
add_subdirectory(Docs)

6
devel/cmake/files/patch-Modules_FindJava.cmake
View File

@ -4,8 +4,8 @@
# 2. OpenJDK 1.6
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
- IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
+ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
- if(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
+ if(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
# 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}" )

46
devel/cmake/files/patch-Modules_FindQt4.cmake
View File

@ -1,43 +1,43 @@
--- ./Modules/FindQt4.cmake.orig 2011-12-30 17:49:56.000000000 +0100
+++ ./Modules/FindQt4.cmake 2012-04-07 18:45:53.442654169 +0200
@@ -473,7 +473,7 @@
--- Modules/FindQt4.cmake.orig 2012-11-06 21:41:36.000000000 +0200
+++ Modules/FindQt4.cmake 2012-11-27 22:31:37.000000000 +0200
@@ -497,7 +497,7 @@
# check for qmake
# Debian uses qmake-qt4
# macports' Qt uses qmake-mac
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake qmake4 qmake-mac PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
@@ -665,13 +665,7 @@
-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
+find_program(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake qmake4 qmake-mac
PATHS
ENV QTDIR
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
@@ -690,13 +690,7 @@
# ask qmake for the plugins directory
IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
_qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir)
- SET(QT_PLUGINS_DIR NOTFOUND)
- set(QT_PLUGINS_DIR NOTFOUND)
- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins")
- endforeach(qt_cross_path)
- FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
- endforeach()
- find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
- HINTS ${qt_cross_paths} ${qt_plugins_dir}
- DOC "The location of the Qt plugins")
+ SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
+ set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
endif ()
# ask qmake for the translations directory
@@ -684,15 +678,7 @@
IF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
@@ -709,15 +703,7 @@
if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
_qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
if(qt_imports_dir)
- SET(QT_IMPORTS_DIR NOTFOUND)
- set(QT_IMPORTS_DIR NOTFOUND)
- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports")
- endforeach(qt_cross_path)
- FIND_PATH(QT_IMPORTS_DIR NAMES Qt
- endforeach()
- find_path(QT_IMPORTS_DIR NAMES Qt
- HINTS ${qt_cross_paths} ${qt_imports_dir}
- DOC "The location of the Qt imports"
- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH)
+ SET(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE)
+ set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE)
mark_as_advanced(QT_IMPORTS_DIR)
endif(qt_imports_dir)
ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
endif()
endif ()

33
devel/cmake/files/patch-Modules_FindSDL.cmake
View File

@ -1,32 +1,23 @@
--- Modules/FindSDL.cmake.orig 2012-04-18 22:24:55.000000000 -0300
+++ Modules/FindSDL.cmake 2012-04-18 22:26:06.000000000 -0300
@@ -82,6 +82,11 @@
/opt
--- Modules/FindSDL.cmake.orig 2012-11-06 21:41:36.000000000 +0200
+++ Modules/FindSDL.cmake 2012-11-27 22:34:53.000000000 +0200
@@ -73,6 +73,11 @@
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
)
+# On FreeBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, which is
+# located in ${LOCALBASE}/include. Append {LOCALBASE}/include to
+# the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box.
+LIST(APPEND SDL_INCLUDE_DIR /usr/local/include)
+list(APPEND SDL_INCLUDE_DIR /usr/local/include)
+
# SDL-1.1 is the name used by FreeBSD ports...
# don't confuse it for the version number.
FIND_LIBRARY(SDL_LIBRARY_TEMP
@@ -97,7 +102,7 @@
find_library(SDL_LIBRARY_TEMP
@@ -83,7 +88,7 @@
)
IF(NOT SDL_BUILDING_LIBRARY)
- IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ IF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
if(NOT SDL_BUILDING_LIBRARY)
- if(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ if(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDLmain for compatibility even though they don't
@@ -113,7 +118,7 @@
/opt/csw
/opt
)
- ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ ENDIF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
ENDIF(NOT SDL_BUILDING_LIBRARY)
# SDL may require threads on your system.

4
devel/cmake/files/patch-Modules_FindwxWidgets.cmake
View File

@ -4,8 +4,8 @@
# 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
- find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
+ find_program(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
ONLY_CMAKE_FIND_ROOT_PATH
)

17
devel/cmake/files/patch-Modules_FindwxWindows.cmake
View File

@ -1,12 +1,11 @@
--- ./Modules/FindwxWindows.cmake.orig 2010-06-28 19:15:57.000000000 +0400
+++ ./Modules/FindwxWindows.cmake 2010-07-06 02:06:30.769844610 +0400
@@ -599,7 +599,8 @@
--- Modules/FindwxWindows.cmake.orig 2012-11-06 21:41:36.000000000 +0200
+++ Modules/FindwxWindows.cmake 2012-11-27 22:39:17.000000000 +0200
@@ -598,7 +598,7 @@
# wx-config should be in your path anyhow, usually no need to set WXWIN or
# search in ../wx or ../../wx
- FIND_PROGRAM(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
+ FIND_PROGRAM(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
+ PATHS
$ENV{WXWIN}
$ENV{WXWIN}/bin
../wx/bin
- find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
+ find_program(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
HINTS
ENV WXWIN
$ENV{WXWIN}/bin