[arch-commits] Commit in guile/repos (5 files)

[Jan de Groot]

    Date: Thursday, January 1, 2009 @ 13:47:32
  Author: jgc
Revision: 23038

Merged revisions 23032,23037 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/guile/trunk

........
  r23032 | jgc | 2009-01-01 17:11:36 +0000 (Thu, 01 Jan 2009) | 3 lines
  
  upgpkg: guile 1.8.6-1
      Remove old patches
  handle info installation
........
  r23037 | jgc | 2009-01-01 18:44:06 +0000 (Thu, 01 Jan 2009) | 1 line
  
  add missing file
........

Added:
  guile/repos/extra-x86_64/guile.install
    (from rev 23037, guile/trunk/guile.install)
Modified:
  guile/repos/extra-x86_64/	(properties)
  guile/repos/extra-x86_64/PKGBUILD
Deleted:
  guile/repos/extra-x86_64/libtool-2.2.patch
  guile/repos/extra-x86_64/ltdl-gcc4.patch

-------------------+
 PKGBUILD          |   22 +++++++++++-----------
 guile.install     |   27 +++++++++++++++++++++++++++
 libtool-2.2.patch |   14 --------------
 ltdl-gcc4.patch   |   19 -------------------
 4 files changed, 38 insertions(+), 44 deletions(-)


Property changes on: guile/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /guile/trunk:1-9794
   + /guile/trunk:1-23037

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-01 18:44:06 UTC (rev 23037)
+++ extra-x86_64/PKGBUILD	2009-01-01 18:47:32 UTC (rev 23038)
@@ -3,24 +3,24 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=guile
-pkgver=1.8.4
-pkgrel=3
+pkgver=1.8.6
+pkgrel=1
 pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gmp' 'libtool' 'ncurses>=5.6-7')
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        libtool-2.2.patch)
-md5sums=('aacc6a384af88a85574717a9221f5c6e' '4edd52a08853236e9bad5439d1d79bcf')
+depends=('gmp' 'libtool' 'ncurses>=5.6-7' 'texinfo')
+install=guile.install
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
+md5sums=('9e23d3dbea0e89bab8a9acc6880150de')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ../libtool-2.2.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-networking \
-    --disable-error-on-warning
+    --disable-error-on-warning || return 1
   make LDFLAGS+="-lpthread" || return 1
-  make DESTDIR=${startdir}/pkg install
-  rm $pkgdir/usr/share/info/dir
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f "${pkgdir}/usr/share/info/dir"
+  gzip "${pkgdir}/usr/share/info"/* || return 1
 }

Copied: guile/repos/extra-x86_64/guile.install (from rev 23037, guile/trunk/guile.install)
===================================================================
--- extra-x86_64/guile.install	                        (rev 0)
+++ extra-x86_64/guile.install	2009-01-01 18:47:32 UTC (rev 23038)
@@ -0,0 +1,27 @@
+files=(goops.info
+       guile-tut.info
+       guile.info
+       guile.info-1
+       guile.info-2
+       guile.info-3
+       guile.info-4
+       guile.info-5
+       guile.info-6
+       guile.info-7
+       r5rs.info)
+
+post_install() {
+  for f in "${files[@]}"; do
+    install-info usr/share/info/${f}.gz usr/share/info/dir 2>/dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in "${files[@]}"; do
+    install-info --delete usr/share/info/${f}.gz usr/share/info/dir 2> /dev/null
+  done
+}

Deleted: extra-x86_64/libtool-2.2.patch
===================================================================
--- extra-x86_64/libtool-2.2.patch	2009-01-01 18:44:06 UTC (rev 23037)
+++ extra-x86_64/libtool-2.2.patch	2009-01-01 18:47:32 UTC (rev 23038)
@@ -1,14 +0,0 @@
-diff -Nur guile-1.8.3.orig/libguile/guile.c guile-1.8.3/libguile/guile.c
---- guile-1.8.3.orig/libguile/guile.c	2007-05-09 22:22:03.000000000 +0200
-+++ guile-1.8.3/libguile/guile.c	2008-03-04 15:54:19.000000000 +0100
-@@ -68,8 +68,8 @@
- {
- #if !defined (__MINGW32__)
-   /* libtool automagically inserts this variable into your executable... */
--  extern const lt_dlsymlist lt_preloaded_symbols[];
--  lt_dlpreload_default (lt_preloaded_symbols);
-+  /*extern const lt_dlsymlist lt_preloaded_symbols[];
-+  lt_dlpreload_default (lt_preloaded_symbols);*/
- #endif
-   scm_boot_guile (argc, argv, inner_main, 0);
-   return 0; /* never reached */

Deleted: extra-x86_64/ltdl-gcc4.patch
===================================================================
--- extra-x86_64/ltdl-gcc4.patch	2009-01-01 18:44:06 UTC (rev 23037)
+++ extra-x86_64/ltdl-gcc4.patch	2009-01-01 18:47:32 UTC (rev 23038)
@@ -1,19 +0,0 @@
---- guile-1.6.7/libguile/guile.c.ltdl	2005-03-02 16:31:46.000000000 +0100
-+++ guile-1.6.7/libguile/guile.c	2005-03-02 16:32:07.000000000 +0100
-@@ -53,6 +53,7 @@
- #endif
- 
- #ifdef DYNAMIC_LINKING
-+#include <ltdl.h>
- #include "guile-ltdl.h"
- #endif
- 
-@@ -88,7 +89,7 @@
- {
- #ifdef DYNAMIC_LINKING
-   /* libtool automagically inserts this variable into your executable... */
--  extern const scm_lt_dlsymlist lt_preloaded_symbols[];
-+  extern const lt_dlsymlist lt_preloaded_symbols[];
-   scm_lt_dlpreload_default (lt_preloaded_symbols);
- #endif
-   scm_boot_guile (argc, argv, inner_main, 0);