[arch-commits] Commit in autoconf/trunk (4 files)

[Allan McRae]

    Date: Saturday, May 14, 2016 @ 13:41:59
  Author: allan
Revision: 267951

upgpkg: autoconf 2.69-3

hooks rebuild

Added:
  autoconf/trunk/autoconf-2.69-libtool-compatibility.patch
  autoconf/trunk/autoconf-2.69-perl-5.22-autoscan.patch
Modified:
  autoconf/trunk/PKGBUILD
Deleted:
  autoconf/trunk/autoconf.install

-------------------------------------------+
 PKGBUILD                                  |   24 +++++++++++++++++++-----
 autoconf-2.69-libtool-compatibility.patch |   27 +++++++++++++++++++++++++++
 autoconf-2.69-perl-5.22-autoscan.patch    |   28 ++++++++++++++++++++++++++++
 autoconf.install                          |   20 --------------------
 4 files changed, 74 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-14 11:04:12 UTC (rev 267950)
+++ PKGBUILD	2016-05-14 11:41:59 UTC (rev 267951)
@@ -4,7 +4,7 @@
 
 pkgname=autoconf
 pkgver=2.69
-pkgrel=2
+pkgrel=3
 pkgdesc="A GNU tool for automatically configuring source code"
 arch=('any')
 license=('GPL2' 'GPL3' 'custom')
@@ -12,14 +12,28 @@
 groups=('base-devel')
 depends=('awk' 'm4' 'diffutils' 'bash')
 checkdepends=('gcc-fortran')
-install=autoconf.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+        autoconf-2.69-perl-5.22-autoscan.patch
+        autoconf-2.69-libtool-compatibility.patch)
 md5sums=('50f97f4159805e374639a73e2636f22e'
-         '2941e2fe687e05b3431eac6b714053bc')
+         'SKIP'
+         'aa07afe5a671df25bf1878831702d5b9'
+         '87bceda7922ebc2a453568b2ae179e1b')
 validpgpkeys=('71C2CC22B1C4602927D2F3AAA7A16B4A2527436A')
 
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # fix incompatibility with recent perl
+  patch -p1 -i $srcdir/autoconf-2.69-perl-5.22-autoscan.patch
+
+  # fix tesetsuite failures with recent libtool
+  patch -p1 -i $srcdir/autoconf-2.69-libtool-compatibility.patch
+}
+  
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }

Added: autoconf-2.69-libtool-compatibility.patch
===================================================================
--- autoconf-2.69-libtool-compatibility.patch	                        (rev 0)
+++ autoconf-2.69-libtool-compatibility.patch	2016-05-14 11:41:59 UTC (rev 267951)
@@ -0,0 +1,27 @@
+From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001
+From: Gary V. Vaughan <gary at gnu.org>
+Date: Mon, 03 Nov 2014 06:25:03 +0000
+Subject: tests: avoid spurious test failure with libtool 2.4.3
+
+Based on a report by Bruce Dubbs.
+
+* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the
+older `quote'.
+
+Signed-off-by: Eric Blake <eblake at redhat.com>
+---
+diff --git a/tests/foreign.at b/tests/foreign.at
+index a9dc33c..d4702cd 100644
+--- a/tests/foreign.at
++++ b/tests/foreign.at
+@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore])
+ # Make sure at-path contains something valid, and let the test suite
+ # display it when verbose.  And fail, skipping would too easily hide
+ # problems.
+-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
+ AT_CHECK([test -f "`sed -n 1p stdout`"])
+ 
+ # Older libtoolize installed everything but install-sh...
+--
+cgit v0.9.0.2

Added: autoconf-2.69-perl-5.22-autoscan.patch
===================================================================
--- autoconf-2.69-perl-5.22-autoscan.patch	                        (rev 0)
+++ autoconf-2.69-perl-5.22-autoscan.patch	2016-05-14 11:41:59 UTC (rev 267951)
@@ -0,0 +1,28 @@
+From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Tue, 29 Jan 2013 13:46:48 -0800
+Subject: [PATCH] autoscan: port to perl 5.17
+
+* bin/autoscan.in (scan_sh_file): Escape '{'.  This avoids a
+feature that is deprecated in Perl 5.17.  Reported by Ray Lauff in
+<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
+---
+ bin/autoscan.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/autoscan.in b/bin/autoscan.in
+index 993a750..db1df79 100644
+--- a/bin/autoscan.in
++++ b/bin/autoscan.in
+@@ -358,7 +358,7 @@ sub scan_sh_file ($)
+     {
+       # Strip out comments and variable references.
+       s/#.*//;
+-      s/\${[^\}]*}//g;
++      s/\$\{[^\}]*}//g;
+       s/@[^@]*@//g;
+ 
+       # Tokens in the code.
+-- 
+2.1.0
+

Deleted: autoconf.install
===================================================================
--- autoconf.install	2016-05-14 11:04:12 UTC (rev 267950)
+++ autoconf.install	2016-05-14 11:41:59 UTC (rev 267951)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(autoconf.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}