From nobody Thu Sep 05 06:20:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wzq3D5wS7z5VHTJ; Thu, 05 Sep 2024 06:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzq3C1pdQz41pR; Thu, 5 Sep 2024 06:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725517207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWS+Gx8DaZrabS8nuStq7Lg27vSdNMWBJddZf/Tu8x0=; b=OM5Keca/qS5iseeho5P8cGMm9WMsLsPbdlDEsigEKYrSPP9IlEjXkqnrkgKMfa83x/yAuq FXA+Z2e3uEXOUCFuab90Apm5Fr+3HrQ8z7i//iU5Iicx+clVH2cn8K3CPW4qZzew10+eWq F/k26Mq0a5R2loKLYChQC5DcFMpySmqqxm+lZoDvyffTOiVPYRfpPTPS34jzhTzzeaO+2v 18In/LUZWACE8odb0X2ta06VSiTKGmUI5ScRWUWw4uUOS7yH1ZNmbWFjjOALiDSUquBQPS iIC4UIXqbiD9AWa4WpmH3CbQ97c9wH9j4UIHi7tw3ShyQiJo+UcGZBP/CcyPGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725517207; a=rsa-sha256; cv=none; b=BQYxMCmIJlotry0jmihHszOg9+QLkIkH5iFZ2G5WPTFmR3vVFMFdkiI9wZtxU8AJeYgx1A Zvll2GWduS1t/9C2YwhmCjFT2Z0yHw7Sr9mB3qf5Gq5DU72QtseKVzUBktNUSdI1x6opYf rKwFDo11mJN6PFI7VUymrXLhj9Lgn4IuxZaVYM6uvFwjB9k57q+zZMr69D5jpXbxhf/EzG Y9Ju0lor4kmlYtCbrtRSdcF6icFNJmQqcpI0t355h9DPTID9FDRChyR2Cby0I/s5HQBE5n uPy3+J+7PtjW/K9tI5ReKl9QieOjyICzHkXzhgTjbPN4eEBHkzDztBV2Tuw1Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725517207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWS+Gx8DaZrabS8nuStq7Lg27vSdNMWBJddZf/Tu8x0=; b=C0DoWQ5Mh5/B+C+hv2Nr45ThDljqwMjFnpSyQS4sEGWKhMzESyDy5DKE22J/OBtkL0uwAs EZoft0D7wHCXBlEaRtdsRWCRC+P+yXVZmYjMVUvi4bqPZcz1GJ3+fpbZDEYFdc1ZvW3PUA M01zATlWQQzLfDEnBSHvUPWsOfRiKB0ISiJmna09UfaismOZdFemENGKjbas6dH+Uh3Hzo emRFfGUhxluX7IHSu9DCsJgbx3ugcSlCHYu7aL/gNSjZKJajlOf3f4CzULolvrnYLoRCzW CflFkBZ/QdXvR4uAnnjlZaiyNm+f53MtxJ9Gl1KDjCchA7YPoFIFpYCw5N7YEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wzq3C1PD2zxD2; Thu, 5 Sep 2024 06:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4856K7bL096132; Thu, 5 Sep 2024 06:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4856K7Uw096128; Thu, 5 Sep 2024 06:20:07 GMT (envelope-from git) Date: Thu, 5 Sep 2024 06:20:07 GMT Message-Id: <202409050620.4856K7Uw096128@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: adaf512dc055 - main - textproc/nuspell: Clean up Makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adaf512dc055f0ab907b1120d4fafa932a3e7864 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=adaf512dc055f0ab907b1120d4fafa932a3e7864 commit adaf512dc055f0ab907b1120d4fafa932a3e7864 Author: Po-Chuan Hsieh AuthorDate: 2024-09-05 05:25:22 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-05 06:17:48 +0000 textproc/nuspell: Clean up Makefile - Update WWW - Update version requirement of TEST_DEPENDS - Use complete arguments/options - Convert REINPLACE_CMD to patch files - Remove unnecessary substitution - Cosmetic change --- textproc/nuspell/Makefile | 36 ++++++++++------------ textproc/nuspell/files/patch-CMakeLists.txt | 7 +++++ .../nuspell/files/patch-src-nuspell-finder.cxx | 14 +++++++++ textproc/nuspell/pkg-plist | 3 +- 4 files changed, 40 insertions(+), 20 deletions(-) diff --git a/textproc/nuspell/Makefile b/textproc/nuspell/Makefile index 8b4d0c8f8132..66b15b95884b 100644 --- a/textproc/nuspell/Makefile +++ b/textproc/nuspell/Makefile @@ -1,44 +1,42 @@ PORTNAME= nuspell +PORTVERSION= 5.1.6 DISTVERSIONPREFIX= v -DISTVERSION= 5.1.6 CATEGORIES= textproc MAINTAINER= sunpoet@FreeBSD.org COMMENT= Fast and safe spellchecking C++ library -WWW= https://nuspell.github.io/ +WWW= https://nuspell.github.io/ \ + https://github.com/nuspell/nuspell LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libicuuc.so:devel/icu -TEST_DEPENDS= catch2>0:devel/catch2 +TEST_DEPENDS= catch2>=3.1.1:devel/catch2 USES= cmake:testing compiler:c++17-lang -USE_GITHUB= yes + +CMAKE_ON= BUILD_SHARED_LIBS BUILD_TOOLS +CMAKE_OFF= BUILD_TESTING +CMAKE_TESTING_ON= BUILD_TESTING USE_LDCONFIG= yes -CMAKE_OFF+= ${CMAKE_TESTING_ON} -PLIST_SUB= VERSION=${PORTVERSION} +PLIST_SUB= PORTVERSION=${PORTVERSION} + +USE_GITHUB= yes OPTIONS_DEFINE= MANPAGES -OPTIONS_DEFAULT=MANPAGES OPTIONS_EXCLUDE_i386= MANPAGES # https://github.com/haskell-foundation/foundation/issues/565 +OPTIONS_DEFAULT=MANPAGES +OPTIONS_SUB= yes MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc MANPAGES_CMAKE_BOOL= BUILD_DOCS -MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz -post-patch: -# Skip README as it only contains install instructions - @${REINPLACE_CMD} -i .doc '/README/d' ${WRKSRC}/CMakeLists.txt -# Respect PREFIX != /usr/local - @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \ - ${WRKSRC}/src/nuspell/finder.cxx - -makepatch-clean: +post-extract: @${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig -.include +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/nuspell/finder.cxx -# XXX Don't override definition in Mk/bsd.port.mk -makepatch: makepatch-clean +.include diff --git a/textproc/nuspell/files/patch-CMakeLists.txt b/textproc/nuspell/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..cf7297bfab09 --- /dev/null +++ b/textproc/nuspell/files/patch-CMakeLists.txt @@ -0,0 +1,7 @@ +--- CMakeLists.txt.orig 2024-07-04 11:45:35 UTC ++++ CMakeLists.txt +@@ -77,4 +77,3 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/NuspellConfi + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/NuspellConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/NuspellConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/nuspell) +-install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) diff --git a/textproc/nuspell/files/patch-src-nuspell-finder.cxx b/textproc/nuspell/files/patch-src-nuspell-finder.cxx new file mode 100644 index 000000000000..46f65d4109e0 --- /dev/null +++ b/textproc/nuspell/files/patch-src-nuspell-finder.cxx @@ -0,0 +1,14 @@ +--- src/nuspell/finder.cxx.orig 2024-07-04 11:45:35 UTC ++++ src/nuspell/finder.cxx +@@ -94,9 +94,9 @@ auto append_default_dir_paths(vector& paths) + paths[i] /= "myspell"; + } + else { +- paths.push_back("/usr/local/share/hunspell"); ++ paths.push_back("%%PREFIX%%/share/hunspell"); + paths.push_back("/usr/share/hunspell"); +- paths.push_back("/usr/local/share/myspell"); ++ paths.push_back("%%PREFIX%%/share/myspell"); + paths.push_back("/usr/share/myspell"); + } + #if defined(__APPLE__) && defined(__MACH__) diff --git a/textproc/nuspell/pkg-plist b/textproc/nuspell/pkg-plist index d0b4a0242e49..3b332cb3194a 100644 --- a/textproc/nuspell/pkg-plist +++ b/textproc/nuspell/pkg-plist @@ -14,5 +14,6 @@ lib/cmake/nuspell/NuspellTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/nuspell/NuspellTargets.cmake lib/libnuspell.so lib/libnuspell.so.5 -lib/libnuspell.so.%%VERSION%% +lib/libnuspell.so.%%PORTVERSION%% libdata/pkgconfig/nuspell.pc +%%MANPAGES%%share/man/man1/nuspell.1.gz