Merge branch 'master' of gparabola:abslibre-mips64el

2 files changed, 9 insertions, 58 deletions

diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD
index 8c11194a9..8acee1114 100644
--- a/community/smbnetfs/PKGBUILD
+++ b/community/smbnetfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76408 2012-09-17 10:51:59Z spupykin $
+# $Id: PKGBUILD 90723 2013-05-13 14:38:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=smbnetfs
 pkgver=0.5.3a
-pkgrel=5
+pkgrel=6
 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://smbnetfs.sourceforge.net/"
@@ -17,19 +17,23 @@ backup=('etc/smbnetfs/.smb/smb.conf'
 install=smbnetfs.install
 options=(docs)
 source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2
-	rc-smbnetfs
 	conf-smbnetfs
 	smbnetfs.service)
 md5sums=('66d1477ca981f5a07b4b21c6bdbdc442'
-         'b6cff0ee75cafd739ad44216236b5e28'
          'e150c4cd894cc6ade11b94c95cf17ec4'
          '0fdd0dbaa5f16b1ecd00ec1ddcdfc223')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
+  sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|g' \
+    src/smb_conn_srv.c src/smb_conn_proto.h src/function.c src/main.c src/event.c
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --docdir=/usr/share/doc/smbnetfs --with-gnome-keyring=no
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   make DESTDIR=$pkgdir install
 
   mv $pkgdir/usr/share/doc/smbnetfs* $pkgdir/usr/share/doc/smbnetfs
@@ -37,7 +41,6 @@ build() {
   mkdir -p $pkgdir/etc/smbnetfs/.smb
   install -m0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/
   install -Dm0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README
-  install -Dm0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs
   install -Dm0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs
   install -Dm0644 $srcdir/smbnetfs.service $pkgdir/usr/lib/systemd/system/smbnetfs.service
   touch $pkgdir/etc/smbnetfs/.smb/smb.conf
diff --git a/community/smbnetfs/rc-smbnetfs b/community/smbnetfs/rc-smbnetfs
deleted file mode 100644
index 69c00d120..000000000
--- a/community/smbnetfs/rc-smbnetfs
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/smbnetfs
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	echo `pidof smbnetfs`
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting smbnetfs"
-
-    [ -f /var/run/smbnetfs.pid ] && rm -f /var/run/smbnetfs.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      cd /tmp && \
-	[ -d $SMBNETFS_MOUNT_POINT ] && \
-	su - nobody -s /bin/bash -c "HOME=/etc/smbnetfs exec smbnetfs -o allow_other $SMBNETFS_MOUNT_POINT" &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/smbnetfs.pid
-        add_daemon smbnetfs
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping smbnetfs"
-
-    fusermount -u $SMBNETFS_MOUNT_POINT &> /dev/null
-    rm -f /var/run/smbnetfs.pid &> /dev/null
-    rm_daemon smbnetfs
-    stat_done
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0