svn commit: r385547 - in head/devel/protobuf: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Wed May  6 18:59:53 2015
New Revision: 385547
URL: https://svnweb.freebsd.org/changeset/ports/385547

Log:
  - Update to 2.6.1
  - Update MASTER_SITES: move from Google Code to GitHub
  - Update WWW
  
  Changes:	https://github.com/google/protobuf/releases
  PR:		199951
  Submitted by:	olgeni

Deleted:
  head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h
Modified:
  head/devel/protobuf/Makefile
  head/devel/protobuf/distinfo
  head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h
  head/devel/protobuf/pkg-descr
  head/devel/protobuf/pkg-plist

Modified: head/devel/protobuf/Makefile
==============================================================================
--- head/devel/protobuf/Makefile	Wed May  6 18:59:47 2015	(r385546)
+++ head/devel/protobuf/Makefile	Wed May  6 18:59:53 2015	(r385547)
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	protobuf
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	devel
-MASTER_SITES=	https://protobuf.googlecode.com/svn/rc/ \
-		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Data interchange format library
@@ -16,12 +14,15 @@ CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 ONLY_FOR_ARCHS=	amd64 armv6 i386
+PATHFIX_MAKEFILEIN=	Makefile.am
+USE_CSTD=	c99	# for audio/clementine-player support
 USE_LDCONFIG=	yes
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		autoreconf gmake libtool pathfix pkgconfig tar:bzip2
 
-# Clang will generate code that just doesn't work with clementine-player
-# if this isn't compiled as though it were C99.
-USE_CSTD=	c99
+USE_GITHUB=	yes
+GH_ACCOUNT=	google
+GH_PROJECT=	protobuf
+GH_TAGNAME=	v${PORTVERSION}
 
 regression-test test: build
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check

Modified: head/devel/protobuf/distinfo
==============================================================================
--- head/devel/protobuf/distinfo	Wed May  6 18:59:47 2015	(r385546)
+++ head/devel/protobuf/distinfo	Wed May  6 18:59:53 2015	(r385547)
@@ -1,2 +1,2 @@
-SHA256 (protobuf-2.6.0.tar.bz2) = 0a2f8533b2e0587a2b4efce0c4c8aea21bbfae1c41c466634d958dedf580f6aa
-SIZE (protobuf-2.6.0.tar.bz2) = 2021255
+SHA256 (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1
+SIZE (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 1349051

Modified: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h
==============================================================================
--- head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h	Wed May  6 18:59:47 2015	(r385546)
+++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h	Wed May  6 18:59:53 2015	(r385547)
@@ -1,6 +1,6 @@
---- src/google/protobuf/stubs/atomicops.h.orig	2014-08-26 03:52:37.000000000 +0800
-+++ src/google/protobuf/stubs/atomicops.h	2015-02-21 11:45:38.816841509 +0800
-@@ -182,6 +182,8 @@
+--- src/google/protobuf/stubs/atomicops.h.orig	2015-05-06 14:28:24 UTC
++++ src/google/protobuf/stubs/atomicops.h
+@@ -187,6 +187,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR
  #elif defined(__GNUC__)
  #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
  #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>

Modified: head/devel/protobuf/pkg-descr
==============================================================================
--- head/devel/protobuf/pkg-descr	Wed May  6 18:59:47 2015	(r385546)
+++ head/devel/protobuf/pkg-descr	Wed May  6 18:59:53 2015	(r385547)
@@ -2,4 +2,4 @@ Protocol Buffers are a way of encoding s
 extensible format. Google uses Protocol Buffers for almost all of its internal
 RPC protocols and file formats.
 
-WWW: https://code.google.com/p/protobuf/
+WWW: https://github.com/google/protobuf

Modified: head/devel/protobuf/pkg-plist
==============================================================================
--- head/devel/protobuf/pkg-plist	Wed May  6 18:59:47 2015	(r385546)
+++ head/devel/protobuf/pkg-plist	Wed May  6 18:59:53 2015	(r385547)
@@ -57,14 +57,14 @@ include/google/protobuf/wire_format_lite
 lib/libprotobuf-lite.a
 lib/libprotobuf-lite.so
 lib/libprotobuf-lite.so.9
-lib/libprotobuf-lite.so.9.0.0
+lib/libprotobuf-lite.so.9.0.1
 lib/libprotobuf.a
 lib/libprotobuf.so
 lib/libprotobuf.so.9
-lib/libprotobuf.so.9.0.0
+lib/libprotobuf.so.9.0.1
 lib/libprotoc.a
 lib/libprotoc.so
 lib/libprotoc.so.9
-lib/libprotoc.so.9.0.0
+lib/libprotoc.so.9.0.1
 libdata/pkgconfig/protobuf-lite.pc
 libdata/pkgconfig/protobuf.pc