Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19751
Modified Files:
autoconf2.6.info
Added Files:
autoconf2.6.patch
Log Message:
copy autoconf package, make source .gz not .xz
--- NEW FILE: autoconf2.6.patch ---
>From 8c8522f1c5c8362ec683b5464e99a95bc735677f Mon Sep 17 00:00:00 2001
From: Eric Blake <ebl...@redhat.com>
Date: Tue, 17 Jul 2012 12:02:12 -0600
Subject: [PATCH] doc: fix texinfo location reports
Otherwise, newer texinfo parses this line as a line directive, and
any error later in the file will claim to be from "conftest.c" instead
of "autoconf.texi".
* doc/autoconf.texi (Generating Sources): Avoid confusing newer
texinfo into thinking we had a line directive.
Reported by Stefano Lattarini, fix suggested by Patrice Dumas.
---
doc/autoconf.texi | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 75a204f..78a2c67 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -9155,7 +9155,7 @@ on a system with @command{gcc} installed, results in:
@example
@c If you change this example, adjust tests/compile.at:AC_LANG_SOURCE example.
@dots{}
-# 1 "conftest.c"
+@asis{#} 1 "conftest.c"
#define PACKAGE_NAME "Hello"
#define PACKAGE_TARNAME "hello"
@@ -9200,7 +9200,7 @@ on a system with @command{gcc} installed, results in:
@example
@c If you change this example, adjust tests/compile.at:AC_LANG_PROGRAM example.
@dots{}
-# 1 "conftest.c"
+@asis{#} 1 "conftest.c"
#define PACKAGE_NAME "Hello"
#define PACKAGE_TARNAME "hello"
--
1.7.2.5
>From a357718b081f1678748ead5d7cb67c766c930441 Mon Sep 17 00:00:00 2001
From: Patrice Dumas <pertu...@free.fr>
Date: Wed, 18 Jul 2012 13:41:45 -0600
Subject: [PATCH] doc: fix texinfo macro usage
The texinfo manual recommends avoiding the use of a trailing @c in
any macro designed to be used inline (as is the case with our ovar
and dvar macros). Furthermore, passing '@\n' in the middle of a
macro call is much different than passing '@\n' between arguments
of a @defmac for line continuation.
* doc/autoconf.texi (ovar, dvar): Don't end macro with @c, since
these macros are designed to be embedded in one-line usage.
(Fortran Compiler): Don't split @dvar.
* THANKS: Update.
Reported by Stefano Lattarini.
Signed-off-by: Eric Blake <ebl...@redhat.com>
Copyright-paperwork-exempt: Yes
---
THANKS | 1 +
doc/autoconf.texi | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/THANKS b/THANKS
index 25734d5..8682c87 100644
--- a/THANKS
+++ b/THANKS
@@ -316,6 +316,7 @@ Olly Betts o...@survex.com
Ossama Othman oss...@debian.org
Pallav Gupta pallavgu...@gmail.com
Paolo Bonzini bonz...@gnu.org
+Patrice Dumas pertu...@free.fr
Patrick Tullmann tullm...@cs.utah.edu
Patrick Welche pr...@newn.cam.ac.uk
Paul Berrevoets p...@swi.com
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 78a2c67..506d966 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -15,7 +15,7 @@
@c The ARG is an optional argument. To be used for macro arguments in
@c their documentation (@defmac).
@macro ovar{varname}
-@r{[}@var{\varname\}@r{]}@c
+@r{[}@var{\varname\}@r{]}
@end macro
@c @dvar(ARG, DEFAULT)
@@ -23,7 +23,7 @@
@c The ARG is an optional argument, defaulting to DEFAULT. To be used
@c for macro arguments in their documentation (@defmac).
@macro dvar{varname, default}
-@r{[}@var{\varname\} = @samp{\default\}@r{]}@c
+@r{[}@var{\varname\} = @samp{\default\}@r{]}
@end macro
@c Handling the indexes with Texinfo yields several different problems.
@@ -8014,10 +8014,10 @@ variables, respectively. The computed linker flags are
cached in
@code{ac_cv_f77_libs} or @code{ac_cv_fc_libs}, respectively.
@end defmac
-@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @
- AC_MSG_FAILURE})
-@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @
- AC_MSG_FAILURE})
+@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @
+ @dvar{action-if-not-found, AC_MSG_FAILURE})
+@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @
+ @dvar{action-if-not-found, AC_MSG_FAILURE})
@acindex{F77_DUMMY_MAIN}
@cvindex F77_DUMMY_MAIN
@acindex{FC_DUMMY_MAIN}
@@ -8268,8 +8268,8 @@ results in @code{ac_cv_fc_srcext_@var{ext}} and
@code{ac_cv_fc_pp_srcext_@var{ext}} variables, respectively.
@end defmac
-@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @dvar{action-if-failure, @
- AC_MSG_FAILURE})
+@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @
+ @dvar{action-if-failure, AC_MSG_FAILURE})
@acindex{FC_PP_DEFINE}
@caindex fc_pp_define
@@ -8287,8 +8287,8 @@ The result of this test is cached in the
@code{ac_cv_fc_pp_define}
variable.
@end defmac
-@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @dvar{action-if-failure, @
- AC_MSG_FAILURE})
+@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @
+ @dvar{action-if-failure, AC_MSG_FAILURE})
@acindex{FC_FREEFORM}
@caindex fc_freeform
@@ -8314,8 +8314,8 @@ The result of this test, or @samp{none} or
@samp{unknown}, is cached in
the @code{ac_cv_fc_freeform} variable.
@end defmac
-@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @dvar{action-if-failure, @
- AC_MSG_FAILURE})
+@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @
+ @dvar{action-if-failure, AC_MSG_FAILURE})
@acindex{FC_FIXEDFORM}
@caindex fc_fixedform
--
1.7.2.5
Index: autoconf2.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/devel/autoconf2.6.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autoconf2.6.info 3 Jul 2012 00:00:19 -0000 1.3
+++ autoconf2.6.info 13 May 2013 06:17:09 -0000 1.4
@@ -1,12 +1,14 @@
Package: autoconf2.6
Version: 2.69
-Revision: 1
-Depends: m4 (>= 1.4.11)
-BuildDepends: texi2html, fink (>= 0.24.12)
+Revision: 3
+Depends: m4 (>= 1.4.16-1)
+BuildDepends: texi2html, texinfo (>= 4.13-1), fink (>= 0.24.12)
Conflicts: autoconf2.13, autoconf25 (<= 2.54-1), autoconf
Replaces: autoconf2.13, autoconf25 (<= 2.54-1), autoconf2.5, autoconf
Source: mirror:gnu:autoconf/autoconf-%v.tar.gz
-Source-MD5: 82d05e03b93e45f5a39b828dc9c6c29b
+Source-MD5: 82d05e03b93e45f5a39b828dc9c6c29b
+PatchFile: %n.patch
+PatchFile-MD5: 98587b965791c7221f644cdf08dbcaf3
ConfigureParams: --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --program-suffix=-%v
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
@@ -46,6 +48,13 @@
that this is a separate package, this autoconf version should work on
most modern configure scripts, however.
+Add patch with upstream autoconf git commits...
+
+8c8522f1c5c8362ec683b5464e99a95bc735677f
+a357718b081f1678748ead5d7cb67c766c930441
+
+to allow for builds with texinfo 5.0.
+
Previously by Christoph Pfisterer <chr...@users.sourceforge.net>
also by Chris Zubrzycki <bere...@users.sourceforge.net>
<<
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
