7 files changed, 71 insertions, 34 deletions

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index e03c2dd82d9b..93b895724971 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netxms
-PORTVERSION=	0.2.18.2
+PORTVERSION=	0.2.19
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netxms.org/download/
 
@@ -16,21 +16,20 @@ COMMENT=	NetXMS - network monitoring system
 NO_PACKAGE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-USE_GCC=	3.4
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 
 OPTIONS=	SERVER "Install NetXMS server & agent" off\
 		CLIENT "Install NetXMS client" off \
 		AGENT "Install NetXMS agent" off \
 		NXHTTPD "Install web-interface" off \
 		MYSQL "Enable MySQL support" off \
-		PGSQL "Enable PostgreSQL support" off
+		PGSQL "Enable PostgreSQL support" off \
+		SQLITE "Enable SQLITE support" off \
+		ODBC "Enable ODBC support" off
 
 NETXMS_OWN=	netxms
 NETXMS_GRP=	netxms
@@ -39,21 +38,36 @@ NETXMS_GRP=	netxms
 
 SUB_FILES=	pkg-install	pkg-deinstall
 
-.if !defined(WITH_SERVER)
-.if defined(WITH_MYSQL) || !defined(WITHOUT_PGSQL)
-IGNORE=	is useless database support without a SERVER. Please (re)run 'make config' and choose SERVER with database
+.if defined(WITH_SERVER) || defined(WITH_CLIENT) || defined(WITH_NXHTTPD)
+PLIST_SUB+=	NXMAP=""
+.else
+PLIST_SUB+=	NXMAP="@comment "
 .endif
+
+.if defined(WITH_CLIENT) || defined(WITH_NXHTTPD)
+PLIST_SUB+=	NXCL=""
+.else
+PLIST_SUB+=	NXCL="@comment "
 .endif
 
-.if defined(WITH_SERVER)
-.if defined(WITHOUT_MYSQL) && !defined(WITH_PGSQL)
-IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
+.if !defined(WITH_SERVER)
+PLIST_SUB+=	SERVER="@comment "
+.if defined(WITH_MYSQL) || !defined(WITHOUT_PGSQL) || !defined(WITHOUT_SQLITE) || !defined(WITHOUT_ODBC)
+IGNORE=	is useless database support without a SERVER. Please (re)run 'make config' and choose SERVER with database
 .endif
-USE_RC_SUBR+=	netxmsd	nxagentd
+.else
 CONFIGURE_ARGS+=	--with-server
 PLIST_SUB+=	SERVER=""
+.if defined(WITHOUT_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) && !defined(WITH_ODBC)
+IGNORE=	is useless without a database. Please (re)run 'make config' and choose database support
+.else
+USE_RC_SUBR+=	netxmsd
+.if defined(WITH_AGENT)
+PLIST_SUB+=	AGENT="@comment "
 .else
-PLIST_SUB+=	SERVER="@comment "	AGENT="@comment "
+USE_RC_SUBR+=	nxagentd
+.endif
+.endif
 .endif
 
 .if defined(WITH_CLIENT)
@@ -64,9 +78,6 @@ PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if defined(WITH_AGENT)
-.if defined(WITH_SERVER)
-IGNORE=	is useles AGENT or SERVER. Please (re)run 'make config' and choose one of AGENT and SERVER (server already include agent)
-.endif
 USE_RC_SUBR+=	nxagentd
 CONFIGURE_ARGS+=	--with-agent
 PLIST_SUB+=	AGENT=""
@@ -78,7 +89,7 @@ PLIST_SUB+=	AGENT="@comment "
 USE_RC_SUBR+=	nxhttpd
 CONFIGURE_ARGS+=	--with-nxhttpd
 PLIST_SUB+=	NXHTTPD=""
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 .else
 PLIST_SUB+=	NXHTTPD="@comment "
 .endif
@@ -99,6 +110,22 @@ USE_PGSQL=	yes
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
+.if defined(WITH_SQLITE)
+CONFIGURE_ARGS+=	--with-sqlite
+PLIST_SUB+=	SQLITE=""
+USE_SQLITE=	yes
+.else
+PLIST_SUB+=	SQLITE="@comment "
+.endif
+
+.if defined(WITH_ODBC)
+CONFIGURE_ARGS+=	--with-odbc
+PLIST_SUB+=	ODBC=""
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+.else
+PLIST_SUB+=	ODBC="@comment "
+.endif
+
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 	                ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
diff --git a/net-mgmt/netxms/distinfo b/net-mgmt/netxms/distinfo
index 4983201aa908..2fda8ceb427f 100644
--- a/net-mgmt/netxms/distinfo
+++ b/net-mgmt/netxms/distinfo
@@ -1,3 +1,3 @@
-MD5 (netxms-0.2.18.2.tar.gz) = a602c248557a1b43673dad30ca145a64
-SHA256 (netxms-0.2.18.2.tar.gz) = 76e627ea0738cce895baa8099055c837a8cc4746476c24e5188979edbacb04c4
-SIZE (netxms-0.2.18.2.tar.gz) = 4749998
+MD5 (netxms-0.2.19.tar.gz) = 6c5bb9693d4daea491685f13ee056aa6
+SHA256 (netxms-0.2.19.tar.gz) = a183c8a6d4c414cfe8f7eb3703f4b59425ab9f141706a22c166b784660197b3a
+SIZE (netxms-0.2.19.tar.gz) = 5131838
diff --git a/net-mgmt/netxms/files/netxmsd.in b/net-mgmt/netxms/files/netxmsd.in
index 99b4adf42711..20da01fc1e0d 100644
--- a/net-mgmt/netxms/files/netxmsd.in
+++ b/net-mgmt/netxms/files/netxmsd.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: netxmsd
-# REQUIRE: mysql postgresql
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 #
diff --git a/net-mgmt/netxms/files/nxagentd.in b/net-mgmt/netxms/files/nxagentd.in
index dc5244541bd6..d5623a7bf3b6 100644
--- a/net-mgmt/netxms/files/nxagentd.in
+++ b/net-mgmt/netxms/files/nxagentd.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: nxagentd
-# REQUIRE: LOGIN
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 #
diff --git a/net-mgmt/netxms/files/nxhttpd.in b/net-mgmt/netxms/files/nxhttpd.in
index 0039c834ec4d..9034ff262602 100644
--- a/net-mgmt/netxms/files/nxhttpd.in
+++ b/net-mgmt/netxms/files/nxhttpd.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: nxhttpd
-# REQUIRE: LOGIN
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 #
diff --git a/net-mgmt/netxms/pkg-descr b/net-mgmt/netxms/pkg-descr
index 2fac11660e80..d8338b137fa0 100644
--- a/net-mgmt/netxms/pkg-descr
+++ b/net-mgmt/netxms/pkg-descr
@@ -7,6 +7,3 @@ reliable and powerful monitoring system, enabling you
 to improve your network availability and service levels.
 
 WWW: http://www.netxms.org/
-
-- Vladimir Ermakov
-samflanker@gmail.com
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index 77dfb06eabc4..1a779adb16ac 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -38,6 +38,9 @@ lib/libnetxms.so.0
 %%SERVER%%lib/libnsm_skeleton.la
 %%SERVER%%lib/libnsm_skeleton.so
 %%SERVER%%lib/libnsm_skeleton.so.0
+%%SERVER%%lib/libnsm_sms.la
+%%SERVER%%lib/libnsm_sms.so
+%%SERVER%%lib/libnsm_sms.so.0
 %%SERVER%%lib/libnsm_ups.la
 %%SERVER%%lib/libnsm_ups.so
 %%SERVER%%lib/libnsm_ups.so.0
@@ -56,30 +59,42 @@ lib/libnetxms.so.0
 %%AGENT%%lib/libnsm_skeleton.la
 %%AGENT%%lib/libnsm_skeleton.so
 %%AGENT%%lib/libnsm_skeleton.so.0
+%%AGENT%%lib/libnsm_sms.la
+%%AGENT%%lib/libnsm_sms.so
+%%AGENT%%lib/libnsm_sms.so.0
 %%AGENT%%lib/libnsm_ups.la
 %%AGENT%%lib/libnsm_ups.so
 %%AGENT%%lib/libnsm_ups.so.0
-%%CLIENT%%lib/libnxcl.la
-%%CLIENT%%lib/libnxcl.so
-%%CLIENT%%lib/libnxcl.so.0
+%%NXCL%%lib/libnxcl.la
+%%NXCL%%lib/libnxcl.so
+%%NXCL%%lib/libnxcl.so.0
 %%SERVER%%lib/libnxcore.la
 %%SERVER%%lib/libnxcore.so
 %%SERVER%%lib/libnxcore.so.0
 %%MYSQL%%lib/libnxddr_mysql.la
 %%MYSQL%%lib/libnxddr_mysql.so
 %%MYSQL%%lib/libnxddr_mysql.so.0
+%%ODBC%%lib/libnxddr_odbc.la
+%%ODBC%%lib/libnxddr_odbc.so
+%%ODBC%%lib/libnxddr_odbc.so.0
 %%PGSQL%%lib/libnxddr_pgsql.la
 %%PGSQL%%lib/libnxddr_pgsql.so
 %%PGSQL%%lib/libnxddr_pgsql.so.0
-%%SERVER%%lib/libnxmap.la
-%%SERVER%%lib/libnxmap.so
-%%SERVER%%lib/libnxmap.so.0
+%%SQLITE%%lib/libnxddr_sqlite.la
+%%SQLITE%%lib/libnxddr_sqlite.so
+%%SQLITE%%lib/libnxddr_sqlite.so.0
+%%NXMAP%%lib/libnxmap.la
+%%NXMAP%%lib/libnxmap.so
+%%NXMAP%%lib/libnxmap.so.0
 %%SERVER%%lib/libnxsl.la
 %%SERVER%%lib/libnxsl.so
 %%SERVER%%lib/libnxsl.so.0
 %%SERVER%%lib/libnxsms_generic.la
 %%SERVER%%lib/libnxsms_generic.so
 %%SERVER%%lib/libnxsms_generic.so.0
+%%SERVER%%lib/libnxsms_nxagent.la
+%%SERVER%%lib/libnxsms_nxagent.so
+%%SERVER%%lib/libnxsms_nxagent.so.0
 %%SERVER%%lib/libnxsnmp.la
 %%SERVER%%lib/libnxsnmp.so
 %%SERVER%%lib/libnxsnmp.so.0
@@ -324,5 +339,3 @@ lib/libnetxms.so.0
 %%SERVER%%@dirrmtry %%DATADIR%%/images
 %%SERVER%%@dirrmtry %%DATADIR%%/backgrounds
 @dirrmtry %%DATADIR%%
-share/nls/POSIX
-share/nls/en_US.US-ASCII