svn commit: r389831 - in head/net/czmq: . files

Tue Jun 16 10:40:33 UTC 2015

Author: koobs
Date: Tue Jun 16 10:40:32 2015
New Revision: 389831
URL: https://svnweb.freebsd.org/changeset/ports/389831

Log:
  net/czmq: Update to 3.0.2, fix build
  
  czmq 2.2.x is no longer compatible with libzmq4 (4.1.x)
  
  - Update to 3.0.2
  - Update pkg-plist
  - Update LICENSE (MPL)
  - Add LICENSE_FILE
  - Add pkg-config to USES
  - Override pkgconfig install path via configure
  - Backport fix not building MAN pages when BUILD_DOCS is off [1]
  - Use autoreconf to regenerate Makefiles until next release
  
  [1] https://github.com/zeromq/czmq/pull/1027
  
  Reported by:	olgeni

Added:
  head/net/czmq/files/
  head/net/czmq/files/patch-doc_Makefile.am   (contents, props changed)
Modified:
  head/net/czmq/Makefile
  head/net/czmq/distinfo
  head/net/czmq/pkg-plist

Modified: head/net/czmq/Makefile
==============================================================================

--- head/net/czmq/Makefile	Tue Jun 16 09:43:00 2015	(r389830)
+++ head/net/czmq/Makefile	Tue Jun 16 10:40:32 2015	(r389831)
@@ -2,23 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	czmq
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	3.0.2
 CATEGORIES=	net
 MASTER_SITES=	http://download.zeromq.org/
 
 MAINTAINER=	koobs at FreeBSD.org
 COMMENT=	High-level C Binding for ZeroMQ
 
-LICENSE=	LGPL3
+LICENSE=	MPL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq4
 
-USES=		libtool pathfix
+USES=		autoreconf libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libzmq=${LOCALBASE}
+CONFIGURE_ARGS=	--with-libzmq=${LOCALBASE} \
+		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 
 MAKE_ENV=	V=1
 INSTALL_TARGET=	install-strip

Modified: head/net/czmq/distinfo
==============================================================================
--- head/net/czmq/distinfo	Tue Jun 16 09:43:00 2015	(r389830)
+++ head/net/czmq/distinfo	Tue Jun 16 10:40:32 2015	(r389831)
@@ -1,2 +1,2 @@
-SHA256 (czmq-2.2.0.tar.gz) = bb8ec7242655ffc3cb61023f6de4e4798900a6fbffb7399cf2d5e42a921c3667
-SIZE (czmq-2.2.0.tar.gz) = 558239
+SHA256 (czmq-3.0.2.tar.gz) = 8bca39ab69375fa4e981daf87b3feae85384d5b40cef6adbe9d5eb063357699a
+SIZE (czmq-3.0.2.tar.gz) = 818110

Added: head/net/czmq/files/patch-doc_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/czmq/files/patch-doc_Makefile.am	Tue Jun 16 10:40:32 2015	(r389831)
@@ -0,0 +1,22 @@
+# From 70a01b00cebcc4fbec0ffe31c26447d3810f488f Mon Sep 17 00:00:00 2001
+# From: Pieter Hintjens <ph at imatix.com>
+# Date: Tue, 16 Jun 2015 12:18:51 +0200
+# Subject: [PATCH] Problem: does not install man pages if BUILD_DOC is off
+# https://github.com/zeromq/czmq/pull/1027
+
+--- doc/Makefile.am.orig	2015-06-16 08:02:24 UTC
++++ doc/Makefile.am
+@@ -13,11 +13,12 @@ MAN_TXT += $(MAN7:%.7=%.txt)
+ 
+ EXTRA_DIST = asciidoc.conf $(MAN_TXT)
+ 
+-if BUILD_DOC
+ if INSTALL_MAN
+ dist_man_MANS = $(MAN_DOC)
+ endif
+ 
++if BUILD_DOC
++
+ MAINTAINERCLEANFILES = $(MAN_DOC)
+ 
+ dist-hook : $(MAN_DOC)

Modified: head/net/czmq/pkg-plist
==============================================================================
--- head/net/czmq/pkg-plist	Tue Jun 16 09:43:00 2015	(r389830)
+++ head/net/czmq/pkg-plist	Tue Jun 16 10:40:32 2015	(r389831)
@@ -1,18 +1,13 @@
-bin/build-android.gsl
-bin/build-autoconf.gsl
-bin/build-cmake.gsl
-bin/build-mingw32.gsl
-bin/build-vs2008.gsl
-bin/build-vs2010.gsl
-bin/build-vs2012.gsl
-bin/build-vs2013.gsl
-bin/czmq_selftest
 bin/makecert
-bin/project.gsl
 include/czmq.h
+include/czmq_library.h
 include/czmq_prelude.h
+include/zactor.h
+include/zarmour.h
 include/zauth.h
+include/zauth_v2.h
 include/zbeacon.h
+include/zbeacon_v2.h
 include/zcert.h
 include/zcertstore.h
 include/zchunk.h
@@ -24,16 +19,23 @@ include/zdir.h
 include/zdir_patch.h
 include/zfile.h
 include/zframe.h
+include/zgossip.h
 include/zhash.h
+include/zhashx.h
+include/ziflist.h
 include/zlist.h
-include/zlog.h
+include/zlistx.h
 include/zloop.h
 include/zmonitor.h
+include/zmonitor_v2.h
 include/zmsg.h
 include/zmutex.h
 include/zpoller.h
 include/zproxy.h
+include/zproxy_v2.h
 include/zrex.h
+include/zsock.h
+include/zsock_option.h
 include/zsocket.h
 include/zsockopt.h
 include/zstr.h
@@ -42,11 +44,16 @@ include/zthread.h
 include/zuuid.h
 lib/libczmq.a
 lib/libczmq.so
-lib/libczmq.so.1
-lib/libczmq.so.1.1.0
+lib/libczmq.so.3
+lib/libczmq.so.3.0.0
 libdata/pkgconfig/libczmq.pc
+man/man1/makecert.1.gz
+man/man3/zactor.3.gz
+man/man3/zarmour.3.gz
 man/man3/zauth.3.gz
+man/man3/zauth_v2.3.gz
 man/man3/zbeacon.3.gz
+man/man3/zbeacon_v2.3.gz
 man/man3/zcert.3.gz
 man/man3/zcertstore.3.gz
 man/man3/zchunk.3.gz
@@ -58,16 +65,23 @@ man/man3/zdir.3.gz
 man/man3/zdir_patch.3.gz
 man/man3/zfile.3.gz
 man/man3/zframe.3.gz
+man/man3/zgossip.3.gz
 man/man3/zhash.3.gz
+man/man3/zhashx.3.gz
+man/man3/ziflist.3.gz
 man/man3/zlist.3.gz
-man/man3/zlog.3.gz
+man/man3/zlistx.3.gz
 man/man3/zloop.3.gz
 man/man3/zmonitor.3.gz
+man/man3/zmonitor_v2.3.gz
 man/man3/zmsg.3.gz
 man/man3/zmutex.3.gz
 man/man3/zpoller.3.gz
 man/man3/zproxy.3.gz
+man/man3/zproxy_v2.3.gz
 man/man3/zrex.3.gz
+man/man3/zsock.3.gz
+man/man3/zsock_option.3.gz
 man/man3/zsocket.3.gz
 man/man3/zsockopt.3.gz
 man/man3/zstr.3.gz
