Attachment #248019 for bug #276670




PORTNAME=	utf8cpp
PORTVERSION=	4.0.4
DISTVERSIONPREFIX=	v
DISTVERSION=	4.0.5
CATEGORIES=	devel

MAINTAINER=	sunpoet@FreeBSD.org

LICENSE=	BSL
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		cmake
NO_BUILD=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	nemtrif


CONFLICTS_INSTALL=	utf8cpp3

do-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/include/utf8cpp/
	cd ${WRKSRC}/source/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/utf8cpp/

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/utf8cpp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1702543612	1	TIMESTAMP = 1706375778
2	SHA256 (nemtrif-utfcpp-v4.0.4_GH0.tar.gz) = 7c8a403d0c575d52473c8644cd9eb46c6ba028d2549bc3e0cdc2d45f5cfd78a0	2	SHA256 (nemtrif-utfcpp-v4.0.5_GH0.tar.gz) = ffc668a310e77607d393f3c18b32715f223da1eac4c4d6e0579a11df8e6b59cf
3	SIZE (nemtrif-utfcpp-v4.0.4_GH0.tar.gz) = 34144	3	SIZE (nemtrif-utfcpp-v4.0.5_GH0.tar.gz) = 34139




--- CMakeLists.txt.orig	2024-01-27 17:17:31 UTC
+++ CMakeLists.txt
@@ -36,17 +36,17 @@ configure_package_config_file(
 configure_package_config_file(
     "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
     "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
 install(EXPORT ${PROJECT_NAME}Targets
         FILE ${PROJECT_NAME}Targets.cmake
         NAMESPACE ${PROJECT_NAME}::
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
 install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
               "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
 install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION

Lines 5-7 include/utf8cpp/utf8/cpp11.h Link Here

(-)b/devel/utf8cpp/pkg-plist (+3 lines)
5	include/utf8cpp/utf8/cpp17.h	5	include/utf8cpp/utf8/cpp17.h
6	include/utf8cpp/utf8/cpp20.h	6	include/utf8cpp/utf8/cpp20.h
7	include/utf8cpp/utf8/unchecked.h	7	include/utf8cpp/utf8/unchecked.h
		8	lib/cmake/utf8cpp/utf8cppConfig.cmake
		9	lib/cmake/utf8cpp/utf8cppConfigVersion.cmake
		10	lib/cmake/utf8cpp/utf8cppTargets.cmake

Return to bug 276670

Lines 1-6 Link Here

(-)b/devel/utf8cpp/Makefile (-7 / +2 lines)
1	PORTNAME= utf8cpp	1	PORTNAME= utf8cpp
2	PORTVERSION= 4.0.4
3	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 4.0.5
4	CATEGORIES= devel	4	CATEGORIES= devel
5		5
6	MAINTAINER= sunpoet@FreeBSD.org	6	MAINTAINER= sunpoet@FreeBSD.org
Lines 10-17 WWW= https://github.com/nemtrif/utfcpp Link Here
10	LICENSE= BSL	10	LICENSE= BSL
11	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	NO_ARCH= yes	13	USES= cmake
14	NO_BUILD= yes
15		14
16	USE_GITHUB= yes	15	USE_GITHUB= yes
17	GH_ACCOUNT= nemtrif	16	GH_ACCOUNT= nemtrif
Lines 19-26 GH_PROJECT= utfcpp Link Here
19		18
20	CONFLICTS_INSTALL= utf8cpp3	19	CONFLICTS_INSTALL= utf8cpp3
21		20
22	do-install:
23	${MKDIR} ${STAGEDIR}${PREFIX}/include/utf8cpp/
24	cd ${WRKSRC}/source/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/utf8cpp/
25
26	.include <bsd.port.mk>	21	.include <bsd.port.mk>

Added Link Here

(-)b/devel/utf8cpp/files/patch-CMakeLists.txt (+23 lines)
1	--- CMakeLists.txt.orig 2024-01-27 17:17:31 UTC
2	+++ CMakeLists.txt
3	@@ -36,17 +36,17 @@ configure_package_config_file(
4	configure_package_config_file(
5	"${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
6	"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
7	- INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
8	+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
9	)
10
11	install(EXPORT ${PROJECT_NAME}Targets
12	FILE ${PROJECT_NAME}Targets.cmake
13	NAMESPACE ${PROJECT_NAME}::
14	- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
15	+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
16
17	install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
18	"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
19	- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
20	+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
21
22	install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp)
23	install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION