Merge pull request #3863 from chneukirchen/cmake350

cmake: update to 3.5.0

srcpkgs/cmake-gui/template

@@ -1,26 +1,29 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.0.2
+version=3.5.0
 revision=1
 wrksrc="cmake-${version}"
 build_style=configure
-configure_script="./bootstrap"
 configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake
  --system-libs --qt-gui ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-makedepends="zlib-devel expat-devel libcurl-devel ncurses-devel libarchive-devel qt-devel"
+makedepends="zlib-devel expat-devel libcurl-devel ncurses-devel libarchive-devel qt-devel jsoncpp-devel"
 depends="desktop-file-utils shared-mime-info"
 short_desc="Cross-platform, open-source build system - QT GUI"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1, 3-clause-BSD"
 homepage="http://www.cmake.org"
 distfiles="http://www.cmake.org/files/v${version%.*}/cmake-$version.tar.gz"
-checksum=6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e
+checksum=92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa
 
 do_install() {
 	# We are only interested in cmake-gui.
 	make DESTDIR=${wrksrc}/${pkgname} install
 
+	vbin ${pkgname}/usr/bin/cmake-gui
+
 	vmkdir usr/share
-	vinstall ${pkgname}/usr/bin/cmake-gui 755 usr/bin
+	cp -a ${pkgname}/usr/share/{applications,mime,icons} ${DESTDIR}/usr/share
-	cp -a ${pkgname}/usr/share/{applications,mime,pixmaps} ${DESTDIR}/usr/share
+
+	vmkdir usr/share/licenses  # no vlicense
+	mv ${pkgname}/usr/share/doc/cmake ${DESTDIR}/usr/share/licenses/cmake-gui
 }

srcpkgs/cmake-gui/update

@@ -1 +1,2 @@
-pkgname="cmake"
+site='https://cmake.org/download/'
+pkgname='cmake'

srcpkgs/cmake/patches/musl-header-fixes.patch

@@ -1,13 +0,0 @@
-mode_t needs sys/stat.h
-
---- Source/cmStandardIncludes.h.orig
-+++ Source/cmStandardIncludes.h
-@@ -74,6 +74,8 @@
- 
- #if defined( _MSC_VER )
- typedef unsigned short mode_t;
-+#else
-+#include <sys/stat.h>
- #endif
- 
- // use this class to shrink the size of symbols in .o files

srcpkgs/cmake/template

@@ -1,7 +1,7 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.2.3
+version=3.5.0
-revision=2
+revision=1
 build_style=configure
 makedepends="zlib-devel bzip2-devel expat-devel libcurl-devel ncurses-devel libarchive-devel"
 short_desc="Cross-platform, open-source build system"
@@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1, 3-clause-BSD"
 homepage="http://www.cmake.org"
 distfiles="http://www.cmake.org/files/v${version%.*}/$pkgname-$version.tar.gz"
-checksum=a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297
+checksum=92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX ugly :-)
@@ -19,10 +19,7 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DCMAKE_USE_SYSTEM_LIBARCHIVE=1"
 	configure_args+=" -DCMAKE_USE_SYSTEM_CURL=1 -DCMAKE_USE_SYSTEM_ZLIB=1"
 	configure_args+=" -DCMAKE_USE_SYSTEM_EXPAT=1 -DCMAKE_USE_SYSTEM_BZIP2=1"
-	configure_args+=" -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DCMAKE_USE_SYSTEM_LIBFORM=1"
+	configure_args+=" -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DKWSYS_LFS_WORKS=1"
-	configure_args+=" -DHAVE_GLIBC_STRERROR_R=0 -DHAVE_POSIX_STRERROR_R=1"
-	configure_args+=" -DHAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT=0 -DHAVE_POSIX_STRERROR_R__TRYRUN_OUTPUT=0"
-	configure_args+=" -DHAVE_POLL_FINE=1 -DKWSYS_CHAR_IS_SIGNED=1 -DKWSYS_LFS_WORKS=1"
 else
 	build_style=configure
 	configure_args="--prefix=/usr --mandir=/share/man"
@@ -30,7 +27,8 @@ else
 fi
 
 post_install() {
-	if [ -d ${DESTDIR}/usr/doc ]; then
+	rm -rf ${DESTDIR}/usr/share/doc/cmake
-		mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share
+	vlicense Copyright.txt
-	fi
+	vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt
+	vlicense Utilities/cmcompress/Copyright.txt cmcompress-Copyright.txt
 }

srcpkgs/cmake/update

@@ -0,0 +1 @@
+site='https://cmake.org/download/'