From lupe@lupe-christoph.de  Sat Nov 20 16:11:35 2004
Return-Path: <lupe@lupe-christoph.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AB44C16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Nov 2004 16:11:35 +0000 (GMT)
Received: from buexe.b-5.de (buexe.b-5.de [80.148.32.30])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B7DD043D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Nov 2004 16:11:33 +0000 (GMT)
	(envelope-from lupe@lupe-christoph.de)
Received: from antalya.lupe-christoph.de (antalya.lupe-christoph.de [172.17.0.9])
	by buexe.b-5.de (8.12.3/8.12.3/b-5/buexe-3.4) with ESMTP id iAKGBUMS009560
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Nov 2004 17:11:31 +0100
Received: from localhost (localhost [127.0.0.1])
	by antalya.lupe-christoph.de (Postfix) with ESMTP id 1FE77B886
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Nov 2004 17:11:25 +0100 (CET)
Received: from antalya.lupe-christoph.de ([127.0.0.1])
	by localhost (antalya [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id 14801-01 for <FreeBSD-gnats-submit@freebsd.org>;
	Sat, 20 Nov 2004 17:11:25 +0100 (CET)
Received: from vmw-freebsd5.lupe-christoph.de (vmw-freebsd5.lupe-christoph.de [172.17.2.15])
	by antalya.lupe-christoph.de (Postfix) with ESMTP id EF704B885
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Nov 2004 17:11:24 +0100 (CET)
Received: by vmw-freebsd5.lupe-christoph.de (Postfix, from userid 1000)
	id E7F8E8031; Sat, 20 Nov 2004 17:08:26 +0100 (CET)
Message-Id: <20041120160826.E7F8E8031@vmw-freebsd5.lupe-christoph.de>
Date: Sat, 20 Nov 2004 17:08:26 +0100 (CET)
From: Lupe Christoph <lupe@lupe-christoph.de>
Reply-To: Lupe Christoph <lupe@lupe-christoph.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: sysutils/munin-main 1.0.3 -> 1.0.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         74165
>Category:       ports
>Synopsis:       Update port: sysutils/munin-main 1.0.3 -> 1.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 20 16:20:30 GMT 2004
>Closed-Date:    Tue Dec 14 01:46:00 GMT 2004
>Last-Modified:  Tue Dec 14 01:46:00 GMT 2004
>Originator:     Lupe Christoph
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD vmw-freebsd5.lupe-christoph.de 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Sun Nov 7 16:52:12 CET 2004 lupe@vmw-freebsd5.lupe-christoph.de:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Update to support Munin 1.0.4
	Remove unchanged config files on deinstall as suggested by Yen-Ming Lee.

	Files changed:
		Makefile
		distinfo
		pkg-plist
>How-To-Repeat:
	
>Fix:

	

--- munin-main-1.0.4.patch begins here ---
diff -ruN munin-main-1.0.3/Makefile munin-main/Makefile
--- munin-main-1.0.3/Makefile	Thu Nov 18 06:56:53 2004
+++ munin-main/Makefile	Sat Nov 20 16:24:27 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	munin
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	munin
@@ -44,6 +44,12 @@
 	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
+	@if [ ! -f ${PREFIX}/www/data-dist/munin/style.css ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/munin/templates/style.css ${PREFIX}/www/data-dist/munin/style.css; \
+	fi
+	@if [ ! -f ${PREFIX}/www/data-dist/munin/logo.png ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/munin/templates/logo.png ${PREFIX}/www/data-dist/munin/logo.png; \
+	fi
 	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin.conf.5 ${PREFIX}/man/man5
 	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-cron.8 ${PREFIX}/man/man8
 	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-graph.8 ${PREFIX}/man/man8
diff -ruN munin-main-1.0.3/distinfo munin-main/distinfo
--- munin-main-1.0.3/distinfo	Thu Nov 18 06:56:53 2004
+++ munin-main/distinfo	Thu Nov 18 07:42:57 2004
@@ -1,2 +1,2 @@
-MD5 (munin_1.0.3.tar.gz) = 8114e4d716e0ec7ac70357a697af28cf
-SIZE (munin_1.0.3.tar.gz) = 214362
+MD5 (munin_1.0.4.tar.gz) = 00721181e1ff81be85ad89307457d998
+SIZE (munin_1.0.4.tar.gz) = 214902
diff -ruN munin-main-1.0.3/pkg-plist munin-main/pkg-plist
--- munin-main-1.0.3/pkg-plist	Sat Jun 12 19:41:59 2004
+++ munin-main/pkg-plist	Sat Nov 20 15:54:52 2004
@@ -1,4 +1,6 @@
 bin/munin-cron
+@unexec if cmp -s %D/etc/munin/templates/style.css %D/www/data-dist/munin/style.css; then rm -f %D/www/data-dist/munin/style.css; fi
+@unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/data-dist/munin/logo.png; then rm -f %D/www/data-dist/munin/logo.png; fi
 etc/munin/munin.conf
 etc/munin/templates/logo.png
 etc/munin/templates/munin-domainview.tmpl
--- munin-main-1.0.4.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Sergey Matveychuk <sem@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, lupe@lupe-christoph.de
Cc:  
Subject: Re: ports/74165: Update port: sysutils/munin-main 1.0.3 -> 1.0.4
Date: Wed, 24 Nov 2004 23:13:53 +0300

 ./install-sh -m 0755 build/server/munin-cron /tmp/test/bin/
 ./install-sh -m 0755 build/server/munin-update /tmp/test/share/munin/
 ./install-sh -m 0755 build/server/munin-nagios /tmp/test/share/munin/
 ./install-sh -m 0755 build/server/munin-graph /tmp/test/share/munin/
 ./install-sh -m 0755 build/server/munin-html /tmp/test/share/munin/
 ./install-sh -m 0644 build/server/Munin.pm 
 /usr/local/lib/perl5/site_perl/5.005/
 install: /tmp/test/www/data-dist/munin/style.css: No such file or directory
 *** Error code 71
 
 Stop in /usr/ports/sysutils/munin-main.
 
 -- 
 Sem.
 

From: Lupe Christoph <lupe@lupe-christoph.de>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/74165: Update port: sysutils/munin-main 1.0.3 -> 1.0.4
Date: Thu, 25 Nov 2004 08:02:42 +0100

 On Wednesday, 2004-11-24 at 23:13:53 +0300, Sergey Matveychuk wrote:
 > ./install-sh -m 0755 build/server/munin-cron /tmp/test/bin/
 > ./install-sh -m 0755 build/server/munin-update /tmp/test/share/munin/
 > ./install-sh -m 0755 build/server/munin-nagios /tmp/test/share/munin/
 > ./install-sh -m 0755 build/server/munin-graph /tmp/test/share/munin/
 > ./install-sh -m 0755 build/server/munin-html /tmp/test/share/munin/
 > ./install-sh -m 0644 build/server/Munin.pm 
 > /usr/local/lib/perl5/site_perl/5.005/
 > install: /tmp/test/www/data-dist/munin/style.css: No such file or directory
 > *** Error code 71
 
 > Stop in /usr/ports/sysutils/munin-main.
 
 OK, I skipped a little sleep to get this done. It was a mixup between
 $(PREFIX)/www/data and $(PREFIX)/www/data-dist. I'm still not sure which
 one I *should* use, but using both and relying on the symlink created by
 Apache is definitely bad.
 
 You can either do a %s/data-dist/data/g on the patch or use the new one
 that follows.
 
 Thanks,
 Lupe Christoph
 
 --- munin-main-1.0.4.patch begins here ---
 diff -ruN /usr/ports/sysutils/munin-main/Makefile munin-main-1.0.4/Makefile
 --- /usr/ports/sysutils/munin-main/Makefile	Thu Nov 18 06:56:53 2004
 +++ munin-main-1.0.4/Makefile	Wed Nov 24 23:03:19 2004
 @@ -6,7 +6,7 @@
 
  
  PORTNAME=	munin
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -44,6 +44,12 @@
  	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
  
  post-install:
 +	@if [ ! -f ${PREFIX}/www/data/munin/style.css ]; then \
 +		${INSTALL_DATA} ${PREFIX}/etc/munin/templates/style.css ${PREFIX}/www/data/munin/style.css; \
 +	fi
 +	@if [ ! -f ${PREFIX}/www/data/munin/logo.png ]; then \
 +		${INSTALL_DATA} ${PREFIX}/etc/munin/templates/logo.png ${PREFIX}/www/data/munin/logo.png; \
 +	fi
  	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin.conf.5 ${PREFIX}/man/man5
  	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-cron.8 ${PREFIX}/man/man8
  	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-graph.8 ${PREFIX}/man/man8
 diff -ruN /usr/ports/sysutils/munin-main/distinfo munin-main-1.0.4/distinfo
 --- /usr/ports/sysutils/munin-main/distinfo	Thu Nov 18 06:56:53 2004
 +++ munin-main-1.0.4/distinfo	Wed Nov 24 22:59:37 2004
 @@ -1,2 +1,2 @@
 -MD5 (munin_1.0.3.tar.gz) = 8114e4d716e0ec7ac70357a697af28cf
 -SIZE (munin_1.0.3.tar.gz) = 214362
 +MD5 (munin_1.0.4.tar.gz) = 00721181e1ff81be85ad89307457d998
 +SIZE (munin_1.0.4.tar.gz) = 214902
 diff -ruN /usr/ports/sysutils/munin-main/pkg-plist munin-main-1.0.4/pkg-plist
 --- /usr/ports/sysutils/munin-main/pkg-plist	Sat Jun 12 19:41:59 2004
 +++ munin-main-1.0.4/pkg-plist	Wed Nov 24 22:59:38 2004
 @@ -1,4 +1,6 @@
  bin/munin-cron
 +@unexec if cmp -s %D/etc/munin/templates/style.css %D/www/data-dist/munin/style.css; then rm -f %D/www/data-dist/munin/style.css; fi
 +@unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/data-dist/munin/logo.png; then rm -f %D/www/data-dist/munin/logo.png; fi
  etc/munin/munin.conf
  etc/munin/templates/logo.png
  etc/munin/templates/munin-domainview.tmpl
 -- munin-main-1.0.4.patch ends here ---
 -- 
 | lupe@lupe-christoph.de       |           http://www.lupe-christoph.de/ |
 | "... putting a mail server on the Internet without filtering is like   |
 | covering yourself with barbecue sauce and breaking into the Charity    |
 | Home for Badgers with Rabies.                            Michael Lucas |

From: Lupe Christoph <lupe@lupe-christoph.de>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: Sergey Matveychuk <sem@FreeBSD.org>
Subject: Re: ports/74165: Update port: sysutils/munin-main 1.0.3 -> 1.0.4
Date: Fri, 26 Nov 2004 19:47:11 +0100

 I'm getting too little sleep. This should not have gone to PR #74166.
 
 Sorry,
 Lupe Christoph
 ----- Forwarded message from Lupe Christoph <lupe@lupe-christoph.de> -----
 
 From: Lupe Christoph <lupe@lupe-christoph.de>
 To: FreeBSD-gnats-submit@FreeBSD.org
 Cc: Sergey Matveychuk <sem@FreeBSD.org>
 Date: Fri, 26 Nov 2004 08:22:59 +0100
 Subject: Re: ports/74166: Update port: sysutils/munin-node 1.0.3 -> 1.0.4
 
 Third version of the update patch. Now it has a deinstall message.
 Previously, only munin-node had this, and for both ports. The deinstall
 message in munin-node gets corrected by a correspondingly changed update
 patch. Both messages refer to the other port for common parts.
 
 Lupe Christoph
 --- munin-main-1.0.4.patch begins here ---
 diff -ruN /usr/ports/sysutils/munin-main/Makefile munin-main-1.0.4/Makefile
 --- /usr/ports/sysutils/munin-main/Makefile	Thu Nov 18 06:56:53 2004
 +++ munin-main-1.0.4/Makefile	Wed Nov 24 23:03:19 2004
 @@ -6,7 +6,7 @@
 
  
  PORTNAME=	munin
 -PORTVERSION=	1.0.3
 +PORTVERSION=	1.0.4
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -44,6 +44,12 @@
  	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
  
  post-install:
 +	@if [ ! -f ${PREFIX}/www/data/munin/style.css ]; then \
 +		${INSTALL_DATA} ${PREFIX}/etc/munin/templates/style.css ${PREFIX}/www/data/munin/style.css; \
 +	fi
 +	@if [ ! -f ${PREFIX}/www/data/munin/logo.png ]; then \
 +		${INSTALL_DATA} ${PREFIX}/etc/munin/templates/logo.png ${PREFIX}/www/data/munin/logo.png; \
 +	fi
  	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin.conf.5 ${PREFIX}/man/man5
  	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-cron.8 ${PREFIX}/man/man8
  	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin-graph.8 ${PREFIX}/man/man8
 diff -ruN /usr/ports/sysutils/munin-main/distinfo munin-main-1.0.4/distinfo
 --- /usr/ports/sysutils/munin-main/distinfo	Thu Nov 18 06:56:53 2004
 +++ munin-main-1.0.4/distinfo	Wed Nov 24 22:59:37 2004
 @@ -1,2 +1,2 @@
 -MD5 (munin_1.0.3.tar.gz) = 8114e4d716e0ec7ac70357a697af28cf
 -SIZE (munin_1.0.3.tar.gz) = 214362
 +MD5 (munin_1.0.4.tar.gz) = 00721181e1ff81be85ad89307457d998
 +SIZE (munin_1.0.4.tar.gz) = 214902
 diff -ruN /usr/ports/sysutils/munin-main/pkg-plist munin-main-1.0.4/pkg-plist
 --- /usr/ports/sysutils/munin-main/pkg-plist	Sat Jun 12 19:41:59 2004
 +++ munin-main-1.0.4/pkg-plist	Fri Nov 26 07:56:37 2004
 @@ -1,4 +1,6 @@
  bin/munin-cron
 +@unexec if cmp -s %D/etc/munin/templates/style.css %D/www/data-dist/munin/style.css; then rm -f %D/www/data-dist/munin/style.css; fi
 +@unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/data-dist/munin/logo.png; then rm -f %D/www/data-dist/munin/logo.png; fi
  etc/munin/munin.conf
  etc/munin/templates/logo.png
  etc/munin/templates/munin-domainview.tmpl
 @@ -18,3 +20,22 @@
  @unexec rmdir %D/share/munin 2>/dev/null || true
  @dirrm etc/munin/templates
  @unexec rmdir %D/etc/munin 2>/dev/null || true
 +@unexec echo
 +@unexec echo '********************************************************************'
 +@unexec echo "If you want to *completely* remove munin-main, you have to"
 +@unexec echo
 +@unexec echo "    rm -rf %D/var/munin/datafile %D/www/data/munin \\"
 +@unexec echo "          "`ls -d /usr/local/var/munin/* | grep -v plugin-state`" \\"
 +@unexec if [ -f %D/etc/munin/munin.conf ]; then echo "           %D/etc/munin/munin.conf \\"; fi
 +@unexec if [ -d %D/etc/munin/templates ]; then echo "           %D/etc/munin/templates \\"; fi
 +@unexec echo "           %D/etc/munin/munin-node.conf %D/etc/munin/plugins \\"
 +@unexec echo "           /var/log/munin"
 +@unexec echo
 +@unexec echo "If you have already deinstalled munin-node, you can also"
 +@unexec echo
 +@unexec echo "    rmdir %D/etc/munin %D/var/munin"
 +@unexec echo
 +@unexec echo "These files and directories have to be left on the system because"
 +@unexec echo "you may be performing an update. This process can't tell."
 +@unexec echo '********************************************************************'
 +@unexec echo
  -- munin-main-1.0.4.patch ends here ---
 -- 
 | lupe@lupe-christoph.de       |           http://www.lupe-christoph.de/ |
 | "... putting a mail server on the Internet without filtering is like   |
 | covering yourself with barbecue sauce and breaking into the Charity    |
 | Home for Badgers with Rabies.                            Michael Lucas |
 
 ----- End forwarded message -----
 
 -- 
 | lupe@lupe-christoph.de       |           http://www.lupe-christoph.de/ |
 | "... putting a mail server on the Internet without filtering is like   |
 | covering yourself with barbecue sauce and breaking into the Charity    |
 | Home for Badgers with Rabies.                            Michael Lucas |
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Tue Dec 14 01:45:52 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74165 
>Unformatted:
