Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv20479
Modified Files:
libxslt-py.info libxslt-py.patch libxslt.info libxslt.patch
Log Message:
sync. w/ 10.!4/stable, 10.4-EOL/unstable
Index: libxslt.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/libxslt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt.patch 11 Jul 2011 04:08:33 -0000 1.1
+++ libxslt.patch 27 Oct 2011 21:32:00 -0000 1.2
@@ -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.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/libxslt.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt.info 11 Jul 2011 04:08:33 -0000 1.1
+++ libxslt.info 27 Oct 2011 21:32:00 -0000 1.2
@@ -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
Index: libxslt-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/libxslt-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt-py.patch 11 Jul 2011 04:08:33 -0000 1.1
+++ libxslt-py.patch 27 Oct 2011 21:32:00 -0000 1.2
@@ -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: libxslt-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/libxslt-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt-py.info 11 Jul 2011 04:08:33 -0000 1.1
+++ libxslt-py.info 27 Oct 2011 21:32:00 -0000 1.2
@@ -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
------------------------------------------------------------------------------
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
