From 83535ac9f0c2f1d3d43db562739a95949893daa7 Mon Sep 17 00:00:00 2001 From: steven Date: Mon, 23 Apr 2007 15:38:04 +0000 Subject: [PATCH] update to libxslt 1.1.20 from alek@ some time ago --- textproc/libxslt/Makefile | 13 ++++++----- textproc/libxslt/distinfo | 10 ++++----- .../patches/patch-libxslt_extensions_c | 22 ------------------- textproc/libxslt/pkg/PLIST | 6 +++-- 4 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 textproc/libxslt/patches/patch-libxslt_extensions_c diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index a6a3c22007a..dcc5b7b0d23 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.51 2006/08/03 23:55:11 espie Exp $ +# $OpenBSD: Makefile,v 1.52 2007/04/23 15:38:04 steven Exp $ COMMENT= "XSLT C Library for GNOME" -DISTNAME= libxslt-1.1.17 -SHARED_LIBS= exslt 9.2 \ - xslt 3.2 +DISTNAME= libxslt-1.1.20 +SHARED_LIBS= exslt 9.3 \ + xslt 3.3 CATEGORIES= textproc @@ -18,9 +18,10 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c gpg-error iconv intl m z +WANTLIB= c gpg-error m z -LIB_DEPENDS= xml2.>=9:libxml->=2.6.25:textproc/libxml \ +MODULES= devel/gettext +LIB_DEPENDS= xml2.>=9:libxml->=2.6.27:textproc/libxml \ gcrypt.>=12::security/libgcrypt USE_LIBTOOL= Yes diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 8bb300b47f8..5783c507c0f 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1,5 +1,5 @@ -MD5 (libxslt-1.1.17.tar.gz) = /eanqTwOsUy6YoaS+joQAA== -RMD160 (libxslt-1.1.17.tar.gz) = 2Y7ui6SYMADFhoPp3DjoDqom4RU= -SHA1 (libxslt-1.1.17.tar.gz) = WzarPh7YXtCGKhDOIsoD4QhNkSE= -SHA256 (libxslt-1.1.17.tar.gz) = 0zf669ZN24xSzeI9+EaeGzxlVFr1+Tnpu0vp7rlljIo= -SIZE (libxslt-1.1.17.tar.gz) = 2735243 +MD5 (libxslt-1.1.20.tar.gz) = TqLcIqI78qpXD4aKqGNX+A== +RMD160 (libxslt-1.1.20.tar.gz) = 8ogv9HMS3jtjFxNu91HUtCqxWlM= +SHA1 (libxslt-1.1.20.tar.gz) = HKYhwEK089mn5zDFOWG4m8zixkU= +SHA256 (libxslt-1.1.20.tar.gz) = zpLwADHIheBMtl6nbEZ1sHqpivlgdXL7DWgYDDS/U0Y= +SIZE (libxslt-1.1.20.tar.gz) = 3689759 diff --git a/textproc/libxslt/patches/patch-libxslt_extensions_c b/textproc/libxslt/patches/patch-libxslt_extensions_c deleted file mode 100644 index ec17b4a57cf..00000000000 --- a/textproc/libxslt/patches/patch-libxslt_extensions_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-libxslt_extensions_c,v 1.1 2006/05/22 11:33:49 steven Exp $ ---- libxslt/extensions.c.orig Sun May 14 22:41:53 2006 -+++ libxslt/extensions.c Sun May 14 22:42:25 2006 -@@ -324,7 +324,8 @@ xsltExtModuleRegisterDynamic(const xmlCh - const xmlChar *ext_directory = NULL; - const xmlChar *protocol = NULL; - xmlChar *i, *regfunc_name; -- int rc, seen_before; -+ int rc; -+ long seen_before; - - /* check for bad inputs */ - if (URI == NULL) -@@ -337,7 +338,7 @@ xsltExtModuleRegisterDynamic(const xmlCh - } - - /* have we attempted to register this module already? */ -- seen_before = (int) xmlHashLookup(xsltModuleHash, URI); -+ seen_before = (long) xmlHashLookup(xsltModuleHash, URI); - if (0 != seen_before) { - return (-1); - } diff --git a/textproc/libxslt/pkg/PLIST b/textproc/libxslt/pkg/PLIST index 7e50c75f3fc..0cfe669ecee 100644 --- a/textproc/libxslt/pkg/PLIST +++ b/textproc/libxslt/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.24 2004/11/12 21:46:40 espie Exp $ +@comment $OpenBSD: PLIST,v 1.25 2007/04/23 15:38:04 steven Exp $ bin/xslt-config bin/xsltproc include/libexslt/ @@ -37,13 +37,15 @@ lib/xsltConf.sh @man man/man1/xsltproc.1 @man man/man3/libexslt.3 @man man/man3/libxslt.3 -share/aclocal/ share/aclocal/libxslt.m4 share/doc/libxslt/ share/doc/libxslt/html/ share/doc/libxslt/html/API.html share/doc/libxslt/html/APIchunk0.html share/doc/libxslt/html/APIchunk1.html +share/doc/libxslt/html/APIchunk10.html +share/doc/libxslt/html/APIchunk11.html +share/doc/libxslt/html/APIchunk12.html share/doc/libxslt/html/APIchunk2.html share/doc/libxslt/html/APIchunk3.html share/doc/libxslt/html/APIchunk4.html