From 207abfe1369d1ef1d89fae73b1091b37b9060ef7 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Thu, 6 Jan 2022 00:29:45 +0100 Subject: [PATCH] textproc/utf8proc: Update to 2.7.0 and switch to CMake Changelog: https://github.com/JuliaStrings/utf8proc/releases/tag/v2.7.0 Approved by: hrs (maintainer timeout, 17+ days) Differential Revision: https://reviews.freebsd.org/D33552 --- textproc/utf8proc/Makefile | 15 ++++----------- textproc/utf8proc/distinfo | 6 +++--- textproc/utf8proc/files/patch-CMakeLists.txt | 11 +++++++++++ 3 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 textproc/utf8proc/files/patch-CMakeLists.txt diff --git a/textproc/utf8proc/Makefile b/textproc/utf8proc/Makefile index 6d6c17e8ec9b..0a614bd312e8 100644 --- a/textproc/utf8proc/Makefile +++ b/textproc/utf8proc/Makefile @@ -2,8 +2,7 @@ PORTNAME= utf8proc DISTVERSIONPREFIX= v -DISTVERSION= 2.6.1 -PORTREVISION= 1 +DISTVERSION= 2.7.0 CATEGORIES= textproc devel MAINTAINER= hrs@FreeBSD.org @@ -12,29 +11,23 @@ COMMENT= UTF-8 processing library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= gmake +USES= cmake USE_GITHUB= yes GH_ACCOUNT= JuliaStrings USE_LDCONFIG= yes -MAKE_ARGS= prefix=${PREFIX} - -CONFLICTS= libutf8proc +CMAKE_ON= BUILD_SHARED_LIBS PLIST_FILES= include/utf8proc.h \ - lib/libutf8proc.a \ lib/libutf8proc.so \ lib/libutf8proc.so.2 \ - lib/libutf8proc.so.2.4.1 \ + lib/libutf8proc.so.2.5.0 \ libdata/pkgconfig/libutf8proc.pc PORTDOCS= NEWS.md README.md OPTIONS_DEFINE= DOCS -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libutf8proc.so - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && \ diff --git a/textproc/utf8proc/distinfo b/textproc/utf8proc/distinfo index ab159dfcd6eb..88711d7a3b71 100644 --- a/textproc/utf8proc/distinfo +++ b/textproc/utf8proc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608108854 -SHA256 (JuliaStrings-utf8proc-v2.6.1_GH0.tar.gz) = 4c06a9dc4017e8a2438ef80ee371d45868bda2237a98b26554de7a95406b283b -SIZE (JuliaStrings-utf8proc-v2.6.1_GH0.tar.gz) = 182903 +TIMESTAMP = 1639776232 +SHA256 (JuliaStrings-utf8proc-v2.7.0_GH0.tar.gz) = 4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1 +SIZE (JuliaStrings-utf8proc-v2.7.0_GH0.tar.gz) = 187906 diff --git a/textproc/utf8proc/files/patch-CMakeLists.txt b/textproc/utf8proc/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..17c0d46124c4 --- /dev/null +++ b/textproc/utf8proc/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2021-12-17 21:31:08 UTC ++++ CMakeLists.txt +@@ -62,7 +62,7 @@ if (UTF8PROC_INSTALL) + RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" + ) + configure_file(libutf8proc.pc.cmakein libutf8proc.pc @ONLY) +- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libutf8proc.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libutf8proc.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}data/pkgconfig") + endif() + + if(UTF8PROC_ENABLE_TESTING)