[csw-devel] SF.net SVN: gar:[12152] csw/mgar/pkg/munin/trunk

j_arndt at users.sourceforge.net j_arndt at users.sourceforge.net
Sun Jan 2 22:12:33 CET 2011


Revision: 12152
          http://gar.svn.sourceforge.net/gar/?rev=12152&view=rev
Author:   j_arndt
Date:     2011-01-02 21:12:33 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
munin: changed dependencies to match new rrdtool packages

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/munin/trunk/files/Makefile.config.patch
    csw/mgar/pkg/munin/trunk/files/Makefile.patch

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2011-01-02 19:06:14 UTC (rev 12151)
+++ csw/mgar/pkg/munin/trunk/Makefile	2011-01-02 21:12:33 UTC (rev 12152)
@@ -49,7 +49,7 @@
 ARCHALL_CSWmunincommon = 1
 
 RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon
-RUNTIME_DEP_PKGS_CSWmuninmaster += CSWrrd CSWapache2
+RUNTIME_DEP_PKGS_CSWmuninmaster += CSWrrdtool CSWpm-rrdtool CSWapache2 
 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils
 
 RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon
@@ -79,10 +79,8 @@
 	@$(MAKECOOKIE)
 
 install-custom:
-	@cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp
-	@mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config
-	@( cd $(WORKSRC); gmake -f Makefile ; gmake -f Makefile install)
-	#mv $(DESTDIR)/opt/csw/lib/plugins $(DESTDIR)/opt/csw/lib/munin_plugins
+	@cat $(WORKSRC)/Makefile | sed -e "s;DESTDIR =;& $(DESTDIR);g" > $(WORKSRC)/Makefile.tmp
+	@( cd $(WORKSRC); gmake -f Makefile ; cp Makefile.tmp Makefile ; gmake -f Makefile install)
 	@mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW
 	@mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW
 	@mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/var/opt/csw/munin/www/.htaccess.CSW

Modified: csw/mgar/pkg/munin/trunk/files/Makefile.config.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/Makefile.config.patch	2011-01-02 19:06:14 UTC (rev 12151)
+++ csw/mgar/pkg/munin/trunk/files/Makefile.config.patch	2011-01-02 21:12:33 UTC (rev 12152)
@@ -1,22 +1,17 @@
-From 0298d86c798e9ad08f763a05932b3bdc1d5db118 Mon Sep 17 00:00:00 2001
+From 9cdc800db0243d4b6ab1464fbf5e989252e655e4 Mon Sep 17 00:00:00 2001
 From: Juergen Arndt <ja at opencsw.org>
-Date: Sun, 11 Jul 2010 18:03:49 +0200
-Subject: [PATCH] set paths to match OpenCSW
+Date: Sun, 2 Jan 2011 20:43:45 +0100
+Subject: [PATCH] changed pathes for OpenCSW
 
 ---
- Makefile.config |   42 ++++++++++++++++++++++--------------------
- 1 files changed, 22 insertions(+), 20 deletions(-)
+ Makefile.config |   40 ++++++++++++++++++++--------------------
+ 1 files changed, 20 insertions(+), 20 deletions(-)
 
 diff --git a/Makefile.config b/Makefile.config
-index 84f155b..cacaf20 100644
+index 84f155b..2eb37ea 100644
 --- a/Makefile.config
 +++ b/Makefile.config
-@@ -14,13 +14,15 @@
- # and LOGDIR as subdirectories.  Today, DBDIR contains configured
- # domains, as well as PLUGSTATE, and we risk collisions.
- 
-+DESTDIR=$(DESTDIR)
-+
+@@ -17,10 +17,10 @@
  #
  # the base of the Munin installation.
  # 
@@ -29,7 +24,7 @@
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
-@@ -29,47 +31,47 @@ BINDIR     = $(PREFIX)/bin
+@@ -29,47 +29,47 @@ BINDIR     = $(PREFIX)/bin
  SBINDIR    = $(PREFIX)/sbin
  
  # Where to put text and html documentation
@@ -88,7 +83,7 @@
  
  # The ruby interpreter to use (used by some plugins)
  RUBY       := /usr/bin/env ruby
-@@ -95,11 +97,11 @@ JAVALIBDIR:= $(LIBDIR)
+@@ -95,11 +95,11 @@ JAVALIBDIR:= $(LIBDIR)
  GOODSH     := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
  
  # Path of bash for bash specific plugins
@@ -102,7 +97,7 @@
  
  # Client only - Install plugins for this architecture
  OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
-@@ -111,7 +113,7 @@ HOSTNAME   := $(shell hostname)
+@@ -111,7 +111,7 @@ HOSTNAME   := $(shell hostname)
  # What is the safest way to create a tempfile.
  # Default is to figure it out by testing various methods.
  # Replace this with a known platform-specific method
@@ -111,7 +106,7 @@
  
  # Munin version number.
  VERSION    := $(shell ./getversion)
-@@ -126,9 +128,9 @@ PLUGINUSER := nobody
+@@ -126,9 +126,9 @@ PLUGINUSER := nobody
  # Which command to use to check if the USER and GROUP to run Munin as, exists.
  # These will work on most modern OSes:
  #
@@ -124,12 +119,12 @@
  
  # For OSX, comment out the previous two lines and comment in these
  #
-@@ -159,4 +161,4 @@ JAR        := jar
+@@ -159,4 +159,4 @@ JAR        := jar
  JCVALID    := $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes")
  
  # Check whether setruid functionality can be used
 -HASSETR    := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
 +HASSETR    := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' )
 -- 
-1.7.1
+1.7.3.2
 

Modified: csw/mgar/pkg/munin/trunk/files/Makefile.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/Makefile.patch	2011-01-02 19:06:14 UTC (rev 12151)
+++ csw/mgar/pkg/munin/trunk/files/Makefile.patch	2011-01-02 21:12:33 UTC (rev 12152)
@@ -1,17 +1,26 @@
-From 7ce22ffb9ee515d86ca799df9d8cc20fe723ffd0 Mon Sep 17 00:00:00 2001
+From 1870ed31733cc218c7a308aea7f96b8f67c0e934 Mon Sep 17 00:00:00 2001
 From: Juergen Arndt <ja at opencsw.org>
-Date: Sun, 11 Jul 2010 13:55:58 +0200
+Date: Sun, 2 Jan 2011 20:49:51 +0100
 Subject: [PATCH] expanded pathes to $(DESTDIR)
 
 ---
- Makefile |  177 ++++++++++++++++++++++++++++++--------------------------------
- 1 files changed, 86 insertions(+), 91 deletions(-)
+ Makefile |  179 ++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 88 insertions(+), 91 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 88f8952..6099fc1 100644
+index 88f8952..0cc40f9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -49,8 +49,8 @@ uninstall:
+@@ -9,6 +9,8 @@
+ DEFAULTS = Makefile.config
+ CONFIG = Makefile.config
+ 
++DESTDIR =
++
+ include $(DEFAULTS)
+ include $(CONFIG)
+ 
+@@ -49,8 +51,8 @@ uninstall:
  # This removes the installed config so that the next install-pass installs
  # a new config.  Target _only_ suitable for maintainers.
  unconfig:
@@ -22,7 +31,7 @@
  
  tags:
  	-rm -f TAGS
-@@ -66,52 +66,51 @@ endif
+@@ -66,52 +68,51 @@ endif
  
  install-pre: Makefile Makefile.config
  	@$(CHECKUSER)
@@ -107,7 +116,7 @@
  
  # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
  # GENERIC ONES
-@@ -122,28 +121,24 @@ install-node-plugins: install-plugins-prime
+@@ -122,28 +123,24 @@ install-node-plugins: install-plugins-prime
  install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
  	@$(CHECKGROUP)
  
@@ -146,7 +155,7 @@
  
  #TODO:
  # configure plugins.  Or not. Better done under the direction of the installer
-@@ -152,30 +147,30 @@ install-plugins-java: build-plugins-java
+@@ -152,30 +149,30 @@ install-plugins-java: build-plugins-java
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
@@ -192,7 +201,7 @@
  
  ######################################################################
  
-@@ -189,28 +184,28 @@ build/%: %.in
+@@ -189,28 +186,28 @@ build/%: %.in
  	@echo "$< -> $@"
  	@mkdir -p build/`dirname $<`
  	@sed -e 's|@@PREFIX@@|$(PREFIX)|g'                      \
@@ -234,7 +243,7 @@
               -e 's|@@USER@@|$(USER)|g'                          \
               -e 's|@@GROUP@@|$(GROUP)|g'                        \
               -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g'              \
-@@ -354,20 +349,20 @@ old-test: t/*.t
+@@ -354,20 +351,20 @@ old-test: t/*.t
  	$(MAKE) $@ CONFIG=t/Makefile.config
  else
  test_plugins = id_default id_root env
@@ -263,7 +272,7 @@
  	echo 'Done?'
  
  t/install: 
-@@ -391,12 +386,12 @@ build-common: common/Build
+@@ -391,12 +388,12 @@ build-common: common/Build
  # can't seem to find a way to persuade it to write otherwhere.
  install-%: %/Build
  	cd $* && $(PERL) Build install			\
@@ -283,5 +292,5 @@
  test-%: %/Build
  	cd $* && $(PERL) Build test || true
 -- 
-1.7.1
+1.7.3.2
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list