summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2008-06-19 14:42:24 +0000
committertaca <taca@pkgsrc.org>2008-06-19 14:42:24 +0000
commit568a18f09668e3d4e0db36dfeb93800b6c8fcff6 (patch)
treeea4c9a0687aaa4b64f78762483789b99f97ca384
parent75743515f4cf2b90bbfcaae38726b150c63f8755 (diff)
downloadpkgsrc-568a18f09668e3d4e0db36dfeb93800b6c8fcff6.tar.gz
Switch to use vendor_dir with Ruby 1.8.7.
Bump PKGREVISION.
-rw-r--r--converters/ruby-romkan/Makefile17
-rw-r--r--converters/ruby-romkan/PLIST14
-rw-r--r--converters/ruby-uconv/Makefile13
-rw-r--r--converters/ruby-uconv/PLIST10
-rw-r--r--databases/qdbm/distinfo4
-rw-r--r--databases/qdbm/patches/patch-af17
-rw-r--r--databases/ruby-mysql/Makefile10
-rw-r--r--databases/ruby-mysql/PLIST16
-rw-r--r--databases/ruby-qdbm/Makefile7
-rw-r--r--databases/ruby-qdbm/PLIST14
-rw-r--r--databases/ruby-vapor/Makefile17
-rw-r--r--databases/ruby-vapor/PLIST268
-rw-r--r--devel/ruby-amstd/Makefile11
-rw-r--r--devel/ruby-amstd/PLIST36
-rw-r--r--devel/ruby-bsearch/Makefile13
-rw-r--r--devel/ruby-bsearch/PLIST16
-rw-r--r--devel/ruby-memcache/Makefile3
-rw-r--r--devel/ruby-memcache/PLIST4
-rw-r--r--devel/ruby-racc/Makefile20
-rw-r--r--devel/ruby-racc/PLIST90
-rw-r--r--devel/ruby-rcsparse/Makefile3
-rw-r--r--devel/ruby-rcsparse/PLIST4
-rw-r--r--devel/ruby-subversion/Makefile12
-rw-r--r--devel/ruby-subversion/PLIST42
-rw-r--r--inputmethod/prime-dict/Makefile4
-rw-r--r--inputmethod/prime-dict/PLIST6
-rw-r--r--inputmethod/prime/Makefile4
-rw-r--r--inputmethod/prime/PLIST92
28 files changed, 402 insertions, 365 deletions
diff --git a/converters/ruby-romkan/Makefile b/converters/ruby-romkan/Makefile
index 26f5581571e..966f08cfa36 100644
--- a/converters/ruby-romkan/Makefile
+++ b/converters/ruby-romkan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 05:51:08 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/19 14:42:24 taca Exp $
DISTNAME= ruby-romkan-0.4
PKGNAME= ${RUBY_PKGPREFIX}-romkan-0.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= converters japanese ruby
MASTER_SITES= http://0xcc.net/ruby-romkan/
@@ -13,19 +13,18 @@ COMMENT= Romaji <-> Kana conversion library for Ruby
PKG_DESTDIR_SUPPORT= user-destdir
NO_CONFIGURE= yes
+DOCS= romkan.html romkan.html.ja romkan.en.rd romkan.ja.rd
+INSTALLATION_DIRS= ${RUBY_DOC}/romkan
do-build:
cd ${WRKSRC}; ${RUBY_RD} romkan.en.rd > romkan.html
cd ${WRKSRC}; ${RUBY_RD} romkan.ja.rd > romkan.html.ja
do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_SITELIBDIR}
- ${INSTALL_DATA} ${WRKSRC}/romkan.rb ${DESTDIR}${RUBY_SITELIBDIR}
- ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/romkan
- ${INSTALL_DATA} ${WRKSRC}/romkan.html ${DESTDIR}${RUBY_DOCDIR}/romkan
- ${INSTALL_DATA} ${WRKSRC}/romkan.html.ja ${DESTDIR}${RUBY_DOCDIR}/romkan
- ${INSTALL_DATA} ${WRKSRC}/romkan.en.rd ${DESTDIR}${RUBY_DOCDIR}/romkan/romkan.rd
- ${INSTALL_DATA} ${WRKSRC}/romkan.ja.rd ${DESTDIR}${RUBY_DOCDIR}/romkan
+ ${INSTALL_DATA} ${WRKSRC}/romkan.rb ${DESTDIR}${PREFIX}/${RUBY_VENDORLIB}
+.for f in ${DOCS}
+ cd ${WRKSRC}; ${INSTALL_DATA} ${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/romkan
+.endfor
.include "../../lang/ruby/modules.mk"
.include "../../textproc/ruby-rdtool/buildlink3.mk"
diff --git a/converters/ruby-romkan/PLIST b/converters/ruby-romkan/PLIST
index 7534ca7c561..f039f698839 100644
--- a/converters/ruby-romkan/PLIST
+++ b/converters/ruby-romkan/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:12 seb Exp $
-${RUBY_SITELIBDIR}/romkan.rb
-${RUBY_DOCDIR}/romkan/romkan.html
-${RUBY_DOCDIR}/romkan/romkan.html.ja
-${RUBY_DOCDIR}/romkan/romkan.ja.rd
-${RUBY_DOCDIR}/romkan/romkan.rd
-@dirrm ${RUBY_DOCDIR}/romkan
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:42:24 taca Exp $
+${RUBY_VENDORLIB}/romkan.rb
+${RUBY_DOC}/romkan/romkan.html
+${RUBY_DOC}/romkan/romkan.html.ja
+${RUBY_DOC}/romkan/romkan.ja.rd
+${RUBY_DOC}/romkan/romkan.en.rd
+@dirrm ${RUBY_DOC}/romkan
diff --git a/converters/ruby-uconv/Makefile b/converters/ruby-uconv/Makefile
index 4397cad57f9..ba8ff2c8655 100644
--- a/converters/ruby-uconv/Makefile
+++ b/converters/ruby-uconv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/01/03 15:07:28 taca Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/19 14:42:43 taca Exp $
DISTNAME= uconv-0.4.12
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= converters japanese ruby
MASTER_SITES= http://www.yoshidam.net/
@@ -14,12 +14,15 @@ RUBY_HAS_ARCHLIB= yes
USE_RUBY_EXTCONF= yes
WRKSRC= ${WRKDIR}/uconv
+INSTALLATION_DIRS= ${RUBY_DOC}/uconv
INSTALL_TARGET= site-install
+DOCS= README README.ja
+
post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/uconv
- ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/uconv
- ${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/uconv
+.for f in ${DOCS}
+ cd ${WRKSRC}; ${INSTALL_DATA} ${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/uconv
+.endfor
.include "../../lang/ruby/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/ruby-uconv/PLIST b/converters/ruby-uconv/PLIST
index 1c8001171ea..cdf38f18841 100644
--- a/converters/ruby-uconv/PLIST
+++ b/converters/ruby-uconv/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2004/12/04 17:20:46 taca Exp $
-${RUBY_SITEARCHLIBDIR}/uconv.${RUBY_DLEXT}
-${RUBY_DOCDIR}/uconv/README
-${RUBY_DOCDIR}/uconv/README.ja
-@dirrm ${RUBY_DOCDIR}/uconv
+@comment $NetBSD: PLIST,v 1.4 2008/06/19 14:42:43 taca Exp $
+${RUBY_VENDORARCHLIB}/uconv.${RUBY_DLEXT}
+${RUBY_DOC}/uconv/README
+${RUBY_DOC}/uconv/README.ja
+@dirrm ${RUBY_DOC}/uconv
diff --git a/databases/qdbm/distinfo b/databases/qdbm/distinfo
index 967baeae0e7..cef1f8ef1b3 100644
--- a/databases/qdbm/distinfo
+++ b/databases/qdbm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2008/06/14 14:48:01 obache Exp $
+$NetBSD: distinfo,v 1.23 2008/06/19 14:45:38 taca Exp $
SHA1 (qdbm-1.8.77.tar.gz) = e277e77bc0209cc4c8eb205a9082ef880048445c
RMD160 (qdbm-1.8.77.tar.gz) = 3c684a4127204faf32472d29d7fd64a07e394332
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = 973e4e2e4e88f6a999456347380aedc19b3f0425
SHA1 (patch-ac) = 7986596c900d20d2b26a8906eca1d925060bec91
SHA1 (patch-ad) = 38b1852cabca8c064bd2a6a4639368e812869448
SHA1 (patch-ae) = aa90ad3e228f765b0ac0a8a6744f7af0f4cf9a7f
-SHA1 (patch-af) = 547e0c7b5d4689f8e80e490819b6df76d8f72ecd
+SHA1 (patch-af) = 3aae0b089f9ace97f48ee5070123350f80643f83
SHA1 (patch-ag) = 6a8df8c41db5d804b39572af0e9d1f201fc1a058
diff --git a/databases/qdbm/patches/patch-af b/databases/qdbm/patches/patch-af
index c45c022263b..1c009920666 100644
--- a/databases/qdbm/patches/patch-af
+++ b/databases/qdbm/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2008/02/07 12:40:16 obache Exp $
+$NetBSD: patch-af,v 1.4 2008/06/19 14:45:38 taca Exp $
---- ruby/Makefile.in.orig 2006-09-06 12:37:33.000000000 +0900
+--- ruby/Makefile.in.orig 2006-09-06 03:37:33.000000000 +0000
+++ ruby/Makefile.in
@@ -21,7 +21,7 @@ MYDOCS = rbspex.html rbspex-ja.html rbap
prefix = @prefix@
@@ -11,3 +11,16 @@ $NetBSD: patch-af,v 1.3 2008/02/07 12:40:16 obache Exp $
DESTDIR =
# Building binaries
+@@ -35,9 +35,9 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
+
+
+ all :
+- cd depot && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+- cd curia && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+- cd villa && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
++ cd depot && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb $(RUBY_EXTCONF_ARGS); $(RUNENV) make
++ cd curia && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb $(RUBY_EXTCONF_ARGS); $(RUNENV) make
++ cd villa && [ -f Makefile ] || $(RUNENV) $(RUBY) extconf.rb $(RUBY_EXTCONF_ARGS); $(RUNENV) make
+ @printf '\n'
+ @printf '#================================================================\n'
+ @printf '# Ready to install.\n'
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 92dde90fc10..807f55e1d1f 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:19 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/06/19 14:44:39 taca Exp $
#
DISTNAME= mysql-ruby-2.7.3
PKGNAME= ${RUBY_PKGPREFIX}-mysql-2.7.3
+PKGREVISION= 1
CATEGORIES= databases ruby
MASTER_SITES= http://tmtm.org/downloads/mysql/ruby/
@@ -15,16 +16,15 @@ RUBY_REQD= 1.8.2
USE_RUBY_EXTCONF= yes
INSTALL_TARGET= site-install
CONFIGURE_ARGS+= --with-mysql-config
+INSTALLATION_DIRS= ${RUBY_DOC}/mysql ${RUBY_EG}/mysql
DOCS= README.html README_ja.html tommy.css
post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/mysql
.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mysql
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/mysql
.endfor
- ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/mysql
- ${INSTALL_SCRIPT} ${WRKSRC}/test.rb ${RUBY_EXAMPLESDIR}/mysql
+ ${INSTALL_SCRIPT} ${WRKSRC}/test.rb ${DESTDIR}${PREFIX}/${RUBY_EG}/mysql
.include "../../lang/ruby/modules.mk"
.include "../../mk/mysql.buildlink3.mk"
diff --git a/databases/ruby-mysql/PLIST b/databases/ruby-mysql/PLIST
index 8cb172baedf..59350e4af82 100644
--- a/databases/ruby-mysql/PLIST
+++ b/databases/ruby-mysql/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/07 15:51:47 taca Exp $
-${RUBY_SITEARCHLIBDIR}/mysql.${RUBY_DLEXT}
-${RUBY_DOCDIR}/mysql/README.html
-${RUBY_DOCDIR}/mysql/README_ja.html
-${RUBY_DOCDIR}/mysql/tommy.css
-${RUBY_EXAMPLESDIR}/mysql/test.rb
-@dirrm ${RUBY_EXAMPLESDIR}/mysql
-@dirrm ${RUBY_DOCDIR}/mysql
+@comment $NetBSD: PLIST,v 1.6 2008/06/19 14:44:40 taca Exp $
+${RUBY_VENDORARCHLIB}/mysql.${RUBY_DLEXT}
+${RUBY_DOC}/mysql/README.html
+${RUBY_DOC}/mysql/README_ja.html
+${RUBY_DOC}/mysql/tommy.css
+${RUBY_EG}/mysql/test.rb
+@dirrm ${RUBY_EG}/mysql
+@dirrm ${RUBY_DOC}/mysql
diff --git a/databases/ruby-qdbm/Makefile b/databases/ruby-qdbm/Makefile
index ef337937bbd..b457d6cae61 100644
--- a/databases/ruby-qdbm/Makefile
+++ b/databases/ruby-qdbm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2008/02/07 12:41:19 obache Exp $
+# $NetBSD: Makefile,v 1.8 2008/06/19 14:45:38 taca Exp $
#
.include "../../databases/qdbm/Makefile.common"
PKGNAME= ${RUBY_PKGPREFIX}-qdbm-1.0.0.${QDBM_VERSION}
+PKGREVISION= 1
CATEGORIES= databases ruby
MAINTAINER= obache@NetBSD.org
@@ -12,14 +13,16 @@ COMMENT= Ruby interface of QDBM
PKG_DESTDIR_SUPPORT= user-destdir
-MY_SUBDIR=ruby
+MY_SUBDIR= ruby
BUILD_DIRS= ${MY_SUBDIR}
CONFIGURE_DIRS= ${MY_SUBDIR}
GNU_CONFIGURE= yes
+MAKE_ENV+= RUBY_EXTCONF_ARGS=${RUBY_EXTCONF_ARGS:Q}
TEST_TARGET= check
#USE_RUBY_EXTCONF= yes
#RUBY_EXTCONF_SUBDIRS= ${MY_SUBDIR}/curia ${MY_SUBDIR}/depot ${MY_SUBDIR}/villa
+RUBY_EXTCONF_ARGS= --with-opt-dir=${PREFIX:Q} --vendor
RUBY_HAS_ARCHLIB= yes
REPLACE_RUBY= ${MY_SUBDIR}/curia/rbcrtest ${MY_SUBDIR}/depot/rbdptest \
diff --git a/databases/ruby-qdbm/PLIST b/databases/ruby-qdbm/PLIST
index 9f6338fc84e..fdb1246db7a 100644
--- a/databases/ruby-qdbm/PLIST
+++ b/databases/ruby-qdbm/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/23 06:42:38 minskim Exp $
-${RUBY_SITEARCHLIBDIR}/mod_curia.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/mod_depot.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/mod_villa.${RUBY_DLEXT}
-${RUBY_SITELIBDIR}/curia.rb
-${RUBY_SITELIBDIR}/depot.rb
-${RUBY_SITELIBDIR}/villa.rb
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:45:38 taca Exp $
+${RUBY_VENDORARCHLIB}/mod_curia.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/mod_depot.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/mod_villa.${RUBY_DLEXT}
+${RUBY_VENDORLIB}/curia.rb
+${RUBY_VENDORLIB}/depot.rb
+${RUBY_VENDORLIB}/villa.rb
bin/rbcrtest
bin/rbdptest
bin/rbvltest
diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile
index d6da9076a72..bc77fecd1df 100644
--- a/databases/ruby-vapor/Makefile
+++ b/databases/ruby-vapor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/19 14:46:07 taca Exp $
DISTNAME= vapor-0.81
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= databases ruby
MASTER_SITES= http://rubyforge.org/frs/download.php/215/
@@ -12,6 +12,7 @@ COMMENT= Ruby transparent persistence to postgresql
DEPENDS+= ${RUBY_PKGPREFIX}-DBD-postgresql>=0.0.20:../../databases/ruby-DBD-postgresql
+USE_TOOLS= pax
USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
REPLACE_RUBY= doc/examples/university/createperson \
@@ -19,10 +20,16 @@ REPLACE_RUBY= doc/examples/university/createperson \
doc/examples/university/employment \
doc/examples/university/enroll
+CONFIGURE_ARGS+= --site-ruby-common=${PREFIX}/${RUBY_VENDORLIB_BASE} \
+ --site-ruby=${PREFIX}/${RUBY_VENDORLIB} \
+ --so-dir==${PREFIX}/${RUBY_VENDORARCHLIB}
+
+
+INSTALLATION_DIRS= ${RUBY_DOC}/vapor
+
post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/vapor
- ${CP} -r ${WRKSRC}/doc/* ${RUBY_DOCDIR}/vapor
- ${LN} -s ${RUBY_DOCDIR}/vapor/examples ${RUBY_EXAMPLESDIR}/vapor
+ cd ${WRKSRC}/doc; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor
+ ${LN} -s ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor ${DESTDIR}${PREFIX}/${RUBY_EG}/vapor
.include "../../lang/ruby/modules.mk"
.include "../../mk/pgsql.buildlink3.mk"
diff --git a/databases/ruby-vapor/PLIST b/databases/ruby-vapor/PLIST
index 0ad190c5b9f..fcaa6eeb8ed 100644
--- a/databases/ruby-vapor/PLIST
+++ b/databases/ruby-vapor/PLIST
@@ -1,135 +1,135 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/07 15:52:03 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/06/19 14:46:07 taca Exp $
bin/vaporadmin
-${RUBY_SITELIBDIR}/vapor.rb
-${RUBY_SITELIBDIR}/vapor/persistencemgr.rb
-${RUBY_SITELIBDIR}/vapor/queryparser.y
-${RUBY_SITELIBDIR}/vapor/extent.rb
-${RUBY_SITELIBDIR}/vapor/repositorymgr.rb
-${RUBY_SITELIBDIR}/vapor/transaction.rb
-${RUBY_SITELIBDIR}/vapor/queryparser.rb
-${RUBY_SITELIBDIR}/vapor/oidgenerator.rb
-${RUBY_SITELIBDIR}/vapor/exceptions.rb
-${RUBY_SITELIBDIR}/vapor/utils.rb
-${RUBY_SITELIBDIR}/vapor/tuplemgr.rb
-${RUBY_SITELIBDIR}/vapor/persistable.rb
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/BackendInconsistentError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/ClassNotDeletableError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/ClassNotDeletableError.src/M000003.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/ClassNotKnownError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/ClassNotKnownError.src/M000001.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/CommitError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/CommitError.src/M000002.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/DeletedObjectError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/DuplicateClassError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/InvalidMetadataError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/InvalidQueryError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/NestedTransactionError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/ObjectAlreadyPersistentError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/PersistableReadOnlyError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/QueryError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/RepositoryOfflineError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/StaleObjectError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/StaleTransactionError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/TransactionAbortedError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/TransactionError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/UniquenessError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/UnknownSuperclassError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/VaporException.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/VaporTypeError.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.src/M000047.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.src/M000048.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.src/M000049.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.src/M000050.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.src/M000051.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.src/M000052.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000004.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000005.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000006.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000007.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000008.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000009.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000010.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000011.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000012.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000013.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src/M000014.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000025.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000026.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000027.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000028.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000029.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000030.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000031.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000032.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000033.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000034.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src/M000035.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/QueryParser.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000038.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000039.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000040.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000041.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000042.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000043.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000044.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000045.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src/M000046.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000016.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000017.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000018.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000019.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000021.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000022.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000023.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src/M000024.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/TransactionLog.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/TransactionLog.src/M000036.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor/TransactionLog.src/M000037.html
-${RUBY_DOCDIR}/vapor/api/classes/Vapor.html
-${RUBY_DOCDIR}/vapor/api/created.rid
-${RUBY_DOCDIR}/vapor/api/files/vapor/exceptions_rb.html
-${RUBY_DOCDIR}/vapor/api/files/vapor/persistable_rb.html
-${RUBY_DOCDIR}/vapor/api/files/vapor/persistencemgr_rb.html
-${RUBY_DOCDIR}/vapor/api/files/vapor/repositorymgr_rb.html
-${RUBY_DOCDIR}/vapor/api/files/vapor/transaction_rb.html
-${RUBY_DOCDIR}/vapor/api/fr_class_index.html
-${RUBY_DOCDIR}/vapor/api/fr_file_index.html
-${RUBY_DOCDIR}/vapor/api/fr_method_index.html
-${RUBY_DOCDIR}/vapor/api/index.html
-${RUBY_DOCDIR}/vapor/api/rdoc-style.css
-${RUBY_DOCDIR}/vapor/example.html
-${RUBY_DOCDIR}/vapor/examples/university/README
-${RUBY_DOCDIR}/vapor/examples/university/createperson
-${RUBY_DOCDIR}/vapor/examples/university/createuni
-${RUBY_DOCDIR}/vapor/examples/university/employment
-${RUBY_DOCDIR}/vapor/examples/university/enroll
-${RUBY_DOCDIR}/vapor/examples/university/university.rb
-${RUBY_DOCDIR}/vapor/examples/university/university.xml
-${RUBY_DOCDIR}/vapor/metadata-example.xml
-${RUBY_DOCDIR}/vapor/vapor.dtd
-${RUBY_EXAMPLESDIR}/vapor
-@dirrm ${RUBY_SITELIBDIR}/vapor
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/ClassNotDeletableError.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/ClassNotKnownError.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions/CommitError.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/Exceptions
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/Extent.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/Persistable.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/PersistenceManager.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/RepositoryManager.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/Transaction.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor/TransactionLog.src
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes/Vapor
-@dirrm ${RUBY_DOCDIR}/vapor/api/classes
-@dirrm ${RUBY_DOCDIR}/vapor/api/files/vapor
-@dirrm ${RUBY_DOCDIR}/vapor/api/files
-@dirrm ${RUBY_DOCDIR}/vapor/api
-@dirrm ${RUBY_DOCDIR}/vapor/examples/university
-@dirrm ${RUBY_DOCDIR}/vapor/examples
-@dirrm ${RUBY_DOCDIR}/vapor
+${RUBY_VENDORLIB}/vapor.rb
+${RUBY_VENDORLIB}/vapor/persistencemgr.rb
+${RUBY_VENDORLIB}/vapor/queryparser.y
+${RUBY_VENDORLIB}/vapor/extent.rb
+${RUBY_VENDORLIB}/vapor/repositorymgr.rb
+${RUBY_VENDORLIB}/vapor/transaction.rb
+${RUBY_VENDORLIB}/vapor/queryparser.rb
+${RUBY_VENDORLIB}/vapor/oidgenerator.rb
+${RUBY_VENDORLIB}/vapor/exceptions.rb
+${RUBY_VENDORLIB}/vapor/utils.rb
+${RUBY_VENDORLIB}/vapor/tuplemgr.rb
+${RUBY_VENDORLIB}/vapor/persistable.rb
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/BackendInconsistentError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/ClassNotDeletableError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/ClassNotDeletableError.src/M000003.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/ClassNotKnownError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/ClassNotKnownError.src/M000001.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/CommitError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/CommitError.src/M000002.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/DeletedObjectError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/DuplicateClassError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/InvalidMetadataError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/InvalidQueryError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/NestedTransactionError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/ObjectAlreadyPersistentError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/PersistableReadOnlyError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/QueryError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/RepositoryOfflineError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/StaleObjectError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/StaleTransactionError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/TransactionAbortedError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/TransactionError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/UniquenessError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/UnknownSuperclassError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/VaporException.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/VaporTypeError.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Extent.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Extent.src/M000047.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Extent.src/M000048.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Extent.src/M000049.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Extent.src/M000050.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Extent.src/M000051.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Extent.src/M000052.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000004.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000005.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000006.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000007.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000008.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000009.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000010.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000011.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000012.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000013.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src/M000014.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000025.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000026.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000027.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000028.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000029.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000030.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000031.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000032.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000033.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000034.html
+${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src/M000035.html
+${RUBY_DOC}/vapor/api/classes/Vapor/QueryParser.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000038.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000039.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000040.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000041.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000042.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000043.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000044.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000045.html
+${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src/M000046.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000016.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000017.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000018.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000019.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000021.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000022.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000023.html
+${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src/M000024.html
+${RUBY_DOC}/vapor/api/classes/Vapor/TransactionLog.html
+${RUBY_DOC}/vapor/api/classes/Vapor/TransactionLog.src/M000036.html
+${RUBY_DOC}/vapor/api/classes/Vapor/TransactionLog.src/M000037.html
+${RUBY_DOC}/vapor/api/classes/Vapor.html
+${RUBY_DOC}/vapor/api/created.rid
+${RUBY_DOC}/vapor/api/files/vapor/exceptions_rb.html
+${RUBY_DOC}/vapor/api/files/vapor/persistable_rb.html
+${RUBY_DOC}/vapor/api/files/vapor/persistencemgr_rb.html
+${RUBY_DOC}/vapor/api/files/vapor/repositorymgr_rb.html
+${RUBY_DOC}/vapor/api/files/vapor/transaction_rb.html
+${RUBY_DOC}/vapor/api/fr_class_index.html
+${RUBY_DOC}/vapor/api/fr_file_index.html
+${RUBY_DOC}/vapor/api/fr_method_index.html
+${RUBY_DOC}/vapor/api/index.html
+${RUBY_DOC}/vapor/api/rdoc-style.css
+${RUBY_DOC}/vapor/example.html
+${RUBY_DOC}/vapor/examples/university/README
+${RUBY_DOC}/vapor/examples/university/createperson
+${RUBY_DOC}/vapor/examples/university/createuni
+${RUBY_DOC}/vapor/examples/university/employment
+${RUBY_DOC}/vapor/examples/university/enroll
+${RUBY_DOC}/vapor/examples/university/university.rb
+${RUBY_DOC}/vapor/examples/university/university.xml
+${RUBY_DOC}/vapor/metadata-example.xml
+${RUBY_DOC}/vapor/vapor.dtd
+${RUBY_EG}/vapor
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/ClassNotDeletableError.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/ClassNotKnownError.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions/CommitError.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/Exceptions
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/Extent.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/Persistable.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/PersistenceManager.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/RepositoryManager.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/Transaction.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor/TransactionLog.src
+@dirrm ${RUBY_DOC}/vapor/api/classes/Vapor
+@dirrm ${RUBY_DOC}/vapor/api/classes
+@dirrm ${RUBY_DOC}/vapor/api/files/vapor
+@dirrm ${RUBY_DOC}/vapor/api/files
+@dirrm ${RUBY_DOC}/vapor/api
+@dirrm ${RUBY_DOC}/vapor/examples/university
+@dirrm ${RUBY_DOC}/vapor/examples
+@dirrm ${RUBY_DOC}/vapor
+@dirrm ${RUBY_VENDORLIB}/vapor
diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index 7ea714c3cc6..78b3d816e4b 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/19 14:46:37 taca Exp $
DISTNAME= amstd-2.0.0
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel ruby
MASTER_SITES= http://www.loveruby.net/archive/amstd/
@@ -12,13 +12,16 @@ COMMENT= Collection of miscellaneous Ruby modules
USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
+CONFIGURE_ARGS= --site-ruby=${PREFIX}/${RUBY_VENDORLIB} \
+ --so-dir=${PREFIX}/${RUBY_VENDORARCHLIB}
DOCS= README.en README.ja manual.rd.ja
+INSTALLATION_DIRS= ${RUBY_DOC}/amstd
+
post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/amstd
.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/amstd
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/amstd
.endfor
.include "../../lang/ruby/modules.mk"
diff --git a/devel/ruby-amstd/PLIST b/devel/ruby-amstd/PLIST
index a9e32d67b7e..afb65268ba5 100644
--- a/devel/ruby-amstd/PLIST
+++ b/devel/ruby-amstd/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/07 15:53:00 taca Exp $
-${RUBY_SITELIBDIR}/amstd/aliasing.rb
-${RUBY_SITELIBDIR}/amstd/benchmark.rb
-${RUBY_SITELIBDIR}/amstd/bug.rb
-${RUBY_SITELIBDIR}/amstd/const.rb
-${RUBY_SITELIBDIR}/amstd/d.rb
-${RUBY_SITELIBDIR}/amstd/daemon.rb
-${RUBY_SITELIBDIR}/amstd/must.rb
-${RUBY_SITELIBDIR}/amstd/protect.rb
-${RUBY_SITELIBDIR}/amstd/rbparams.rb
-${RUBY_SITELIBDIR}/amstd/rubyloader.rb
-${RUBY_SITELIBDIR}/amstd/timer.rb
-${RUBY_SITELIBDIR}/amstd/version.rb
-${RUBY_DOCDIR}/amstd/README.en
-${RUBY_DOCDIR}/amstd/README.ja
-${RUBY_DOCDIR}/amstd/manual.rd.ja
-@dirrm ${RUBY_SITELIBDIR}/amstd
-@dirrm ${RUBY_DOCDIR}/amstd
+@comment $NetBSD: PLIST,v 1.6 2008/06/19 14:46:37 taca Exp $
+${RUBY_VENDORLIB}/amstd/aliasing.rb
+${RUBY_VENDORLIB}/amstd/benchmark.rb
+${RUBY_VENDORLIB}/amstd/bug.rb
+${RUBY_VENDORLIB}/amstd/const.rb
+${RUBY_VENDORLIB}/amstd/d.rb
+${RUBY_VENDORLIB}/amstd/daemon.rb
+${RUBY_VENDORLIB}/amstd/must.rb
+${RUBY_VENDORLIB}/amstd/protect.rb
+${RUBY_VENDORLIB}/amstd/rbparams.rb
+${RUBY_VENDORLIB}/amstd/rubyloader.rb
+${RUBY_VENDORLIB}/amstd/timer.rb
+${RUBY_VENDORLIB}/amstd/version.rb
+${RUBY_DOC}/amstd/README.en
+${RUBY_DOC}/amstd/README.ja
+${RUBY_DOC}/amstd/manual.rd.ja
+@dirrm ${RUBY_VENDORLIB}/amstd
+@dirrm ${RUBY_DOC}/amstd
diff --git a/devel/ruby-bsearch/Makefile b/devel/ruby-bsearch/Makefile
index b3cde99fe10..869f8597e8c 100644
--- a/devel/ruby-bsearch/Makefile
+++ b/devel/ruby-bsearch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/19 14:47:00 taca Exp $
DISTNAME= ruby-bsearch-${VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-bsearch-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel ruby
MASTER_SITES= http://0xcc.net/ruby-bsearch/
@@ -20,17 +20,18 @@ TEST_TARGET= check
RD_SRCS= bsearch.en.rd bsearch.ja.rd
DOCS= ${RD_SRCS} bsearch.en.html bsearch.ja.html bsearch.png
+INSTALLATION_DIRS= ${RUBY_DOC}/bsearch
+
do-build:
.for f in ${RD_SRCS}
cd ${WRKSRC}; ${RUBY_RD} ${f} > ${f:S/.rd/.html/}
.endfor
do-install:
- ${INSTALL_LIB_DIR} ${DESTDIR}${RUBY_SITELIBDIR}
- ${INSTALL_DATA} ${WRKSRC}/bsearch.rb ${DESTDIR}${RUBY_SITELIBDIR}/bsearch.rb
- ${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/bsearch
+ ${INSTALL_DATA} ${WRKSRC}/bsearch.rb \
+ ${DESTDIR}${PREFIX}/${RUBY_VENDORLIB}/bsearch.rb
.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${RUBY_DOCDIR}/bsearch
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/bsearch
.endfor
.include "../../lang/ruby/modules.mk"
diff --git a/devel/ruby-bsearch/PLIST b/devel/ruby-bsearch/PLIST
index 94b2c1451f5..31ad6d73666 100644
--- a/devel/ruby-bsearch/PLIST
+++ b/devel/ruby-bsearch/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/03 15:50:00 taca Exp $
-${RUBY_SITELIBDIR}/bsearch.rb
-${RUBY_DOCDIR}/bsearch/bsearch.en.html
-${RUBY_DOCDIR}/bsearch/bsearch.en.rd
-${RUBY_DOCDIR}/bsearch/bsearch.ja.html
-${RUBY_DOCDIR}/bsearch/bsearch.ja.rd
-${RUBY_DOCDIR}/bsearch/bsearch.png
-@dirrm ${RUBY_DOCDIR}/bsearch
+@comment $NetBSD: PLIST,v 1.3 2008/06/19 14:47:00 taca Exp $
+${RUBY_VENDORLIB}/bsearch.rb
+${RUBY_DOC}/bsearch/bsearch.en.html
+${RUBY_DOC}/bsearch/bsearch.en.rd
+${RUBY_DOC}/bsearch/bsearch.ja.html
+${RUBY_DOC}/bsearch/bsearch.ja.rd
+${RUBY_DOC}/bsearch/bsearch.png
+@dirrm ${RUBY_DOC}/bsearch
diff --git a/devel/ruby-memcache/Makefile b/devel/ruby-memcache/Makefile
index 4a86cdb1884..cffaf67dcad 100644
--- a/devel/ruby-memcache/Makefile
+++ b/devel/ruby-memcache/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:28:10 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/19 14:47:42 taca Exp $
DISTNAME= ruby-memcache-0.1.0
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://rubyforge.org/frs/download.php/2484/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/ruby-memcache/PLIST b/devel/ruby-memcache/PLIST
index 2b4da5d3565..173860dd97b 100644
--- a/devel/ruby-memcache/PLIST
+++ b/devel/ruby-memcache/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/04/04 15:28:10 jlam Exp $
-${RUBY_SITEARCHLIBDIR}/memcache.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:47:42 taca Exp $
+${RUBY_VENDORARCHLIB}/memcache.${RUBY_DLEXT}
diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index ebebcfc5b33..3d94754d2c0 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/03/17 15:49:43 taca Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/19 14:47:54 taca Exp $
DISTNAME= racc-${RACC_VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-racc-${RACC_VERSION}
+PKGREVISION= 1
CATEGORIES= devel ruby
MASTER_SITES= http://i.loveruby.net/archive/racc/
@@ -12,6 +13,12 @@ COMMENT= LALR(1) parser generator for Ruby
USE_RUBY_SETUP= yes
RACC_VERSION= 1.4.5
+CONFIGURE_ARGS+= --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
+ --siterubyver=${PREFIX}/${RUBY_VENDORLIB} \
+ --siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
+INSTALLATION_DIRS= ${RUBY_DOC}/racc/en ${RUBY_DOC}/racc/ja \
+ ${RUBY_EG}/racc
+
DOCS= ChangeLog README.en README.ja TODO
DOCS_HTML= NEWS.html command.html debug.html grammar.html index.html \
parser.html usage.html
@@ -19,21 +26,18 @@ EXAMPLES= array.y array2.y calc-ja.y calc.y conflict.y hash.y lalr.y \
syntax.y yyerr.y
post-install:
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/en
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/ja
.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/racc
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/racc
.endfor
.for f in ${DOCS_HTML}
${INSTALL_DATA} ${WRKSRC}/doc.en/${f} \
- ${RUBY_DOCDIR}/racc/en
+ ${DESTDIR}${PREFIX}/${RUBY_DOC}/racc/en
${INSTALL_DATA} ${WRKSRC}/doc.ja/${f} \
- ${RUBY_DOCDIR}/racc/ja
+ ${DESTDIR}${PREFIX}/${RUBY_DOC}/racc/ja
.endfor
- ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/racc
.for f in ${EXAMPLES}
${INSTALL_DATA} ${WRKSRC}/sample/${f} \
- ${RUBY_EXAMPLESDIR}/racc
+ ${DESTDIR}${PREFIX}/${RUBY_EG}/racc
.endfor
.include "../../lang/ruby/modules.mk"
diff --git a/devel/ruby-racc/PLIST b/devel/ruby-racc/PLIST
index b5b0d6ad44e..1a56d854738 100644
--- a/devel/ruby-racc/PLIST
+++ b/devel/ruby-racc/PLIST
@@ -1,48 +1,48 @@
-@comment $NetBSD: PLIST,v 1.9 2007/03/17 15:49:43 taca Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/06/19 14:47:54 taca Exp $
bin/racc
bin/racc2y
bin/y2racc
-${RUBY_SITELIBDIR}/racc/compat.rb
-${RUBY_SITELIBDIR}/racc/compiler.rb
-${RUBY_SITELIBDIR}/racc/exception.rb
-${RUBY_SITELIBDIR}/racc/grammar.rb
-${RUBY_SITELIBDIR}/racc/grammarfileparser.rb
-${RUBY_SITELIBDIR}/racc/grammarfilescanner.rb
-${RUBY_SITELIBDIR}/racc/info.rb
-${RUBY_SITELIBDIR}/racc/iset.rb
-${RUBY_SITELIBDIR}/racc/output.rb
-${RUBY_SITELIBDIR}/racc/parser-text.rb
-${RUBY_SITELIBDIR}/racc/state.rb
-${RUBY_SITELIBDIR}/racc/usercodeparser.rb
-${RUBY_DOCDIR}/racc/ChangeLog
-${RUBY_DOCDIR}/racc/README.en
-${RUBY_DOCDIR}/racc/README.ja
-${RUBY_DOCDIR}/racc/TODO
-${RUBY_DOCDIR}/racc/en/NEWS.html
-${RUBY_DOCDIR}/racc/en/command.html
-${RUBY_DOCDIR}/racc/en/debug.html
-${RUBY_DOCDIR}/racc/en/grammar.html
-${RUBY_DOCDIR}/racc/en/index.html
-${RUBY_DOCDIR}/racc/en/parser.html
-${RUBY_DOCDIR}/racc/en/usage.html
-${RUBY_DOCDIR}/racc/ja/NEWS.html
-${RUBY_DOCDIR}/racc/ja/command.html
-${RUBY_DOCDIR}/racc/ja/debug.html
-${RUBY_DOCDIR}/racc/ja/grammar.html
-${RUBY_DOCDIR}/racc/ja/index.html
-${RUBY_DOCDIR}/racc/ja/parser.html
-${RUBY_DOCDIR}/racc/ja/usage.html
-${RUBY_EXAMPLESDIR}/racc/array.y
-${RUBY_EXAMPLESDIR}/racc/array2.y
-${RUBY_EXAMPLESDIR}/racc/calc-ja.y
-${RUBY_EXAMPLESDIR}/racc/calc.y
-${RUBY_EXAMPLESDIR}/racc/conflict.y
-${RUBY_EXAMPLESDIR}/racc/hash.y
-${RUBY_EXAMPLESDIR}/racc/lalr.y
-${RUBY_EXAMPLESDIR}/racc/syntax.y
-${RUBY_EXAMPLESDIR}/racc/yyerr.y
-@dirrm ${RUBY_SITELIBDIR}/racc
-@dirrm ${RUBY_DOCDIR}/racc/en
-@dirrm ${RUBY_DOCDIR}/racc/ja
-@dirrm ${RUBY_DOCDIR}/racc
-@dirrm ${RUBY_EXAMPLESDIR}/racc
+${RUBY_VENDORLIB}/racc/compat.rb
+${RUBY_VENDORLIB}/racc/compiler.rb
+${RUBY_VENDORLIB}/racc/exception.rb
+${RUBY_VENDORLIB}/racc/grammar.rb
+${RUBY_VENDORLIB}/racc/grammarfileparser.rb
+${RUBY_VENDORLIB}/racc/grammarfilescanner.rb
+${RUBY_VENDORLIB}/racc/info.rb
+${RUBY_VENDORLIB}/racc/iset.rb
+${RUBY_VENDORLIB}/racc/output.rb
+${RUBY_VENDORLIB}/racc/parser-text.rb
+${RUBY_VENDORLIB}/racc/state.rb
+${RUBY_VENDORLIB}/racc/usercodeparser.rb
+${RUBY_DOC}/racc/ChangeLog
+${RUBY_DOC}/racc/README.en
+${RUBY_DOC}/racc/README.ja
+${RUBY_DOC}/racc/TODO
+${RUBY_DOC}/racc/en/NEWS.html
+${RUBY_DOC}/racc/en/command.html
+${RUBY_DOC}/racc/en/debug.html
+${RUBY_DOC}/racc/en/grammar.html
+${RUBY_DOC}/racc/en/index.html
+${RUBY_DOC}/racc/en/parser.html
+${RUBY_DOC}/racc/en/usage.html
+${RUBY_DOC}/racc/ja/NEWS.html
+${RUBY_DOC}/racc/ja/command.html
+${RUBY_DOC}/racc/ja/debug.html
+${RUBY_DOC}/racc/ja/grammar.html
+${RUBY_DOC}/racc/ja/index.html
+${RUBY_DOC}/racc/ja/parser.html
+${RUBY_DOC}/racc/ja/usage.html
+${RUBY_EG}/racc/array.y
+${RUBY_EG}/racc/array2.y
+${RUBY_EG}/racc/calc-ja.y
+${RUBY_EG}/racc/calc.y
+${RUBY_EG}/racc/conflict.y
+${RUBY_EG}/racc/hash.y
+${RUBY_EG}/racc/lalr.y
+${RUBY_EG}/racc/syntax.y
+${RUBY_EG}/racc/yyerr.y
+@dirrm ${RUBY_VENDORLIB}/racc
+@dirrm ${RUBY_DOC}/racc/en
+@dirrm ${RUBY_DOC}/racc/ja
+@dirrm ${RUBY_DOC}/racc
+@dirrm ${RUBY_EG}/racc
diff --git a/devel/ruby-rcsparse/Makefile b/devel/ruby-rcsparse/Makefile
index 362fbd9b43d..e173c06c332 100644
--- a/devel/ruby-rcsparse/Makefile
+++ b/devel/ruby-rcsparse/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/05/21 09:44:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/19 14:48:18 taca Exp $
DISTNAME= 2ea7cc31cb36
PKGNAME= ${RUBY_PKGPREFIX}-rcsparse-0.0.0.42
+PKGREVISION= 1
CATEGORIES= devel ruby
MASTER_SITES= http://ww2.fs.ei.tum.de/~corecode/hg/rcsparse/archive/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/ruby-rcsparse/PLIST b/devel/ruby-rcsparse/PLIST
index ee4453947bb..21e2e3123e6 100644
--- a/devel/ruby-rcsparse/PLIST
+++ b/devel/ruby-rcsparse/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/21 10:35:04 wiz Exp $
-${RUBY_SITEARCHLIBDIR}/rcsfile.${RUBY_DLEXT}
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:48:18 taca Exp $
+${RUBY_VENDORARCHLIB}/rcsfile.${RUBY_DLEXT}
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index 7629d3e220d..1b6a8ed6c36 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2008/04/04 15:31:39 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/19 14:48:43 taca Exp $
PKGNAME= ${RUBY_PKGPREFIX}-subversion-${SVNVER}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Ruby bindings for Subversion
.include "../../devel/subversion/Makefile.common"
@@ -11,20 +11,22 @@ SHLIBTOOL_OVERRIDE= # empty
REPLACE_RUBY_DIRS= tools
CONFIGURE_ENV+= RUBY=${RUBY:Q}
+CONFIGURE_ARGS+= --with-ruby-sitedir=${PREFIX}/${RUBY_VENDORLIB_BASE}
BUILD_TARGET= swig-rb-lib swig-rb
INSTALL_TARGET= install-swig-rb
TEST_TARGET= check-swig-rb
+INSTALLATION_DIRS+= ${SVNEXAMPLES:S/${PREFIX}\///}/ruby
+
post-patch:
${RM} ${WRKSRC}/build-outputs.mk
${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
post-install:
- ${RM} ${RUBY_SITEARCHLIBDIR}/svn/ext/*.la
- ${INSTALL_DATA_DIR} ${SVNEXAMPLES}/ruby
- ${INSTALL_DATA} ${WRKSRC}/tools/*/*.rb ${SVNEXAMPLES}/ruby
+ ${RM} ${DESTDIR}${PREFIX}/${RUBY_VENDORARCHLIB}/svn/ext/*.la
+ ${INSTALL_DATA} ${WRKSRC}/tools/*/*.rb ${DESTDIR}${SVNEXAMPLES}/ruby
.include "../../devel/subversion-base/buildlink3.mk"
.include "../../lang/ruby/modules.mk"
diff --git a/devel/ruby-subversion/PLIST b/devel/ruby-subversion/PLIST
index fcfea485359..c0055c9cda5 100644
--- a/devel/ruby-subversion/PLIST
+++ b/devel/ruby-subversion/PLIST
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/11 04:14:30 epg Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/06/19 14:48:43 taca Exp $
lib/libsvn_swig_ruby-1.la
-${RUBY_SITEARCHLIBDIR}/svn/ext/client.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/svn/ext/core.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/svn/ext/delta.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/svn/ext/fs.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/svn/ext/ra.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/svn/ext/repos.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/svn/ext/wc.${RUBY_DLEXT}
-${RUBY_SITELIBDIR}/svn/client.rb
-${RUBY_SITELIBDIR}/svn/core.rb
-${RUBY_SITELIBDIR}/svn/delta.rb
-${RUBY_SITELIBDIR}/svn/error.rb
-${RUBY_SITELIBDIR}/svn/fs.rb
-${RUBY_SITELIBDIR}/svn/info.rb
-${RUBY_SITELIBDIR}/svn/ra.rb
-${RUBY_SITELIBDIR}/svn/repos.rb
-${RUBY_SITELIBDIR}/svn/util.rb
-${RUBY_SITELIBDIR}/svn/wc.rb
+${RUBY_VENDORARCHLIB}/svn/ext/client.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/svn/ext/core.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/svn/ext/delta.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/svn/ext/fs.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/svn/ext/ra.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/svn/ext/repos.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/svn/ext/wc.${RUBY_DLEXT}
+${RUBY_VENDORLIB}/svn/client.rb
+${RUBY_VENDORLIB}/svn/core.rb
+${RUBY_VENDORLIB}/svn/delta.rb
+${RUBY_VENDORLIB}/svn/error.rb
+${RUBY_VENDORLIB}/svn/fs.rb
+${RUBY_VENDORLIB}/svn/info.rb
+${RUBY_VENDORLIB}/svn/ra.rb
+${RUBY_VENDORLIB}/svn/repos.rb
+${RUBY_VENDORLIB}/svn/util.rb
+${RUBY_VENDORLIB}/svn/wc.rb
share/examples/subversion/ruby/commit-email.rb
share/examples/subversion/ruby/svnlog2html.rb
share/examples/subversion/ruby/svnlook.rb
share/examples/subversion/ruby/svnshell.rb
@dirrm share/examples/subversion/ruby
-@dirrm ${RUBY_SITELIBDIR}/svn
-@dirrm ${RUBY_SITEARCHLIBDIR}/svn/ext
-@dirrm ${RUBY_SITEARCHLIBDIR}/svn
+@dirrm ${RUBY_VENDORLIB}/svn
+@dirrm ${RUBY_VENDORARCHLIB}/svn/ext
+@dirrm ${RUBY_VENDORARCHLIB}/svn
diff --git a/inputmethod/prime-dict/Makefile b/inputmethod/prime-dict/Makefile
index 5a7f640fd9d..0058e8db0ea 100644
--- a/inputmethod/prime-dict/Makefile
+++ b/inputmethod/prime-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 02:50:45 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/19 14:49:51 taca Exp $
#
DISTNAME= prime-dict-1.0.0
@@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LANGUAGES= # none
-CONFIGURE_ARGS+= --with-rubydir=${RUBY_SITELIBDIR}
+CONFIGURE_ARGS+= --with-rubydir=${PREFIX}/${RUBY_VENDORLIB}
.include "../../lang/ruby/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/prime-dict/PLIST b/inputmethod/prime-dict/PLIST
index 0fe9507f899..7072a35670a 100644
--- a/inputmethod/prime-dict/PLIST
+++ b/inputmethod/prime-dict/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/02 02:50:45 obache Exp $
-${RUBY_SITELIBDIR}/prime/prime-dict-config.rb
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:49:51 taca Exp $
+${RUBY_VENDORLIB}/prime/prime-dict-config.rb
share/prime/dict/prime-dict
share/prime/dict/prime-dict-en
share/prime/dict/prime-dict-en-pos
@@ -14,4 +14,4 @@ share/prime/dict/prime-dict.ary
share/prime/dict/prime-dict_literal.ary
@dirrm share/prime/dict
@dirrm share/prime
-@dirrm ${RUBY_SITELIBDIR}/prime
+@dirrm ${RUBY_VENDORLIB}/prime
diff --git a/inputmethod/prime/Makefile b/inputmethod/prime/Makefile
index 3248e40c058..5f59b52477f 100644
--- a/inputmethod/prime/Makefile
+++ b/inputmethod/prime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/04/04 15:31:39 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/19 14:50:08 taca Exp $
#
DISTNAME= prime-1.0.0.1
@@ -26,7 +26,7 @@ PKGCONFIG_OVERRIDE+= prime.pc.in
REPLACE_RUBY_DIRS= src
REPLACE_RUBY_PAT= *.src
-CONFIGURE_ARGS+= --with-rubydir=${RUBY_SITELIBDIR}
+CONFIGURE_ARGS+= --with-rubydir=${PREFIX}/${RUBY_VENDORLIB}
CONFIGURE_ARGS+= --with-prime-configdir=${PKG_SYSCONFDIR}
PKG_SYSCONFSUBDIR= prime
diff --git a/inputmethod/prime/PLIST b/inputmethod/prime/PLIST
index 9f19a3d52cd..6c1a4cb467f 100644
--- a/inputmethod/prime/PLIST
+++ b/inputmethod/prime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/02 02:49:45 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/06/19 14:50:09 taca Exp $
bin/prime
bin/prime-dict-convert
bin/prime-dict-index
@@ -6,48 +6,48 @@ bin/prime-refresh
bin/prime-userdict-convert
bin/prime-userdict-update
lib/pkgconfig/prime.pc
-${RUBY_SITELIBDIR}/prime/array-agent.rb
-${RUBY_SITELIBDIR}/prime/composer.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-adambnc.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-alphabet.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-basic.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-english.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-network.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-number.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-personaldict.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-sary.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-userdict.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-userdict2-en.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-userdict2-lib.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-userdict2-static.rb
-${RUBY_SITELIBDIR}/prime/engine/engine-userdict2.rb
-${RUBY_SITELIBDIR}/prime/engine/engine.rb
-${RUBY_SITELIBDIR}/prime/grammar/grammar.rb
-${RUBY_SITELIBDIR}/prime/makedict/basicdict.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-adambnc.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-cannadic.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-pubdic.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-skkdic.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-text.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-usage.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-wordlist.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat-wordnet.rb
-${RUBY_SITELIBDIR}/prime/makedict/dictformat.rb
-${RUBY_SITELIBDIR}/prime/makedict/prime-sary.rb
-${RUBY_SITELIBDIR}/prime/makedict/userdict.rb
-${RUBY_SITELIBDIR}/prime/prime-config.rb
-${RUBY_SITELIBDIR}/prime/prime-japanese.rb
-${RUBY_SITELIBDIR}/prime/prime-mixed.rb
-${RUBY_SITELIBDIR}/prime/prime.rb
-${RUBY_SITELIBDIR}/prime/prime08.rb
-${RUBY_SITELIBDIR}/prime/prime2.rb
-${RUBY_SITELIBDIR}/prime/protocol.rb
-${RUBY_SITELIBDIR}/prime/server.rb
-${RUBY_SITELIBDIR}/prime/session-english.rb
-${RUBY_SITELIBDIR}/prime/session-japanese.rb
-${RUBY_SITELIBDIR}/prime/session-prime08.rb
-${RUBY_SITELIBDIR}/prime/session.rb
-${RUBY_SITELIBDIR}/prime/taiyaki.rb
+${RUBY_VENDORLIB}/prime/array-agent.rb
+${RUBY_VENDORLIB}/prime/composer.rb
+${RUBY_VENDORLIB}/prime/engine/engine-adambnc.rb
+${RUBY_VENDORLIB}/prime/engine/engine-alphabet.rb
+${RUBY_VENDORLIB}/prime/engine/engine-basic.rb
+${RUBY_VENDORLIB}/prime/engine/engine-english.rb
+${RUBY_VENDORLIB}/prime/engine/engine-network.rb
+${RUBY_VENDORLIB}/prime/engine/engine-number.rb
+${RUBY_VENDORLIB}/prime/engine/engine-personaldict.rb
+${RUBY_VENDORLIB}/prime/engine/engine-sary.rb
+${RUBY_VENDORLIB}/prime/engine/engine-userdict.rb
+${RUBY_VENDORLIB}/prime/engine/engine-userdict2-en.rb
+${RUBY_VENDORLIB}/prime/engine/engine-userdict2-lib.rb
+${RUBY_VENDORLIB}/prime/engine/engine-userdict2-static.rb
+${RUBY_VENDORLIB}/prime/engine/engine-userdict2.rb
+${RUBY_VENDORLIB}/prime/engine/engine.rb
+${RUBY_VENDORLIB}/prime/grammar/grammar.rb
+${RUBY_VENDORLIB}/prime/makedict/basicdict.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-adambnc.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-cannadic.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-pubdic.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-skkdic.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-text.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-usage.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-wordlist.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat-wordnet.rb
+${RUBY_VENDORLIB}/prime/makedict/dictformat.rb
+${RUBY_VENDORLIB}/prime/makedict/prime-sary.rb
+${RUBY_VENDORLIB}/prime/makedict/userdict.rb
+${RUBY_VENDORLIB}/prime/prime-config.rb
+${RUBY_VENDORLIB}/prime/prime-japanese.rb
+${RUBY_VENDORLIB}/prime/prime-mixed.rb
+${RUBY_VENDORLIB}/prime/prime.rb
+${RUBY_VENDORLIB}/prime/prime08.rb
+${RUBY_VENDORLIB}/prime/prime2.rb
+${RUBY_VENDORLIB}/prime/protocol.rb
+${RUBY_VENDORLIB}/prime/server.rb
+${RUBY_VENDORLIB}/prime/session-english.rb
+${RUBY_VENDORLIB}/prime/session-japanese.rb
+${RUBY_VENDORLIB}/prime/session-prime08.rb
+${RUBY_VENDORLIB}/prime/session.rb
+${RUBY_VENDORLIB}/prime/taiyaki.rb
share/doc/prime/dictionary.html
share/doc/prime/examples/Custom_prime.rb
share/doc/prime/figures/dict-format.png
@@ -71,6 +71,6 @@ share/prime/makedict/canna2prime.table
@dirrm share/doc/prime/figures
@dirrm share/doc/prime/examples
@dirrm share/doc/prime
-@dirrm ${RUBY_SITELIBDIR}/prime/makedict
-@dirrm ${RUBY_SITELIBDIR}/prime/grammar
-@dirrm ${RUBY_SITELIBDIR}/prime/engine
+@dirrm ${RUBY_VENDORLIB}/prime/makedict
+@dirrm ${RUBY_VENDORLIB}/prime/grammar
+@dirrm ${RUBY_VENDORLIB}/prime/engine