summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-06-03 22:38:35 +0000
committerpav <pav@FreeBSD.org>2004-06-03 22:38:35 +0000
commit107eee14991cb7089d0ef5d9222e4a160cf7cd50 (patch)
tree7b44b5ed1533724d4129adfc98bcd326f13ec050
parent69d98fe2626872b3efb61e17a8a8d0efb423aa7e (diff)
downloadFreeBSD-ports-107eee14991cb7089d0ef5d9222e4a160cf7cd50.zip
FreeBSD-ports-107eee14991cb7089d0ef5d9222e4a160cf7cd50.tar.gz
- Update to 1.0.0 pre5
PR: ports/67532 Submitted by: Lupe Christoph <lupe@lupe-christoph.de> (maintainer)
Diffstat
-rw-r--r--sysutils/munin-main/Makefile6
-rw-r--r--sysutils/munin-main/distinfo4
-rw-r--r--sysutils/munin-main/files/patch-Makefile11
-rw-r--r--sysutils/munin-main/pkg-install7
-rw-r--r--sysutils/munin-main/pkg-plist3
-rw-r--r--sysutils/munin-master/Makefile6
-rw-r--r--sysutils/munin-master/distinfo4
-rw-r--r--sysutils/munin-master/files/patch-Makefile11
-rw-r--r--sysutils/munin-master/pkg-install7
-rw-r--r--sysutils/munin-master/pkg-plist3
10 files changed, 48 insertions, 14 deletions
diff --git a/sysutils/munin-main/Makefile b/sysutils/munin-main/Makefile
index 2542e33..609b50c 100644
--- a/sysutils/munin-main/Makefile
+++ b/sysutils/munin-main/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= munin
-PORTVERSION= 1.0.0.p3
+PORTVERSION= 1.0.0.p5
CATEGORIES= sysutils perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= munin
PKGNAMESUFFIX= -main
-DISTNAME= munin_1.0.0pre3
+DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/}
MAINTAINER= lupe@lupe-christoph.de
COMMENT= Collector part of Munin
@@ -31,7 +31,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storabl
USE_GMAKE= yes
PATCH_STRIP= -p1
-WRKSRC= ${WRKDIR}/munin-1.0.0pre3
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.p/pre/}
PKGMESSAGE= ${WRKDIR}/pkg-message
ALL_TARGET= DATADIR=${DATADIR} build build-man
INSTALL_TARGET= DATADIR=${DATADIR} install-main
diff --git a/sysutils/munin-main/distinfo b/sysutils/munin-main/distinfo
index 33d0172..e29fd48 100644
--- a/sysutils/munin-main/distinfo
+++ b/sysutils/munin-main/distinfo
@@ -1,2 +1,2 @@
-MD5 (munin_1.0.0pre3.tar.gz) = f1aea51a61304b824dd61d7ad7808f6d
-SIZE (munin_1.0.0pre3.tar.gz) = 120572
+MD5 (munin_1.0.0pre5.tar.gz) = a03ddb5cc2318e6fcd6c4a69d18ac6d0
+SIZE (munin_1.0.0pre5.tar.gz) = 212231
diff --git a/sysutils/munin-main/files/patch-Makefile b/sysutils/munin-main/files/patch-Makefile
new file mode 100644
index 0000000..e67b632
--- /dev/null
+++ b/sysutils/munin-main/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig Tue May 11 22:23:06 2004
++++ Makefile Fri Jun 4 00:25:54 2004
+@@ -26,7 +26,7 @@
+ mkdir -p $(HTMLDIR)
+ mkdir -p $(DBDIR)
+
+- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
++ $(CHOWN) $(USER) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
+
+ for p in server/*.tmpl; do \
+ $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
diff --git a/sysutils/munin-main/pkg-install b/sysutils/munin-main/pkg-install
index 4f1614b..1515949 100644
--- a/sysutils/munin-main/pkg-install
+++ b/sysutils/munin-main/pkg-install
@@ -101,6 +101,13 @@ create_crontab_entries() {
case $2 in
PRE-INSTALL)
+ # Munin had a logo.gif up to 1.0.0pre3.
+ # Remove it, it's been replaced by logo.png
+ rm -f ${PKG_PREFIX}/www/data/munin/logo.gif
+ # The old stylesheet must go, too.
+ rm -f ${PKG_PREFIX}/www/data/munin/style.css
+ # Both new files will be put in place by munin-html
+
make_account munin munin "Munin owner"
make_directories
;;
diff --git a/sysutils/munin-main/pkg-plist b/sysutils/munin-main/pkg-plist
index c97660d..a498e38 100644
--- a/sysutils/munin-main/pkg-plist
+++ b/sysutils/munin-main/pkg-plist
@@ -1,6 +1,6 @@
bin/munin-cron
etc/munin/munin.conf
-etc/munin/templates/logo.gif
+etc/munin/templates/logo.png
etc/munin/templates/munin-domainview.tmpl
etc/munin/templates/munin-nodeview.tmpl
etc/munin/templates/munin-overview.tmpl
@@ -13,7 +13,6 @@ share/munin/munin-nagios
share/munin/munin-update
@unexec rmdir %D/www/data/munin 2>/dev/null || true
@unexec rmdir %D/www/data 2>/dev/null || true
-@unexec rmdir %D/www 2>/dev/null || true
@unexec rmdir %D/var/munin 2>/dev/null || true
@unexec rmdir %D/var 2>/dev/null || true
@unexec rmdir %D/share/munin 2>/dev/null || true
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 2542e33..609b50c 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= munin
-PORTVERSION= 1.0.0.p3
+PORTVERSION= 1.0.0.p5
CATEGORIES= sysutils perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= munin
PKGNAMESUFFIX= -main
-DISTNAME= munin_1.0.0pre3
+DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/}
MAINTAINER= lupe@lupe-christoph.de
COMMENT= Collector part of Munin
@@ -31,7 +31,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storabl
USE_GMAKE= yes
PATCH_STRIP= -p1
-WRKSRC= ${WRKDIR}/munin-1.0.0pre3
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.p/pre/}
PKGMESSAGE= ${WRKDIR}/pkg-message
ALL_TARGET= DATADIR=${DATADIR} build build-man
INSTALL_TARGET= DATADIR=${DATADIR} install-main
diff --git a/sysutils/munin-master/distinfo b/sysutils/munin-master/distinfo
index 33d0172..e29fd48 100644
--- a/sysutils/munin-master/distinfo
+++ b/sysutils/munin-master/distinfo
@@ -1,2 +1,2 @@
-MD5 (munin_1.0.0pre3.tar.gz) = f1aea51a61304b824dd61d7ad7808f6d
-SIZE (munin_1.0.0pre3.tar.gz) = 120572
+MD5 (munin_1.0.0pre5.tar.gz) = a03ddb5cc2318e6fcd6c4a69d18ac6d0
+SIZE (munin_1.0.0pre5.tar.gz) = 212231
diff --git a/sysutils/munin-master/files/patch-Makefile b/sysutils/munin-master/files/patch-Makefile
new file mode 100644
index 0000000..e67b632
--- /dev/null
+++ b/sysutils/munin-master/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig Tue May 11 22:23:06 2004
++++ Makefile Fri Jun 4 00:25:54 2004
+@@ -26,7 +26,7 @@
+ mkdir -p $(HTMLDIR)
+ mkdir -p $(DBDIR)
+
+- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
++ $(CHOWN) $(USER) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
+
+ for p in server/*.tmpl; do \
+ $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
diff --git a/sysutils/munin-master/pkg-install b/sysutils/munin-master/pkg-install
index 4f1614b..1515949 100644
--- a/sysutils/munin-master/pkg-install
+++ b/sysutils/munin-master/pkg-install
@@ -101,6 +101,13 @@ create_crontab_entries() {
case $2 in
PRE-INSTALL)
+ # Munin had a logo.gif up to 1.0.0pre3.
+ # Remove it, it's been replaced by logo.png
+ rm -f ${PKG_PREFIX}/www/data/munin/logo.gif
+ # The old stylesheet must go, too.
+ rm -f ${PKG_PREFIX}/www/data/munin/style.css
+ # Both new files will be put in place by munin-html
+
make_account munin munin "Munin owner"
make_directories
;;
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index c97660d..a498e38 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -1,6 +1,6 @@
bin/munin-cron
etc/munin/munin.conf
-etc/munin/templates/logo.gif
+etc/munin/templates/logo.png
etc/munin/templates/munin-domainview.tmpl
etc/munin/templates/munin-nodeview.tmpl
etc/munin/templates/munin-overview.tmpl
@@ -13,7 +13,6 @@ share/munin/munin-nagios
share/munin/munin-update
@unexec rmdir %D/www/data/munin 2>/dev/null || true
@unexec rmdir %D/www/data 2>/dev/null || true
-@unexec rmdir %D/www 2>/dev/null || true
@unexec rmdir %D/var/munin 2>/dev/null || true
@unexec rmdir %D/var 2>/dev/null || true
@unexec rmdir %D/share/munin 2>/dev/null || true
OpenPOWER on IntegriCloud