Make ruby-iconv package to ruby 1.8.1 based package. Previous

ruby-iconv-0.5 package will be provided as ruby16-iconv package.

4 files changed, 16 insertions, 37 deletions

diff --git a/converters/ruby-iconv/DESCR b/converters/ruby-iconv/DESCR
index c2465e1ded1..1eced2941c9 100644
--- a/converters/ruby-iconv/DESCR
+++ b/converters/ruby-iconv/DESCR
@@ -1,6 +1,2 @@
-This is an iconv wrapper class for Ruby.
-
-Note that this version is still experimental.  Report any problems to
-the author.
-
-Author:	Nobuyoshi.Nakada <nobu.nokada@softhome.net>
+This is an iconv wrapper class for Ruby, which is actually a part of
+the Ruby distribution version 1.8 and later.
diff --git a/converters/ruby-iconv/Makefile b/converters/ruby-iconv/Makefile
index fce70f04bd3..abed502b3ff 100644
--- a/converters/ruby-iconv/Makefile
+++ b/converters/ruby-iconv/Makefile
@@ -1,33 +1,23 @@
-# $NetBSD: Makefile,v 1.11 2004/11/13 21:28:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/27 14:21:14 taca Exp $
 #
 
-DISTNAME=	iconv-0.5
-PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
-PKGREVISION=	1
+DISTNAME=	${RUBY_DISTNAME}
+PKGNAME=	${RUBY_PKGPREFIX}-iconv-${RUBY_VERSION}
 CATEGORIES=	converters ruby
-MASTER_SITES=	http://nokada.jin.gr.jp/ruby/
+MASTER_SITES=	${MASTER_SITE_RUBY}
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	# not available
+HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Iconv wrapper class for Ruby
 
-USE_BUILDLINK3= yes
-
-DIST_SUBDIR=	ruby
-USE_RUBY_EXTCONF= yes
-USE_RUBY_RD=	yes
-
-INSTALL_TARGET= site-install
-
-DOCS=		iconv.html rd.css
-
-post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/iconv
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/iconv
-.endfor
+RUBY_VERSION_SUPPORTED=	18
+USE_BUILDLINK3=		yes
+USE_RUBY_EXTCONF=	yes
+DISTINFO_FILE=		${RUBY_DISTINFO_FILE}
+WRKSRC=         	${RUBY_WRKSRC}/ext/iconv
+EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/iconv
 
+.include "../../lang/ruby/modules.mk"
+.include "../../lang/ruby/Makefile.common"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../lang/ruby-base/Makefile.common"
-.include "../../lang/ruby-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/ruby-iconv/PLIST b/converters/ruby-iconv/PLIST
index 85e384d2b6b..bf962744374 100644
--- a/converters/ruby-iconv/PLIST
+++ b/converters/ruby-iconv/PLIST
@@ -1,5 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:51:08 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/27 14:21:14 taca Exp $
 ${RUBY_SITEARCHLIBDIR}/iconv.so
-${RUBY_DOCDIR}/iconv/iconv.html
-${RUBY_DOCDIR}/iconv/rd.css
-@dirrm ${RUBY_DOCDIR}/iconv
diff --git a/converters/ruby-iconv/distinfo b/converters/ruby-iconv/distinfo
deleted file mode 100644
index 2509f76f6ae..00000000000
--- a/converters/ruby-iconv/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/10/05 08:58:10 taca Exp $
-
-SHA1 (ruby/iconv-0.5.tar.gz) = 5c71177c7997342af1354ddf272c713c08661e3f
-Size (ruby/iconv-0.5.tar.gz) = 12089 bytes