Fix intl/Makefile syntax wrt make-3.82 (#336128).

(Portage version: 2.1.8.3/cvs/Linux x86_64)

2 files changed, 32 insertions, 17 deletions

diff --git a/net-dialup/lrzsz/ChangeLog b/net-dialup/lrzsz/ChangeLog
index bc4d3af804f2..fdb1ef9cbf13 100644
--- a/net-dialup/lrzsz/ChangeLog
+++ b/net-dialup/lrzsz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/lrzsz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.21 2010/01/01 17:23:57 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.22 2010/09/24 22:51:19 mrness Exp $
+
+  24 Sep 2010; Alin Năstac <mrness@gentoo.org> files/lrzsz-autotools.patch:
+  Fix intl/Makefile syntax wrt make-3.82 (#336128).
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   lrzsz-0.12.20-r3.ebuild:
diff --git a/net-dialup/lrzsz/files/lrzsz-autotools.patch b/net-dialup/lrzsz/files/lrzsz-autotools.patch
index b76aad666d6b..704af801559e 100644
--- a/net-dialup/lrzsz/files/lrzsz-autotools.patch
+++ b/net-dialup/lrzsz/files/lrzsz-autotools.patch
@@ -1,6 +1,6 @@
 diff -Nru lrzsz-0.12.20.orig/acinclude.m4 lrzsz-0.12.20/acinclude.m4
 --- lrzsz-0.12.20.orig/acinclude.m4	1998-12-27 23:08:59.000000000 +0100
-+++ lrzsz-0.12.20/acinclude.m4	2009-07-10 01:18:40.000000000 +0200
++++ lrzsz-0.12.20/acinclude.m4	2010-09-25 00:43:43.000000000 +0200
 @@ -13,7 +13,7 @@
  lrzsz_cv_decl_errno=yes, lrzsz_cv_decl_errno=no)])
  AC_MSG_RESULT($lrzsz_cv_decl_errno)
@@ -30,8 +30,20 @@ diff -Nru lrzsz-0.12.20.orig/acinclude.m4 lrzsz-0.12.20/acinclude.m4
  
 diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
 --- lrzsz-0.12.20.orig/configure.in	1998-12-30 08:50:07.000000000 +0100
-+++ lrzsz-0.12.20/configure.in	2009-07-10 01:18:40.000000000 +0200
-@@ -33,25 +33,25 @@
++++ lrzsz-0.12.20/configure.in	2010-09-25 00:45:10.000000000 +0200
+@@ -20,6 +20,11 @@
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ 
++GT_YES="#"
++GT_NO=""
++AC_SUBST(GT_YES)
++AC_SUBST(GT_NO)
++
+ changequote(,)dnl
+ case $VERSION in
+ 	[0-9]*.[0-9]*.[0-9]*) README_ALPHA="README-alpha";;
+@@ -33,25 +38,25 @@
  	[if test "$enableval" = "no" ; then 
  		:
  	  else
@@ -62,7 +74,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  AC_ARG_ENABLE(syslog,
  	[--enable-syslog=FACILITY,{force,default,optional} include syslogsupport],
  	[
-@@ -62,7 +62,7 @@
+@@ -62,7 +67,7 @@
  	    *,*)
  			level=`echo $enableval|sed -e 's/^.*,//'`
  			fac=`echo $enableval|sed -e 's/,.*$//'`
@@ -71,7 +83,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  			;;
  		*)
  			lookup_facility=LOG_UUCP
-@@ -70,16 +70,16 @@
+@@ -70,16 +75,16 @@
  			;;
  		esac
  	  	if test "$level" = "force" ; then
@@ -91,7 +103,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  		lookup_facility=LOG_UUCP
  	  ])
  
-@@ -90,8 +90,8 @@
+@@ -90,8 +95,8 @@
  dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE
  AC_PROG_RANLIB
  AC_ISC_POSIX
@@ -102,7 +114,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  AM_C_PROTOTYPES
  AC_C_CONST
  AC_C_INLINE
-@@ -113,7 +113,7 @@
+@@ -113,7 +118,7 @@
  fi
  case "$CFLAGS" in
  *-Wstrict-prototypes*)
@@ -111,7 +123,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  	;;
  esac
  
-@@ -131,7 +131,7 @@
+@@ -131,7 +136,7 @@
  LRZSZ_HEADERS_TERM_IO
  AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)
  AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h)
@@ -120,7 +132,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_SIZE_T
-@@ -153,7 +153,7 @@
+@@ -153,7 +158,7 @@
  dnl AC_FUNC_UTIME_NULL
  AC_FUNC_MMAP
  AC_FUNC_ALLOCA
@@ -129,7 +141,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  
  AC_CHECK_FUNCS(gettimeofday settimeofday)
  AC_CHECK_FUNCS(strchr memcpy select vprintf)
-@@ -206,10 +206,10 @@
+@@ -206,10 +211,10 @@
  lrzsz_cv_sys_ftime_ok=no,
  lrzsz_cv_sys_ftime_ok=runtime)])
  case $lrzsz_cv_sys_ftime_ok in
@@ -142,7 +154,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  	AC_MSG_RESULT(will check at run time) ;;
  esac
  ])
-@@ -223,7 +223,7 @@
+@@ -223,7 +228,7 @@
  ])
  if test $libquark_cv_var_timezone = yes ; then
  	AC_MSG_RESULT(yes)
@@ -151,7 +163,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  else
  	AC_MSG_RESULT(no)
  fi
-@@ -245,9 +245,9 @@
+@@ -245,9 +250,9 @@
  	])
  	if test $lrzsz_cv_lookup_facility = yes ; then
  		AC_MSG_RESULT(yes)
@@ -163,7 +175,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  		AC_MSG_RESULT(no)
  	fi
  fi
-@@ -257,9 +257,8 @@
+@@ -257,9 +262,8 @@
  AC_SUBST(LDFLAGS)
  AC_SUBST(LIBS)
  
@@ -176,7 +188,7 @@ diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
  AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \
 diff -Nru lrzsz-0.12.20.orig/lib/Makefile.am lrzsz-0.12.20/lib/Makefile.am
 --- lrzsz-0.12.20.orig/lib/Makefile.am	1998-12-27 17:25:26.000000000 +0100
-+++ lrzsz-0.12.20/lib/Makefile.am	2009-07-10 01:18:40.000000000 +0200
++++ lrzsz-0.12.20/lib/Makefile.am	2010-09-25 00:43:43.000000000 +0200
 @@ -1,5 +1,4 @@
  noinst_LIBRARIES=libzmodem.a
 -CFLAGS=@CFLAGS@
@@ -185,7 +197,7 @@ diff -Nru lrzsz-0.12.20.orig/lib/Makefile.am lrzsz-0.12.20/lib/Makefile.am
  EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
 diff -Nru lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in
 --- lrzsz-0.12.20.orig/po/Makefile.in.in	1998-04-26 15:22:40.000000000 +0200
-+++ lrzsz-0.12.20/po/Makefile.in.in	2009-07-10 01:19:23.000000000 +0200
++++ lrzsz-0.12.20/po/Makefile.in.in	2010-09-25 00:43:43.000000000 +0200
 @@ -51,7 +51,7 @@
  
  POTFILES = \
@@ -208,7 +220,7 @@ diff -Nru lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in
  	  dir=$$destdir/$$lang/LC_MESSAGES; \
 diff -Nru lrzsz-0.12.20.orig/src/Makefile.am lrzsz-0.12.20/src/Makefile.am
 --- lrzsz-0.12.20.orig/src/Makefile.am	1998-12-28 09:38:47.000000000 +0100
-+++ lrzsz-0.12.20/src/Makefile.am	2009-07-10 01:18:40.000000000 +0200
++++ lrzsz-0.12.20/src/Makefile.am	2010-09-25 00:43:43.000000000 +0200
 @@ -4,7 +4,6 @@
  noinst_HEADERS = timing.h zglobal.h zmodem.h
  datadir = $(prefix)/@DATADIRNAME@