[arch-commits] Commit in slib/trunk (PKGBUILD slib.install)

[Eric Bélanger]

    Date: Tuesday, March 18, 2014 @ 17:53:42
  Author: eric
Revision: 208200

upgpkg: slib 3b4-1

Upstream update, Clean up PKGBUILD, Remove texinfo depends

Modified:
  slib/trunk/PKGBUILD
  slib/trunk/slib.install

--------------+
 PKGBUILD     |   31 ++++++++++++++-----------------
 slib.install |    8 +++++---
 2 files changed, 19 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-18 16:35:50 UTC (rev 208199)
+++ PKGBUILD	2014-03-18 16:53:42 UTC (rev 208200)
@@ -3,27 +3,31 @@
 # Contributor: David Moore <davidm at sjsoft.com>
 
 pkgname=slib
-pkgver=3b3
-pkgrel=3
+pkgver=3b4
+pkgrel=1
 pkgdesc="A library providing functions for Scheme implementations"
 arch=('any')
 url="http://people.csail.mit.edu/jaffer/SLIB.html"
 license=('custom')
-depends=('guile1.8' 'sh' 'texinfo')
+depends=('guile1.8' 'sh')
 options=('emptydirs')
 install=slib.install
 source=("http://ftp.lfs-matrix.net/pub/blfs/svn/s/slib-$pkgver.tar.gz")
-md5sums=('11626eef380de4f56d3082514559beb6')
+md5sums=('dcada65c4df4209c8f71211095bcef8e')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -r -i "s,/usr/(local/)?lib/slib,/usr/share/slib,g" *.init
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -r -i "s,/usr/(local/)?lib/slib,/usr/share/slib,g" *.init
-  install -m755 -d "${pkgdir}/usr/share/slib"
+  cd ${pkgname}-${pkgver}
+  install -m755 -d "${pkgdir}"/usr/{bin,share/{guile/site,slib}}
   install -m644 *.scm *.init *.xyz *.txt *.dat *.ps "${pkgdir}/usr/share/slib/"
-  install -m755 -d "${pkgdir}/usr/share/info"
-  install -m644 slib.info "${pkgdir}/usr/share/info/"
+  install -D -m644 slib.info "${pkgdir}/usr/share/info/slib.info"
+  install -D -m644 slib.1 "${pkgdir}/usr/share/man/man1/slib.1"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 
-  install -m755 -d "${pkgdir}/usr/bin"
   cat << _EOF > "${pkgdir}/usr/bin/slib"
 #!/bin/sh
 SCHEME_LIBRARY_PATH=/usr/share/slib/
@@ -36,12 +40,5 @@
   cat slib.sh >> "${pkgdir}/usr/bin/slib"
   chmod 755 "${pkgdir}/usr/bin/slib"
 
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 slib.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/"
-
-  install -m755 -d "${pkgdir}/usr/share/guile/site/"
   ln -s /usr/share/slib "${pkgdir}/usr/share/guile/site/"
 }

Modified: slib.install
===================================================================
--- slib.install	2014-03-18 16:35:50 UTC (rev 208199)
+++ slib.install	2014-03-18 16:53:42 UTC (rev 208200)
@@ -2,8 +2,9 @@
 # can/should generate catalogs for mzscheme, drscheme, whatever else we can
 
 post_upgrade () {
-  usr/bin/guile1.8 -c "((use-modules (ice-9 slib))(require 'new-catalog)(quit))"
-  usr/bin/install-info usr/share/info/slib.info.gz usr/share/info/dir 2>/dev/null
+  guile1.8 -c "((use-modules (ice-9 slib))(require 'new-catalog)(quit))"
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info usr/share/info/slib.info.gz usr/share/info/dir 2>/dev/null
 }
 post_install() {
   post_upgrade
@@ -11,5 +12,6 @@
 
 pre_remove() {
   rm usr/share/guile/site/slibcat
-  usr/bin/install-info --delete usr/share/info/slib.info.gz usr/share/info/dir 2>/dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete usr/share/info/slib.info.gz usr/share/info/dir 2>/dev/null
 }