From user@blg.akavia.ru  Fri May 25 13:29:54 2007
Return-Path: <user@blg.akavia.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 89AC416A46B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 25 May 2007 13:29:54 +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 88FAD13C48A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 25 May 2007 13:29:52 +0000 (UTC)
	(envelope-from user@blg.akavia.ru)
Received: from blg.akavia.ru (localhost [127.0.0.1])
	by blg.akavia.ru (8.13.8/8.13.8) with ESMTP id l4PDToTC042451;
	Fri, 25 May 2007 23:29:50 +1000 (YAKST)
	(envelope-from user@blg.akavia.ru)
Received: (from root@localhost)
	by blg.akavia.ru (8.13.8/8.13.8/Submit) id l4PDToYD042450;
	Fri, 25 May 2007 23:29:50 +1000 (YAKST)
	(envelope-from user)
Message-Id: <200705251329.l4PDToYD042450@blg.akavia.ru>
Date: Fri, 25 May 2007 23:29:50 +1000 (YAKST)
From: Alexander Logvinov <ports@logvinov.com>
Reply-To: Alexander Logvinov <ports@logvinov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: demon@freebsd.org
Subject: [PATCH] net-mgmt/mrtg: update to 2.15.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         112994
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/mrtg: update to 2.15.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    demon
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 25 13:30:07 GMT 2007
>Closed-Date:    Wed May 30 09:26:50 GMT 2007
>Last-Modified:  Wed May 30 09:30:06 GMT 2007
>Originator:     Alexander Logvinov
>Release:        FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:

>Description:

    Update to 2.15.2
    Respect ETCDIR
    
>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/mrtg/Makefile,v
retrieving revision 1.93
diff -u -r1.93 Makefile
--- Makefile	19 May 2007 20:19:47 -0000	1.93
+++ Makefile	25 May 2007 13:24:54 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mrtg
-PORTVERSION=	2.15.1
-PORTREVISION=	1
+PORTVERSION=	2.15.2
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
@@ -55,7 +54,7 @@
 		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
-		${MKDIR} -m 755 ${PREFIX}/etc/mrtg
+		${MKDIR} -m 755 ${ETCDIR}
 		${MKDIR} -m 755 ${DATADIR}
 .if !defined(NOPORTDOCS)
 		${MKDIR} -m 755 ${DOCSDIR}
@@ -64,7 +63,7 @@
 			${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \
 		done
 .endif
-		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample
+		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample
 		${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}
 		${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
 		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL}
@@ -78,7 +77,7 @@
 .if !defined(BATCH)
 	@${ECHO} ""
 	@${ECHO} "############################################################################"
-	@${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg                  #"
+	@${ECHO} "# Please create a MRTG config file in ${ETCDIR}                  #"
 	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
 	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
 	@${ECHO} "#                                                                          #"
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/mrtg/distinfo,v
retrieving revision 1.58
diff -u -r1.58 distinfo
--- distinfo	5 Feb 2007 11:45:39 -0000	1.58
+++ distinfo	25 May 2007 13:01:33 -0000
@@ -1,3 +1,3 @@
-MD5 (mrtg-2.15.1.tar.gz) = 32f5c62c0b6fc9b2f9cb00fe3098811d
-SHA256 (mrtg-2.15.1.tar.gz) = 6d9bd56d511939268b17100b98937f599f1c6c49a4f40b3df16fcf5b0a3b07bc
-SIZE (mrtg-2.15.1.tar.gz) = 1069188
+MD5 (mrtg-2.15.2.tar.gz) = 5827175dd5ee941c2ae894369f0c9071
+SHA256 (mrtg-2.15.2.tar.gz) = 3456f358c1ea5ae5182153169c3effd2cd4b071c4d12f36e03947a62372f87ab
+SIZE (mrtg-2.15.2.tar.gz) = 1070900
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/mrtg/pkg-plist,v
retrieving revision 1.22
diff -u -r1.22 pkg-plist
--- pkg-plist	5 Feb 2007 11:45:39 -0000	1.22
+++ pkg-plist	25 May 2007 13:13:47 -0000
@@ -2,7 +2,7 @@
 bin/indexmaker
 bin/mrtg
 bin/rateup
-etc/mrtg/mrtg.cfg.sample
+%%ETCDIR%%/mrtg.cfg.sample
 %%SITE_PERL%%/MRTG_lib.pm
 %%SITE_PERL%%/Net_SNMP_util.pm
 %%SITE_PERL%%/locales_mrtg.pm
@@ -57,7 +57,7 @@
 %%DATADIR%%/mrtg-r.png
 %%DATADIR%%/mrtg-ti.gif
 %%DATADIR%%/mrtg-ti.png
-@dirrmtry etc/mrtg
+@dirrmtry %%ETCDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @dirrmtry /var/run/mrtg
Index: files/mrtg_daemon.sh.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/mrtg/files/mrtg_daemon.sh.in,v
retrieving revision 1.5
diff -u -r1.5 mrtg_daemon.sh.in
--- files/mrtg_daemon.sh.in	23 Apr 2006 17:39:52 -0000	1.5
+++ files/mrtg_daemon.sh.in	25 May 2007 13:12:30 -0000
@@ -18,7 +18,7 @@
 : ${mrtg_daemon_pidfile="/var/run/mrtg/mrtg.pid"}
 : ${mrtg_daemon_user="mrtg"}
 : ${mrtg_daemon_group="mrtg"}
-: ${mrtg_daemon_config="%%PREFIX%%/etc/mrtg/mrtg.cfg"}
+: ${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"}
 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->demon 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri May 25 13:30:33 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112994 
State-Changed-From-To: open->closed 
State-Changed-By: demon 
State-Changed-When: Wed May 30 09:26:33 UTC 2007 
State-Changed-Why:  
Port updated, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112994 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/112994: commit references a PR
Date: Wed, 30 May 2007 09:26:25 +0000 (UTC)

 demon       2007-05-30 09:26:18 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/mrtg        Makefile distinfo pkg-plist 
     net-mgmt/mrtg/files  mrtg_daemon.sh.in 
   Log:
   Update to 2.15.2.
   
   PR:             112994
   Submitted by:   Alexander Logvinov <ports@logvinov.com>
   
   Revision  Changes    Path
   1.94      +4 -5      ports/net-mgmt/mrtg/Makefile
   1.59      +3 -3      ports/net-mgmt/mrtg/distinfo
   1.6       +2 -2      ports/net-mgmt/mrtg/files/mrtg_daemon.sh.in
   1.23      +2 -2      ports/net-mgmt/mrtg/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
