[97867] trunk/dports/devel/cmake

css at macports.org css at macports.org
Tue Sep 18 03:16:34 PDT 2012


Revision: 97867
          http://trac.macports.org//changeset/97867
Author:   css at macports.org
Date:     2012-09-18 03:16:34 -0700 (Tue, 18 Sep 2012)
Log Message:
-----------
cmake: removed FindPkgConfig patch no longer needed for 2.8.9 and bump revision. refs #35882 and #34505

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile

Removed Paths:
-------------
    trunk/dports/devel/cmake/files/patch-Modules_FindPkgConfig_cmake.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2012-09-18 08:39:34 UTC (rev 97866)
+++ trunk/dports/devel/cmake/Portfile	2012-09-18 10:16:34 UTC (rev 97867)
@@ -6,6 +6,7 @@
 
 name		cmake
 version		2.8.9
+revision	1
 set branch	[join [lrange [split ${version} .] 0 1] .]
 categories	devel
 license		BSD
@@ -49,8 +50,7 @@
 }
 
 patchfiles	patch-CMakeFindFrameworks.cmake.diff \
-			patch-Modules-FindQt4.cmake.diff \
-            patch-Modules_FindPkgConfig_cmake.diff
+			patch-Modules-FindQt4.cmake.diff
 
 post-patch {
 	# copy cmake init file, ready to be patched below
@@ -74,7 +74,7 @@
 
 variant gui description {Qt4 based cmake-gui} {
 	PortGroup qt4 1.0
-	patchfiles-append patch-CMakeLists.txt.diff
+#	patchfiles-append patch-CMakeLists.txt.diff
 	configure.args-append --qt-gui --qt-qmake=${qt_qmake_cmd}
 }
 

Deleted: trunk/dports/devel/cmake/files/patch-Modules_FindPkgConfig_cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules_FindPkgConfig_cmake.diff	2012-09-18 08:39:34 UTC (rev 97866)
+++ trunk/dports/devel/cmake/files/patch-Modules_FindPkgConfig_cmake.diff	2012-09-18 10:16:34 UTC (rev 97867)
@@ -1,11 +0,0 @@
---- Modules/FindPkgConfig.cmake.orig	2012-05-18 22:18:17.000000000 +0200
-+++ Modules/FindPkgConfig.cmake	2012-05-18 22:18:37.000000000 +0200
-@@ -100,7 +100,7 @@
- endif (PKG_CONFIG_EXECUTABLE)
- 
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
--find_package_handle_standard_args(PkgConfig
-+find_package_handle_standard_args(PKG_CONFIG
-                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
-                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120918/09747bdd/attachment.html>


More information about the macports-changes mailing list