Commit graph

127 commits

Author SHA1 Message Date
Adriaan de Groot
4790d623e6 CMake 3.10 uses C++11, which needs to be explicitly enabled for
Tier-2 architectures.

PR:		224721
Reported by:	Justin Hibbits
Approved by:	tcberner (mentor)
2017-12-30 22:31:13 +00:00
Adriaan de Groot
74c0e748b9 Update CMake to 3.10.1
- https://blog.kitware.com/cmake-3-10-1-available-for-download/
   - flang support
   - changes to automoc policies
   - support for FreeBSD package generation with CPack

Necessary fixes to other ports:
 - cad/openvsp make search for libxml explicit
 - math/scalapack force C compiler to be compatible with mpi
 - deskutils/kdepim4 fix incorrect sources list
 - www/qt5-webkit fix incorrect sources list

Thanks to Antoine for the multiple exp-runs.

PR:		223872
Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D13210
2017-12-23 10:44:23 +00:00
Adriaan de Groot
aac918473d Update the cmake family to 3.9.6 (skip 3.9.5, the upstream
releases are coming quick and fast). Upstream changes are
 - AUTOMOC options fixes (3.9.5)
 - gcc_eh linking (3.9.6)

Thanks antoine@ for the exp-runs.

PR:		223436
Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D12958
2017-11-16 10:15:15 +00:00
Adriaan de Groot
d02f09d11e Update CMake to 3.9.4.
Update CMake to latest upstream release. This is a minor bug-fix release --
the changelog suggests mostly polishing applied to the FindBoost module.

Thanks to antoine@ for the exp-run.

PR:		222878
Approved by:	rakuco (mentor)
Differential Revision:	https://reviews.freebsd.org/D12604
2017-10-18 13:36:43 +00:00
Adriaan de Groot
e95a728619 Update CMake to 3.9.3
This includes the upstream patches for the new Boost version (PR 222207, r450301).
Thanks to antoine@ for the exp-run.

PR:		222513
Approved by:	rakuco (mentor), tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D12427
2017-10-01 16:26:39 +00:00
Mathieu Arnold
3fcd0e41de Remove USES=execinfo.
PR:		220271
Submitted by:	mat (review), Yasuhiro KIMURA (PR)
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D11488
2017-09-22 10:48:28 +00:00
Jan Beich
9f1c615306 devel/cmake: backport boost 1.65.1 support
CMake Warning at /usr/local/share/cmake/Modules/FindBoost.cmake:767 (message):
  Imported targets not available for Boost version 106501
Call Stack (most recent call first):
  /usr/local/share/cmake/Modules/FindBoost.cmake:871 (_Boost_COMPONENT_DEPENDENCIES)
  /usr/local/share/cmake/Modules/FindBoost.cmake:1501 (_Boost_MISSING_DEPENDENCIES)
  CMakeLists.txt:558 (find_package)

PR:		222207
Approved by:	kde (rakuco)
Obtained from:	upstream (cmake-3.9.3)
2017-09-21 19:59:35 +00:00
Adriaan de Groot
c91270bd8d Update CMake to 3.9, merge devel/cmake-modules into devel/cmake
Thanks to antoine@ for the exp-run.

Approved by:		rakuco (mentor)
Reviewed by:		tcberner (mentor)
Reviewed by:		mat
PR:			222000 (exp-run)
Differential Revision:	https://reviews.freebsd.org/D12299
2017-09-14 21:02:51 +00:00
Alexey Dokuchaev
b2bbe1b164 Add two missing linefeeds. 2017-06-26 12:50:00 +00:00
Raphael Kubo da Costa
d917f8db47 Update CMake to 3.8.2.
Thanks to antoine@ for the exp-run.

PR:		219765
Submitted by:	Adriaan de Groot <groot@kde.org>
2017-06-10 13:33:52 +00:00
Tobias C. Berner
e06c13c87b Update cmake and friends to 3.8.0
* add patch for finance/kmymoney-kde4
* change patch in irc/irssi-fish as pkgconfig handling has changed.

PR:		218559
Exp-run by:	antoine
Reviewed by:	mat, rakuco
Approved by:	rakuco (mentor)
Differential Revision:	https://reviews.freebsd.org/D9557
2017-04-19 15:04:59 +00:00
Tobias C. Berner
4b775dff0a Update devel/cmake and friends to 3.7.2
PR:		216190
Exp-Run by:	antoine
Reviewed by:	rakuco
Approved by:	rakuco (mentor)
Differential Revision:	https://reviews.freebsd.org/D9224
2017-01-20 12:21:37 +00:00
Tobias C. Berner
2daa0c1611 Update devel/cmake* to 3.7.1 [1]
Due to an upstream commit [2] we need now to pass
CMAKE_INSTALL_MANDIR:PATH="share/man" in the
devel/llvm-* ports, and fix the plist of net/remmina.
Further add an upstream patch to  math/plplot to
fix the build with 3.7.1.

[1] https://cmake.org/cmake/help/v3.7/release/3.7.html
[2] https://github.com/kitware/cmake/commit/956054

PR:		214975
Approved by:	rakuco (mentor)
Exp-run by:	antoine
2016-12-09 11:40:59 +00:00
Tobias C. Berner
bb9f85bbd4 Update devel/cmake to 3.6.3
Changelog:
https://blog.kitware.com/cmake-3-6-3-available-for-download/

PR:		214425
Exp-run by: 	antoine
Approved by:	rakuco (mentor)
2016-11-16 17:04:15 +00:00
Tobias C. Berner
35e807e355 Update CMake to 3.6.2.
Announcement: https://blog.kitware.com/cmake-3-6-2-available-for-download/

PR:	212586
Approved by: rakuco (mentor)
2016-09-18 08:38:25 +00:00
Tobias C. Berner
0f583d8700 Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and
Plasma5 ports

At the moment KDE ports use bsd.kde4.mk to handle their dependencies. When
working on the ports for KDE Frameworks and Plasma5 it seemed to be more
reasonable to create a new kde.mk instead of adding an bsd.kde5.mk.

The kde.mk in this review is a stripped down version of the one we are using in
the KDE Test repositories plasma5 branch [1] to only contain the parts relevant
to the current KDE4 ports in the portstree [2].

Changes to the KDE Ports needed by this:

Replace USE_KDE4 by USE_KDE [3]
Add USES=kde:4 [4]
[1] http://src.mouf.net/area51/view/branches/plasma5/KDE/Mk/Uses/kde.mk
[2] The version in the plasma5 branch also handles frameworks/plasma5 and
    handles MASTER_SITES via a KDE_DIST variable similar to bsd.qt.mk for Qt
    Ports -- I chose to leave this out for now, as the diff is already large
    enough.
[3] I chose USE_KDE instead of USE_KDE4, USE_KDE5, USE_KDEX as the version we
    want is already specified as argument to kde:<arg>
[4] For KDE Frameworks and Plasma5 ports this would be kde:5

PR:             210667
Approved by:    portmgr, mat (mentor), rakuco (mentor)
Reviewed by:    mat, rakuco
Differential Revision:   https://reviews.freebsd.org/D6961
2016-08-24 08:20:31 +00:00
John Marino
84060bc094 devel/cmake: document ncurses requirement
Approved by:	ncurses blanket
2016-08-23 19:09:32 +00:00
Raphael Kubo da Costa
ea3d3f386c Update CMake to 3.6.1.
https://blog.kitware.com/cmake-3-6-0-available-for-download/
https://blog.kitware.com/cmake-3-6-1-available-for-download/

PR:		210988
2016-07-23 12:32:18 +00:00
Raphael Kubo da Costa
8d18ef1860 Add USES=execinfo.
Even though the port built fine without it, it does look for execinfo.h during
the configuration phase and uses its features when it is detected.
2016-07-10 21:38:01 +00:00
Kurt Jaeger
cbefba2eac devel/jsoncpp: bump portrevision for dependent ports for shlib change .0 -> .1
PR:		209407
Submitted by:	sunpoet
2016-05-17 18:01:15 +00:00
Raphael Kubo da Costa
f2d0723592 Update CMake to 3.5.2.
Announcement: https://blog.kitware.com/cmake-3-5-2-available-for-download/

PR:		208831
2016-04-18 09:54:11 +00:00
Raphael Kubo da Costa
60a616a115 Update CMake to 3.5.1.
Release notes: https://blog.kitware.com/cmake-3-5-1-available-for-download/

PR:		208473
2016-04-07 17:23:29 +00:00
Mathieu Arnold
4e1b79a0a6 Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 14:00:51 +00:00
Mathieu Arnold
999161a9ed Fixup some whitespace at the beginning of lines problems.
With hat:	portmgr
Sponsored by:	Absolight
2016-04-01 13:18:17 +00:00
Raphael Kubo da Costa
e76eee642e cmake, cmake-gui: Use ${PORTVERSION:R} in MASTER_SITES.
This reduces the number of lines that need to be changed on CMake updates.
Thanks to sunpoet for the suggestion.
2016-03-22 10:59:54 +00:00
Raphael Kubo da Costa
8332d1f769 Update CMake to 3.5.0.
Announcement: https://blog.kitware.com/cmake-3-5-0-available-for-download/

Most ports have already been fixed for this update, but science/orthanc was
included in this commit because I am not entirely sure the changes in it work
with CMake < 3.5.0. In short, FindDCMTK.cmake was rewritten and the way orthanc
uses the DCMTK variables was incompatible with the use upstream intended.

PR:		208033
2016-03-19 14:41:38 +00:00
Raphael Kubo da Costa
0a60d35989 Update CMake to 3.4.2.
This is a small bug fix release mostly targeting Windows 10 targets.
Release announcement: http://www.kitware.com/blog/home/post/1036

PR:		206519
Submitted by:	Tobias Berner <tcberner@gmail.com>
2016-01-26 10:20:00 +00:00
Raphael Kubo da Costa
b30000116c Update CMake to 3.4.1.
Release notes: http://www.kitware.com/blog/home/post/1016

Finally a small, bug-fix release that does not requrie changes to other
ports.

PR:		205014
2015-12-05 21:16:19 +00:00
Raphael Kubo da Costa
7a323ebcd6 CMake: Add upstream patch to fix the build with recent GCCs.
At least lang/gcc (4.8) and later were known to be broken like this:

/usr/ports/devel/cmake/work/cmake-3.4.0/Source/cmArchiveWrite.h:93:23: error: 'mode_t' has not been declared
   void SetPermissions(mode_t permissions_)
                       ^
/usr/ports/devel/cmake/work/cmake-3.4.0/Source/cmArchiveWrite.h:106:27: error: 'mode_t' has not been declared
   void SetPermissionsMask(mode_t permissionsMask_)
                           ^
/usr/ports/devel/cmake/work/cmake-3.4.0/Source/cmArchiveWrite.h:179:26: error: 'mode_t' was not declared in this scope
   cmArchiveWriteOptional<mode_t> Permissions;
                          ^
/usr/ports/devel/cmake/work/cmake-3.4.0/Source/cmArchiveWrite.h:179:32: error: template argument 1 is invalid
   cmArchiveWriteOptional<mode_t> Permissions;
                                ^
/usr/ports/devel/cmake/work/cmake-3.4.0/Source/cmArchiveWrite.h:180:26: error: 'mode_t' was not declared in this scope
   cmArchiveWriteOptional<mode_t> PermissionsMask;
                          ^
/usr/ports/devel/cmake/work/cmake-3.4.0/Source/cmArchiveWrite.h:180:32: error: template argument 1 is invalid
   cmArchiveWriteOptional<mode_t> PermissionsMask;
                                ^

This was introduced in CMake 3.4.0, so there is no need for an MFH request.

PR:		204921
2015-12-02 10:58:50 +00:00
Raphael Kubo da Costa
08ea67cb98 Update CMake to 3.4.0.
Release notes: https://cmake.org/cmake/help/v3.4/release/3.4.html

- Bump PORTREVISION in a few ports that do not ship SOVERSIONed libraries
  anymore (see https://cmake.org/gitweb?p=cmake.git;a=commit;h=f799ffb5).
- Switch MASTER_SITES to https.

PR:		204629
2015-11-30 14:20:13 +00:00
Raphael Kubo da Costa
ff65e01c1b Add upstream patch to fix the build with GCC 4.6, 4.7 and 4.8.
runetype.h uses _Thread_local, and if we pass -std=c11 or -std=gnu11 to GCC
the header expects it to be supported as part of the language and does not
make it a typedef or something else.

Since GCC only started supporting _Thread_local with the 4.9 series,
building CMake with, say, lang/gcc (which is 4.8) fails:

    /usr/include/runetype.h:92:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'const'
    /usr/include/runetype.h: In function '__getCurrentRuneLocale':
    /usr/include/runetype.h:96:6: error: '_ThreadRuneLocale' undeclared (first use in this function)
    /usr/include/runetype.h:96:6: note: each undeclared identifier is reported only once for each function it appears in

The upstream patch adds a test for _Thread_local and uses C99 instead of C11
if it fails.

PR:		203066
2015-09-16 14:56:07 +00:00
Raphael Kubo da Costa
cfc6c42930 Update CMake to 3.1.1.
Release notes for the 3.3 series:
http://www.cmake.org/cmake/help/v3.3/release/3.3.html

This update took longer than expected because of a behavior change in CMake:
now calls to find_library(), find_path() etc will take the $PATH environment
variable into consideration, which in practice means that it will prefer
libraries in base instead of those in ports when both versions are available.
r395972 is an example of the groundwork that had to be done before landing this
patch.

- deskutils/owncloudclient: When OpenSSL from ports is to be used, make sure to
  pass ${LOCALBASE} as $CMAKE_PREFIX_PATH, otherwise it will use the version in
  base (see above) and fail on 9.x.
- math/cgal: Import upstream patch to fix the configuration process with CMake
  3.3.x.

PR:		202516
2015-09-07 12:09:53 +00:00
Raphael Kubo da Costa
7c2b19e9c5 Add upstream patch to make the build work with non-base (ie. newer) GCCs.
The build was failing with, for example, lang/gcc48:

In file included from /usr/ports/devel/cmake/work/cmake-3.2.3/Source/cmGlobalNinjaGenerator.cxx:14:0:
/usr/ports/devel/cmake/work/cmake-3.2.3/Source/cmGeneratorExpressionEvaluationFile.h:39:64: error: 'mode_t' has not been declared
               std::map<std::string, std::string> &outputFiles, mode_t perm);
2015-08-30 19:44:54 +00:00
Baptiste Daroussin
cd6ed67653 Enforce libarchive from ports
This reduces the patching level on some ports and make it simpler to maintainer
over all supported version of freebsd
2015-07-19 22:04:44 +00:00
Raphael Kubo da Costa
f5a57e0292 Bump PORTREVISION in cmake and cmake-gui after r391009.
Make sure the generated binaries have the right entry for libjsoncpp.so in
the ELF headers.

PR:		200969
2015-06-30 21:49:29 +00:00
Brad Davis
24430efd28 Update devel/cmake, devel/cmake-gui and devel/cmake-modules to 3.2.3.
Thank you to antonie@ for the exp-run and rakuco@ for fixing the ports that needed fixes.

PR:		200647
Approved by:	bdrewery (mentor)
2015-06-16 20:25:05 +00:00
Raphael Kubo da Costa
eb4a9c77b9 Set LIBLZMA_INCLUDE_DIR and LIBLZMA_LIBRARY in the initial cache.
Do it so that we can hardcode these variables to point to base's liblzma,
otherwise the liblzma.so installed by archivers/lzmalib will be chosen if
present and the configuration process will fail.

This is done only so that `make configure' works, as liblzma is only used if
we build CMake's bundled libarchive.

MFH:		2015Q2
2015-05-03 19:36:02 +00:00
Adam Weinberger
cdb587461c Add a MANPAGES option to control the generation of cmake's manpages.
The py-sphinx system brings in a number of dependencies that wouldn't
otherwise be necessary for cmake. The MANPAGES option defaults to on,
so the main pkg won't change.

PR:		193259
Approved by:	kde (makc)
2015-02-24 16:40:43 +00:00
Raphael Kubo da Costa
2361564507 Update CMake to 3.1.3.
Changelog:
http://www.kitware.com/blog/home/post/842 (v3.1.3)
http://www.kitware.com/blog/home/post/839 (v3.1.2)

PR:		197690
2015-02-16 19:58:34 +00:00
Raphael Kubo da Costa
7fc41c469c Update CMake to 3.1.1.
List of changes: http://www.kitware.com/blog/home/post/828

PR:		197053
2015-01-26 23:23:03 +00:00
Koop Mast
bb89f80c35 Update ImageMagick to 6.9.0.4.
- Normalize the ImageMagick library name so it stays the same regardless of
  what the 16-bit and HDRI option are set to [1]. Teach cmake to look for
  the new name. Bump ports that link to the libraries due to this.
- As a result do away with the "HALFSUPPORTED" option block, and list
  16-bit and HDRI with the other options.
- ImageMagick ships a basic SVG plugin when not using librsvg2 for SVG
  support. This basic SVG plugin needs libxml2 to work [2]. Make libxml2
  a mandatory dependency (instead of only when the SVG option was selected).
- Don't touch .keep files in the modules directory, there files there so
  it useless.

PR:		194949 [1]
PR:		195227 [2]
Requested by:	many [1]
Submitted by:	software-freebsd@interfasys.ch [2]
2015-01-18 21:12:42 +00:00
Raphael Kubo da Costa
8201ec1103 Update CMake to 3.1.0.
Upstream release notes:
http://www.cmake.org/cmake/help/v3.1/release/3.1.0.html

Notable changes on the packaging side:
* devel/cmake does not need USE_OPENSSL=yes anymore. In fact, it has not
  needed it since r366996, when we stopped building CMake's bundled copies
  of curl, libarchive & friends (curl was the only consumer of OpenSSL in
  CMake).

* Likewise, we do not need to set CMAKE_USE_OPENSSL in InitialCache.cmake
  anymore.

* On FreeBSD < 10, devel/cmake and devel/cmake-gui now depend on
  archivers/libarchive because the libarchive version in base is too old and
  does not contain some functions that CMake uses.

PR:		196367
2015-01-04 22:18:02 +00:00
Raphael Kubo da Costa
d9c3f9f1b7 Include bsd.port.pre.mk after setting OPTIONS.
r375798 made the OPTIONS prompt show up on every build because
bsd.port.pre.mk was being included too early. Move the inclusion down one
section.

PR:		196374
Submitted by:	Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
2014-12-30 09:50:59 +00:00
Raphael Kubo da Costa
8de9d2b8c6 Check for WITH_DEBUG when changing INSTALL_TARGET.
We have the same problem described in https://reviews.freebsd.org/D875:
> bsd.ports.mk sets STRIP= after all Uses files have been processed
> initially. If you have WITH_DEBUG=yes set, cmake's INSTALL_TARGET has been
> set already to install/strip, before STRIP is reset.

In other words, INSTALL_TARGET would always be set to "install/strip"
even when WITH_DEBUG was set.

Since we do not use USES=cmake here the fix (check for WITH_DEBUG besides
evaluating STRIP) needs to be duplicated in the Makefile.
2014-12-29 20:10:20 +00:00
Baptiste Daroussin
e52c1f9d98 Cleanup plist 2014-10-27 10:10:58 +00:00
Raphael Kubo da Costa
a2f301d7d8 Update CMake to 3.0.2.
This is a much smaller update than the previous one, and the only change
worth mentioning on the ports side is that devel/cmake-gui now has
USES=desktop-file-utils because it installs a .desktop file.

PR:		193691
2014-09-19 16:35:26 +00:00
Raphael Kubo da Costa
eac6c226d8 - Install CMake's Help/ directory. Its contents are used by commands such as
`cmake --help-command' and `cmake --help-policies', which were just
  erroring out or not printing anything.
  Modules/ and Templates/ are still installed by devel/cmake-modules.

  Reported by gahr@.

- Pass --parallel to CMake's bootstrap script to parallelize the initial
  part of its build process.
2014-09-04 21:20:48 +00:00
Raphael Kubo da Costa
9cf4c16732 Commit the changes to devel/cmake's Makefile that should've been part of r366996.
Still no idea how it wasn't committed.
2014-09-02 13:39:32 +00:00
Raphael Kubo da Costa
68bc4af5c8 Update CMake to 3.0.1.
The 3.0 series is an incremental improvement over the previous 2.8 series
despite the major version number change. A list of important changes is
available at http://www.cmake.org/cmake/help/v3.0/release/3.0.0.html

On the porting side
* The minimum FreeBSD release we have to support in the ports tree is now
  recent enough that ports/168671 can finally be committed: instead of
  building and using CMake's own copies of bzip2, curl, expat, libarchive,
  liblzma and zlib, we use the versions in ports and/or the base system.

* CMake's documentation system has been changed and vastly improved at the
  cost of now depending on Sphinx. We still generate only man pages, but can
  start generating the HTML documentation in the future if desired.

* devel/cmake-gui now uses Qt5 instead of Qt4 and does not needlessly build
  the ncurses UI that is installed by devel/cmake itself.

* CMake commit 3816cd2 fixes a longstanding issue in the detection of the
  Python interpreter and its libraries, but requires us to revert a
  workaround for that in Mk/Uses/python.mk itself, effectively reverting
  the patch introduced by ports/168159.

* Similarly, a few ports had to be fixed manually due to CMake being
  stricter when parsing some files or the ports detecting Python the wrong
  way. Fortunately, they all had been fixed upstream so I just grabbed the
  appropriate commits and pointed to them in the patches.
  science/gnudatalanguage had to have its PORTREVISION bumped because
  switching to USES=cmake:outsource removed a few files from the plist that
  were not supposed to have been installed in the first place.

PR:		168671
PR:		192644
2014-09-02 12:59:54 +00:00
Raphael Kubo da Costa
7054d0e059 Update MASTER_SITES for the CMake ports.
downloads.cmake.org does not resolve, use www.cmake.org instead.

PR:		192141
MFH:		2014Q3
2014-07-27 11:46:06 +00:00