[69426] trunk/dports/devel/autoconf

ram at macports.org ram at macports.org
Mon Jul 5 12:12:20 PDT 2010


Revision: 69426
          http://trac.macports.org/changeset/69426
Author:   ram at macports.org
Date:     2010-07-05 12:12:16 -0700 (Mon, 05 Jul 2010)
Log Message:
-----------
devel/autoconf: revert to 2.65_1 to to numerous regressions in 2.66

Modified Paths:
--------------
    trunk/dports/devel/autoconf/Portfile

Added Paths:
-----------
    trunk/dports/devel/autoconf/files/
    trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch
    trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch

Removed Paths:
-------------
    trunk/dports/devel/autoconf/files/
    trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch
    trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch

Modified: trunk/dports/devel/autoconf/Portfile
===================================================================
--- trunk/dports/devel/autoconf/Portfile	2010-07-05 15:37:07 UTC (rev 69425)
+++ trunk/dports/devel/autoconf/Portfile	2010-07-05 19:12:16 UTC (rev 69426)
@@ -3,8 +3,9 @@
 PortSystem       1.0
 
 name             autoconf
-version          2.66
-revision         2
+version          2.65
+revision         1
+epoch            1
 categories       devel
 maintainers      ram openmaintainer
 platforms        darwin
@@ -28,18 +29,17 @@
     universal_variant no
 }
 
-checksums        md5 d2d22a532ee0e4d6d86a02e6425ecfce \
-                 sha1 1b446c7365f79d4c1f494e14602c6115df99af1a \
-                 rmd160 cca0aa54b8f44d6160b0edd8665febf9365d7940
+checksums        md5 a6de1cc6434cd64038b0a0ae4e252b33 \
+                 sha1 9126ffb8d7d59f38f305ef53e208531d4b75bb87 \
+                 rmd160 250b0f46ae6f81fe47f30ae61335a2291d736197
 
+patchfiles       0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch \
+                 0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch
+
 depends_lib      path:bin/perl:perl5 \
                  port:m4 \
                  port:help2man
 
-patchfiles       patch-lib_autoconf_status.m4.diff \
-                 patch-lib_autoconf_types.m4.diff \
-                 patch-lib_m4sugar_m4sh.m4.diff
-
 # If libtool is eventually installed, it will provide glibtoolize (not libtoolize)
 post-patch {
   reinplace "s|'libtoolize'|'glibtoolize'|" ${worksrcpath}/bin/autoreconf.in

Deleted: trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch
===================================================================
--- trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch	2010-04-06 02:46:34 UTC (rev 66088)
+++ trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch	2010-07-05 19:12:16 UTC (rev 69426)
@@ -1,90 +0,0 @@
-From a6bf8d5c754dcde068dedd2e826ae95af50c197e Mon Sep 17 00:00:00 2001
-From: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
-Date: Tue, 24 Nov 2009 11:36:53 +0100
-Subject: [PATCH 1/2] Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
-for the constant string.  Cast void* to char* for assignment.
-* NEWS, THANKS: Update.
-Report by Michal Čihař.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
----
- ChangeLog                 |    8 ++++++++
- NEWS                      |    2 ++
- THANKS                    |    1 +
- lib/autoconf/functions.m4 |    7 ++++---
- 4 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git ChangeLog ChangeLog
-index d8d0f9b..521ef79 100644
---- ChangeLog
-+++ ChangeLog
-@@ -1,3 +1,11 @@
-+2009-11-24  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
-+
-+	Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
-+	* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
-+	for the constant string.  Cast void* to char* for assignment.
-+	* NEWS, THANKS: Update.
-+	Report by Michal Čihař.
-+
- 2009-11-21  Eric Blake  <ebb9 at byu.net>
- 
- 	Release Version 2.65.
-diff --git NEWS NEWS
-index b72eb17..d05b78c 100644
---- NEWS
-+++ NEWS
-@@ -1,5 +1,7 @@
- GNU Autoconf NEWS - User visible changes.
- 
-+** AC_FUNC_MMAP works in C++ mode again.  Regression introduced in 2.65.
-+
- * Major changes in Autoconf 2.65 (2009-11-21) [stable]
-   Released by Eric Blake, based on git versions 2.64.*.
- 
-diff --git THANKS THANKS
-index b288163..fdd6930 100644
---- THANKS
-+++ THANKS
-@@ -250,6 +250,7 @@ Matthew D. Langston         langston at SLAC.Stanford.EDU
- Matthew Mueller             donut at azstarnet.com
- Matthew Woehlke             mw_triad at users.sourceforge.net
- Matthias Andree             matthias.andree at gmx.de
-+Michal Čihař                nijel at debian.org
- Michael Elizabeth Chastain  chastain at cygnus.com
- Michael Jenning             ?
- Michael Matz                matz at kde.org
-diff --git lib/autoconf/functions.m4 lib/autoconf/functions.m4
-index 6b6e7fc..14a8cb9 100644
---- lib/autoconf/functions.m4
-+++ lib/autoconf/functions.m4
-@@ -1258,6 +1258,7 @@ int
- main ()
- {
-   char *data, *data2, *data3;
-+  const char *cdata2;
-   int i, pagesize;
-   int fd, fd2;
- 
-@@ -1282,10 +1283,10 @@ main ()
-   fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
-   if (fd2 < 0)
-     return 4;
--  data2 = "";
--  if (write (fd2, data2, 1) != 1)
-+  cdata2 = "";
-+  if (write (fd2, cdata2, 1) != 1)
-     return 5;
--  data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
-+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
-   if (data2 == MAP_FAILED)
-     return 6;
-   for (i = 0; i < pagesize; ++i)
--- 
-1.6.5.3
-

Copied: trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch (from rev 66088, trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch)
===================================================================
--- trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch	                        (rev 0)
+++ trunk/dports/devel/autoconf/files/0001-Fix-AC_FUNC_MMAP-regression-with-C-compiler-in-2.65.patch	2010-07-05 19:12:16 UTC (rev 69426)
@@ -0,0 +1,90 @@
+From a6bf8d5c754dcde068dedd2e826ae95af50c197e Mon Sep 17 00:00:00 2001
+From: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
+Date: Tue, 24 Nov 2009 11:36:53 +0100
+Subject: [PATCH 1/2] Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
+for the constant string.  Cast void* to char* for assignment.
+* NEWS, THANKS: Update.
+Report by Michal Čihař.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
+---
+ ChangeLog                 |    8 ++++++++
+ NEWS                      |    2 ++
+ THANKS                    |    1 +
+ lib/autoconf/functions.m4 |    7 ++++---
+ 4 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git ChangeLog ChangeLog
+index d8d0f9b..521ef79 100644
+--- ChangeLog
++++ ChangeLog
+@@ -1,3 +1,11 @@
++2009-11-24  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
++
++	Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
++	* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
++	for the constant string.  Cast void* to char* for assignment.
++	* NEWS, THANKS: Update.
++	Report by Michal Čihař.
++
+ 2009-11-21  Eric Blake  <ebb9 at byu.net>
+ 
+ 	Release Version 2.65.
+diff --git NEWS NEWS
+index b72eb17..d05b78c 100644
+--- NEWS
++++ NEWS
+@@ -1,5 +1,7 @@
+ GNU Autoconf NEWS - User visible changes.
+ 
++** AC_FUNC_MMAP works in C++ mode again.  Regression introduced in 2.65.
++
+ * Major changes in Autoconf 2.65 (2009-11-21) [stable]
+   Released by Eric Blake, based on git versions 2.64.*.
+ 
+diff --git THANKS THANKS
+index b288163..fdd6930 100644
+--- THANKS
++++ THANKS
+@@ -250,6 +250,7 @@ Matthew D. Langston         langston at SLAC.Stanford.EDU
+ Matthew Mueller             donut at azstarnet.com
+ Matthew Woehlke             mw_triad at users.sourceforge.net
+ Matthias Andree             matthias.andree at gmx.de
++Michal Čihař                nijel at debian.org
+ Michael Elizabeth Chastain  chastain at cygnus.com
+ Michael Jenning             ?
+ Michael Matz                matz at kde.org
+diff --git lib/autoconf/functions.m4 lib/autoconf/functions.m4
+index 6b6e7fc..14a8cb9 100644
+--- lib/autoconf/functions.m4
++++ lib/autoconf/functions.m4
+@@ -1258,6 +1258,7 @@ int
+ main ()
+ {
+   char *data, *data2, *data3;
++  const char *cdata2;
+   int i, pagesize;
+   int fd, fd2;
+ 
+@@ -1282,10 +1283,10 @@ main ()
+   fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+   if (fd2 < 0)
+     return 4;
+-  data2 = "";
+-  if (write (fd2, data2, 1) != 1)
++  cdata2 = "";
++  if (write (fd2, cdata2, 1) != 1)
+     return 5;
+-  data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
++  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+   if (data2 == MAP_FAILED)
+     return 6;
+   for (i = 0; i < pagesize; ++i)
+-- 
+1.6.5.3
+

Deleted: trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch
===================================================================
--- trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch	2010-04-06 02:46:34 UTC (rev 66088)
+++ trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch	2010-07-05 19:12:16 UTC (rev 69426)
@@ -1,87 +0,0 @@
-From 83af14cdbfe2eb1fbc5ce8ea395244dbe65dd4f3 Mon Sep 17 00:00:00 2001
-From: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
-Date: Wed, 9 Dec 2009 07:20:16 +0100
-Subject: [PATCH 2/2] Fix 2.64 AC_TYPE_INT*_T macro body text regression.
-
-* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
-definition to prologue section, to avoid syntax error.
-* NEWS, THANKS: Update.
-Report by Pierre Ynard.
-
-Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
----
- ChangeLog             |    8 ++++++++
- NEWS                  |    3 +++
- THANKS                |    1 +
- lib/autoconf/types.m4 |   12 ++++++------
- 4 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git ChangeLog ChangeLog
-index 521ef79..b254d5e 100644
---- ChangeLog
-+++ ChangeLog
-@@ -1,3 +1,11 @@
-+2009-12-09  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
-+
-+	Fix 2.65 AC_TYPE_INT*_T macro body text regression.
-+	* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
-+	definition to prologue section, to avoid syntax error.
-+	* NEWS, THANKS: Update.
-+	Report by Pierre Ynard.
-+
- 2009-11-24  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
- 
- 	Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
-diff --git NEWS NEWS
-index d05b78c..436d22e 100644
---- NEWS
-+++ NEWS
-@@ -1,5 +1,8 @@
- GNU Autoconf NEWS - User visible changes.
- 
-+** The macros AC_TYPE_INT8_T, AC_TYPE_INT16_T, AC_TYPE_INT32_T, and
-+   AC_TYPE_INT64_T work again.  Regression introduced in 2.65.
-+
- ** AC_FUNC_MMAP works in C++ mode again.  Regression introduced in 2.65.
- 
- * Major changes in Autoconf 2.65 (2009-11-21) [stable]
-diff --git THANKS THANKS
-index fdd6930..5ec7633 100644
---- THANKS
-+++ THANKS
-@@ -307,6 +307,7 @@ Peter Stephenson            pws at csr.com
- Philipp Thomas              kthomas at gwdg.de
- Philippe De Muyter          ?
- Pierre                      pierre42d at 9online.fr
-+Pierre Ynard                linkfanel at yahoo.fr
- Pontus Skoeld               pont at soua.net
- Rainer Orth                 ro at TechFak.Uni-Bielefeld.DE
- Raja R Harinath             harinath at cs.umn.edu
-diff --git lib/autoconf/types.m4 lib/autoconf/types.m4
-index 7a73fc2..3829c4c 100644
---- lib/autoconf/types.m4
-+++ lib/autoconf/types.m4
-@@ -635,14 +635,14 @@ m4_define([_AC_TYPE_INT_BODY],
- 	 'long long int' 'short int' 'signed char'; do
-        AC_COMPILE_IFELSE(
- 	 [AC_LANG_BOOL_COMPILE_TRY(
--	    [AC_INCLUDES_DEFAULT],
--	    [enum { N = $[]2 / 2 - 1 };
--	     0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
-+	    [AC_INCLUDES_DEFAULT
-+	     enum { N = $[]2 / 2 - 1 };],
-+	    [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
- 	 [AC_COMPILE_IFELSE(
- 	    [AC_LANG_BOOL_COMPILE_TRY(
--	       [AC_INCLUDES_DEFAULT],
--	       [enum { N = $[]2 / 2 - 1 };
--		($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
-+	       [AC_INCLUDES_DEFAULT
-+	        enum { N = $[]2 / 2 - 1 };],
-+	       [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
- 		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])],
- 	    [],
- 	    [AS_CASE([$ac_type], [int$[]2_t],
--- 
-1.6.5.3
-

Copied: trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch (from rev 66088, trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch)
===================================================================
--- trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch	                        (rev 0)
+++ trunk/dports/devel/autoconf/files/0002-Fix-2.64-AC_TYPE_INT-_T-macro-body-text-regression.patch	2010-07-05 19:12:16 UTC (rev 69426)
@@ -0,0 +1,87 @@
+From 83af14cdbfe2eb1fbc5ce8ea395244dbe65dd4f3 Mon Sep 17 00:00:00 2001
+From: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
+Date: Wed, 9 Dec 2009 07:20:16 +0100
+Subject: [PATCH 2/2] Fix 2.64 AC_TYPE_INT*_T macro body text regression.
+
+* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
+definition to prologue section, to avoid syntax error.
+* NEWS, THANKS: Update.
+Report by Pierre Ynard.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues at gmx.de>
+---
+ ChangeLog             |    8 ++++++++
+ NEWS                  |    3 +++
+ THANKS                |    1 +
+ lib/autoconf/types.m4 |   12 ++++++------
+ 4 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git ChangeLog ChangeLog
+index 521ef79..b254d5e 100644
+--- ChangeLog
++++ ChangeLog
+@@ -1,3 +1,11 @@
++2009-12-09  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
++
++	Fix 2.65 AC_TYPE_INT*_T macro body text regression.
++	* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
++	definition to prologue section, to avoid syntax error.
++	* NEWS, THANKS: Update.
++	Report by Pierre Ynard.
++
+ 2009-11-24  Ralf Wildenhues  <Ralf.Wildenhues at gmx.de>
+ 
+ 	Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
+diff --git NEWS NEWS
+index d05b78c..436d22e 100644
+--- NEWS
++++ NEWS
+@@ -1,5 +1,8 @@
+ GNU Autoconf NEWS - User visible changes.
+ 
++** The macros AC_TYPE_INT8_T, AC_TYPE_INT16_T, AC_TYPE_INT32_T, and
++   AC_TYPE_INT64_T work again.  Regression introduced in 2.65.
++
+ ** AC_FUNC_MMAP works in C++ mode again.  Regression introduced in 2.65.
+ 
+ * Major changes in Autoconf 2.65 (2009-11-21) [stable]
+diff --git THANKS THANKS
+index fdd6930..5ec7633 100644
+--- THANKS
++++ THANKS
+@@ -307,6 +307,7 @@ Peter Stephenson            pws at csr.com
+ Philipp Thomas              kthomas at gwdg.de
+ Philippe De Muyter          ?
+ Pierre                      pierre42d at 9online.fr
++Pierre Ynard                linkfanel at yahoo.fr
+ Pontus Skoeld               pont at soua.net
+ Rainer Orth                 ro at TechFak.Uni-Bielefeld.DE
+ Raja R Harinath             harinath at cs.umn.edu
+diff --git lib/autoconf/types.m4 lib/autoconf/types.m4
+index 7a73fc2..3829c4c 100644
+--- lib/autoconf/types.m4
++++ lib/autoconf/types.m4
+@@ -635,14 +635,14 @@ m4_define([_AC_TYPE_INT_BODY],
+ 	 'long long int' 'short int' 'signed char'; do
+        AC_COMPILE_IFELSE(
+ 	 [AC_LANG_BOOL_COMPILE_TRY(
+-	    [AC_INCLUDES_DEFAULT],
+-	    [enum { N = $[]2 / 2 - 1 };
+-	     0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
++	    [AC_INCLUDES_DEFAULT
++	     enum { N = $[]2 / 2 - 1 };],
++	    [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
+ 	 [AC_COMPILE_IFELSE(
+ 	    [AC_LANG_BOOL_COMPILE_TRY(
+-	       [AC_INCLUDES_DEFAULT],
+-	       [enum { N = $[]2 / 2 - 1 };
+-		($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
++	       [AC_INCLUDES_DEFAULT
++	        enum { N = $[]2 / 2 - 1 };],
++	       [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+ 		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])],
+ 	    [],
+ 	    [AS_CASE([$ac_type], [int$[]2_t],
+-- 
+1.6.5.3
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100705/b0328c8c/attachment-0001.html>


More information about the macports-changes mailing list