From nobody Thu Dec 23 21:21:12 2021 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 90E1718FE756; Thu, 23 Dec 2021 21:21:14 +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 4JKjmT2qYrz4mfp; Thu, 23 Dec 2021 21:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6698B18038; Thu, 23 Dec 2021 21:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BNLLCT3021797; Thu, 23 Dec 2021 21:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BNLLCfr021796; Thu, 23 Dec 2021 21:21:12 GMT (envelope-from git) Date: Thu, 23 Dec 2021 21:21:12 GMT Message-Id: <202112232121.1BNLLCfr021796@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: ddc0332a1c48 - main - devel/libcrossguid: Update to latest commit and switch to CMake 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddc0332a1c48da23f4d4bc5f71e68ad7aa513dfb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640294473; 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=nXSygCR0JvjD1E56ll2suCeFjslZKKcZXpCKimceHrM=; b=bG8DpG70Nzx9hXYYqk9gBk4QdOmHw9ARA5DnEAD7vpIqHV7ErhI8Qp3cd9Xb9W5IAIu2zS mk9ZG2/d14L8OF0uN1NGLvrWZ4n+OdwQqKTQu0QuQtZKsj5xBEBnuz7bcud+iEUXmWCwZa JEdDa8SnWZZ/rP9ABYnXPk63jUPQi/BpR0G2szDMcQa+14NY6VsVfSl82Xk1lVj/+GUCLk jspidDBhgXEQRT1vgfzl+jHOtYpq87q5H/Sgkitp6TSj8I8Y3aJvihpx4yWGRqgCfHT2sQ 6GrVjdMfN+neqsoo1yZWH4a37+rURYOoW/kDVWOzaHXKgmiJMVnCBTFb3oiHCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640294473; a=rsa-sha256; cv=none; b=VKXCxuJRpg2Uw+KBd/MK8qt9Jj8I1pPFF2m+1J83YBGJt6mRz0BXp07oqL7trFqAy6erzq Ko02Uv8NTUOJNyXw415Q4tFWTXb1ejo6N1WgHr1kz3u4RTHoU3agwyMO8zrgajEUmVNBba 7ObiEuG5Vbz6A/9Muf7hNGkw28H+wuyGQtf258P7vXSf4wpTSpiJO61PMlyRLPS5GpSENV +e/NTOVe5nm93ia0KDwqa5SUS+9jOULqg6RuGCLYvYQ7RVia3nZl0gehD46N/YFGch6/U7 /tKDpHALCmgclo8lHMQnHebJ78DtiaJooOpjzVaPl7Zj5Ozl1+LhCpdF1fNN0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ddc0332a1c48da23f4d4bc5f71e68ad7aa513dfb commit ddc0332a1c48da23f4d4bc5f71e68ad7aa513dfb Author: Daniel Engberg AuthorDate: 2021-12-23 21:08:42 +0000 Commit: Daniel Engberg CommitDate: 2021-12-23 21:21:00 +0000 devel/libcrossguid: Update to latest commit and switch to CMake The current version is very old and requires a lot of hacking, update to latest commit as the latest release was back in 2017 and switch to CMake. This update also includes following commit from 3rd party repo for performance: https://github.com/jhaws1982/crossguid/commit/23a8c007a668413c2e8cbd00984d223ed5ecfe05 PR: 253531 Approved by: mentors (implicit), Mickael Maillot (maintainer timeout, 9+ months) Differential Revision: https://reviews.freebsd.org/D33415 --- devel/libcrossguid/Makefile | 40 ++++++++------------------- devel/libcrossguid/distinfo | 7 +++-- devel/libcrossguid/files/libcrossguid.pc.in | 9 ------ devel/libcrossguid/files/patch-CMakeLists.txt | 20 ++++++++++++++ devel/libcrossguid/pkg-plist | 9 ++++++ 5 files changed, 45 insertions(+), 40 deletions(-) diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile index 45d49a7fbce9..e45cdea48224 100644 --- a/devel/libcrossguid/Makefile +++ b/devel/libcrossguid/Makefile @@ -1,8 +1,13 @@ PORTNAME= libcrossguid -PORTVERSION= 20150803 -PORTREVISION= 6 +DISTVERSIONPREFIX= v +DISTVERSION= 0.2.2-52 +DISTVERSIONSUFFIX= -gca1bf4b +PORTEPOCH= 1 CATEGORIES= devel +PATCH_SITES= https://github.com/jhaws1982/crossguid/commit/ +PATCHFILES= 23a8c007a668413c2e8cbd00984d223ed5ecfe05.patch:-p1 + MAINTAINER= mickael.maillot@gmail.com COMMENT= Minimal and cross platform C++ GUID library @@ -11,36 +16,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +USES= cmake compiler:c++17-lang pkgconfig +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= graeme-hill GH_PROJECT= crossguid -GH_TAGNAME= 8f399e8 - -USES= compiler:c++11-lang pkgconfig -USE_CXXSTD= c++11 -CXXFLAGS+= `pkg-config --cflags uuid` -USE_LDCONFIG= yes -PLIST_FILES= include/guid.h \ - lib/libcrossguid.so \ - lib/libcrossguid.so.0 \ - libdata/pkgconfig/libcrossguid.pc - -post-patch: - @${SED} -e 's|%PREFIX%|${PREFIX}|' -e 's|%VERSION%|${PORTVERSION}|' \ - ${FILESDIR}/libcrossguid.pc.in > ${WRKDIR}/libcrossguid.pc - -do-build: - cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -shared -fPIC \ - -Wl,-soname,libcrossguid.so.0 \ - -DGUID_LIBUUID -L${LOCALBASE}/lib guid.cpp \ - -o libcrossguid.so.0 -luuid - -do-install: - ${INSTALL_DATA} ${WRKSRC}/guid.h ${STAGEDIR}${PREFIX}/include - ${INSTALL_LIB} ${WRKSRC}/libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib - ${INSTALL_DATA} ${WRKDIR}/libcrossguid.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig - ${LN} -sf libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib/libcrossguid.so +CMAKE_ON= BUILD_SHARED_LIBS .include diff --git a/devel/libcrossguid/distinfo b/devel/libcrossguid/distinfo index 67b60a85af45..7f2f47277d46 100644 --- a/devel/libcrossguid/distinfo +++ b/devel/libcrossguid/distinfo @@ -1,2 +1,5 @@ -SHA256 (graeme-hill-crossguid-20150803-8f399e8_GH0.tar.gz) = 929397adfe57b945c5153e09f1e0bc1763300e2b30578ec7ed6facc2821d7f6f -SIZE (graeme-hill-crossguid-20150803-8f399e8_GH0.tar.gz) = 46576 +TIMESTAMP = 1639380917 +SHA256 (graeme-hill-crossguid-v0.2.2-52-gca1bf4b_GH0.tar.gz) = 731eab92a5b916eb1195208eac448155e209f9634436c0e877cb32cadd71bdc3 +SIZE (graeme-hill-crossguid-v0.2.2-52-gca1bf4b_GH0.tar.gz) = 141678 +SHA256 (23a8c007a668413c2e8cbd00984d223ed5ecfe05.patch) = 4ac3983dee2df81397b8d835563b4fcbf2c24877ff33630b07f78b73eac5effa +SIZE (23a8c007a668413c2e8cbd00984d223ed5ecfe05.patch) = 1780 diff --git a/devel/libcrossguid/files/libcrossguid.pc.in b/devel/libcrossguid/files/libcrossguid.pc.in deleted file mode 100644 index 0c109c01c879..000000000000 --- a/devel/libcrossguid/files/libcrossguid.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -prefix=%PREFIX% -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: libguid -Description: minimal and cross platform C++ GUID library -Version: %VERSION% -Libs: -L${libdir} -lcrossguid -Cflags: -I${includedir} diff --git a/devel/libcrossguid/files/patch-CMakeLists.txt b/devel/libcrossguid/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..47de8e3d6fdc --- /dev/null +++ b/devel/libcrossguid/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2019-05-29 15:36:34 UTC ++++ CMakeLists.txt +@@ -64,7 +64,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURC + set(CROSSGUID_ARCHIVE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") + set(CROSSGUID_FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") + +- set(CROSSGUID_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/crossguid/cmake") ++ set(CROSSGUID_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/crossguid/") + set(CROSSGUID_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/crossguid") + + # Install target +@@ -75,7 +75,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURC + FRAMEWORK DESTINATION ${CROSSGUID_FRAMEWORK_INSTALL_DIR}) + + # Install headers +- install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" ++ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/crossguid/" + DESTINATION ${CROSSGUID_INC_INSTALL_DIR}) + + # Make cmake config files for all targets diff --git a/devel/libcrossguid/pkg-plist b/devel/libcrossguid/pkg-plist new file mode 100644 index 000000000000..22cf856d9ff4 --- /dev/null +++ b/devel/libcrossguid/pkg-plist @@ -0,0 +1,9 @@ +include/guid.hpp +lib/cmake/crossguid/crossguid-config-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/crossguid/crossguid-config.cmake +lib/libcrossguid.so +lib/libcrossguid.so.0 +lib/libcrossguid.so.0.2.3 +libdata/pkgconfig/crossguid.pc +share/crossguid/LICENSE +share/crossguid/README.md