3 files changed, 52 insertions, 37 deletions

diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 177da0037a57..e171bddadc8c 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -6,23 +6,15 @@
 #
 
 PORTNAME=	netxms
-PORTVERSION=	0.2.24
+PORTVERSION=	1.0.12
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netxms.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	NetXMS - network monitoring system
+COMMENT=	Network monitoring system
 
-BROKEN=	does not compile with gcc 4.2 && Does not fetch
-
-NO_PACKAGE=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
-USE_ICONV=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
 
 OPTIONS=	SERVER "Install NetXMS server & agent" off \
 		CLIENT "Install NetXMS client" on \
@@ -33,6 +25,20 @@ OPTIONS=	SERVER "Install NetXMS server & agent" off \
 		SQLITE "Enable SQLITE support" off \
 		ODBC "Enable ODBC support" off
 
+NO_PACKAGE=	yes
+
+USE_PERL5=	yes
+USE_OPENSSL=	yes
+USE_ICONV=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-silent-rules
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 NETXMS_OWN=	netxms
 NETXMS_GRP=	netxms
 
@@ -140,37 +146,30 @@ pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 	                ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .if defined(WITH_SERVER)
-	@if [ ! -f ${PREFIX}/etc/netxmsd.conf-dist ]; then \
-	        ${CP} -p ${WRKSRC}/contrib/netxmsd.conf-dist ${PREFIX}/etc/netxmsd.conf-dist ; \
-	fi
+.if !exists(${PREFIX}/etc/netxmsd.conf-dist)
+	${INSTALL_DATA} ${WRKSRC}/contrib/netxmsd.conf-dist ${PREFIX}/etc
+	${CHOWN} ${NETXMS_OWN}:${NETXMS_GRP} ${PREFIX}/etc/netxmsd.conf-dist
+.endif
 .endif
 .if defined(WITH_SERVER) || !defined(WITHOUT_AGENT)
-	@if [ ! -f ${PREFIX}/etc/nxagentd.conf-dist ]; then \
-	        ${CP} -p ${WRKSRC}/contrib/nxagentd.conf-dist ${PREFIX}/etc/nxagentd.conf-dist ; \
-	fi
+.if !exists(${PREFIX}/etc/nxagentd.conf-dist)
+	${INSTALL_DATA} ${WRKSRC}/contrib/nxagentd.conf-dist ${PREFIX}/etc
+	${CHOWN} ${NETXMS_OWN}:${NETXMS_GRP} ${PREFIX}/etc/nxagentd.conf-dist
+.endif
 .endif
 .if defined(WITH_NXHTTPD)
-	@if [ ! -f ${PREFIX}/etc/nxhttpd.conf-dist ]; then \
-	        ${CP} -p ${WRKSRC}/contrib/nxhttpd.conf-dist ${PREFIX}/etc/nxhttpd.conf-dist ; \
-	fi
+.if !exists(${PREFIX}/etc/nxhttpd.conf-dist)
+	${INSTALL_DATA} ${WRKSRC}/contrib/nxhttpd.conf-dist ${PREFIX}/etc
+	${CHOWN} ${NETXMS_OWN}:${NETXMS_GRP} ${PREFIX}/etc/nxhttpd.conf-dist
+.endif
 .endif
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-	                ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
-.if defined(WITH_SERVER)
-			${CHOWN} ${NETXMS_OWN}:${NETXMS_GRP} ${PREFIX}/etc/netxmsd.conf-dist
-			${CHOWN} ${NETXMS_OWN}:${NETXMS_GRP} ${PREFIX}/etc/nxagentd.conf-dist
-.endif
-.if defined(WITH_AGENT)
-			${CHOWN} ${NETXMS_OWN}:${NETXMS_GRP} ${PREFIX}/etc/nxagentd.conf-dist
-.endif
-.if defined(WITH_NXHTTPD)
-			${CHOWN} ${NETXMS_OWN}:${NETXMS_GRP} ${PREFIX}/etc/nxhttpd.conf-dist
-.endif
+		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 
 post-deinstall:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-	                ${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL
+		${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/netxms/distinfo b/net-mgmt/netxms/distinfo
index 2b74a9403df0..e999a347f5db 100644
--- a/net-mgmt/netxms/distinfo
+++ b/net-mgmt/netxms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netxms-0.2.24.tar.gz) = 9df9169aacd350302202f9cf371aad02a7804b72d3c2b9d47cbc1ee08ed8afad
-SIZE (netxms-0.2.24.tar.gz) = 6390751
+SHA256 (netxms-1.0.12.tar.gz) = f702286629a2838aa849e5ffc7fce14454ed84be4d121709a4b4f3590eedc755
+SIZE (netxms-1.0.12.tar.gz) = 6932665
diff --git a/net-mgmt/netxms/pkg-plist b/net-mgmt/netxms/pkg-plist
index b101dbc939d5..8f0a028b5cb1 100644
--- a/net-mgmt/netxms/pkg-plist
+++ b/net-mgmt/netxms/pkg-plist
@@ -7,12 +7,12 @@
 %%CLIENT%%bin/nxcmd
 %%NXCPTEST%%bin/nxcptest
 %%SERVER%%bin/nxdbmgr
+%%SERVER%%bin/nxencpasswd
 %%CLIENT%%bin/nxevent
 %%SERVER%%bin/nxget
 %%NXHTTPD%%bin/nxhttpd
 %%SERVER%%bin/nxmibc
 %%CLIENT%%bin/nxpush
-%%CLIENT%%bin/nxreport
 %%SERVER%%bin/nxscript
 %%CLIENT%%bin/nxsms
 %%SERVER%%bin/nxsnmpget
@@ -26,6 +26,9 @@
 lib/libnetxms.la
 lib/libnetxms.so
 lib/libnetxms.so.0
+lib/libnxsqlite.la
+lib/libnxsqlite.so
+lib/libnxsqlite.so.0
 %%SERVER%%lib/libnsm_ecs.la
 %%SERVER%%lib/libnsm_ecs.so
 %%SERVER%%lib/libnsm_ecs.so.0
@@ -148,6 +151,8 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/images/zone.ico
 %%SERVER%%%%DATADIR%%/images/zone.png
 %%SERVER%%%%DATADIR%%/mibs/ARCADA-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/ASTERISK-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/BAY-STACK-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BGP4-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BN-IF-EXTENSIONS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/BRIDGE-MIB.txt
@@ -169,8 +174,10 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/mibs/COSINE-GLOBAL-REG.txt
 %%SERVER%%%%DATADIR%%/mibs/COSINE-InVision-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/COSINE-ORION-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/DIGIUM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DS1-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/DS3-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/EMBEDDED-NGX-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/ENTITY-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/FIBRE-CHANNEL-FE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/HOST-RESOURCES-MIB.txt
@@ -205,13 +212,15 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VPN-MON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VR-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETSCREEN-VSYS-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/NetWare-Server-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/NETWORK-APPLIANCE-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NOKIA-IPSO-REGISTRATION-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/NOKIA-IPSO-SYSTEM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/OPTIMUX-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/OSPF-MIB.txt
-%%SERVER%%%%DATADIR%%/PIM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/P-BRIDGE-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/PIM-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PerfHist-TC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/PowerNet-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/Printer-MIB.txt
@@ -224,6 +233,7 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/mibs/RMON-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RMON2-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/RS-232-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/S5-AGENT-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-CHASSIS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-CHASSIS-TRAP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/S5-ETH-MULTISEG-TOPOLOGY-MIB.txt
@@ -261,6 +271,7 @@ lib/libnetxms.so.0
 %%SERVER%%%%DATADIR%%/mibs/UPS-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/USEC-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/V2ADMIN-MIB.txt
+%%SERVER%%%%DATADIR%%/mibs/VRRP-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/WF-COM.txt
 %%SERVER%%%%DATADIR%%/mibs/WWW-MIB.txt
 %%SERVER%%%%DATADIR%%/mibs/netxms.mib
@@ -344,10 +355,15 @@ lib/libnetxms.so.0
 %%NXHTTPD%%%%DATADIR%%/nxhttpd/xmlextras.js
 %%NXHTTPD%%%%DATADIR%%/nxhttpd/xtree.js
 %%SERVER%%%%DATADIR%%/sql/dbinit_mssql.sql
+%%SERVER%%%%DATADIR%%/sql/dbschema_mssql.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_mysql.sql
+%%SERVER%%%%DATADIR%%/sql/dbschema_mysql.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_oracle.sql
+%%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_pgsql.sql
+%%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql
 %%SERVER%%%%DATADIR%%/sql/dbinit_sqlite.sql
+%%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql
 %%SERVER%%@dirrmtry %%DATADIR%%/sql
 %%NXHTTPD%%@dirrmtry %%DATADIR%%/nxhttpd/images/status
 %%NXHTTPD%%@dirrmtry %%DATADIR%%/nxhttpd/images/objects