From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 29 23:10:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77B2D1065670 for ; Thu, 29 May 2008 23:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 505E58FC19 for ; Thu, 29 May 2008 23:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m4TNA2TM057611 for ; Thu, 29 May 2008 23:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m4TNA2bp057610; Thu, 29 May 2008 23:10:02 GMT (envelope-from gnats) Resent-Date: Thu, 29 May 2008 23:10:02 GMT Resent-Message-Id: <200805292310.m4TNA2bp057610@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, Alexander Logvinov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C468106567C for ; Thu, 29 May 2008 23:01:29 +0000 (UTC) (envelope-from user@blg.akavia.ru) Received: from blg.akavia.ru (blg.akavia.ru [62.33.174.250]) by mx1.freebsd.org (Postfix) with ESMTP id 315CA8FC16 for ; Thu, 29 May 2008 23:01:27 +0000 (UTC) (envelope-from user@blg.akavia.ru) Received: from blg.akavia.ru (localhost [127.0.0.1]) by blg.akavia.ru (8.14.2/8.14.2) with ESMTP id m4TN1P8S052214; Fri, 30 May 2008 09:01:25 +1000 (YAKST) (envelope-from user@blg.akavia.ru) Received: (from root@localhost) by blg.akavia.ru (8.14.2/8.14.2/Submit) id m4TN1Njr052213; Fri, 30 May 2008 09:01:23 +1000 (YAKST) (envelope-from user) Message-Id: <200805292301.m4TN1Njr052213@blg.akavia.ru> Date: Fri, 30 May 2008 09:01:23 +1000 (YAKST) From: Alexander Logvinov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Alexander Logvinov Subject: ports/124116: [PATCH] net-mgmt/mrtg: update to 2.16.2 and take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Logvinov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2008 23:10:02 -0000 >Number: 124116 >Category: ports >Synopsis: [PATCH] net-mgmt/mrtg: update to 2.16.2 and take maintainership >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: Thu May 29 23:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Alexander Logvinov >Release: FreeBSD 6.3-RELEASE-p1 i386 >Organization: >Environment: >Description: - Update to 2.16.2 - Try to fix ports/116934 - Take maintainership >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/mrtg/Makefile,v retrieving revision 1.97 diff -u -r1.97 Makefile --- Makefile 29 May 2008 21:06:35 -0000 1.97 +++ Makefile 29 May 2008 22:35:59 -0000 @@ -6,8 +6,7 @@ # PORTNAME= mrtg -PORTVERSION= 2.16.0 -PORTREVISION= 1 +PORTVERSION= 2.16.2 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ @@ -15,7 +14,7 @@ ftp://ftp.nstu.ru/pub/sources/nettools/monitoring/ \ ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@logvinov.com COMMENT= The multi-router traffic grapher LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd @@ -32,7 +31,7 @@ MRTG_GID?= 279 MRTG_RUNDIR?= /var/run/mrtg -USE_RC_SUBR= mrtg_daemon.sh +USE_RC_SUBR= mrtg_daemon SUB_FILES= pkg-install pkg-message SUB_LIST= PERL=${PERL} \ MRTG_USER=${MRTG_USER} \ @@ -80,16 +79,16 @@ .endif post-patch: - ${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm + @${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm pre-configure: - ${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g;' \ + @${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g;' \ -e 's,%%MRTG_GROUP%%,${MRTG_GROUP},g;' \ -e 's,%%MRTG_UID%%,${MRTG_UID},g;' \ -e 's,%%MRTG_GID%%,${MRTG_GID},g;' \ -e 's,%%MRTG_RUNDIR%%,${MRTG_RUNDIR},g;' \ < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} - ${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ + @${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ PRE-INSTALL do-install: Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net-mgmt/mrtg/distinfo,v retrieving revision 1.60 diff -u -r1.60 distinfo --- distinfo 24 May 2008 02:31:24 -0000 1.60 +++ distinfo 29 May 2008 22:24:05 -0000 @@ -1,3 +1,3 @@ -MD5 (mrtg-2.16.0.tar.gz) = 568c8f3d7eca2d20607aa7ea7281f897 -SHA256 (mrtg-2.16.0.tar.gz) = 97b2788b82d67960260ee9366fc3f84794442fdb3d111480218c6b1560c50fa1 -SIZE (mrtg-2.16.0.tar.gz) = 1078505 +MD5 (mrtg-2.16.2.tar.gz) = 06de09c0ee0d35a0142afed5b275b4cd +SHA256 (mrtg-2.16.2.tar.gz) = ce9ec97bb6c8f94a8d8bb2d3cfa7e72b73754ed7a1081e7aca1c8cece5ce3385 +SIZE (mrtg-2.16.2.tar.gz) = 1078423 Index: files/mrtg_daemon.in =================================================================== RCS file: files/mrtg_daemon.in diff -N files/mrtg_daemon.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/mrtg_daemon.in 29 May 2008 22:38:22 -0000 @@ -0,0 +1,37 @@ +#!/bin/sh +# +# $FreeBSD$ + +# +# PROVIDE: mrtg_daemon +# REQUIRE: DAEMON bsnmpd snmpd + +. %%RC_SUBR%% + + +name="mrtg_daemon" +rcvar=`set_rcvar` + +load_rc_config $name + +: ${mrtg_daemon_enable="NO"} +: ${mrtg_daemon_pidfile="/var/run/mrtg/mrtg.pid"} +: ${mrtg_daemon_user="mrtg"} +: ${mrtg_daemon_group="mrtg"} +: ${mrtg_daemon_config="%%ETCDIR%%/mrtg.cfg"} + +: ${mrtg_daemon_flags="--pid-file $mrtg_daemon_pidfile --lock-file /var/run/mrtg/lockfile --confcache-file /var/run/mrtg/confcache --user $mrtg_daemon_user --group $mrtg_daemon_group --daemon $mrtg_daemon_config"} + +start_precmd="mrtg_daemon_precmd" + +command="%%PREFIX%%/bin/mrtg" +command_interpreter="%%PERL%%" +pidfile=${mrtg_daemon_pidfile} + +mrtg_daemon_precmd() +{ + rm -f /var/run/mrtg/lockfile /var/run/mrtg/confcache $mrtg_daemon_pidfile + export LANG=C +} + +run_rc_command "$1" Index: files/mrtg_daemon.sh.in =================================================================== RCS file: files/mrtg_daemon.sh.in diff -N files/mrtg_daemon.sh.in --- files/mrtg_daemon.sh.in 30 May 2007 09:26:18 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/net-mgmt/mrtg/files/mrtg_daemon.sh.in,v 1.6 2007/05/30 09:26:18 demon Exp $ - -# -# PROVIDE: mrtg_daemon -# REQUIRE: DAEMON bsnmpd snmpd - -. %%RC_SUBR%% - - -name="mrtg_daemon" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${mrtg_daemon_enable="NO"} -: ${mrtg_daemon_pidfile="/var/run/mrtg/mrtg.pid"} -: ${mrtg_daemon_user="mrtg"} -: ${mrtg_daemon_group="mrtg"} -: ${mrtg_daemon_config="%%ETCDIR%%/mrtg.cfg"} - -: ${mrtg_daemon_flags="--pid-file $mrtg_daemon_pidfile --lock-file /var/run/mrtg/lockfile --confcache-file /var/run/mrtg/confcache --user $mrtg_daemon_user --group $mrtg_daemon_group --daemon $mrtg_daemon_config"} - -start_precmd="mrtg_daemon_precmd" - -command="%%PREFIX%%/bin/mrtg" -command_interpreter="%%PERL%%" -pidfile=${mrtg_daemon_pidfile} - -mrtg_daemon_precmd() -{ - rm -f /var/run/mrtg/lockfile /var/run/mrtg/confcache $mrtg_daemon_pidfile -} - -run_rc_command "$1" - >Release-Note: >Audit-Trail: >Unformatted: