Update ruby-tmail package to 1.2.1.

pkgsrc change:

 * Use INSTALLATION_DIRS
 * Update HOMEPAGE.

Since changes are too many to write here, please refer pages linked from News
in http://tmail.rubyforge.org/.

Requested by minskim@ via private mail.

4 files changed, 38 insertions, 79 deletions

diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
index ba5f1f41990..abbe595e824 100644
--- a/mail/ruby-tmail/Makefile
+++ b/mail/ruby-tmail/Makefile
@@ -1,30 +1,27 @@
-# $NetBSD: Makefile,v 1.13 2007/04/02 13:36:21 taca Exp $
+# $NetBSD: Makefile,v 1.14 2008/01/27 16:46:46 taca Exp $
 
-DISTNAME=	tmail-0.10.8
-PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	5
+DISTNAME=	tmail.${VERS}
+PKGNAME=	${RUBY_PKGPREFIX}-tmail-${VERS}
 CATEGORIES=	mail ruby
-MASTER_SITES=	http://i.loveruby.net/archive/tmail/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/30630/
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://i.loveruby.net/en/projects/tmail/
+HOMEPAGE=	http://tmail.rubyforge.org/
 COMMENT=	Mail manipulating library for Ruby including MIME multipart support
 
+VERS=			1.2.1
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_SETUP=		yes
+RUBY_SETUP=		script/setup
+
+WRKSRC=			${WRKDIR}/tmail-${VERS}
+INSTALLATION_DIRS=	${RUBY_DOCDIR}/tmail ${RUBY_EXAMPLESDIR}/tmail/data
+DOCS=			CHANGES LICENSE NOTES README
 
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/tmail/en
-	${INSTALL_DATA} ${WRKSRC}/BUGS ${WRKSRC}/ChangeLog ${WRKSRC}/TODO \
-		${RUBY_DOCDIR}/tmail
-	${INSTALL_DATA} ${WRKSRC}/Incompatibilities ${WRKSRC}/README.en \
-		${RUBY_DOCDIR}/tmail/en
-	${INSTALL_DATA} ${WRKSRC}/doc.en/*.html ${RUBY_DOCDIR}/tmail/en
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/tmail/ja
-	${INSTALL_DATA} ${WRKSRC}/Incompatibilities.ja ${WRKSRC}/README.ja \
-		${RUBY_DOCDIR}/tmail/ja
-	${INSTALL_DATA} ${WRKSRC}/doc.ja/*.html ${RUBY_DOCDIR}/tmail/ja
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tmail/data
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/tmail
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/tmail
 	${INSTALL_DATA} ${WRKSRC}/sample/data/* ${RUBY_EXAMPLESDIR}/tmail/data
 
diff --git a/mail/ruby-tmail/PLIST b/mail/ruby-tmail/PLIST
index c65bbcc1c03..508082feb2e 100644
--- a/mail/ruby-tmail/PLIST
+++ b/mail/ruby-tmail/PLIST
@@ -1,55 +1,38 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/07 15:54:25 taca Exp $
-${RUBY_SITEARCHLIBDIR}/tmail/base64.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/tmail/scanner_c.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.5 2008/01/27 16:46:46 taca Exp $
+${RUBY_SITEARCHLIBDIR}/tmailscanner/tmailscanner.${RUBY_DLEXT}
 ${RUBY_SITELIBDIR}/tmail.rb
+${RUBY_SITELIBDIR}/tmail/Makefile
 ${RUBY_SITELIBDIR}/tmail/address.rb
+${RUBY_SITELIBDIR}/tmail/attachments.rb
 ${RUBY_SITELIBDIR}/tmail/base64.rb
-${RUBY_SITELIBDIR}/tmail/config.rb
 ${RUBY_SITELIBDIR}/tmail/compat.rb
+${RUBY_SITELIBDIR}/tmail/config.rb
+${RUBY_SITELIBDIR}/tmail/core_extensions.rb
 ${RUBY_SITELIBDIR}/tmail/encode.rb
 ${RUBY_SITELIBDIR}/tmail/header.rb
-${RUBY_SITELIBDIR}/tmail/info.rb
+${RUBY_SITELIBDIR}/tmail/index.rb
+${RUBY_SITELIBDIR}/tmail/interface.rb
 ${RUBY_SITELIBDIR}/tmail/loader.rb
 ${RUBY_SITELIBDIR}/tmail/mail.rb
 ${RUBY_SITELIBDIR}/tmail/mailbox.rb
+${RUBY_SITELIBDIR}/tmail/main.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/quoting.rb
+${RUBY_SITELIBDIR}/tmail/require_arch.rb
 ${RUBY_SITELIBDIR}/tmail/scanner.rb
 ${RUBY_SITELIBDIR}/tmail/scanner_r.rb
 ${RUBY_SITELIBDIR}/tmail/stringio.rb
-${RUBY_SITELIBDIR}/tmail/textutils.rb
-${RUBY_SITELIBDIR}/tmail/tmail.rb
 ${RUBY_SITELIBDIR}/tmail/utils.rb
-${RUBY_DOCDIR}/tmail/BUGS
-${RUBY_DOCDIR}/tmail/ChangeLog
-${RUBY_DOCDIR}/tmail/TODO
-${RUBY_DOCDIR}/tmail/en/Incompatibilities
-${RUBY_DOCDIR}/tmail/en/README.en
-${RUBY_DOCDIR}/tmail/en/address.html
-${RUBY_DOCDIR}/tmail/en/basics.html
-${RUBY_DOCDIR}/tmail/en/config.html
-${RUBY_DOCDIR}/tmail/en/details.html
-${RUBY_DOCDIR}/tmail/en/index.html
-${RUBY_DOCDIR}/tmail/en/mail.html
-${RUBY_DOCDIR}/tmail/en/mailbox.html
-${RUBY_DOCDIR}/tmail/en/port.html
-${RUBY_DOCDIR}/tmail/en/tmail.html
-${RUBY_DOCDIR}/tmail/en/usage.html
-${RUBY_DOCDIR}/tmail/ja/Incompatibilities.ja
-${RUBY_DOCDIR}/tmail/ja/README.ja
-${RUBY_DOCDIR}/tmail/ja/address.html
-${RUBY_DOCDIR}/tmail/ja/basics.html
-${RUBY_DOCDIR}/tmail/ja/config.html
-${RUBY_DOCDIR}/tmail/ja/details.html
-${RUBY_DOCDIR}/tmail/ja/index.html
-${RUBY_DOCDIR}/tmail/ja/mail.html
-${RUBY_DOCDIR}/tmail/ja/mailbox.html
-${RUBY_DOCDIR}/tmail/ja/port.html
-${RUBY_DOCDIR}/tmail/ja/tmail.html
-${RUBY_DOCDIR}/tmail/ja/usage.html
+${RUBY_SITELIBDIR}/tmail/version.rb
+${RUBY_DOCDIR}/tmail/CHANGES
+${RUBY_DOCDIR}/tmail/LICENSE
+${RUBY_DOCDIR}/tmail/NOTES
+${RUBY_DOCDIR}/tmail/README
+${RUBY_EXAMPLESDIR}/tmail/bench_base64.rb
 ${RUBY_EXAMPLESDIR}/tmail/data/multipart
 ${RUBY_EXAMPLESDIR}/tmail/data/normal
 ${RUBY_EXAMPLESDIR}/tmail/data/sendtest
@@ -61,10 +44,8 @@ ${RUBY_EXAMPLESDIR}/tmail/multipart.rb
 ${RUBY_EXAMPLESDIR}/tmail/parse-bench.rb
 ${RUBY_EXAMPLESDIR}/tmail/parse-test.rb
 ${RUBY_EXAMPLESDIR}/tmail/sendmail.rb
-@dirrm ${RUBY_SITEARCHLIBDIR}/tmail
-@dirrm ${RUBY_SITELIBDIR}/tmail
-@dirrm ${RUBY_DOCDIR}/tmail/en
-@dirrm ${RUBY_DOCDIR}/tmail/ja
-@dirrm ${RUBY_DOCDIR}/tmail
 @dirrm ${RUBY_EXAMPLESDIR}/tmail/data
 @dirrm ${RUBY_EXAMPLESDIR}/tmail
+@dirrm ${RUBY_DOCDIR}/tmail
+@dirrm ${RUBY_SITELIBDIR}/tmail
+@dirrm ${RUBY_SITEARCHLIBDIR}/tmailscanner
diff --git a/mail/ruby-tmail/distinfo b/mail/ruby-tmail/distinfo
index d9b1508020e..1bd39ff90bc 100644
--- a/mail/ruby-tmail/distinfo
+++ b/mail/ruby-tmail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/04/02 13:36:21 taca Exp $
+$NetBSD: distinfo,v 1.6 2008/01/27 16:46:46 taca Exp $
 
-SHA1 (tmail-0.10.8.tar.gz) = 179cad68020fb75de8bb34df489cb54a7cd14384
-RMD160 (tmail-0.10.8.tar.gz) = dadba826fdff0b67d17c4e5fb4e3cf36de5c4118
-Size (tmail-0.10.8.tar.gz) = 125752 bytes
-SHA1 (patch-aa) = bccd6450af7c173484fef96acaea59cf9cd0ae11
+SHA1 (tmail.1.2.1.tar.gz) = 3d4dc1755be56ebe363dc9e4f70912ee53aefc72
+RMD160 (tmail.1.2.1.tar.gz) = b6599485ad53c1aeac8da964ec30b30a124b4ab5
+Size (tmail.1.2.1.tar.gz) = 141435 bytes
diff --git a/mail/ruby-tmail/patches/patch-aa b/mail/ruby-tmail/patches/patch-aa
deleted file mode 100644
index f658cd2f82f..00000000000
--- a/mail/ruby-tmail/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/04/02 13:36:23 taca Exp $
-
-Fix a bug of RFC2231 encoding.
-
-Index: lib/tmail/textutils.rb
-===================================================================
---- lib/tmail/textutils.rb.orig	2004-02-20 09:35:01.000000000 +0900
-+++ lib/tmail/textutils.rb
-@@ -188,8 +188,7 @@ module TMail
- 
-     def decode_RFC2231(str)
-       m = RFC2231_ENCODED.match(str) or return str
--      NKF.nkf(NKF_FLAGS[$KCODE],
--              m.post_match.gsub(/%[\da-f]{2}/in) {|s| s[1,2].hex.chr })
-+      to_kcode(m.post_match.gsub(/%[\da-f]{2}/in) {|s| s[1,2].hex.chr })
-     end
- 
-   end