Wednesday, August 23, 2017

UPDATE: devel/glog (fix clang build)

Hi

please find below a diff to update glog to 2.2.1.

ports relevant:

- Switch to github
- Switch to cmake
- remove MAINTAINER (Not available - also removed in devel/gtest)
- sharedlibs bump

Not all tests are green but I think is's ok because there are no
glog consumers in our tree.

Please keep in mind glog 2.2.1 needs upcoming gflags update 2.2.1 to
build/test.

OK? Comments?

Rafael Sadowski

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/glog/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 26 Jul 2017 22:45:17 -0000 1.11
+++ Makefile 23 Aug 2017 13:31:12 -0000
@@ -2,30 +2,23 @@

COMMENT = C++ application-level logging library

-DISTNAME = glog-0.3.1
-REVISION = 2
+GH_ACCOUNT = google
+GH_PROJECT = glog
+GH_TAGNAME = v0.3.5

-SHARED_LIBS += glog 0.0 # 0.2.1
+SHARED_LIBS += glog 1.0 # 0.2.1

CATEGORIES = devel

-HOMEPAGE = https://google-glog.googlecode.com/
-
-MAINTAINER = Vincent Auclair <auclair.vincent@gmail.com>
-
# New BSD
PERMIT_PACKAGE_CDROM = Yes

-WANTLIB += gflags m pthread ${COMPILER_LIBCXX}
-
-MASTER_SITES = ${HOMEPAGE}/files/
+WANTLIB += ${COMPILER_LIBCXX} gflags m

LIB_DEPENDS = devel/gflags
-TEST_DEPENDS = devel/gtest
-BUILD_DEPENDS += ${TEST_DEPENDS}

-CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --with-gflags=${LOCALBASE}
-MAKE_FLAGS = docdir='$$(prefix)/share/doc/glog'
+MODULES = devel/cmake
+
+CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/glog/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 18 Jan 2015 03:13:12 -0000 1.3
+++ distinfo 23 Aug 2017 13:31:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (glog-0.3.1.tar.gz) = 7rxheiKj9oWU50rtPEigJPNshntCMkp5UhJZ1jk7riQ=
-SIZE (glog-0.3.1.tar.gz) = 490361
+SHA256 (glog-0.3.5.tar.gz) = dYDkCKLAtaicohRzmXjOb/SAtefY12mKKqkvrcSE0eA=
+SIZE (glog-0.3.5.tar.gz) = 532275
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 31 Dec 2009 15:48:59 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2009/12/31 15:48:59 landry Exp $
---- configure.orig Thu Jul 30 14:29:42 2009
-+++ configure Fri Nov 27 23:35:25 2009
-@@ -2470,6 +2470,7 @@ ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+acxx_link='$CXX -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-@@ -23954,7 +23955,7 @@ case "(($ac_try" in
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-+ (eval "$acxx_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -24068,7 +24069,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_GMOCK_CONFIG=""yes""
-+ ac_cv_prog_GMOCK_CONFIG=""no""
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/glog/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:40 -0000 1.2
+++ pkg/PLIST 23 Aug 2017 13:31:12 -0000
@@ -1,21 +1,15 @@
@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:40 naddy Exp $
include/glog/
+include/glog/config.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/libglog.la
+lib/cmake/
+lib/cmake/glog/
+lib/cmake/glog/glog-config-version.cmake
+lib/cmake/glog/glog-config.cmake
+lib/cmake/glog/glog-targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/glog/glog-targets.cmake
@lib lib/libglog.so.${LIBglog_VERSION}
-lib/pkgconfig/libglog.pc
-share/doc/glog/
-share/doc/glog/AUTHORS
-share/doc/glog/COPYING
-share/doc/glog/ChangeLog
-share/doc/glog/INSTALL
-share/doc/glog/NEWS
-share/doc/glog/README
-share/doc/glog/README.windows
-share/doc/glog/designstyle.css
-share/doc/glog/glog.html

No comments:

Post a Comment