Update to 0.10.7.

8 files changed, 46 insertions, 58 deletions

diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
index 4be998b62f42..23f4d1e273a1 100644
--- a/mail/ruby-tmail/Makefile
+++ b/mail/ruby-tmail/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	tmail
-PORTVERSION=	0.10.6
-PORTREVISION=	1
+PORTVERSION=	0.10.7
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -20,19 +18,24 @@ COMMENT=	A RFC2822/MIME compliant mail manipulating library for Ruby
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
+RUBY_SETUP=	install.rb
 USE_RUBY_FEATURES=	racc-runtime
 
-CONFIGURE_ARGS=	--with=tmail
-
-WRKDIR_TMAIL=	${WRKSRC}/packages/tmail
+DOCS_EN=	Incompatibilities	README.en	doc.en/*	\
+		*ChangeLog		BUGS		TODO
+DOCS_JA=	Incompatibilities.ja	README.ja	doc.ja/*
 
 do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_MODEXAMPLESDIR}/
+	${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_MODDOCDIR}/
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_MODDOCDIR}/ja/
+.for f in ${DOCS_EN}
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.for f in ${DOCS_JA}
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/ruby-tmail/distinfo b/mail/ruby-tmail/distinfo
index b85b252d5afc..c9643e980b0d 100644
--- a/mail/ruby-tmail/distinfo
+++ b/mail/ruby-tmail/distinfo
@@ -1 +1 @@
-MD5 (ruby/tmail-0.10.6-all.tar.gz) = 375513dbba2c3fa157bcf59a557a85f6
+MD5 (ruby/tmail-0.10.7.tar.gz) = c3fa36589f011cd492f3d6724050162e
diff --git a/mail/ruby-tmail/files/patch-mails.c b/mail/ruby-tmail/files/patch-mails.c
deleted file mode 100644
index 75d704eda870..000000000000
--- a/mail/ruby-tmail/files/patch-mails.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/tmail/ext/tmail/mails/mails.c.orig	Sun Nov 10 23:18:39 2002
-+++ packages/tmail/ext/tmail/mails/mails.c	Sat Nov 16 04:55:28 2002
-@@ -58,7 +58,7 @@
- 
- static VALUE
- mails_s_new(klass, str, ident, cmt)
--    VALUE klass;
-+    VALUE klass, str, ident, cmt;
- {
-     struct scanner *sc;
-     const char *tmp;
diff --git a/mail/ruby-tmail/pkg-plist b/mail/ruby-tmail/pkg-plist
index da1dd82034c3..3e99ccc02dec 100644
--- a/mail/ruby-tmail/pkg-plist
+++ b/mail/ruby-tmail/pkg-plist
@@ -1,8 +1,7 @@
-%%RUBY_SITEARCHLIBDIR%%/tmail/cmails.so
-%%RUBY_SITEARCHLIBDIR%%/tmail/tmbase64.so
+%%RUBY_SITEARCHLIBDIR%%/tmail/base64.so
+%%RUBY_SITEARCHLIBDIR%%/tmail/scanner_c.so
 %%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
@@ -12,13 +11,14 @@
 %%RUBY_SITELIBDIR%%/tmail/info.rb
 %%RUBY_SITELIBDIR%%/tmail/loader.rb
 %%RUBY_SITELIBDIR%%/tmail/mail.rb
+%%RUBY_SITELIBDIR%%/tmail/mailbox.rb
 %%RUBY_SITELIBDIR%%/tmail/mbox.rb
 %%RUBY_SITELIBDIR%%/tmail/net.rb
 %%RUBY_SITELIBDIR%%/tmail/obsolete.rb
 %%RUBY_SITELIBDIR%%/tmail/parser.rb
 %%RUBY_SITELIBDIR%%/tmail/port.rb
-%%RUBY_SITELIBDIR%%/tmail/rmails.rb
 %%RUBY_SITELIBDIR%%/tmail/scanner.rb
+%%RUBY_SITELIBDIR%%/tmail/scanner_r.rb
 %%RUBY_SITELIBDIR%%/tmail/stringio.rb
 %%RUBY_SITELIBDIR%%/tmail/tmail.rb
 %%RUBY_SITELIBDIR%%/tmail/utils.rb
@@ -35,16 +35,19 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/0ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/BUGS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mailbox.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
@@ -56,8 +59,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mailbox.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
index 4be998b62f42..23f4d1e273a1 100644
--- a/mail/rubygem-tmail/Makefile
+++ b/mail/rubygem-tmail/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	tmail
-PORTVERSION=	0.10.6
-PORTREVISION=	1
+PORTVERSION=	0.10.7
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -20,19 +18,24 @@ COMMENT=	A RFC2822/MIME compliant mail manipulating library for Ruby
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
+RUBY_SETUP=	install.rb
 USE_RUBY_FEATURES=	racc-runtime
 
-CONFIGURE_ARGS=	--with=tmail
-
-WRKDIR_TMAIL=	${WRKSRC}/packages/tmail
+DOCS_EN=	Incompatibilities	README.en	doc.en/*	\
+		*ChangeLog		BUGS		TODO
+DOCS_JA=	Incompatibilities.ja	README.ja	doc.ja/*
 
 do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_MODEXAMPLESDIR}/
+	${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_MODDOCDIR}/
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_MODDOCDIR}/ja/
+.for f in ${DOCS_EN}
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
+.for f in ${DOCS_JA}
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/rubygem-tmail/distinfo b/mail/rubygem-tmail/distinfo
index b85b252d5afc..c9643e980b0d 100644
--- a/mail/rubygem-tmail/distinfo
+++ b/mail/rubygem-tmail/distinfo
@@ -1 +1 @@
-MD5 (ruby/tmail-0.10.6-all.tar.gz) = 375513dbba2c3fa157bcf59a557a85f6
+MD5 (ruby/tmail-0.10.7.tar.gz) = c3fa36589f011cd492f3d6724050162e
diff --git a/mail/rubygem-tmail/files/patch-mails.c b/mail/rubygem-tmail/files/patch-mails.c
deleted file mode 100644
index 75d704eda870..000000000000
--- a/mail/rubygem-tmail/files/patch-mails.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/tmail/ext/tmail/mails/mails.c.orig	Sun Nov 10 23:18:39 2002
-+++ packages/tmail/ext/tmail/mails/mails.c	Sat Nov 16 04:55:28 2002
-@@ -58,7 +58,7 @@
- 
- static VALUE
- mails_s_new(klass, str, ident, cmt)
--    VALUE klass;
-+    VALUE klass, str, ident, cmt;
- {
-     struct scanner *sc;
-     const char *tmp;
diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
index da1dd82034c3..3e99ccc02dec 100644
--- a/mail/rubygem-tmail/pkg-plist
+++ b/mail/rubygem-tmail/pkg-plist
@@ -1,8 +1,7 @@
-%%RUBY_SITEARCHLIBDIR%%/tmail/cmails.so
-%%RUBY_SITEARCHLIBDIR%%/tmail/tmbase64.so
+%%RUBY_SITEARCHLIBDIR%%/tmail/base64.so
+%%RUBY_SITEARCHLIBDIR%%/tmail/scanner_c.so
 %%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
@@ -12,13 +11,14 @@
 %%RUBY_SITELIBDIR%%/tmail/info.rb
 %%RUBY_SITELIBDIR%%/tmail/loader.rb
 %%RUBY_SITELIBDIR%%/tmail/mail.rb
+%%RUBY_SITELIBDIR%%/tmail/mailbox.rb
 %%RUBY_SITELIBDIR%%/tmail/mbox.rb
 %%RUBY_SITELIBDIR%%/tmail/net.rb
 %%RUBY_SITELIBDIR%%/tmail/obsolete.rb
 %%RUBY_SITELIBDIR%%/tmail/parser.rb
 %%RUBY_SITELIBDIR%%/tmail/port.rb
-%%RUBY_SITELIBDIR%%/tmail/rmails.rb
 %%RUBY_SITELIBDIR%%/tmail/scanner.rb
+%%RUBY_SITELIBDIR%%/tmail/scanner_r.rb
 %%RUBY_SITELIBDIR%%/tmail/stringio.rb
 %%RUBY_SITELIBDIR%%/tmail/tmail.rb
 %%RUBY_SITELIBDIR%%/tmail/utils.rb
@@ -35,16 +35,19 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/0ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/BUGS
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mailbox.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
@@ -56,8 +59,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/notes.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mailbox.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html