aboutsummaryrefslogtreecommitdiffstats
path: root/devel/glog
diff options
context:
space:
mode:
authorclsung <clsung@FreeBSD.org>2011-04-07 17:12:37 +0800
committerclsung <clsung@FreeBSD.org>2011-04-07 17:12:37 +0800
commitacb256d05d49ffe59ea01f9d83c6711ded799372 (patch)
tree0b8c6ff9ee0c0f0ae73d8a6bceda05430ff2fc7f /devel/glog
parentc87f2a7cece1e8df6d8b8596bd2cdb37c052d14c (diff)
downloadfreebsd-ports-gnome-acb256d05d49ffe59ea01f9d83c6711ded799372.tar.gz
freebsd-ports-gnome-acb256d05d49ffe59ea01f9d83c6711ded799372.tar.zst
freebsd-ports-gnome-acb256d05d49ffe59ea01f9d83c6711ded799372.zip
- Update to 0.3.1
Diffstat (limited to 'devel/glog')
-rw-r--r--devel/glog/Makefile9
-rw-r--r--devel/glog/distinfo5
-rw-r--r--devel/glog/files/extra-patch-src-logging.cc11
-rw-r--r--devel/glog/files/extra-patch-src-utilities.cc15
4 files changed, 9 insertions, 31 deletions
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index bacc2aedb9a2..53e3f977eafd 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= glog
-DISTVERSION= 0.2.1
-PORTREVISION= 1
+DISTVERSION= 0.3.1
CATEGORIES= devel
-MASTER_SITES= http://google-glog.googlecode.com/files/
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= clsung@FreeBSD.org
COMMENT= A library of C++ classes for flexible logging
@@ -20,14 +19,14 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomehack
USE_LDCONFIG= yes
USE_GCC= 4.2+
+PROJECTHOST= google-glog
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lexecinfo"
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" || ${ARCH} =="ia64" || ${ARCH} =="powerpc" || ${ARCH} =="sparc64"
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-src-logging.cc \
- ${FILESDIR}/extra-patch-src-utilities.cc
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-src-utilities.cc
.endif
.if ${ARCH} == "amd64"
diff --git a/devel/glog/distinfo b/devel/glog/distinfo
index f9ac1ec8fd0b..bd8caf712d57 100644
--- a/devel/glog/distinfo
+++ b/devel/glog/distinfo
@@ -1,3 +1,2 @@
-MD5 (glog-0.2.1.tar.gz) = 8e2dd128f2f39200d9982f0e36f106ba
-SHA256 (glog-0.2.1.tar.gz) = 572dae745aeaaaafcff5b9ba33462e56a910b504db07298337cfe6416dfb6dea
-SIZE (glog-0.2.1.tar.gz) = 484026
+SHA256 (glog-0.3.1.tar.gz) = eebc617a22a3f68594e74aed3c48a024f36c867b42324a79521259d6393bae24
+SIZE (glog-0.3.1.tar.gz) = 490361
diff --git a/devel/glog/files/extra-patch-src-logging.cc b/devel/glog/files/extra-patch-src-logging.cc
deleted file mode 100644
index ab7f22f6ecb7..000000000000
--- a/devel/glog/files/extra-patch-src-logging.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/logging.cc.orig 2008-10-03 13:32:01.000000000 +0800
-+++ src/logging.cc 2008-10-14 13:32:03.000000000 +0800
-@@ -1566,7 +1566,7 @@
- } else {
- buf[0] = '\000';
- #if defined(OS_MACOSX) || defined(OS_FREEBSD)
-- if (reinterpret_cast<int>(rc) < sys_nerr) {
-+ if (reinterpret_cast<long>(rc) < sys_nerr) {
- // This means an error on MacOSX or FreeBSD.
- return -1;
- }
diff --git a/devel/glog/files/extra-patch-src-utilities.cc b/devel/glog/files/extra-patch-src-utilities.cc
index 3d9ad6c8977d..72967a340d54 100644
--- a/devel/glog/files/extra-patch-src-utilities.cc
+++ b/devel/glog/files/extra-patch-src-utilities.cc
@@ -1,6 +1,6 @@
---- src/utilities.cc.orig 2009-01-23 09:37:14.000000000 +0800
-+++ src/utilities.cc 2009-02-04 11:25:50.000000000 +0800
-@@ -187,8 +187,6 @@
+--- src/utilities.cc.orig 2010-06-15 14:28:09.000000000 +0800
++++ src/utilities.cc 2011-04-07 17:00:18.000000000 +0800
+@@ -227,8 +227,6 @@
#ifndef __NR_gettid
#ifdef OS_MACOSX
#define __NR_gettid SYS_gettid
@@ -9,12 +9,3 @@
#else
#define __NR_gettid 224
#endif
-@@ -214,7 +212,7 @@
- return GetCurrentThreadId();
- #else
- // If none of the techniques above worked, we use pthread_self().
-- return (pid_t)pthread_self();
-+ return reinterpret_cast<unsigned long>(pthread_self());
- #endif
- }
-