From f3ff426b004b302d930ff0e8a9f5e703dac04f96 Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Sat, 16 Aug 2014 21:04:52 +0000 Subject: [PATCH] devel/protobuf-c: update to 1.0.1 - Bump port revision due to shlib change - Add DOCS option - Pass maintainership to submitter PR: 192175 Submitted by: truckman Approved by: maintainer --- converters/osm2pgsql/Makefile | 2 +- devel/protobuf-c/Makefile | 34 +++++++++++-- devel/protobuf-c/distinfo | 4 +- devel/protobuf-c/pkg-descr | 2 +- devel/protobuf-c/pkg-plist | 91 ++++++++++++++++++++++++++++++++--- net-mgmt/collectd5/Makefile | 2 +- polish/libgadu/Makefile | 1 + 7 files changed, 120 insertions(+), 16 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 73603274f29e..51f71eabc801 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -3,7 +3,7 @@ PORTNAME= osm2pgsql PORTVERSION= 0.84.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile index ddcea00cd9c6..61c2d19a0f08 100644 --- a/devel/protobuf-c/Makefile +++ b/devel/protobuf-c/Makefile @@ -2,13 +2,16 @@ # $FreeBSD$ PORTNAME= protobuf-c -PORTVERSION= 0.15 -PORTREVISION= 2 +PORTVERSION= 1.0.1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= https://github.com/${GITHUB_USER}/${GITHUB_REPO}/releases/download/v${PORTVERSION}/ \ + http://github.com/${GITHUB_USER}/${GITHUB_REPO}/releases/download/v${PORTVERSION}/ -MAINTAINER= ahurt@anbcs.com -COMMENT= This package provides a code generator and runtime libraries to use Protocol Buffers from pure C (not C++) +MAINTAINER= truckman@FreeBSD.org +COMMENT= Code generator and libraries to use Protocol Buffers from pure C + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf @@ -19,9 +22,30 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +GITHUB_USER= protobuf-c +GITHUB_REPO= protobuf-c + +OPTIONS_DEFINE= DOCS + +.include + +ALL_TARGET= all +.if ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen +ALL_TARGET+= html-local +.endif + + post-patch: @${REINPLACE_CMD} -e 's|GREP "\\-L"|GREP "bin/ld"|g' ${WRKSRC}/configure +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libprotobuf-c.so.1.0.0 +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/html + ${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}/html +.endif + tests: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) diff --git a/devel/protobuf-c/distinfo b/devel/protobuf-c/distinfo index 2a3ae1ed03a3..dff5d268048a 100644 --- a/devel/protobuf-c/distinfo +++ b/devel/protobuf-c/distinfo @@ -1,2 +1,2 @@ -SHA256 (protobuf-c-0.15.tar.gz) = 8fcb538e13a5431c46168fc8f2e6ad2574e2db9b684c0c72b066e24f010a0036 -SIZE (protobuf-c-0.15.tar.gz) = 500911 +SHA256 (protobuf-c-1.0.1.tar.gz) = e1b2989684ac51e62f8b7de8739c381717b27c7cf4410c7a7e39b958afd3cd74 +SIZE (protobuf-c-1.0.1.tar.gz) = 448519 diff --git a/devel/protobuf-c/pkg-descr b/devel/protobuf-c/pkg-descr index ef3e11fc94fd..3ecd0f309067 100644 --- a/devel/protobuf-c/pkg-descr +++ b/devel/protobuf-c/pkg-descr @@ -2,4 +2,4 @@ This package provides a code generator and runtime libraries to use Protocol Buffers from pure C (not C++). It uses a modified version of protoc called protoc-c. -WWW: http://code.google.com/p/protobuf-c/ +WWW: http://github.com/protobuf-c/protobuf-c diff --git a/devel/protobuf-c/pkg-plist b/devel/protobuf-c/pkg-plist index 3dc74ba71955..5dbe6086209c 100644 --- a/devel/protobuf-c/pkg-plist +++ b/devel/protobuf-c/pkg-plist @@ -1,13 +1,92 @@ bin/protoc-c -include/google/protobuf-c/protobuf-c-dispatch.h -include/google/protobuf-c/protobuf-c-private.h -include/google/protobuf-c/protobuf-c-rpc.h include/google/protobuf-c/protobuf-c.h +include/protobuf-c/protobuf-c.h lib/libprotobuf-c.a lib/libprotobuf-c.la lib/libprotobuf-c.so -lib/libprotobuf-c.so.0 -lib/libprotobuf-c.so.0.0.0 +lib/libprotobuf-c.so.1 +lib/libprotobuf-c.so.1.0.0 libdata/pkgconfig/libprotobuf-c.pc +%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html +%%PORTDOCS%%%%DOCSDIR%%/html/annotated.js +%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png +%%PORTDOCS%%%%DOCSDIR%%/html/bdwn.png +%%PORTDOCS%%%%DOCSDIR%%/html/classes.html +%%PORTDOCS%%%%DOCSDIR%%/html/closed.png +%%PORTDOCS%%%%DOCSDIR%%/html/dir_2c96eb53f97134aa5468aeff4257fb45.html +%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/html/dynsections.js +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2blank.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2doc.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderclosed.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2folderopen.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2lastnode.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2link.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mlastnode.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2mnode.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2node.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2plastnode.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2pnode.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2splitbar.png +%%PORTDOCS%%%%DOCSDIR%%/html/ftv2vertline.png +%%PORTDOCS%%%%DOCSDIR%%/html/functions.html +%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html +%%PORTDOCS%%%%DOCSDIR%%/html/gencode.html +%%PORTDOCS%%%%DOCSDIR%%/html/group__api.html +%%PORTDOCS%%%%DOCSDIR%%/html/group__api.js +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/html/modules.html +%%PORTDOCS%%%%DOCSDIR%%/html/modules.js +%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/html/nav_g.png +%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/html/navtree.css +%%PORTDOCS%%%%DOCSDIR%%/html/navtree.js +%%PORTDOCS%%%%DOCSDIR%%/html/navtreeindex0.js +%%PORTDOCS%%%%DOCSDIR%%/html/open.png +%%PORTDOCS%%%%DOCSDIR%%/html/pack.html +%%PORTDOCS%%%%DOCSDIR%%/html/pages.html +%%PORTDOCS%%%%DOCSDIR%%/html/resize.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCAllocator.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCAllocator.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCBinaryData.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCBinaryData.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCBuffer.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCBuffer.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCBufferSimple.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCBufferSimple.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCEnumDescriptor.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCEnumDescriptor.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCEnumValue.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCEnumValue.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCEnumValueIndex.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCEnumValueIndex.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCFieldDescriptor.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCFieldDescriptor.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCIntRange.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCIntRange.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMessage.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMessage.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMessageDescriptor.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMessageDescriptor.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMessageUnknownField.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMessageUnknownField.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMethodDescriptor.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCMethodDescriptor.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCService.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCService.js +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCServiceDescriptor.html +%%PORTDOCS%%%%DOCSDIR%%/html/structProtobufCServiceDescriptor.js +%%PORTDOCS%%%%DOCSDIR%%/html/sync_off.png +%%PORTDOCS%%%%DOCSDIR%%/html/sync_on.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png +%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css @dirrm include/google/protobuf-c -@dirrmtry include/google +@dirrm include/protobuf-c +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index ac73e6584501..cffb458b5b87 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ PKGNAMESUFFIX= 5 diff --git a/polish/libgadu/Makefile b/polish/libgadu/Makefile index 6bfaca62f855..67073f2cca74 100644 --- a/polish/libgadu/Makefile +++ b/polish/libgadu/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgadu DISTVERSION= 1.12.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= polish net-im