Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=492005fc0951a64065ac03a0a4810a5e716284c2
commit 492005fc0951a64065ac03a0a4810a5e716284c2 Author: Miklos Vajna <vmik...@frugalware.org> Date: Thu Aug 6 22:45:42 2009 +0200 monit-5.0.3-1-i686 - version bump - replaced this nightmare -fix-man-page-paths.patch with proper Fsed calls diff --git a/source/apps-extra/monit/FrugalBuild b/source/apps-extra/monit/FrugalBuild index c08dbca..91cbbec 100644 --- a/source/apps-extra/monit/FrugalBuild +++ b/source/apps-extra/monit/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme <a...@alex-smith.me.uk> pkgname=monit -pkgver=4.10.1 +pkgver=5.0.3 pkgrel=1 pkgdesc="monit is a utility for managing and monitoring, processes, files, directories and devices on a UNIX system" url="http://www.tildeslash.com/monit"; @@ -12,15 +12,16 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.tildeslash.com/monit/dist/?C=M;O=A' | Flasttar" source=(http://www.tildeslash.com/monit/dist/$pkgname-$pkgver.tar.gz \ - monit-4.10.1-change-conf-file-path.patch monit-4.10.1-fix-man-page-paths.patch \ + monit-4.10.1-change-conf-file-path.patch \ README.Frugalware) -sha1sums=('c87aa0c6e0b1d13f46b7e9d84937191e25a907a6' \ - 'b0e0461b3cf128a036d35021c8a4aaa24254a60e' \ - '3abdc3b12942e29fe88d1f8c74ec0105e05d161b' \ - '933901884a93535baf97c1a629dca9acec2fc82f') +sha1sums=('60cb18678f7d1423e728b44cd09f57a87340b2ba' \ + 'b0e0461b3cf128a036d35021c8a4aaa24254a60e' \ + '933901884a93535baf97c1a629dca9acec2fc82f') Fconfopts="$Fconfopts --bindir=/usr/sbin" build() { + Fsed /usr/local /usr monit.1 + Fsed /etc /etc/monit monit.1 Fbuild Fdoc README.Frugalware } diff --git a/source/apps-extra/monit/monit-4.10.1-fix-man-page-paths.patch b/source/apps-extra/monit/monit-4.10.1-fix-man-page-paths.patch deleted file mode 100644 index 47a8f0e..0000000 --- a/source/apps-extra/monit/monit-4.10.1-fix-man-page-paths.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur monit-4.10.1-orig/monit.1 monit-4.10.1/monit.1 ---- monit-4.10.1-orig/monit.1 2007-11-06 21:34:52.000000000 +0100 -+++ monit-4.10.1/monit.1 2008-01-20 17:54:37.000000000 +0100 -@@ -307,7 +307,7 @@ - .IX Header "HOW TO MONITOR" - monit is configured and controlled via a control file called - \&\fBmonitrc\fR. The default location for this file is ~/.monitrc. If --this file does not exist, monit will try /etc/monitrc, then -+this file does not exist, monit will try /etc/monit/monitrc, then - @sysconfdir@/monitrc and finally ./monitrc. - .PP - A monit control file consists of a series of service entries and -@@ -465,7 +465,7 @@ - .PP - .Vb 2 - \& # Run monit in standard run\-levels --\& mo:2345:respawn:/usr/local/bin/monit \-Ic /etc/monitrc -+\& mo:2345:respawn:/usr/sbin/monit \-Ic /etc/monit/monitrc - .Ve - .PP - After you have modified init's configuration file, you can run -@@ -1749,7 +1749,7 @@ - script. Example: - .PP - .Vb 3 --\& check file monit.bin with path "/usr/local/bin/monit" -+\& check file monit.bin with path "/usr/sbin/monit" - \& if failed permission 0555 then unmonitor - \& alert f...@bar - .Ve -@@ -3600,7 +3600,7 @@ - .IX Item "4. monit starts the node group" - .PD - .PP --\&\fBMonit: \f(BI/etc/monitrc\fB\fR -+\&\fBMonit: \f(BI/etc/monit/monitrc\fB\fR - .PP - This example describes a cluster with 2 nodes. Services running - on Node 1 are in the group \fInode1\fR and Node 2 services are in -@@ -3691,7 +3691,7 @@ - .PP - .Vb 2 - \& #/etc/inittab --\& mo:2345:respawn:/usr/local/bin/monit \-d 10 \-c /etc/monitrc \-g local -+\& mo:2345:respawn:/usr/sbin/monit \-d 10 \-c /etc/monit/monitrc \-g local - .Ve - .PP - \&\fBheartbeat: \f(BI/etc/ha.d/haresources\fB\fR -@@ -3714,7 +3714,7 @@ - \& # - \& # sample script for starting/stopping all services on node1 - \& # --\& prog="/usr/local/bin/monit \-g node1" -+\& prog="/usr/sbin/monit \-g node1" - \& start() - \& { - \& echo \-n $"Starting $prog:" -@@ -3767,9 +3767,9 @@ - \&\fI~/.monitrc\fR - Default run control file - .PP --\&\fI/etc/monitrc\fR -+\&\fI/etc/monit/monitrc\fR - If the control file is not found in the default -- location and /etc contains a \fImonitrc\fR file, this -+ location and /etc/monit contains a \fImonitrc\fR file, this - file will be used instead. - .PP - \&\fI./monitrc\fR _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
