[arch-commits] Commit in m4/trunk (3 files)

[Allan McRae]

    Date: Saturday, May 14, 2016 @ 13:02:47
  Author: allan
Revision: 267949

upgpkg: m4 1.4.17-2

hooks rebuild

Added:
  m4/trunk/m4-1.4.17-perl-make-check.patch
Modified:
  m4/trunk/PKGBUILD
Deleted:
  m4/trunk/m4.install

---------------------------------+
 PKGBUILD                        |   23 ++++++++++++++++-------
 m4-1.4.17-perl-make-check.patch |   12 ++++++++++++
 m4.install                      |   20 --------------------
 3 files changed, 28 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-05-14 10:50:45 UTC (rev 267948)
+++ PKGBUILD    2016-05-14 11:02:47 UTC (rev 267949)
@@ -4,7 +4,7 @@
 
 pkgname=m4
 pkgver=1.4.17
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU macro processor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/m4";
@@ -11,24 +11,33 @@
 license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'bash')
-install=m4.install
-source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
+        m4-1.4.17-perl-make-check.patch)
 md5sums=('12a3c829301a4fd6586a57d3fcf196dc'
-         'SKIP')
+         'SKIP'
+         '4e4df1abc05f425ec0dc3bc2b692b35f')
 validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')   # Gary Vaughan
 
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # fix testsuite failures with newer perl
+  patch -p1 -i $srcdir/m4-1.4.17-perl-make-check.patch
+}
+
 build() {
-  cd ${srcdir}/$pkgname-$pkgver  
+  cd $pkgname-$pkgver  
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make prefix=${pkgdir}/usr install
 }

Added: m4-1.4.17-perl-make-check.patch
===================================================================
--- m4-1.4.17-perl-make-check.patch                             (rev 0)
+++ m4-1.4.17-perl-make-check.patch     2016-05-14 11:02:47 UTC (rev 267949)
@@ -0,0 +1,12 @@
+diff -up m4-1.4.17/build-aux/update-copyright.orig 
m4-1.4.17/build-aux/update-copyright
+--- m4-1.4.17/build-aux/update-copyright.orig  2015-07-13 11:25:19.502749690 
+0200
++++ m4-1.4.17/build-aux/update-copyright       2015-07-13 11:26:20.445044297 
+0200
+@@ -124,7 +124,7 @@ use strict;
+ use warnings;
+ 
+ my $copyright_re = 'Copyright';
+-my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
++my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)';
+ my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
+ $holder ||= 'Free Software Foundation, Inc.';
+ my $prefix_max = 5;

Deleted: m4.install
===================================================================
--- m4.install  2016-05-14 10:50:45 UTC (rev 267948)
+++ m4.install  2016-05-14 11:02:47 UTC (rev 267949)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=('m4.info' 'm4.info-1' 'm4.info-2')
-
-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
-}