devel/marisa-trie: Update to 0.3.1

Take maintainership

3 files changed, 36 insertions, 28 deletions

diff --git a/devel/marisa-trie/Makefile b/devel/marisa-trie/Makefile
index 260bab44d51a..a53b84d7b16d 100644
--- a/devel/marisa-trie/Makefile
+++ b/devel/marisa-trie/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	marisa-trie
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.6
-PORTREVISION=	1
+DISTVERSION=	0.3.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	MARISA: Matching Algorithm with Recursively Implemented StorAge
 WWW=		https://github.com/s-yata/marisa-trie
 
@@ -13,43 +12,52 @@ LICENSE=	BSD2CLAUSE LGPL21+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING.md
 
-USES=		autoreconf libtool:build pathfix
+USES=		cmake pathfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	s-yata
 GH_PROJECT=	marisa-trie
 USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-pkg-config-dir=${PREFIX}/libdata/pkgconfig
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON -DENABLE_NATIVE_CODE=ON
+CMAKE_BOOL+=	ENABLE_NATIVE_CODE
 
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
-
-OPTIONS_DEFINE=	SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 SSE4A POPCNT
+OPTIONS_DEFINE=	SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 POPCNT BMI BMI2
 OPTIONS_DEFAULT=${MACHINE_CPU:tu}
 
 SSE2_DESC=	Support for SSE2
-SSE2_CONFIGURE_ENABLE=	sse2
+SSE2_CMAKE_ARGS=	-DENABLE_NATIVE_CODE=ON -DHAVE_SSE2=ON -DENABLE_SSE2=ON
+SSE2_CMAKE_BOOL+=	HAVE_SSE2 ENABLE_SSE2
 
 SSE3_DESC=	Support for SSE3
-SSE3_CONFIGURE_ENABLE=	sse3
+SSE3_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_SSE3=ON -DENABLE_SSE3=ON
+SSE3_CMAKE_BOOL+=	HAVE_SSE3 ENABLE_SSE3
 
 SSSE3_DESC=	Support for SSSE3
-SSSE3_CONFIGURE_ENABLE=	sse3
+SSSE3_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_SSSE3=ON -DENABLE_SSSE3=ON
+SSSE3_CMAKE_BOOL+=	HAVE_SSSE3 ENABLE_SSSE3
 
 SSE4_DESC=	Support for SSE4
-SSE4_CONFIGURE_ENABLE=	sse4
+SSE4_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_SSE4=ON -DENABLE_SSE4=ON
+SSE4_CMAKE_BOOL+=	HAVE_SSE4 ENABLE_SSE4
 
 SSE41_DESC=	Support for SSE4.1
-SSE41_CONFIGURE_ENABLE=	sse4.1
+SSE41_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_SSE4_1=ON -DENABLE_SSE4_1=ON
+SSE41_CMAKE_BOOL+=	HAVE_SSE4_1 ENABLE_SSE4_1
 
 SSE42_DESC=	Support for SSE4.2
-SSE42_CONFIGURE_ENABLE=	sse4.2
-
-SSE4A_DESC=	Support for SSE4a
-SSE4A_CONFIGURE_ENABLE=	sse4a
+SSE42_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_SSE4_2=ON -DENABLE_SSE4_2=ON
+SSE42_CMAKE_BOOL+=	HAVE_SSE4_2 ENABLE_SSE4_2
 
 POPCNT_DESC=	Support for POPCNT
-POPCNT_CONFIGURE_ENABLE=	POPCNT
+POPCNT_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_POPCNT=ON -DENABLE_POPCNT=ON
+POPCNT_CMAKE_BOOL+=	HAVE_POPCNT ENABLE_POPCNT
+
+BMI_DESC=	Support for BMI
+BMI_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_BMI=ON -DENABLE_BMI=ON
+BMI_CMAKE_BOOL+=	HAVE_BMI ENABLE_BMI
+
+BMI2_DESC=	Support for BMI2
+BMI2_CMAKE_ARGS+=	-DENABLE_NATIVE_CODE=ON -DHAVE_BMI2=ON -DENABLE_BMI2=ON
+BMI2_CMAKE_BOOL+=	HAVE_BMI2 ENABLE_BMI2
 
 .include <bsd.port.mk>
diff --git a/devel/marisa-trie/distinfo b/devel/marisa-trie/distinfo
index 9a0f5b959572..d3a53decd190 100644
--- a/devel/marisa-trie/distinfo
+++ b/devel/marisa-trie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665596480
-SHA256 (s-yata-marisa-trie-v0.2.6_GH0.tar.gz) = 1063a27c789e75afa2ee6f1716cc6a5486631dcfcb7f4d56d6485d2462e566de
-SIZE (s-yata-marisa-trie-v0.2.6_GH0.tar.gz) = 168332
+TIMESTAMP = 1759225340
+SHA256 (s-yata-marisa-trie-v0.3.1_GH0.tar.gz) = 986ed5e2967435e3a3932a8c95980993ae5a196111e377721f0849cad4e807f3
+SIZE (s-yata-marisa-trie-v0.3.1_GH0.tar.gz) = 212791
diff --git a/devel/marisa-trie/pkg-plist b/devel/marisa-trie/pkg-plist
index 8bde20e459b5..7b9f19f3d70b 100644
--- a/devel/marisa-trie/pkg-plist
+++ b/devel/marisa-trie/pkg-plist
@@ -8,17 +8,17 @@ bin/marisa-reverse-lookup
 include/marisa.h
 include/marisa/agent.h
 include/marisa/base.h
-include/marisa/exception.h
 include/marisa/iostream.h
 include/marisa/key.h
 include/marisa/keyset.h
 include/marisa/query.h
-include/marisa/scoped-array.h
-include/marisa/scoped-ptr.h
 include/marisa/stdio.h
 include/marisa/trie.h
-lib/libmarisa.a
+lib/cmake/Marisa/MarisaConfig.cmake
+lib/cmake/Marisa/MarisaConfigVersion.cmake
+lib/cmake/Marisa/MarisaTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Marisa/MarisaTargets.cmake
 lib/libmarisa.so
 lib/libmarisa.so.0
-lib/libmarisa.so.0.0.0
+lib/libmarisa.so.0.3.1
 libdata/pkgconfig/marisa.pc