From d2f9885ab83d4d2c0e5f62f81c482fe896c41da4 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 21 Jul 2006 16:23:42 +0000
Subject: Create cgidir before installing into it -- fixes installation. Add
 some missing directories to PLIST. Bump PKGREVISION.

---
 sysutils/munin-server/Makefile         |  3 ++-
 sysutils/munin-server/PLIST            |  7 ++++++-
 sysutils/munin-server/distinfo         |  4 ++--
 sysutils/munin-server/patches/patch-ad | 20 ++++++++++++++------
 4 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/munin-server/Makefile b/sysutils/munin-server/Makefile
index 1538256df5a..31f073ca568 100644
--- a/sysutils/munin-server/Makefile
+++ b/sysutils/munin-server/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/07/07 22:10:07 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/07/21 16:23:42 wiz Exp $
 #
 
 DISTNAME=	${PKGNAME:S:-server-:_:}
 PKGNAME=	munin-server-1.3.1
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=munin/}
 
diff --git a/sysutils/munin-server/PLIST b/sysutils/munin-server/PLIST
index f84447d842d..67d1a6071e4 100644
--- a/sysutils/munin-server/PLIST
+++ b/sysutils/munin-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/06/08 19:16:24 he Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/21 16:23:42 wiz Exp $
 bin/munin-cron
 lib/munin/munin-graph
 lib/munin/munin-html
@@ -20,5 +20,10 @@ www/munin/data/cgi/munin-cgi-graph
 ${PERL5_SITELIB}/Munin.pm
 @comment pkg-specific directories:
 @dirrm share/examples/munin/templates
+@dirrm share/examples/munin
+@dirrm www/munin/data/cgi
+@dirrm www/munin/data
+@dirrm www/munin
+@dirrm www
 @comment shared with munin-node
 @unexec ${RMDIR} %D/lib/munin 2>/dev/null || ${TRUE}
diff --git a/sysutils/munin-server/distinfo b/sysutils/munin-server/distinfo
index 938d0d5a7b8..2caf9067e1b 100644
--- a/sysutils/munin-server/distinfo
+++ b/sysutils/munin-server/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/06/08 19:16:24 he Exp $
+$NetBSD: distinfo,v 1.2 2006/07/21 16:23:42 wiz Exp $
 
 SHA1 (munin_1.3.1.tar.gz) = f7783b645abbb25524c3f1b6e0fe27185f1de3db
 RMD160 (munin_1.3.1.tar.gz) = a6ea4e1839f4c787457e4051d55007b7bcebd1d4
 Size (munin_1.3.1.tar.gz) = 315743 bytes
 SHA1 (patch-aa) = 7582a840614389f5fb4bf672cd4ea1e4b6822dd5
 SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80
-SHA1 (patch-ad) = 1ecac375a3c340200e3aa7ecad96a1351ff1da79
+SHA1 (patch-ad) = f59ed32d7ca4acf72dfa32d8151b4ffa4c0f41a9
 SHA1 (patch-ae) = ac8f4f5b7abf03c057ff293ab82c7176bc51a3f6
diff --git a/sysutils/munin-server/patches/patch-ad b/sysutils/munin-server/patches/patch-ad
index f84d4dd52d1..c66af5a5c8c 100644
--- a/sysutils/munin-server/patches/patch-ad
+++ b/sysutils/munin-server/patches/patch-ad
@@ -1,17 +1,25 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/06/08 19:16:24 he Exp $
+$NetBSD: patch-ad,v 1.2 2006/07/21 16:23:42 wiz Exp $
 
---- Makefile.orig	2004-12-22 22:33:47.000000000 +0100
+--- Makefile.orig	2004-12-22 21:33:47.000000000 +0000
 +++ Makefile
-@@ -17,6 +17,7 @@ install: install-main install-node insta
+@@ -16,7 +16,7 @@ install: install-main install-node insta
+ 
  install-main: build
  	$(CHECKUSER)
- 	mkdir -p $(CONFDIR)/templates
+-	mkdir -p $(CONFDIR)/templates
 +	mkdir -p $(EGDIR)/templates
  	mkdir -p $(LIBDIR)
  	mkdir -p $(BINDIR)
  	mkdir -p $(PERLLIB)
-@@ -29,13 +30,11 @@ install-main: build
- 	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
+@@ -24,18 +24,17 @@ install-main: build
+ 	mkdir -p $(LOGDIR)
+ 	mkdir -p $(STATEDIR)
+ 	mkdir -p $(HTMLDIR)
++	mkdir -p $(CGIDIR)
+ 	mkdir -p $(DBDIR)
+ 
+-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
++	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) $(CGIDIR)
  
  	for p in build/server/*.tmpl; do    		              \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
-- 
cgit v1.2.3