Attachment #138517 for bug #184495

View | Details | Raw Unified | Return to bug 184495
Collapse All | Expand All




# Created by: Jim Riggs <ports@christianserving.org>
# $FreeBSD: head/net-mgmt/zabbix2-frontend/Makefile 327757 2013-09-20 22:24:43Z bapt $

PORTNAME=       zabbix2
PKGNAMESUFFIX=  -frontend
CATEGORIES=     net-mgmt

MASTERDIR=	${.CURDIR}/../zabbix2-server


PLIST=		${PKGDIR}/pkg-plist.frontend

USE_PHP=	bcmath ctype gd pcre snmp sockets mbstring session dom xml \
		xmlreader xmlwriter simplexml gettext ldap
WANT_PHP_WEB=	yes

OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
OPTIONS_DEFINE=	MYSQL MYSQLI PGSQL SQLITE ORACLE
OPTIONS_DEFAULT=	MYSQL MYSQLI
MYSQLI_DESC=	MySQLI backend


USE_PHP+=	sqlite3
.endif

.if ${PORT_OPTIONS:MORACLE}
ZABBIX_REQUIRE=
CONFIGURE_ARGS+=        --with-oracle
.endif

do-install:
	@${INSTALL} -d ${WWWDIR}
	@cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR}

Lines 1-13 Link Here

(-)zabbix2-server/Makefile (-13 / +24 lines)
1	# Created by: Jim Riggs <ports@christianserving.org>	1	reated by: Jim Riggs <ports@christianserving.org>
2	# $FreeBSD: head/net-mgmt/zabbix2-server/Makefile 328009 2013-09-23 14:26:59Z rm $	2	# $FreeBSD: head/net-mgmt/zabbix2-server/Makefile 328009 2013-09-23 14:26:59Z rm $
3		3
4	PORTNAME= zabbix2	4	PORTNAME= zabbix2
5	PORTVERSION= 2.0.8	5	PORTVERSION= 2.0.9
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= net-mgmt	7	CATEGORIES= net-mgmt
8	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}	8	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
9	PKGNAMESUFFIX?= -server	9	PKGNAMESUFFIX?= -server
10	DISTNAME= zabbix-${PORTVERSION}	10	DISTNAME= zabbix-${PORTVERSION}
11		11
12	MAINTAINER= pakhom706@gmail.com	12	MAINTAINER= pakhom706@gmail.com
13	COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//})	13	COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//})
Lines 16-21 Link Here
16		16
17	CONFLICTS= ${PKGBASE}-1.[0-8]*	17	CONFLICTS= ${PKGBASE}-1.[0-8]*
18		18
		19	IGNORE_WITH_MYSQL= 41
		20
19	.if ${PKGNAMESUFFIX} != "-agent"	21	.if ${PKGNAMESUFFIX} != "-agent"
20	CONFLICTS+= ${PORTNAME}-1.[0-8]*	22	CONFLICTS+= ${PORTNAME}-1.[0-8]*
21	.endif	23	.endif
Lines 68-75 Link Here
68		70
69	OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options	71	OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
70		72
71	OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW	73	OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW MYSQL
72	OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL LDAP	74	OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL
73		75
74	CURL_DESC= Support for web monitoring	76	CURL_DESC= Support for web monitoring
75	FPING_DESC= Build/install fping for ping checks	77	FPING_DESC= Build/install fping for ping checks
Lines 84-90 Link Here
84	UNIXODBC_DESC= Use UnixODBC for ODBC support	86	UNIXODBC_DESC= Use UnixODBC for ODBC support
85		87
86	OPTIONS_SINGLE= DB ODBC	88	OPTIONS_SINGLE= DB ODBC
87	OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE	89	OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE
88	OPTIONS_SINGLE_ODBC= IODBC UNIXODBC	90	OPTIONS_SINGLE_ODBC= IODBC UNIXODBC
89		91
90	NO_STAGE= yes	92	NO_STAGE= yes
Lines 103-113 Link Here
103	.endif	105	.endif
104		106
105	.if ${PORT_OPTIONS:MSQLITE}	107	.if ${PORT_OPTIONS:MSQLITE}
106	ZABBIX_REQUIRE=	108	ZABBIX_REQUIRE= " sqlite"
107	USE_SQLITE= 3	109	USE_SQLITE= 3
108	CONFIGURE_ARGS+= --with-sqlite3	110	CONFIGURE_ARGS+= --with-sqlite3
109	.endif	111	.endif
110		112
		113	.if ${PORT_OPTIONS:MORACLE}
		114	ZABBIX_REQUIRE=
		115	CONFIGURE_ARGS+= --with-oracle
		116	.endif
		117
111	.if ${PORT_OPTIONS:MCURL}	118	.if ${PORT_OPTIONS:MCURL}
112	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl	119	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
113	CONFIGURE_ARGS+= --with-libcurl	120	CONFIGURE_ARGS+= --with-libcurl
Lines 173-179 Link Here
173		180
174	.if ${ZABBIX_BUILD} != "agent"	181	.if ${ZABBIX_BUILD} != "agent"
175	.if empty(PORT_OPTIONS:MFPING)	182	.if empty(PORT_OPTIONS:MFPING)
176	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/conf/zabbix_${ZABBIX_BUILD}.conf
177	.endif	183	.endif
178	.for d in mysql oracle postgresql sqlite3	184	.for d in mysql oracle postgresql sqlite3
179	@${REINPLACE_CMD} -e 's\|/bin/ping\|/sbin/ping\|g; \	185	@${REINPLACE_CMD} -e 's\|/bin/ping\|/sbin/ping\|g; \
Lines 187-192 Link Here
187	@${FIND} ${WRKSRC} -type f $ -name '.bak' -or -name '.orig' $ -exec ${RM} -f {} +	193	@${FIND} ${WRKSRC} -type f $ -name '.bak' -or -name '.orig' $ -exec ${RM} -f {} +
188		194
189	post-install:	195	post-install:
		196
		197	.if defined(WITH_JAVAGW)
		198	@${MV} ${PREFIX}/sbin/zabbix_java/settings.sh ${PREFIX}/sbin/zabbix_java/settings.sh.sample
		199	.endif
		200
190	.if ${ZABBIX_BUILD} != "agent"	201	.if ${ZABBIX_BUILD} != "agent"
191	@${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database"	202	@${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database"
192	@cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/	203	@cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/

Lines 1-2 Link Here

(-)zabbix2-server/distinfo (-2 / +2 lines)
1	SHA256 (zabbix-2.0.8.tar.gz) = c4b94960de0a1d0b20604a08503e9715c15845409368162c1e321040b8e4519a	1	SHA256 (zabbix-2.0.9.tar.gz) = d5ef1ea94f6f09992a7f1f6fb9b58f99c3bca6196c5454ad29fa63c03996ee14
2	SIZE (zabbix-2.0.8.tar.gz) = 13457936	2	SIZE (zabbix-2.0.9.tar.gz) = 13648392

Line 0 Link Here

(-)zabbix2-server/files/patch-src_shutdown.sh (+12 lines)
	1	--- src/zabbix_java/shutdown.sh.orig 2013-11-12 10:07:23.000000000 +0400
	2	+++ src/zabbix_java/shutdown.sh 2013-12-04 16:37:38.000000000 +0400
	3	@@ -1,7 +1,7 @@
	4	-#!/bin/bash
	5	+#!/bin/sh
	6
	7	cd $(dirname $0)
	8	-source settings.sh
	9	+. settings.sh
	10
	11	if [ -n "$PID_FILE" ]; then
	12	if [ -e "$PID_FILE" ]; then




--- src/zabbix_java/startup.sh.orig	2013-11-12 10:07:23.000000000 +0400
+++ src/zabbix_java/startup.sh	2013-12-04 16:37:05.000000000 +0400
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
 cd $(dirname $0)
-source settings.sh
+. settings.sh
 
 if [ -n "$PID_FILE" -a -e "$PID_FILE" ]; then
 	echo "Zabbix Java Gateway is already running"
@@ -16,8 +16,8 @@
 fi
 
 CLASSPATH="lib"
-for jar in {lib,bin}/*.jar; do
-	if [[ $jar != *junit* ]]; then
+for jar in lib/*.jar bin/*.jar; do
+	if [ "$jar" != "*junit*" ]; then
 		CLASSPATH="$CLASSPATH:$jar"
 	fi
 done
@@ -39,7 +39,7 @@
 COMMAND_LINE="$JAVA $JAVA_OPTIONS -classpath $CLASSPATH $ZABBIX_OPTIONS com.zabbix.gateway.JavaGateway"
 
 if [ -n "$PID_FILE" ]; then
-	PID=$(/bin/bash -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!")
+	PID=$(/bin/sh -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!")
 	if ps -p $PID > /dev/null 2>&1; then
 		echo $PID > $PID_FILE
 	else

Lines 38-44 Link Here

(-)zabbix2-server/pkg-plist (-1 / +1 lines)
38	%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-classic-0.9.27.jar	38	%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-classic-0.9.27.jar
39	%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback.xml	39	%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback.xml
40	%%JAVAGW%%%%ZABBIX_JAVA%%/lib/slf4j-api-1.6.1.jar	40	%%JAVAGW%%%%ZABBIX_JAVA%%/lib/slf4j-api-1.6.1.jar
41	%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh	41	%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh.sample
42	%%JAVAGW%%%%ZABBIX_JAVA%%/startup.sh	42	%%JAVAGW%%%%ZABBIX_JAVA%%/startup.sh
43	%%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-%%PORTVERSION%%.jar	43	%%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
44	%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib	44	%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib

Lines 645-650 Link Here

(-)zabbix2-server/pkg-plist.frontend (+4 lines)
645	%%WWWDIR%%/locale/bg/LC_MESSAGES/frontend.mo	645	%%WWWDIR%%/locale/bg/LC_MESSAGES/frontend.mo
646	%%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.po	646	%%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.po
647	%%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.mo	647	%%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.mo
		648	%%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.po
		649	%%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.mo
648	%%WWWDIR%%/locale/add_new_language.sh	650	%%WWWDIR%%/locale/add_new_language.sh
649	%%WWWDIR%%/conf/zabbix.conf.php.example	651	%%WWWDIR%%/conf/zabbix.conf.php.example
650	%%WWWDIR%%/conf/maintenance.inc.php	652	%%WWWDIR%%/conf/maintenance.inc.php
Lines 858-863 Link Here
858	@dirrm %%WWWDIR%%/locale/bg/	860	@dirrm %%WWWDIR%%/locale/bg/
859	@dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES/	861	@dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES/
860	@dirrm %%WWWDIR%%/locale/lt/	862	@dirrm %%WWWDIR%%/locale/lt/
		863	@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES/
		864	@dirrm %%WWWDIR%%/locale/ro/
861	@dirrm %%WWWDIR%%/locale	865	@dirrm %%WWWDIR%%/locale
862	@dirrm %%WWWDIR%%/conf	866	@dirrm %%WWWDIR%%/conf
863	@dirrm %%WWWDIR%%/js/jquery	867	@dirrm %%WWWDIR%%/js/jquery

Return to bug 184495

Lines 1-9 Link Here

(-)zabbix2-frontend/Makefile (-5 / +10 lines)
1	# Created by: Jim Riggs <ports@christianserving.org>	1	# Created by: Jim Riggs <ports@christianserving.org>
2	# $FreeBSD: head/net-mgmt/zabbix2-frontend/Makefile 327757 2013-09-20 22:24:43Z bapt $	2	# $FreeBSD: head/net-mgmt/zabbix2-frontend/Makefile 327757 2013-09-20 22:24:43Z bapt $
3		3
4	PORTNAME= zabbix2	4	PORTNAME= zabbix2
5	PKGNAMESUFFIX= -frontend	5	PKGNAMESUFFIX= -frontend
6	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
7		7
8	MASTERDIR= ${.CURDIR}/../zabbix2-server	8	MASTERDIR= ${.CURDIR}/../zabbix2-server
9		9
Lines 12-22 Link Here
12	PLIST= ${PKGDIR}/pkg-plist.frontend	12	PLIST= ${PKGDIR}/pkg-plist.frontend
13		13
14	USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \	14	USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \
15	xmlreader xmlwriter simplexml gettext	15	xmlreader xmlwriter simplexml gettext ldap
16	WANT_PHP_WEB= yes	16	WANT_PHP_WEB= yes
17		17
18	OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options	18	OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
19	OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE	19	OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE
20	OPTIONS_DEFAULT= MYSQL MYSQLI	20	OPTIONS_DEFAULT= MYSQL MYSQLI
21	MYSQLI_DESC= MySQLI backend	21	MYSQLI_DESC= MySQLI backend
22		22
Lines 39-44 Link Here
39	USE_PHP+= sqlite3	39	USE_PHP+= sqlite3
40	.endif	40	.endif
41		41
		42	.if ${PORT_OPTIONS:MORACLE}
		43	ZABBIX_REQUIRE=
		44	CONFIGURE_ARGS+= --with-oracle
		45	.endif
		46
42	do-install:	47	do-install:
43	@${INSTALL} -d ${WWWDIR}	48	@${INSTALL} -d ${WWWDIR}
44	@cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR}	49	@cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR}

Line 0 Link Here

(-)zabbix2-server/files/patch-src_startup.sh (+32 lines)
	1	--- src/zabbix_java/startup.sh.orig 2013-11-12 10:07:23.000000000 +0400
	2	+++ src/zabbix_java/startup.sh 2013-12-04 16:37:05.000000000 +0400
	3	@@ -1,7 +1,7 @@
	4	-#!/bin/bash
	5	+#!/bin/sh
	6
	7	cd $(dirname $0)
	8	-source settings.sh
	9	+. settings.sh
	10
	11	if [ -n "$PID_FILE" -a -e "$PID_FILE" ]; then
	12	echo "Zabbix Java Gateway is already running"
	13	@@ -16,8 +16,8 @@
	14	fi
	15
	16	CLASSPATH="lib"
	17	-for jar in {lib,bin}/*.jar; do
	18	- if [[ $jar != junit ]]; then
	19	+for jar in lib/.jar bin/.jar; do
	20	+ if [ "$jar" != "junit" ]; then
	21	CLASSPATH="$CLASSPATH:$jar"
	22	fi
	23	done
	24	@@ -39,7 +39,7 @@
	25	COMMAND_LINE="$JAVA $JAVA_OPTIONS -classpath $CLASSPATH $ZABBIX_OPTIONS com.zabbix.gateway.JavaGateway"
	26
	27	if [ -n "$PID_FILE" ]; then
	28	- PID=$(/bin/bash -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!")
	29	+ PID=$(/bin/sh -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!")
	30	if ps -p $PID > /dev/null 2>&1; then
	31	echo $PID > $PID_FILE
	32	else