Thu May 15 03:57:18 UTC 2014

5 files changed, 14 insertions, 24 deletions

diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index 6963d5078..e5011ddb5 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 99912 2013-10-31 02:26:00Z allan $
+# $Id: PKGBUILD 111118 2014-05-14 12:21:40Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
+# Contributor: Martin "mortbauer" <mortbauer@gmail.com>
 
 pkgbase=mfs
 pkgname=('mfs-master' 'mfs-chunkserver' 'mfs-client')
-pkgver=1.6.27_1
+pkgver=1.6.27_5
 pkgrel=1
 pkgdesc='MooseFS, fault tolerant, network distributed file system'
 url='http://www.moosefs.com/'
@@ -17,17 +18,15 @@ source=("http://www.moosefs.org/tl_files/${pkgbase}code/$pkgbase-${pkgver/_/-}.t
         'mfschunkserver.service'
         'mfsmetalogger.service'
         'mfscgiserv.service')
-sha256sums=('dfe682f0b184ed13e602274825148cd9a7ddfe4f0894e1ab9c1823f66208cb28'
-            'b24fc4f699e7d11fcda00d83a1feb45aa0e6f4f448e675a1857edcf315427fe0'
-            '19262bde4dbefb1d3eba09ba7d507595aed9647328a0a7822bbc1915ae3201a7'
-            'bf92e93be68308d53f649de84dc5bbb0fb433e33306b8d0c303be6c6c3e59a55'
-            '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a')
+sha256sums=('5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb'
+            '9f67ace1b598b642d0bee53a759dc9618062612491818bc163d852dd6232c225'
+            'a7b9139cf4d41ce7730e280da34f43c1a5671c1e3b1ae40b871b4814e2076d85'
+            '2d664a28e0822df4c733681863584dee0836ba2b2e3a94733da66bca97b0b55a'
+            'a3a8a3091b262e091901a1ca031608f42869e1d892466611e709a7fc23099707')
 
 build() {
-  cd "$srcdir"
-
   msg2 'Building client...'
-  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-client"
+  cp -r "$pkgbase-${pkgver%_*}" "$pkgbase-client"
   cd "$pkgbase-client"
   ./configure \
       --prefix=/usr \
@@ -41,7 +40,7 @@ build() {
   cd ..
   
   msg2 'Building chunkserver...'
-  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-chunk"
+  cp -r "$pkgbase-${pkgver%_*}" "$pkgbase-chunk"
   cd "$pkgbase-chunk"
   ./configure \
       --prefix=/usr \
@@ -55,7 +54,7 @@ build() {
   cd ..
   
   msg2 'Building master...'
-  cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-master"
+  cp -r "$pkgbase-${pkgver%_*}" "$pkgbase-master"
   cd "$pkgbase-master"
   ./configure \
       --prefix=/usr \
@@ -68,7 +67,7 @@ build() {
 
 package_mfs-client() {
   depends=('zlib' 'fuse' 'bash')
-  cd "$srcdir/$pkgbase-client"
+  cd "$pkgbase-client"
 
   msg2 'Packaging client...'
   make DESTDIR="$pkgdir" install
@@ -80,7 +79,7 @@ package_mfs-client() {
 
 package_mfs-chunkserver() {
   depends=('zlib' 'bash')
-  cd "$srcdir/$pkgbase-chunk"
+  cd "$pkgbase-chunk"
 
   msg2 'Packaging chunkserver...'
   make DESTDIR="$pkgdir" install
@@ -97,7 +96,7 @@ package_mfs-chunkserver() {
 
 package_mfs-master() {
   depends=('zlib' 'python2')
-  cd "$srcdir/$pkgbase-master"
+  cd "$pkgbase-master"
 
   msg2 'Packaging master, metalogger and web interface...'
   make DESTDIR="$pkgdir" install
diff --git a/community/mfs/mfscgiserv.service b/community/mfs/mfscgiserv.service
index 09daf41b7..eb10eae59 100644
--- a/community/mfs/mfscgiserv.service
+++ b/community/mfs/mfscgiserv.service
@@ -6,8 +6,6 @@ After=network.target
 Type=forking
 ExecStart=/usr/bin/mfscgiserv
 ExecStop=/bin/kill -15 $MAINPID
-PIDFile=/run/mfs/mfscgiserv.pid
-Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/mfs/mfschunkserver.service b/community/mfs/mfschunkserver.service
index 83ef11adc..c0cb98563 100644
--- a/community/mfs/mfschunkserver.service
+++ b/community/mfs/mfschunkserver.service
@@ -6,9 +6,6 @@ After=network.target
 Type=forking
 ExecStart=/usr/bin/mfschunkserver start
 ExecStop=/usr/bin/mfschunkserver stop
-ExecReload=/usr/bin/mfschunkserver reload
-PIDFile=/run/mfs/mfschunkserver.pid
-Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/mfs/mfsmaster.service b/community/mfs/mfsmaster.service
index 410774f9a..1a68409e4 100644
--- a/community/mfs/mfsmaster.service
+++ b/community/mfs/mfsmaster.service
@@ -6,8 +6,6 @@ After=network.target
 Type=forking
 ExecStart=/usr/bin/mfsmaster start
 ExecStop=/usr/bin/mfsmaster stop
-PIDFile=/run/mfs/mfsmaster.pid
-Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/mfs/mfsmetalogger.service b/community/mfs/mfsmetalogger.service
index 611afc532..26a86f46e 100644
--- a/community/mfs/mfsmetalogger.service
+++ b/community/mfs/mfsmetalogger.service
@@ -6,8 +6,6 @@ After=network.target
 Type=forking
 ExecStart=/usr/bin/mfsmetalogger start
 ExecStop=/usr/bin/mfsmetalogger stop
-PIDFile=/run/mfs/mfsmetalogger.pid
-Restart=always
 
 [Install]
 WantedBy=multi-user.target