4 files changed, 34 insertions, 30 deletions

diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index 46bb6c11d13b..a52679d16ace 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmlparser
-PORTVERSION=	0.5.19
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.bekkoame.ne.jp/~yoshidam/
@@ -31,12 +30,20 @@ USE_RUBY_RD=	yes
 PERL_ARCHLIB=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+CONFIGURE_ARGS=	--with-perl-enc-map \
+		--with-xmlparse-include="${LOCALBASE}/include/xml" \
+		--with-xmltok-include="${LOCALBASE}/include/xml"
 INSTALL_TARGET=	site-install
 
 EXAMPLES_EN=	dtd/ext1.dtd	dtd/ext2.dtd	dtd/extdtd.rb	dtd/extdtd.xml \
+		expat-1.2/ext.ent		expat-1.2/exttest.rb \
+		expat-1.2/exttesti.rb		expat-1.2/hoge.dtd \
+		expat-1.2/idtest.rb		expat-1.2/idtest.xml \
+		expat-1.2/xmlextparser.rb \
 		namespaces/namespace1.rb	namespaces/namespace1.xml \
 		namespaces/namespace2.rb	namespaces/namespace2.xml \
-		digesttest.rb	idattrtest.rb	my-html.rb	saxtest.rb \
+		digesttest.rb	doctype.rb	doctype.xml	doctypei.rb \
+		idattrtest.rb	my-html.rb	saxtest.rb \
 		visitortest.rb	writer.rb	xmlcomments.rb	xmlstats.rb
 EXAMPLES_JA=	buildertest.rb	buildertest2.rb	digesttest2.rb	document.dtd \
 		gtktree.rb	index_euc.xml	index_jis.xml	index_noenc.xml \
@@ -47,12 +54,12 @@ EXAMPLES_JA=	buildertest.rb	buildertest2.rb	digesttest2.rb	document.dtd \
 RD_DOCS=	xmltree.rb	xmltreebuilder.rb	xmltreevisitor.rb
 
 post-patch:
-	${PERL} -i -pe 's,%%PERL_ARCHLIB%%,${PERL_ARCHLIB},g' ${WRKSRC}/extconf.rb
-	${PERL} -i -pe 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/lib/wget.rb
+	${RUBY} -i -pe 'gsub /%%PREFIX%%/, "${PREFIX}"' ${WRKSRC}/lib/wget.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/xmlparser/dtd
+	${MKDIR} ${RUBY_EXAMPLESDIR}/xmlparser/expat-1.2
 	${MKDIR} ${RUBY_EXAMPLESDIR}/xmlparser/namespaces
 	${MKDIR} ${RUBY_EXAMPLESDIR}/xmlparser/ja
 .for f in ${EXAMPLES_EN}
diff --git a/textproc/ruby-xmlparser/distinfo b/textproc/ruby-xmlparser/distinfo
index 88715056d312..6c2056718592 100644
--- a/textproc/ruby-xmlparser/distinfo
+++ b/textproc/ruby-xmlparser/distinfo
@@ -1 +1 @@
-MD5 (ruby/xmlparser-0.5.19.tar.gz) = bb14ede4eeefcdfe7e1d7747917f4b20
+MD5 (ruby/xmlparser-0.6.1.tar.gz) = 2496698f6ea32365af4fc284e3345948
diff --git a/textproc/ruby-xmlparser/files/patch-aa b/textproc/ruby-xmlparser/files/patch-aa
index 97f6bbf83593..8ce291d1c44b 100644
--- a/textproc/ruby-xmlparser/files/patch-aa
+++ b/textproc/ruby-xmlparser/files/patch-aa
@@ -1,27 +1,13 @@
---- extconf.rb.orig	Wed Aug 18 08:38:36 1999
-+++ extconf.rb	Wed Aug  9 20:24:40 2000
-@@ -4,19 +4,19 @@
- 
- ## Encoding maps may be stored in $perl_archlib/XML/Parser/Encodins/
- #perl_archlib = '/usr/lib/perl5/site_perl/5.005/i586-linux'
--perl_archlib = '/usr/local/lib'
-+perl_archlib = '%%PERL_ARCHLIB%%'
- xml_enc_path = perl_archlib + "/XML/Parser/Encodings"
- 
+--- extconf.rb.orig	Sun Oct 15 15:22:39 2000
++++ extconf.rb	Mon Oct 16 05:40:33 2000
+@@ -22,8 +22,8 @@
  ##$CFLAGS="-I#{cwd}/expat/xmlparse -I#{cwd}/expat/xmltok" +
  ##  ' -DXML_ENC_PATH=getenv\(\"XML_ENC_PATH\"\)' +
  ##  " -DNEW_EXPAT"
--$CFLAGS="-I#{cwd}/expat/xmlparse -I#{cwd}/expat/xmltok" +
-+$CFLAGS="-I#{CONFIG['prefix']}/include/xml" +
-   " -DXML_ENC_PATH=\\\"#{xml_enc_path}\\\""
--$LDFLAGS="-L#{cwd}/expat"
-+$LDFLAGS="-L#{CONFIG['prefix']}/lib"
- 
- if have_header("xmlparse.h")
--  if have_library("xmltok", "XML_ParserCreate")
--#  if have_library("expat", "XML_ParserCreate")
-+#  if have_library("xmltok", "XML_ParserCreate")
-+  if have_library("expat", "XML_ParserCreate")
-     if have_func("XML_SetNotStandaloneHandler")
-       $CFLAGS += " -DNEW_EXPAT"
-     end
+-$CFLAGS = "-I#{cwd}/expat/xmlparse -I#{cwd}/expat/xmltok"
+-$LDFLAGS = "-L#{cwd}/expat/xmlparse"
++#$CFLAGS = "-I#{cwd}/expat/xmlparse -I#{cwd}/expat/xmltok"
++#$LDFLAGS = "-L#{cwd}/expat/xmlparse"
+ dir_config("xmltok")
+ dir_config("xmlparse")
+ if xml_enc_path
diff --git a/textproc/ruby-xmlparser/pkg-plist b/textproc/ruby-xmlparser/pkg-plist
index 9749b30f1ada..35bc7760a8d5 100644
--- a/textproc/ruby-xmlparser/pkg-plist
+++ b/textproc/ruby-xmlparser/pkg-plist
@@ -13,6 +13,13 @@
 %%RUBY_EXAMPLESDIR%%/xmlparser/dtd/ext2.dtd
 %%RUBY_EXAMPLESDIR%%/xmlparser/dtd/extdtd.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/dtd/extdtd.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2/ext.ent
+%%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2/exttest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2/exttesti.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2/hoge.dtd
+%%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2/idtest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2/idtest.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2/xmlextparser.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/namespaces/namespace1.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/namespaces/namespace1.xml
 %%RUBY_EXAMPLESDIR%%/xmlparser/namespaces/namespace2.rb
@@ -40,6 +47,9 @@
 %%RUBY_EXAMPLESDIR%%/xmlparser/ja/xpointer.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/ja/xpointertest.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/digesttest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/doctype.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/doctype.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/doctypei.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/idattrtest.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/my-html.rb
 %%RUBY_EXAMPLESDIR%%/xmlparser/saxtest.rb
@@ -49,6 +59,7 @@
 %%RUBY_EXAMPLESDIR%%/xmlparser/xmlstats.rb
 @dirrm %%RUBY_EXAMPLESDIR%%/xmlparser/ja
 @dirrm %%RUBY_EXAMPLESDIR%%/xmlparser/namespaces
+@dirrm %%RUBY_EXAMPLESDIR%%/xmlparser/expat-1.2
 @dirrm %%RUBY_EXAMPLESDIR%%/xmlparser/dtd
 @dirrm %%RUBY_EXAMPLESDIR%%/xmlparser
 %%RUBY_DOCDIR%%/xmlparser/ja/README.ja