pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Switch to use vendor_dir with Ruby 1.8.7.
details: https://anonhg.NetBSD.org/pkgsrc/rev/430f0c562514
branches: trunk
changeset: 543478:430f0c562514
user: taca <taca%pkgsrc.org@localhost>
date: Thu Jun 19 14:42:24 2008 +0000
description:
Switch to use vendor_dir with Ruby 1.8.7.
Bump PKGREVISION.
diffstat:
converters/ruby-romkan/Makefile | 17 +-
converters/ruby-romkan/PLIST | 14 +-
converters/ruby-uconv/Makefile | 13 +-
converters/ruby-uconv/PLIST | 10 +-
databases/qdbm/distinfo | 4 +-
databases/qdbm/patches/patch-af | 17 ++-
databases/ruby-mysql/Makefile | 10 +-
databases/ruby-mysql/PLIST | 16 +-
databases/ruby-qdbm/Makefile | 7 +-
databases/ruby-qdbm/PLIST | 14 +-
databases/ruby-vapor/Makefile | 17 +-
databases/ruby-vapor/PLIST | 268 ++++++++++++++++++++--------------------
devel/ruby-amstd/Makefile | 11 +-
devel/ruby-amstd/PLIST | 36 ++--
devel/ruby-bsearch/Makefile | 13 +-
devel/ruby-bsearch/PLIST | 16 +-
devel/ruby-memcache/Makefile | 3 +-
devel/ruby-memcache/PLIST | 4 +-
devel/ruby-racc/Makefile | 20 +-
devel/ruby-racc/PLIST | 90 ++++++------
devel/ruby-rcsparse/Makefile | 3 +-
devel/ruby-rcsparse/PLIST | 4 +-
devel/ruby-subversion/Makefile | 12 +-
devel/ruby-subversion/PLIST | 42 +++---
inputmethod/prime-dict/Makefile | 4 +-
inputmethod/prime-dict/PLIST | 6 +-
inputmethod/prime/Makefile | 4 +-
inputmethod/prime/PLIST | 92 ++++++------
28 files changed, 402 insertions(+), 365 deletions(-)
diffs (truncated from 1148 to 300 lines):
diff -r f70b99db5635 -r 430f0c562514 converters/ruby-romkan/Makefile
--- a/converters/ruby-romkan/Makefile Thu Jun 19 14:39:58 2008 +0000
+++ b/converters/ruby-romkan/Makefile Thu Jun 19 14:42:24 2008 +0000
@@ -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 @@
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 -r f70b99db5635 -r 430f0c562514 converters/ruby-romkan/PLIST
--- a/converters/ruby-romkan/PLIST Thu Jun 19 14:39:58 2008 +0000
+++ b/converters/ruby-romkan/PLIST Thu Jun 19 14:42:24 2008 +0000
@@ -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 -r f70b99db5635 -r 430f0c562514 converters/ruby-uconv/Makefile
--- a/converters/ruby-uconv/Makefile Thu Jun 19 14:39:58 2008 +0000
+++ b/converters/ruby-uconv/Makefile Thu Jun 19 14:42:24 2008 +0000
@@ -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 @@
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 -r f70b99db5635 -r 430f0c562514 converters/ruby-uconv/PLIST
--- a/converters/ruby-uconv/PLIST Thu Jun 19 14:39:58 2008 +0000
+++ b/converters/ruby-uconv/PLIST Thu Jun 19 14:42:24 2008 +0000
@@ -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 -r f70b99db5635 -r 430f0c562514 databases/qdbm/distinfo
--- a/databases/qdbm/distinfo Thu Jun 19 14:39:58 2008 +0000
+++ b/databases/qdbm/distinfo Thu Jun 19 14:42:24 2008 +0000
@@ -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-ac) = 7986596c900d20d2b26a8906eca1d925060bec91
SHA1 (patch-ad) = 38b1852cabca8c064bd2a6a4639368e812869448
SHA1 (patch-ae) = aa90ad3e228f765b0ac0a8a6744f7af0f4cf9a7f
-SHA1 (patch-af) = 547e0c7b5d4689f8e80e490819b6df76d8f72ecd
+SHA1 (patch-af) = 3aae0b089f9ace97f48ee5070123350f80643f83
SHA1 (patch-ag) = 6a8df8c41db5d804b39572af0e9d1f201fc1a058
diff -r f70b99db5635 -r 430f0c562514 databases/qdbm/patches/patch-af
--- a/databases/qdbm/patches/patch-af Thu Jun 19 14:39:58 2008 +0000
+++ b/databases/qdbm/patches/patch-af Thu Jun 19 14:42:24 2008 +0000
@@ -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 @@
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 -r f70b99db5635 -r 430f0c562514 databases/ruby-mysql/Makefile
--- a/databases/ruby-mysql/Makefile Thu Jun 19 14:39:58 2008 +0000
+++ b/databases/ruby-mysql/Makefile Thu Jun 19 14:42:24 2008 +0000
@@ -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 @@
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 -r f70b99db5635 -r 430f0c562514 databases/ruby-mysql/PLIST
--- a/databases/ruby-mysql/PLIST Thu Jun 19 14:39:58 2008 +0000
+++ b/databases/ruby-mysql/PLIST Thu Jun 19 14:42:24 2008 +0000
@@ -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 -r f70b99db5635 -r 430f0c562514 databases/ruby-qdbm/Makefile
--- a/databases/ruby-qdbm/Makefile Thu Jun 19 14:39:58 2008 +0000
+++ b/databases/ruby-qdbm/Makefile Thu Jun 19 14:42:24 2008 +0000
@@ -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@localhost
@@ -12,14 +13,16 @@
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 -r f70b99db5635 -r 430f0c562514 databases/ruby-qdbm/PLIST
--- a/databases/ruby-qdbm/PLIST Thu Jun 19 14:39:58 2008 +0000
+++ b/databases/ruby-qdbm/PLIST Thu Jun 19 14:42:24 2008 +0000
@@ -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 -r f70b99db5635 -r 430f0c562514 databases/ruby-vapor/Makefile
--- a/databases/ruby-vapor/Makefile Thu Jun 19 14:39:58 2008 +0000
+++ b/databases/ruby-vapor/Makefile Thu Jun 19 14:42:24 2008 +0000
@@ -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 @@
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 @@
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"
Home |
Main Index |
Thread Index |
Old Index