[arch-commits] Commit in preload/trunk (PKGBUILD rc.d service)

[Eric Bélanger]

    Date: Monday, May 13, 2013 @ 02:32:46
  Author: eric
Revision: 90535

upgpkg: preload 0.6.4-6

Remove initscripts support, Move binaries in /usr/sbin to /usr/bin

Modified:
  preload/trunk/PKGBUILD
  preload/trunk/service
Deleted:
  preload/trunk/rc.d

----------+
 PKGBUILD |   24 +++++----------
 rc.d     |   97 -------------------------------------------------------------
 service  |    2 -
 3 files changed, 10 insertions(+), 113 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 00:32:20 UTC (rev 90534)
+++ PKGBUILD	2013-05-13 00:32:46 UTC (rev 90535)
@@ -5,46 +5,40 @@
 
 pkgname=preload
 pkgver=0.6.4
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 pkgdesc="Makes applications run faster by prefetching binaries and shared objects"
 url="http://sourceforge.net/projects/preload"
 license=('GPL2')
 depends=('glib2' 'bash')
-makedepends=('help2man' 'pkgconfig')
+makedepends=('help2man')
 backup=('etc/preload.conf')
 options=('!makeflags')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz"
-        rc.d service)
+        service)
 md5sums=('10786287b55afd3a2b433b4f898809f4'
-         'bde0dd7867c77e7c4d10b481b5cddcd3'
-         'db9350ab52fd643edbc88ebab2c8c1bb')
+         'b4871a6ade86968322b3bdf3fce88e99')
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --mandir=/usr/share/man \
+              --sbindir=/usr/bin \
               --localstatedir=/var
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" sysconfigdir=/etc/conf.d install
   
-  install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/preload
   install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/preload.service
 
-  rm -rf "${pkgdir}"/etc/rc.d/init.d
-
+  rm -rf "${pkgdir}"/etc/rc.d
   rm -rf "${pkgdir}"/var/lib/preload/preload.state
   rm -rf "${pkgdir}"/var/log/preload.log
 
-  install -d "${pkgdir}"/etc/conf.d
-  mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d
-  rm -rf "${pkgdir}"/etc/sysconfig
-
   sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf
 }

Deleted: rc.d
===================================================================
--- rc.d	2013-05-13 00:32:20 UTC (rev 90534)
+++ rc.d	2013-05-13 00:32:46 UTC (rev 90535)
@@ -1,97 +0,0 @@
-#!/bin/bash
-#
-#	/etc/rc.d/init.d/preload
-#
-# Starts the preload daemon
-#
-# Heavily modified for Arch Linux by Leslie P. Polzer <polzer at gnu.org>.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/preload`
-
-if [ -f /etc/conf.d/preload ]; then
-        . /etc/conf.d/preload
-fi
-
-MIN_MEMORY=${MIN_MEMORY:-256}
-# Check for > MIN_MEMORY MB
-free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
-
-RETVAL=0
-
-#
-# See how we were called.
-#
-
-start() {
-        if [ -z "$PID" ]; then
-                stat_busy "Starting preload daemon: "
-                /usr/sbin/preload $PRELOAD_OPTS
-                RETVAL=$?
-                if [ $RETVAL -eq 0 ]; then
-			if [ -n $IONICE_OPTS ]; then
-				/usr/bin/ionice $IONICE_OPTS -p "`pidof -o %PPID /usr/sbin/preload`"
-			fi
-                        add_daemon preload
-                        stat_done
-                else
-                        stat_fail
-                fi
-        fi
-        return $RETVAL
-}
-
-stop() {
-        stat_busy "Stopping preload daemon: "
-        kill $PID &>/dev/null
-        RETVAL=$?
-        if [ $RETVAL -eq 0 ]; then
-                rm_daemon preload
-                stat_done
-		PID=""
-        else
-                stat_fail
-        fi
-        return $RETVAL
-}
-
-
-restart() {
-        $0 stop
-	sleep 1
-        $0 start
-}	
-
-reload() {
-        trap "" SIGHUP
-        kill -HUP $PID
-}	
-
-case "$1" in
-        start)
-        start
-        ;;
-        stop)
-        stop
-        ;;
-        reload)
-        reload
-        ;;
-        restart)
-        restart
-        ;;
-        condrestart)
-        if [ ! -z $PID ]; then
-                restart
-        else
-                stat_fail
-        fi
-        ;;
-        *)
-        echo "Usage: $0 {start|stop|restart|condrestart|reload}"
-        exit 1
-esac
-
-exit $RETVAL

Modified: service
===================================================================
--- service	2013-05-13 00:32:20 UTC (rev 90534)
+++ service	2013-05-13 00:32:46 UTC (rev 90535)
@@ -5,7 +5,7 @@
 Type=simple
 IOSchedulingClass=3
 EnvironmentFile=/etc/conf.d/preload
-ExecStart=/usr/sbin/preload --foreground $PRELOAD_OPTS
+ExecStart=/usr/bin/preload --foreground $PRELOAD_OPTS
      
 [Install]
 WantedBy=multi-user.target