Attachment 125530 Details for Bug 169153 – zabbix2-server.txt

zabbix2-server.txt

zabbix2-server.txt (text/plain; charset=US-ASCII), 4.55 KB, created by pg on 2012-07-18 10:05:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pg

Created: 2012-07-18 10:05:52 UTC

Size: 4.55 KB

patch

obsolete

>--- zabbix-server/Makefile	2012-07-18 12:42:31.939209978 +0400
>+++ zabbix2-server/Makefile	2012-07-18 12:42:10.268209207 +0400
>@@ -5,22 +5,23 @@
> # $FreeBSD: ports/net-mgmt/zabbix-server/Makefile,v 1.18 2012/05/12 13:55:28 sylvio Exp $
> #
> 
>-PORTNAME=	zabbix
>-PORTVERSION=	1.8.13
>-PORTEPOCH=	2
>+PORTNAME=	zabbix2
>+PORTVERSION=	2.0.0
>+PORTREVISION?=  0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
>+DISTNAME=	zabbix-${PORTVERSION}
> PKGNAMESUFFIX?=	-server
> 
>-MAINTAINER=	ports@christianserving.org
>+MAINTAINER=	pakhom706@gmail.com
> COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//})
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	${PKGBASE}-1.[0-6]*
>+CONFLICTS=	${PKGBASE}-1.[0-8]*
> 
> .if ${PKGNAMESUFFIX} != "-agent"
>-CONFLICTS+=	${PORTNAME}-1.[0-6]*
>+CONFLICTS+=	${PORTNAME}-1.[0-8]*
> .endif
> 
> ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
>@@ -28,13 +29,13 @@
> .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
> .if ${ZABBIX_BUILD} != "agent"
> USE_ICONV=	yes
>-MAN8+=		${PORTNAME}_${ZABBIX_BUILD}.8
>-USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}
>+MAN8+=		zabbix_${ZABBIX_BUILD}.8
>+USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}
> .else
> USE_ICONV=	yes
>-MAN1+=		${PORTNAME}_get.1 ${PORTNAME}_sender.1
>-MAN8+=		${PORTNAME}_${ZABBIX_BUILD}d.8
>-USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}d
>+MAN1+=		zabbix_get.1 zabbix_sender.1
>+MAN8+=		zabbix_${ZABBIX_BUILD}d.8
>+USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
> .endif
> 
> USERS=		zabbix
>@@ -45,7 +46,9 @@
> 
> MAKE_ARGS+=	ARCH=freebsd
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
>+CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} \
>+			--sysconfdir=${ETCDIR} \
>+			--datadir=${ETCDIR}
> 
> .if ${ZABBIX_BUILD} != "agent"
> LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
>@@ -56,10 +59,10 @@
> CONFIGURE_ARGS+=	--with-net-snmp
> 
> OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
>-OPTIONS=	MYSQL "Use MySQL backend" on \
>-		PGSQL "Use PostgreSQL backend" off \
>+OPTIONS=	MYSQL "Use MySQL backend" off \
>+		PGSQL "Use PostgreSQL backend" on \
> 		SQLITE "Use SQLite backend" off \
>-		IPV6 "Support for IPv6" on \
>+		IPV6 "Support for IPv6" off \
> 		FPING "Use fping for pinging hosts" on \
> 		JABBER "Support for jabber media type" on \
> 		CURL "Support web monitoring with cURL" on \
>@@ -67,7 +70,8 @@
> 		IPMI "Support for IPMI" off \
> 		SSH "Support for SSH-based checks" off \
> 		IODBC "Support for iODBC" off \
>-		UNIXODBC "Support for unixODBC" off
>+		UNIXODBC "Support for unixODBC" off \
>+		NMAP "Detect operating system" off
> 
> .include <bsd.port.options.mk>
> 
>@@ -78,7 +82,7 @@
> .elifdef WITH_PGSQL
> ZABBIX_REQUIRE=	" postgresql"
> USE_PGSQL=	yes
>-CONFIGURE_ARGS+=	--with-pgsql
>+CONFIGURE_ARGS+=	--with-postgresql
> .elifdef WITH_SQLITE
> ZABBIX_REQUIRE=
> USE_SQLITE=	3
>@@ -135,29 +139,35 @@
> CONFIGURE_ARGS+=	--enable-ipv6
> .endif
> 
>+.ifdef WITH_NMAP
>+RUN_DEPENDS+=   nmap:${PORTSDIR}/security/nmap
>+RUN_DEPENDS+=	sudo${PORTSDIR}/security/sudo
>+.endif
>+
> post-patch:
> 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
> 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
>-	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/misc/conf/${PORTNAME}_*.conf
>+	@${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf
> 	@${FIND} ${WRKSRC} -type f $ -name '*.bak' -or -name '*.orig' $ -exec ${RM} -f {} +
> 
> .if ${ZABBIX_BUILD} != "agent"
> .ifdef WITHOUT_FPING
>-	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}.conf
>+	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/conf/zabbix_${ZABBIX_BUILD}.conf
> .endif
> .endif
> 
> post-install:
> 	@${INSTALL} -d ${ETCDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}.conf ${ETCDIR}/${PORTNAME}_${ZABBIX_BUILD}.conf.sample
>+	@${INSTALL_DATA} ${WRKSRC}/conf/zabbix_${ZABBIX_BUILD}.conf ${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample
> 
> .if ${ZABBIX_BUILD} == "agent"
>-	@${INSTALL_DATA} ${WRKSRC}/misc/conf/${PORTNAME}_${ZABBIX_BUILD}d.conf ${ETCDIR}/${PORTNAME}_${ZABBIX_BUILD}d.conf.sample
>+	@${INSTALL_DATA} ${WRKSRC}/conf/zabbix_${ZABBIX_BUILD}d.conf ${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample
> .endif
> 
> .if ${ZABBIX_BUILD} != "agent"
>+	@${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database"
> 	@cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/
>-	@cd ${WRKSRC}/create/ && ${COPYTREE_SHARE} "data schema" ${DATADIR}/${ZABBIX_BUILD}/create/
>+	@cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${DATADIR}/${ZABBIX_BUILD}/database/
> 	@${CAT} ${PKGMESSAGE}
> .endif
> .endif # if ${ZABBIX_BUILD} != "frontend"

Actions: View

Attachments on bug 169153: 125523 | 125524 | 125525 | 125526 | 125527 | 125528 | 125529 | 125530 | 125531 | 125532 | 125533 | 125534 | 125535