Date: Thu, 25 Nov 2004 07:10:30 GMT From: Lupe Christoph <lupe@lupe-christoph.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/74165: Update port: sysutils/munin-main 1.0.3 -> 1.0.4 Message-ID: <200411250710.iAP7AUZl044911@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/74165; it has been noted by GNATS.
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 |
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411250710.iAP7AUZl044911>