diff options
| author | yuri <yuri@FreeBSD.org> | 2018-04-02 04:13:38 +0800 |
|---|---|---|
| committer | yuri <yuri@FreeBSD.org> | 2018-04-02 04:13:38 +0800 |
| commit | 5798e78b33d9d41fd2f1ad0c5f48c3886173315e (patch) | |
| tree | 0f8faf17df2467ea0c26314161758497d800a3f7 | |
| parent | fe83520efa7c9dee3dd1e26cf7cde30aec377f32 (diff) | |
| download | freebsd-ports-gnome-5798e78b33d9d41fd2f1ad0c5f48c3886173315e.tar.gz freebsd-ports-gnome-5798e78b33d9d41fd2f1ad0c5f48c3886173315e.tar.zst freebsd-ports-gnome-5798e78b33d9d41fd2f1ad0c5f48c3886173315e.zip | |
devel/libfmt: Update 3.0.1 -> 4.1.0
Port changes:
* Change to DISTVERSION
* Add USE_LDCONFIG
* Converted the TEST option to do-test target
* Add shared library version substitution variables
All tests pass.
Bump multimedia/kodi-devel.
PR: 226677
Approved by: SlavaMikerov@gmail.com (maintainer's timeout; 15 days)
| -rw-r--r-- | devel/libfmt/Makefile | 16 | ||||
| -rw-r--r-- | devel/libfmt/distinfo | 6 | ||||
| -rw-r--r-- | devel/libfmt/files/patch-test_posix-mock-test.cc | 11 | ||||
| -rw-r--r-- | devel/libfmt/pkg-plist | 8 | ||||
| -rw-r--r-- | multimedia/kodi-devel/Makefile | 2 |
5 files changed, 21 insertions, 22 deletions
diff --git a/devel/libfmt/Makefile b/devel/libfmt/Makefile index e588e5f497cb..48f653794a3d 100644 --- a/devel/libfmt/Makefile +++ b/devel/libfmt/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libfmt -PORTVERSION= 3.0.1 -PORTREVISION= 3 +DISTVERSION= 4.1.0 CATEGORIES= devel MAINTAINER= SlavaMikerov@gmail.com @@ -15,8 +14,15 @@ USES= cmake:outsource compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= fmtlib GH_PROJECT= fmt -CMAKE_ARGS= -DFMT_DOC=OFF -DBUILD_SHARED_LIBS=ON -OPTIONS_DEFINE= TEST -TEST_CMAKE_BOOL= FMT_TEST +USE_LDCONFIG= yes +CMAKE_ARGS= -DFMT_DOC:BOOL=OFF -DFMT_TEST:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON + +PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} + +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFMT_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include <bsd.port.mk> diff --git a/devel/libfmt/distinfo b/devel/libfmt/distinfo index 4e65f081e573..feaa030b8548 100644 --- a/devel/libfmt/distinfo +++ b/devel/libfmt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480615869 -SHA256 (fmtlib-fmt-3.0.1_GH0.tar.gz) = dce62ab75a161dd4353a98364feb166d35e7eea382169d59d9ce842c49c55bad -SIZE (fmtlib-fmt-3.0.1_GH0.tar.gz) = 606603 +TIMESTAMP = 1521298377 +SHA256 (fmtlib-fmt-4.1.0_GH0.tar.gz) = 46628a2f068d0e33c716be0ed9dcae4370242df135aed663a180b9fd8e36733d +SIZE (fmtlib-fmt-4.1.0_GH0.tar.gz) = 620863 diff --git a/devel/libfmt/files/patch-test_posix-mock-test.cc b/devel/libfmt/files/patch-test_posix-mock-test.cc deleted file mode 100644 index 3cf5886e3cb7..000000000000 --- a/devel/libfmt/files/patch-test_posix-mock-test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- test/posix-mock-test.cc.orig 2016-12-01 18:09:30 UTC -+++ test/posix-mock-test.cc -@@ -502,7 +502,7 @@ LocaleType newlocale(int category_mask, - return LocaleMock::instance->newlocale(category_mask, locale, base); - } - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - typedef int FreeLocaleResult; - #else - typedef void FreeLocaleResult; diff --git a/devel/libfmt/pkg-plist b/devel/libfmt/pkg-plist index 7963238992fb..bb176eb87084 100644 --- a/devel/libfmt/pkg-plist +++ b/devel/libfmt/pkg-plist @@ -1,13 +1,17 @@ +include/fmt/container.h include/fmt/format.cc include/fmt/format.h include/fmt/ostream.cc include/fmt/ostream.h include/fmt/posix.h +include/fmt/printf.cc +include/fmt/printf.h +include/fmt/string.h include/fmt/time.h lib/cmake/fmt/fmt-config-version.cmake lib/cmake/fmt/fmt-config.cmake lib/cmake/fmt/fmt-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/fmt/fmt-targets.cmake lib/libfmt.so -lib/libfmt.so.3 -lib/libfmt.so.3.0.1 +lib/libfmt.so.%%SHL1%% +lib/libfmt.so.%%SHL3%% diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile index 5e72bfec0ce6..ba1708a33aaf 100644 --- a/multimedia/kodi-devel/Makefile +++ b/multimedia/kodi-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= kodi DISTVERSION= 18.0.g201803211302 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMESUFFIX?= -devel |