Updating bigloo's versioning config/support patch, cause of issues with dos line ending and sys-devel/patch-2.5.9, fixes bug 219624

(Portage version: 2.1.5.5)

2 files changed, 46 insertions, 37 deletions

diff --git a/dev-php/roadsend-php/ChangeLog b/dev-php/roadsend-php/ChangeLog
index e946412dc325..591f9d530719 100644
--- a/dev-php/roadsend-php/ChangeLog
+++ b/dev-php/roadsend-php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/roadsend-php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/roadsend-php/ChangeLog,v 1.7 2008/04/25 12:20:43 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/roadsend-php/ChangeLog,v 1.8 2008/06/18 22:30:48 pchrist Exp $
+
+  18 Jun 2008; Panagiotis Christopoulos <pchrist@gentoo.org>
+  files/bigloo-3.1a-configsupport.patch:
+  Updating bigloo's versioning config/support patch, cause of issues with
+  dos line ending and sys-devel/patch-2.5.9, fixes bug 219624
 
 *roadsend-php-2.9.6 (25 Apr 2008)
 
diff --git a/dev-php/roadsend-php/files/bigloo-3.1a-configsupport.patch b/dev-php/roadsend-php/files/bigloo-3.1a-configsupport.patch
index 4d954ccb8ffd..0df61bee3504 100644
--- a/dev-php/roadsend-php/files/bigloo-3.1a-configsupport.patch
+++ b/dev-php/roadsend-php/files/bigloo-3.1a-configsupport.patch
@@ -1,36 +1,40 @@
-Index: /trunk/pcc/configure

-===================================================================

---- /trunk/pcc/configure (revision 495)

-+++ /trunk/pcc/configure (revision 504)

-@@ -3122,5 +3122,5 @@

- # can't figure out how to get this into AC_CHECK_PROG_VER below?

- # have to change it there too

--want_bigloo="3.0c, 3.0d"

-+want_bigloo="3.0c, 3.0d, 3.1a"

- want_curl=7.15.1

- 

-@@ -3192,5 +3192,5 @@

-   case $ac_prog_version in

-     '') ac_prog_version_m="v. ?.??, bad"; ac_verc_fail=yes;;

--    3.0c | 3.0d)

-+    3.0c | 3.0d | 3.1a)

-        ac_prog_version_m="$ac_prog_version, ok"; ac_verc_fail=no;;

-     *) ac_prog_version_m="$ac_prog_version, bad"; ac_verc_fail=yes;;

-Index: /trunk/pcc/configure.in

-===================================================================

---- /trunk/pcc/configure.in (revision 495)

-+++ /trunk/pcc/configure.in (revision 504)

-@@ -27,5 +27,5 @@

- # can't figure out how to get this into AC_CHECK_PROG_VER below?

- # have to change it there too

--want_bigloo="3.0c, 3.0d"

-+want_bigloo="3.0c, 3.0d, 3.1a"

- want_curl=7.15.1

- 

-@@ -50,5 +50,5 @@

- 		  -revision,

- 		  [\([2-9].[0-9][a-z]\)],

--		  [3.0c | 3.0d],

-+		  [3.0c | 3.0d | 3.1a],

- 		  AC_MSG_FAILURE([Bigloo version $want_bigloo required in the system path]))

- 

+--- configure	2008-04-16 17:08:39.000000000 +0300
++++ /tmp/roadsend/configure	2008-06-19 01:03:00.000000000 +0300
+@@ -3121,7 +3121,7 @@
+ 
+ # can't figure out how to get this into AC_CHECK_PROG_VER below?
+ # have to change it there too
+-want_bigloo="3.0c, 3.0d"
++want_bigloo="3.0c, 3.0d 3.1a"
+ want_curl=7.15.1
+ 
+ # defaults
+@@ -3191,7 +3191,7 @@
+   ac_prog_version=`$HAVE_BIGLOO -revision 2>&1 | sed -n 's/^.*\([2-9].[0-9][a-z]\).*$/\1/p'`
+   case $ac_prog_version in
+     '') ac_prog_version_m="v. ?.??, bad"; ac_verc_fail=yes;;
+-    3.0c | 3.0d)
++    3.0c | 3.0d | 3.1a)
+        ac_prog_version_m="$ac_prog_version, ok"; ac_verc_fail=no;;
+     *) ac_prog_version_m="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ 
+--- configure.in	2008-04-16 17:08:39.000000000 +0300
++++ /tmp/roadsend/configure.in	2008-06-19 01:03:16.000000000 +0300
+@@ -26,7 +26,7 @@
+ 
+ # can't figure out how to get this into AC_CHECK_PROG_VER below?
+ # have to change it there too
+-want_bigloo="3.0c, 3.0d"
++want_bigloo="3.0c, 3.0d, 3.1a"
+ want_curl=7.15.1
+ 
+ # defaults
+@@ -49,7 +49,7 @@
+ 		  bigloo, 
+ 		  -revision,
+ 		  [\([2-9].[0-9][a-z]\)],
+-		  [3.0c | 3.0d],
++		  [3.0c | 3.0d | 3.1a],
+ 		  AC_MSG_FAILURE([Bigloo version $want_bigloo required in the system path]))
+ 
+ BIGLOO_VERSION=$ac_prog_version