[pkgsrc/trunk]: pkgsrc/textproc/ruby-amrita Migrate ruby-amrita to use new fr...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0cde439cb78e
branches:  trunk
changeset: 484529:0cde439cb78e
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Nov 28 04:22:48 2004 +0000

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

diffstat:

 textproc/ruby-amrita/DESCR            |   2 --
 textproc/ruby-amrita/Makefile         |  22 +++++++++++++---------
 textproc/ruby-amrita/distinfo         |   7 +++----
 textproc/ruby-amrita/patches/patch-aa |  13 -------------
 4 files changed, 16 insertions(+), 28 deletions(-)

diffs (90 lines):

diff -r 0ab1b1b8b901 -r 0cde439cb78e textproc/ruby-amrita/DESCR
--- a/textproc/ruby-amrita/DESCR        Sun Nov 28 04:21:42 2004 +0000
+++ b/textproc/ruby-amrita/DESCR        Sun Nov 28 04:22:48 2004 +0000
@@ -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@localhost>
diff -r 0ab1b1b8b901 -r 0cde439cb78e textproc/ruby-amrita/Makefile
--- a/textproc/ruby-amrita/Makefile     Sun Nov 28 04:21:42 2004 +0000
+++ b/textproc/ruby-amrita/Makefile     Sun Nov 28 04:22:48 2004 +0000
@@ -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 @@
 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 @@
        ${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 -r 0ab1b1b8b901 -r 0cde439cb78e textproc/ruby-amrita/distinfo
--- a/textproc/ruby-amrita/distinfo     Sun Nov 28 04:21:42 2004 +0000
+++ b/textproc/ruby-amrita/distinfo     Sun Nov 28 04:22:48 2004 +0000
@@ -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 -r 0ab1b1b8b901 -r 0cde439cb78e textproc/ruby-amrita/patches/patch-aa
--- a/textproc/ruby-amrita/patches/patch-aa     Sun Nov 28 04:21:42 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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)