From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 28 23:30:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73AFE5A6 for ; Fri, 28 Mar 2014 23:30:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E7C3291 for ; Fri, 28 Mar 2014 23:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2SNU1h7048133 for ; Fri, 28 Mar 2014 23:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2SNU1mF048132; Fri, 28 Mar 2014 23:30:01 GMT (envelope-from gnats) Resent-Date: Fri, 28 Mar 2014 23:30:01 GMT Resent-Message-Id: <201403282330.s2SNU1mF048132@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, "Danilo G. Baio" Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D6A03EB for ; Fri, 28 Mar 2014 23:21:28 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C73F237 for ; Fri, 28 Mar 2014 23:21:28 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2SNLQx5037281 for ; Fri, 28 Mar 2014 23:21:26 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2SNLQH2037277; Fri, 28 Mar 2014 23:21:26 GMT (envelope-from nobody) Message-Id: <201403282321.s2SNLQH2037277@cgiserv.freebsd.org> Date: Fri, 28 Mar 2014 23:21:26 GMT From: "Danilo G. Baio" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/188037: [PATCH] net-mgmt/zabbix22-server net-mgmt/zabbix22-frontend net-mgmt/zabbix22-agent net-mgmt/zabbix22-proxy: support STAGEDIR X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Mar 2014 23:30:01 -0000 >Number: 188037 >Category: ports >Synopsis: [PATCH] net-mgmt/zabbix22-server net-mgmt/zabbix22-frontend net-mgmt/zabbix22-agent net-mgmt/zabbix22-proxy: support STAGEDIR >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Mar 28 23:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Danilo G. Baio >Release: 10.0-RELEASE >Organization: >Environment: FreeBSD dbaio.bs2cloud.com.br 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Attached patch updates zabbix22 packages for support stage dir and fix orphan files net-mgmt/zabbix22-server net-mgmt/zabbix22-frontend net-mgmt/zabbix22-agent net-mgmt/zabbix22-proxy >How-To-Repeat: >Fix: Patch attached with submission follows: Index: zabbix22-agent/Makefile =================================================================== --- zabbix22-agent/Makefile (revision 349425) +++ zabbix22-agent/Makefile (working copy) @@ -13,6 +13,5 @@ OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 -NO_STAGE= yes .include .include "${MASTERDIR}/Makefile" Index: zabbix22-frontend/Makefile =================================================================== --- zabbix22-frontend/Makefile (revision 349425) +++ zabbix22-frontend/Makefile (working copy) @@ -20,7 +20,6 @@ OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMYSQL} @@ -45,7 +44,7 @@ .endif do-install: - @${INSTALL} -d ${WWWDIR} - @cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR} + @${INSTALL} -d ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} .include "${MASTERDIR}/Makefile" Index: zabbix22-proxy/Makefile =================================================================== --- zabbix22-proxy/Makefile (revision 349425) +++ zabbix22-proxy/Makefile (working copy) @@ -6,5 +6,4 @@ MASTERDIR= ${.CURDIR}/../zabbix22-server -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: zabbix22-server/Makefile =================================================================== --- zabbix22-server/Makefile (revision 349425) +++ zabbix22-server/Makefile (working copy) @@ -92,7 +92,6 @@ OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMYSQL} @@ -203,14 +202,13 @@ post-install: .if defined(WITH_JAVAGW) - @${MV} ${PREFIX}/sbin/zabbix_java/settings.sh ${PREFIX}/sbin/zabbix_java/settings.sh.sample + @${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample .endif .if ${ZABBIX_BUILD} != "agent" - @${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database" - @cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/ - @cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${DATADIR}/${ZABBIX_BUILD}/database/ - @${CAT} ${PKGMESSAGE} + @${MKDIR} "${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database" + @cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/upgrades/ + @cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database/ .endif .endif # if ${ZABBIX_BUILD} != "frontend" Index: zabbix22-server/pkg-plist =================================================================== --- zabbix22-server/pkg-plist (revision 349425) +++ zabbix22-server/pkg-plist (working copy) @@ -1,4 +1,5 @@ %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample +man/man8/zabbix_%%ZABBIX_BUILD%%.8.gz sbin/zabbix_%%ZABBIX_BUILD%% %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/data.sql %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/schema.sql Index: zabbix22-server/pkg-plist.agent =================================================================== --- zabbix22-server/pkg-plist.agent (revision 349425) +++ zabbix22-server/pkg-plist.agent (working copy) @@ -7,3 +7,6 @@ @dirrmtry %%ETCDIR%%/zabbix_agentd.conf.d @dirrmtry %%ETCDIR%%/zabbix_agent.conf.d @dirrmtry %%ETCDIR%% +man/man1/zabbix_get.1.gz +man/man1/zabbix_sender.1.gz +man/man8/zabbix_%%ZABBIX_BUILD%%d.8.gz Index: zabbix22-server/pkg-plist.frontend =================================================================== --- zabbix22-server/pkg-plist.frontend (revision 349425) +++ zabbix22-server/pkg-plist.frontend (working copy) @@ -846,7 +846,8 @@ @dirrm %%WWWDIR%%/include/classes/validators/host @dirrm %%WWWDIR%%/include/classes/validators/string @dirrm %%WWWDIR%%/include/classes/validators/object -@dirrm %%WWWDIR%%/include/classes/validators/ +@dirrm %%WWWDIR%%/include/classes/validators +@dirrm %%WWWDIR%%/include/classes/graphdraw @dirrm %%WWWDIR%%/include/classes @dirrm %%WWWDIR%%/include @dirrm %%WWWDIR%%/api/rpc @@ -921,6 +922,14 @@ @dirrm %%WWWDIR%%/locale/lt/ @dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES/ @dirrm %%WWWDIR%%/locale/ro/ +@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES +@dirrm %%WWWDIR%%/locale/ro +@dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES +@dirrm %%WWWDIR%%/locale/lt +@dirrm %%WWWDIR%%/locale/en_US/LC_MESSAGES +@dirrm %%WWWDIR%%/locale/en_US +@dirrm %%WWWDIR%%/locale/bg/LC_MESSAGES +@dirrm %%WWWDIR%%/locale/bg @dirrm %%WWWDIR%%/locale @dirrm %%WWWDIR%%/conf @dirrm %%WWWDIR%%/js/jquery >Release-Note: >Audit-Trail: >Unformatted: