From f2dbc3f997981c9e46b5782c46383950147add5f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 31 Dec 2012 09:48:23 +0000
Subject: [PATCH] main/a2ps: fix building with automake-1.13
---
main/a2ps/APKBUILD | 8 +++++---
main/a2ps/automake.patch | 30 ++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 main/a2ps/automake.patch
diff --git a/main/a2ps/APKBUILD b/main/a2ps/APKBUILD
index bb1418e5b11c..d5bb45a58261 100644
--- a/main/a2ps/APKBUILD
+++ b/main/a2ps/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=a2ps
pkgver=4.14
-pkgrel=3
+pkgrel=4
pkgdesc="a2ps is an Any to PostScript filter"
url="http://www.gnu.org/software/a2ps/"
arch="all"
@@ -17,6 +17,7 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname-$pkgver-check-mempcpy.patch
$pkgname-$pkgver-fix-stpcpy-proto.patch
a2ps-automake-1.12.patch
+ automake.patch
"
prepare() {
@@ -30,7 +31,7 @@ prepare() {
|| return 1
rm -f aclocal.m4 */aclocal.m4
libtoolize --force --copy || return 1
- autoreconf -I m4 || return 1
+ aclocal -I m4 && automake --add-missing && autoreconf -I m4 || return 1
}
build() {
@@ -54,4 +55,5 @@ md5sums="781ac3d9b213fa3e1ed0d79f986dc8c7 a2ps-4.14.tar.gz
09cc5ed4d3d8ff1b2103e519191e8286 a2ps-4.13-manpage-chmod.patch
42aa39b74f6da8cf6e94185c4fc3e601 a2ps-4.14-check-mempcpy.patch
4b4fbc19a6b79fa64df7e26945fcdcf9 a2ps-4.14-fix-stpcpy-proto.patch
-72e8f0a6cd234945df92549d8a5451f8 a2ps-automake-1.12.patch"
+72e8f0a6cd234945df92549d8a5451f8 a2ps-automake-1.12.patch
+868217fde7f9a4c1350c99431b0c1671 automake.patch"
diff --git a/main/a2ps/automake.patch b/main/a2ps/automake.patch
new file mode 100644
index 000000000000..5a76359367df
--- /dev/null
+++ b/main/a2ps/automake.patch
@@ -0,0 +1,30 @@
+--- ./configure.in.orig 2012-12-31 09:32:06.411787207 +0000
++++ ./configure.in 2012-12-31 09:33:15.672384454 +0000
+@@ -12,7 +12,7 @@
+ # Initialize automake
+ AM_INIT_AUTOMAKE
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+
+ # Specify the liba2ps version number
+ LIBVERSION=1:0:0
+@@ -42,7 +42,6 @@
+ AC_MINIX
+ AC_ISC_POSIX
+ AC_PROG_CPP
+-AM_PROG_CC_STDC
+ AC_PROG_YACC
+ fp_PROG_ECHO
+ AC_PROG_GPERF
+--- ./m4/protos.m4.orig 2012-12-31 09:43:24.994398048 +0000
++++ ./m4/protos.m4 2012-12-31 09:43:57.681443768 +0000
+@@ -6,7 +6,7 @@
+ # serial 1
+
+ AC_DEFUN([AM_C_PROTOTYPES],
+-[AC_REQUIRE([AM_PROG_CC_STDC])
++[AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_PROG_CPP])
+ AC_MSG_CHECKING([for function prototypes])
+ if test "$am_cv_prog_cc_stdc" != no; then
--
GitLab