diff options
| author | miwi <miwi@FreeBSD.org> | 2009-08-05 03:33:08 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2009-08-05 03:33:08 +0800 |
| commit | 32198db977429daaf8bbf3ef8312d29a0e17083d (patch) | |
| tree | ce207d0173ce2586afabfcb4a9446ca9a5c139e0 | |
| parent | 895c08ffe4e40a84de068b77c3dc12d7280e7a09 (diff) | |
| download | freebsd-ports-gnome-32198db977429daaf8bbf3ef8312d29a0e17083d.tar.gz freebsd-ports-gnome-32198db977429daaf8bbf3ef8312d29a0e17083d.tar.zst freebsd-ports-gnome-32198db977429daaf8bbf3ef8312d29a0e17083d.zip | |
- Update to 2.6.4
| -rw-r--r-- | devel/cmake/Makefile | 11 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 6 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 22 | ||||
| -rw-r--r-- | devel/cmake/pkg-plist | 2 |
4 files changed, 9 insertions, 32 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index e1284d3637ce..881cb56c4a75 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cmake -PORTVERSION= 2.6.3 -PORTREVISION= 1 +PORTVERSION= 2.6.4 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ @@ -38,16 +37,8 @@ MAN1= ccmake.1 \ ctest.1 post-patch: - @${GREP} -rl '/usr/local' ${WRKSRC}/Modules ${WRKSRC}/Tests | \ - ${XARGS} ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' @${GREP} -rl '/usr/X11R6' ${WRKSRC}/Modules ${WRKSRC}/Tests | \ ${XARGS} ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/Source/cmLocalGenerator.cxx - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - ${WRKSRC}/bootstrap @${REINPLACE_CMD} -e 's,/opt/kde4,${LOCALBASE}/kde4,g' \ ${WRKSRC}/Modules/FindKDE4.cmake diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 58c3f1dbacde..45fee6148762 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,3 +1,3 @@ -MD5 (cmake-2.6.3.tar.gz) = 5ba47a94ce276f326abca1fd72a7e7c6 -SHA256 (cmake-2.6.3.tar.gz) = 3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450 -SIZE (cmake-2.6.3.tar.gz) = 3594959 +MD5 (cmake-2.6.4.tar.gz) = 50f387d0436696c4a68b5512a72c9cde +SHA256 (cmake-2.6.4.tar.gz) = 9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2 +SIZE (cmake-2.6.4.tar.gz) = 3285371 diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index 13f6a82f03ca..3cb84ea59ec2 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,6 +1,6 @@ ---- ./Modules/FindQt4.cmake.orig 2009-02-21 23:36:50.000000000 +0300 -+++ ./Modules/FindQt4.cmake 2009-03-20 13:20:18.000000000 +0300 -@@ -319,7 +319,7 @@ +--- Modules/FindQt4.cmake.orig 2009-05-10 21:46:40.000000000 +0200 ++++ Modules/FindQt4.cmake 2009-05-10 21:47:58.000000000 +0200 +@@ -336,7 +336,7 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) # check for qmake @@ -9,19 +9,3 @@ "[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" -@@ -855,13 +855,13 @@ - ) - - FIND_PROGRAM(QT_LUPDATE_EXECUTABLE -- NAMES lupdate -+ NAMES lupdate-qt4 - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) - - FIND_PROGRAM(QT_LRELEASE_EXECUTABLE -- NAMES lrelease -+ NAMES lrelease-qt4 - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index 5933385e9366..84e9c490f010 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -81,7 +81,9 @@ bin/ctest %%DATADIR%%/Modules/CPack.Description.plist.in %%DATADIR%%/Modules/CPack.Info.plist.in %%DATADIR%%/Modules/CPack.OSXScriptLauncher.in +%%DATADIR%%/Modules/CPack.OSXScriptLauncher.rsrc.in %%DATADIR%%/Modules/CPack.OSXX11.Info.plist.in +%%DATADIR%%/Modules/CPack.OSXX11.main.scpt.in %%DATADIR%%/Modules/CPack.RuntimeScript.in %%DATADIR%%/Modules/CPack.STGZ_Header.sh.in %%DATADIR%%/Modules/CPack.VolumeIcon.icns.in |