Revision: 18255
http://gar.svn.sourceforge.net/gar/?rev=18255&view=rev
Author: j_arndt
Date: 2012-06-07 15:06:01 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
munin/trunk: removed some patches, use of REINPLACE instead
Modified Paths:
--------------
csw/mgar/pkg/munin/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch
csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch
csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch
Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 15:02:40 UTC (rev 18254)
+++ csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 15:06:01 UTC (rev 18255)
@@ -21,13 +21,34 @@
PATCHFILES += 0001-Expand-paths-with-DESTDIR.patch
PATCHFILES += 0001-paths-in-Makefile.config.patch
-PATCHFILES += 0001-Use-CSWtop-in-memory.in.patch
+#PATCHFILES += 0001-Use-CSWtop-in-memory.in.patch
PATCHFILES += 0001-paths-and-hostname-in-munin-node.conf.in.patch
PATCHFILES += 0001-replace-yourhostname-with-hostname-in-postinstall.patch
-PATCHFILES += 0001-paths-in-munin-htaccess.in.patch
+#PATCHFILES += 0001-paths-in-munin-htaccess.in.patch
#PATCHFILES += munin-graph.in.patch # match some paths to
/{etc|var}/opt/csw/munin
-PATCHFILES += 0001-changed-shebang-in-files.patch
+#PATCHFILES += 0001-changed-shebang-in-files.patch
+#
+# Reinplacements
+#
+
+# bad file content ...
+
+REINPLACE_USRLOCAL += plugins/node.d/*
+REINPLACE_USRLOCAL += plugins/node.d.sunos/*
+
+# put the right shebang into perl files
+
+REINPLACEMENTS += perl
+REINPLACE_MATCH_perl = \#!/usr/bin/perl
+REINPLACE_WITH_perl = \#!/opt/csw/bin/perl
+REINPLACE_FILES_perl += node/bin/*
+REINPLACE_FILES_perl += node/sbin/*
+
+#
+#
+#
+
PACKAGES = CSWmunin-master CSWmunin-node CSWmunin-common
CATALOGNAME_CSWmunin-master = munin_master
CATALOGNAME_CSWmunin-node = munin_node
Deleted: csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch
2012-06-07 15:02:40 UTC (rev 18254)
+++ csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch
2012-06-07 15:06:01 UTC (rev 18255)
@@ -1,34 +0,0 @@
-From 02a69c5ed4cd96c71068e1cb1b2f0a2006321396 Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Sun, 3 Jun 2012 18:11:50 +0200
-Subject: [PATCH] Use CSWtop in memory.in
-
----
- plugins/node.d.sunos/memory.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/node.d.sunos/memory.in b/plugins/node.d.sunos/memory.in
-index 98f4bce..fea0a31 100644
---- a/plugins/node.d.sunos/memory.in
-+++ b/plugins/node.d.sunos/memory.in
-@@ -17,7 +17,7 @@ top installed.
- The following shows the default settings for this plugin:
-
- [memory]
-- env.top /usr/local/bin/top
-+ env.top /opt/csw/bin/top
-
- You can also set warning and critical limits with these env settings:
-
-@@ -61,7 +61,7 @@ Fixme: Using kstat would be much better
-
- . $MUNIN_LIBDIR/plugins/plugin.sh
-
--TOP=${top:-/usr/local/bin/top}
-+TOP=${top:-/opt/csw/bin/top}
-
- if [ "$1" = "autoconf" ]; then
- if [ -x $TOP ] ; then
---
-1.7.10.3
-
Deleted: csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch
2012-06-07 15:02:40 UTC (rev 18254)
+++ csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch
2012-06-07 15:06:01 UTC (rev 18255)
@@ -1,55 +0,0 @@
-From 88101738efc1d7b5e46de77f7a21eae0f4b7f838 Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Sun, 3 Jun 2012 18:32:04 +0200
-Subject: [PATCH] changed shebang in files
-
----
- node/bin/munindoc | 2 +-
- node/sbin/munin-node | 2 +-
- node/sbin/munin-node-configure | 2 +-
- node/sbin/munin-run | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/node/bin/munindoc b/node/bin/munindoc
-index e36f87b..e2334a1 100755
---- a/node/bin/munindoc
-+++ b/node/bin/munindoc
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
- # -*- perl -*-
- #
- # This script provides the basis for a plugin documentation system for
-diff --git a/node/sbin/munin-node b/node/sbin/munin-node
-index e664074..6d88caf 100755
---- a/node/sbin/munin-node
-+++ b/node/sbin/munin-node
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wT
-+#!/opt/csw/bin/perl -wT
- # -*- cperl -*-
- #
- # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
-diff --git a/node/sbin/munin-node-configure b/node/sbin/munin-node-configure
-index 3002ea1..86fac19 100755
---- a/node/sbin/munin-node-configure
-+++ b/node/sbin/munin-node-configure
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
- # -*- cperl -*-
- #
- # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
-diff --git a/node/sbin/munin-run b/node/sbin/munin-run
-index cd47952..097df9d 100755
---- a/node/sbin/munin-run
-+++ b/node/sbin/munin-run
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -T
-+#!/opt/csw/bin/perl -T
- # -*- perl -*-
- #
- # Copyright (C) 2004-2009
---
-1.7.10.3
-
Deleted: csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch
2012-06-07 15:02:40 UTC (rev 18254)
+++ csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch
2012-06-07 15:06:01 UTC (rev 18255)
@@ -1,28 +0,0 @@
-From 0e3ebcc0dab328d289f88b2bb07b4a3ecc68c377 Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <j...@opencsw.org>
-Date: Sun, 3 Jun 2012 18:24:50 +0200
-Subject: [PATCH] paths in munin-htaccess.in
-
----
- master/www/munin-htaccess.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/master/www/munin-htaccess.in b/master/www/munin-htaccess.in
-index f6c6321..1838408 100644
---- a/master/www/munin-htaccess.in
-+++ b/master/www/munin-htaccess.in
-@@ -7,9 +7,9 @@
- #
- # As a config file enclose it in <directory> like so:
- #
--# <directory @@HTMLDIR@@>
-+# <directory /var/opt/csw/munin/www>
-
--AuthUserFile @@CONFDIR@@/munin-htpasswd
-+AuthUserFile /etc/opt/csw/munin/munin-htpasswd
- AuthName "Munin"
- AuthType Basic
- require valid-user
---
-1.7.10.3
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
