From c6b77b3c820fd6dd121929fedd8b6feb3d545d59 Mon Sep 17 00:00:00 2001
From: jwise <jwise@pkgsrc.org>
Date: Tue, 23 Oct 2001 17:21:56 +0000
Subject: Integrate a patch from the sourceforge page for this project.

With this patch, the sablotron base URI for xslt processing is set to the
current working directory, so document inclusion (ala

	<xsl:apply-templates select="document(data/test.xml)" />

) will DTRT.

Bump the pkg version to 1.1nb1, as stylesheets written for the new version
may not work with the old.
---
 www/ap-xslt/Makefile         |  4 ++--
 www/ap-xslt/distinfo         |  4 ++--
 www/ap-xslt/patches/patch-aa |  1 +
 www/ap-xslt/patches/patch-ab | 32 ++++++++++++++++++++++++++++++--
 4 files changed, 35 insertions(+), 6 deletions(-)

(limited to 'www/ap-xslt')

diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 36f9db7b242..28083fea3b2 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 03:17:17 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/23 17:21:56 jwise Exp $
 
 DISTNAME=	modxslt
-PKGNAME=	ap-xslt-1.1
+PKGNAME=	ap-xslt-1.1nb1
 CATEGORIES=	www
 MASTER_SITES=	http://download.sourceforge.net/modxslt/
 
diff --git a/www/ap-xslt/distinfo b/www/ap-xslt/distinfo
index 6fa87ec1a87..a1d0a85329f 100644
--- a/www/ap-xslt/distinfo
+++ b/www/ap-xslt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/16 18:23:21 jwise Exp $
+$NetBSD: distinfo,v 1.2 2001/10/23 17:21:56 jwise Exp $
 
 SHA1 (modxslt.tar.gz) = 136edef75ef6caf53eb865102a2ebfa15383df47
 Size (modxslt.tar.gz) = 11693 bytes
 SHA1 (patch-aa) = c5615792fac77828431a9fa6cabe4ff07b5654e4
-SHA1 (patch-ab) = 2bc2b9cade4dc96b5bf4e4f5a565a5121519a640
+SHA1 (patch-ab) = 2c93353e7a296602cb19d2fca3f0213f867e4d42
diff --git a/www/ap-xslt/patches/patch-aa b/www/ap-xslt/patches/patch-aa
index 8664cba2092..b9a9d4772fe 100644
--- a/www/ap-xslt/patches/patch-aa
+++ b/www/ap-xslt/patches/patch-aa
@@ -1,3 +1,4 @@
+$NetBSD: patch-aa,v 1.2 2001/10/23 17:21:57 jwise Exp $
 --- Makefile.orig	Wed Aug 23 22:30:50 2000
 +++ Makefile	Tue Sep 25 15:12:22 2001
 @@ -1,12 +1,12 @@
diff --git a/www/ap-xslt/patches/patch-ab b/www/ap-xslt/patches/patch-ab
index 13059eb13fc..119f7a52b53 100644
--- a/www/ap-xslt/patches/patch-ab
+++ b/www/ap-xslt/patches/patch-ab
@@ -1,5 +1,9 @@
---- mod_xslt.c.orig	Tue Sep 25 15:15:15 2001
-+++ mod_xslt.c	Tue Sep 25 15:15:42 2001
+$NetBSD: patch-ab,v 1.2 2001/10/23 17:21:57 jwise Exp $
+This patch incorporates a patch from the mod_xslt project page on sourceforge
+in order to have a valid base URI set during xslt processing, so that document
+inclusion will DTRT.
+--- mod_xslt.c.orig	Wed Aug 23 22:05:28 2000
++++ mod_xslt.c	Tue Oct 23 12:43:12 2001
 @@ -43,7 +43,7 @@
  #include "http_protocol.h"
  #include "ap_config.h"
@@ -9,3 +13,27 @@
  #include "http_core.h"
  #include "sablot.h"
  #include "http_log.h"
+@@ -195,6 +195,8 @@
+ 
+ int transform(request_rec *r, char *styleSheetStr, char *inputStr, char **resultStr) {
+   int se;
++  char *cwd = NULL;
++  char *baseURI = NULL;
+   char *argums[] =
+   {
+     "/_stylesheet", styleSheetStr,
+@@ -209,6 +211,14 @@
+     se = SablotCreateProcessor (&theproc);
+     if (cfg->debug)
+       se |= SablotRegHandler(theproc, HLR_MESSAGE, &sablotMH, (void*)r);
++
++    /* get current working directory */
++    cwd = ap_palloc(r->pool, MAXCHAR +1);
++    getcwd(cwd, MAXCHAR);
++
++    /* set base URI to cwd */
++    baseURI = ap_pstrcat(r->pool, "file://", cwd, "/", NULL);
++    se |= SablotSetBase(theproc, baseURI);
+     se |= SablotRunProcessor(theproc,"arg:/_stylesheet","arg:/_xmlinput","arg:/_output",NULL,argums);
+     se |= SablotGetResultArg(theproc,"arg:/_output", resultStr);
+     se |= SablotDestroyProcessor(theproc);
-- 
cgit v1.2.3