Commit 05f155d9 authored by Sunpoet Po-Chuan Hsieh's avatar Sunpoet Po-Chuan Hsieh
Browse files

Revert r473259 and r473260 which are committed by accident

- Bump PORTEPOCH for protobuf and py-protobuf
- Bump PORTREVISION for dependent ports
parent bab46736
......@@ -4,7 +4,7 @@
PORTNAME= libosmpbf
PORTVERSION= 1.3.3
DISTVERSIONPREFIX= v
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org
......
......@@ -3,7 +3,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.18.2
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= astro
MAINTAINER= dev2@heesakkers.info
......
......@@ -5,7 +5,7 @@ PORTNAME= clementine
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.1-441
DISTVERSIONSUFFIX= -gc01b7bc
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
PKGNAMESUFFIX= -player
......
......@@ -4,7 +4,7 @@
PORTNAME= mixxx
PORTVERSION= 2.0.0
DISTVERSIONSUFFIX= -src
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/
......
......@@ -3,7 +3,7 @@
PORTNAME= mumble
PORTVERSION= 1.2.19
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= audio
MAINTAINER= feld@FreeBSD.org
......
......@@ -3,7 +3,7 @@
PORTNAME= murmur
PORTVERSION= 1.2.19
PORTREVISION= 12
PORTREVISION= 13
CATEGORIES= audio net
MAINTAINER= feld@FreeBSD.org
......
......@@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 5.7.22
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
......
......@@ -4,7 +4,7 @@
PORTNAME= grpc
PORTVERSION= 1.12.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= vanilla@FreeBSD.org
......
......@@ -3,7 +3,7 @@
PORTNAME= pinba
PORTVERSION= 2012.03.20
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= devel
PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
......
......@@ -4,7 +4,7 @@
PORTNAME= protobuf-c
PORTVERSION= 1.3.0
DISTVERSIONPREFIX= v
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MAINTAINER= truckman@FreeBSD.org
......
......@@ -2,8 +2,9 @@
# $FreeBSD$
PORTNAME= protobuf
PORTVERSION= 3.6.0
PORTVERSION= 3.5.2
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= devel
MAINTAINER= sunpoet@FreeBSD.org
......@@ -18,11 +19,9 @@ TEST_DEPENDS= googlemock>=0:devel/googlemock \
googletest>=0:devel/googletest
CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src
CONFIGURE_ENV= CC_FOR_BUILD="${CC}" \
CFLAGS_FOR_BUILD="${CFLAGS}" \
CONFIGURE_ENV= CC_FOR_BUILD="${CC}" CFLAGS_FOR_BUILD="${CFLAGS}" \
CPPFLAGS_FOR_BUILD="${CPPFLAGS}" \
CXX_FOR_BUILD="${CXX}" \
CXXFLAGS_FOR_BUILD="${CXXFLAGS}" \
CXX_FOR_BUILD="${CXX}" CXXFLAGS_FOR_BUILD="${CXXFLAGS}" \
LDFLAGS_FOR_BUILD="${LDFLAGS}"
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
......
TIMESTAMP = 1529610442
SHA256 (google-protobuf-v3.6.0_GH0.tar.gz) = 50a5753995b3142627ac55cfd496cebc418a2e575ca0236e29033c67bd5665f4
SIZE (google-protobuf-v3.6.0_GH0.tar.gz) = 4483224
TIMESTAMP = 1523095599
SHA256 (google-protobuf-v3.5.2_GH0.tar.gz) = 4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2
SIZE (google-protobuf-v3.5.2_GH0.tar.gz) = 4584659
--- src/google/protobuf/stubs/atomicops.h.orig 2017-08-15 23:39:12 UTC
+++ src/google/protobuf/stubs/atomicops.h
@@ -198,6 +198,8 @@ Atomic64 Release_Load(volatile const Ato
#elif defined(__GNUC__)
#if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
#include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
+#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__)
+#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__)
#if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
......@@ -15,6 +15,7 @@ include/google/protobuf/compiler/csharp/csharp_names.h
include/google/protobuf/compiler/importer.h
include/google/protobuf/compiler/java/java_generator.h
include/google/protobuf/compiler/java/java_names.h
include/google/protobuf/compiler/javanano/javanano_generator.h
include/google/protobuf/compiler/js/js_generator.h
include/google/protobuf/compiler/js/well_known_types_embed.h
include/google/protobuf/compiler/objectivec/objectivec_generator.h
......@@ -44,8 +45,6 @@ include/google/protobuf/generated_message_reflection.h
include/google/protobuf/generated_message_table_driven.h
include/google/protobuf/generated_message_util.h
include/google/protobuf/has_bits.h
include/google/protobuf/implicit_weak_message.h
include/google/protobuf/inlined_string_field.h
include/google/protobuf/io/coded_stream.h
include/google/protobuf/io/gzip_stream.h
include/google/protobuf/io/printer.h
......@@ -73,6 +72,20 @@ include/google/protobuf/source_context.pb.h
include/google/protobuf/source_context.proto
include/google/protobuf/struct.pb.h
include/google/protobuf/struct.proto
include/google/protobuf/stubs/atomic_sequence_num.h
include/google/protobuf/stubs/atomicops.h
include/google/protobuf/stubs/atomicops_internals_arm64_gcc.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_generic_c11_atomic.h
include/google/protobuf/stubs/atomicops_internals_generic_gcc.h
include/google/protobuf/stubs/atomicops_internals_mips_gcc.h
include/google/protobuf/stubs/atomicops_internals_power.h
include/google/protobuf/stubs/atomicops_internals_ppc_gcc.h
include/google/protobuf/stubs/atomicops_internals_solaris.h
include/google/protobuf/stubs/atomicops_internals_tsan.h
include/google/protobuf/stubs/atomicops_internals_x86_gcc.h
include/google/protobuf/stubs/atomicops_internals_x86_msvc.h
include/google/protobuf/stubs/bytestream.h
include/google/protobuf/stubs/callback.h
include/google/protobuf/stubs/casts.h
......@@ -85,11 +98,14 @@ include/google/protobuf/stubs/mutex.h
include/google/protobuf/stubs/once.h
include/google/protobuf/stubs/platform_macros.h
include/google/protobuf/stubs/port.h
include/google/protobuf/stubs/scoped_ptr.h
include/google/protobuf/stubs/shared_ptr.h
include/google/protobuf/stubs/singleton.h
include/google/protobuf/stubs/status.h
include/google/protobuf/stubs/stl_util.h
include/google/protobuf/stubs/stringpiece.h
include/google/protobuf/stubs/template_util.h
include/google/protobuf/stubs/type_traits.h
include/google/protobuf/text_format.h
include/google/protobuf/timestamp.pb.h
include/google/protobuf/timestamp.proto
......@@ -110,10 +126,16 @@ include/google/protobuf/wire_format_lite_inl.h
include/google/protobuf/wrappers.pb.h
include/google/protobuf/wrappers.proto
lib/libprotobuf-lite.a
lib/libprotobuf-lite.so.16.0.0
lib/libprotobuf-lite.so
lib/libprotobuf-lite.so.15
lib/libprotobuf-lite.so.15.0.1
lib/libprotobuf.a
lib/libprotobuf.so.16.0.0
lib/libprotobuf.so
lib/libprotobuf.so.15
lib/libprotobuf.so.15.0.1
lib/libprotoc.a
lib/libprotoc.so.16.0.0
lib/libprotoc.so
lib/libprotoc.so.15
lib/libprotoc.so.15.0.1
libdata/pkgconfig/protobuf-lite.pc
libdata/pkgconfig/protobuf.pc
......@@ -2,17 +2,20 @@
# $FreeBSD$
PORTNAME= protobuf
PORTVERSION= 3.6.0
PORTVERSION= 3.5.2
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Google protobuf Python Client Library
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/../LICENSE
BUILD_DEPENDS= protoc:devel/protobuf
BUILD_DEPENDS= protoc:devel/protobuf \
${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
DO_MAKE_TEST= ${PYTHON_CMD} ${PYDISTUTILS_SETUP}
......@@ -20,5 +23,12 @@ NO_ARCH= yes
TEST_TARGET= test
USE_PYTHON= autoplist concurrent distutils
USES= python
WRKSRC_SUBDIR= python
GH_ACCOUNT= google
USE_GITHUB= yes
post-patch:
@${MKDIR} ${WRKSRC}/google/protobuf/compiler/
.include <bsd.port.mk>
TIMESTAMP = 1529740635
SHA256 (protobuf-3.6.0.tar.gz) = a37836aa47d1b81c2db1a6b7a5e79926062b5d76bd962115a0e615551be2b48d
SIZE (protobuf-3.6.0.tar.gz) = 230937
TIMESTAMP = 1523095625
SHA256 (google-protobuf-v3.5.2_GH0.tar.gz) = 4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2
SIZE (google-protobuf-v3.5.2_GH0.tar.gz) = 4584659
......@@ -3,7 +3,7 @@
PORTNAME= dnsdist
DISTVERSION= 1.3.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= dns net
MASTER_SITES= https://downloads.powerdns.com/releases/ \
LOCAL/cpm
......
......@@ -3,7 +3,7 @@
PORTNAME= knot-resolver
DISTVERSION= 2.3.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= dns ipv6
MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \
https://dns.company/downloads/knot-resolver/
......
......@@ -3,7 +3,7 @@
PORTNAME= recursor
DISTVERSION= 4.1.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
PKGNAMEPREFIX= powerdns-
......
......@@ -2,7 +2,7 @@
PORTNAME= powerdns
DISTVERSION= 4.1.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${DISTVERSION}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment