Date: Sun, 7 Jul 2019 20:48:56 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506195 - head/textproc/nuspell Message-ID: <201907072048.x67Kmup1042131@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Jul 7 20:48:55 2019 New Revision: 506195 URL: https://svnweb.freebsd.org/changeset/ports/506195 Log: textproc/nuspell: simplify system catch usage via upstream fix Modified: head/textproc/nuspell/Makefile (contents, props changed) head/textproc/nuspell/distinfo (contents, props changed) Modified: head/textproc/nuspell/Makefile ============================================================================== --- head/textproc/nuspell/Makefile Sun Jul 7 19:16:25 2019 (r506194) +++ head/textproc/nuspell/Makefile Sun Jul 7 20:48:55 2019 (r506195) @@ -6,6 +6,11 @@ DISTVERSION= 2.2.0 PORTREVISION= 2 CATEGORIES= textproc +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 35ae2bd38585.patch:-p1 +PATCHFILES+= 1d4c96d3fe0f.patch:-p1 +PATCHFILES+= ad0eea5e8028.patch:-p1 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Free and open source C++ spell checking library @@ -32,12 +37,6 @@ TEST_TEST_TARGET= test post-patch: # Skip README as it only contains install instructions @${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 Modified: head/textproc/nuspell/distinfo ============================================================================== --- head/textproc/nuspell/distinfo Sun Jul 7 19:16:25 2019 (r506194) +++ head/textproc/nuspell/distinfo Sun Jul 7 20:48:55 2019 (r506195) @@ -1,3 +1,9 @@ TIMESTAMP = 1553005126 SHA256 (nuspell-nuspell-v2.2.0_GH0.tar.gz) = c6d7664be74e84505f4227836d302c2885f65b165411ef86cc9cffbc1228d0c4 SIZE (nuspell-nuspell-v2.2.0_GH0.tar.gz) = 400415 +SHA256 (35ae2bd38585.patch) = 72e683f0ad6ecbbd42e2559b729dde8f31e667f42a960b12c50af69ef511fff6 +SIZE (35ae2bd38585.patch) = 4634 +SHA256 (1d4c96d3fe0f.patch) = 064feccad9472467069213d4d5c36467ca990cc90fdf8d157197a5b9a5406522 +SIZE (1d4c96d3fe0f.patch) = 2176 +SHA256 (ad0eea5e8028.patch) = 27a2ad9ea1c7c29dc9a730fe44fdbc52766a541706c4542599f3d96f19ff8bf4 +SIZE (ad0eea5e8028.patch) = 991
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907072048.x67Kmup1042131>