net-mgmt/netxms: UNBREAK

- Update version 1.2.16=>1.2.17
- Fix patch files to reflect 'make makepatch'
This commit is contained in:
Muhammad Moinur Rahman 2015-05-30 11:35:33 +00:00
parent 562e70a3f9
commit e61f270c6e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=387925
6 changed files with 66 additions and 26 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= netxms
PORTVERSION= 1.2.16
PORTVERSION= 1.2.17
CATEGORIES= net-mgmt
MASTER_SITES= http://www.netxms.org/download/ \
http://www.netxms.org/download/archive/
@ -13,9 +13,7 @@ COMMENT= Network monitoring system
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
BROKEN= Fails to package
DEPRECATED= Broken for more than 6 months
EXPIRATION_DATE= 2015-05-26
PORTSCOUT= limit:^1\.
OPTIONS_DEFINE= SERVER CLIENT AGENT
OPTIONS_DEFAULT= CLIENT AGENT
@ -23,9 +21,21 @@ SERVER_ENABLED_MODULES= MYSQL
SERVER_DISABLED_MODULES= PGSQL SQLITE ODBC
OPTIONS_SINGLE= SERVER
OPTIONS_SINGLE_SERVER= ${SERVER_ENABLED_MODULES} ${SERVER_DISABLED_MODULES}
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
MYSQL_CONFIGURE_ON= --with-mysql
MYSQL_USE= MYSQL=yes
PGSQL_CONFIGURE_ON= --with-pgsql
PGSQL_USES= pgsql
SQLITE_CONFIGURE_ON= --with-sqlite
SQLITE_USE= SQLITE=yes
ODBC_CONFIGURE_ON= --with-odbc
ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC
USE_OPENSSL= yes
USES= gmake iconv libtool perl5

View File

@ -1,2 +1,2 @@
SHA256 (netxms-1.2.16.tar.gz) = 708e7adf47db2cfee2f88e7439575ed947c291d6c44b7a34f81cad0a17ffb940
SIZE (netxms-1.2.16.tar.gz) = 10275424
SHA256 (netxms-1.2.17.tar.gz) = 76e325c6889f1fe9d76fed4ab026203764acf45224a6bcb9fcdd6d939a89d9e4
SIZE (netxms-1.2.17.tar.gz) = 10592536

View File

@ -1,6 +1,6 @@
--- src/agent/subagents/freebsd/freebsd.cpp.orig 2014-10-02 16:57:50.000000000 +0400
+++ src/agent/subagents/freebsd/freebsd.cpp 2014-10-02 16:58:48.000000000 +0400
@@ -48,14 +48,14 @@
--- src/agent/subagents/freebsd/freebsd.cpp.orig 2013-12-25 15:01:05 UTC
+++ src/agent/subagents/freebsd/freebsd.cpp
@@ -48,14 +48,14 @@ static NETXMS_SUBAGENT_PARAM m_parameter
{ _T("FileSystem.UsedPerc(*)"), H_DiskInfo, (const TCHAR *)DISK_USED_PERC, DCI_DT_FLOAT, DCIDESC_FS_USEDPERC },
{ _T("Net.Interface.AdminStatus(*)"), H_NetIfAdmStatus, NULL, DCI_DT_INT, DCIDESC_NET_INTERFACE_ADMINSTATUS },

View File

@ -1,5 +1,5 @@
--- src/agent/subagents/freebsd/net.cpp.orig 2014-10-02 16:54:48.000000000 +0400
+++ src/agent/subagents/freebsd/net.cpp 2014-10-02 17:19:53.000000000 +0400
--- src/agent/subagents/freebsd/net.cpp.orig 2013-12-25 15:01:05 UTC
+++ src/agent/subagents/freebsd/net.cpp
@@ -32,7 +32,6 @@
#include <net/if_media.h>
#include <net/if_dl.h>
@ -18,7 +18,7 @@
#include "net.h"
@@ -60,14 +58,6 @@
@@ -60,14 +58,6 @@ typedef struct t_IfList
int index;
} IFLIST;
@ -33,7 +33,7 @@
LONG H_NetIpForwarding(const TCHAR *pszParam, const TCHAR *pArg, TCHAR *pValue)
{
int nVer = CAST_FROM_POINTER(pArg, int);
@@ -568,94 +558,66 @@
@@ -568,94 +558,66 @@ LONG H_NetIfList(const TCHAR *pszParam,
return nRet;
}

View File

@ -1,6 +1,6 @@
--- src/agent/subagents/freebsd/net.h.orig 2014-10-02 16:59:04.000000000 +0400
+++ src/agent/subagents/freebsd/net.h 2014-10-02 16:59:10.000000000 +0400
@@ -39,6 +39,6 @@
--- src/agent/subagents/freebsd/net.h.orig 2013-12-25 15:01:05 UTC
+++ src/agent/subagents/freebsd/net.h
@@ -39,6 +39,6 @@ LONG H_NetIfLink(const TCHAR *, const TC
LONG H_NetArpCache(const TCHAR *, const TCHAR *, StringList *);
LONG H_NetIfList(const TCHAR *, const TCHAR *, StringList *);
LONG H_NetRoutingTable(const TCHAR *, const TCHAR *, StringList *);

View File

@ -24,6 +24,9 @@
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
@ -114,6 +117,7 @@ lib/libnetxms.so.1.0.0
%%SERVER%%lib/netxms/ndd/dell-pwc.ndd
%%SERVER%%lib/netxms/ndd/dlink.ndd
%%SERVER%%lib/netxms/ndd/ers8000.ndd
%%SERVER%%lib/netxms/ndd/h3c.ndd
%%SERVER%%lib/netxms/ndd/mikrotik.ndd
%%SERVER%%lib/netxms/ndd/netscreen.ndd
%%SERVER%%lib/netxms/ndd/ntws.ndd
@ -137,6 +141,23 @@ lib/libnetxms.so.1.0.0
%%SERVER%%%%DATADIR%%/images/bacde727-b183-4e6c-8dca-ab024c88b999
%%SERVER%%%%DATADIR%%/images/f5214d16-1ab1-4577-bb21-063cfd45d7af
%%SERVER%%%%DATADIR%%/images/f9105c54-8dcf-483a-b387-b4587dfd3cba
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-COMMON-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-CONFIG-MAN-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-DEVICE-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-ENTITY-EXT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-ENTITY-VENDORTYPE-OID-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-IF-EXT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-IP-ADDRESS-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-IP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-IPV6-ADDRESS-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-OBJECT-INFO-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-OID-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-SSH-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-STACK-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-SYS-MAN-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-SYSLOG-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3COM-HUAWEI-TRAP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/A3Com-products-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/AAC-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/ACLMGMT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/AGENT-GENERAL-MIB.txt
@ -233,6 +254,8 @@ lib/libnetxms.so.1.0.0
%%SERVER%%%%DATADIR%%/mibs/DES3200-52P-L2MGMT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/DES3200-52P-L3MGMT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/DHCP-RELAY-MGMT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/DIFFSERV-DSCP-TC.txt
%%SERVER%%%%DATADIR%%/mibs/DIFFSERV-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/DIGIUM-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/DISMAN-PING-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/DISMAN-TRACEROUTE-MIB.txt
@ -270,6 +293,19 @@ lib/libnetxms.so.1.0.0
%%SERVER%%%%DATADIR%%/mibs/FOUNDRY-SN-TRAP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/FOUNDRY-SN-VSRP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/FROGFOOT-RESOURCES-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-COMMON-SYSTEM-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-CONFIG-MAN-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-ENTITY-EXT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-ENTITY-VENDORTYPE-OID-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-IF-EXT-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-IP-ADDRESS-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-IPV6-ADDRESS-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-OBJECT-INFO-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-SSH-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-STACK-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-SYS-MAN-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-SYSLOG-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/H3C-TRAP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/HCNUM-TC.txt
%%SERVER%%%%DATADIR%%/mibs/HOST-RESOURCES-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/HOST-RESOURCES-TYPES.txt
@ -307,6 +343,8 @@ lib/libnetxms.so.1.0.0
%%SERVER%%%%DATADIR%%/mibs/HP-SwitchStack-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/HP-VLAN.txt
%%SERVER%%%%DATADIR%%/mibs/HpicfHighAvailability-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/HUAWEI-3COM-OID-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/HUAWEI-VLAN-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/IANA-LANGUAGE-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/IANA-RTPROTO-MIB.txt
@ -321,6 +359,7 @@ lib/libnetxms.so.1.0.0
%%SERVER%%%%DATADIR%%/mibs/IF-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/IGMP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/INET-ADDRESS-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/INTEGRATED-SERVICES-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/IP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/IP-FORWARD-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/IP-MAC-BIND-MIB.txt
@ -337,6 +376,7 @@ lib/libnetxms.so.1.0.0
%%SERVER%%%%DATADIR%%/mibs/LANNET-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-DOT1-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-DOT3-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/LLDP-EXT-MED-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/LLDP-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/LLDP-V2-MIB.txt
%%SERVER%%%%DATADIR%%/mibs/LLDP-V2-TC-MIB.txt
@ -555,13 +595,3 @@ lib/libnetxms.so.1.0.0
%%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql
%%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql
%%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql
%%SERVER%%@dirrmtry %%DATADIR%%/sql
%%SERVER%%@dirrmtry %%DATADIR%%/mibs
%%SERVER%%@dirrmtry %%DATADIR%%/images
%%SERVER%%@dirrmtry %%DATADIR%%/backgrounds
%%SERVER%%@dirrmtry %%DATADIR%%
@owner root
@group wheel
%%SERVER%%@dirrm lib/netxms/ndd
%%SERVER%%@dirrm lib/netxms/dbdrv
%%NXCP%%@dirrm lib/netxms