Update to 0.5.0.

4 files changed, 35 insertions, 35 deletions

diff --git a/textproc/ruby-sablot/Makefile b/textproc/ruby-sablot/Makefile
index 2b090c5b3e08..c864702dfd6a 100644
--- a/textproc/ruby-sablot/Makefile
+++ b/textproc/ruby-sablot/Makefile
@@ -6,36 +6,32 @@
 #
 
 PORTNAME=	sablot
-PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTVERSION=	0.5.0
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://www.inac.co.jp/~maki/ruby/
+MASTER_SITES=	http://www.rubycolor.org/arc/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	sablot.60:${PORTSDIR}/textproc/sablotron
+LIB_DEPENDS=	sablot.60:${PORTSDIR}/textproc/sablotron \
+		iconv.2:${PORTSDIR}/converters/iconv \
+		expat.2:${PORTSDIR}/textproc/expat2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-.if !defined(NOPORTDOCS)
-USE_RUBY_RD=	yes
-.endif
 
+CONFIGURE_ARGS=	--with-sablot-lib="${LOCALBASE}" \
+		--with-iconv="${LOCALBASE}" \
+		--with-expat="${LOCALBASE}"
 INSTALL_TARGET=	site-install
 
-DOCS=		README		sablot.html	sablot.rd
-
-post-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${RUBY_RD} sablot.rd > sablot.html
-.endif
+DOCS=		README		doc/*
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
diff --git a/textproc/ruby-sablot/distinfo b/textproc/ruby-sablot/distinfo
index f956bfd83b0b..84f71deff514 100644
--- a/textproc/ruby-sablot/distinfo
+++ b/textproc/ruby-sablot/distinfo
@@ -1 +1 @@
-MD5 (ruby/sablot-0.4.0.tar.gz) = befe1d3d76ac338e39554b68fd139ffe
+MD5 (ruby/sablot-0.5.0.tar.gz) = c9f811d68e15b104fc6af72691f280d5
diff --git a/textproc/ruby-sablot/files/patch-extconf.rb b/textproc/ruby-sablot/files/patch-extconf.rb
deleted file mode 100644
index e2abb2870f94..000000000000
--- a/textproc/ruby-sablot/files/patch-extconf.rb
+++ /dev/null
@@ -1,15 +0,0 @@
---- extconf.rb.orig	Mon Mar 12 02:09:20 2001
-+++ extconf.rb	Mon Mar 12 22:00:21 2001
-@@ -8,8 +8,10 @@
- end
- 
- if have_header("sablot.h") and
--    have_library("xmltok", "XmlParseXmlDecl") and
--    have_library("xmlparse", "XML_ParserCreate") and
-+    (have_library("expat", "XML_ParserCreate") or
-+     (have_library("xmltok", "XmlParseXmlDecl") and
-+      have_library("xmlparse", "XML_ParserCreate"))) and
-+    have_library("iconv") and
-     have_library("sablot", "SablotProcessStrings")
-   create_makefile("sablot")
-   STDERR.print <<EOB
diff --git a/textproc/ruby-sablot/pkg-plist b/textproc/ruby-sablot/pkg-plist
index a6655d03dcf6..aedee96ad47b 100644
--- a/textproc/ruby-sablot/pkg-plist
+++ b/textproc/ruby-sablot/pkg-plist
@@ -1,9 +1,28 @@
 %%RUBY_SITEARCHLIBDIR%%/sablot.so
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/sample.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/sample.xml
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/sample.xsl
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/sample2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/sample3.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample.xsl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_file.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_obj.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_param.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/basic/sample_param.xsl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/ddhc-iso-8859-1.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/ddhc-utf-8.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-euc-jp.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-iso-2022-jp.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-shift_jis.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc-utf-8.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html.xsl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html_fr.xsl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/encoding/doc2html_ja.xsl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample.xsl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample_err.xsl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sablot/handler/sample_mh.rb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot/basic
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot/encoding
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot/handler
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/sablot
 %%PORTDOCS%%%%RUBY_DOCDIR%%/sablot/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/sablot/sablot.html