Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13644
Modified Files:
libxml2-32bit.info
Added Files:
libxml2-32bit.patch
Log Message:
Synchronise libxml2-32bit with libxml2, and fork the patchfile in case it gets
upgraded again.
--- NEW FILE: libxml2-32bit.patch ---
diff -Nurd -x'*~' libxml2-2.9.1.orig/doc/Makefile.in
libxml2-2.9.1/doc/Makefile.in
--- libxml2-2.9.1.orig/doc/Makefile.in 2013-04-19 03:36:12.000000000 -0400
+++ libxml2-2.9.1/doc/Makefile.in 2013-06-09 04:30:23.000000000 -0400
@@ -1116,7 +1116,7 @@
install-data-local:
$(MKDIR_P) $(DESTDIR)$(HTML_DIR)
- -$(INSTALL) -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)
+ -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.gif $(srcdir)/*.png
$(srcdir)/libxml2-api.xml $(DESTDIR)$(HTML_DIR)
$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/html
-$(INSTALL) -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html
-$(INSTALL) -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html
diff -Nurd -x'*~' libxml2-2.9.1.orig/doc/examples/Makefile.in
libxml2-2.9.1/doc/examples/Makefile.in
--- libxml2-2.9.1.orig/doc/examples/Makefile.in 2013-04-19 03:36:12.000000000
-0400
+++ libxml2-2.9.1/doc/examples/Makefile.in 2013-06-09 04:32:40.000000000
-0400
@@ -839,12 +839,12 @@
@REBUILD_DOCS_TRUE@ $(MAKE) Makefile
@rebuild_docs_t...@index.html: examples.xml examples.xsl
-@REBUILD_DOCS_TRUE@ cd $(srcdir) && xsltproc examples.xsl examples.xml &&
echo "Rebuilt web page"
+@REBUILD_DOCS_TRUE@ cd $(srcdir) && xsltproc --nonet examples.xsl
examples.xml && echo "Rebuilt web page"
@REBUILD_DOCS_TRUE@ -cd $(srcdir) && xmllint --valid --noout index.html
install-data-local:
- $(MKDIR_P) $(DESTDIR)$(HTML_DIR)
- -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml
$(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
+ $(MKDIR_P) $(DESTDIR)$(HTML_DIR)/examples
+ -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml
$(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples
clean-local:
test -f Makefile.am || rm -f test?.xml
diff -Nurd -x'*~' libxml2-2.9.1.orig/update-sgml-catalog
libxml2-2.9.1/update-sgml-catalog
--- libxml2-2.9.1.orig/update-sgml-catalog 1969-12-31 19:00:00.000000000
-0500
+++ libxml2-2.9.1/update-sgml-catalog 2013-06-09 04:26:32.000000000 -0400
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+#
+# update-sgml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
+CATALOG=@PREFIX@/etc/sgml/catalog
+CATALOG_D=@PREFIX@/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.9.1.orig/update-xml-catalog
libxml2-2.9.1/update-xml-catalog
--- libxml2-2.9.1.orig/update-xml-catalog 1969-12-31 19:00:00.000000000
-0500
+++ libxml2-2.9.1/update-xml-catalog 2013-06-09 04:26:32.000000000 -0400
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+#
+# update-xml-catalog
+# see DescPackaging field of libxml2 .info file for usage.
+#
+
+CATALOG=@PREFIX@/etc/xml/catalog
+CATALOG_D=@PREFIX@/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
Index: libxml2-32bit.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libxml2-32bit.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxml2-32bit.info 18 May 2013 04:46:57 -0000 1.2
+++ libxml2-32bit.info 24 Jun 2013 00:53:45 -0000 1.3
@@ -1,10 +1,7 @@
Package: libxml2-32bit
+Version: 2.9.1
Architecture: x86_64
-# 2.9.0 maybe not viable even when patched to be compileable. See:
-# https://mail.gnome.org/archives/xml/2012-September/msg00058.html
-Version: 2.8.0
-
Revision: 2
Maintainer: Sjors Gielen <fink-libxml2-32...@sjorsgielen.nl>
Depends: %N-bin (= %v-%r) | libxml2-bin (= %v-%r), %N-shlibs (= %v-%r),
pkgconfig (>= 0.23)
@@ -17,9 +14,9 @@
Conflicts: libxml2
Replaces: libxml2
Source: http://xmlsoft.org/sources/libxml2-%v.tar.gz
-Source-MD5: c62106f02ee00b6437f0fb9d370c1093
-PatchFile: libxml2.patch
-PatchFile-MD5: 99412a35ea1a3c6ec03f0beb1a78353f
+Source-MD5: 9c0cfef285d5c4a5c80d00904ddab380
+PatchFile: %n.patch
+PatchFile-MD5: f41c70a417a901b023936dd4fc6a0672
PatchScript: <<
#!/bin/sh -ev
sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
