Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Aug 2005 17:09:40 +0200 (CEST)
From:      Pav Lucistnik <pav@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/84706: unbreak and update textproc/ruby-xslt to 0.8.1
Message-ID:  <200508091509.j79F9eks081603@ikaros.oook.cz>
Resent-Message-ID: <200508091510.j79FAEes028868@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         84706
>Category:       ports
>Synopsis:       unbreak and update textproc/ruby-xslt to 0.8.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 09 15:10:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Pav Lucistnik
>Release:        FreeBSD 6.0-BETA1 amd64
>Organization:
>Environment:
System: FreeBSD ikaros.oook.cz 6.0-BETA1 FreeBSD 6.0-BETA1 #0: Sun Jul 24 00:19:43 CEST 2005 root@ikaros.oook.cz:/usr/obj/usr/src/sys/IKAROS amd64

>Description:
Port currently does not configure itself on 5.X and newer.
Attached patch updates it to 0.8.1 which no longer have the problem.

>How-To-Repeat:
>Fix:

--- ruby-xslt.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/ruby-xslt/Makefile,v
retrieving revision 1.8
diff -a -u -r1.8 Makefile
--- Makefile	26 Sep 2004 02:56:43 -0000	1.8
+++ Makefile	9 Aug 2005 15:07:31 -0000
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	xslt
-PORTVERSION=	0.3.0
+PORTVERSION=	0.8.1
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://www.webtime-project.net/ruby-xslt/
+MASTER_SITES=	http://gregoire.lejeune.free.fr/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	ruby
@@ -16,28 +16,16 @@
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	An XSLT processor in pure Ruby
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		xslt.2:${PORTSDIR}/textproc/libxslt
-
+USE_GNOME=	libxslt
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 
-DOCS=		AUTHORS README docs/*.rd doc
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Configure fails on FreeBSD >= 5.x"
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/textproc/ruby-xslt/distinfo,v
retrieving revision 1.4
diff -a -u -r1.4 distinfo
--- distinfo	28 Jun 2004 17:29:40 -0000	1.4
+++ distinfo	9 Aug 2005 15:07:31 -0000
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-xslt_0.3.0.tar.gz) = d477d012feb9c3a01a4525a8b8f7950f
-SIZE (ruby/ruby-xslt_0.3.0.tar.gz) = 23124
+MD5 (ruby/ruby-xslt_0.8.1.tar.gz) = 28cc6a296564178c890ae202ba9aaccf
+SIZE (ruby/ruby-xslt_0.8.1.tar.gz) = 21189
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/textproc/ruby-xslt/pkg-descr,v
retrieving revision 1.3
diff -a -u -r1.3 pkg-descr
--- pkg-descr	28 Jun 2004 17:29:40 -0000	1.3
+++ pkg-descr	9 Aug 2005 15:07:31 -0000
@@ -1,4 +1,4 @@
 This is a Ruby class for processing XSLT.
 
 Author:	Gregoire Lejeune <glejeune.lejeune@free.fr>
-WWW:	http://www.webtime-project.net/ruby-xslt/
+WWW:	http://raa.ruby-lang.org/project/ruby-xslt/
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/textproc/ruby-xslt/pkg-plist,v
retrieving revision 1.4
diff -a -u -r1.4 pkg-plist
--- pkg-plist	28 Jun 2004 17:29:40 -0000	1.4
+++ pkg-plist	9 Aug 2005 15:07:31 -0000
@@ -1,29 +1,4 @@
 %%RUBY_SITEARCHLIBDIR%%/xml/xslt.so
-@unexec /bin/rmdir %%RUBY_SITEARCHLIBDIR%%/xml 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
+@unexec /bin/rmdir %D/%%RUBY_SITEARCHLIBDIR%%/xml 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/xslt.en.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000001.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000002.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000003.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000004.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000005.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000006.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000007.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000008.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src/M000009.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/xslt_c.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_class_index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_file_index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/XML/XSLT.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/XML
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
Index: files/patch-extfunc.h
===================================================================
RCS file: files/patch-extfunc.h
diff -N files/patch-extfunc.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-extfunc.h	9 Aug 2005 15:07:31 -0000
@@ -0,0 +1,11 @@
+--- extfunc.h.orig	Mon Mar 28 21:48:01 2005
++++ extfunc.h	Tue Aug  9 17:04:58 2005
+@@ -21,7 +21,7 @@
+ /* this stores function names and the ids of the objects they belong to, indexed by name and namespace */
+ static xmlHashTablePtr pExtFunctionsHashTable = NULL;
+ 
+-void deallocateCallback( void *, xmlChar * ATTRIBUTE_UNUSED );
++void deallocateCallback( void *payload, xmlChar *name ATTRIBUTE_UNUSED );
+ VALUE xpathObj2value( xmlXPathObjectPtr, xmlDocPtr );
+ xmlXPathObjectPtr value2xpathObj( VALUE );
+ void xmlXPathFuncCallback( xmlXPathParserContextPtr, int );
--- ruby-xslt.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508091509.j79F9eks081603>