1: Upgrade protobuf to 2.5.0.

2: bump revision.
3: document UPDATING.

10 files changed, 35 insertions, 34 deletions

diff --git a/devel/gjstest/Makefile b/devel/gjstest/Makefile
index 299683dc9b27..b470c49ab8cc 100644
--- a/devel/gjstest/Makefile
+++ b/devel/gjstest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gjstest
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/devel/php5-pinba/Makefile b/devel/php5-pinba/Makefile
index 66353de52bac..db1f43a4586a 100644
--- a/devel/php5-pinba/Makefile
+++ b/devel/php5-pinba/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pinba
 PORTVERSION=	2012.03.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tony2001/pinba_extension/tarball/${GITVERSION}/
 PKGNAMEPREFIX=	php5-
@@ -15,7 +16,7 @@ DISTNAME=	tony2001-pinba_extension-${GITVERSION}
 MAINTAINER=	komarov@valerka.net
 COMMENT=	PHP-extension part of statistics server for PHP
 
-LIB_DEPENDS=	protobuf.7:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	protobuf:${PORTSDIR}/devel/protobuf
 
 GITVERSION=	f76b673
 FETCH_ARGS=	-pRr
diff --git a/devel/pinba_engine/Makefile b/devel/pinba_engine/Makefile
index 82cff9a5dc91..480cf0baf118 100644
--- a/devel/pinba_engine/Makefile
+++ b/devel/pinba_engine/Makefile
@@ -22,6 +22,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/google/protobuf/descriptor.h:${PORTSDIR}/dev
  		${NONEXISTENT}:${PORTSDIR}/${_MYSQL_SERVER}:configure \
 		bison:${PORTSDIR}/devel/bison \
 		cmake:${PORTSDIR}/devel/cmake
+LIB_DEPENDS=	protobuf:${PORTSDIR}/devel/protobuf
 
 GITVERSION=	3a0cb51
 FETCH_ARGS=	-pRr
diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
index b80c95681662..b62e1e83a8ea 100644
--- a/devel/protobuf-c/Makefile
+++ b/devel/protobuf-c/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	protobuf-c
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	ahurt@anbcs.com
 COMMENT=	This package provides a code generator and runtime libraries to use Protocol Buffers from pure C (not C++)
 
-LIB_DEPENDS=	protobuf.7:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	protobuf:${PORTSDIR}/devel/protobuf
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index fdfdcb2fd26d..a80ddf7edf06 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -1,13 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for:	protobuf
-# Date created:				Aug 9, 2008
-# Whom:					vanilla
-#
+# Created by: vanilla
 # $FreeBSD$
-#
 
 PORTNAME=	protobuf
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -18,7 +13,8 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_PKGCONFIG=	yes
+USES+=		pathfix
 
 tests: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo
index 868584e54b79..d50dcb6f8e63 100644
--- a/devel/protobuf/distinfo
+++ b/devel/protobuf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (protobuf-2.4.1.tar.bz2) = cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
-SIZE (protobuf-2.4.1.tar.bz2) = 1440188
+SHA256 (protobuf-2.5.0.tar.bz2) = 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
+SIZE (protobuf-2.5.0.tar.bz2) = 1866763
diff --git a/devel/protobuf/files/patch-src-google-protobuf-message.cc b/devel/protobuf/files/patch-src-google-protobuf-message.cc
deleted file mode 100644
index 441d8deb1b44..000000000000
--- a/devel/protobuf/files/patch-src-google-protobuf-message.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/google/protobuf/message.cc.orig	2012-03-14 23:11:12.000000000 +0800
-+++ src/google/protobuf/message.cc	2012-03-14 23:11:26.000000000 +0800
-@@ -32,6 +32,7 @@
- //  Based on original Protocol Buffers design by
- //  Sanjay Ghemawat, Jeff Dean, and others.
- 
-+#include <iostream>
- #include <stack>
- #include <google/protobuf/stubs/hash.h>
- 
diff --git a/devel/protobuf/pkg-plist b/devel/protobuf/pkg-plist
index ee77ccdb98d0..75aa0b0703e0 100644
--- a/devel/protobuf/pkg-plist
+++ b/devel/protobuf/pkg-plist
@@ -15,6 +15,7 @@ include/google/protobuf/descriptor.proto
 include/google/protobuf/descriptor_database.h
 include/google/protobuf/dynamic_message.h
 include/google/protobuf/extension_set.h
+include/google/protobuf/generated_enum_reflection.h
 include/google/protobuf/generated_message_reflection.h
 include/google/protobuf/generated_message_util.h
 include/google/protobuf/io/coded_stream.h
@@ -31,6 +32,18 @@ include/google/protobuf/repeated_field.h
 include/google/protobuf/service.h
 include/google/protobuf/stubs/common.h
 include/google/protobuf/stubs/once.h
+include/google/protobuf/stubs/atomicops.h
+include/google/protobuf/stubs/atomicops_internals_arm_gcc.h
+include/google/protobuf/stubs/atomicops_internals_arm_qnx.h
+include/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
+include/google/protobuf/stubs/atomicops_internals_macosx.h
+include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
+include/google/protobuf/stubs/atomicops_internals_pnacl.h
+include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
+include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
+include/google/protobuf/stubs/platform_macros.h
+include/google/protobuf/stubs/template_util.h
+include/google/protobuf/stubs/type_traits.h
 include/google/protobuf/text_format.h
 include/google/protobuf/unknown_field_set.h
 include/google/protobuf/wire_format.h
@@ -39,15 +52,15 @@ include/google/protobuf/wire_format_lite_inl.h
 lib/libprotobuf-lite.a
 lib/libprotobuf-lite.la
 lib/libprotobuf-lite.so
-lib/libprotobuf-lite.so.7
+lib/libprotobuf-lite.so.8
 lib/libprotobuf.a
 lib/libprotobuf.la
 lib/libprotobuf.so
-lib/libprotobuf.so.7
+lib/libprotobuf.so.8
 lib/libprotoc.a
 lib/libprotoc.la
 lib/libprotoc.so
-lib/libprotoc.so.7
+lib/libprotoc.so.8
 libdata/pkgconfig/protobuf-lite.pc
 libdata/pkgconfig/protobuf.pc
 @dirrm include/google/protobuf/stubs
diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index 79417764a6ab..897cfb175278 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	py-protobuf
-# Date created:				May 27 2009
-# Whom:					vanilla@
-#
+# Created by: vanilla@
 # $FreeBSD$
-#
 
 PORTNAME=	protobuf
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.0
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,4 +18,7 @@ USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
+pre-build:
+	@${MKDIR} ${WRKSRC}/google/protobuf/compiler
+
 .include <bsd.port.mk>
diff --git a/devel/py-protobuf/distinfo b/devel/py-protobuf/distinfo
index 868584e54b79..d50dcb6f8e63 100644
--- a/devel/py-protobuf/distinfo
+++ b/devel/py-protobuf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (protobuf-2.4.1.tar.bz2) = cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
-SIZE (protobuf-2.4.1.tar.bz2) = 1440188
+SHA256 (protobuf-2.5.0.tar.bz2) = 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
+SIZE (protobuf-2.5.0.tar.bz2) = 1866763