Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Oct 2014 08:45:20 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r369705 - in head/devel/protobuf: . files
Message-ID:  <201410010845.s918jKqL055293@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Wed Oct  1 08:45:20 2014
New Revision: 369705
URL: https://svnweb.freebsd.org/changeset/ports/369705
QAT: https://qat.redports.org/buildarchive/r369705/

Log:
  1: fix tests build
  2: switch to install-strip.
  3: fix pkg-plist to chase pkg-1.3.8.
  4: drop maintainer bit.
  
  PR:		ports/194041 ports/194042
  Submitted by:	Jan Beich jbeich at vfemail dot net

Added:
  head/devel/protobuf/files/
  head/devel/protobuf/files/patch-src__google__protobuf__testing__zcgunzip.cc   (contents, props changed)
  head/devel/protobuf/files/patch-src__google__protobuf__testing__zcgzip.cc   (contents, props changed)
Modified:
  head/devel/protobuf/Makefile
  head/devel/protobuf/pkg-plist

Modified: head/devel/protobuf/Makefile
==============================================================================
--- head/devel/protobuf/Makefile	Wed Oct  1 08:39:43 2014	(r369704)
+++ head/devel/protobuf/Makefile	Wed Oct  1 08:45:20 2014	(r369705)
@@ -7,23 +7,22 @@ PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Data interchange format library
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		gmake pathfix pkgconfig tar:bzip2 libtool
 ONLY_FOR_ARCHS=	i386 amd64
+INSTALL_TARGET=	install-strip
 
 # clang will generate code that just doesn't work with clementine-player
 # if this isn't compiled as though it were C99.
 CFLAGS+=	-std=c99 -DGOOGLE_PROTOBUF_NO_RTTI
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libprotobuf-lite.so.8
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libprotobuf.so.8
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libprotoc.so.8
-
 tests: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 

Added: head/devel/protobuf/files/patch-src__google__protobuf__testing__zcgunzip.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/protobuf/files/patch-src__google__protobuf__testing__zcgunzip.cc	Wed Oct  1 08:45:20 2014	(r369705)
@@ -0,0 +1,10 @@
+--- src/google/protobuf/testing/zcgunzip.cc.orig	2014-09-30 23:01:39.718744075 +0800
++++ src/google/protobuf/testing/zcgunzip.cc	2014-09-30 23:02:05.753740335 +0800
+@@ -44,6 +44,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
++#include <unistd.h> // for STDOUT_FILENO
+ 
+ #include <google/protobuf/io/gzip_stream.h>
+ #include <google/protobuf/io/zero_copy_stream_impl.h>

Added: head/devel/protobuf/files/patch-src__google__protobuf__testing__zcgzip.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/protobuf/files/patch-src__google__protobuf__testing__zcgzip.cc	Wed Oct  1 08:45:20 2014	(r369705)
@@ -0,0 +1,10 @@
+--- src/google/protobuf/testing/zcgzip.cc.orig	2014-09-30 22:46:34.571804492 +0800
++++ src/google/protobuf/testing/zcgzip.cc	2014-09-30 22:46:50.657816315 +0800
+@@ -43,6 +43,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
++#include <unistd.h> // for STDOUT_FILENO
+ 
+ #include <google/protobuf/io/gzip_stream.h>
+ #include <google/protobuf/io/zero_copy_stream_impl.h>

Modified: head/devel/protobuf/pkg-plist
==============================================================================
--- head/devel/protobuf/pkg-plist	Wed Oct  1 08:39:43 2014	(r369704)
+++ head/devel/protobuf/pkg-plist	Wed Oct  1 08:45:20 2014	(r369705)
@@ -63,11 +63,3 @@ lib/libprotoc.so.8
 lib/libprotoc.so.8.0.0
 libdata/pkgconfig/protobuf-lite.pc
 libdata/pkgconfig/protobuf.pc
-@dirrm include/google/protobuf/stubs
-@dirrm include/google/protobuf/io
-@dirrm include/google/protobuf/compiler/python
-@dirrm include/google/protobuf/compiler/java
-@dirrm include/google/protobuf/compiler/cpp
-@dirrm include/google/protobuf/compiler
-@dirrm include/google/protobuf
-@dirrmtry include/google



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410010845.s918jKqL055293>