Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8915/stable/main/finkinfo/libs
Modified Files:
gdbm.info libxml2-py.info libxml2-py.patch libxml2.info
libxml2.patch libxslt-py.info libxslt-py.patch libxslt.info
libxslt.patch
Log Message:
latest libxml2/libxslt to stable; new libxml will be major changes
Index: libxml2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libxml2.patch 16 Jul 2008 03:01:38 -0000 1.4
+++ libxml2.patch 16 Mar 2009 06:03:57 -0000 1.5
@@ -1,19 +1,7 @@
-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,7 +106,7 @@
-
- install-data-local:
- $(mkinstalldirs) $(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
- -...@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.24.orig/doc/Makefile.in
libxml2-2.6.24/doc/Makefile.in
---- libxml2-2.6.24.orig/doc/Makefile.in 2006-04-28 12:32:49.000000000
-0400
-+++ libxml2-2.6.24/doc/Makefile.in 2006-05-03 12:20:18.000000000 -0400
-@@ -739,7 +739,7 @@
+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 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
@@ -22,34 +10,11 @@
$(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
-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)
-- -...@install@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml
$(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
-+ $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/examples
-+ -...@install@ -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 -x'*~' libxml2-2.6.24.orig/doc/examples/Makefile.in
libxml2-2.6.24/doc/examples/Makefile.in
---- libxml2-2.6.24.orig/doc/examples/Makefile.in 2006-04-28
12:32:49.000000000 -0400
-+++ libxml2-2.6.24/doc/examples/Makefile.in 2006-05-03 12:22:55.000000000
-0400
-@@ -690,6 +690,8 @@
- tags uninstall uninstall-am uninstall-info-am
+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 @@
+ tags uninstall uninstall-am
+all: rebuild
@@ -57,7 +22,7 @@
rebuild: examples.xml index.html
examples.xml: index.py *.c
-@@ -699,8 +701,8 @@
+@@ -753,8 +755,8 @@
-@(xsltproc examples.xsl examples.xml && echo "Rebuilt web page" &&
xmllint --valid --noout index.html)
install-data-local:
Index: libxml2-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxml2-py.patch 31 Jul 2007 17:26:50 -0000 1.1
+++ libxml2-py.patch 16 Mar 2009 06:03:57 -0000 1.2
@@ -1,22 +1,25 @@
-diff -Nurd -x'*~' libxml2-2.6.27.orig/python/Makefile.in
libxml2-2.6.27/python/Makefile.in
---- libxml2-2.6.27.orig/python/Makefile.in 2006-10-25 11:56:46.000000000
-0400
-+++ libxml2-2.6.27/python/Makefile.in 2007-07-25 00:51:55.000000000 -0400
-@@ -57,13 +57,12 @@
+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 @@
+ "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"
pythonLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(python_LTLIBRARIES)
- @with_python_t...@am__dependencies_1 = $(top_builddir)/libxml2.la
-...@with_python_true@libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c
- @with_python_t...@am_libxml2mod_la_objects = libxml.lo types.lo \
- @WITH_PYTHON_TRUE@ libxml2-py.lo
- libxml2mod_la_OBJECTS = $(am_libxml2mod_la_OBJECTS)
+...@with_python_true@libxml2mod_la_DEPENDENCIES = $(mylibs)
+...@with_python_true@libxml2mod_la_DEPENDENCIES =
+ am__libxml2mod_la_SOURCES_DIST = libxml.c types.c
+ @with_python_t...@am_libxml2mod_la_objects = libxml.lo types.lo
+ @with_python_t...@nodist_libxml2mod_la_objects = libxml2-py.lo
+@@ -65,7 +65,7 @@
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libxml2mod_la_LDFLAGS) $(LDFLAGS) -o $@
@with_python_t...@am_libxml2mod_la_rpath = -rpath $(pythondir)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -305,8 +304,6 @@
+@@ -318,8 +318,6 @@
SUBDIRS = . tests
INCLUDES = \
-I$(PYTHON_INCLUDES) \
@@ -24,8 +27,8 @@
- -I$(top_builddir)/include \
-I$(top_builddir)/$(subdir)
- DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
-@@ -326,7 +323,7 @@
+ docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
+@@ -335,7 +333,7 @@
libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module
-avoid-version
@with_python_t...@mylibs = \
@@ -33,15 +36,7 @@
+...@with_python_true@ -lxml2
@with_python_t...@python_ltlibraries = libxml2mod.la
- @with_python_t...@libxml2mod_la_sources = libxml.c types.c libxml2-py.c
-@@ -735,6 +732,7 @@
- @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py
$(DESTDIR)$(pythondir)
-...@with_python_true@ $(PYTHON)
$(prefix)/lib/python$(PYTHON_VERSION)/compileall.py -d $(pythondir)
$(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
- @WITH_PYTHON_TRUE@ @(for doc in $(DOCS) ; \
- @WITH_PYTHON_TRUE@ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ;
done)
+ @with_python_t...@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
@@ -54,10 +49,10 @@
py_modules=modules,
ext_modules=extens,
ext_package=ext_package,
-diff -Nurd -x'*~' libxml2-2.6.27.orig/python/tests/Makefile.in
libxml2-2.6.27/python/tests/Makefile.in
---- libxml2-2.6.27.orig/python/tests/Makefile.in 2006-10-25
11:56:47.000000000 -0400
-+++ libxml2-2.6.27/python/tests/Makefile.in 2007-02-01 00:15:27.000000000
-0500
-@@ -476,14 +476,21 @@
+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 @@
@with_python_t...@tests: $(PYTESTS)
@WITH_PYTHON_TRUE@ @echo "## running Python regression tests"
Index: libxslt-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt-py.info 16 Jul 2008 03:01:38 -0000 1.1
+++ libxslt-py.info 16 Mar 2009 06:03:57 -0000 1.2
@@ -1,16 +1,17 @@
Info2: <<
Package: libxslt-py%type_pkg[python]
-Version: 1.1.22
+Version: 1.1.24
Revision: 1
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Maintainer: Daniel Macks <dma...@netspace.org>
Type: python (2.3 2.4 2.5)
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)
-Source: mirror:gnome:sources/libxslt/1.1/libxslt-%v.tar.bz2
-Source-MD5: f2061dddea77257488601e20e2f3b5a7
+#Source: mirror:gnome:sources/libxslt/1.1/libxslt-%v.tar.bz2
+Source: http://xmlsoft.org/sources/libxslt-%v.tar.gz
+Source-MD5: e83ec5d27fc4c10c6f612879bea9a153
PatchFile: %{ni}.patch
-PatchFile-MD5: 6317624596e55359f15bd5bde717bca3
+PatchFile-MD5: 8126e3fb6bad0e71da59e8d6e79b347c
PatchScript: <<
%{default_script}
perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
@@ -23,6 +24,7 @@
<<
InstallScript: <<
make -C python install DESTDIR=%d DOCS_DIR=%p/share/doc/%n
EXAMPLE_DIR=%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]
<<
DocFiles: AUTHORS COPYING ChangeLog Copyright FEATURES NEWS README
Description: Python bindings for libxslt library
@@ -31,7 +33,8 @@
See: http://bugzilla.gnome.org/show_bug.cgi?id=341292
<<
DescPort: <<
- Patch python/Makefile.in to compile .py -> .pyc for 'make install'.
+ Doesn't use the automake piece that compiles .py -> .pyc, so do it
+ manually in IntallScript.
Same as: http://bugzilla.gnome.org/show_bug.cgi?id=460113
<<
License: BSD
Index: libxml2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libxml2.info 16 Jul 2008 03:01:38 -0000 1.7
+++ libxml2.info 16 Mar 2009 06:03:57 -0000 1.8
@@ -1,13 +1,14 @@
Package: libxml2
-Version: 2.6.30
-Revision: 1001
+Version: 2.6.32
+Revision: 1
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)
-Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
-Source-MD5: cbc6d381daaa836b90a7ab449c1bc1ae
+#Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
+Source: http://xmlsoft.org/sources/%n-%v.tar.gz
+Source-MD5: 2621d322c16f0257e30f0ff2b13384de
PatchFile: %n.patch
-PatchFile-MD5: 709894e4c9b52ed2dd93a2ff00a4c254
+PatchFile-MD5: af3b98e3cdca82ab0b1f75c9248eb60e
PatchScript: <<
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
Index: libxslt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxslt.patch 16 Jul 2008 03:01:38 -0000 1.3
+++ libxslt.patch 16 Mar 2009 06:03:57 -0000 1.4
@@ -1,49 +1,8 @@
-diff -Nurd -x'*~' libxslt-1.1.20.orig/doc/Makefile.am
libxslt-1.1.20/doc/Makefile.am
---- libxslt-1.1.20.orig/doc/Makefile.am 2007-01-15 07:54:32.000000000
-0500
-+++ libxslt-1.1.20/doc/Makefile.am 2007-01-31 22:02:39.000000000 -0500
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
-
- # The name of the module.
--DOC_MODULE=libxslt-$(VERSION)
-+DOC_MODULE=libxslt
-
- # The top-level SGML file.
- DOC_MAIN_XML_FILE=libxslt.xml
-@@ -14,7 +14,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
-@@ -181,14 +181,16 @@
-
- install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-- -...@install@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(TARGET_DIR)
-+ -...@install@ -m 0644 $(srcdir)/*.html $(srcdir)/*.xml
$(DESTDIR)$(TARGET_DIR)
-+ -...@install@ -m 0644 $(srcdir)/news.xsl $(srcdir)/site.xsl
$(srcdir)/xsa.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/*.html $(srcdir)/EXSLT/*.xml
$(DESTDIR)$(TARGET_DIR)/EXSLT
-+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/EXSLT/html
-+ -...@install@ -m 0644 $(srcdir)/EXSLT/html/*.html
$(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.20.orig/doc/Makefile.in
libxslt-1.1.20/doc/Makefile.in
---- libxslt-1.1.20.orig/doc/Makefile.in 2007-01-17 09:42:16.000000000
-0500
-+++ libxslt-1.1.20/doc/Makefile.in 2007-01-31 22:02:39.000000000 -0500
-@@ -211,7 +211,7 @@
- target_alias = @target_alias@
+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)
@@ -51,7 +10,7 @@
# The top-level SGML file.
DOC_MAIN_XML_FILE = libxslt.xml
-@@ -221,7 +221,7 @@
+@@ -220,7 +220,7 @@
# A file in win32 depends upon two of the doc files
WIN32_DIR = $(top_srcdir)/win32
@@ -60,23 +19,38 @@
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
-@@ -604,14 +604,16 @@
-
+@@ -609,13 +609,18 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-- -...@install@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(TARGET_DIR)
-+ -...@install@ -m 0644 $(srcdir)/*.html $(srcdir)/*.xml
$(DESTDIR)$(TARGET_DIR)
-+ -...@install@ -m 0644 $(srcdir)/news.xsl $(srcdir)/site.xsl
$(srcdir)/xsa.xsl $(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/*.html $(srcdir)/EXSLT/*.xml
$(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
$(srcdir)/EXSLT/html/*.png $(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
+@@ -28,11 +28,6 @@
+ #include "config.h"
+ #endif
+
+-#if HAVE_LOCALTIME_R /* _POSIX_SOURCE required by gnu libc */
+-#ifndef _AIX51 /* but on AIX we're not using gnu libc */
+-#define _POSIX_SOURCE
+-#endif
+-#endif
+
+ #include <libxml/tree.h>
+ #include <libxml/xpath.h>
Index: libxslt-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt-py.patch 16 Jul 2008 03:01:38 -0000 1.1
+++ libxslt-py.patch 16 Mar 2009 06:03:57 -0000 1.2
@@ -1,22 +1,24 @@
-diff -Nurd -x'*~' libxslt-1.1.20.orig/python/Makefile.in
libxslt-1.1.20/python/Makefile.in
---- libxslt-1.1.20.orig/python/Makefile.in 2007-01-17 09:42:17.000000000
-0500
-+++ libxslt-1.1.20/python/Makefile.in 2007-07-25 12:10:18.000000000 -0400
-@@ -57,13 +57,12 @@
- @with_python_t...@am__dependencies_1 = \
- @WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \
- @WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la
-...@with_python_true@libxsltmod_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+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 @@
+ 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_t...@am_libxsltmod_la_objects = libxslt.lo types.lo \
@WITH_PYTHON_TRUE@ libxslt-py.lo
- libxsltmod_la_OBJECTS = $(am_libxsltmod_la_OBJECTS)
+@@ -59,7 +58,7 @@
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libxsltmod_la_LDFLAGS) $(LDFLAGS) -o $@
@with_python_t...@am_libxsltmod_la_rpath = -rpath $(pythondir)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -250,10 +249,7 @@
+@@ -253,10 +252,7 @@
SUBDIRS = . tests
INCLUDES = \
-I$(PYTHON_INCLUDES) \
@@ -28,7 +30,7 @@
DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
# libxsltclass.txt is generated
-@@ -270,8 +266,8 @@
+@@ -273,8 +269,8 @@
libxsltmod_la_LDFLAGS = -module -avoid-version
@with_python_t...@mylibs = \
@@ -39,11 +41,3 @@
@with_python_t...@python_ltlibraries = libxsltmod.la
@with_python_t...@libxsltmod_la_sources = libxslt.c types.c libxslt-py.c
-@@ -676,6 +672,7 @@
- @with_python_t...@install-data-local:
- @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir)
-...@with_python_true@ $(PYTHON)
$(prefix)/lib/python$(PYTHON_VERSION)/compileall.py -d $(pythondir)
$(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
- @WITH_PYTHON_TRUE@ @(for doc in $(DOCS) ; \
- @WITH_PYTHON_TRUE@ do @INSTALL@ -m 0644 $(srcdir)/$$doc
$(DESTDIR)$(DOCS_DIR) ; done)
Index: libxml2-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2-py.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxml2-py.info 16 Jul 2008 03:01:37 -0000 1.2
+++ libxml2-py.info 16 Mar 2009 06:03:57 -0000 1.3
@@ -1,16 +1,17 @@
Info2: <<
Package: libxml2-py%type_pkg[python]
-Version: 2.6.30
-Revision: 1001
-Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
+Version: 2.6.32
+Revision: 1
+Distribution: (%type_pkg[python] = 23) 10.4
Maintainer: Daniel Macks <dma...@netspace.org>
Type: python (2.3 2.4 2.5)
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)
-Source: mirror:gnome:sources/libxml2/2.6/libxml2-%v.tar.bz2
-Source-MD5: cbc6d381daaa836b90a7ab449c1bc1ae
+#Source: mirror:gnome:sources/%n/2.6/%libxml2-%v.tar.bz2
+Source: http://xmlsoft.org/sources/libxml2-%v.tar.gz
+Source-MD5: 2621d322c16f0257e30f0ff2b13384de
PatchFile: %{ni}.patch
-PatchFile-MD5: ed62e245438508f3921bd713aae427c9
+PatchFile-MD5: fc06e22543467a6b73ed03097c5431cc
PatchScript: <<
%{default_script}
perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
@@ -23,7 +24,8 @@
make -C python tests
<<
InstallScript: <<
- make -C python install DESTDIR=%d DOCS_DIR=%p/share/doc/%n
EXAMPLE_DIR=%p/share/doc/%n/examples
+ 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]
<<
DocFiles: AUTHORS Copyright NEWS README python/README:README.py-bindings TODO
python/TODO:TODO.py-bindings
Description: Python bindings for libxml2 library
@@ -38,7 +40,8 @@
Uses deprecated xmllib instead of xml.sax. See:
http://bugzilla.gnome.org/show_bug.cgi?id=340764
- Patch python/Makefile.in to compile .py -> .pyc for 'make install'.
+ 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
<<
License: BSD
Index: gdbm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/gdbm.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gdbm.info 12 Mar 2007 00:11:16 -0000 1.3
+++ gdbm.info 16 Mar 2009 06:03:57 -0000 1.4
@@ -4,13 +4,14 @@
Source: gnu
Source-MD5: cd543862287f55ad66e62cc9d82cc906
Depends: %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.9.9)
+BuildDepends: fink (>= 0.24.12-1)
Conflicts: gdbm3
Replaces: gdbm3
UpdateConfigGuess: true
UpdateLibtool: true
NoSetCPPFlags: true
-Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: d3b15bb797319ffec2066bde90bff0b2
CompileScript: <<
./configure %c
make prefix=%p
Index: libxslt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxslt.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxslt.info 16 Jul 2008 03:01:38 -0000 1.3
+++ libxslt.info 16 Mar 2009 06:03:57 -0000 1.4
@@ -1,14 +1,15 @@
Package: libxslt
-Version: 1.1.22
+Version: 1.1.24
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)
Depends: %N-bin (= %v-%r), %N-shlibs (= %v-%r)
-Source: mirror:gnome:sources/%n/1.1/%n-%v.tar.bz2
-Source-MD5: f2061dddea77257488601e20e2f3b5a7
+#Source: mirror:gnome:sources/%n/1.1/%n-%v.tar.bz2
+Source: http://xmlsoft.org/sources/%n-%v.tar.gz
+Source-MD5: e83ec5d27fc4c10c6f612879bea9a153
PatchFile: %n.patch
-PatchFile-MD5: 1b824ceb8b5f61b0c56b39eca052f722
+PatchFile-MD5: 7cda4fbfa2a73c159936ca5a9542fcde
PatchScript: <<
%{default_script}
perl -pi -e 's,/etc,%p/etc,g' doc/*.html doc/*.1 xsltproc/xsltproc.c
@@ -22,7 +23,7 @@
<<
InfoTest: TestScript: make check || exit 2
InstallScript: <<
- make install DESTDIR=%d DOC_MODULE=%n
+ make install DESTDIR=%d
<<
DocFiles: README COPYING AUTHORS ChangeLog Copyright FEATURES NEWS TODO
SplitOff: <<
@@ -65,6 +66,11 @@
Patch libexslt/date.c to allow <time.h> to declare some functions.
See: http://bugzilla.gnome.org/show_bug.cgi?id=340590
+
+ Ignoring two regession tests for now (look like long-standing
+ problems?). See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=551838
+ http://bugzilla.gnome.org/show_bug.cgi?id=551839
<<
License: BSD
Homepage: http://www.xmlsoft.org/XSLT/
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
