Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv22335/stable/main/finkinfo/libs
Modified Files:
libxml2.info libxml2.patch libxml2-py.info libxml2-py.patch
libxslt.info libxslt.patch libxslt-py.info libxslt-py.patch
Log Message:
sync latest xsl to stable
Index: libxml2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libxml2.patch 16 Mar 2009 06:03:57 -0000 1.5
+++ libxml2.patch 27 Oct 2011 12:48:19 -0000 1.6
@@ -1,19 +1,19 @@
-diff -Nurd -x'*~' libxml2-2.6.32.orig/doc/Makefile.in
libxml2-2.6.32/doc/Makefile.in
---- libxml2-2.6.32.orig/doc/Makefile.in 2008-04-08 10:55:01.000000000
-0400
-+++ libxml2-2.6.32/doc/Makefile.in 2008-09-07 13:40:46.000000000 -0400
-@@ -746,7 +746,7 @@
+diff -Nurd -x'*~' libxml2-2.7.8.orig/doc/Makefile.in
libxml2-2.7.8/doc/Makefile.in
+--- libxml2-2.7.8.orig/doc/Makefile.in 2010-11-04 13:28:16.000000000 -0400
++++ libxml2-2.7.8/doc/Makefile.in 2010-11-04 22:30:04.000000000 -0400
+@@ -849,7 +849,7 @@
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
+ @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)
- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
+ @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.6.32.orig/doc/examples/Makefile.in
libxml2-2.6.32/doc/examples/Makefile.in
---- libxml2-2.6.32.orig/doc/examples/Makefile.in 2008-04-08
10:55:02.000000000 -0400
-+++ libxml2-2.6.32/doc/examples/Makefile.in 2008-09-07 13:40:46.000000000
-0400
-@@ -744,6 +744,8 @@
+diff -Nurd -x'*~' libxml2-2.7.8.orig/doc/examples/Makefile.in
libxml2-2.7.8/doc/examples/Makefile.in
+--- libxml2-2.7.8.orig/doc/examples/Makefile.in 2010-11-04
13:28:16.000000000 -0400
++++ libxml2-2.7.8/doc/examples/Makefile.in 2011-01-04 11:52:34.000000000
-0500
+@@ -781,17 +781,19 @@
tags uninstall uninstall-am
@@ -22,20 +22,23 @@
rebuild: examples.xml index.html
examples.xml: index.py *.c
-@@ -753,8 +755,8 @@
- -@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" &&
xmllint --valid --noout index.html)
+ -@($(srcdir)/index.py)
+
+ index.html: examples.xml examples.xsl
+- -@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" &&
xmllint --valid --noout index.html)
++ -@(xsltproc --nonet examples.xsl examples.xml && echo "Rebuilt web
page")
install-data-local:
-- $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
+- @MKDIR_P@ $(DESTDIR)$(HTML_DIR)
- -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml
$(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
-+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/examples
++ @MKDIR_P@ $(DESTDIR)$(HTML_DIR)/examples
+ -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml
$(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples
valgrind:
$(MAKE) CHECKER='valgrind' tests
-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
+diff -Nurd -x'*~' libxml2-2.7.8.orig/update-sgml-catalog
libxml2-2.7.8/update-sgml-catalog
+--- libxml2-2.7.8.orig/update-sgml-catalog 1969-12-31 19:00:00.000000000
-0500
++++ libxml2-2.7.8/update-sgml-catalog 2010-11-04 22:31:15.000000000 -0400
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+#
@@ -65,9 +68,9 @@
+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
+diff -Nurd -x'*~' libxml2-2.7.8.orig/update-xml-catalog
libxml2-2.7.8/update-xml-catalog
+--- libxml2-2.7.8.orig/update-xml-catalog 1969-12-31 19:00:00.000000000
-0500
++++ libxml2-2.7.8/update-xml-catalog 2010-11-04 22:31:15.000000000 -0400
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+#
Index: libxml2-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2-py.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxml2-py.patch 16 Mar 2009 06:03:57 -0000 1.2
+++ libxml2-py.patch 27 Oct 2011 12:48:19 -0000 1.3
@@ -1,25 +1,25 @@
-diff -Nurd -x'*~' libxml2-2.6.32.orig/python/Makefile.in
libxml2-2.6.32/python/Makefile.in
---- libxml2-2.6.32.orig/python/Makefile.in 2008-04-08 10:55:02.000000000
-0400
-+++ libxml2-2.6.32/python/Makefile.in 2008-09-07 19:31:18.000000000 -0400
-@@ -55,7 +55,7 @@
+diff -Nurd -x'*~' libxml2-2.7.8.orig/python/Makefile.in
libxml2-2.7.8/python/Makefile.in
+--- libxml2-2.7.8.orig/python/Makefile.in 2010-11-04 13:28:16.000000000
-0400
++++ libxml2-2.7.8/python/Makefile.in 2010-11-04 22:47:00.000000000 -0400
+@@ -74,7 +74,7 @@
+ am__installdirs = "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(docsdir)" \
"$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"
- pythonLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(python_LTLIBRARIES)
-@WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = $(mylibs)
+@WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES =
- am__libxml2mod_la_SOURCES_DIST = libxml.c types.c
+ am__libxml2mod_la_SOURCES_DIST = $(srcdir)/libxml.c $(srcdir)/types.c
@WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo
@WITH_PYTHON_TRUE@nodist_libxml2mod_la_OBJECTS = libxml2-py.lo
-@@ -65,7 +65,7 @@
+@@ -84,7 +84,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libxml2mod_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_PYTHON_TRUE@am_libxml2mod_la_rpath = -rpath $(pythondir)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -318,8 +318,6 @@
+ am__mv = mv -f
+@@ -370,8 +370,6 @@
SUBDIRS = . tests
INCLUDES = \
-I$(PYTHON_INCLUDES) \
@@ -28,7 +28,7 @@
-I$(top_builddir)/$(subdir)
docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
-@@ -335,7 +333,7 @@
+@@ -387,7 +385,7 @@
libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module
-avoid-version
@WITH_PYTHON_TRUE@mylibs = \
@@ -36,10 +36,10 @@
+@WITH_PYTHON_TRUE@ -lxml2
@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
- @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c
-diff -Nurd -x'*~' libxml2-2.6.27.orig/python/setup.py
libxml2-2.6.27/python/setup.py
---- libxml2-2.6.27.orig/python/setup.py 2006-10-25 11:57:19.000000000
-0400
-+++ libxml2-2.6.27/python/setup.py 2007-02-01 00:13:18.000000000 -0500
+ @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = $(srcdir)/libxml.c $(srcdir)/types.c
+diff -Nurd -x'*~' libxml2-2.7.8.orig/python/setup.py
libxml2-2.7.8/python/setup.py
+--- libxml2-2.7.8.orig/python/setup.py 2010-11-04 13:28:24.000000000 -0400
++++ libxml2-2.7.8/python/setup.py 2010-11-04 22:47:00.000000000 -0400
@@ -231,7 +231,7 @@
author = "Daniel Veillard",
author_email = "veill...@redhat.com",
@@ -49,10 +49,10 @@
py_modules=modules,
ext_modules=extens,
ext_package=ext_package,
-diff -Nurd -x'*~' libxml2-2.6.32.orig/python/tests/Makefile.in
libxml2-2.6.32/python/tests/Makefile.in
---- libxml2-2.6.32.orig/python/tests/Makefile.in 2008-04-08
10:55:02.000000000 -0400
-+++ libxml2-2.6.32/python/tests/Makefile.in 2008-09-07 13:51:36.000000000
-0400
-@@ -513,14 +513,21 @@
+diff -Nurd -x'*~' libxml2-2.7.8.orig/python/tests/Makefile.in
libxml2-2.7.8/python/tests/Makefile.in
+--- libxml2-2.7.8.orig/python/tests/Makefile.in 2010-11-04
13:28:16.000000000 -0400
++++ libxml2-2.7.8/python/tests/Makefile.in 2010-11-04 22:47:00.000000000
-0400
+@@ -561,14 +561,21 @@
@WITH_PYTHON_TRUE@tests: $(PYTESTS)
@WITH_PYTHON_TRUE@ @echo "## running Python regression tests"
@@ -78,3 +78,33 @@
@WITH_PYTHON_FALSE@tests:
clean:
+diff -Nurd -x'*~' libxml2-2.7.8.orig/python/tests/serialize.py
libxml2-2.7.8/python/tests/serialize.py
+--- libxml2-2.7.8.orig/python/tests/serialize.py 2009-09-24
11:31:59.000000000 -0400
++++ libxml2-2.7.8/python/tests/serialize.py 2011-01-04 02:52:56.000000000
-0500
+@@ -96,7 +96,7 @@
+ if str != """<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/REC-html40/loose.dtd";>
+ <html>
+ <head>
+-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
++<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Hello</title>
+ </head>
+ <body><p>hello</p></body>
+@@ -111,7 +111,7 @@
+ doc.htmlSetMetaEncoding(None)
+ root = doc.getRootElement()
+ str = root.serialize()
+-if str !=
"""<html><head><title>Hello</title></head><body><p>hello</p></body></html>""":
++if str != """<html><head><meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1"><title>Hello</title></head><body><p>hello</p></body></html>""":
+ print "error serializing HTML root 1"
+ sys.exit(1)
+ str = root.serialize("ISO-8859-1")
+@@ -131,7 +131,7 @@
+ str = root.serialize("iso-8859-1", 1)
+ if str != """<html>
+ <head>
+-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
++<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>Hello</title>
+ </head>
+ <body><p>hello</p></body>
Index: libxslt-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt-py.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libxslt-py.info 14 Oct 2010 05:19:24 -0000 1.7
+++ libxslt-py.info 27 Oct 2011 12:48:19 -0000 1.8
@@ -1,25 +1,38 @@
Info2: <<
Package: libxslt-py%type_pkg[python]
-Version: 1.1.24
+Version: 1.1.26
Revision: 1
Maintainer: Daniel Macks <dma...@netspace.org>
Type: python (2.5 2.6 2.7)
-Depends: libxslt-shlibs (>= %v-1), libxml2-shlibs (>= 2.6.27-1),
libxml2-py%type_pkg[python], libiconv, python%type_pkg[python]
-BuildDepends: libxslt (>= %v-1), libxml2 (>= 2.6.27-1), libiconv-dev, fink (>=
0.24.12-1)
+Depends: <<
+ libiconv,
+ libxslt-shlibs (>= %v-1),
+ libxml2-py%type_pkg[python] (>= 2.7.8-1),
+ libxml2-shlibs (>= 2.7.8-1),
+ python%type_pkg[python]
+<<
+BuildDepends: <<
+ fink (>= 0.24.12-1),
+ fink-package-precedence,
+ libiconv-dev,
+ libxslt (>= %v-1),
+ libxml2 (>= 2.7.8-1)
+<<
#Source: mirror:gnome:sources/libxslt/1.1/libxslt-%v.tar.bz2
Source: http://xmlsoft.org/sources/libxslt-%v.tar.gz
-Source-MD5: e83ec5d27fc4c10c6f612879bea9a153
+Source-MD5: e61d0364a30146aaa3001296f853b2b9
PatchFile: %{ni}.patch
-PatchFile-MD5: 8126e3fb6bad0e71da59e8d6e79b347c
+PatchFile-MD5: 97924920dfd65afc1d4aacb3ef578c24
PatchScript: <<
%{default_script}
perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
<<
-ConfigureParams: --mandir=%p/share/man
--with-python=%p/bin/python%type_raw[python] --without-crypto --disable-static
--disable-dependency-tracking
+ConfigureParams: --mandir=%p/share/man
--with-python=%p/bin/python%type_raw[python] --without-crypto --disable-static
--enable-dependency-tracking
CompileScript: <<
./configure %c
make -C python
make -C python tests
+ fink-package-precedence .
<<
InstallScript: <<
make -C python install DESTDIR=%d DOCS_DIR=%p/share/doc/%n
EXAMPLE_DIR=%p/share/doc/%n/examples
@@ -30,6 +43,8 @@
DescPackaging: <<
Patch python module makefiles to use installed libxslt not locally-built
See: http://bugzilla.gnome.org/show_bug.cgi?id=341292
+
+ Uses libxml2 directly, so make sure to link against it.
<<
DescPort: <<
Doesn't use the automake piece that compiles .py -> .pyc, so do it
Index: libxml2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- libxml2.info 9 May 2010 14:52:42 -0000 1.9
+++ libxml2.info 27 Oct 2011 12:48:19 -0000 1.10
@@ -1,24 +1,31 @@
Package: libxml2
-
-# not upgradeable to 2.7.x
-Version: 2.6.32
-
-Revision: 1
+Version: 2.7.8
+Revision: 102
+Distribution: 10.5, 10.6, 10.7
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
-Depends: %N-bin (= %v-%r), %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1)
-BuildDepends: fink (>= 0.24.12-1), libiconv-dev, libncurses5 (>=
5.4-20041023-1006), readline5 (>= 5.0-1004)
+Depends: %N-bin (= %v-%r), %N-shlibs (= %v-%r), pkgconfig (>= 0.23)
+BuildDepends: <<
+ fink (>= 0.24.12-1),
+ fink-package-precedence,
+ libiconv-dev,
+ libncurses5 (>= 5.4-20041023-1006),
+ readline5 (>= 5.0-1004)
+<<
#Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source: http://xmlsoft.org/sources/%n-%v.tar.gz
-Source-MD5: 2621d322c16f0257e30f0ff2b13384de
+Source-MD5: 8127a65e8c3b08856093099b52599c86
PatchFile: %n.patch
-PatchFile-MD5: af3b98e3cdca82ab0b1f75c9248eb60e
+PatchFile-MD5: 51675f66115d7ab64a5bf04ffbc455f7
PatchScript: <<
+#!/bin/sh -ev
sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
perl -pi -e 's|/etc|%p/etc|g' catalog.c doc/catalog.html
doc/guidelines.html doc/xml.html doc/xmlcatalog.1 doc/xmlcatalog_man.html
doc/xmlcatalog_man.xml doc/xmllint.1 doc/xmllint.html runtest.c xmlcatalog.c
doc/xmllint.xml
perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
+ rm test/ebcdic_566012.xml
+
<<
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
+ConfigureParams: --mandir=%p/share/man --with-iconv=%p --without-python
--enable-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
@@ -29,6 +36,7 @@
make
rm -f doc/index.html
mv doc/index1.html doc/index.html
+ fink-package-precedence --prohibit-bdep=%n .
<<
InfoTest: TestScript: make check || exit 2
InstallScript: <<
@@ -46,8 +54,8 @@
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)
+ Files: lib/libxml2.2.dylib
+ Shlibs: %p/lib/libxml2.2.dylib 10.0.0 %n (>= 2.7.7-1)
DocFiles: Copyright README
<<
SplitOff2: <<
@@ -119,13 +127,9 @@
Previous versions by Christoph Pfisterer <chr...@users.sourceforge.net>
- 2.7.6: disable the self-test of ebcdic handling because GNU
+ disable the self-test of ebcdic handling because GNU
libiconv doesn't support ebcdic. See:
https://bugzilla.gnome.org/show_bug.cgi?id=603432
-
- 2.7.6 python-bindings fail self-tests, and 2.6.32 bindings
- fail self-tests when built/tested against 2.7.6, so 2.7.6 is
- blocked.
<<
License: BSD
Homepage: http://www.xmlsoft.org/
Index: libxslt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libxslt.patch 16 Mar 2009 06:03:57 -0000 1.4
+++ libxslt.patch 27 Oct 2011 12:48:19 -0000 1.5
@@ -1,47 +1,29 @@
-diff -Nurd -x'*~' libxslt-1.1.24.orig/doc/Makefile.in
libxslt-1.1.24/doc/Makefile.in
---- libxslt-1.1.24.orig/doc/Makefile.in 2008-05-13 11:52:13.000000000
-0400
-+++ libxslt-1.1.24/doc/Makefile.in 2008-09-11 11:40:10.000000000 -0400
-@@ -210,7 +210,7 @@
- top_srcdir = @top_srcdir@
-
- # The name of the module.
--DOC_MODULE = libxslt-$(VERSION)
-+DOC_MODULE = libxslt
-
- # The top-level SGML file.
- DOC_MAIN_XML_FILE = libxslt.xml
-@@ -220,7 +220,7 @@
-
- # A file in win32 depends upon two of the doc files
- WIN32_DIR = $(top_srcdir)/win32
--TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
-+TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- PAGES = API.html bugs.html contribs.html FAQ.html docs.html \
- downloads.html help.html index.html intro.html news.html \
- xsltproc.html xsltproc2.html
-@@ -609,13 +609,18 @@
- install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- -@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(TARGET_DIR)
-+ -@INSTALL@ -m 0644 $(srcdir)/*.xml $(DESTDIR)$(TARGET_DIR)
-+ -@INSTALL@ -m 0644 $(srcdir)/*.xsl $(DESTDIR)$(TARGET_DIR)
- -@INSTALL@ -m 0644 $(srcdir)/*.gif $(DESTDIR)$(TARGET_DIR)
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/html
- -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)/html
- -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(TARGET_DIR)/html
-- -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml
$(DESTDIR)$(TARGET_DIR)/html
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/EXSLT
- -@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.html $(DESTDIR)$(TARGET_DIR)/EXSLT
-+ -@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.xml $(DESTDIR)$(TARGET_DIR)/EXSLT
-+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/EXSLT/html
-+ -@INSTALL@ -m 0644 $(srcdir)/EXSLT/html/*.html
$(DESTDIR)$(TARGET_DIR)/EXSLT/html
-+ -@INSTALL@ -m 0644 $(srcdir)/EXSLT/html/*.png
$(DESTDIR)$(TARGET_DIR)/EXSLT/html
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
- -@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial2
-diff -Nurd -x'*~' libxslt-1.1.24.orig/libexslt/date.c
libxslt-1.1.24/libexslt/date.c
---- libxslt-1.1.24.orig/libexslt/date.c 2008-04-08 13:18:06.000000000
-0400
-+++ libxslt-1.1.24/libexslt/date.c 2008-09-11 12:24:51.000000000 -0400
+diff -Nurd -x'*~' libxslt-1.1.26.orig/doc/Makefile.in
libxslt-1.1.26/doc/Makefile.in
+--- libxslt-1.1.26.orig/doc/Makefile.in 2009-09-24 10:43:14.000000000
-0400
++++ libxslt-1.1.26/doc/Makefile.in 2011-03-10 00:21:41.000000000 -0500
+@@ -670,13 +670,18 @@
+ install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
+ -@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR)
++ -@INSTALL@ -m 0644 $(srcdir)/*.xml $(DESTDIR)$(HTML_DIR)
++ -@INSTALL@ -m 0644 $(srcdir)/*.xsl $(DESTDIR)$(HTML_DIR)
+ -@INSTALL@ -m 0644 $(srcdir)/*.gif $(DESTDIR)$(HTML_DIR)
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
+ -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html
+ -@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html
+- -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(HTML_DIR)/html
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/EXSLT
+ -@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.html $(DESTDIR)$(HTML_DIR)/EXSLT
++ -@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.xml $(DESTDIR)$(HTML_DIR)/EXSLT
++ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/EXSLT/html
++ -@INSTALL@ -m 0644 $(srcdir)/EXSLT/html/*.html
$(DESTDIR)$(HTML_DIR)/EXSLT/html
++ -@INSTALL@ -m 0644 $(srcdir)/EXSLT/html/*.png
$(DESTDIR)$(HTML_DIR)/EXSLT/html
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial
+ -@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(HTML_DIR)/tutorial
+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial2
+diff -Nurd -x'*~' libxslt-1.1.26.orig/libexslt/date.c
libxslt-1.1.26/libexslt/date.c
+--- libxslt-1.1.26.orig/libexslt/date.c 2009-09-17 10:51:10.000000000
-0400
++++ libxslt-1.1.26/libexslt/date.c 2011-03-10 00:19:04.000000000 -0500
@@ -28,11 +28,6 @@
#include "config.h"
#endif
Index: libxslt-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt-py.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxslt-py.patch 16 Mar 2009 06:03:57 -0000 1.2
+++ libxslt-py.patch 27 Oct 2011 12:48:19 -0000 1.3
@@ -1,24 +1,24 @@
-diff -Nurd -x'*~' libxslt-1.1.24.orig/python/Makefile.in
libxslt-1.1.24/python/Makefile.in
---- libxslt-1.1.24.orig/python/Makefile.in 2008-05-13 11:52:13.000000000
-0400
-+++ libxslt-1.1.24/python/Makefile.in 2008-09-11 14:37:51.000000000 -0400
-@@ -50,7 +50,6 @@
+diff -Nurd -x'*~' libxslt-1.1.26.orig/python/Makefile.in
libxslt-1.1.26/python/Makefile.in
+--- libxslt-1.1.26.orig/python/Makefile.in 2009-09-24 10:43:14.000000000
-0400
++++ libxslt-1.1.26/python/Makefile.in 2011-03-10 10:29:36.000000000 -0500
+@@ -67,7 +67,6 @@
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(pythondir)"
- pythonLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(python_LTLIBRARIES)
-@WITH_PYTHON_TRUE@libxsltmod_la_DEPENDENCIES = $(mylibs)
am__libxsltmod_la_SOURCES_DIST = libxslt.c types.c libxslt-py.c
@WITH_PYTHON_TRUE@am_libxsltmod_la_OBJECTS = libxslt.lo types.lo \
@WITH_PYTHON_TRUE@ libxslt-py.lo
-@@ -59,7 +58,7 @@
+@@ -76,7 +75,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libxsltmod_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_PYTHON_TRUE@am_libxsltmod_la_rpath = -rpath $(pythondir)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -253,10 +252,7 @@
+ am__mv = mv -f
+@@ -311,10 +310,7 @@
SUBDIRS = . tests
INCLUDES = \
-I$(PYTHON_INCLUDES) \
@@ -30,14 +30,13 @@
DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
# libxsltclass.txt is generated
-@@ -273,8 +269,8 @@
+@@ -331,8 +327,7 @@
- libxsltmod_la_LDFLAGS = -module -avoid-version
+ libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
@WITH_PYTHON_TRUE@mylibs = \
-@WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \
-@WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la
-+@WITH_PYTHON_TRUE@ -lxslt \
-+@WITH_PYTHON_TRUE@ -lexslt
++@WITH_PYTHON_TRUE@ -lxslt -lexslt $(LIBXML_LIBS)
@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la
@WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c
Index: libxml2-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2-py.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libxml2-py.info 14 Oct 2010 05:18:13 -0000 1.7
+++ libxml2-py.info 27 Oct 2011 12:48:19 -0000 1.8
@@ -1,27 +1,46 @@
Info2: <<
Package: libxml2-py%type_pkg[python]
-Version: 2.6.32
+Version: 2.7.8
Revision: 1
+Distribution: (%type_pkg[python] = 25) 10.5, (%type_pkg[python] = 25) 10.6
Maintainer: Daniel Macks <dma...@netspace.org>
Type: python (2.5 2.6 2.7)
Depends: libxml2-shlibs (>= %v-1), libiconv, python%type_pkg[python]
-BuildDepends: libxml2 (>= %v-1), libiconv-dev, readline5 (>= 5.0-1004),
libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.12-1)
+BuildDepends: <<
+ fink (>= 0.24.12-1),
+ fink-package-precedence,
+ libiconv-dev,
+ libncurses5 (>= 5.4-20041023-1006),
+ libxml2 (>= %v-1),
+ readline5 (>= 5.0-1004)
+<<
#Source: mirror:gnome:sources/%n/2.6/%libxml2-%v.tar.bz2
Source: http://xmlsoft.org/sources/libxml2-%v.tar.gz
-Source-MD5: 2621d322c16f0257e30f0ff2b13384de
+Source-MD5: 8127a65e8c3b08856093099b52599c86
PatchFile: %{ni}.patch
-PatchFile-MD5: fc06e22543467a6b73ed03097c5431cc
+PatchFile-MD5: f205948963e3da9bf9d969b21c73fb2c
PatchScript: <<
%{default_script}
perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
<<
SetCPPFLAGS: -I%p/include/libxml2
-ConfigureParams: --mandir=%p/share/man --with-iconv=%p
--with-python=%p/bin/python%type_raw[python] --disable-static
--disable-dependency-tracking --with-html-dir=%p/share/doc
--with-html-subdir=%n --with-history
+ConfigureParams: --mandir=%p/share/man --with-iconv=%p
--with-python=%p/bin/python%type_raw[python] --disable-static
--enable-dependency-tracking --with-html-dir=%p/share/doc --with-html-subdir=%n
--with-history
CompileScript: <<
./configure %c
make -C python
- make -C python tests
+ fink-package-precedence .
<<
+#InfoTest: <<
+# TestScript: <<
+# #!/bin/sh -ev
+# # Self-tests fail for py25 on 10.6/i386 due to runtime
+# # misuse of python interp binary. Looks like newly-
+# # discovered previously-existing issue, so ignoring.
+# if [ %type_pkg[python] != 25 ]; then
+# make -C python tests || exit 2
+# fi
+# <<
+#<<
InstallScript: <<
make -C python install DESTDIR=%d docsdir=%p/share/doc/%n
exampledir=%p/share/doc/%n/examples
%p/bin/python%type_raw[python] %p/lib/python%type_raw[python]/compileall.py
-d %p/lib/python%type_raw[python] %i/lib/python%type_raw[python]
@@ -31,17 +50,21 @@
DescPackaging: <<
Patch python module makefiles to use installed libxml2 not locally-built
See: http://bugzilla.gnome.org/show_bug.cgi?id=341290
+
+ Self-test (especially serialize.py) is are *extremely* fragile,
+ tend to fail for technically correct (but apparently not
+ expected) results on various platforms. Disabling for now.
<<
DescPort: <<
Fix tests target so that it gives cleaner feedback and propagates
failures correctly to the caller's shell.
- Uses deprecated xmllib instead of xml.sax. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=340764
-
Doesn't use the automake piece that compiles .py -> .pyc, so do it
manually in IntallScript.
See: http://bugzilla.gnome.org/show_bug.cgi?id=460113
+
+ Fix capitalization of charset-names in selftest. See:
+ https://bugzilla.gnome.org/show_bug.cgi?id=630682
<<
License: BSD
Homepage: http://www.xmlsoft.org/
Index: libxslt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libxslt.info 16 Mar 2009 06:03:57 -0000 1.4
+++ libxslt.info 27 Oct 2011 12:48:19 -0000 1.5
@@ -1,25 +1,32 @@
Package: libxslt
-Version: 1.1.24
+Version: 1.1.26
Revision: 1
BuildDependsOnly: true
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
-BuildDepends: gdbm3, libiconv-dev, libxml2 (>= 2.6.27-1), fink (>= 0.24.12-1)
+BuildDepends: <<
+ fink (>= 0.24.12-1),
+ fink-package-precedence,
+ gdbm3,
+ libiconv-dev,
+ libxml2 (>= 2.7.8-1)
+<<
Depends: %N-bin (= %v-%r), %N-shlibs (= %v-%r)
#Source: mirror:gnome:sources/%n/1.1/%n-%v.tar.bz2
Source: http://xmlsoft.org/sources/%n-%v.tar.gz
-Source-MD5: e83ec5d27fc4c10c6f612879bea9a153
+Source-MD5: e61d0364a30146aaa3001296f853b2b9
PatchFile: %n.patch
-PatchFile-MD5: 7cda4fbfa2a73c159936ca5a9542fcde
+PatchFile-MD5: 9fc15862f6cf8a228ee5c2005803f03c
PatchScript: <<
%{default_script}
perl -pi -e 's,/etc,%p/etc,g' doc/*.html doc/*.1 xsltproc/xsltproc.c
perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
<<
SetLDFLAGS: -no-undefined
-ConfigureParams: --mandir=%p/share/man --without-python --without-crypto
--disable-dependency-tracking
+ConfigureParams: --mandir=%p/share/man --without-python --without-crypto
--enable-dependency-tracking --with-html-subdir=libxslt
XSLTPROC=/usr/bin/xsltproc
CompileScript: <<
./configure %c
make
+ fink-package-precedence --prohibit-bdep=%n .
<<
InfoTest: TestScript: make check || exit 2
InstallScript: <<
@@ -29,7 +36,10 @@
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<< 1.0.15-2)
- Depends: libiconv, libxml2-shlibs (>= 2.6.27-1)
+ Depends: <<
+ libiconv,
+ libxml2-shlibs (>= 2.7.8-1)
+ <<
Description: XML stylsheet transformation shared libraries
Files: lib/libexslt.0*.dylib lib/libxslt.1*.dylib lib/libxslt-plugins
Shlibs: <<
@@ -41,7 +51,11 @@
SplitOff2: <<
Package: %N-bin
Replaces: %N (<= 1.1.8-1)
- Depends: %N-shlibs (= %v-%r), libiconv, libxml2-shlibs (>= 2.6.27-1)
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ libiconv,
+ libxml2-shlibs (>= 2.7.8-1)
+ <<
Description: XML stylsheet transformation utility (xsltproc)
Files: bin/xsltproc share/man/man1/xsltproc.1
DocFiles: README COPYING AUTHORS ChangeLog Copyright FEATURES NEWS TODO
@@ -60,6 +74,9 @@
All crypto support in libexslt is disabled to avoid needing
libgcrypt, so that libxslt can remain out of Section:crypto.
See: http://bugzilla.gnome.org/show_bug.cgi?id=538358
+
+ Avoid circular dependency with xsltproc: use system's at
+ compile-time (for building included docs)
<<
DescPort: <<
Patching Makefile in doc to install it correctly
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
