devel/cereal: Update 1.3.0 -> 1.3.0-10

Also: * Add missing NO_ARCH * Fix dependencies * Not building tests every time * Add the 'test' target PR: 252793 Approved by: teodor@sigaev.ru (maintainer's timeout 25 days)
freebsd · Feb 13, 2021 · 9e09408 · 9e09408
1 parent 9e272f9
commit 9e09408
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 11 deletions.
diff --git a/devel/cereal/Makefile b/devel/cereal/Makefile
@@ -2,27 +2,38 @@
 
 PORTNAME=		cereal
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.3.0
-CATEGORIES=		devel
+DISTVERSION=	1.3.0-10
+DISTVERSIONSUFFIX=	-g64f50dbd
+CATEGORIES=	devel
 
 MAINTAINER=	teodor@sigaev.ru
 COMMENT=	C++11 library for serialization
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs
-BUILD_DEPENDS=	boost-libs>=1.69:devel/boost-libs \
-		cmake>=2.6.2:devel/cmake \
-		ninja>=1.8.2:devel/ninja
+BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
+RUN_DEPENDS=	boost-libs>0:devel/boost-libs
 
 USES=		cmake compiler:c++11-lang
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	USCiLab
 
 CFLAGS+=	-Wno-unused-private-field
 
 CMAKE_ON=	SKIP_PORTABILITY_TEST
-CMAKE_OFF=	WITH_WERROR
+CMAKE_OFF=	BUILD_TESTS WITH_WERROR
+
+NO_ARCH=	yes
+
+post-install:
+	${FIND} ${STAGEDIR}${PREFIX} -name LICENSE -delete
+
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/devel/cereal/distinfo b/devel/cereal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573867507
-SHA256 (USCiLab-cereal-v1.3.0_GH0.tar.gz) = 329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5
-SIZE (USCiLab-cereal-v1.3.0_GH0.tar.gz) = 374585
+TIMESTAMP = 1613257495
+SHA256 (USCiLab-cereal-v1.3.0-10-g64f50dbd_GH0.tar.gz) = 9e6cf92293168f2a1d0e33da4879d3c4fe3c81520718a1bc1d9295bc9e54e426
+SIZE (USCiLab-cereal-v1.3.0-10-g64f50dbd_GH0.tar.gz) = 376163
diff --git a/devel/cereal/files/patch-CMakeLists.txt b/devel/cereal/files/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+- Same change that is proposed here: https://github.com/USCiLab/cereal/issues/668
+- Otherwise sandbox is always built.
+
+--- CMakeLists.txt.orig	2020-11-17 20:50:06 UTC
++++ CMakeLists.txt
+@@ -115,6 +115,8 @@ if(BUILD_TESTS)
+     add_subdirectory(unittests)
+ endif()
+
+-add_subdirectory(sandbox)
++if(BUILD_SANDBOX)
++    add_subdirectory(sandbox)
++endif()
+
+ add_subdirectory(doc)
diff --git a/devel/cereal/pkg-plist b/devel/cereal/pkg-plist
@@ -85,4 +85,6 @@ include/cereal/types/valarray.hpp
 include/cereal/types/variant.hpp
 include/cereal/types/vector.hpp
 include/cereal/version.hpp
-share/cmake/cereal/cereal-config.cmake
+lib/cmake/cereal/cerealConfig.cmake
+lib/cmake/cereal/cerealConfigVersion.cmake
+lib/cmake/cereal/cerealTargets.cmake