Update to 0.10.4. This introduces some incompatibilities with the

previous versions.  Read the document named "Incompatibilities" for
details.

6 files changed, 70 insertions, 54 deletions

diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
index cc8fdd088a35..dc98c681175b 100644
--- a/mail/ruby-tmail/Makefile
+++ b/mail/ruby-tmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tmail
-PORTVERSION=	0.9.10
+PORTVERSION=	0.10.4
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/ \
 		http://www.ruby-lang.org/~knu/backup/
@@ -17,12 +17,9 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \
-		${RUBY_SITELIBDIR}/fileutils.rb:${PORTSDIR}/devel/ruby-fileutils \
-		${RUBY_SITELIBDIR}/strscan.rb:${PORTSDIR}/devel/ruby-strscan
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime
 
 USE_RUBY=	yes
-USE_RUBY_AMSTD=	yes
 USE_RUBY_SETUP=	yes
 
 CONFIGURE_ARGS=	--with=tmail
@@ -34,8 +31,8 @@ do-install:
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${CP} -R ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
-	${CP} -R ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/ruby-tmail/distinfo b/mail/ruby-tmail/distinfo
index 8d3b568c9ae6..56bb392bfc79 100644
--- a/mail/ruby-tmail/distinfo
+++ b/mail/ruby-tmail/distinfo
@@ -1 +1 @@
-MD5 (ruby/tmail-0.9.10-all.tar.gz) = 93e091021ea06bd7c702d5638a92d38b
+MD5 (ruby/tmail-0.10.4-all.tar.gz) = 6df403968d3b97020a334855091cb4bc
diff --git a/mail/ruby-tmail/pkg-plist b/mail/ruby-tmail/pkg-plist
index 3b4671567a5e..26fe6b53545a 100644
--- a/mail/ruby-tmail/pkg-plist
+++ b/mail/ruby-tmail/pkg-plist
@@ -3,54 +3,65 @@
 %%RUBY_SITELIBDIR%%/tmail.rb
 @dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
 %%RUBY_SITELIBDIR%%/tmail/_loadlib.rb
+%%RUBY_SITELIBDIR%%/tmail/address.rb
 %%RUBY_SITELIBDIR%%/tmail/base64.rb
+%%RUBY_SITELIBDIR%%/tmail/config.rb
 %%RUBY_SITELIBDIR%%/tmail/encode.rb
 %%RUBY_SITELIBDIR%%/tmail/facade.rb
-%%RUBY_SITELIBDIR%%/tmail/field.rb
+%%RUBY_SITELIBDIR%%/tmail/header.rb
 %%RUBY_SITELIBDIR%%/tmail/info.rb
 %%RUBY_SITELIBDIR%%/tmail/loader.rb
 %%RUBY_SITELIBDIR%%/tmail/mail.rb
+%%RUBY_SITELIBDIR%%/tmail/mbox.rb
 %%RUBY_SITELIBDIR%%/tmail/net.rb
-%%RUBY_SITELIBDIR%%/tmail/parsemail.rb
+%%RUBY_SITELIBDIR%%/tmail/obsolete.rb
+%%RUBY_SITELIBDIR%%/tmail/parser.rb
 %%RUBY_SITELIBDIR%%/tmail/port.rb
 %%RUBY_SITELIBDIR%%/tmail/rmails.rb
-%%RUBY_SITELIBDIR%%/tmail/scanmail.rb
+%%RUBY_SITELIBDIR%%/tmail/scanner.rb
+%%RUBY_SITELIBDIR%%/tmail/stringio.rb
 %%RUBY_SITELIBDIR%%/tmail/tmail.rb
+%%RUBY_SITELIBDIR%%/tmail/utils.rb
 @dirrm %%RUBY_SITELIBDIR%%/tmail
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/from-check.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/hf2class.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/multipart.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-bench.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-test.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/sendmail.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/multipart
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/normal
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/sendtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/simple
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/test
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail/m
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/multipart
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/normal
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/sendtest
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/simple
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/test
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail/data
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/Incompatibilities
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/README.en
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/address.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/basics.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/bugs.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/field.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/config.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/details.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/item.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/loader.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mbox.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/notes.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/port.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/tmail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/usage.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/Incompatibilities.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/bugs.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/address.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/basics.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/concept.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/field.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/config.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/details.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/item.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/loader.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mbox.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/notes.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/port.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/tmail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/usage.html
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail/ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
index cc8fdd088a35..dc98c681175b 100644
--- a/mail/rubygem-tmail/Makefile
+++ b/mail/rubygem-tmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tmail
-PORTVERSION=	0.9.10
+PORTVERSION=	0.10.4
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/ \
 		http://www.ruby-lang.org/~knu/backup/
@@ -17,12 +17,9 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \
-		${RUBY_SITELIBDIR}/fileutils.rb:${PORTSDIR}/devel/ruby-fileutils \
-		${RUBY_SITELIBDIR}/strscan.rb:${PORTSDIR}/devel/ruby-strscan
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime
 
 USE_RUBY=	yes
-USE_RUBY_AMSTD=	yes
 USE_RUBY_SETUP=	yes
 
 CONFIGURE_ARGS=	--with=tmail
@@ -34,8 +31,8 @@ do-install:
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-	${CP} -R ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
-	${CP} -R ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/rubygem-tmail/distinfo b/mail/rubygem-tmail/distinfo
index 8d3b568c9ae6..56bb392bfc79 100644
--- a/mail/rubygem-tmail/distinfo
+++ b/mail/rubygem-tmail/distinfo
@@ -1 +1 @@
-MD5 (ruby/tmail-0.9.10-all.tar.gz) = 93e091021ea06bd7c702d5638a92d38b
+MD5 (ruby/tmail-0.10.4-all.tar.gz) = 6df403968d3b97020a334855091cb4bc
diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
index 3b4671567a5e..26fe6b53545a 100644
--- a/mail/rubygem-tmail/pkg-plist
+++ b/mail/rubygem-tmail/pkg-plist
@@ -3,54 +3,65 @@
 %%RUBY_SITELIBDIR%%/tmail.rb
 @dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
 %%RUBY_SITELIBDIR%%/tmail/_loadlib.rb
+%%RUBY_SITELIBDIR%%/tmail/address.rb
 %%RUBY_SITELIBDIR%%/tmail/base64.rb
+%%RUBY_SITELIBDIR%%/tmail/config.rb
 %%RUBY_SITELIBDIR%%/tmail/encode.rb
 %%RUBY_SITELIBDIR%%/tmail/facade.rb
-%%RUBY_SITELIBDIR%%/tmail/field.rb
+%%RUBY_SITELIBDIR%%/tmail/header.rb
 %%RUBY_SITELIBDIR%%/tmail/info.rb
 %%RUBY_SITELIBDIR%%/tmail/loader.rb
 %%RUBY_SITELIBDIR%%/tmail/mail.rb
+%%RUBY_SITELIBDIR%%/tmail/mbox.rb
 %%RUBY_SITELIBDIR%%/tmail/net.rb
-%%RUBY_SITELIBDIR%%/tmail/parsemail.rb
+%%RUBY_SITELIBDIR%%/tmail/obsolete.rb
+%%RUBY_SITELIBDIR%%/tmail/parser.rb
 %%RUBY_SITELIBDIR%%/tmail/port.rb
 %%RUBY_SITELIBDIR%%/tmail/rmails.rb
-%%RUBY_SITELIBDIR%%/tmail/scanmail.rb
+%%RUBY_SITELIBDIR%%/tmail/scanner.rb
+%%RUBY_SITELIBDIR%%/tmail/stringio.rb
 %%RUBY_SITELIBDIR%%/tmail/tmail.rb
+%%RUBY_SITELIBDIR%%/tmail/utils.rb
 @dirrm %%RUBY_SITELIBDIR%%/tmail
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/from-check.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/hf2class.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/multipart.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-bench.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/parse-test.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/sendmail.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/multipart
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/normal
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/sendtest
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/simple
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/m/test
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail/m
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/multipart
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/normal
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/sendtest
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/simple
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tmail/data/test
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail/data
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/tmail
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/Incompatibilities
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/README.en
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/address.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/basics.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/bugs.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/field.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/config.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/details.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/item.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/loader.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/mbox.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/notes.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/port.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/tmail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/usage.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/Incompatibilities.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/bugs.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/address.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/basics.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/changes.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/concept.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/field.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/config.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/details.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/index.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/item.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/loader.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/mbox.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/notes.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/port.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/tmail.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/tmail/ja/usage.html
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail/ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/tmail