diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile index 92e5f4c24f96..b64a588706f6 100644 --- a/devel/libphonenumber/Makefile +++ b/devel/libphonenumber/Makefile @@ -1,27 +1,30 @@ PORTNAME= libphonenumber DISTVERSIONPREFIX= v -DISTVERSION= 8.12.56 -PORTREVISION= 3 +DISTVERSION= 8.13.4 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org COMMENT= Library for parsing, formatting, and validating phone numbers WWW= https://github.com/google/libphonenumber LICENSE= APACHE20 BUILD_DEPENDS= googletest>0:devel/googletest LIB_DEPENDS= libabsl_strings.so:devel/abseil \ libboost_atomic.so:devel/boost-libs \ libicui18n.so:devel/icu \ libprotobuf.so:devel/protobuf USES= cmake:noninja compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= google CMAKE_ON= USE_STD_MAP WRKSRC_SUBDIR= cpp +MAKE_JOBS_UNSAFE= yes + +PLIST_SUB= SHLIB_FULL=${PORTVERSION:R} SHLIB_SHORT=${PORTVERSION:R:R} + .include diff --git a/devel/libphonenumber/distinfo b/devel/libphonenumber/distinfo index f467b989c427..aeb31100fe7c 100644 --- a/devel/libphonenumber/distinfo +++ b/devel/libphonenumber/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663950424 -SHA256 (google-libphonenumber-v8.12.56_GH0.tar.gz) = 51ec355a7e021e282b5b495ab6729dcef310598caba34c7bada41ae7c14ce919 -SIZE (google-libphonenumber-v8.12.56_GH0.tar.gz) = 14574363 +TIMESTAMP = 1674356278 +SHA256 (google-libphonenumber-v8.13.4_GH0.tar.gz) = 7c9d1b7bc3320e1a234bdd9435486bc01fca181d74455e2866af19543289ae6c +SIZE (google-libphonenumber-v8.13.4_GH0.tar.gz) = 14756476 diff --git a/devel/libphonenumber/files/patch-CMakeLists.txt b/devel/libphonenumber/files/patch-CMakeLists.txt index fa0a848ccac8..84b597363642 100644 --- a/devel/libphonenumber/files/patch-CMakeLists.txt +++ b/devel/libphonenumber/files/patch-CMakeLists.txt @@ -1,19 +1,20 @@ ---- CMakeLists.txt.orig 2022-08-04 05:09:57 UTC +--- CMakeLists.txt.orig 2023-01-06 10:17:24 UTC +++ CMakeLists.txt -@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11) +@@ -20,7 +20,7 @@ project (libphonenumber VERSION 8.13.0) # Pick the C++ standard to compile with. # Abseil currently supports C++11, C++14, and C++17. -set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard used to compile this project") +set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard used to compile this project") set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) - project (libphonenumber) -@@ -101,6 +101,7 @@ if (${USE_ALTERNATE_FORMATS} STREQUAL "ON") +@@ -106,7 +106,7 @@ endif () endif () # Find all the required libraries and programs. +-find_package(absl) +find_package(absl REQUIRED) - if (${USE_BOOST} STREQUAL "ON") - add_definitions ("-DI18N_PHONENUMBERS_USE_BOOST") - if (WIN32) + + if(NOT absl_FOUND) + # Overide abseil install rules for subprojects diff --git a/devel/libphonenumber/pkg-plist b/devel/libphonenumber/pkg-plist index 4814ac2f37ea..46d95660a6a0 100644 --- a/devel/libphonenumber/pkg-plist +++ b/devel/libphonenumber/pkg-plist @@ -1,41 +1,45 @@ include/phonenumbers/asyoutypeformatter.h include/phonenumbers/base/basictypes.h include/phonenumbers/base/logging.h include/phonenumbers/base/memory/scoped_ptr.h include/phonenumbers/base/memory/singleton.h include/phonenumbers/base/memory/singleton_boost.h include/phonenumbers/base/memory/singleton_posix.h include/phonenumbers/base/memory/singleton_stdmutex.h include/phonenumbers/base/memory/singleton_unsafe.h include/phonenumbers/base/memory/singleton_win32.h include/phonenumbers/base/synchronization/lock.h include/phonenumbers/base/synchronization/lock_boost.h include/phonenumbers/base/synchronization/lock_posix.h include/phonenumbers/base/synchronization/lock_stdmutex.h include/phonenumbers/base/synchronization/lock_unsafe.h include/phonenumbers/base/synchronization/lock_win32.h include/phonenumbers/base/template_util.h include/phonenumbers/base/thread_checker.h include/phonenumbers/callback.h include/phonenumbers/geocoding/phonenumber_offline_geocoder.h include/phonenumbers/logger.h include/phonenumbers/matcher_api.h include/phonenumbers/phonemetadata.pb.h include/phonenumbers/phonenumber.pb.h include/phonenumbers/phonenumbermatch.h include/phonenumbers/phonenumbermatcher.h include/phonenumbers/phonenumberutil.h include/phonenumbers/regexp_adapter.h include/phonenumbers/regexp_cache.h include/phonenumbers/region_code.h include/phonenumbers/shortnumberinfo.h include/phonenumbers/unicodestring.h include/phonenumbers/utf/unicodetext.h +lib/cmake/libphonenumber/libphonenumber-config-version.cmake +lib/cmake/libphonenumber/libphonenumber-config.cmake +lib/cmake/libphonenumber/libphonenumber-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libphonenumber/libphonenumber-targets.cmake lib/libgeocoding.a lib/libgeocoding.so -lib/libgeocoding.so.8 -lib/libgeocoding.so.8.12 +lib/libgeocoding.so.%%SHLIB_SHORT%% +lib/libgeocoding.so.%%SHLIB_FULL%% lib/libphonenumber.a lib/libphonenumber.so -lib/libphonenumber.so.8 -lib/libphonenumber.so.8.12 +lib/libphonenumber.so.%%SHLIB_SHORT%% +lib/libphonenumber.so.%%SHLIB_FULL%%