git: aac990618e17 - main - devel/glog: Update to 0.5.0

Po-Chuan Hsieh sunpoet at FreeBSD.org
Sun May 16 15:26:12 UTC 2021 

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aac990618e17966d1b5865526efd9c89332701fe

commit aac990618e17966d1b5865526efd9c89332701fe
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-05-16 15:13:35 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-05-16 15:23:53 +0000

    devel/glog: Update to 0.5.0
    
    Changes:        https://github.com/google/glog/releases
---
 devel/glog/Makefile                                | 18 ++++-----
 devel/glog/distinfo                                |  6 +--
 devel/glog/files/patch-CMakeLists.txt              | 23 +++++++++++
 devel/glog/files/patch-m4-pc_from_ucontext.m4      | 10 -----
 devel/glog/files/patch-src-glog-stl_logging.h.in   | 44 ++++++++++++++++++++++
 devel/glog/files/patch-src-stl_logging_unittest.cc | 12 ++++++
 devel/glog/pkg-plist                               | 18 ++++-----
 7 files changed, 97 insertions(+), 34 deletions(-)

diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index 650bb510a83b..de9bf320b662 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -1,8 +1,7 @@
 # Created by: Cheng-Lung Sung <clsung at FreeBSD.org>
 
 PORTNAME=	glog
-PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -12,23 +11,20 @@ COMMENT=	Library of C++ classes for flexible logging
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgflags.so:devel/gflags
+LIB_DEPENDS=	libgflags.so:devel/gflags \
+		libunwind.so:devel/libunwind
 
-OPTIONS_DEFINE=	DOCS
+USES=		cmake compiler:c++11-lang pkgconfig
 
-USES=		autoreconf compiler:c++11-lang libtool localbase pathfix
+CMAKE_ON=	BUILD_SHARED_LIBS WITH_GFLAGS WITH_PKGCONFIG WITH_SYMBOLIZE WITH_THREADS WITH_TLS WITH_UNWIND
+CMAKE_OFF=	PRINT_UNSYMBOLIZED_STACK_TRACES WITH_CUSTOM_PREFIX WITH_GTEST
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 LDFLAGS+=	-lexecinfo
-TEST_TARGET=	check
+TEST_TARGET=	test
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^docdir = / s| = .*| = ${DOCSDIR}|' ${WRKSRC}/Makefile.am
-
 .include <bsd.port.mk>
diff --git a/devel/glog/distinfo b/devel/glog/distinfo
index 42cb384761d0..f6d91a549e07 100644
--- a/devel/glog/distinfo
+++ b/devel/glog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553260442
-SHA256 (google-glog-v0.4.0_GH0.tar.gz) = f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c
-SIZE (google-glog-v0.4.0_GH0.tar.gz) = 200955
+TIMESTAMP = 1620928565
+SHA256 (google-glog-v0.5.0_GH0.tar.gz) = eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5
+SIZE (google-glog-v0.5.0_GH0.tar.gz) = 183346
diff --git a/devel/glog/files/patch-CMakeLists.txt b/devel/glog/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..9b41ba3d0dd9
--- /dev/null
+++ b/devel/glog/files/patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+--- CMakeLists.txt.orig	2021-05-07 23:05:04 UTC
++++ CMakeLists.txt
+@@ -113,8 +113,6 @@ check_include_file_cxx (unistd.h HAVE_UNISTD_H)
+ check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP)
+ check_include_file_cxx ("ext/hash_set" HAVE_EXT_HASH_SET)
+ check_include_file_cxx ("ext/slist" HAVE_EXT_SLIST)
+-check_include_file_cxx ("tr1/unordered_map" HAVE_TR1_UNORDERED_MAP)
+-check_include_file_cxx ("tr1/unordered_set" HAVE_TR1_UNORDERED_SET)
+ check_include_file_cxx ("unordered_map" HAVE_UNORDERED_MAP)
+ check_include_file_cxx ("unordered_set" HAVE_UNORDERED_SET)
+ 
+@@ -678,11 +676,6 @@ if (BUILD_TESTING)
+     target_compile_definitions (stl_logging_unittest PRIVATE
+       GLOG_STL_LOGGING_FOR_UNORDERED)
+   endif (HAVE_UNORDERED_MAP AND HAVE_UNORDERED_SET)
+-
+-  if (HAVE_TR1_UNORDERED_MAP AND HAVE_TR1_UNORDERED_SET)
+-    target_compile_definitions (stl_logging_unittest PRIVATE
+-      GLOG_STL_LOGGING_FOR_TR1_UNORDERED)
+-  endif (HAVE_TR1_UNORDERED_MAP AND HAVE_TR1_UNORDERED_SET)
+ 
+   if (HAVE_EXT_HASH_MAP AND HAVE_EXT_HASH_SET)
+     target_compile_definitions (stl_logging_unittest PRIVATE
diff --git a/devel/glog/files/patch-m4-pc_from_ucontext.m4 b/devel/glog/files/patch-m4-pc_from_ucontext.m4
deleted file mode 100644
index 993c80cacb90..000000000000
--- a/devel/glog/files/patch-m4-pc_from_ucontext.m4
+++ /dev/null
@@ -1,10 +0,0 @@
---- m4/pc_from_ucontext.m4.orig	2019-09-01 20:36:55 UTC
-+++ m4/pc_from_ucontext.m4
-@@ -21,6 +21,7 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
-    pc_fields="$pc_fields uc_mcontext.gregs[[R15]]"     # Linux (arm old [untested])
-    pc_fields="$pc_fields uc_mcontext.arm_pc"           # Linux (arm new [untested])
-    pc_fields="$pc_fields uc_mcontext.mc_eip"           # FreeBSD (i386)
-+   pc_fields="$pc_fields uc_mcontext.mc_srr0"          # FreeBSD (powerpc, powerpc64)
-    pc_fields="$pc_fields uc_mcontext.mc_rip"           # FreeBSD (x86_64 [untested])
-    pc_fields="$pc_fields uc_mcontext.__gregs[[_REG_EIP]]"  # NetBSD (i386)
-    pc_fields="$pc_fields uc_mcontext.__gregs[[_REG_RIP]]"  # NetBSD (x86_64)
diff --git a/devel/glog/files/patch-src-glog-stl_logging.h.in b/devel/glog/files/patch-src-glog-stl_logging.h.in
new file mode 100644
index 000000000000..ba10427f9ce1
--- /dev/null
+++ b/devel/glog/files/patch-src-glog-stl_logging.h.in
@@ -0,0 +1,44 @@
+--- src/glog/stl_logging.h.in.orig	2021-05-07 23:05:04 UTC
++++ src/glog/stl_logging.h.in
+@@ -39,7 +39,6 @@
+ // need to define macros before including this file:
+ //
+ // - GLOG_STL_LOGGING_FOR_UNORDERED     - <unordered_map> and <unordered_set>
+-// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - <tr1/unordered_(map|set)>
+ // - GLOG_STL_LOGGING_FOR_EXT_HASH      - <ext/hash_(map|set)>
+ // - GLOG_STL_LOGGING_FOR_EXT_SLIST     - <ext/slist>
+ //
+@@ -64,11 +63,6 @@
+ # include <unordered_set>
+ #endif
+ 
+-#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
+-# include <tr1/unordered_map>
+-# include <tr1/unordered_set>
+-#endif
+-
+ #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH
+ # include <ext/hash_set>
+ # include <ext/hash_map>
+@@ -134,10 +128,6 @@ OUTPUT_FOUR_ARG_CONTAINER(std::multimap)
+ OUTPUT_FOUR_ARG_CONTAINER(std::unordered_set)
+ OUTPUT_FOUR_ARG_CONTAINER(std::unordered_multiset)
+ #endif
+-#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
+-OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_set)
+-OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_multiset)
+-#endif
+ #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH
+ OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_set)
+ OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_multiset)
+@@ -156,10 +146,6 @@ inline std::ostream& operator<<(std::ostream& out, \
+ #ifdef GLOG_STL_LOGGING_FOR_UNORDERED
+ OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map)
+ OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap)
+-#endif
+-#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
+-OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_map)
+-OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_multimap)
+ #endif
+ #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH
+ OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_map)
diff --git a/devel/glog/files/patch-src-stl_logging_unittest.cc b/devel/glog/files/patch-src-stl_logging_unittest.cc
new file mode 100644
index 000000000000..dcf45e53b816
--- /dev/null
+++ b/devel/glog/files/patch-src-stl_logging_unittest.cc
@@ -0,0 +1,12 @@
+--- src/stl_logging_unittest.cc.orig	2021-05-07 23:05:04 UTC
++++ src/stl_logging_unittest.cc
+@@ -52,9 +52,6 @@
+ #  ifndef GLOG_STL_LOGGING_FOR_EXT_SLIST
+ #  define GLOG_STL_LOGGING_FOR_EXT_SLIST
+ #  endif
+-#  ifndef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
+-#  define GLOG_STL_LOGGING_FOR_TR1_UNORDERED
+-#  endif
+ # endif
+ #endif
+ 
diff --git a/devel/glog/pkg-plist b/devel/glog/pkg-plist
index 840c0a73b1d1..037ad2ac8b49 100644
--- a/devel/glog/pkg-plist
+++ b/devel/glog/pkg-plist
@@ -1,18 +1,16 @@
+include/glog/export.h
 include/glog/log_severity.h
 include/glog/logging.h
 include/glog/raw_logging.h
 include/glog/stl_logging.h
 include/glog/vlog_is_on.h
-lib/libglog.a
+lib/cmake/glog/glog-config-version.cmake
+lib/cmake/glog/glog-config.cmake
+lib/cmake/glog/glog-modules.cmake
+lib/cmake/glog/glog-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/glog/glog-targets.cmake
 lib/libglog.so
 lib/libglog.so.0
-lib/libglog.so.0.0.0
+lib/libglog.so.0.5.0
 libdata/pkgconfig/libglog.pc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/README.windows
-%%PORTDOCS%%%%DOCSDIR%%/designstyle.css
-%%PORTDOCS%%%%DOCSDIR%%/glog.html
+%%DATADIR%%/cmake/FindUnwind.cmake

More information about the dev-commits-ports-all mailing list