From 005904201026953366159da66233e6e682dc4eb3 Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 24 Feb 2003 20:45:19 +0000 Subject: Update to 1.0.26. Author does not maintain a file that outlines main changes between versions, but it seems that most of them are bugfixes. This closes PR pkg/20300 by Juan RP. --- textproc/libxslt/Makefile | 5 +++-- textproc/libxslt/PLIST | 9 ++++++--- textproc/libxslt/buildlink2.mk | 4 ++-- textproc/libxslt/distinfo | 10 ++++------ textproc/libxslt/patches/patch-aa | 13 ------------- textproc/libxslt/patches/patch-ab | 17 ++++++++++------- textproc/libxslt/patches/patch-ac | 16 ---------------- 7 files changed, 25 insertions(+), 49 deletions(-) delete mode 100644 textproc/libxslt/patches/patch-aa delete mode 100644 textproc/libxslt/patches/patch-ac (limited to 'textproc/libxslt') diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 184b6a1b8ca..cc56eb3a0aa 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2002/11/06 21:59:29 tron Exp $ +# $NetBSD: Makefile,v 1.15 2003/02/24 20:45:19 jmmv Exp $ -DISTNAME= libxslt-1.0.21 +DISTNAME= libxslt-1.0.26 PKGNAME= ${DISTNAME} CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxslt/1.0/} @@ -13,6 +13,7 @@ USE_BUILDLINK2= yes USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/libxslt.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2} diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST index 0c3a12f6842..5e53f99ea9a 100644 --- a/textproc/libxslt/PLIST +++ b/textproc/libxslt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2002/11/06 21:59:30 tron Exp $ +@comment $NetBSD: PLIST,v 1.11 2003/02/24 20:45:19 jmmv Exp $ bin/xslt-config bin/xsltproc include/libexslt/exslt.h @@ -14,6 +14,7 @@ include/libxslt/namespaces.h include/libxslt/numbersInternals.h include/libxslt/pattern.h include/libxslt/preproc.h +include/libxslt/security.h include/libxslt/templates.h include/libxslt/transform.h include/libxslt/variables.h @@ -25,12 +26,12 @@ lib/libexslt.a lib/libexslt.la lib/libexslt.so lib/libexslt.so.7 -lib/libexslt.so.7.12 +lib/libexslt.so.7.17 lib/libxslt.a lib/libxslt.la lib/libxslt.so lib/libxslt.so.1 -lib/libxslt.so.1.21 +lib/libxslt.so.1.26 lib/libxsltbreakpoint.a lib/libxsltbreakpoint.la lib/libxsltbreakpoint.so @@ -41,6 +42,7 @@ lib/xsltConf.sh man/man1/xsltproc.1 man/man4/libexslt.4 man/man4/libxslt.4 +share/aclocal/libxslt.m4 share/doc/html/libxslt/API.html share/doc/html/libxslt/APIchunk0.html share/doc/html/libxslt/APIchunk1.html @@ -49,6 +51,7 @@ share/doc/html/libxslt/APIchunk3.html share/doc/html/libxslt/APIchunk4.html share/doc/html/libxslt/APIchunk5.html share/doc/html/libxslt/APIchunk6.html +share/doc/html/libxslt/APIchunk7.html share/doc/html/libxslt/APIconstructors.html share/doc/html/libxslt/APIfiles.html share/doc/html/libxslt/APIfunctions.html diff --git a/textproc/libxslt/buildlink2.mk b/textproc/libxslt/buildlink2.mk index 9c87c211fa3..05190e3bf10 100644 --- a/textproc/libxslt/buildlink2.mk +++ b/textproc/libxslt/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.6 2002/09/24 18:21:29 martti Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2003/02/24 20:45:19 jmmv Exp $ .if !defined(LIBXSLT_BUILDLINK2_MK) LIBXSLT_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libxslt -BUILDLINK_DEPENDS.libxslt?= libxslt>=1.0.20 +BUILDLINK_DEPENDS.libxslt?= libxslt>=1.0.26 BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt EVAL_PREFIX+= BUILDLINK_PREFIX.libxslt=libxslt diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 0c9c1c69104..b8c916ad31a 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.10 2002/11/06 21:59:30 tron Exp $ +$NetBSD: distinfo,v 1.11 2003/02/24 20:45:19 jmmv Exp $ -SHA1 (libxslt-1.0.21.tar.gz) = d040a14a5bb21e8db69df22509b38403c32a679c -Size (libxslt-1.0.21.tar.gz) = 2148312 bytes -SHA1 (patch-aa) = 17d7ebcd5d3aeae8322718ba73a1d7f1a3c278d5 -SHA1 (patch-ab) = ce7bfef7ed18d9776a87615979a0bd0605ef587f -SHA1 (patch-ac) = 16e0dc9aadd2487ec0f69369384e71210d370b37 +SHA1 (libxslt-1.0.26.tar.gz) = 2a99e78b247c366e14e6399f5c078354ddd6cef4 +Size (libxslt-1.0.26.tar.gz) = 2252167 bytes +SHA1 (patch-ab) = 582ed6baf15abade35ccaa904f64b477ccf1b102 diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa deleted file mode 100644 index 89f0c136a8a..00000000000 --- a/textproc/libxslt/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/10/03 14:06:17 martti Exp $ - ---- configure.orig Thu Sep 26 20:59:02 2002 -+++ configure Thu Oct 3 12:43:55 2002 -@@ -6449,7 +6449,7 @@ - - - --XSLT_LIBDIR='-L${libdir}' -+XSLT_LIBDIR='-L${libdir} -Wl,-R${libdir}' - - case ${host} in - *-*-solaris*) diff --git a/textproc/libxslt/patches/patch-ab b/textproc/libxslt/patches/patch-ab index 3b279df3e57..d08d357efd7 100644 --- a/textproc/libxslt/patches/patch-ab +++ b/textproc/libxslt/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2002/10/03 14:06:17 martti Exp $ +$NetBSD: patch-ab,v 1.7 2003/02/24 20:45:19 jmmv Exp $ ---- doc/Makefile.in.orig Thu Sep 26 20:59:32 2002 -+++ doc/Makefile.in Thu Oct 3 12:44:13 2002 -@@ -124,7 +124,7 @@ +--- doc/Makefile.in.orig 2003-02-10 18:00:22.000000000 +0100 ++++ doc/Makefile.in +@@ -128,7 +128,7 @@ EXTRA_DIST = \ # The name of the module. @@ -11,16 +11,19 @@ $NetBSD: patch-ab,v 1.6 2002/10/03 14:06:17 martti Exp $ # The top-level SGML file. DOC_MAIN_SGML_FILE = libxslt.sgml -@@ -134,7 +134,7 @@ +@@ -136,9 +136,9 @@ DOC_MAIN_SGML_FILE = libxslt.sgml + # The directory containing the source code (if it contains documentation). + DOC_SOURCE_DIR = .. - HTML_DIR = @HTML_DIR@ +-HTML_DIR = $(datadir)/doc ++HTML_DIR = $(datadir)/doc/html -TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) PAGES = API.html bugs.html contribs.html docs.html downloads.html \ help.html index.html intro.html news.html xsltproc2.html FAQ.html -@@ -351,7 +351,6 @@ +@@ -353,7 +353,6 @@ install-data-local: -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial -@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial diff --git a/textproc/libxslt/patches/patch-ac b/textproc/libxslt/patches/patch-ac deleted file mode 100644 index 5255867b646..00000000000 --- a/textproc/libxslt/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2002/10/03 14:06:17 martti Exp $ - ---- libexslt/Makefile.in.orig Thu Sep 26 20:59:28 2002 -+++ libexslt/Makefile.in Thu Oct 3 12:44:31 2002 -@@ -147,10 +147,7 @@ - dynamic.c - - --# The following DOES NOT WORK reliably. Sorry no prelinking to uninstalled --# yet libraries. --# libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) --libexslt_la_LIBADD = $(INSTALLED_XSLT_LIB) $(EXTRA_LIBS) -+libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) - libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ - - man_MANS = libexslt.4 -- cgit v1.2.3