Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=4da7de052f15a504a544878b9e6c33c3c5764318

commit 4da7de052f15a504a544878b9e6c33c3c5764318
Merge: 3ee2763 79e68d9
Author: James Buren <[email protected]>
Date:   Thu Jun 7 20:07:37 2012 -0500

Merge branch 'master' of ../current

Conflicts:
source/apps-extra/monit/FrugalBuild

diff --cc source/apps-extra/monit/FrugalBuild
index d11d98b,eef9c08..506032b
--- a/source/apps-extra/monit/FrugalBuild
+++ b/source/apps-extra/monit/FrugalBuild
@@@ -12,13 -12,12 +12,14 @@@ 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 \
-       README.Frugalware monit.service)
- sha1sums=('346d90dfa526e35be2df2f15ba8ab62e1826f8c2' \
+       README.Frugalware monit.service monit-etc-monit-monitrc.patch)
+ sha1sums=('d497ff61da9d30c286e2a2079538a802e02436c2' \
'983e699c6b418342e0366967cfdf36a47ddc7514' \
-           '71442198a899311de383402ab782227391901703')
+           '71442198a899311de383402ab782227391901703' \
+           '1b1254874f0bf5fcc3398c304368949b59edd552')
Fconfopts="$Fconfopts --bindir=/usr/sbin"
+_F_systemd_units=(monit=)
+Finclude systemd

build() {
Fsed /usr/local /usr monit.1
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to