Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31046/10.4-transitional/unstable/main/finkinfo/libs
Modified Files:
libxml2.info libxml2.patch
Log Message:
New version. Added readline history to xmllint. Removed cruft from build.
Index: libxml2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libxml2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxml2.patch 27 Apr 2005 03:26:03 -0000 1.1
+++ libxml2.patch 26 Oct 2005 16:32:11 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uNr libxml2-2.6.11/catalog.c libxml2-2.6.11-new/catalog.c
---- libxml2-2.6.11/catalog.c 2004-06-27 12:14:07.000000000 -0400
-+++ libxml2-2.6.11-new/catalog.c 2004-07-07 18:27:17.000000000 -0400
+diff -Nurd -x'*~' libxml2-2.6.22.orig/catalog.c libxml2-2.6.22/catalog.c
+--- libxml2-2.6.22.orig/catalog.c 2005-04-01 08:15:01.000000000 -0500
++++ libxml2-2.6.22/catalog.c 2005-10-26 01:42:04.000000000 -0400
@@ -62,10 +62,10 @@
#define XML_URN_PUBID "urn:publicid:"
#define XML_CATAL_BREAK ((xmlChar *) -1)
@@ -14,10 +14,110 @@
#endif
#if defined(_WIN32) && defined(_MSC_VER)
-diff -uNr libxml2-2.6.11/doc/xmllint.1 libxml2-2.6.11-new/doc/xmllint.1
---- libxml2-2.6.11/doc/xmllint.1 2004-06-27 07:56:46.000000000 -0400
-+++ libxml2-2.6.11-new/doc/xmllint.1 2004-07-07 18:27:47.000000000 -0400
-@@ -152,7 +152,7 @@
+diff -Nurd -x'*~' libxml2-2.6.22.orig/doc/catalog.html
libxml2-2.6.22/doc/catalog.html
+--- libxml2-2.6.22.orig/doc/catalog.html 2005-09-12 17:40:30.000000000
-0400
++++ libxml2-2.6.22/doc/catalog.html 2005-10-26 01:40:44.000000000 -0400
+@@ -49,7 +49,7 @@
+ Catalogs</a> is far more flexible, more recent, uses an XML syntax and
+ should scale quite better. This is the default option of libxml.</li>
+ </ul><p></p><h3><a name="Simple" id="Simple">Using catalog</a></h3><p>In a
normal environment libxml2 will by default check the presence of a
+-catalog in /etc/xml/catalog, and assuming it has been correctly populated,
++catalog in @PREFIX@/etc/xml/catalog, and assuming it has been correctly
populated,
+ the processing is completely transparent to the document user. To take a
+ concrete example, suppose you are authoring a DocBook document, this one
+ starts with the following DOCTYPE definition:</p><pre><?xml
version='1.0'?>
+@@ -106,7 +106,7 @@
+ as the DocBook resources on the local machine.</p><h3><a name="reference"
id="reference">How to tune catalog usage:</a></h3><p>The user can change the
default catalog behaviour by redirecting queries
+ to its own set of catalogs, this can be done by setting the
+ <code>XML_CATALOG_FILES</code> environment variable to a list of catalogs, an
+-empty one should deactivate loading the default <code>/etc/xml/catalog</code>
++empty one should deactivate loading the default
<code>@PREFIX@/etc/xml/catalog</code>
+ default catalog</p><h3><a name="validate" id="validate">How to debug catalog
processing:</a></h3><p>Setting up the <code>XML_DEBUG_CATALOG</code>
environment variable will
+ make libxml2 output debugging informations for each catalog operations, for
+ example:</p><pre>orchis:~/XML -> xmllint --memory --noout test/ent2
+@@ -239,8 +239,8 @@
+ specification update, some background and pointers to others tools
+ providing XML Catalog support</li>
+ <li>There is a <a href="buildDocBookCatalog">shell script</a> to generate
+- XML Catalogs for DocBook 4.1.2 . If it can write to the /etc/xml/
+- directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on
++ XML Catalogs for DocBook 4.1.2 . If it can write to the @PREFIX@/etc/xml/
++ directory, it will set-up @PREFIX@/etc/xml/catalog and
@PREFIX@/etc/xml/docbook based on
+ the resources found on the system. Otherwise it will just create
+ ~/xmlcatalog and ~/dbkxmlcatalog and doing:
+ <p><code>export XML_CATALOG_FILES=$HOME/xmlcatalog</code></p>
+diff -Nurd -x'*~' libxml2-2.6.22.orig/doc/guidelines.html
libxml2-2.6.22/doc/guidelines.html
+--- libxml2-2.6.22.orig/doc/guidelines.html 2005-01-02 09:11:41.000000000
-0500
++++ libxml2-2.6.22/doc/guidelines.html 2005-10-26 01:39:34.000000000 -0400
+@@ -203,7 +203,7 @@
+ tools to use a local copy of the resources if it is available even if the
+ instance document references the canonical URL. <a
+ href="http://www.oasis-open.org/committees/entity/";>XML Catalogs</a> are
+-anchored in the root catalog (usually <code>/etc/xml/catalog</code> or
++anchored in the root catalog (usually <code>@PREFIX@/etc/xml/catalog</code> or
+ defined by the user). They are a tree of XML documents defining the mappings
+ between the canonical naming space and the local installed ones, this can be
+ seen as a static cache structure.</p>
+diff -Nurd -x'*~' libxml2-2.6.22.orig/doc/xml.html libxml2-2.6.22/doc/xml.html
+--- libxml2-2.6.22.orig/doc/xml.html 2005-09-12 17:36:53.000000000 -0400
++++ libxml2-2.6.22/doc/xml.html 2005-10-26 01:41:17.000000000 -0400
+@@ -3763,7 +3763,7 @@
+ <h3><a name="Simple">Using catalog</a></h3>
+
+ <p>In a normal environment libxml2 will by default check the presence of a
+-catalog in /etc/xml/catalog, and assuming it has been correctly populated,
++catalog in @PREFIX@/etc/xml/catalog, and assuming it has been correctly
populated,
+ the processing is completely transparent to the document user. To take a
+ concrete example, suppose you are authoring a DocBook document, this one
+ starts with the following DOCTYPE definition:</p>
+@@ -3844,7 +3844,7 @@
+ <p>The user can change the default catalog behaviour by redirecting queries
+ to its own set of catalogs, this can be done by setting the
+ <code>XML_CATALOG_FILES</code> environment variable to a list of catalogs, an
+-empty one should deactivate loading the default <code>/etc/xml/catalog</code>
++empty one should deactivate loading the default
<code>@PREFIX@/etc/xml/catalog</code>
+ default catalog</p>
+
+ <h3><a name="validate">How to debug catalog processing:</a></h3>
+@@ -4068,8 +4068,8 @@
+ specification update, some background and pointers to others tools
+ providing XML Catalog support</li>
+ <li>There is a <a href="buildDocBookCatalog">shell script</a> to generate
+- XML Catalogs for DocBook 4.1.2 . If it can write to the /etc/xml/
+- directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on
++ XML Catalogs for DocBook 4.1.2 . If it can write to the @PREFIX@/etc/xml/
++ directory, it will set-up @PREFIX@/etc/xml/catalog and
@PREFIX@/etc/xml/docbook based on
+ the resources found on the system. Otherwise it will just create
+ ~/xmlcatalog and ~/dbkxmlcatalog and doing:
+ <p><code>export XML_CATALOG_FILES=$HOME/xmlcatalog</code></p>
+diff -Nurd -x'*~' libxml2-2.6.22.orig/doc/xmlcatalog.1
libxml2-2.6.22/doc/xmlcatalog.1
+--- libxml2-2.6.22.orig/doc/xmlcatalog.1 2005-01-02 09:11:42.000000000
-0500
++++ libxml2-2.6.22/doc/xmlcatalog.1 2005-10-26 01:38:04.000000000 -0400
+@@ -128,7 +128,7 @@
+ .SH "CATALOGS"
+
+ .PP
+-Catalog behavior can be changed by redirecting queries to the user's own set
of catalogs\&. This can be done by setting the \fIXML_CATALOG_FILES\fR
environment variable to a list of catalogs\&. An empty one should deactivate
loading the default \fI/etc/xml/catalog\fR default catalog\&.
++Catalog behavior can be changed by redirecting queries to the user's own set
of catalogs\&. This can be done by setting the \fIXML_CATALOG_FILES\fR
environment variable to a list of catalogs\&. An empty one should deactivate
loading the default [EMAIL PROTECTED]@/etc/xml/catalog\fR default catalog\&.
+
+ .SH "REFERENCES"
+
+diff -Nurd -x'*~' libxml2-2.6.22.orig/doc/xmlcatalog_man.html
libxml2-2.6.22/doc/xmlcatalog_man.html
+--- libxml2-2.6.22.orig/doc/xmlcatalog_man.html 2005-01-02
09:11:42.000000000 -0500
++++ libxml2-2.6.22/doc/xmlcatalog_man.html 2005-10-26 01:37:54.000000000
-0400
+@@ -95,7 +95,7 @@
+ queries to the user's own set of catalogs. This can be done by setting
the
+ <tt class="varname">XML_CATALOG_FILES</tt> environment variable to a
list of
+ catalogs. An empty one should deactivate loading the default
+- <tt class="filename">/etc/xml/catalog</tt> default
catalog.</p></div><div class="refsect1" lang="en"><h2>References</h2><p><a
href="http://www.xmlsoft.org/"; target="_top">libxml web page</a></p><p><a
href="http://www.xmlsoft.org/catalog.html"; target="_top"><span
class="application">libxml</span>
++ <tt class="filename">@PREFIX@/etc/xml/catalog</tt> default
catalog.</p></div><div class="refsect1" lang="en"><h2>References</h2><p><a
href="http://www.xmlsoft.org/"; target="_top">libxml web page</a></p><p><a
href="http://www.xmlsoft.org/catalog.html"; target="_top"><span
class="application">libxml</span>
+ catalog support web page:</a></p><p><a
href="http://www.jclark.com/sp/catalog.htm"; target="_top">James Clark's
+ <span class="acronym">SGML</span> catalog page:</a></p><p><a
href="http://www.oasis-open.org/committees/entity/spec.html";
target="_top"><span class="acronym">OASIS</span>
+ <span class="acronym">XML</span> catalog specification:
</a></p></div></div></body></html>
+diff -Nurd -x'*~' libxml2-2.6.22.orig/doc/xmllint.1
libxml2-2.6.22/doc/xmllint.1
+--- libxml2-2.6.22.orig/doc/xmllint.1 2005-07-27 16:59:37.000000000 -0400
++++ libxml2-2.6.22/doc/xmllint.1 2005-10-26 01:32:14.000000000 -0400
+@@ -176,7 +176,7 @@
.TP
\fB\-\-catalogs\fR
@@ -26,7 +126,7 @@
.TP
\fB\-\-nocatalogs\fR
-@@ -270,7 +270,7 @@
+@@ -306,7 +306,7 @@
.SH "CATALOGS"
.PP
@@ -35,10 +135,31 @@
.SH "DEBUGGING CATALOGS"
-diff -uNr libxml2-2.6.11/ltmain.sh libxml2-2.6.11-new/ltmain.sh
---- libxml2-2.6.11/ltmain.sh 2004-07-05 13:46:24.000000000 -0400
-+++ libxml2-2.6.11-new/ltmain.sh 2004-07-07 18:27:18.000000000 -0400
-@@ -2211,7 +2211,7 @@
+diff -Nurd -x'*~' libxml2-2.6.22.orig/doc/xmllint.html
libxml2-2.6.22/doc/xmllint.html
+--- libxml2-2.6.22.orig/doc/xmllint.html 2005-07-10 12:16:09.000000000
-0400
++++ libxml2-2.6.22/doc/xmllint.html 2005-10-26 01:37:29.000000000 -0400
+@@ -95,7 +95,7 @@
+ </dd><dt><span class="term"><tt class="option">--encode</tt> <i
class="replaceable"><tt>encoding</tt></i></span></dt><dd>
+ Output in the given encoding.
+ </dd><dt><span class="term"><tt
class="option">--catalogs</tt></span></dt><dd>
+- Use the catalogs from $SGML_CATALOG_FILES. Otherwise /etc/xml/catalog
++ Use the catalogs from $SGML_CATALOG_FILES. Otherwise
@PREFIX@/etc/xml/catalog
+ is used by default.
+ </dd><dt><span class="term"><tt
class="option">--nocatalogs</tt></span></dt><dd>
+ Do not use any catalogs.
+@@ -167,7 +167,7 @@
+ queries to the user's own set of catalogs. This can be done by setting
the
+ <tt class="varname">XML_CATALOG_FILES</tt> environment variable to a
list of
+ catalogs. An empty one should deactivate loading the default
+- <tt class="filename">/etc/xml/catalog</tt> default
catalog.</p></div><div class="refsect1" lang="en"><h2>Debugging
Catalogs</h2><p>Setting the environment variable <tt
class="varname">XML_DEBUG_CATALOG</tt>
++ <tt class="filename">@PREFIX@/etc/xml/catalog</tt> default
catalog.</p></div><div class="refsect1" lang="en"><h2>Debugging
Catalogs</h2><p>Setting the environment variable <tt
class="varname">XML_DEBUG_CATALOG</tt>
+ using the command <b class="command">"export XML_DEBUG_CATALOG="</b>
+ outputs debugging information related to catalog
operations.</p></div><div class="refsect1" lang="en"><h2>Error Return
Codes</h2><p>On the completion of execution, <span
class="application">Xmllint</span>
+ returns the following error codes:</p><div
class="variablelist"><dl><dt><span class="term">0</span></dt><dd>No
error</dd><dt><span class="term">1</span></dt><dd>Unclassified</dd><dt><span
class="term">2</span></dt><dd>Error in DTD</dd><dt><span
class="term">3</span></dt><dd>Validation error</dd><dt><span
class="term">4</span></dt><dd>Validation error</dd><dt><span
class="term">5</span></dt><dd>Error in schema compilation</dd><dt><span
class="term">6</span></dt><dd>Error writing output</dd><dt><span
class="term">7</span></dt><dd>Error in pattern (generated when
+diff -Nurd -x'*~' libxml2-2.6.22.orig/ltmain.sh libxml2-2.6.22/ltmain.sh
+--- libxml2-2.6.22.orig/ltmain.sh 2005-09-12 17:44:40.000000000 -0400
++++ libxml2-2.6.22/ltmain.sh 2005-10-26 01:32:14.000000000 -0400
+@@ -2276,7 +2276,7 @@
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
@@ -46,10 +167,31 @@
+ need_relink=no
fi
# This is a shared library
-
-diff -uNr libxml2-2.6.11/update-sgml-catalog
libxml2-2.6.11-new/update-sgml-catalog
---- libxml2-2.6.11/update-sgml-catalog 1969-12-31 19:00:00.000000000 -0500
-+++ libxml2-2.6.11-new/update-sgml-catalog 2004-07-07 18:27:18.000000000
-0400
+
+diff -Nurd -x'*~' libxml2-2.6.22.orig/runtest.c libxml2-2.6.22/runtest.c
+--- libxml2-2.6.22.orig/runtest.c 2005-08-25 08:26:59.000000000 -0400
++++ libxml2-2.6.22/runtest.c 2005-10-26 01:35:52.000000000 -0400
+@@ -2738,7 +2738,7 @@
+ */
+ static int
+ uripMatch(const char * URI) {
+- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog")))
++ if ((URI == NULL) || (!strcmp(URI, "file://@PREFIX@/etc/xml/catalog")))
+ return(0);
+ /* Verify we received the escaped URL */
+ if (strcmp(urip_rcvsURLs[urip_current], URI))
+@@ -2757,7 +2757,7 @@
+ */
+ static void *
+ uripOpen(const char * URI) {
+- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog")))
++ if ((URI == NULL) || (!strcmp(URI, "file://@PREFIX@/etc/xml/catalog")))
+ return(NULL);
+ /* Verify we received the escaped URL */
+ if (strcmp(urip_rcvsURLs[urip_current], URI))
+diff -Nurd -x'*~' libxml2-2.6.22.orig/update-sgml-catalog
libxml2-2.6.22/update-sgml-catalog
+--- libxml2-2.6.22.orig/update-sgml-catalog 1969-12-31 19:00:00.000000000
-0500
++++ libxml2-2.6.22/update-sgml-catalog 2005-10-26 01:32:14.000000000 -0400
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+#
@@ -79,9 +221,9 @@
+chmod 0644 ${CATALOG}
+
+exit 0
-diff -uNr libxml2-2.6.11/update-xml-catalog
libxml2-2.6.11-new/update-xml-catalog
---- libxml2-2.6.11/update-xml-catalog 1969-12-31 19:00:00.000000000 -0500
-+++ libxml2-2.6.11-new/update-xml-catalog 2004-07-07 18:27:18.000000000
-0400
+diff -Nurd -x'*~' libxml2-2.6.22.orig/update-xml-catalog
libxml2-2.6.22/update-xml-catalog
+--- libxml2-2.6.22.orig/update-xml-catalog 1969-12-31 19:00:00.000000000
-0500
++++ libxml2-2.6.22/update-xml-catalog 2005-10-26 01:32:14.000000000 -0400
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+#
@@ -112,10 +254,10 @@
+chmod 0644 ${CATALOG}
+
+exit 0
-diff -uNr libxml2-2.6.11/xmlcatalog.c libxml2-2.6.11-new/xmlcatalog.c
---- libxml2-2.6.11/xmlcatalog.c 2004-03-04 09:00:11.000000000 -0500
-+++ libxml2-2.6.11-new/xmlcatalog.c 2004-07-07 18:27:18.000000000 -0400
-@@ -42,7 +42,7 @@
+diff -Nurd -x'*~' libxml2-2.6.22.orig/xmlcatalog.c libxml2-2.6.22/xmlcatalog.c
+--- libxml2-2.6.22.orig/xmlcatalog.c 2005-01-04 09:49:48.000000000 -0500
++++ libxml2-2.6.22/xmlcatalog.c 2005-10-26 01:32:14.000000000 -0400
+@@ -43,7 +43,7 @@
#ifndef XML_SGML_DEFAULT_CATALOG
@@ -124,10 +266,10 @@
#endif
/************************************************************************
-diff -uNr libxml2-2.6.11/xmllint.c libxml2-2.6.11-new/xmllint.c
---- libxml2-2.6.11/xmllint.c 2004-06-27 07:56:46.000000000 -0400
-+++ libxml2-2.6.11-new/xmllint.c 2004-07-07 18:27:18.000000000 -0400
-@@ -94,7 +94,7 @@
+diff -Nurd -x'*~' libxml2-2.6.22.orig/xmllint.c libxml2-2.6.22/xmllint.c
+--- libxml2-2.6.22.orig/xmllint.c 2005-09-12 05:15:48.000000000 -0400
++++ libxml2-2.6.22/xmllint.c 2005-10-26 01:32:14.000000000 -0400
+@@ -100,7 +100,7 @@
#endif
#ifndef XML_XML_DEFAULT_CATALOG
Index: libxml2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libxml2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libxml2.info 25 Aug 2005 18:36:37 -0000 1.4
+++ libxml2.info 26 Oct 2005 16:32:11 -0000 1.5
@@ -1,26 +1,27 @@
Package: libxml2
-Version: 2.6.20
+Version: 2.6.22
Revision: 1
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-Depends: %N-shlibs (>= %v-%r), %N-bin
-BuildDepends: libiconv-dev
+Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r)
+BuildDepends: libiconv-dev, readline5, libncurses5
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
-Source-MD5: 342f722d1770071be19253f229fef677
+Source-MD5: 5bf7e6bc7164ae0f5a6cc5ff693a4180
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
- perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
<<
-NoSetLDFLAGS: true
SetLDFLAGS: -no-undefined
-ConfigureParams: --mandir='${prefix}/share/man' --with-iconv=%p
--without-python --disable-dependency-tracking ac_cv_lib_dl_dlopen=no
+ConfigureParams: --mandir=%p/share/man --with-iconv=%p --without-python
--disable-dependency-tracking --with-html-subdir=%n --with-history
+CompileScript: <<
+ XMLLINT=/usr/bin/true XSLTPROC=/usr/bin/true ./configure %c
+ make
+<<
InstallScript: <<
- make install prefix=%i
- mkdir -p %i/etc/xml
- mkdir -p %i/share/doc
- mv %i/share/doc/%n-%v %i/share/doc/%n
- mkdir -p %i/sbin
- install -c -m 755 update-xml-catalog %i/sbin/
- install -c -m 755 update-sgml-catalog %i/sbin/
+ make install DESTDIR=%d DOC_MODULE=%n
+ mkdir -p %i/etc/xml/catalog.d
+ mkdir -p %i/etc/sgml/catalog.d
+ mkdir -p %i/sbin
+ install -c -m 755 update-xml-catalog %i/sbin/
+ install -c -m 755 update-sgml-catalog %i/sbin/
<<
DocFiles: AUTHORS Copyright NEWS README TODO
BuildDependsOnly: True
@@ -35,7 +36,7 @@
<<
SplitOff2: <<
Package: %N-bin
- Depends: %N-shlibs (>= %v-%r)
+ Depends: %N-shlibs (>= %v-%r), readline5-shlibs, libncurses5-shlibs
Replaces: libxml2 (<< 2.4.18-2)
Files: bin/xmlcatalog bin/xmllint sbin share/man/man1/xmlcatalog.1
share/man/man1/xmllint.1 etc/xml
DocFiles: Copyright README
@@ -66,19 +67,18 @@
are in libxml2-pyXX for various pythonX.X versions.
<<
DescPort: <<
- The Makefile is too stupid to link the executables against the right
- copy of the library, so we help by setting LDFLAGS. Otherwise we get
- contamination if an older version of libxml2 is already installed
- while building.
-
- Libtool gets patched to fix bundle (loadable module, .so file) building.
-
- Make sure we don't link to fink's dlcompat lib.
-
- ./configure checks for xmllint and xsltproc, which would cause
+ Hide xmllint and xsltproc executables from ./configure to avoid
circular dependencies (on libxml2-bin (build here) and libxslt-bin
- (depends on libxml2)). Fortunately, these executables are only used
- to build docs that we do not build.
+ (depends on libxml2)) and network access during build. Fortunately,
+ these executables are only used to build docs that already come
+ prebuilt (we patch the targets instead of patching sources and
+ rebuilding).
+
+ Packages prior to 2.6.22-1 did not use --with-history, so they did
+ not need readline or ncurses. Now it does, but these libs are only
+ used for the -bin programs not the -shlibs libs. So no new flags in
+ .la or .pc, so no dependency and rebuilding nightmare for dependent
+ packages. Hooray!
<<
DescPackaging: <<
Uses pkgconfig, but there are no pkgconfig-related dependencies.
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
