Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15428a
Added Files:
libxml2-py.info libxml2-py.patch libxml2.info libxml2.patch
Log Message:
import from 10.4/unstable
--- NEW FILE: libxml2.patch ---
diff -Nurd libxml2-2.6.22-orig/catalog.c libxml2-2.6.22/catalog.c
--- libxml2-2.6.22-orig/catalog.c 2005-04-01 15:15:01.000000000 +0200
+++ libxml2-2.6.22/catalog.c 2006-03-19 05:34:18.000000000 +0100
@@ -62,10 +62,10 @@
#define XML_URN_PUBID "urn:publicid:"
#define XML_CATAL_BREAK ((xmlChar *) -1)
#ifndef XML_XML_DEFAULT_CATALOG
-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "file://@PREFIX@/etc/xml/catalog"
#endif
#ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "file://@PREFIX@/etc/sgml/catalog"
#endif
#if defined(_WIN32) && defined(_MSC_VER)
diff -Nurd libxml2-2.6.22-orig/doc/Makefile.am libxml2-2.6.22/doc/Makefile.am
--- libxml2-2.6.22-orig/doc/Makefile.am 2005-09-12 11:17:59.000000000 +0200
+++ libxml2-2.6.22/doc/Makefile.am 2006-03-21 21:38:37.000000000 +0100
@@ -106,11 +106,10 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
- [EMAIL PROTECTED]@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html
$(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif
$(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif
$(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif
$(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR)
+ [EMAIL PROTECTED]@ -m 0644 $(srcdir)/*.html $(srcdir)/*.gif
$(srcdir)/*.png $(srcdir)/libxml2-api.xml $(DESTDIR)$(HTML_DIR)
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
[EMAIL PROTECTED]@ -m 0644 $(srcdir)/html/*.html
$(DESTDIR)$(HTML_DIR)/html
[EMAIL PROTECTED]@ -m 0644 $(srcdir)/html/*.png
$(DESTDIR)$(HTML_DIR)/html
- [EMAIL PROTECTED]@ -m 0644 $(srcdir)/html/index.sgml
$(DESTDIR)$(HTML_DIR)/html
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial
[EMAIL PROTECTED]@ -m 0644 $(srcdir)/tutorial/*.* \
$(DESTDIR)$(HTML_DIR)/tutorial
diff -Nurd libxml2-2.6.22-orig/doc/Makefile.in libxml2-2.6.22/doc/Makefile.in
--- libxml2-2.6.22-orig/doc/Makefile.in 2005-09-12 23:44:43.000000000 +0200
+++ libxml2-2.6.22/doc/Makefile.in 2006-03-21 21:38:16.000000000 +0100
@@ -727,11 +727,10 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
- [EMAIL PROTECTED]@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html
$(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif
$(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif
$(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif
$(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR)
+ [EMAIL PROTECTED]@ -m 0644 $(srcdir)/*.html $(srcdir)/*.gif
$(srcdir)/*.png $(srcdir)/libxml2-api.xml $(DESTDIR)$(HTML_DIR)
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
[EMAIL PROTECTED]@ -m 0644 $(srcdir)/html/*.html
$(DESTDIR)$(HTML_DIR)/html
[EMAIL PROTECTED]@ -m 0644 $(srcdir)/html/*.png
$(DESTDIR)$(HTML_DIR)/html
- [EMAIL PROTECTED]@ -m 0644 $(srcdir)/html/index.sgml
$(DESTDIR)$(HTML_DIR)/html
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial
[EMAIL PROTECTED]@ -m 0644 $(srcdir)/tutorial/*.* \
$(DESTDIR)$(HTML_DIR)/tutorial
diff -Nurd libxml2-2.6.22-orig/doc/catalog.html libxml2-2.6.22/doc/catalog.html
--- libxml2-2.6.22-orig/doc/catalog.html 2006-01-05 14:36:59.000000000
+0100
+++ libxml2-2.6.22/doc/catalog.html 2006-03-19 06:19:20.000000000 +0100
@@ -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 libxml2-2.6.22-orig/doc/examples/Makefile.am
libxml2-2.6.22/doc/examples/Makefile.am
--- libxml2-2.6.22-orig/doc/examples/Makefile.am 2006-01-05
14:46:06.000000000 +0100
+++ libxml2-2.6.22/doc/examples/Makefile.am 2006-03-21 13:48:28.000000000
+0100
@@ -3,6 +3,8 @@
DEPS = $(top_builddir)/libxml2.la
LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@
$(ICONV_LIBS) -lm @WIN32_EXTRA_LIBADD@
+all: rebuild
+
rebuild: examples.xml index.html
examples.xml: index.py *.c
@@ -12,8 +14,8 @@
-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" &&
xmllint --valid --noout index.html)
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
- [EMAIL PROTECTED]@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c
$(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/examples
+ [EMAIL PROTECTED]@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c
$(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples
EXTRA_DIST=examples.xsl index.py examples.xml test1.xml test2.xml test3.xml
tst.xml writer.xml io1.res io2.res reader1.res reader3.res reader4.res
tree1.res tree2.res xpath1.res xpath2.res
diff -Nurd libxml2-2.6.22-orig/doc/examples/Makefile.in
libxml2-2.6.22/doc/examples/Makefile.in
--- libxml2-2.6.22-orig/doc/examples/Makefile.in 2006-01-05
16:39:07.000000000 +0100
+++ libxml2-2.6.22/doc/examples/Makefile.in 2006-03-21 13:48:59.000000000
+0100
@@ -692,6 +692,8 @@
tags uninstall uninstall-am uninstall-info-am
+all: rebuild
+
rebuild: examples.xml index.html
examples.xml: index.py *.c
@@ -701,8 +703,8 @@
-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" &&
xmllint --valid --noout index.html)
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
- [EMAIL PROTECTED]@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c
$(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/examples
+ [EMAIL PROTECTED]@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c
$(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples
valgrind:
$(MAKE) CHECKER='valgrind' tests
diff -Nurd 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 15:11:41.000000000
+0100
+++ libxml2-2.6.22/doc/guidelines.html 2006-03-19 06:25:40.000000000 +0100
@@ -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 libxml2-2.6.22-orig/doc/xml.html libxml2-2.6.22/doc/xml.html
--- libxml2-2.6.22-orig/doc/xml.html 2006-01-05 14:32:51.000000000 +0100
+++ libxml2-2.6.22/doc/xml.html 2006-03-19 06:27:51.000000000 +0100
<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>
@@ -3874,7 +3874,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>
@@ -4135,8 +4135,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 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 15:11:42.000000000
+0100
+++ libxml2-2.6.22/doc/xmlcatalog.1 2006-03-19 05:45:37.000000000 +0100
@@ -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 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 15:11:42.000000000
+0100
+++ libxml2-2.6.22/doc/xmlcatalog_man.html 2006-03-19 05:47:41.000000000
+0100
@@ -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 libxml2-2.6.22-orig/doc/xmlcatalog_man.xml
libxml2-2.6.22/doc/xmlcatalog_man.xml
--- libxml2-2.6.22-orig/doc/xmlcatalog_man.xml 2005-01-02 15:11:42.000000000
+0100
+++ libxml2-2.6.22/doc/xmlcatalog_man.xml 2006-03-19 05:49:28.000000000
+0100
@@ -278,7 +278,7 @@
queries to the user's own set of catalogs. This can be done by setting the
<varname>XML_CATALOG_FILES</varname> environment variable to a list of
catalogs. An empty one should deactivate loading the default
- <filename>/etc/xml/catalog</filename> default catalog.</para>
+ <filename>@PPREFIX@/etc/xml/catalog</filename> default catalog.</para>
</refsect1>
<refsect1>
<title>References</title>
diff -Nurd 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 22:59:37.000000000 +0200
+++ libxml2-2.6.22/doc/xmllint.1 2006-03-19 05:46:36.000000000 +0100
@@ -176,7 +176,7 @@
.TP
\fB\-\-catalogs\fR
-Use the catalogs from $SGML_CATALOG_FILES\&. Otherwise /etc/xml/catalog is
used by default\&.
+Use the catalogs from $SGML_CATALOG_FILES\&. Otherwise
@PREFIX@/etc/xml/catalog is used by default\&.
.TP
\fB\-\-nocatalogs\fR
@@ -306,7 +306,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 "DEBUGGING CATALOGS"
diff -Nurd 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 18:16:09.000000000
+0200
+++ libxml2-2.6.22/doc/xmllint.html 2006-03-19 05:50:43.000000000 +0100
@@ -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"
- need_relink=yes
+ need_relink=no
fi
# This is a shared library
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
+#
+# update-sgml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
[EMAIL PROTECTED]@/etc/sgml/catalog
[EMAIL PROTECTED]@/etc/sgml/catalog.d
+
+mkdir -p ${CATALOG_D}
+
+TMPFILE=`tempfile`
+
+if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then
+ cat ${CATALOG_D}/* | sed 's/#.*$//g' | {
+ while read cat; do
+ if [ -z "${cat}" ]; then
+ continue
+ fi
+ echo CATALOG ${cat} >>${TMPFILE}
+ done
+ }
+fi
+
+mv -f ${TMPFILE} ${CATALOG}
+chmod 0644 ${CATALOG}
+
+exit 0
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
+#
+# update-xml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
[EMAIL PROTECTED]@/etc/xml/catalog
[EMAIL PROTECTED]@/etc/xml/catalog.d
+
+mkdir -p ${CATALOG_D}
+
+TMPFILE=`tempfile`
+xmlcatalog --create >>${TMPFILE}
+
+if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then
+ cat ${CATALOG_D}/* | sed 's/#.*$//g' | {
+ while read type orig replace; do
+ if [ -z "${type}" -o -z "${orig}" -o -z "${replace}" ]; then
+ continue
+ fi
+ eval xmlcatalog --noout --add ${type} ${orig} ${replace} ${TMPFILE}
+ done
+ }
+fi
+
+mv -f ${TMPFILE} ${CATALOG}
+chmod 0644 ${CATALOG}
+
+exit 0
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
-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "@PREFIX@/etc/sgml/catalog"
#endif
/************************************************************************
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
-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "file://@PREFIX@/etc/xml/catalog"
#endif
typedef enum {
diff -Nurd libxml2-2.6.22-orig/doc/xmllint.xml libxml2-2.6.22/doc/xmllint.xml
--- libxml2-2.6.22-orig/doc/xmllint.xml 2005-07-27 22:59:37.000000000 +0200
+++ libxml2-2.6.22/doc/xmllint.xml 2006-03-19 05:52:11.000000000 +0100
@@ -452,7 +452,7 @@
<term><option>--catalogs</option></term>
<listitem>
<simpara>
- 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.
</simpara>
</listitem>
@@ -723,7 +723,7 @@
queries to the user's own set of catalogs. This can be done by setting the
<varname>XML_CATALOG_FILES</varname> environment variable to a list of
catalogs. An empty one should deactivate loading the default
- <filename>/etc/xml/catalog</filename> default catalog.</para>
+ <filename>@PREFIX@/etc/xml/catalog</filename> default catalog.</para>
</refsect1>
<refsect1>
<title>Debugging Catalogs</title>
--- NEW FILE: libxml2.info ---
Package: libxml2
Version: 2.6.22
Revision: 1003
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r)
BuildDepends: libiconv-dev, readline5 (>= 5.0-1004), libncurses5 (>=
5.4-20041023-1006)
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source-MD5: 5bf7e6bc7164ae0f5a6cc5ff693a4180
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
<<
SetLDFLAGS: -no-undefined
ConfigureParams: --mandir=%p/share/man --with-iconv=%p --without-python
--disable-dependency-tracking --with-html-dir=%p/share/doc
--with-html-subdir=%n --with-history
CompileScript: <<
## Work around a missing xhtml-dtd in catalog
## which obviously cannot be in
## and xmllint --nonet to rebuild the doc which
## makes vanish index.html
cp doc/index.html doc/index1.html
XMLLINT=/usr/bin/true XSLTPROC=/usr/bin/true ./configure %c
make
rm -f doc/index.html
mv doc/index1.html doc/index.html
<<
InstallScript: <<
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 ChangeLog COPYING Copyright NEWS README TODO TODO_SCHEMAS
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Depends: libiconv
Replaces: libxml2 (<< 2.4.18-2)
Suggests: %N-bin
Files: lib/libxml2.%v.dylib lib/libxml2.2.dylib
Shlibs: %p/lib/libxml2.2.dylib 9.0.0 %n (>= 2.6.1-1)
DocFiles: Copyright README
<<
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs (>= %v-%r), readline5-shlibs (>= 5.0-1004),
libncurses5-shlibs (>= 5.4-20041023-1006)
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
RuntimeVars: <<
SGML_CATALOG_FILES: %p/etc/sgml/catalog
XML_CATALOG_FILES: %p/etc/xml/catalog
<<
PostInstScript: <<
case "$1" in
configure)
update-xml-catalog
update-sgml-catalog
;;
esac
<<
PostRmScript: <<
case "$1" in
abort-install|purge|remove)
rm -f %p/etc/xml/catalog
rm -f %p/etc/sgml/catalog
;;
esac
<<
<<
Description: XML parsing library, version 2
DescDetail: <<
This set of packages does *not* contain the python bindings. Those
are in libxml2-pyXX for various pythonX.X versions.
<<
DescPort: <<
Hide xmllint and xsltproc executables from ./configure to avoid
circular dependencies (on libxml2-bin (build here) and libxslt-bin
(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!
Rebuild the doc/examples/index.html not present in the tarball
Changed the installation to avoid examples overriding top level
of doc.
<<
DescPackaging: <<
Uses pkgconfig, but there are no pkgconfig-related dependencies.
libxml2 uses XML/SGML super catalog to know location of DTDs installed on
local system. They are managed by update-xml-catalog and update-sgml-catalog
script. Each package that provides DTDs should also provide configuration
file(s) for these script and call them within Pre/PostInstScript.
When update-xml-catalog is called, it reads every configuration file belongs
to %p/etc/xml/catalog.d/. Each line of them contain 3 fields, TYPE, ORIG and
REPLACE, correspond to arguments of `xmlcatalog --add'. See xmlcatalog(1) for
detail.
Also, update-sgml-catalog reads every configuration file belongs to %p/etc/
sgml/catalog.d/ when it is called. Each line of them contain only 1 field,
reference to other SGML catalog file.
Previous versions by Christoph Pfisterer <[EMAIL PROTECTED]>
<<
License: LGPL
Homepage: http://www.xmlsoft.org/
--- NEW FILE: libxml2-py.patch ---
diff -Nurd -x'*~' libxml2-2.6.20.orig/python/setup.py
libxml2-2.6.20/python/setup.py
--- libxml2-2.6.20.orig/python/setup.py 2005-07-10 18:53:45.000000000 -0400
+++ libxml2-2.6.20/python/setup.py 2005-08-25 12:19:56.000000000 -0400
@@ -231,7 +231,7 @@
author = "Daniel Veillard",
author_email = "[EMAIL PROTECTED]",
url = "http://xmlsoft.org/python.html";,
- licence="MIT Licence",
+ license="MIT Licence",
py_modules=modules,
ext_modules=extens,
ext_package=ext_package,
diff -Nurd -x'*~' libxml2-2.6.20.orig/python/tests/Makefile
libxml2-2.6.20/python/tests/Makefile
--- libxml2-2.6.20.orig/python/tests/Makefile 2005-08-25 12:18:59.000000000
-0400
+++ libxml2-2.6.20/python/tests/Makefile 2005-08-25 12:19:56.000000000
-0400
@@ -53,20 +53,22 @@
EXTRA_DIST = $(PYTESTS) $(XMLS)
-if WITH_PYTHON
tests: $(PYTESTS)
@echo "## running Python regression tests"
- -@(PYTHONPATH="..:../.libs:$(srcdir)/..:$$PYTHONPATH" ; \
- export PYTHONPATH; \
- LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
- export LD_LIBRARY_PATH; \
+ @rm -f test.out
+ -@( ; \
for test in $(PYTESTS) ; \
- do log=`$(PYTHON) $(srcdir)/$$test` ; \
- if [ "`echo $$log | grep OK`" = "" ] ; then \
- echo "-- $$test" ; echo "$$log" ; fi ; done)
-else
-tests:
-endif
+ do log=`$(PYTHON) ./$$test 2>&1` ; \
+ if [ "`echo $$log | grep OK`" = "" ] ; then \
+ echo "-- FAILED $$test" ; \
+ echo "$$log" ; \
+ echo " $$test" >> test.out ; \
+ else \
+ echo "-- OK $$test" ; \
+ fi ; \
+ done; \
+ )
+ @[ ! -s test.out ]
clean:
rm -f *.pyc core
--- NEW FILE: libxml2-py.info ---
Info2: <<
Package: libxml2-py%type_pkg[python]
Version: 2.6.22
Revision: 1
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
Type: python (2.3 2.4)
Depends: libxml2-shlibs (>= %v-1), libiconv, python%type_pkg[python]
BuildDepends: libxml2 (>= %v-1), libiconv-dev, pkgconfig
Source: mirror:gnome:sources/libxml2/2.6/libxml2-%v.tar.bz2
Source-MD5: 5bf7e6bc7164ae0f5a6cc5ff693a4180
PatchScript: <<
cp python/tests/Makefile.am python/tests/Makefile
patch -p1 < %a/%{ni}.patch
<<
CompileScript: <<
#!/bin/sh -ev
CPPFLAGS="`%p/bin/pkg-config --cflags libxml-2.0` $CPPFLAGS"
LDFLAGS="`%p/bin/pkg-config --libs libxml-2.0` $LDFLAGS"
export PYTHON=%p/bin/python%type_raw[python]
cd python
$PYTHON setup.py build
cd tests && make tests PYTHONPATH="`%p/bin/python%type_raw[python] -c 'import
sys;from distutils.util import get_platform; print "../build/lib.%%s-%%s" %%
(get_platform(), sys.version[0:3])'`:$PYTHONPATH"
<<
InstallScript: <<
#!/bin/sh -ev
cd python
%p/bin/python%type_raw[python] setup.py install --root %d
<<
DocFiles: AUTHORS Copyright NEWS README python/README:README.py-bindings TODO
python/TODO:TODO.py-bindings
Description: Python bindings for libxml2 library
DescPort: <<
We only need to build the python stuff and link against an
already-installed lib that comes from the top-level build, so don't
bother doing the top-level build. By using the python-standard
package script setup.py we don't even need the python/ autoconf
stuff so we can skip ./configure completely. To get tests, hack the
relevant parts of the Makefile.am template into a proper Makefile.
Fix tests target so that it gives cleaner feedback and propagates
failures correctly to the caller's shell.
build-lib path determination based on python2.4 distutils/command/build.py
<<
License: LGPL
Homepage: http://www.xmlsoft.org/
<<
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
