From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 1 17:50:02 2013 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 1AEE72E7 for ; Sun, 1 Dec 2013 17:50:02 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E5BA4120C for ; Sun, 1 Dec 2013 17:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB1Ho1lv079883 for ; Sun, 1 Dec 2013 17:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB1Ho1Lv079882; Sun, 1 Dec 2013 17:50:01 GMT (envelope-from gnats) Resent-Date: Sun, 1 Dec 2013 17:50:01 GMT Resent-Message-Id: <201312011750.rB1Ho1Lv079882@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, User Rodrigo 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 01A21D0B for ; Sun, 1 Dec 2013 17:43:28 +0000 (UTC) Received: from smtp2-g21.free.fr (unknown [IPv6:2a01:e0c:1:1599:215:17ff:fe31:fb8]) by mx1.freebsd.org (Postfix) with ESMTP id 43C2211E3 for ; Sun, 1 Dec 2013 17:43:25 +0000 (UTC) Received: from q.workgroup (unknown [82.227.164.69]) by smtp2-g21.free.fr (Postfix) with ESMTP id 8E9F74B0111 for ; Sun, 1 Dec 2013 18:43:17 +0100 (CET) Received: from q.workgroup (localhost [127.0.0.1]) by q.workgroup (8.14.7/8.14.7) with ESMTP id rB1HgZPq087581 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sun, 1 Dec 2013 18:42:36 +0100 (CET) (envelope-from rodrigo@q.workgroup) Received: (from root@localhost) by q.workgroup (8.14.7/8.14.7/Submit) id rB1HgZYL087481; Sun, 1 Dec 2013 18:42:35 +0100 (CET) (envelope-from rodrigo) Message-Id: <201312011742.rB1HgZYL087481@q.workgroup> Date: Sun, 1 Dec 2013 18:42:35 +0100 (CET) From: User Rodrigo To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/184416: net-mgmt/smokeping stage fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: User Rodrigo List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Dec 2013 17:50:02 -0000 >Number: 184416 >Category: ports >Synopsis: net-mgmt/smokeping stage fixes >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: Sun Dec 01 17:50:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: User Rodrigo >Release: FreeBSD 10.0-BETA3 i386 >Organization: >Environment: System: FreeBSD q 10.0-BETA3 FreeBSD 10.0-BETA3 #0 r257580: Sun Nov 3 21:15:32 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386 >Description: Port stage fix. - remove no_stage - fix lib_depends - add licence - fix manpages >How-To-Repeat: >Fix: --- smokeping.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 335354) +++ Makefile (working copy) @@ -10,7 +10,9 @@ MAINTAINER= rodrigo@bebik.net COMMENT= Latency logging and graphing system -LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool +LICENSE= GPLv2 + +LIB_DEPENDS= librrd.so:${PORTSDIR}/databases/rrdtool BUILD_DEPENDS= p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \ p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \ p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ @@ -32,69 +34,6 @@ USE_RC_SUBR= smokeping -MAN1= smokeping.1 \ - smokeping_cgi.1 \ - tSmoke.1 -MAN3= Smokeping_matchers_Avgratio.3 \ - Smokeping_matchers_CheckLatency.3 \ - Smokeping_matchers_CheckLoss.3 \ - Smokeping_matchers_ExpLoss.3 \ - Smokeping_matchers_Median.3 \ - Smokeping_matchers_Medratio.3 \ - Smokeping_matchers_base.3 \ - Smokeping_probes_AnotherDNS.3 \ - Smokeping_probes_AnotherSSH.3 \ - Smokeping_probes_CiscoRTTMonDNS.3 \ - Smokeping_probes_CiscoRTTMonEchoICMP.3 \ - Smokeping_probes_CiscoRTTMonTcpConnect.3 \ - Smokeping_probes_Curl.3 \ - Smokeping_probes_DNS.3 \ - Smokeping_probes_DismanPing.3 \ - Smokeping_probes_EchoPing.3 \ - Smokeping_probes_EchoPingChargen.3 \ - Smokeping_probes_EchoPingDNS.3 \ - Smokeping_probes_EchoPingDiscard.3 \ - Smokeping_probes_EchoPingHttp.3 \ - Smokeping_probes_EchoPingHttps.3 \ - Smokeping_probes_EchoPingIcp.3 \ - Smokeping_probes_EchoPingLDAP.3 \ - Smokeping_probes_EchoPingPlugin.3 \ - Smokeping_probes_EchoPingSmtp.3 \ - Smokeping_probes_EchoPingWhois.3 \ - Smokeping_probes_FPing.3 \ - Smokeping_probes_FPing6.3 \ - Smokeping_probes_FTPtransfer.3 \ - Smokeping_probes_IOSPing.3 \ - Smokeping_probes_LDAP.3 \ - Smokeping_probes_NFSping.3 \ - Smokeping_probes_OpenSSHJunOSPing.3 \ - Smokeping_probes_Radius.3 \ - Smokeping_probes_RemoteFPing.3 \ - Smokeping_probes_SendEmail.3 \ - Smokeping_probes_SSH.3 \ - Smokeping_probes_SipSak.3 \ - Smokeping_probes_TCPPing.3 \ - Smokeping_probes_TacacsPlus.3 \ - Smokeping_probes_TelnetIOSPing.3 \ - Smokeping_probes_TelnetJunOSPing.3 \ - Smokeping_probes_WebProxyFilter.3 \ - Smokeping_probes_base.3 \ - Smokeping_probes_basefork.3 \ - Smokeping_probes_basevars.3 \ - Smokeping_probes_passwordchecker.3 \ - Smokeping_probes_skel.3 \ - Smokeping_sorters_Loss.3 \ - Smokeping_sorters_Max.3 \ - Smokeping_sorters_Median.3 \ - Smokeping_sorters_StdDev.3 \ - Smokeping_sorters_base.3 -MAN5= smokeping_config.5 \ - smokeping_examples.5 -MAN7= smokeping_extend.7 \ - smokeping_install.7 \ - smokeping_master_slave.7 \ - smokeping_upgrade.7 - PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USERS= smokeping @@ -116,7 +55,6 @@ OPTIONS_DEFINE= ECHOPING CURL RADIUS TELNET DNS FPING LDAP LDAPSSL OPTIONS_DEFAULT= FPING -NO_STAGE= yes .include .if ${PORT_OPTIONS:MFPING} @@ -166,15 +104,10 @@ post-install: .for FILE in basepage.html config smokemail tmail - [ -f ${ETCDIR}/${FILE} ] || ${CP} ${ETCDIR}/${FILE}.dist ${ETCDIR}/${FILE} + [ -f ${STAGEDIR}${ETCDIR}/${FILE} ] || ${CP} ${STAGEDIR}${ETCDIR}/${FILE}.dist ${STAGEDIR}${ETCDIR}/${FILE} .endfor - [ -f ${PREFIX}/smokeping/htdocs/smokeping.fcgi ] || ${CP} ${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${PREFIX}/smokeping/htdocs/smokeping.fcgi - ${MKDIR} ${PREFIX}/smokeping/htdocs/img - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/smokeping/htdocs - ${MKDIR} ${PREFIX}/var/smokeping - ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/smokeping -.if !defined(BATCH) - ${CAT} ${PKGMESSAGE} -.endif + [ -f ${PREFIX}/smokeping/htdocs/smokeping.fcgi ] || ${CP} ${STAGEDIR}${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${STAGEDIR}${PREFIX}/smokeping/htdocs/smokeping.fcgi + ${MKDIR} ${STAGEDIR}${PREFIX}/smokeping/htdocs/img + ${MKDIR} ${STAGEDIR}${PREFIX}/var/smokeping .include Index: pkg-plist =================================================================== --- pkg-plist (revision 335354) +++ pkg-plist (working copy) @@ -26,6 +26,8 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.simple %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.targetvars-with-Curl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.template +@owner www +@group www smokeping/htdocs/cropper/cropper.css smokeping/htdocs/cropper/cropper.js smokeping/htdocs/cropper/cropper.uncompressed.js @@ -42,6 +44,8 @@ smokeping/htdocs/cropper/marqueeHoriz.gif smokeping/htdocs/cropper/marqueeVert.gif smokeping/htdocs/cropper/smokeping-zoom.js +@owner +@group smokeping/lib/Smokeping.pm smokeping/lib/Smokeping/Colorspace.pm smokeping/lib/Smokeping/Config.pm @@ -112,7 +116,11 @@ @unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true @exec mkdir -p %D/var/smokeping @exec chown smokeping:smokeping %D/var/smokeping +@owner smokeping +@group smokeping @dirrmtry var/smokeping +@owner +@group @dirrmtry var @dirrm smokeping/lib/Smokeping/sorters @dirrm smokeping/lib/Smokeping/probes @@ -124,3 +132,72 @@ @dirrm smokeping/htdocs %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrmtry smokeping +man/man1/smokeping.1.gz +man/man1/smokeping_cgi.1.gz +man/man1/tSmoke.1.gz +man/man3/Smokeping_matchers_Avgratio.3.gz +man/man3/Smokeping_matchers_CheckLatency.3.gz +man/man3/Smokeping_matchers_CheckLoss.3.gz +man/man3/Smokeping_matchers_ExpLoss.3.gz +man/man3/Smokeping_matchers_Median.3.gz +man/man3/Smokeping_matchers_Medratio.3.gz +man/man3/Smokeping_matchers_base.3.gz +man/man3/Smokeping_probes_AnotherDNS.3.gz +man/man3/Smokeping_probes_AnotherSSH.3.gz +man/man3/Smokeping_probes_CiscoRTTMonDNS.3.gz +man/man3/Smokeping_probes_CiscoRTTMonEchoICMP.3.gz +man/man3/Smokeping_probes_CiscoRTTMonTcpConnect.3.gz +man/man3/Smokeping_probes_Curl.3.gz +man/man3/Smokeping_probes_DNS.3.gz +man/man3/Smokeping_probes_DismanPing.3.gz +man/man3/Smokeping_probes_EchoPing.3.gz +man/man3/Smokeping_probes_EchoPingChargen.3.gz +man/man3/Smokeping_probes_EchoPingDNS.3.gz +man/man3/Smokeping_probes_EchoPingDiscard.3.gz +man/man3/Smokeping_probes_EchoPingHttp.3.gz +man/man3/Smokeping_probes_EchoPingHttps.3.gz +man/man3/Smokeping_probes_EchoPingIcp.3.gz +man/man3/Smokeping_probes_EchoPingLDAP.3.gz +man/man3/Smokeping_probes_EchoPingPlugin.3.gz +man/man3/Smokeping_probes_EchoPingSmtp.3.gz +man/man3/Smokeping_probes_EchoPingWhois.3.gz +man/man3/Smokeping_probes_FPing.3.gz +man/man3/Smokeping_probes_FPing6.3.gz +man/man3/Smokeping_probes_FTPtransfer.3.gz +man/man3/Smokeping_probes_IOSPing.3.gz +man/man3/Smokeping_probes_LDAP.3.gz +man/man3/Smokeping_probes_NFSping.3.gz +man/man3/Smokeping_probes_OpenSSHJunOSPing.3.gz +man/man3/Smokeping_probes_Radius.3.gz +man/man3/Smokeping_probes_RemoteFPing.3.gz +man/man3/Smokeping_probes_SSH.3.gz +man/man3/Smokeping_probes_SendEmail.3.gz +man/man3/Smokeping_probes_SipSak.3.gz +man/man3/Smokeping_probes_TCPPing.3.gz +man/man3/Smokeping_probes_TacacsPlus.3.gz +man/man3/Smokeping_probes_TelnetIOSPing.3.gz +man/man3/Smokeping_probes_TelnetJunOSPing.3.gz +man/man3/Smokeping_probes_WebProxyFilter.3.gz +man/man3/Smokeping_probes_base.3.gz +man/man3/Smokeping_probes_basefork.3.gz +man/man3/Smokeping_probes_basevars.3.gz +man/man3/Smokeping_probes_passwordchecker.3.gz +man/man3/Smokeping_probes_skel.3.gz +man/man3/Smokeping_sorters_Loss.3.gz +man/man3/Smokeping_sorters_Max.3.gz +man/man3/Smokeping_sorters_Median.3.gz +man/man3/Smokeping_sorters_StdDev.3.gz +man/man3/Smokeping_sorters_base.3.gz +man/man5/smokeping_config.5.gz +man/man5/smokeping_examples.5.gz +man/man7/smokeping_extend.7.gz +man/man7/smokeping_install.7.gz +man/man7/smokeping_master_slave.7.gz +man/man7/smokeping_upgrade.7.gz +etc/smokeping/basepage.html +etc/smokeping/config +etc/smokeping/smokemail +etc/smokeping/tmail +smokeping/htdocs/smokeping.fcgi +@dirrmtry smokeping/htdocs/img + Service unavailableService unavailableService unavailable --- smokeping.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: