Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4437
Modified Files:
libxml2.info libxml2.patch
Log Message:
This time, the doc builds without missing files
Index: libxml2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxml2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxml2.patch 20 Jan 2006 20:21:18 -0000 1.1
+++ libxml2.patch 21 Mar 2006 22:10:57 -0000 1.2
@@ -1,6 +1,6 @@
-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
+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)
@@ -14,9 +14,41 @@
#endif
#if defined(_WIN32) && defined(_MSC_VER)
-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
+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>
@@ -46,9 +78,55 @@
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
+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
@@ -58,10 +136,9 @@
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 @@
+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
@@ -70,7 +147,7 @@
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 @@
+@@ -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
@@ -79,7 +156,7 @@
default catalog</p>
<h3><a name="validate">How to debug catalog processing:</a></h3>
-@@ -4068,8 +4068,8 @@
+@@ -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
@@ -90,9 +167,9 @@
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
+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"
@@ -102,9 +179,9 @@
.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
+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
@@ -114,9 +191,21 @@
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
+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
@@ -135,9 +224,9 @@
.SH "DEBUGGING CATALOGS"
-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
+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.
@@ -278,3 +367,24 @@
#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>
Index: libxml2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxml2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxml2.info 22 Jan 2006 05:11:40 -0000 1.3
+++ libxml2.info 21 Mar 2006 22:10:57 -0000 1.4
@@ -1,6 +1,6 @@
Package: libxml2
Version: 2.6.22
-Revision: 1002
+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)
@@ -10,10 +10,17 @@
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-subdir=%n --with-history
+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
@@ -23,7 +30,7 @@
install -c -m 755 update-xml-catalog %i/sbin/
install -c -m 755 update-sgml-catalog %i/sbin/
<<
-DocFiles: AUTHORS Copyright NEWS README TODO
+DocFiles: AUTHORS ChangeLog COPYING Copyright NEWS README TODO TODO_SCHEMAS
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
@@ -79,6 +86,10 @@
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.
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
