svn commit: r496336 - head/textproc/nuspell
Jan Beich
jbeich at FreeBSD.org
Wed Mar 20 12:22:56 UTC 2019
Author: jbeich
Date: Wed Mar 20 12:22:54 2019
New Revision: 496336
URL: https://svnweb.freebsd.org/changeset/ports/496336
Log:
textproc/nuspell: update to 2.2.0
Changes: https://github.com/nuspell/nuspell/releases/tag/v2.2.0
Changes: https://github.com/nuspell/nuspell/compare/v2.1.0...v2.2.0
Modified:
head/textproc/nuspell/Makefile (contents, props changed)
head/textproc/nuspell/distinfo (contents, props changed)
head/textproc/nuspell/pkg-plist (contents, props changed)
Modified: head/textproc/nuspell/Makefile
==============================================================================
--- head/textproc/nuspell/Makefile Wed Mar 20 12:03:07 2019 (r496335)
+++ head/textproc/nuspell/Makefile Wed Mar 20 12:22:54 2019 (r496336)
@@ -2,7 +2,7 @@
PORTNAME= nuspell
DISTVERSIONPREFIX= v
-DISTVERSION= 2.1.0
+DISTVERSION= 2.2.0
CATEGORIES= textproc
MAINTAINER= jbeich at FreeBSD.org
@@ -14,27 +14,31 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
LIB_DEPENDS= libboost_locale.so:devel/boost-libs \
libicuuc.so:devel/icu
-USES= autoreconf compiler:c++14-lang gmake libtool pkgconfig
+USES= cmake compiler:c++14-lang
USE_GITHUB= yes
-GNU_CONFIGURE= yes
+CMAKE_ON= BUILD_SHARED_LIBS
-OPTIONS_DEFINE= TEST
+OPTIONS_DEFINE= DOCS TEST
-TEST_BUILD_DEPENDS= catch>0:devel/catch
-TEST_CPPFLAGS= -isystem${LOCALBASE}/include/catch2
-TEST_TEST_TARGET= check
+DOCS_BUILD_DEPENDS= ronn:textproc/rubygem-ronn
+TEST_BUILD_DEPENDS= catch>0:devel/catch \
+ bash:shells/bash
+TEST_CMAKE_BOOL= BUILD_TESTING
+TEST_TEST_TARGET= test
+
post-patch:
# Skip README as it only contains install instructions
- @${REINPLACE_CMD} 's/ README//' ${WRKSRC}/Makefile.am
-# Don't try to download catch2 during build
- @${REINPLACE_CMD} '/wget/d' ${WRKSRC}/tests/Makefile.am
+ @${REINPLACE_CMD} -i .doc '/README/d' ${WRKSRC}/CMakeLists.txt
+# Switch to system Catch2 and use IMPORTED target
+ @${REINPLACE_CMD} -i .catch '/Catch2/,//d' ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} -i .catch -e '/CMAKE_MODULE_PATH/,/Catch2/d' \
+ -e $$'/include.*Catch/i\\\nfind_package(Catch2 REQUIRED)\n' \
+ -e '/target_link_libraries/s/Catch2/&::&/' \
+ ${WRKSRC}/tests/CMakeLists.txt
# Respect PREFIX != /usr/local
@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
${WRKSRC}/src/nuspell/finder.cxx
-
-post-patch-TEST-off:
- @${REINPLACE_CMD} -i .notest 's/ tests//' ${WRKSRC}/Makefile.am
pre-install-TEST-on: do-test
Modified: head/textproc/nuspell/distinfo
==============================================================================
--- head/textproc/nuspell/distinfo Wed Mar 20 12:03:07 2019 (r496335)
+++ head/textproc/nuspell/distinfo Wed Mar 20 12:22:54 2019 (r496336)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1546481730
-SHA256 (nuspell-nuspell-v2.1.0_GH0.tar.gz) = 95ff7e803ef36f668de405b2c657efb4af36ddeb10c6267cc9bf126898be4482
-SIZE (nuspell-nuspell-v2.1.0_GH0.tar.gz) = 447400
+TIMESTAMP = 1553005126
+SHA256 (nuspell-nuspell-v2.2.0_GH0.tar.gz) = c6d7664be74e84505f4227836d302c2885f65b165411ef86cc9cffbc1228d0c4
+SIZE (nuspell-nuspell-v2.2.0_GH0.tar.gz) = 400415
+SHA256 (catchorg-Catch2-v2.2.0_GH0.tar.gz) = dee151b8fb403b277e1c806be6c6978c3f92f12a7f457761fa08c0404c1aaedb
+SIZE (catchorg-Catch2-v2.2.0_GH0.tar.gz) = 487585
Modified: head/textproc/nuspell/pkg-plist
==============================================================================
--- head/textproc/nuspell/pkg-plist Wed Mar 20 12:03:07 2019 (r496335)
+++ head/textproc/nuspell/pkg-plist Wed Mar 20 12:22:54 2019 (r496336)
@@ -5,6 +5,12 @@ include/nuspell/finder.hxx
include/nuspell/locale_utils.hxx
include/nuspell/string_utils.hxx
include/nuspell/structures.hxx
-lib/libnuspell.a
+lib/cmake/nuspell/NuspellConfig.cmake
+lib/cmake/nuspell/NuspellConfigVersion.cmake
+lib/cmake/nuspell/NuspellTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/nuspell/NuspellTargets.cmake
+lib/libnuspell.so
+lib/libnuspell.so.2
+lib/libnuspell.so.2.2.0
libdata/pkgconfig/nuspell.pc
-man/man1/nuspell.1.gz
+%%PORTDOCS%%man/man1/nuspell.1.gz
More information about the svn-ports-all
mailing list