From a0a8d23451c1fb10a7498394a736ba77ac6d08ce Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 26 Apr 2013 15:37:10 +0000 Subject: Use patch by Shunsuke Shimizu (bug #467330) instead of sed script. Rename automake-1.12 patch to avoid future confusion. (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613) --- net-dialup/lrzsz/ChangeLog | 9 ++++++- .../lrzsz/files/lrzsz-0.12.20-automake-1.12.patch | 28 ++++++++++++++++++++++ .../lrzsz/files/lrzsz-0.12.20-automake-1.13.patch | 12 ++++++++++ .../lrzsz/files/lrzsz-0.12.20-automake-2.12.patch | 28 ---------------------- net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild | 7 +++--- 5 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.12.patch create mode 100644 net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.13.patch delete mode 100644 net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch (limited to 'net-dialup/lrzsz') diff --git a/net-dialup/lrzsz/ChangeLog b/net-dialup/lrzsz/ChangeLog index 17361817bf4b..f5e42d7dbd92 100644 --- a/net-dialup/lrzsz/ChangeLog +++ b/net-dialup/lrzsz/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dialup/lrzsz # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.31 2013/04/26 15:30:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.32 2013/04/26 15:37:10 jer Exp $ + + 26 Apr 2013; Jeroen Roovers lrzsz-0.12.20-r3.ebuild, + +files/lrzsz-0.12.20-automake-1.12.patch, + +files/lrzsz-0.12.20-automake-1.13.patch, + -files/lrzsz-0.12.20-automake-2.12.patch: + Use patch by Shunsuke Shimizu (bug #467330) instead of sed script. Rename + automake-1.12 patch to avoid future confusion. 26 Apr 2013; Jeroen Roovers lrzsz-0.12.20-r3.ebuild: Fix building with automake-1.13 (bug #467330 by Shunsuke Shimizu). diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.12.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.12.patch new file mode 100644 index 000000000000..c5ecdee208d0 --- /dev/null +++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.12.patch @@ -0,0 +1,28 @@ +--- lrzsz-0.12.20/configure.in ++++ lrzsz-0.12.20/configure.in +@@ -97,7 +97,6 @@ + AC_ISC_POSIX + AC_USE_SYSTEM_EXTENSIONS + AM_GNU_GETTEXT +-AM_C_PROTOTYPES + AC_C_CONST + AC_C_INLINE + +--- lrzsz-0.12.20/lib/Makefile.am ++++ lrzsz-0.12.20/lib/Makefile.am +@@ -1,5 +1,4 @@ + noinst_LIBRARIES=libzmodem.a +-AUTOMAKE_OPTIONS=ansi2knr + + EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \ + getopt.c getopt1.c mkdir.c mktime.c \ +--- lrzsz-0.12.20/src/Makefile.am ++++ lrzsz-0.12.20/src/Makefile.am +@@ -7,7 +7,6 @@ + DISTCLEAN_FILES=lrzszbug + + LDADD = ../lib/libzmodem.a @INTLLIBS@ +-AUTOMAKE_OPTIONS=ansi2knr + EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in + INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib + #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\" diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.13.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.13.patch new file mode 100644 index 000000000000..a0d67c9f014f --- /dev/null +++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.13.patch @@ -0,0 +1,12 @@ +diff -urN lrzsz-0.12.20/configure.in lrzsz-0.12.20-new/configure.in +--- lrzsz-0.12.20/configure.in 1998-12-30 16:50:07.000000000 +0900 ++++ lrzsz-0.12.20-new/configure.in 2013-04-26 18:53:29.020100620 +0900 +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/crctab.c) + AM_INIT_AUTOMAKE(lrzsz, 0.12.20) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) + + + dnl AC_C_CROSS is in AC_PROG_CC since 2.12 diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch deleted file mode 100644 index c5ecdee208d0..000000000000 --- a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- lrzsz-0.12.20/configure.in -+++ lrzsz-0.12.20/configure.in -@@ -97,7 +97,6 @@ - AC_ISC_POSIX - AC_USE_SYSTEM_EXTENSIONS - AM_GNU_GETTEXT --AM_C_PROTOTYPES - AC_C_CONST - AC_C_INLINE - ---- lrzsz-0.12.20/lib/Makefile.am -+++ lrzsz-0.12.20/lib/Makefile.am -@@ -1,5 +1,4 @@ - noinst_LIBRARIES=libzmodem.a --AUTOMAKE_OPTIONS=ansi2knr - - EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \ - getopt.c getopt1.c mkdir.c mktime.c \ ---- lrzsz-0.12.20/src/Makefile.am -+++ lrzsz-0.12.20/src/Makefile.am -@@ -7,7 +7,6 @@ - DISTCLEAN_FILES=lrzszbug - - LDADD = ../lib/libzmodem.a @INTLLIBS@ --AUTOMAKE_OPTIONS=ansi2knr - EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in - INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib - #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\" diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild index 0fb47e6e3887..5ac66fb1fd38 100644 --- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild +++ b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.10 2013/04/26 15:30:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.11 2013/04/26 15:37:10 jer Exp $ EAPI="2" @@ -21,7 +21,8 @@ RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}"/${PN}-autotools.patch epatch "${FILESDIR}"/${PN}-implicit-decl.patch - epatch "${FILESDIR}"/${P}-automake-2.12.patch + epatch "${FILESDIR}"/${P}-automake-1.12.patch + epatch "${FILESDIR}"/${P}-automake-1.13.patch # automake is unhappy if this is missing >> config.rpath @@ -30,8 +31,6 @@ src_prepare() { # Autoheader does not like seeing this file. rm -f acconfig.h - sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die - eautoreconf } -- cgit v1.2.3-65-gdbad