summaryrefslogtreecommitdiff
path: root/databases/sqlrelay
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2015-09-02 12:39:33 +0000
committerfhajny <fhajny@pkgsrc.org>2015-09-02 12:39:33 +0000
commit95a06d4a2e7b45b98d567f6da0fb40d76c8b8993 (patch)
tree0018cbc1d5d624c3593608a08199b597401efa55 /databases/sqlrelay
parente560bff6b2b11a40dbaab1ec0b6588484a081af7 (diff)
downloadpkgsrc-95a06d4a2e7b45b98d567f6da0fb40d76c8b8993.tar.gz
Update databases/sqlrelay to 0.63.
sqlrelay 0.63 - suppressed ruby configure warning - fixed glib detection if pkg-config isn't present - fixed mono detection on freebsd - fixed node.js yes/no misreport bug in configure script - added freetds tcl test - fixed slashes in tcl tests for windows - updated docs to mention firebird buffer size parameters - updated MAX_ITEM_BUFFER_SIZE to 32768 for firebird - fixed ruby detection on fedora 22 - fixed missing export for setAuth/ResponseTimeout in ruby api - added manual include of inttypes.h in php api to work around issue with define/undef games, revealed on openbsd 5.7 - tweaked ruby cflags script for debian 8 - refactored mysql detection - tweaked unixodbc detection to also look in /usr/include/odbc - renamed "oracle8" connection plugin to "oracle" - renamed "sybase" connection plugin to "sap" - updated identity tests in api's/cmdline clients to use charstring::contains() rather than !charstring::compare() - implemented missing destructors for ADO.NET Data Provider sqlrelay 0.62 - added query filter plugin framework - added regex, string and pattern filters - added normalization translation - added reformatdatetime result set translation - fixed error in sqlrconfigfile class that could cause sqlr-start to crash if one instance defines addresses but the next doesn't - added query status flag to sqlrservercursor - tweaked odbc driver's SQLGetTypeInfo() - field name is passed into runResultSetTranslations() now - added support for maxitembuffersize, maxselectlistsize, and maxbindcount for firebird - added native api for node.js - added recognition of bigint, ubigint and uniqueidentifier fields in freetds/sybase - added nullsasnulls command to sqlrsh - added workaround for freetds empty (but non-null) text fields not getting properly converted to null-terminated empty strings - fetchatonce, maxitembuffersize and maxselectlistsize are set to defaulting values if invalid values are given for them - added lazyconnect option to PHP PDO and Perl DBI drivers (defaults to 1) - direct Transact SQL which returns a result set is now supported with Sybase/SAP/MSSQLServer/FreeTDS - added docs for authentication, query translation, query filter and result set translation modules - added -fPIC to sqlrserver-config --cflags, if supported - the "default" auth module is now called "userlist" - added database auth module that is analagous to authtier="database" - replaced passwordencryption attribute with passwordencryptionid - added --disable-postgresql8-api configure option - tweaked -Werror detection in configure script - refactored sqlr-bench build to work on windows - documentation, examples and tests are now covered by a license - reflecting modern interpretation of the GPL, The license for The SQLRelay Server (as designated in COPYING) license now carries an exception, explicitly allowing it to be linked with various non-GPL compatible libraries - license is installed now sqlrelay 0.61 skipped sqlrelay 0.60 - fixed true->false transposition in sqlrservercontroller::interceptQuery that could lead to a reLogIn loop - disabled -Werror for gcc < 2.7 - applied George Carrette's patch to fix PDO connectstring options - migrated directory/file paths info into sqlrpaths class - removed undocumented and not-so-relevent-these-days MAX_CONNECTIONS/overridemaxconnections failsafe in sqlr-start - fixed java header detection for javac located in /usr/bin - updated java api to support non-null-tolerant implementations of environment::NewStringUTF() - the perl api builds correctly on OSR5 again - the postgresql sslmode is omitted entirely from the connect string now, if it's disabled, to prevent problems with older versions of postgresql that don't support the parameter at all - mono 2.8 or greater is required now - added a datedelimiters attribute to the instance tag in sqlrelay.conf to limit what date delimiters are used when translating dates - re-added mssqlserver detection, which had been accidentally removed - fixed statically-linked build - fixed mysql lob field bug that could cause a crash
Diffstat (limited to 'databases/sqlrelay')
-rw-r--r--databases/sqlrelay/Makefile5
-rw-r--r--databases/sqlrelay/Makefile.common5
-rw-r--r--databases/sqlrelay/PLIST60
-rw-r--r--databases/sqlrelay/distinfo16
-rw-r--r--databases/sqlrelay/patches/patch-config.mk.in12
-rw-r--r--databases/sqlrelay/patches/patch-configure20
-rw-r--r--databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb30
-rw-r--r--databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb27
8 files changed, 114 insertions, 61 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 2fc5430abdc..b6e6e013390 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2015/06/12 10:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2015/09/02 12:39:33 fhajny Exp $
COMMENT= Database connection pooling middleware and API
-PKGREVISION= 2
.include "../../databases/sqlrelay/Makefile.common"
@@ -12,7 +11,7 @@ CONFIGURE_ARGS+= --disable-db2 --disable-erlang --disable-firebird \
--disable-mysql --disable-odbc --disable-oracle \
--disable-perl --disable-php --disable-postgresql \
--disable-python --disable-ruby --disable-sqlite \
- --disable-sybase --disable-tcl
+ --disable-sybase --disable-tcl --disable-nodejs
INSTALL_MAKE_FLAGS+= EXAMPLEDIR=${DESTDIR}${EGDIR}
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 44f37c45cd2..772a0113f71 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile.common,v 1.9 2015/06/12 10:48:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.10 2015/09/02 12:39:33 fhajny Exp $
# used by databases/p5-sqlrelay/Makefile
# used by databases/php-sqlrelay/Makefile
# used by databases/py-sqlrelay/Makefile
# used by databases/ruby-sqlrelay/Makefile
# used by databases/sqlrelay-freetds/Makefile
# used by databases/sqlrelay-mysql/Makefile
+# used by databases/sqlrelay-nodejs/Makefile
# used by databases/sqlrelay-odbc/Makefile
# used by databases/sqlrelay-pgsql/Makefile
# used by databases/sqlrelay-sqlite/Makefile
# used by databases/sqlrelay/Makefile
-DISTNAME= sqlrelay-0.59
+DISTNAME= sqlrelay-0.63
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST
index 69a27720521..756bba5a4e1 100644
--- a/databases/sqlrelay/PLIST
+++ b/databases/sqlrelay/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2015/05/21 15:11:57 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.14 2015/09/02 12:39:33 fhajny Exp $
bin/sqlr-cachemanager
bin/sqlr-connection
bin/sqlr-export
@@ -62,9 +62,13 @@ lib/libsqlrserver.la
lib/libsqlrutil.la
lib/pkgconfig/sqlrelay-c++.pc
lib/pkgconfig/sqlrelay-c.pc
-libexec/sqlrelay/sqlrauth_default.so
+libexec/sqlrelay/sqlrauth_database.so
libexec/sqlrelay/sqlrauth_sqlrelay.so
+libexec/sqlrelay/sqlrauth_userlist.so
libexec/sqlrelay/sqlrconnection_router.so
+libexec/sqlrelay/sqlrfilter_patterns.so
+libexec/sqlrelay/sqlrfilter_regex.so
+libexec/sqlrelay/sqlrfilter_string.so
libexec/sqlrelay/sqlrlogger_custom_nw.so
libexec/sqlrelay/sqlrlogger_custom_sc.so
libexec/sqlrelay/sqlrlogger_debug.so
@@ -76,6 +80,8 @@ libexec/sqlrelay/sqlrpwdenc_md5.so
libexec/sqlrelay/sqlrpwdenc_rot.so
libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so
libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so
+libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so
+libexec/sqlrelay/sqlrtranslation_normalize.so
man/man1/sqlr-fields.1
man/man1/sqlr-query.1
man/man1/sqlrsh.1
@@ -325,6 +331,43 @@ share/doc/sqlrelay/api/java/resources/tab.gif
share/doc/sqlrelay/api/java/resources/titlebar.gif
share/doc/sqlrelay/api/java/resources/titlebar_end.gif
share/doc/sqlrelay/api/java/stylesheet.css
+share/doc/sqlrelay/api/nodejs/html/annotated.html
+share/doc/sqlrelay/api/nodejs/html/arrowdown.png
+share/doc/sqlrelay/api/nodejs/html/arrowright.png
+share/doc/sqlrelay/api/nodejs/html/bc_s.png
+share/doc/sqlrelay/api/nodejs/html/bdwn.png
+share/doc/sqlrelay/api/nodejs/html/class_s_q_l_r_connection-members.html
+share/doc/sqlrelay/api/nodejs/html/class_s_q_l_r_connection.html
+share/doc/sqlrelay/api/nodejs/html/class_s_q_l_r_cursor-members.html
+share/doc/sqlrelay/api/nodejs/html/class_s_q_l_r_cursor.html
+share/doc/sqlrelay/api/nodejs/html/classes.html
+share/doc/sqlrelay/api/nodejs/html/closed.png
+share/doc/sqlrelay/api/nodejs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/sqlrelay/api/nodejs/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html
+share/doc/sqlrelay/api/nodejs/html/dir_e0347da986b64b83ab9fe56dd33df350.html
+share/doc/sqlrelay/api/nodejs/html/doc.png
+share/doc/sqlrelay/api/nodejs/html/doxygen.css
+share/doc/sqlrelay/api/nodejs/html/doxygen.png
+share/doc/sqlrelay/api/nodejs/html/dynsections.js
+share/doc/sqlrelay/api/nodejs/html/folderclosed.png
+share/doc/sqlrelay/api/nodejs/html/folderopen.png
+share/doc/sqlrelay/api/nodejs/html/functions.html
+share/doc/sqlrelay/api/nodejs/html/functions_func.html
+share/doc/sqlrelay/api/nodejs/html/index.html
+share/doc/sqlrelay/api/nodejs/html/jquery.js
+share/doc/sqlrelay/api/nodejs/html/nav_f.png
+share/doc/sqlrelay/api/nodejs/html/nav_g.png
+share/doc/sqlrelay/api/nodejs/html/nav_h.png
+share/doc/sqlrelay/api/nodejs/html/open.png
+share/doc/sqlrelay/api/nodejs/html/splitbar.png
+share/doc/sqlrelay/api/nodejs/html/sqlrelay_8doc_8h_source.html
+share/doc/sqlrelay/api/nodejs/html/sync_off.png
+share/doc/sqlrelay/api/nodejs/html/sync_on.png
+share/doc/sqlrelay/api/nodejs/html/tab_a.png
+share/doc/sqlrelay/api/nodejs/html/tab_b.png
+share/doc/sqlrelay/api/nodejs/html/tab_h.png
+share/doc/sqlrelay/api/nodejs/html/tab_s.png
+share/doc/sqlrelay/api/nodejs/html/tabs.css
share/doc/sqlrelay/api/perl/Connection.html
share/doc/sqlrelay/api/perl/Cursor.html
share/doc/sqlrelay/api/perl/SQLRelay.html
@@ -531,6 +574,7 @@ share/doc/sqlrelay/features/languages.html
share/doc/sqlrelay/features/loadbalancing.html
share/doc/sqlrelay/features/multirowfetches.html
share/doc/sqlrelay/features/proxying.html
+share/doc/sqlrelay/features/queryfiltering.html
share/doc/sqlrelay/features/queryrouting.html
share/doc/sqlrelay/features/resultsetcaching.html
share/doc/sqlrelay/features/substitutionandbindvars.html
@@ -603,21 +647,25 @@ share/doc/sqlrelay/images/toomanyconnections.png
share/doc/sqlrelay/images/unixodbc.png
share/doc/sqlrelay/index.html
share/doc/sqlrelay/js/rotate.js
-share/doc/sqlrelay/modules/logger.html
-share/doc/sqlrelay/modules/passwordencryption.html
+share/doc/sqlrelay/modules/auths.html
+share/doc/sqlrelay/modules/filters.html
+share/doc/sqlrelay/modules/loggers.html
+share/doc/sqlrelay/modules/pwdencs.html
+share/doc/sqlrelay/modules/resultsettranslations.html
share/doc/sqlrelay/modules/sqlr-connection-oracletest-querylog.2899.html
share/doc/sqlrelay/modules/sqlr-connection.1871.html
share/doc/sqlrelay/modules/sqlr-listener.1869.html
share/doc/sqlrelay/modules/sqlr-listener.1886.html
+share/doc/sqlrelay/modules/translations.html
share/doc/sqlrelay/programming/ado.net.html
share/doc/sqlrelay/programming/binds.html
share/doc/sqlrelay/programming/c++.html
share/doc/sqlrelay/programming/c.html
share/doc/sqlrelay/programming/cs.html
share/doc/sqlrelay/programming/erlang.html
-share/doc/sqlrelay/programming/guide.html
share/doc/sqlrelay/programming/java.html
share/doc/sqlrelay/programming/jdbc.html
+share/doc/sqlrelay/programming/nodejs.html
share/doc/sqlrelay/programming/odbc.html
share/doc/sqlrelay/programming/perl.html
share/doc/sqlrelay/programming/perldbi.html
@@ -634,4 +682,4 @@ share/examples/sqlrelay/sqlrelay.conf
share/examples/sqlrelay/sqlrelay.conf.example
share/examples/sqlrelay/sqlrelay.dtd
share/examples/sqlrelay/sqlrelay.xsd
-@pkgdir etc/sqlrelay/sqlrelay.conf.d
+share/licenses/sqlrelay/COPYING
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index 7f78355ec92..465d8184b9b 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.15 2015/07/05 12:52:39 joerg Exp $
+$NetBSD: distinfo,v 1.16 2015/09/02 12:39:33 fhajny Exp $
-SHA1 (sqlrelay-0.59.tar.gz) = 0d89f1cfff4c929297f92a575bfdae43d0b7affa
-RMD160 (sqlrelay-0.59.tar.gz) = a0731c80048f280b71ec1dcb89bedad2b5145348
-Size (sqlrelay-0.59.tar.gz) = 3224000 bytes
+SHA1 (sqlrelay-0.63.tar.gz) = b71f8967269fee4bd7b0e50699276f2f01ee2a5a
+RMD160 (sqlrelay-0.63.tar.gz) = 381311a698a70e96aa92dfecf4910dc942e4a3fb
+Size (sqlrelay-0.63.tar.gz) = 3422788 bytes
SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609
-SHA1 (patch-config.mk.in) = 3ac1d68eec9e71b2827a675549dc873be9a56741
-SHA1 (patch-configure) = cd7598c42a3d12c3ac4874d07cfe679b3dc24b2c
+SHA1 (patch-config.mk.in) = 297ac15bc1d59bdff7236107df8b5ad7b03737e5
+SHA1 (patch-configure) = 29bc9087fc814d0879c99b2772632a3034bec502
SHA1 (patch-etc_Makefile) = 128102a3eaaeba96425060f82dc8e5e94edeabd0
SHA1 (patch-src_api_php_sql__relay.cpp) = d589837f05e86d614bc3b71bc0459ae786193d88
-SHA1 (patch-src_api_ruby_getcflags.rb) = a08e18e15cf8b7e7aff4b50d3927d7c352ec15c3
-SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 89d1bee15077d009a8e9b3b98443dcc667a583da
+SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee
+SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 603c66ed45f854b833eefbcdbd58e41465fb8120
SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9
diff --git a/databases/sqlrelay/patches/patch-config.mk.in b/databases/sqlrelay/patches/patch-config.mk.in
index 44280131a5e..7e3126e2d38 100644
--- a/databases/sqlrelay/patches/patch-config.mk.in
+++ b/databases/sqlrelay/patches/patch-config.mk.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-config.mk.in,v 1.1 2015/05/20 13:26:45 ryoon Exp $
+$NetBSD: patch-config.mk.in,v 1.2 2015/09/02 12:39:33 fhajny Exp $
---- config.mk.in.orig 2015-04-18 05:29:10.000000000 +0000
+--- config.mk.in.orig 2015-08-24 07:39:39.000000000 +0000
+++ config.mk.in
-@@ -778,7 +778,7 @@ MODULERENAME = $(top_builddir)/moduleren
+@@ -861,7 +861,7 @@ MODULERENAME = $(top_builddir)/moduleren
# build directories
--INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-pkgconfig
-+INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-pkgconfig
- UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-pkgconfig
+-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-license install-pkgconfig
++INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-license install-pkgconfig
+ UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-license uninstall-pkgconfig
ifeq ($(SQLRELAY_ENABLE_SHARED),yes)
diff --git a/databases/sqlrelay/patches/patch-configure b/databases/sqlrelay/patches/patch-configure
index 78f432b93d2..1a0e12f4c03 100644
--- a/databases/sqlrelay/patches/patch-configure
+++ b/databases/sqlrelay/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.3 2015/05/20 13:26:45 ryoon Exp $
+$NetBSD: patch-configure,v 1.4 2015/09/02 12:39:33 fhajny Exp $
Look for history/readline at proper places.
---- configure.orig 2015-04-08 22:16:40.000000000 +0000
+--- configure.orig 2015-08-16 02:25:15.000000000 +0000
+++ configure
-@@ -17567,7 +17567,7 @@ fi
+@@ -17662,7 +17662,7 @@ fi
$as_echo_n "checking for history... " >&6; }
@@ -12,7 +12,7 @@ Look for history/readline at proper places.
NAME=history
HEADER=readline/history.h
LIBNAME=history
-@@ -17903,7 +17903,7 @@ fi
+@@ -17998,7 +17998,7 @@ fi
$as_echo_n "checking for readline... " >&6; }
@@ -21,7 +21,7 @@ Look for history/readline at proper places.
NAME=readline
HEADER=readline/readline.h
LIBNAME=readline
-@@ -18511,7 +18511,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -18606,7 +18606,7 @@ rm -f core conftest.err conftest.$ac_obj
@@ -30,12 +30,12 @@ Look for history/readline at proper places.
NAME=iconv
HEADER=iconv.h
LIBNAME=iconv
-@@ -32389,7 +32389,7 @@ print "arch = "
- print CONFIG["arch"]
+@@ -33144,7 +33144,7 @@ print CONFIG["arch"]
print "\n"
print "ruby_version = "
+ begin
-print Config::CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
- print "\n"
- print "prefix = "
- print CONFIG["prefix"].sub(drive, "")
+ rescue
+ print CONFIG["ruby_version"]
+ end
diff --git a/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb b/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb
index b299156ac6f..dd1279c2379 100644
--- a/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb
+++ b/databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb
@@ -1,31 +1,15 @@
-$NetBSD: patch-src_api_ruby_getcflags.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $
+$NetBSD: patch-src_api_ruby_getcflags.rb,v 1.2 2015/09/02 12:39:33 fhajny Exp $
* Fix Ruby 2.2 build.
---- src/api/ruby/getcflags.rb.orig 2011-07-16 00:49:53.000000000 +0000
+--- src/api/ruby/getcflags.rb.orig 2015-08-15 01:50:31.000000000 +0000
+++ src/api/ruby/getcflags.rb
-@@ -6,19 +6,19 @@ require "mkmf"
- drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
- print "\n"
- print "arch = "
--print CONFIG["arch"]
-+print RbConfig::CONFIG["arch"]
- print "\n"
- print "sitearch = "
--print CONFIG["sitearch"]
-+print RbConfig::CONFIG["sitearch"]
+@@ -10,7 +10,7 @@ print CONFIG["sitearch"]
print "\n"
print "ruby_version = "
+ begin
-print Config::CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
- print "\n"
- print "prefix = "
--print CONFIG["prefix"].sub(drive, "")
-+print RbConfig::CONFIG["prefix"].sub(drive, "")
- print "\n"
- print "exec_prefix = "
--print CONFIG["exec_prefix"].sub(drive, "")
-+print RbConfig::CONFIG["exec_prefix"].sub(drive, "")
- print "\n"
- print "libdir = "
- print $libdir.sub(drive, "")
+ rescue
+ print CONFIG["ruby_version"]
+ end
diff --git a/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb b/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb
index c75105e2473..dc188f5b9e9 100644
--- a/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb
+++ b/databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $
+$NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.2 2015/09/02 12:39:33 fhajny Exp $
* Fix Ruby 2.2 build.
---- src/api/ruby/getsitearchdir.rb.orig 2015-04-09 01:48:10.000000000 +0000
+--- src/api/ruby/getsitearchdir.rb.orig 2015-08-15 00:27:59.000000000 +0000
+++ src/api/ruby/getsitearchdir.rb
-@@ -1,19 +1,19 @@
+@@ -1,35 +1,35 @@
require "mkmf"
drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
print "arch = "
@@ -16,8 +16,13 @@ $NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Ex
+print RbConfig::CONFIG["sitearch"]
print "\n"
print "ruby_version = "
+ begin
-print Config::CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
+ rescue
+-print CONFIG["ruby_version"]
++print RbConfig::CONFIG["ruby_version"]
+ end
print "\n"
print "prefix = "
-print CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","")
@@ -29,3 +34,19 @@ $NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Ex
print "\n"
print "libdir = "
print $libdir.sub(drive, "").sub("$(DESTDIR)","")
+ print "\n"
+-if CONFIG["RUBY_BASE_NAME"]!=nil then
++if RbConfig::CONFIG["RUBY_BASE_NAME"]!=nil then
+ print "RUBY_BASE_NAME = "
+- print CONFIG["RUBY_BASE_NAME"]
++ print RbConfig::CONFIG["RUBY_BASE_NAME"]
+ print "\n"
+ end
+-if CONFIG["rubylibprefix"]!=nil then
++if RbConfig::CONFIG["rubylibprefix"]!=nil then
+ print "rubylibprefix = "
+- print CONFIG["rubylibprefix"].sub(drive, "").sub("$(DESTDIR)","")
++ print RbConfig::CONFIG["rubylibprefix"].sub(drive, "").sub("$(DESTDIR)","")
+ print "\n"
+ end
+ print "rubylibdir = "