guile 1.8.8

3 files changed, 21 insertions, 33 deletions

diff --git a/abs/extra/guile/PKGBUILD b/abs/extra/guile/PKGBUILD
index 265139a..50f10eb 100644
--- a/abs/extra/guile/PKGBUILD
+++ b/abs/extra/guile/PKGBUILD
@@ -1,35 +1,29 @@
-# $Id: PKGBUILD 72807 2010-03-20 04:06:14Z allan $
+# $Id: PKGBUILD 150868 2012-02-23 13:23:16Z ibiru $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=guile
-pkgver=1.8.7
+pkgver=1.8.8
 pkgrel=2
-pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
+pkgdesc="a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('GPL')
-depends=('gmp' 'libtool' 'ncurses>=5.7' 'texinfo')
+depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo')
 install=guile.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        guile-snarf.patch)
-options=('!libtool' '!makeflags')
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+options=('!libtool')
+md5sums=('18661a8fdfef13e2fcb7651720aa53f3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix build failure without -P
-  # http://old.nabble.com/build-failure-just-trying-to-build-guile-1.8.7-natively-td26411839.html
-  patch -Np1 < ${srcdir}/guile-snarf.patch || return 1
-
-  ./configure --prefix=/usr --disable-error-on-warning || return 1
-  make LDFLAGS+="-lpthread" || return 1
+  ./configure --prefix=/usr \
+	--disable-static  \
+	--disable-error-on-warning
+  make LDFLAGS+="-lpthread"
 }
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  rm -f "${pkgdir}/usr/share/info/dir"
-  gzip "${pkgdir}/usr/share/info"/* || return 1
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('991b5b3efcbbc3f7507d05bc42f80a5e'
-         'c11264d2a80858ab2ea1af761a6f6e65')
diff --git a/abs/extra/guile/guile-snarf.patch b/abs/extra/guile/guile-snarf.patch
deleted file mode 100644
index 42f2c66..0000000
--- a/abs/extra/guile/guile-snarf.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur guile-1.8.7.orig/libguile/guile-snarf-docs.in guile-1.8.7/libguile/guile-snarf-docs.in
---- guile-1.8.7.orig/libguile/guile-snarf-docs.in 2009-07-03 18:19:00.000000000 -0400
-+++ guile-1.8.7/libguile/guile-snarf-docs.in 2009-11-19 12:55:32.487266268 -0500
-@@ -23,4 +23,4 @@
- ## Let the user override the preprocessor autoconf found.
- test -n "${CPP+set}" || CPP="@CPP@"
-
--${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
-+${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@" 
diff --git a/abs/extra/guile/guile.install b/abs/extra/guile/guile.install
index 8fab0b1..5d1eeaf 100644
--- a/abs/extra/guile/guile.install
+++ b/abs/extra/guile/guile.install
@@ -1,3 +1,4 @@
+infodir=/usr/share/info
 files=(goops.info
        guile-tut.info
        guile.info
@@ -11,8 +12,9 @@ files=(goops.info
        r5rs.info)
 
 post_install() {
-  for f in "${files[@]}"; do
-    install-info usr/share/info/${f}.gz usr/share/info/dir 2>/dev/null
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -21,7 +23,8 @@ post_upgrade() {
 }
 
 pre_remove() {
-  for f in "${files[@]}"; do
-    install-info --delete usr/share/info/${f}.gz usr/share/info/dir 2> /dev/null
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }