Migrate ruby-amrita to use new framework for Ruby packages.

4 files changed, 16 insertions, 28 deletions

diff --git a/textproc/ruby-amrita/DESCR b/textproc/ruby-amrita/DESCR
index 45f3f827649..56f301a9b6c 100644
--- a/textproc/ruby-amrita/DESCR
+++ b/textproc/ruby-amrita/DESCR
@@ -1,4 +1,2 @@
 amrita is an HTML/XHTML template library for Ruby.
 It makes html documents from a template and a model data.
-
-Author: Taku Nakajima <tnakajima@brain-tokyo.jp>
diff --git a/textproc/ruby-amrita/Makefile b/textproc/ruby-amrita/Makefile
index 481ca633b7d..ca3ca0ee064 100644
--- a/textproc/ruby-amrita/Makefile
+++ b/textproc/ruby-amrita/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/03/16 02:01:11 taca Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/28 04:22:48 taca Exp $
 # FreeBSD: ports/textproc/ruby-amrita/Makefile,v 1.5 2003/02/18 05:38:23 knu Exp
 #
 
 DISTNAME=	amrita-1.0.2
-PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc ruby www
 MASTER_SITES=	http://www.brain-tokyo.jp/research/amrita/
 
@@ -11,20 +11,24 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.brain-tokyo.jp/research/amrita/
 COMMENT=	HTML/XHTML template library for Ruby
 
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}strscan>=0.6.5:../../devel/ruby-strscan
+CONFLICTS+=	ruby[1-9][0-9]-amrita-*
 
-NO_BUILD=	# defined
+NO_BUILD=	yes
+DOCS=		ChangeLog README README_ja
+REPLACE_RUBY=	bin/ams bin/amshandler bin/amx
 
-BINS=           bin/ams bin/amshandler bin/amx
-DOCS=           ChangeLog README README_ja
-REPLACE_RUBY=	${BINS}
+.include "../../lang/ruby/rubyversion.mk"
+
+.if ${RUBY_VER} == 16
+DEPENDS+=	${RUBY_PKGPREFIX}-strscan>=0.6.5:../../devel/ruby-strscan
+.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '.cvsignore' -exec ${RM} -f {} \;
 
 do-install:
 	cd ${WRKSRC}; ${RUBY} install.rb
-.for f in ${BINS}
+.for f in ${REPLACE_RUBY}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/amrita
@@ -35,5 +39,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/amrita
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/amrita
 
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-amrita/distinfo b/textproc/ruby-amrita/distinfo
index d00dca0e23b..245cd2734f8 100644
--- a/textproc/ruby-amrita/distinfo
+++ b/textproc/ruby-amrita/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/03/12 05:15:27 taca Exp $
+$NetBSD: distinfo,v 1.2 2004/11/28 04:22:48 taca Exp $
 
-SHA1 (amrita-1.0.2.tar.gz) = b9d74d73b7668bcbfa60abf8c076bc12f71c6898
-Size (amrita-1.0.2.tar.gz) = 221789 bytes
-SHA1 (patch-aa) = 47be517f55ee5e71443451363e371331edb44d65
+SHA1 (ruby/amrita-1.0.2.tar.gz) = b9d74d73b7668bcbfa60abf8c076bc12f71c6898
+Size (ruby/amrita-1.0.2.tar.gz) = 221789 bytes
diff --git a/textproc/ruby-amrita/patches/patch-aa b/textproc/ruby-amrita/patches/patch-aa
deleted file mode 100644
index 07d79146e01..00000000000
--- a/textproc/ruby-amrita/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/12 05:15:27 taca Exp $
-
---- install.rb.orig	2002-07-19 16:20:51.000000000 +0900
-+++ install.rb
-@@ -37,7 +37,7 @@ def install(from, to)
- 
-     st = File::lstat(path)
-     dest = path.sub(from, to)
--    mode = 0644
-+    mode = 0444
- 
-     if st.symlink?
-       linksrc = File::readlink(path)