From 01b95925f01e824a945d7cf43cc7bf49e2266644 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sat, 31 May 2003 14:41:32 +0000
Subject: fix a multiline literal, allowing this to be built with gcc-3.3.

---
 www/ap-xslt/distinfo         |  4 ++--
 www/ap-xslt/patches/patch-ab | 30 +++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'www/ap-xslt')

diff --git a/www/ap-xslt/distinfo b/www/ap-xslt/distinfo
index 86ae3422302..565d68ec3fb 100644
--- a/www/ap-xslt/distinfo
+++ b/www/ap-xslt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/02/18 00:41:35 grant Exp $
+$NetBSD: distinfo,v 1.6 2003/05/31 14:41:32 grant Exp $
 
 SHA1 (modxslt-1.1.tar.gz) = 136edef75ef6caf53eb865102a2ebfa15383df47
 Size (modxslt-1.1.tar.gz) = 11693 bytes
-SHA1 (patch-ab) = 2c93353e7a296602cb19d2fca3f0213f867e4d42
+SHA1 (patch-ab) = 024e79a880835193eba1ad69eedf2c1057240a17
diff --git a/www/ap-xslt/patches/patch-ab b/www/ap-xslt/patches/patch-ab
index 119f7a52b53..4f223a5b2e6 100644
--- a/www/ap-xslt/patches/patch-ab
+++ b/www/ap-xslt/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2001/10/23 17:21:57 jwise Exp $
+$NetBSD: patch-ab,v 1.3 2003/05/31 14:41:32 grant 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
+
+It also fixes two multi-line literals which are disallowed in gcc 3.3.
+
+--- mod_xslt.c.orig	Thu Aug 24 12:05:28 2000
++++ mod_xslt.c
 @@ -43,7 +43,7 @@
  #include "http_protocol.h"
  #include "ap_config.h"
@@ -13,7 +17,7 @@ inclusion will DTRT.
  #include "http_core.h"
  #include "sablot.h"
  #include "http_log.h"
-@@ -195,6 +195,8 @@
+@@ -195,6 +195,8 @@ MessageHandler sablotMH = {
  
  int transform(request_rec *r, char *styleSheetStr, char *inputStr, char **resultStr) {
    int se;
@@ -22,7 +26,7 @@ inclusion will DTRT.
    char *argums[] =
    {
      "/_stylesheet", styleSheetStr,
-@@ -209,6 +211,14 @@
+@@ -209,6 +211,14 @@ int transform(request_rec *r, char *styl
      se = SablotCreateProcessor (&theproc);
      if (cfg->debug)
        se |= SablotRegHandler(theproc, HLR_MESSAGE, &sablotMH, (void*)r);
@@ -37,3 +41,19 @@ inclusion will DTRT.
      se |= SablotRunProcessor(theproc,"arg:/_stylesheet","arg:/_xmlinput","arg:/_output",NULL,argums);
      se |= SablotGetResultArg(theproc,"arg:/_output", resultStr);
      se |= SablotDestroyProcessor(theproc);
+@@ -288,12 +298,12 @@ static int mod_xslt_handler(request_rec 
+ 
+   if (!strcmp("xml",mimetype))
+     if (cfg->debug){
+-      return mod_xslt_debug_out(r, "XSLT DEBUG: \"AddHandler mod_xslt .xml\" will cause infinite
+-      recursion. Remove it!\n"); 
++      return mod_xslt_debug_out(r, "XSLT DEBUG: \"AddHandler mod_xslt .xml\" will cause infinite\n"
++      "recursion. Remove it!\n"); 
+       return ;
+     } else {
+-      ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, "\"AddHandler mod_xslt .xml\" will cause infinite
+-      recursion. Remove it!\n");
++      ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, "\"AddHandler mod_xslt .xml\" will cause infinite\n"
++      "recursion. Remove it!\n");
+       return SERVER_ERROR;
+     }
-- 
cgit v1.2.3