From skv@FreeBSD.org  Thu Jun  2 12:10:52 2005
Return-Path: <skv@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BE08116A41C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  2 Jun 2005 12:10:52 +0000 (GMT)
	(envelope-from skv@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 84FBF43D49
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  2 Jun 2005 12:10:52 +0000 (GMT)
	(envelope-from skv@FreeBSD.org)
Received: from freefall.freebsd.org (skv@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j52CAqja085028
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 2 Jun 2005 12:10:52 GMT
	(envelope-from skv@freefall.freebsd.org)
Received: (from skv@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j52CAqvm085027;
	Thu, 2 Jun 2005 12:10:52 GMT
	(envelope-from skv)
Message-Id: <200506021210.j52CAqvm085027@freefall.freebsd.org>
Date: Thu, 2 Jun 2005 12:10:52 GMT
From: skv@freebsd.org
Reply-To: skv@freebsd.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: p5-XML-LibXSLT - fix xinclude
X-Send-Pr-Version: 3.2

>Number:         81802
>Category:       ports
>Synopsis:       Update port: p5-XML-LibXSLT - fix xinclude
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    jylefort
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 02 12:20:02 GMT 2005
>Closed-Date:    Mon Jun 06 18:08:37 GMT 2005
>Last-Modified:  Mon Jun 06 18:08:37 GMT 2005
>Originator:     Sergey Skvortsov
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
<Organization of PR author (multiple lines)>
>Environment:

	<Relevant environment information (multiple lines)>

>Description:

Update port: p5-XML-LibXSLT

xinclude does not work with latest libxslt due to API changes.

Add patch to explicitly pass xsltTransformContext to processing methods.

>How-To-Repeat:

	<Code/input/activities to reproduce the problem (multiple lines)>

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/p5-XML-LibXSLT/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	16 May 2004 16:23:57 -0000	1.10
+++ Makefile	2 Jun 2005 12:03:54 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML-LibXSLT
 PORTVERSION=	1.57
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
Index: files/patch-LibXSLT.xs
===================================================================
RCS file: files/patch-LibXSLT.xs
diff -N files/patch-LibXSLT.xs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-LibXSLT.xs	2 Jun 2005 12:03:03 -0000
@@ -0,0 +1,33 @@
+--- LibXSLT.xs.orig	Mon Mar  1 18:42:43 2004
++++ LibXSLT.xs	Mon Apr 11 08:07:33 2005
+@@ -772,6 +772,7 @@
+         xmlDocPtr real_dom;
+         xmlDocPtr doc;
+         STRLEN len;
++        xsltTransformContextPtr ctxt;
+     CODE:
+         if (sv_doc == NULL) {
+             XSRETURN_UNDEF;
+@@ -806,10 +807,21 @@
+                               (xmlInputOpenCallback) LibXSLT_input_open,
+                               (xmlInputReadCallback) LibXSLT_input_read,
+                               (xmlInputCloseCallback) LibXSLT_input_close);
+-        real_dom = xsltApplyStylesheet(self, doc, xslt_params);
++        
++        ctxt = xsltNewTransformContext(self, doc);
++        if (ctxt == NULL)
++                return;
++
++        xsltSetCtxtParseOptions(ctxt, 0);
++
++        if (xsltGetXIncludeDefault())
++                ctxt->xinclude = 1;
++
++        real_dom = xsltApplyStylesheetUser(self, doc, xslt_params, NULL, NULL, ctxt);
+ 
+         xmlCleanupInputCallbacks();
+         xmlRegisterDefaultInputCallbacks();
++        xsltFreeTransformContext(ctxt);
+ 
+         if (real_dom == NULL) {
+             if (SvTRUE(ERRSV)) {
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jylefort 
Responsible-Changed-By: jylefort 
Responsible-Changed-When: Thu Jun 2 13:46:06 GMT 2005 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81802 
State-Changed-From-To: open->feedback 
State-Changed-By: jylefort 
State-Changed-When: Thu Jun 2 13:46:19 GMT 2005 
State-Changed-Why:  
Asked maintainer for approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81802 
State-Changed-From-To: feedback->open 
State-Changed-By: jylefort 
State-Changed-When: Thu Jun 2 23:07:15 GMT 2005 
State-Changed-Why:  
Maintainer has approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81802 
State-Changed-From-To: open->closed 
State-Changed-By: jylefort 
State-Changed-When: Mon Jun 6 18:08:22 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81802 
>Unformatted:
