2 files changed, 18 insertions, 16 deletions

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 63f780ad9416..9c6f4dec1d80 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netxms
 PORTVERSION=	1.2.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netxms.org/download/ \
 		http://www.netxms.org/download/archive/
@@ -14,18 +14,23 @@ COMMENT=	Network monitoring system
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libjansson.so:${PORTSDIR}/devel/jansson \
+		libtre.so:${PORTSDIR}/textproc/libtre
+
 PORTSCOUT=	limit:^1\.
 
 OPTIONS_DEFINE=	SERVER CLIENT AGENT
 OPTIONS_DEFAULT=	CLIENT AGENT
-SERVER_ENABLED_MODULES=	MYSQL
-SERVER_DISABLED_MODULES=	PGSQL SQLITE ODBC
 OPTIONS_SINGLE=	SERVER
-OPTIONS_SINGLE_SERVER=	${SERVER_ENABLED_MODULES} ${SERVER_DISABLED_MODULES}
+OPTIONS_SINGLE_SERVER=	MYSQL PGSQL SQLITE ODBC
 OPTIONS_SUB=	yes
+
 SERVER_DESC=	Install NetXMS server & agent
 CLIENT_DESC=	Install NetXMS client
 AGENT_DESC=	Install NetXMS agent
+
 CLIENT_CONFIGURE_ON=	--with-client
 AGENT_CONFIGURE_ON=	--with-agent
 SERVER_CONFIGURE_ON=	--with-server
@@ -41,9 +46,7 @@ ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
 USE_OPENSSL=	yes
 USES=		gmake iconv libtool perl5
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-silent-rules \
-		--with-internal-libjansson \
-		--with-internal-libtre
+CONFIGURE_ARGS=	--disable-silent-rules
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index bbbbaa9be297..f7ed76070c7e 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -24,18 +24,12 @@
 lib/libnetxms.so
 lib/libnetxms.so.1
 lib/libnetxms.so.1.0.0
-lib/libnxexpat.so
-lib/libnxexpat.so.1
-lib/libnxexpat.so.1.0.0
-%%CLIENT%%lib/libnxtre.so
-%%CLIENT%%lib/libnxtre.so.5
 %%NXCP%%lib/libnxsqlite.so
 %%NXCP%%lib/libnxsqlite.so.1
 %%AGENT%%lib/libnxsqlite.so.1.0.0
 %%NXCP%%lib/libnxdb.so
 %%NXCP%%lib/libnxdb.so.1
 %%AGENT%%lib/libnxdb.so.1.0.0
-%%AGENT%%lib/libnxtre.so.5.0.0
 %%AGENT%%lib/netxms/devemu.nsm
 %%NXCP%%lib/libappagent.so
 %%NXCP%%lib/libappagent.so.1
@@ -46,9 +40,7 @@ lib/libnxexpat.so.1.0.0
 %%SERVER%%lib/libnsm_filemgr.so
 %%NXCP%%lib/libnsm_portcheck.so
 %%AGENT%%lib/libnsm_devemu.so
-%%AGENT%%lib/libnxjansson.so
-%%AGENT%%lib/libnxjansson.so.4
-%%AGENT%%lib/libnxjansson.so.4.6.0
+%%NXCP%%lib/libnsm_netsvc.so
 %%NXCP%%lib/libnxsd.so
 %%NXCP%%lib/libnxsd.so.1
 %%AGENT%%lib/libnxsd.so.1.0.0
@@ -92,6 +84,9 @@ lib/libnxexpat.so.1.0.0
 %%SERVER%%lib/libnxsms_nxagent.so
 %%SERVER%%lib/libnxsms_nxagent.so.1
 %%SERVER%%lib/libnxsms_nxagent.so.1.0.0
+%%SERVER%%lib/libnxsms_websms.so
+%%SERVER%%lib/libnxsms_websms.so.1
+%%SERVER%%lib/libnxsms_websms.so.1.0.0
 %%SERVER%%lib/libnxsnmp.so
 %%SERVER%%lib/libnxsnmp.so.1
 %%SERVER%%lib/libnxsnmp.so.1.0.0
@@ -101,7 +96,9 @@ lib/libnxexpat.so.1.0.0
 %%NXCP%%lib/netxms/dbquery.nsm
 %%NXCP%%lib/netxms/ecs.nsm
 %%NXCP%%lib/netxms/freebsd.nsm
+%%SERVER%%lib/netxms/jira.hdlink
 %%NXCP%%lib/netxms/logwatch.nsm
+%%NXCP%%lib/netxms/netsvc.nsm
 %%NXCP%%lib/netxms/ping.nsm
 %%NXCP%%lib/netxms/portcheck.nsm
 %%NXCP%%lib/netxms/sms.nsm
@@ -595,3 +592,5 @@ lib/libnxexpat.so.1.0.0
 %%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql
 %%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql
 %%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql
+@owner
+@group