3 files changed, 55 insertions, 38 deletions
diff --git a/zeromq/Makefile b/zeromq/Makefile
index 4270f36..535fd82 100644
--- a/zeromq/Makefile
+++ b/zeromq/Makefile
@@ -1,4 +1,6 @@
-include /usr/share/cibs/rules/ips.mk
+package ?= ips
+
+include /usr/share/cibs/rules/$(package).mk
 include /usr/share/cibs/rules/archive.mk
 include /usr/share/cibs/rules/autotools.mk
 include /usr/share/cibs/rules/64.mk
@@ -23,11 +25,12 @@ configure-options += --with-system-pgm
 
 home     := http://www.zeromq.org
 name     := zeromq
-version  := 2.2.0
+version  := 3.2.2
 archive  := $(name)-$(version).tar.gz
 download := http://download.zeromq.org/$(archive)
-checksum := \
-     md5:1b11aae09b19d18276d0717b2ea288f6 \
-    sha1:e4bc024c33d3e62f658640625e061ce4e8bd1ff1 \
-  sha256:43904aeb9ea6844f72ca02e4e53bf1d481a1a0264e64979da761464e88604637 \
-    size:1900378
+checksum-zeromq-3.2.2.tar.gz := \
+     md5:df68431d9300da84a1a5f9a2784e33de \
+    sha1:0e8734c773b6a757b474c16fc3c517993ba47283 \
+  sha256:2b4eeda60fe47a9fa0804d53d76f656665c5f84dab7e63a1d496d9430b554f99 \
+    size:2067590
+
diff --git a/zeromq/libzmq.p5m b/zeromq/libzmq.p5m
index 0b547b2..437ab70 100644
--- a/zeromq/libzmq.p5m
+++ b/zeromq/libzmq.p5m
@@ -5,41 +5,55 @@ set name=info.source-url value="$(download)"
 
 license $(license-file)  license="$(license)"
 
-depend fmri=pkg:/library/libzmq1@$(ips-version) type=require
-depend fmri=pkg:/library/libzmq1@$(ips-version) type=incorporate
+depend fmri=pkg:/library/libzmq3@$(ips-version) type=require
+depend fmri=pkg:/library/libzmq3@$(ips-version) type=incorporate
 
-file path=usr/include/zmq.h
-file path=usr/include/zmq.hpp
-file path=usr/include/zmq_utils.h
 file path=usr/lib/$(mach64)/pkgconfig/libzmq.pc
+link path=usr/lib/$(mach64)/libzmq.so target=libzmq.so.3
+
+file path=usr/include/zmq_utils.h
+file path=usr/include/zmq.h
+
+file path=usr/share/man/man7/zmq_pgm.7
+file path=usr/share/man/man7/zmq_ipc.7
+file path=usr/share/man/man7/zmq_inproc.7
+file path=usr/share/man/man7/zmq.7
+file path=usr/share/man/man7/zmq_epgm.7
+file path=usr/share/man/man7/zmq_tcp.7
+file path=usr/share/man/man3/zmq_msg_init_data.3
+file path=usr/share/man/man3/zmq_msg_init.3
+file path=usr/share/man/man3/zmq_msg_get.3
+file path=usr/share/man/man3/zmq_sendmsg.3
+file path=usr/share/man/man3/zmq_msg_size.3
+file path=usr/share/man/man3/zmq_msg_more.3
+file path=usr/share/man/man3/zmq_socket.3
+file path=usr/share/man/man3/zmq_msg_move.3
 file path=usr/share/man/man3/zmq_bind.3
-file path=usr/share/man/man3/zmq_close.3
-file path=usr/share/man/man3/zmq_connect.3
-file path=usr/share/man/man3/zmq_device.3
-file path=usr/share/man/man3/zmq_errno.3
-file path=usr/share/man/man3/zmq_getsockopt.3
 file path=usr/share/man/man3/zmq_init.3
+file path=usr/share/man/man3/zmq_proxy.3
+file path=usr/share/man/man3/zmq_msg_set.3
+file path=usr/share/man/man3/zmq_version.3
+file path=usr/share/man/man3/zmq_errno.3
+file path=usr/share/man/man3/zmq_close.3
+file path=usr/share/man/man3/zmq_setsockopt.3
+file path=usr/share/man/man3/zmq_ctx_destroy.3
 file path=usr/share/man/man3/zmq_msg_close.3
+file path=usr/share/man/man3/zmq_recv.3
+file path=usr/share/man/man3/zmq_msg_send.3
+file path=usr/share/man/man3/zmq_ctx_get.3
+file path=usr/share/man/man3/zmq_unbind.3
 file path=usr/share/man/man3/zmq_msg_copy.3
+file path=usr/share/man/man3/zmq_connect.3
 file path=usr/share/man/man3/zmq_msg_data.3
-file path=usr/share/man/man3/zmq_msg_init.3
-file path=usr/share/man/man3/zmq_msg_init_data.3
-file path=usr/share/man/man3/zmq_msg_init_size.3
-file path=usr/share/man/man3/zmq_msg_move.3
-file path=usr/share/man/man3/zmq_msg_size.3
 file path=usr/share/man/man3/zmq_poll.3
-file path=usr/share/man/man3/zmq_recv.3
-file path=usr/share/man/man3/zmq_send.3
-file path=usr/share/man/man3/zmq_setsockopt.3
-file path=usr/share/man/man3/zmq_socket.3
+file path=usr/share/man/man3/zmq_recvmsg.3
+file path=usr/share/man/man3/zmq_disconnect.3
 file path=usr/share/man/man3/zmq_strerror.3
+file path=usr/share/man/man3/zmq_msg_recv.3
+file path=usr/share/man/man3/zmq_ctx_set.3
+file path=usr/share/man/man3/zmq_ctx_new.3
+file path=usr/share/man/man3/zmq_send.3
+file path=usr/share/man/man3/zmq_msg_init_size.3
 file path=usr/share/man/man3/zmq_term.3
-file path=usr/share/man/man3/zmq_version.3
-file path=usr/share/man/man7/zmq.7
-file path=usr/share/man/man7/zmq_cpp.7
-file path=usr/share/man/man7/zmq_epgm.7
-file path=usr/share/man/man7/zmq_inproc.7
-file path=usr/share/man/man7/zmq_ipc.7
-file path=usr/share/man/man7/zmq_pgm.7
-file path=usr/share/man/man7/zmq_tcp.7
-link path=usr/lib/$(mach64)/libzmq.so target=libzmq.so.1
+file path=usr/share/man/man3/zmq_socket_monitor.3
+file path=usr/share/man/man3/zmq_getsockopt.3
diff --git a/zeromq/libzmq1.p5m b/zeromq/libzmq3.p5m
index 3f23d45..4d0e901 100644
--- a/zeromq/libzmq1.p5m
+++ b/zeromq/libzmq3.p5m
@@ -1,9 +1,9 @@
-set name=pkg.fmri value=pkg:/library/libzmq1@$(ips-version)
+set name=pkg.fmri value=pkg:/library/libzmq3@$(ips-version)
 set name=pkg.summary value="$(summary), shared library"
 set name=info.upstream-url value="$(home)"
 set name=info.source-url value="$(download)"
 
 license $(license-file)  license="$(license)"
 
-file path=usr/lib/$(mach64)/libzmq.so.1.0.1
-link path=usr/lib/$(mach64)/libzmq.so.1 target=libzmq.so.1.0.1
+file path=usr/lib/$(mach64)/libzmq.so.3.0.0
+link path=usr/lib/$(mach64)/libzmq.so.3 target=libzmq.so.3.0.0