From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 14 04:40:15 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B879016A4CE for ; Wed, 14 Jan 2004 04:40:15 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6B6F43D5A for ; Wed, 14 Jan 2004 04:40:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0ECeCFR066647 for ; Wed, 14 Jan 2004 04:40:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0ECeCg8066646; Wed, 14 Jan 2004 04:40:12 -0800 (PST) (envelope-from gnats) Resent-Date: Wed, 14 Jan 2004 04:40:12 -0800 (PST) Resent-Message-Id: <200401141240.i0ECeCg8066646@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sergey Akifyev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 002F216A4CE for ; Wed, 14 Jan 2004 04:31:11 -0800 (PST) Received: from mail.gascom.ru (mail.gascom.ru [217.17.160.2]) by mx1.FreeBSD.org (Postfix) with SMTP id 7E4A343D4C for ; Wed, 14 Jan 2004 04:30:52 -0800 (PST) (envelope-from asa@mail.gascom.ru) Received: (qmail 42783 invoked by uid 0); 14 Jan 2004 12:30:47 -0000 Message-Id: <20040114123047.42780.qmail@mail.gascom.ru> Date: 14 Jan 2004 12:30:47 -0000 From: Sergey Akifyev To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/61360: [maintainer] bump zabbix b12 -> b13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Sergey Akifyev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jan 2004 12:40:15 -0000 >Number: 61360 >Category: ports >Synopsis: [maintainer] bump zabbix b12 -> b13 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 14 04:40:12 PST 2004 >Closed-Date: >Last-Modified: >Originator: Sergey Akifyev >Release: FreeBSD 4.8-RELEASE-p13 i386 >Organization: JSC Gascom >Environment: System: FreeBSD mail.gascom.ru 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #5: Mon Oct 6 15:48:47 MSD 2003 asa@boulder.gascom.ru:/usr/src/sys/compile/SMP_STD i386 >Description: * bump zabbix b12 -> b13 * some fixes + cleanup >How-To-Repeat: >Fix: --- zabbix.diff begins here --- diff -ruN zabbix.orig/Makefile zabbix/Makefile --- zabbix.orig/Makefile Wed Jan 14 07:50:50 2004 +++ zabbix/Makefile Wed Jan 14 12:06:57 2004 @@ -6,8 +6,7 @@ # PORTNAME= zabbix -PORTVERSION= 1.0b12 -PORTREVISION= 2 +PORTVERSION= 1.0b13 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,18 +19,21 @@ PKGNAMESUFFIX= -agent PLIST= ${MASTERDIR}/pkg-plist.agent PKGMESSAGE= nonexistent -.else +.else # ZABBIX_AGENT_ONLY LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net/net-snmp -RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms \ - fping:${PORTSDIR}/net/fping +RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms + +.ifndef(WITHOUT_FPING) +RUN_DEPENDS+= fping:${PORTSDIR}/net/fping +.endif USE_MYSQL= yes CONFIGURE_ARGS= --with-mysql --with-net-snmp PKGMESSAGE= ${WRKDIR}/pkg-message -.endif +.endif # ZABBIX_AGENT_ONLY -USE_RC_SUBR= yes USE_REINPLACE= yes +USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include @@ -53,8 +55,13 @@ @${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \ ${WRKDIR}/zabbix-agent.sh.sample +.ifndef(ZABBIX_AGENT_ONLY) post-patch: @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c +.ifdef WITHOUT_FPING + @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf +.endif +.endif # ZABBIX_AGENT_ONLY do-install: .for FILE in ${ZABBIX_BINARIES} @@ -83,7 +90,7 @@ ${PREFIX}/etc/rc.d ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .ifndef(ZABBIX_AGENT_ONLY) - ${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .endif .include diff -ruN zabbix.orig/distinfo zabbix/distinfo --- zabbix.orig/distinfo Mon Dec 15 06:28:25 2003 +++ zabbix/distinfo Wed Jan 14 11:43:15 2004 @@ -1 +1 @@ -MD5 (zabbix-1.0beta12.tar.gz) = 8b8827272231de93cd9b93731a8369dd +MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab diff -ruN zabbix.orig/pkg-plist zabbix/pkg-plist --- zabbix.orig/pkg-plist Mon Dec 15 06:28:25 2003 +++ zabbix/pkg-plist Wed Jan 14 11:54:31 2004 @@ -58,12 +58,23 @@ %%DATADIR%%/php/trends.php %%DATADIR%%/php/triggers.php %%DATADIR%%/php/users.php +%%DATADIR%%/php/images/sysmaps/old/Notebook.png +%%DATADIR%%/php/images/sysmaps/old/Hub.png +%%DATADIR%%/php/images/sysmaps/old/Printer.png +%%DATADIR%%/php/images/sysmaps/old/Router.png +%%DATADIR%%/php/images/sysmaps/old/Server.png +%%DATADIR%%/php/images/sysmaps/old/Workstation.png %%DATADIR%%/php/images/sysmaps/Notebook.png %%DATADIR%%/php/images/sysmaps/Hub.png %%DATADIR%%/php/images/sysmaps/Printer.png %%DATADIR%%/php/images/sysmaps/Router.png %%DATADIR%%/php/images/sysmaps/Server.png %%DATADIR%%/php/images/sysmaps/Workstation.png +%%DATADIR%%/php/images/sysmaps/README +%%DATADIR%%/php/images/sysmaps/Phone.png +%%DATADIR%%/php/images/sysmaps/Battery.png +%%DATADIR%%/php/images/sysmaps/Network.png +%%DATADIR%%/php/images/sysmaps/Satellite.png %%DATADIR%%/php/include/.htaccess %%DATADIR%%/php/include/classes.inc.php %%DATADIR%%/php/include/config.inc.php @@ -109,8 +120,11 @@ %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql +%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql +%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql @dirrm etc/zabbix @dirrm %%DATADIR%%/php/audio +@dirrm %%DATADIR%%/php/images/sysmaps/old @dirrm %%DATADIR%%/php/images/sysmaps @dirrm %%DATADIR%%/php/images @dirrm %%DATADIR%%/php/include @@ -173,6 +187,9 @@ @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11 +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13 @dirrm %%DATADIR%%/dbpatches @dirrm %%DATADIR%% @exec ln -sf %D/etc/zabbix /etc/zabbix --- zabbix.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: