[arch-commits] Commit in sysvinit/trunk (PKGBUILD)

[Tom Gundersen]

    Date: Thursday, August 30, 2012 @ 16:26:51
  Author: tomegun
Revision: 165812

upgpkg: sysvinit 2.88-7

split out sysvinit-tools, which might be used even under systemd

Modified:
  sysvinit/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-30 19:22:40 UTC (rev 165811)
+++ PKGBUILD	2012-08-30 20:26:51 UTC (rev 165812)
@@ -1,17 +1,16 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
 
-pkgname=sysvinit
+pkgbase=sysvinit
+pkgname=('sysvinit-tools' 'sysvinit')
 pkgver=2.88
-pkgrel=6
-pkgdesc="Linux System V Init"
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/sysvinit"
 license=('GPL')
 groups=('base')
 depends=('util-linux' 'coreutils' 'glibc' 'awk')
-install=sysvinit.install
-source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2
+source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgbase}-${pkgver}dsf.tar.bz2
         "0001-simplify-writelog.patch"
         "0002-remove-ansi-escape-codes-from-log-file.patch")
 sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
@@ -19,7 +18,7 @@
           'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}dsf"
+  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
 
   # FS#30005
   patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
@@ -28,12 +27,37 @@
   make 
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}dsf"
+package_sysvinit-tools() {
+  pkgdesc="Linux System V Init Tools"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
   make ROOT="${pkgdir}" install
 
-  # mountpoint is now provided by util-linux instead
+  # provided by util-linux
   cd "${pkgdir}"
   rm bin/mountpoint
   rm usr/share/man/man1/mountpoint.1
+# once u-l-2.22 is out
+#  rm usr/bin/{mesg,utmpdump,wall}
+#  rm usr/share/man/man1/{mesg,utmpdump,wall}.1
+#  rm sbin/sulogin
+#  rm usr/share/man/man8/sulogin.8
+
+  ### split out sysvinit
+  rm -rf ${srcdir}/_sysvinit
+  install -dm755 \
+        ${srcdir}/_sysvinit/sbin \
+        ${srcdir}/_sysvinit/usr/share/man/man8
+  cd ${srcdir}/_sysvinit
+  mv ${pkgdir}/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} sbin/
+  mv ${pkgdir}/usr/share/man/man5 usr/share/man/
+  mv ${pkgdir}/usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}.8 usr/share/man/man8/
 }
+
+package_sysvinit() {
+  pkgdesc="Linux System V Init"
+  depends=('sysvinit-tools')
+  install=sysvinit.install
+
+  mv "${srcdir}"/_sysvinit/* $pkgdir
+}