Fri Mar 29 09:17:26 2013 UTC ()
Make it depend on zlib explicitly.
This fixes linking problems on platforms with no builtin zlib.
Found by Jason Bacon on CentOS.


(asau)
diff -r1.5 -r1.6 pkgsrc/devel/protobuf/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/protobuf/buildlink3.mk
cvs diff -r1.5 -r1.6 pkgsrc/devel/protobuf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/Makefile 2013/03/17 14:50:13 1.5
+++ pkgsrc/devel/protobuf/Makefile 2013/03/29 09:17:26 1.6
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.5 2013/03/17 14:50:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2013/03/29 09:17:26 asau Exp $
2# 2#
3 3
4DISTNAME= protobuf-2.5.0 4DISTNAME= protobuf-2.5.0
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= http://protobuf.googlecode.com/files/ 7MASTER_SITES= http://protobuf.googlecode.com/files/
7 8
8MAINTAINER= aran@100acres.us 9MAINTAINER= aran@100acres.us
9HOMEPAGE= http://code.google.com/p/protobuf/ 10HOMEPAGE= http://code.google.com/p/protobuf/
10COMMENT= Google protocol buffers 11COMMENT= Google protocol buffers
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_LANGUAGES= c++ c 16USE_LANGUAGES= c++ c
16 17
17CONFIGURE_ARGS+= --libdir=${PREFIX}/lib 18CONFIGURE_ARGS+= --libdir=${PREFIX}/lib
cvs diff -r1.1 -r1.2 pkgsrc/devel/protobuf/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/buildlink3.mk 2012/07/20 03:13:48 1.1
+++ pkgsrc/devel/protobuf/buildlink3.mk 2013/03/29 09:17:26 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.1 2012/07/20 03:13:48 agc Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2013/03/29 09:17:26 asau Exp $
2 2
3BUILDLINK_TREE+= protobuf 3BUILDLINK_TREE+= protobuf
4 4
5.if !defined(PROTOBUF_BUILDLINK3_MK) 5.if !defined(PROTOBUF_BUILDLINK3_MK)
6PROTOBUF_BUILDLINK3_MK:= 6PROTOBUF_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.protobuf+= protobuf>=2.4.1 8BUILDLINK_API_DEPENDS.protobuf+= protobuf>=2.4.1
9BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf 9BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf
10 10
 11.include "../../devel/zlib/buildlink3.mk"
11.endif # PROTOBUF_BUILDLINK3_MK 12.endif # PROTOBUF_BUILDLINK3_MK
12 13
13BUILDLINK_TREE+= -protobuf 14BUILDLINK_TREE+= -protobuf