libs/libxslt 1.1.26
authoryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Mon, 21 Dec 2009 01:44:08 +0000 (01:44 +0000)
committeryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Mon, 21 Dec 2009 01:44:08 +0000 (01:44 +0000)
git-svn-id: https://cygwin-ports.svn.sourceforge.net/svnroot/cygwin-ports/ports/trunk@8303 e127d73d-b18e-4ae1-a744-a22e6a3ccd30

1.1.24-doc-install.patch [deleted file]
1.1.24-no-undefined.patch [deleted file]
1.1.26-no-undefined.patch [new file with mode: 0644]
README
libxslt-1.1.26-1.cygport [moved from libxslt-1.1.24-10.cygport with 76% similarity]

diff --git a/1.1.24-doc-install.patch b/1.1.24-doc-install.patch
deleted file mode 100644 (file)
index 8aae98e..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- origsrc/libxslt-1.1.24/doc/Makefile.am     2007-01-15 06:54:32.000000000 -0600
-+++ src/libxslt-1.1.24/doc/Makefile.am 2009-03-16 21:59:18.015625000 -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
---- origsrc/libxslt-1.1.24/python/Makefile.am  2009-03-16 21:53:14.375000000 -0500
-+++ src/libxslt-1.1.24/python/Makefile.am      2009-03-16 22:00:24.234375000 -0500
-@@ -10,7 +10,7 @@ INCLUDES = \
-       -I$(top_srcdir) \
-       -I../libexslt
--DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
-+DOCS_DIR = $(datadir)/doc/python-libxslt
- # libxsltclass.txt is generated
- DOCS = TODO
---- origsrc/libxslt-1.1.24/python/tests/Makefile.am    2007-01-03 09:11:42.000000000 -0600
-+++ src/libxslt-1.1.24/python/tests/Makefile.am        2009-03-16 22:00:12.234375000 -0500
-@@ -1,4 +1,4 @@
--EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples
-+EXAMPLE_DIR = $(datadir)/doc/python-libxslt/examples
- TESTSPY=      \
-     basic.py  \
diff --git a/1.1.24-no-undefined.patch b/1.1.24-no-undefined.patch
deleted file mode 100644 (file)
index f1514e9..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
---- origsrc/libxslt-1.1.24/configure.in        2008-05-13 10:40:31.000000000 -0500
-+++ src/libxslt-1.1.24/configure.in    2008-07-09 02:20:10.921875000 -0500
-@@ -510,6 +510,13 @@
- WIN32_EXTRA_LIBADD=
- WIN32_EXTRA_LDFLAGS=
- case "$host" in
-+ *-*-cygwin*)
-+ WIN32_EXTRA_LDFLAGS="-no-undefined"
-+ if test "${PYTHON}" != ""
-+ then
-+   CYGWIN_EXTRA_PYTHON_LIBADD="-L/usr/lib/python${PYTHON_VERSION}/config -lpython${PYTHON_VERSION}"
-+ fi
-+ ;;
-  *-*-mingw*)
-  WIN32_EXTRA_LIBADD="-lwsock32"
-  WIN32_EXTRA_LDFLAGS="-no-undefined"
-@@ -520,6 +527,7 @@
- esac
- AC_SUBST(WIN32_EXTRA_LIBADD)
- AC_SUBST(WIN32_EXTRA_LDFLAGS)
-+AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD)
- AC_SUBST(XSLTPROCDV)
---- origsrc/libxslt-1.1.24/libexslt/Makefile.am        2007-01-03 09:11:57.000000000 -0600
-+++ src/libxslt-1.1.24/libexslt/Makefile.am    2008-07-09 02:20:10.921875000 -0500
-@@ -29,7 +29,7 @@
-       dynamic.c
- libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
--libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
-+libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(WIN32_EXTRA_LDFLAGS) $(LIBGCRYPT_LIBS)
- man_MANS = libexslt.3
---- origsrc/libxslt-1.1.24/libxslt/Makefile.am 2007-01-03 09:11:57.000000000 -0600
-+++ src/libxslt-1.1.24/libxslt/Makefile.am     2008-07-09 02:20:10.937500000 -0500
-@@ -51,7 +51,7 @@
-       libxslt.h
- libxslt_la_LIBADD = $(EXTRA_LIBS)
--libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@
-+libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@ $(WIN32_EXTRA_LDFLAGS)
- man_MANS = libxslt.3
---- origsrc/libxslt-1.1.24/python/Makefile.am  2007-01-03 09:11:42.000000000 -0600
-+++ src/libxslt-1.1.24/python/Makefile.am      2008-07-09 02:20:10.937500000 -0500
-@@ -24,12 +24,14 @@
-       libxslt-python-api.xml  \
-       $(DOCS)
--libxsltmod_la_LDFLAGS = -module -avoid-version
-+libxsltmod_la_LDFLAGS = -module -avoid-version $(WIN32_EXTRA_LDFLAGS)
- if WITH_PYTHON
- mylibs = \
-       $(top_builddir)/libxslt/libxslt.la \
--      $(top_builddir)/libexslt/libexslt.la
-+      $(top_builddir)/libexslt/libexslt.la \
-+      $(CYGWIN_EXTRA_PYTHON_LIBADD) \
-+      $(EXTRA_LIBS)
- all-local: libxslt.py
diff --git a/1.1.26-no-undefined.patch b/1.1.26-no-undefined.patch
new file mode 100644 (file)
index 0000000..6cd2f28
--- /dev/null
@@ -0,0 +1,33 @@
+--- origsrc/libxslt-1.1.26/configure.in        2009-09-24 09:27:30.000000000 -0500
++++ src/libxslt-1.1.26/configure.in    2009-12-19 23:18:57.134830100 -0600
+@@ -625,6 +625,10 @@ WIN32_EXTRA_LDFLAGS=
+ case "$host" in
+  *-*-cygwin*)
+  WIN32_EXTRA_LDFLAGS="-no-undefined"
++ if test -n "${PYTHON}"
++ then
++   CYGWIN_EXTRA_PYTHON_LIBADD="-L/usr/lib/python${PYTHON_VERSION}/config -lpython${PYTHON_VERSION}"
++ fi
+  ;;
+  *-*-mingw*)
+  WIN32_EXTRA_LIBADD="-lwsock32"
+@@ -636,6 +640,7 @@ case "$host" in
+ esac
+ AC_SUBST(WIN32_EXTRA_LIBADD)
+ AC_SUBST(WIN32_EXTRA_LDFLAGS)
++AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD)
+ AC_SUBST(XSLTPROCDV)
+--- origsrc/libxslt-1.1.26/python/Makefile.am  2009-12-19 22:22:05.066671000 -0600
++++ src/libxslt-1.1.26/python/Makefile.am      2009-12-19 22:30:48.333600200 -0600
+@@ -29,7 +29,8 @@ libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_L
+ if WITH_PYTHON
+ mylibs = \
+       $(top_builddir)/libxslt/libxslt.la \
+-      $(top_builddir)/libexslt/libexslt.la
++      $(top_builddir)/libexslt/libexslt.la \
++      $(CYGWIN_EXTRA_PYTHON_LIBADD)
+ all-local: libxslt.py
diff --git a/README b/README
index 7f510e66bc37b2c46d206af1b9ba0df73d43f204..e209208b99b9f7d645f54bd42dc710a0b4f8e9a4 100644 (file)
--- a/README
+++ b/README
@@ -7,26 +7,26 @@ also implements most of the EXSLT set of processor- portable extensions
 functions and some of Saxon's evaluate and expressions extensions.
 
 Runtime requirements:
-  cygwin-1.7.0-43
-  libgcc1-4.3.2-2
+  cygwin-1.7.0-67
+  libgcc1-4.3.4-3
   libgcrypt11-1.4.1-4
-  libxml2-2.7.3-10
+  libxml2-2.7.6-1
 
 The Python bindings also require:
   python-2.5.4-10
-  python-libxml2-2.7.3-10
+  python-libxml2-2.7.6-1
 
 Build requirements:
 (besides corresponding devel packages)
   autoconf2.5-2.63-10
-  automake1.10-1.10.1-10
-  binutils-20080624-2
-  cygport-0.9.5-1
-  gawk-3.1.6-2
-  gcc4-core-4.3.2-2
+  automake1.10-1.10.2-10
+  binutils-2.19.51-1
+  cygport-0.9.10-1
+  gawk-3.1.7-1
+  gcc4-core-4.3.4-3
   make-3.81-2
-  libtool-2.2.7a-1
-  pkg-config-0.23a-2
+  libtool-2.2.7a-14
+  pkg-config-0.23b-10
   sed-4.1.5-2
 
 Canonical homepage:
@@ -39,179 +39,26 @@ Canonical download:
 -------------------------------------------
 
 Build instructions:
-  unpack libxslt-1.1.24-X-src.tar.bz2
+  unpack libxslt-1.1.26-X-src.tar.bz2
     if you use setup to install this src package, it will be
         unpacked under /usr/src automatically
   cd /usr/src
-  cygport ./libxslt-1.1.24-X.cygport all
+  cygport ./libxslt-1.1.26-X.cygport all
 
 This will create:
-  /usr/src/libxslt-1.1.24-X-src.tar.bz2
-  /usr/src/libxslt-1.1.24-X.tar.bz2
-  /usr/src/libxslt-devel-1.1.24-X.tar.bz2
-  /usr/src/libxslt-doc-1.1.24-X.tar.bz2
-  /usr/src/python-libxslt-1.1.24-X.tar.bz2
+  /usr/src/libxslt-1.1.26-X-src.tar.bz2
+  /usr/src/libxslt-1.1.26-X.tar.bz2
+  /usr/src/libxslt-devel-1.1.26-X.tar.bz2
+  /usr/src/libxslt-doc-1.1.26-X.tar.bz2
+  /usr/src/python-libxslt-1.1.26-X.tar.bz2
 
 -------------------------------------------
 
-Files included in the binary packages:
-
-(libxslt)
-  /usr/bin/cygexslt-0.dll
-  /usr/bin/cygxslt-1.dll
-  /usr/bin/xsltproc.exe
-  /usr/share/doc/libxslt/AUTHORS
-  /usr/share/doc/libxslt/COPYING
-  /usr/share/doc/libxslt/COPYRIGHT
-  /usr/share/doc/libxslt/ChangeLog
-  /usr/share/doc/libxslt/INSTALL
-  /usr/share/doc/libxslt/NEWS
-  /usr/share/doc/libxslt/README
-  /usr/share/doc/libxslt/TODO
-  /usr/share/man/man1/xsltproc.1.gz
-  /usr/share/man/man3/libexslt.3.gz
-  /usr/share/man/man3/libxslt.3.gz
-
-(python-libxslt)
-  /usr/lib/python2.5/site-packages/libxslt.py
-  /usr/lib/python2.5/site-packages/libxslt.pyc
-  /usr/lib/python2.5/site-packages/libxslt.pyo
-  /usr/lib/python2.5/site-packages/libxsltmod.dll
-  /usr/lib/python2.5/site-packages/libxsltmod.la
-  /usr/share/doc/python-libxslt/TODO
-  /usr/share/doc/python-libxslt/examples/basic.py
-  /usr/share/doc/python-libxslt/examples/exslt.py
-  /usr/share/doc/python-libxslt/examples/extelem.py
-  /usr/share/doc/python-libxslt/examples/extfunc.py
-  /usr/share/doc/python-libxslt/examples/pyxsltproc.py
-  /usr/share/doc/python-libxslt/examples/test.xml
-  /usr/share/doc/python-libxslt/examples/test.xsl
-
-(libxslt-devel)
-  /usr/bin/xslt-config
-  /usr/include/libexslt/exslt.h
-  /usr/include/libexslt/exsltconfig.h
-  /usr/include/libexslt/exsltexports.h
-  /usr/include/libxslt/attributes.h
-  /usr/include/libxslt/documents.h
-  /usr/include/libxslt/extensions.h
-  /usr/include/libxslt/extra.h
-  /usr/include/libxslt/functions.h
-  /usr/include/libxslt/imports.h
-  /usr/include/libxslt/keys.h
-  /usr/include/libxslt/namespaces.h
-  /usr/include/libxslt/numbersInternals.h
-  /usr/include/libxslt/pattern.h
-  /usr/include/libxslt/preproc.h
-  /usr/include/libxslt/security.h
-  /usr/include/libxslt/templates.h
-  /usr/include/libxslt/transform.h
-  /usr/include/libxslt/variables.h
-  /usr/include/libxslt/xslt.h
-  /usr/include/libxslt/xsltInternals.h
-  /usr/include/libxslt/xsltconfig.h
-  /usr/include/libxslt/xsltexports.h
-  /usr/include/libxslt/xsltutils.h
-  /usr/lib/libexslt.dll.a
-  /usr/lib/libexslt.la
-  /usr/lib/libxslt.dll.a
-  /usr/lib/libxslt.la
-  /usr/lib/pkgconfig/libexslt.pc
-  /usr/lib/pkgconfig/libxslt.pc
-  /usr/lib/xsltConf.sh
-  /usr/share/aclocal/libxslt.m4
-
-(libxslt-doc)
-  /usr/share/doc/libxslt/html/API.html
-  /usr/share/doc/libxslt/html/APIchunk0.html
-  /usr/share/doc/libxslt/html/APIchunk1.html
-  /usr/share/doc/libxslt/html/APIchunk2.html
-  /usr/share/doc/libxslt/html/APIchunk3.html
-  /usr/share/doc/libxslt/html/APIchunk4.html
-  /usr/share/doc/libxslt/html/APIchunk5.html
-  /usr/share/doc/libxslt/html/APIchunk6.html
-  /usr/share/doc/libxslt/html/APIchunk7.html
-  /usr/share/doc/libxslt/html/APIchunk8.html
-  /usr/share/doc/libxslt/html/APIchunk9.html
-  /usr/share/doc/libxslt/html/APIconstructors.html
-  /usr/share/doc/libxslt/html/APIfiles.html
-  /usr/share/doc/libxslt/html/APIfunctions.html
-  /usr/share/doc/libxslt/html/APIsymbols.html
-  /usr/share/doc/libxslt/html/EXSLT/APIchunk0.html
-  /usr/share/doc/libxslt/html/EXSLT/APIconstructors.html
-  /usr/share/doc/libxslt/html/EXSLT/APIfiles.html
-  /usr/share/doc/libxslt/html/EXSLT/APIfunctions.html
-  /usr/share/doc/libxslt/html/EXSLT/APIsymbols.html
-  /usr/share/doc/libxslt/html/EXSLT/bugs.html
-  /usr/share/doc/libxslt/html/EXSLT/docs.html
-  /usr/share/doc/libxslt/html/EXSLT/downloads.html
-  /usr/share/doc/libxslt/html/EXSLT/exslt.html
-  /usr/share/doc/libxslt/html/EXSLT/help.html
-  /usr/share/doc/libxslt/html/EXSLT/index.html
-  /usr/share/doc/libxslt/html/EXSLT/intro.html
-  /usr/share/doc/libxslt/html/FAQ.html
-  /usr/share/doc/libxslt/html/Libxslt-Logo-180x208.gif
-  /usr/share/doc/libxslt/html/Libxslt-Logo-90x34.gif
-  /usr/share/doc/libxslt/html/bugs.html
-  /usr/share/doc/libxslt/html/contexts.gif
-  /usr/share/doc/libxslt/html/contribs.html
-  /usr/share/doc/libxslt/html/docbook.html
-  /usr/share/doc/libxslt/html/docs.html
-  /usr/share/doc/libxslt/html/downloads.html
-  /usr/share/doc/libxslt/html/extensions.html
-  /usr/share/doc/libxslt/html/help.html
-  /usr/share/doc/libxslt/html/html/book1.html
-  /usr/share/doc/libxslt/html/html/home.png
-  /usr/share/doc/libxslt/html/html/index.html
-  /usr/share/doc/libxslt/html/html/left.png
-  /usr/share/doc/libxslt/html/html/libxslt-attributes.html
-  /usr/share/doc/libxslt/html/html/libxslt-documents.html
-  /usr/share/doc/libxslt/html/html/libxslt-extensions.html
-  /usr/share/doc/libxslt/html/html/libxslt-extra.html
-  /usr/share/doc/libxslt/html/html/libxslt-functions.html
-  /usr/share/doc/libxslt/html/html/libxslt-imports.html
-  /usr/share/doc/libxslt/html/html/libxslt-keys.html
-  /usr/share/doc/libxslt/html/html/libxslt-lib.html
-  /usr/share/doc/libxslt/html/html/libxslt-namespaces.html
-  /usr/share/doc/libxslt/html/html/libxslt-numbersInternals.html
-  /usr/share/doc/libxslt/html/html/libxslt-pattern.html
-  /usr/share/doc/libxslt/html/html/libxslt-preproc.html
-  /usr/share/doc/libxslt/html/html/libxslt-security.html
-  /usr/share/doc/libxslt/html/html/libxslt-templates.html
-  /usr/share/doc/libxslt/html/html/libxslt-transform.html
-  /usr/share/doc/libxslt/html/html/libxslt-variables.html
-  /usr/share/doc/libxslt/html/html/libxslt-xslt.html
-  /usr/share/doc/libxslt/html/html/libxslt-xsltInternals.html
-  /usr/share/doc/libxslt/html/html/libxslt-xsltexports.html
-  /usr/share/doc/libxslt/html/html/libxslt-xsltutils.html
-  /usr/share/doc/libxslt/html/html/right.png
-  /usr/share/doc/libxslt/html/html/up.png
-  /usr/share/doc/libxslt/html/index.html
-  /usr/share/doc/libxslt/html/internals.html
-  /usr/share/doc/libxslt/html/intro.html
-  /usr/share/doc/libxslt/html/news.html
-  /usr/share/doc/libxslt/html/node.gif
-  /usr/share/doc/libxslt/html/object.gif
-  /usr/share/doc/libxslt/html/processing.gif
-  /usr/share/doc/libxslt/html/python.html
-  /usr/share/doc/libxslt/html/redhat.gif
-  /usr/share/doc/libxslt/html/smallfootonly.gif
-  /usr/share/doc/libxslt/html/stylesheet.gif
-  /usr/share/doc/libxslt/html/templates.gif
-  /usr/share/doc/libxslt/html/tutorial/libxslt_tutorial.c
-  /usr/share/doc/libxslt/html/tutorial/libxslttutorial.html
-  /usr/share/doc/libxslt/html/tutorial/libxslttutorial.xml
-  /usr/share/doc/libxslt/html/tutorial2/libxslt_pipes.c
-  /usr/share/doc/libxslt/html/tutorial2/libxslt_pipes.html
-  /usr/share/doc/libxslt/html/tutorial2/libxslt_pipes.xml
-  /usr/share/doc/libxslt/html/xslt.html
-  /usr/share/doc/libxslt/html/xsltproc.html
-  /usr/share/doc/libxslt/html/xsltproc2.html
-
-------------------
-
 Port Notes:
 
+----- version 1.1.26-1 -----
+Version bump.
+
 ----- version 1.1.24-10 -----
 Rebuilt for Cygwin 1.7.
 
similarity index 76%
rename from libxslt-1.1.24-10.cygport
rename to libxslt-1.1.26-1.cygport
index 43a6598c367ccff8dc2bee1e4a7b9760d3b1572d..e217a69241e77be45a6a8b1518b3a9070154619d 100644 (file)
@@ -4,11 +4,9 @@ DESCRIPTION="GNOME XSLT library"
 HOMEPAGE="http://xmlsoft.org/XSLT/"
 SRC_URI="ftp://xmlsoft.org/libxml2/${P}.tar.gz"
 PATCH_URI="
-       mirror://portage/dev-libs/${PN}/files/libxslt.m4-${PN}-1.1.8.patch
+       mirror://portage/dev-libs/${PN}/files/libxslt.m4-${PN}-1.1.26.patch
        mirror://portage/dev-libs/${PN}/files/${PN}-1.1.23-parallel-install.patch
-       mirror://portage/dev-libs/${PN}/files/${P}-exslt_crypt.patch
-       1.1.24-no-undefined.patch
-       1.1.24-doc-install.patch
+       1.1.26-no-undefined.patch
 "
 
 PKG_NAMES="${PN} ${PN}-devel ${PN}-doc python-${PN}"
@@ -22,7 +20,13 @@ python_libxslt_CONTENTS="${PYTHON_SITELIB#/} usr/share/doc/python-${PN}/"
 
 DIFF_EXCLUDES='libxslt-export.c libxslt-py.* libxsltclass.* *xsltconfig.h'
 
-CYGCONF_ARGS="--with-debugger --with-python --with-crypto"
+CYGCONF_ARGS="
+       --with-crypto
+       --with-debugger
+       --with-html-dir=/usr/share/doc/${PN}
+       --with-html-subdir=html
+       --with-python
+"
 
 src_install() {
        cd ${B}
@@ -30,6 +34,7 @@ src_install() {
 
        mv ${D}${PYTHON_SITELIB}/${PN/lib/cyg}mod.dll ${D}${PYTHON_SITELIB}/${PN}mod.dll
        sed -i -e "s:${PN/lib/cyg}mod:${PN}mod:g" ${D}${PYTHON_SITELIB}/${PN}mod.la
-
        python_optimize
+
+       mv ${D}/usr/share/doc/libxslt-python-${PV} ${D}/usr/share/doc/python-libxslt
 }
This page took 0.111584 seconds and 5 git commands to generate.