runit: upgrade to 2.1.1

1 files changed, 32 insertions, 33 deletions

diff --git a/abs/core/runit/PKGBUILD b/abs/core/runit/PKGBUILD
index bb3a4f5..1dd2838 100755..100644
--- a/abs/core/runit/PKGBUILD
+++ b/abs/core/runit/PKGBUILD
@@ -1,10 +1,10 @@
 pkgname=runit
-pkgver=1.8.0
-pkgrel=64
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision"
 url="http://smarden.org/runit/"
-license="BSD"
-depends=('glibc' 'util-linux' 'initscripts' )
+license=('BSD')
+depends=('glibc' 'util-linux' 'initscripts')
 makedepends=()
 conflicts=()
 replaces=()
@@ -14,7 +14,7 @@ source=(http://smarden.org/runit/$pkgname-$pkgver.tar.gz add_service.sh remove_s
 arch=('i686')
 
 build() {
-  cd $startdir/src/admin/$pkgname-$pkgver/src
+  cd $srcdir/admin/$pkgname-$pkgver/src
   echo "${CC:-gcc} ${CFLAGS:--Os}" > conf-cc
   echo "${LD:-gcc -s}" > conf-ld
   make || return 1
@@ -24,47 +24,46 @@ build() {
   ./load svwaitup unix.a byte.a time.a
   ./compile utmpset.c
   ./load utmpset unix.a byte.a
+}
 
+package() {
+  install -d $pkgdir/sbin/
+  install -d $pkgdir/usr/man/man8
+  install -m0755 $srcdir/add_service.sh $pkgdir/sbin
+  install -m0755 $srcdir/remove_service.sh $pkgdir/sbin
+  install -m0755 $srcdir/reboot.script $pkgdir/sbin
+  install -m0755 $srcdir/halt.script  $pkgdir/sbin
+  install -m0755 $srcdir/poweroff.script  $pkgdir/sbin
+  install -m0755 $srcdir/shutdown.script  $pkgdir/sbin
 
-
-
-  install -d $startdir/pkg/sbin/
-  install -d $startdir/pkg/usr/man/man8
-  install -m0755 $startdir/src/add_service.sh $startdir/pkg/sbin
-  install -m0755 $startdir/src/remove_service.sh $startdir/pkg/sbin
-  install -m0755 $startdir/src/reboot.script $startdir/pkg/sbin
-  install -m0755 $startdir/src/halt.script  $startdir/pkg/sbin
-  install -m0755 $startdir/src/poweroff.script  $startdir/pkg/sbin
-  install -m0755 $startdir/src/shutdown.script  $startdir/pkg/sbin
-
+  cd $srcdir/admin/$pkgname-$pkgver/src
   for i in `cat ../package/commands`; do
-    install -m0755 $i $startdir/pkg/sbin/
+    install -m0755 $i $pkgdir/sbin/
   done
   
-  install -m0755 svwaitup $startdir/pkg/sbin/
-  install -m0755 svwaitdown $startdir/pkg/sbin/
-  install -m0644 ../man/*.8 $startdir/pkg/usr/man/man8
-
-#  rsync -a --exclude=.svn $startdir/runitscripts $startdir/src
-#  cd $startdir/src/runitscripts
+  install -m0755 svwaitup $pkgdir/sbin/
+  install -m0755 svwaitdown $pkgdir/sbin/
+  install -m0644 ../man/*.8 $pkgdir/usr/man/man8
+  gzip -9 $pkgdir/usr/man/man8/*.8 || return 1
 
-  install -d $startdir/pkg/etc/
-  install -d $startdir/pkg/etc/runit/
-  install -d $startdir/pkg/var/service
+#  rsync -a --exclude=.svn $startdir/runitscripts $srcdir
+#  cd $srcdir/runitscripts
 
+  install -d $pkgdir/etc/
+  install -d $pkgdir/etc/runit/
+  install -d $pkgdir/var/service
 
-#  install -m0700 1 2 3 ctrlaltdel $startdir/pkg/etc/runit
-#  install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
+#  install -m0700 1 2 3 ctrlaltdel $pkgdir/etc/runit
+#  install -m0755 reboot-runit halt-runit logger $pkgdir/sbin
 
- # install -d $startdir/pkg/etc/sv
- # rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
+ # install -d $pkgdir/etc/sv
+ # rsync -a --exclude=.svn services/* $pkgdir/etc/sv
 
   cd $startdir
-  install -d $startdir/pkg/usr/bin
-
+  install -d $pkgdir/usr/bin
 
 }
-md5sums=('46549303a336bee8f627bfb399d44085'
+md5sums=('8fa53ea8f71d88da9503f62793336bc3'
          '5828ac37537d60ded00252dc02d462c6'
          '984dbe096b0db26ad9f3f5b51addd9c9'
          'e347ea8cf2981f2cd4105111ea1ce1d4'