Tue Sep 4 00:04:04 UTC 2012

1 files changed, 34 insertions, 10 deletions

diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD
index b8eef133e..5c81ef41d 100644
--- a/core/sysvinit/PKGBUILD
+++ b/core/sysvinit/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 162726 2012-06-29 06:27:09Z bluewind $
+# $Id: PKGBUILD 165862 2012-09-01 20:01:12Z tomegun $
 # Maintainer: Eric Belanger <eric@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 @@ sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
           '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 @@ build() {
   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
 }