From nobody Tue Jun 11 18:38:40 2024 X-Original-To: dev-commits-ports-all@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 4VzHW51Xqxz5N0Sj; Tue, 11 Jun 2024 18:38:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VzHW4358vz4H5V; Tue, 11 Jun 2024 18:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718131120; 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=KvLNDwUFi8CL6HrP3CShbp7/vgmmQb1tKcypRczoNTM=; b=HfaNT63LyOERsYidGeYJslZ18qzNj7pgtscwKwOowFXqSqiioyv/zkpCsbXE408CwCWLOL 23VomHuwi6U3vD2D40I/8nQusJbK7SeB9AVlqFdGiqFFA9eswkF/L2U2CSK2qdbW+ULYJA rFC/BSTBaaJt5PYDK3kUMUGBS5ECnK9rTT7BsJ8vSGXVgDe60paYqsQi6Z6O/KPW9Nbgka HAJ4yxQyKPYJuoBvk5/UQdnu9S8EEhj062JFwjP73quKF+BDl5IV4pXWpGpdvqE4WliqwY aniIBruHdPVtORqBzykigymA/rppMwyosn8xdzgzB42YJC9ta4Y+piYH21O1Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718131120; a=rsa-sha256; cv=none; b=Ivt6Je4tuawTnLaG3kZj98lusQMkutec65ve4KRwWo20tve5EqSk8WL9B/fKmhRaU8lHMY n1RjuEnzvx6bOkwkl4X79sI93CtVAb0rW61f9Fwpfe9k6q29vz4lmDZETuYx7m6ydusmc7 qpWezQ/8xNHpYfYFlho7h4dlQKLvyHVdEMYKtaTdyP4BTkpn9NzWiclK7+zDwyp87R59Cq xZ9xGenQudaDALAoKmXJfhAknONsbkSZTBN9Z+Kus4xDeSUDvW6xKeNYTOy2HqPtYVxhb5 GL/xeTwjnFaMNxw+Chw6s8Lk/b+wwDK0GQInfXcSbqi/CkzUIexgAdCQowQXBw== 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=1718131120; 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=KvLNDwUFi8CL6HrP3CShbp7/vgmmQb1tKcypRczoNTM=; b=M7FPxpUQVrcjgcWPp7WGaiaIvhdwIdEEOAybYGS38UFQLQ6TFWpZlSHz9k2KMoKSoaKeMR 1qQvg0bE1gJSzkFnm2QxSwNiu4kIy5O2Gj2H3hUhPMIMJlLqHaifmxX/HWGybV08VmyvqD RbA2qEphrXd4mmwnvF5i2930zW2QriPYS9OKeQwvNIPiZt3zsxpwDIANdHIpLeRCi7oPfz wIKohXNCGTzmWcCQeqDXDFVgvZKByNK67Yd69FShRqFFo0JgfRLzLN5ej/005ny1LGSXrH baDBZGcVdzqY4pWvTGIDHvAcI+jiBtAnkl/JfEnahOsUFBo8OsNHru3B/1xJUQ== 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 4VzHW42gWkzKRr; Tue, 11 Jun 2024 18:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45BIce0D002869; Tue, 11 Jun 2024 18:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BIceu6002866; Tue, 11 Jun 2024 18:38:40 GMT (envelope-from git) Date: Tue, 11 Jun 2024 18:38:40 GMT Message-Id: <202406111838.45BIceu6002866@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: b607e109fcba - main - devel/simpleini: install cmake files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b607e109fcbad6c4f61133fd020deaa136dba694 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=b607e109fcbad6c4f61133fd020deaa136dba694 commit b607e109fcbad6c4f61133fd020deaa136dba694 Author: Dmitry Marakasov AuthorDate: 2024-06-03 15:35:55 +0000 Commit: Dmitry Marakasov CommitDate: 2024-06-11 18:10:34 +0000 devel/simpleini: install cmake files - Switch to upstream cmake build to install cmake target files properly --- devel/simpleini/Makefile | 16 ++++-------- devel/simpleini/files/patch-CMakeLists.txt | 10 ++++++++ devel/simpleini/files/patch-cmake-targets | 41 ++++++++++++++++++++++++++++++ devel/simpleini/pkg-plist | 4 +++ 4 files changed, 60 insertions(+), 11 deletions(-) diff --git a/devel/simpleini/Makefile b/devel/simpleini/Makefile index a09698fda3a6..5275e60d32db 100644 --- a/devel/simpleini/Makefile +++ b/devel/simpleini/Makefile @@ -1,6 +1,7 @@ PORTNAME= simpleini DISTVERSIONPREFIX= v DISTVERSION= 4.22 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org @@ -10,30 +11,23 @@ WWW= https://github.com/brofield/simpleini LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt +USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= brofield -NO_BUILD= yes NO_ARCH= yes CMAKE_ON= SIMPLEINI_USE_SYSTEM_GTEST PORTDOCS= * -PLIST_FILES= include/SimpleIni.h - OPTIONS_DEFINE= TEST DOCS -TEST_USES= pkgconfig TEST_BUILD_DEPENDS= googletest>=0:devel/googletest -do-install: - ${INSTALL_DATA} ${WRKSRC}/SimpleIni.h ${STAGEDIR}${PREFIX}/include +post-patch-TEST-off: + @${REINPLACE_CMD} -e '/add_subdirectory(tests/ d' ${WRKSRC}/CMakeLists.txt -do-install-DOCS-on: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ -do-test-TEST-on: - cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${TEST_ENV} \ - ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} test - .include diff --git a/devel/simpleini/files/patch-CMakeLists.txt b/devel/simpleini/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..835b583840f6 --- /dev/null +++ b/devel/simpleini/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2023-12-29 02:44:28 UTC ++++ CMakeLists.txt +@@ -34,6 +34,7 @@ add_library(${EXPORT_NAMESPACE}${PROJECT_NAME} ALIAS $ + + add_library(${PROJECT_NAME} INTERFACE) + add_library(${EXPORT_NAMESPACE}${PROJECT_NAME} ALIAS ${PROJECT_NAME}) ++target_compile_definitions(${PROJECT_NAME} INTERFACE SI_NO_CONVERSION) + + include(GNUInstallDirs) + diff --git a/devel/simpleini/files/patch-cmake-targets b/devel/simpleini/files/patch-cmake-targets new file mode 100644 index 000000000000..966b2529a634 --- /dev/null +++ b/devel/simpleini/files/patch-cmake-targets @@ -0,0 +1,41 @@ +From aeacf861a8ad8add5f4974792a88ffea393e41db Mon Sep 17 00:00:00 2001 +From: Alexandre Bouvier +Date: Tue, 2 Jan 2024 08:42:03 +0100 +Subject: [PATCH] cmake: fix namespace and include dir (#74) + +--- + CMakeLists.txt | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git CMakeLists.txt CMakeLists.txt +index 8f09295..7804947 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -48,7 +48,7 @@ configure_package_config_file(${PROJECT_NAME}Config.cmake.in + ) + + install(FILES SimpleIni.h +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + install(TARGETS ${PROJECT_NAME} +@@ -62,12 +62,15 @@ install(FILES + ) + install(EXPORT ${PROJECT_NAME}Targets + DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME} +- NAMESPACE EXPORT_NAMESPACE ++ NAMESPACE ${EXPORT_NAMESPACE} + ) + +-target_include_directories(${PROJECT_NAME} INTERFACE $) ++target_include_directories(${PROJECT_NAME} INTERFACE ++ $ ++ $ ++) + + if(IS_TOPLEVEL_PROJECT) +- enable_testing() ++ include(CTest) + add_subdirectory(tests) + endif() diff --git a/devel/simpleini/pkg-plist b/devel/simpleini/pkg-plist new file mode 100644 index 000000000000..36349f911b1b --- /dev/null +++ b/devel/simpleini/pkg-plist @@ -0,0 +1,4 @@ +include/SimpleIni.h +share/cmake/SimpleIni/SimpleIniConfig.cmake +share/cmake/SimpleIni/SimpleIniConfigVersion.cmake +share/cmake/SimpleIni/SimpleIniTargets.cmake