2 files changed, 40 insertions, 42 deletions

diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile
index aa2d972f8f00..2b917324f1d4 100644
--- a/devel/libxs/Makefile
+++ b/devel/libxs/Makefile
@@ -10,8 +10,10 @@ MASTER_SITES=	http://download.crossroads.io/
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Open source lightweight messaging layer
 
+LICENSE=	GPLv3
+
 GNU_CONFIGURE=	yes
-USES=	pathfix pkgconfig
+USES=	pathfix pkgconfig libtool
 USE_LDCONFIG=	yes
 USE_GCC=	yes
 
@@ -24,7 +26,6 @@ OPTIONS_RADIO=		PGM
 OPTIONS_RADIO_PGM=	INTERNAL EXTERNAL
 OPTIONS_DEFAULT=PLUGINS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -32,46 +33,10 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
+BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 		xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml
 
-MAN3=	\
-	xs_bind.3 \
-	xs_close.3 \
-	xs_connect.3 \
-	xs_errno.3 \
-	xs_getmsgopt.3 \
-	xs_getsockopt.3 \
-	xs_init.3 \
-	xs_msg_close.3 \
-	xs_msg_copy.3 \
-	xs_msg_data.3 \
-	xs_msg_init.3 \
-	xs_msg_init_data.3 \
-	xs_msg_init_size.3 \
-	xs_msg_move.3 \
-	xs_msg_size.3 \
-	xs_poll.3 \
-	xs_recv.3 \
-	xs_recvmsg.3 \
-	xs_send.3 \
-	xs_sendmsg.3 \
-	xs_setctxopt.3 \
-	xs_setsockopt.3 \
-	xs_shutdown.3 \
-	xs_socket.3 \
-	xs_strerror.3 \
-	xs_term.3 \
-	xs_version.3
-
-MAN7=	\
-	xs.7 \
-	xs_inproc.7 \
-	xs_ipc.7 \
-	xs_pgm.7 \
-	xs_tcp.7 \
-	xs_zmq.7
 .else
 CONFIGURE_ARGS+=	--without-documentation
 .endif
@@ -84,7 +49,7 @@ CFLAGS+=		-fPIC
 
 .if ${PORT_OPTIONS:MEXTERNAL}
 CONFIGURE_ARGS+=	--with-system-pgm
-LIB_DEPENDS+=		pgm:${PORTSDIR}/net/openpgm
+LIB_DEPENDS+=		libpgm.so:${PORTSDIR}/net/openpgm
 .endif
 
 .if ${PORT_OPTIONS:MPLUGINS}
diff --git a/devel/libxs/pkg-plist b/devel/libxs/pkg-plist
index 77085e8c042b..4992ff83dfb6 100644
--- a/devel/libxs/pkg-plist
+++ b/devel/libxs/pkg-plist
@@ -1,14 +1,47 @@
 %%ZMQ%%include/zmq.h
 %%ZMQ%%include/zmq_utils.h
 %%ZMQ%%lib/libzmq.a
-%%ZMQ%%lib/libzmq.la
 %%ZMQ%%lib/libzmq.so
 %%ZMQ%%lib/libzmq.so.1
+%%ZMQ%%lib/libzmq.so.1.0.0
 %%ZMQ%%libdata/pkgconfig/libzmq.pc
 include/xs/xs.h
 lib/libxs.a
-lib/libxs.la
 lib/libxs.so
 lib/libxs.so.2
+lib/libxs.so.2.0.0
 libdata/pkgconfig/libxs.pc
+%%PORTDOCS%%man/man3/xs_bind.3.gz
+%%PORTDOCS%%man/man3/xs_close.3.gz
+%%PORTDOCS%%man/man3/xs_connect.3.gz
+%%PORTDOCS%%man/man3/xs_errno.3.gz
+%%PORTDOCS%%man/man3/xs_getmsgopt.3.gz
+%%PORTDOCS%%man/man3/xs_getsockopt.3.gz
+%%PORTDOCS%%man/man3/xs_init.3.gz
+%%PORTDOCS%%man/man3/xs_msg_close.3.gz
+%%PORTDOCS%%man/man3/xs_msg_copy.3.gz
+%%PORTDOCS%%man/man3/xs_msg_data.3.gz
+%%PORTDOCS%%man/man3/xs_msg_init.3.gz
+%%PORTDOCS%%man/man3/xs_msg_init_data.3.gz
+%%PORTDOCS%%man/man3/xs_msg_init_size.3.gz
+%%PORTDOCS%%man/man3/xs_msg_move.3.gz
+%%PORTDOCS%%man/man3/xs_msg_size.3.gz
+%%PORTDOCS%%man/man3/xs_poll.3.gz
+%%PORTDOCS%%man/man3/xs_recv.3.gz
+%%PORTDOCS%%man/man3/xs_recvmsg.3.gz
+%%PORTDOCS%%man/man3/xs_send.3.gz
+%%PORTDOCS%%man/man3/xs_sendmsg.3.gz
+%%PORTDOCS%%man/man3/xs_setctxopt.3.gz
+%%PORTDOCS%%man/man3/xs_setsockopt.3.gz
+%%PORTDOCS%%man/man3/xs_shutdown.3.gz
+%%PORTDOCS%%man/man3/xs_socket.3.gz
+%%PORTDOCS%%man/man3/xs_strerror.3.gz
+%%PORTDOCS%%man/man3/xs_term.3.gz
+%%PORTDOCS%%man/man3/xs_version.3.gz
+%%PORTDOCS%%man/man7/xs.7.gz
+%%PORTDOCS%%man/man7/xs_inproc.7.gz
+%%PORTDOCS%%man/man7/xs_ipc.7.gz
+%%PORTDOCS%%man/man7/xs_pgm.7.gz
+%%PORTDOCS%%man/man7/xs_tcp.7.gz
+%%PORTDOCS%%man/man7/xs_zmq.7.gz
 @dirrm include/xs