Update to 1.1.25, and use OPTIONS instead of pre-everything for crypto

support.

Feature safe:	yes

6 files changed, 23 insertions, 200 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 59633bf914a0..54b23f727f92 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	libxslt
-PORTVERSION=	1.1.24
-PORTREVISION?=	2
+PORTVERSION=	1.1.25
+PORTREVISION?=	0
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://fr.rpmfind.net/pub/libxml/ \
 		ftp://gd.tuwien.ac.at/pub/libxml/ \
@@ -34,7 +34,8 @@ _SLAVE_PORT=	yes
 MAN3=		libexslt.3 libxslt.3
 MAN1=		xsltproc.1
 
-OPTIONS=	MEM_DEBUG "Enable memory debugging" off
+OPTIONS=	MEM_DEBUG "Enable memory debugging" off \
+		CRYPTO "Enable crypto support for exslt" on
 .endif
 
 .include <bsd.port.pre.mk>
@@ -43,21 +44,10 @@ OPTIONS=	MEM_DEBUG "Enable memory debugging" off
 CONFIGURE_ARGS+=	--with-mem-debug
 .endif
 
-.if !defined(_SLAVE_PORT)
-.if exists(${LOCALBASE}/lib/libgcrypt.so)
-WITH_GCRYPT=	yes
-.endif
-
-.if defined(WITH_GCRYPT)
+.if defined(WITH_CRYPTO)
 LIB_DEPENDS+=	gcrypt.16:${PORTSDIR}/security/libgcrypt
-.endif
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Libxslt has the following additional tunables:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "	WITH_GCRYPT=yes			Turns on libgcrypt support"
-	@${ECHO_MSG} ""
+.else
+CONFIGURE_ARGS+=--without-crypto
 .endif
 
 post-patch:
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index c80840a40527..265254ba27d7 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libxslt-1.1.24.tar.gz) = e83ec5d27fc4c10c6f612879bea9a153
-SHA256 (gnome2/libxslt-1.1.24.tar.gz) = c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e
-SIZE (gnome2/libxslt-1.1.24.tar.gz) = 3363961
+MD5 (gnome2/libxslt-1.1.25.tar.gz) = 50c5ba1218262ac10669961b32db405a
+SHA256 (gnome2/libxslt-1.1.25.tar.gz) = 5c58a171ab5e33e1d3bb8f417711a62f9deb47f3edd888562183ac818618411d
+SIZE (gnome2/libxslt-1.1.25.tar.gz) = 3394904
diff --git a/textproc/libxslt/files/patch-configure b/textproc/libxslt/files/patch-configure
index 8423bb993eca..67348399dbea 100644
--- a/textproc/libxslt/files/patch-configure
+++ b/textproc/libxslt/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	2008-05-24 00:09:57.000000000 -0500
-+++ configure	2008-05-24 00:10:20.000000000 -0500
-@@ -22284,11 +22284,12 @@
+--- configure.orig	2009-09-18 15:31:26.000000000 -0400
++++ configure	2009-09-18 15:35:31.000000000 -0400
+@@ -4770,7 +4770,7 @@ fi
+ if test "${with_html_subdir+set}" = set; then
+   withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"
+ else
+-  HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"
++  HTML_DIR="$HTML_DIR/\$(PACKAGE)"
+ fi
+ 
+ 
+@@ -15572,11 +15572,12 @@ except: print 0"`
      fi
      if test "$PYTHON_VERSION" != ""
      then
diff --git a/textproc/libxslt/files/patch-doc::Makefile.in b/textproc/libxslt/files/patch-doc::Makefile.in
deleted file mode 100644
index ba2fd08b96cb..000000000000
--- a/textproc/libxslt/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- doc/Makefile.in.orig	Wed Dec 24 12:41:48 2003
-+++ doc/Makefile.in	Wed Dec 24 12:43:38 2003
-@@ -141,7 +141,7 @@
- pythondir = @pythondir@
- 
- # The name of the module.
--DOC_MODULE = libxslt-$(VERSION)
-+DOC_MODULE = libxslt
- 
- # The top-level SGML file.
- DOC_MAIN_XML_FILE = libxslt.xml
-@@ -486,10 +486,9 @@
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- 	-@INSTALL@ -m 0644 $(srcdir)/*.html $(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
-+	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
-+	-@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(TARGET_DIR)
-+	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/EXSLT
- 	-@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.html $(DESTDIR)$(TARGET_DIR)/EXSLT
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
diff --git a/textproc/libxslt/files/patch-exslt_crypt b/textproc/libxslt/files/patch-exslt_crypt
deleted file mode 100644
index c9ab232dd4b9..000000000000
--- a/textproc/libxslt/files/patch-exslt_crypt
+++ /dev/null
@@ -1,152 +0,0 @@
-Index: libexslt/crypto.c
-===================================================================
---- libexslt/crypto.c	(revision 1479)
-+++ libexslt/crypto.c	(working copy)
-@@ -595,11 +595,13 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, hex_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL;
-     xmlChar *bin = NULL, *hex = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -611,7 +613,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -620,15 +622,33 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-+
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     memcpy (padkey, key, key_size);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* encrypt it */
-     bin_len = str_len;
-     bin = xmlStrdup (str);
-     if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -638,6 +658,9 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     hex_len = str_len * 2 + 1;
-     hex = xmlMallocAtomic (hex_len);
-     if (hex == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -670,11 +693,13 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, ret_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin =
- 	NULL, *ret = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -686,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -695,22 +720,51 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     memcpy (padkey, key, key_size);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* decode hex to binary */
-     bin_len = str_len;
-     bin = xmlMallocAtomic (bin_len);
-+    if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     ret_len = exsltCryptoHex2Bin (str, str_len, bin, bin_len);
- 
- /* decrypt the binary blob */
-     ret = xmlMallocAtomic (ret_len);
-+    if (ret == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     PLATFORM_RC4_DECRYPT (ctxt, padkey, bin, ret_len, ret, ret_len);
- 
-     xmlXPathReturnString (ctxt, ret);
- 
-+done:
-     if (key != NULL)
- 	xmlFree (key);
-     if (str != NULL)
diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist
index 18c451272dc6..355b34632deb 100644
--- a/textproc/libxslt/pkg-plist
+++ b/textproc/libxslt/pkg-plist
@@ -23,6 +23,7 @@ include/libxslt/xslt.h
 include/libxslt/xsltInternals.h
 include/libxslt/xsltconfig.h
 include/libxslt/xsltexports.h
+include/libxslt/xsltlocale.h
 include/libxslt/xsltutils.h
 lib/libexslt.a
 lib/libexslt.la