[arch-commits] Commit in fssos-nsvs/repos (4 files)

[Eric Bélanger]

    Date: Wednesday, March 4, 2009 @ 21:16:34
  Author: eric
Revision: 29068

Fixed svn conflict

Modified:
  fssos-nsvs/repos/extra-x86_64/	(properties)
  fssos-nsvs/repos/extra-x86_64/PKGBUILD
  fssos-nsvs/repos/extra-x86_64/fssos-nsvs.install
  fssos-nsvs/repos/extra-x86_64/nsvsd

--------------------+
 PKGBUILD           |   30 +++++++++++++-----------------
 fssos-nsvs.install |    9 ---------
 nsvsd              |    3 ++-
 3 files changed, 15 insertions(+), 27 deletions(-)


Property changes on: fssos-nsvs/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /fssos-nsvs/trunk:1
   + /fssos-nsvs/trunk:1-29067

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-05 02:13:05 UTC (rev 29067)
+++ extra-x86_64/PKGBUILD	2009-03-05 02:16:34 UTC (rev 29068)
@@ -4,26 +4,22 @@
 
 pkgname=fssos-nsvs
 pkgver=0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="NSVS for FSSOS"
-arch=(i686 x86_64)
-backup=(etc/nsvsd.conf)
+arch=('i686' 'x86_64')
 url="http://fssos.sourceforge.net/"
-license="GNU GPL"
+license=('GPL')
 depends=('bash' 'mysql>=5.0.15' 'mysql<=5.0.9999')
-install=($pkgname.install)
-source=(http://dl.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz nsvsd \
-	fssos-nsvs.install)
-md5sums=('3f17c2f6339f1a322b712b467023d825' '4a7189354be6dd44f3a8d655a6d38775' \
-	'f71c19df8cabcfb23f6285ee75988668')
+backup=('etc/nsvsd.conf')
+options=('!libtool' '!makeflags')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz nsvsd)
+md5sums=('3f17c2f6339f1a322b712b467023d825' '4dfd9dc0d69b375587e39ab2621d9ea9')
 
 build() {
-  cd $startdir/src/nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  mkdir -p $startdir/pkg/etc/rc.d
-  cp -p $startdir/src/nsvsd $startdir/pkg/etc/rc.d/
-  # libtoolslay
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  cd $srcdir/nsvs-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc || return 1
+  make CFLAGS="${CFLAGS} -D_GNU_SOURCE" || return 1
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m755 $srcdir/nsvsd $pkgdir/etc/rc.d/nsvsd || return 1
 }

Modified: extra-x86_64/fssos-nsvs.install
===================================================================
--- extra-x86_64/fssos-nsvs.install	2009-03-05 02:13:05 UTC (rev 29067)
+++ extra-x86_64/fssos-nsvs.install	2009-03-05 02:16:34 UTC (rev 29068)
@@ -1,4 +1,3 @@
-# arg 1:  the new package version
 post_install() {
     if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
 	groupadd -g 83 nsvsd
@@ -8,19 +7,11 @@
     fi
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
     post_install $1
 }
 
-# arg 1:  the old package version
 pre_remove() {
     userdel nsvsd &> /dev/null
     groupdel nsvsd &> /dev/null
 }
-
-op=$1
-shift
-
-$op $*

Modified: extra-x86_64/nsvsd
===================================================================
--- extra-x86_64/nsvsd	2009-03-05 02:13:05 UTC (rev 29067)
+++ extra-x86_64/nsvsd	2009-03-05 02:16:34 UTC (rev 29068)
@@ -18,6 +18,7 @@
   stop)
     stat_busy "Stopping nsvsd"
     kill `cat /var/run/nsvsd.pid` &>/dev/null
+    rm -f /var/run/nsvsd.pid
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -31,5 +32,5 @@
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart|reload}"  
+    echo "usage: $0 {start|stop|restart}"  
 esac