Revision: 24793
http://sourceforge.net/p/gar/code/24793
Author: dmichelsen
Date: 2015-04-01 11:25:58 +0000 (Wed, 01 Apr 2015)
Log Message:
-----------
cmake/trunk: Update to 3.2.1
Modified Paths:
--------------
csw/mgar/pkg/cmake/trunk/Makefile
csw/mgar/pkg/cmake/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
csw/mgar/pkg/cmake/trunk/files/CSWcmake.gspec
Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile 2015-03-31 20:53:53 UTC (rev 24792)
+++ csw/mgar/pkg/cmake/trunk/Makefile 2015-04-01 11:25:58 UTC (rev 24793)
@@ -1,7 +1,7 @@
# $Id$
NAME = cmake
-VERSION = 3.1.0
+VERSION = 3.2.1
GARTYPE = v2
DESCRIPTION = Cross-platform make
@@ -15,54 +15,67 @@
endef
RELVER = $(shell echo $(VERSION) | cut -d. -f1-2)
-SPKG_SOURCEURL = http://cmake.org/
MASTER_SITES = http://cmake.org/files/v$(RELVER)/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+
+VENDOR_URL = http://cmake.org/
LICENSE = Copyright.txt
-# temporary for cmake-2.8.8, see
http://public.kitware.com/Bug/view.php?id=13199
-#PATCHFILES += 0001-bootstrap-Port-back-to-old-shells-13199.patch
PACKAGES = CSWcmake
-CATALOGNAME_CSWcmake = cmake
SPKG_DESC_CSWcmake = $(DESCRIPTION)
-
RUNTIME_DEP_PKGS_CSWcmake += CSWlibexpat1
RUNTIME_DEP_PKGS_CSWcmake += CSWlibcurl4
RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1
-
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakepolicies.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakecompat.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakemodules.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cpack.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/ccmake.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/ctest.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakeprops.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakecommands.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmake.1
-CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakevars.1
+RUNTIME_DEP_PKGS_CSWcmake += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWcmake += CSWlibstlport1
CHECKPKG_OVERRIDES_CSWcmake += missing-dependency|CSWemacs-common
-NOISALIST = 1
+# This is most certainly the default installation prefix
+CHECKPKG_OVERRIDES_CSWcmake +=
file-with-bad-content|/usr/local|root/opt/csw/bin/cmake
+CHECKPKG_OVERRIDES_CSWcmake +=
file-with-bad-content|/usr/local|root/opt/csw/bin/ccmake
+CHECKPKG_OVERRIDES_CSWcmake +=
file-with-bad-content|/usr/local|root/opt/csw/bin/ctest
+CHECKPKG_OVERRIDES_CSWcmake +=
file-with-bad-content|/usr/local|root/opt/csw/bin/cpack
+
+# This is /usr/local/bin vs. /opt/csw/bin
+REINPLACE_USRLOCAL += Source/cmSiteNameCommand.cxx
+
CONFIGURE_ARGS = --prefix=$(prefix)
TEST_TARGET = test
-# Some tests are failing.
+
+# Some tests are failing:
+# 78 - Module.GenerateExportHeader (Failed)
+# 173 - CTestTestUpload (Failed)
+# 285 - RunCMake.CTestMemcheck (Failed)
+# 352 - GTK2Targets.gio (Failed)
+# 355 - GTK2Targets.atk (Failed)
+# 356 - GTK2Targets.gdk_pixbuf (Failed)
+# 358 - GTK2Targets.pango (Failed)
+# 359 - GTK2Targets.pangocairo (Failed)
+# 360 - GTK2Targets.pangoxft (Failed)
+# 361 - GTK2Targets.pangoft2 (Failed)
+# 362 - GTK2Targets.gdk (Failed)
+# 363 - GTK2Targets.gtk (Failed)
+# 364 - GTK2Targets.sigc++ (Failed)
+# 365 - GTK2Targets.glibmm (Failed)
+# 366 - GTK2Targets.giomm (Failed)
+# 367 - GTK2Targets.atkmm (Failed)
+# 368 - GTK2Targets.cairomm (Failed)
+# 369 - GTK2Targets.pangomm (Failed)
+# 370 - GTK2Targets.gdkmm (Failed)
+# 371 - GTK2Targets.gtkmm (Failed)
+# 401 - CMake.CheckSourceTree (Failed)
+
SKIPTEST = 1
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content
+#CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content
include gar/category.mk
-FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(NAME)-$(VERSION)/Modules
-FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(NAME)-$(VERSION)/Templates
-FIXCONFIG_DIRS += $(DESTDIR)$(prefix)$(docdir)
-FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/man/man1
-
EXTRA_CFLAGS = -xnorunpath
EXTRA_CXXFLAGS = -norunpath
-post-configure-modulated:
+post-configure:
@(echo "==> Forcing use of system libraries")
@(echo "=====> curl, expat, xmlrpc, and zlib")
@(perl -i -plne 's/USE_SYSTEM_CURL:BOOL=OFF/USE_SYSTEM_CURL:BOOL=ON/'
$(WORKSRC)/CMakeCache.txt)
@@ -70,3 +83,18 @@
@(perl -i -plne
's/USE_SYSTEM_XMLRPC:BOOL=OFF/USE_SYSTEM_XMLRPC:BOOL=ON/'
$(WORKSRC)/CMakeCache.txt)
@(perl -i -plne 's/USE_SYSTEM_ZLIB:BOOL=OFF/USE_SYSTEM_ZLIB:BOOL=ON/'
$(WORKSRC)/CMakeCache.txt)
@$(MAKECOOKIE)
+
+# Entries with spaces in the filepath are not allowed in the pkgmap.
+# Adjust the directory path to the help pages in 8.1.7
+post-install:
+ cd $(DESTDIR); find . -type d -name "* *" | \
+ while read F; do \
+ N=`echo $$F | tr ' ' '_'`; \
+ mv "$$F" $$N; \
+ done;
+ cd $(DESTDIR); find . -type f -name "* *" | \
+ while read F; do \
+ N=`echo $$F | tr ' ' '_'`; \
+ mv "$$F" $$N; \
+ done;
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/cmake/trunk/checksums
===================================================================
--- csw/mgar/pkg/cmake/trunk/checksums 2015-03-31 20:53:53 UTC (rev 24792)
+++ csw/mgar/pkg/cmake/trunk/checksums 2015-04-01 11:25:58 UTC (rev 24793)
@@ -1 +1 @@
-188eb7dc9b1b82b363bc51c0d3f1d461 cmake-3.1.0.tar.gz
+63f436aa19b5efc37017759c8d3953ca cmake-3.2.1.tar.gz
Deleted:
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
===================================================================
---
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
2015-03-31 20:53:53 UTC (rev 24792)
+++
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
2015-04-01 11:25:58 UTC (rev 24793)
@@ -1,69 +0,0 @@
-From e5dc76894ae8fbc95126ebb54a838e0342686b96 Mon Sep 17 00:00:00 2001
-Message-Id:
<e5dc76894ae8fbc95126ebb54a838e0342686b96.1336485168.git.brad.k...@kitware.com>
-From: Brad King <brad.k...@kitware.com>
-Date: Tue, 8 May 2012 09:43:19 -0400
-Subject: [PATCH] bootstrap: Port back to old shells (#13199)
-
-Since commit f39e82c9 (bootstrap: Re-implement command line option
-processing, 2011-12-16) bootstrap uses POSIX shell expressions of the
-form "${x#y}" to remove prefix pattern 'y' from the vaule of 'x'.
-Although this is allowed by POSIX old shells on some platforms do not
-support it. Revert to using 'sed' to work with old shells.
----
- bootstrap | 27 ++++++++++++++++++---------
- 1 file changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/bootstrap b/bootstrap
-index 3be3d1f..7b044e7 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -460,6 +460,12 @@ cmake_escape ()
- echo $1 | sed "s/ /\\\\ /g"
- }
-
-+# Strip prefix from argument
-+cmake_arg ()
-+{
-+ echo "$1" | sed "s/^${2-[^=]*=}//"
-+}
-+
- # Write message to the log
- cmake_log ()
- {
-@@ -544,21 +550,24 @@ cmake_ccache_enabled=
- cmake_prefix_dir="${cmake_default_prefix}"
- while test $# != 0; do
- case "$1" in
-- --prefix=*) cmake_prefix_dir=`cmake_fix_slashes "${1#*=}"` ;;
-- --parallel=*) cmake_parallel_make="${1#*=}" ;;
-- --datadir=*) cmake_data_dir="${1#*=}" ;;
-- --docdir=*) cmake_doc_dir="${1#*=}" ;;
-- --mandir=*) cmake_man_dir="${1#*=}" ;;
-- --init=*) cmake_init_file="${1#*=}" ;;
-+ --prefix=*) dir=`cmake_arg "$1"`
-+ cmake_prefix_dir=`cmake_fix_slashes "$dir"` ;;
-+ --parallel=*) cmake_parallel_make=`cmake_arg "$1"` ;;
-+ --datadir=*) cmake_data_dir=`cmake_arg "$1"` ;;
-+ --docdir=*) cmake_doc_dir=`cmake_arg "$1"` ;;
-+ --mandir=*) cmake_man_dir=`cmake_arg "$1"` ;;
-+ --init=*) cmake_init_file=`cmake_arg "$1"` ;;
- --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
- --no-system-libs)
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
-
--system-bzip2|--system-curl|--system-expat|--system-libarchive|--system-zlib)
-- cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${1#--system-}`=1" ;;
-+ lib=`cmake_arg "$1" "--system-"`
-+ cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
-
--no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib)
-- cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${1#--no-system-}`=0" ;;
-+ lib=`cmake_arg "$1" "--no-system-"`
-+ cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
- --qt-gui) cmake_bootstrap_qt_gui="1" ;;
- --no-qt-gui) cmake_bootstrap_qt_gui="0" ;;
-- --qt-qmake=*) cmake_bootstrap_qt_qmake="${1#*=}" ;;
-+ --qt-qmake=*) cmake_bootstrap_qt_qmake=`cmake_arg "$1"` ;;
- --help) cmake_usage ;;
- --version) cmake_version_display ; exit 2 ;;
- --verbose) cmake_verbose=TRUE ;;
---
-1.7.10
-
Deleted: csw/mgar/pkg/cmake/trunk/files/CSWcmake.gspec
===================================================================
--- csw/mgar/pkg/cmake/trunk/files/CSWcmake.gspec 2015-03-31 20:53:53 UTC
(rev 24792)
+++ csw/mgar/pkg/cmake/trunk/files/CSWcmake.gspec 2015-04-01 11:25:58 UTC
(rev 24793)
@@ -1,4 +0,0 @@
-%var bitname cmake
-%var pkgname CSWcmake
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/Docs/Copyright.txt
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
