ports/141717: [MAINTAINER] net-mgmt/zabbix-server: fix LIB_DEPENDS and SUB_FILES for zabbix-agent.

[Jim Riggs]

The following reply was made to PR ports/141717; it has been noted by GNATS.

From: Jim Riggs <ports at christianserving.org>
To: FreeBSD-gnats-submit at freebsd.org
Cc:  
Subject: Re: ports/141717: [MAINTAINER] net-mgmt/zabbix-server: fix LIB_DEPENDS and SUB_FILES for zabbix-agent.
Date: Thu, 17 Dec 2009 22:49:46 -0600 (CST)

 >Submitter-Id:	current-users
 >Originator:	Jim Riggs
 >Organization:	
 >Confidential:	no 
 >Synopsis:	Re: ports/141717: [MAINTAINER] net-mgmt/zabbix-server: fix LIB_DEPENDS and SUB_FILES for zabbix-agent.
 >Severity:	non-critical
 >Priority:	low
 >Category:	ports 
 >Class:		maintainer-update
 >Release:	FreeBSD 6.3-RELEASE-p2 amd64
 >Environment:
 System: FreeBSD zion.christianserving.org 6.3-RELEASE-p2 FreeBSD 6.3-RELEASE-p2 #3: Mon May  5 21:27:22 CDT
 >Description:
 Additionally add the database to the REQUIRE list for zabbix-server and zabbix-proxy rc scripts to ensure that the database is running before server/proxy.
 
 Generated with FreeBSD Port Tools 0.77
 >How-To-Repeat:
 >Fix:
 
 --- zabbix-server-1.8,2.patch begins here ---
 diff -ruN --exclude=CVS /root/portwork/zabbix/net-mgmt/zabbix-server.orig/Makefile /root/portwork/zabbix/net-mgmt/zabbix-server/Makefile
 --- /root/portwork/zabbix/net-mgmt/zabbix-server.orig/Makefile	2009-12-13 16:30:17.000000000 -0600
 +++ /root/portwork/zabbix/net-mgmt/zabbix-server/Makefile	2009-12-17 22:30:31.000000000 -0600
 @@ -24,11 +24,6 @@
  ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
  
  .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
 -LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
 -		curl:${PORTSDIR}/ftp/curl
 -
 -SUB_FILES=	pkg-message
 -
  .if ${ZABBIX_BUILD} != "agent"
  MAN8=		${PORTNAME}_${ZABBIX_BUILD}.8
  USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}
 @@ -43,13 +38,20 @@
  GROUPS=		zabbix
  
  PLIST_SUB=	ZABBIX_BUILD=${ZABBIX_BUILD}
 -SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD}
 +SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
  
  MAKE_ARGS+=	ARCH=freebsd
  GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} --with-net-snmp
 +CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
  
  .if ${ZABBIX_BUILD} != "agent"
 +LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
 +		curl:${PORTSDIR}/ftp/curl
 +
 +SUB_FILES=	pkg-message
 +
 +CONFIGURE_ARGS+=	--with-net-snmp
 +
  OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
  OPTIONS=	MYSQL "Use MySQL backend" on \
  		PGSQL "Use PostgreSQL backend" off \
 @@ -62,12 +64,15 @@
  .include <bsd.port.options.mk>
  
  .ifndef WITHOUT_MYSQL
 +ZABBIX_REQUIRE=	" mysql"
  USE_MYSQL=	yes
  CONFIGURE_ARGS+=	--with-mysql
  .elifdef WITH_PGSQL
 +ZABBIX_REQUIRE=	" postgresql"
  USE_PGSQL=	yes
  CONFIGURE_ARGS+=	--with-pgsql
  .elifdef WITH_SQLITE
 +ZABBIX_REQUIRE=
  USE_SQLITE=	yes
  CONFIGURE_ARGS+=	--with-sqlite3
  .else
 diff -ruN --exclude=CVS /root/portwork/zabbix/net-mgmt/zabbix-server.orig/files/zabbix_proxy.in /root/portwork/zabbix/net-mgmt/zabbix-server/files/zabbix_proxy.in
 --- /root/portwork/zabbix/net-mgmt/zabbix-server.orig/files/zabbix_proxy.in	2009-12-13 16:30:17.000000000 -0600
 +++ /root/portwork/zabbix/net-mgmt/zabbix-server/files/zabbix_proxy.in	2009-12-17 22:25:26.000000000 -0600
 @@ -1,7 +1,7 @@
  #!/bin/sh
  
  # PROVIDE: zabbix_proxy
 -# REQUIRE: DAEMON
 +# REQUIRE: DAEMON%%ZABBIX_REQUIRE%%
  # KEYWORD: shutdown
  #
  # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
 diff -ruN --exclude=CVS /root/portwork/zabbix/net-mgmt/zabbix-server.orig/files/zabbix_server.in /root/portwork/zabbix/net-mgmt/zabbix-server/files/zabbix_server.in
 --- /root/portwork/zabbix/net-mgmt/zabbix-server.orig/files/zabbix_server.in	2009-12-13 16:30:17.000000000 -0600
 +++ /root/portwork/zabbix/net-mgmt/zabbix-server/files/zabbix_server.in	2009-12-17 22:25:32.000000000 -0600
 @@ -1,7 +1,7 @@
  #!/bin/sh
  
  # PROVIDE: zabbix_server
 -# REQUIRE: DAEMON
 +# REQUIRE: DAEMON%%ZABBIX_REQUIRE%%
  # KEYWORD: shutdown
  #
  # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
 --- zabbix-server-1.8,2.patch ends here ---