[arch-commits] Commit in m4/repos (6 files)

[Allan McRae]

    Date: Friday, November 4, 2011 @ 19:35:59
  Author: allan
Revision: 142067

db-move: moved m4 from [testing] to [core] (i686)

Added:
  m4/repos/core-i686/PKGBUILD
    (from rev 142056, m4/repos/testing-i686/PKGBUILD)
  m4/repos/core-i686/m4-1.4.16-readlink-einval.patch
    (from rev 142056, m4/repos/testing-i686/m4-1.4.16-readlink-einval.patch)
  m4/repos/core-i686/m4.install
    (from rev 142056, m4/repos/testing-i686/m4.install)
Deleted:
  m4/repos/core-i686/PKGBUILD
  m4/repos/core-i686/m4.install
  m4/repos/testing-i686/

---------------------------------+
 PKGBUILD                        |   68 ++++++++++++++++++++------------------
 m4-1.4.16-readlink-einval.patch |   12 ++++++
 m4.install                      |   40 +++++++++++-----------
 3 files changed, 68 insertions(+), 52 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2011-11-04 23:35:58 UTC (rev 142066)
+++ core-i686/PKGBUILD	2011-11-04 23:35:59 UTC (rev 142067)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=m4
-pkgver=1.4.16
-pkgrel=1
-pkgdesc="The GNU macro processor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/m4"
-license=('GPL3')
-groups=('base-devel')
-depends=('glibc' 'bash')
-install=m4.install
-source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz)
-md5sums=('7548ec061a1ba993790159764f522d0e')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make prefix=${pkgdir}/usr install
-}

Copied: m4/repos/core-i686/PKGBUILD (from rev 142056, m4/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2011-11-04 23:35:59 UTC (rev 142067)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=m4
+pkgver=1.4.16
+pkgrel=2
+pkgdesc="The GNU macro processor"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/m4"
+license=('GPL3')
+groups=('base-devel')
+depends=('glibc' 'bash')
+install=m4.install
+source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
+        m4-1.4.16-readlink-einval.patch)
+md5sums=('7548ec061a1ba993790159764f522d0e'
+         'eebe5c94e74e7551e2e30c5844f1b653'
+         'cea138fa9b568d06e46269611cec8dd0')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make prefix=${pkgdir}/usr install
+}

Copied: m4/repos/core-i686/m4-1.4.16-readlink-einval.patch (from rev 142056, m4/repos/testing-i686/m4-1.4.16-readlink-einval.patch)
===================================================================
--- core-i686/m4-1.4.16-readlink-einval.patch	                        (rev 0)
+++ core-i686/m4-1.4.16-readlink-einval.patch	2011-11-04 23:35:59 UTC (rev 142067)
@@ -0,0 +1,12 @@
+diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h
+--- m4-1.4.16/tests/test-readlink.h.orig	2011-09-19 12:44:58.745546826 +0200
++++ m4-1.4.16/tests/test-readlink.h	2011-09-19 12:46:00.079548410 +0200
+@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con
+   ASSERT (errno == ENOENT);
+   errno = 0;
+   ASSERT (func ("", buf, sizeof buf) == -1);
+-  ASSERT (errno == ENOENT);
++  ASSERT (errno == ENOENT || errno == EINVAL);
+   errno = 0;
+   ASSERT (func (".", buf, sizeof buf) == -1);
+   ASSERT (errno == EINVAL);

Deleted: core-i686/m4.install
===================================================================
--- core-i686/m4.install	2011-11-04 23:35:58 UTC (rev 142066)
+++ core-i686/m4.install	2011-11-04 23:35:59 UTC (rev 142067)
@@ -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
-}

Copied: m4/repos/core-i686/m4.install (from rev 142056, m4/repos/testing-i686/m4.install)
===================================================================
--- core-i686/m4.install	                        (rev 0)
+++ core-i686/m4.install	2011-11-04 23:35:59 UTC (rev 142067)
@@ -0,0 +1,20 @@
+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
+}