pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases
Module Name: pkgsrc
Committed By: adam
Date: Sat Dec 3 15:53:41 UTC 2022
Modified Files:
pkgsrc/databases/p5-sqlrelay: Makefile
pkgsrc/databases/php-sqlrelay: Makefile
pkgsrc/databases/py-sqlrelay: Makefile
pkgsrc/databases/ruby-sqlrelay: Makefile
pkgsrc/databases/sqlrelay: Makefile Makefile.common distinfo
pkgsrc/databases/sqlrelay-freetds: Makefile
pkgsrc/databases/sqlrelay-mysql: Makefile
pkgsrc/databases/sqlrelay-nodejs: Makefile
pkgsrc/databases/sqlrelay-odbc: Makefile
pkgsrc/databases/sqlrelay-pgsql: Makefile
pkgsrc/databases/sqlrelay-sqlite: Makefile
pkgsrc/databases/sqlrelay/patches: patch-configure
Removed Files:
pkgsrc/databases/sqlrelay/patches: patch-src_api_php_sql__relay.cpp
patch-src_api_ruby_sqlrelay.cpp
Log Message:
sqlrelay: updated to 1.9.3
1.9.3 - added some missing SQLGetInfo() attributes to the ODBC driver
backported fixes for PHP 8
backported support for Oracle 18 and 19
backported a fix for some missing map clears in postgresql protocol
module
backported a fix for NULL-binds in the ODBC driver
backported -fdeclspec configure test for ruby with clang
backported a postgresql isnull fix
backported patch from Kyle to use HH24 instead of HH in default
fakeinputbindvariablesdateformat string
backported mysql connection segfault fix
disabled PQsendQueryPrepared/PQsetSingleRowMode to fix nested query
bug with postgresql
backported postgresql noRowsToReturn fix
1.9.2 - ruby cursor constructor marks associated ruby connection object now
updated bad-command and no-cursor-available handling in sqlrclient
protocol module
fixed a subtle bug that could cause closeResultSet()/clearError() not
to be called between reexecutes if the previous execute resulted
in an error
backported support for password files in userlist auth modules
1.9.1 - fixed some missing map clears in postgresql protocol module
fixed NULL-bind in the ODBC driver
1.9.0 - added missing inequality operators to end-of-bind detection
fixed commit/begin without commitcount error in sqlrimportcsv
fetch errors aren't returned if sqlrclient protocol version < 2
query-intercept catches "begin transaction" now
query-intercept doesn't intercept various begin-type statements if the
query is actually a block of sql containing commit or rollback
added ncharencoding option to odbc connection to enable UTF-16 values
in SQL Server nchars/nvarchars
fixed a bug that caused output binds of length 8000+ to fail on
SQL Server
begin() runs "begin transaction" instead of just "begin" on SQL Server
fixed a column-count reset bug in odbc, db2, informix, and postgresql
that could cause begin queries to fail when fake transaction
blocks are used
object lists have correct column names for mysql, odbc, and jdbc now
fixed a bug that caused rollback to be called insted of commit when
endofsession="commit" and faketransactionblocks=yes are used
commit/rollback is now called at the end of session when
faketransactoinblocks=yes is used, whether or not the server
believes it's in a transaction block, to catch cases where the
begin-interceptor is intentionally bypassed
sqlrimportcsv handles dates without centuries now
fixed crash in replay module when table name is quoted
mysql explain statements work now
fixed node-gyp.js detection on ubuntu 20.04
added configure options for PHP 8.x
added php/pdo module tweaks for PHP 8
mysql and postgresql protocol modules support TLS now
pushed most of tls/gss code up into sqlrprotocol parent class
fixed subtle issues in mysql/postgresql database modules that could
sometimes cause reexecutes of the same query with the same
bind variables to return no results the second time
the configure script specifically looks for liberl_interface.a now
updated nodejs macros for node 14+
fixed subtle bugs in Python getField, getFieldLength, and
getRowLengthsDictionary functions
added GVL management to the Ruby API
applied patch from Igor to fix configure.vbs VC++ version detection
for non-US versions
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/databases/p5-sqlrelay/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/php-sqlrelay/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/py-sqlrelay/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/ruby-sqlrelay/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/databases/sqlrelay/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/sqlrelay/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/sqlrelay/distinfo
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/sqlrelay-freetds/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/sqlrelay-mysql/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/sqlrelay-nodejs/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/sqlrelay-odbc/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/sqlrelay-pgsql/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/databases/sqlrelay-sqlite/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/sqlrelay/patches/patch-configure
cvs rdiff -u -r1.4 -r0 \
pkgsrc/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
cvs rdiff -u -r1.1 -r0 \
pkgsrc/databases/sqlrelay/patches/patch-src_api_ruby_sqlrelay.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/p5-sqlrelay/Makefile
diff -u pkgsrc/databases/p5-sqlrelay/Makefile:1.39 pkgsrc/databases/p5-sqlrelay/Makefile:1.40
--- pkgsrc/databases/p5-sqlrelay/Makefile:1.39 Wed Oct 26 10:31:18 2022
+++ pkgsrc/databases/p5-sqlrelay/Makefile Sat Dec 3 15:53:39 2022
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.39 2022/10/26 10:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/12/03 15:53:39 adam Exp $
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 6
COMMENT= Perl module for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
LICENSE= artistic
-USE_TOOLS+= perl
+USE_TOOLS+= gmake perl
CONFIGURE_ARGS+= --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR}
CONFIGURE_ARGS+= --with-perl-prefix=${BUILDLINK_PREFIX.perl}
CONFIGURE_ARGS+= --with-perl-site-arch=${PERL5_INSTALLVENDORARCH}
CONFIGURE_ARGS+= --with-perl-site-lib=${PERL5_INSTALLVENDORLIB}
-LIBS+= -lperl -L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
+LDFLAGS+= -L${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/CORE
BUILD_DIRS= src/api/perl
Index: pkgsrc/databases/php-sqlrelay/Makefile
diff -u pkgsrc/databases/php-sqlrelay/Makefile:1.36 pkgsrc/databases/php-sqlrelay/Makefile:1.37
--- pkgsrc/databases/php-sqlrelay/Makefile:1.36 Wed Oct 26 10:31:19 2022
+++ pkgsrc/databases/php-sqlrelay/Makefile Sat Dec 3 15:53:40 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2022/10/26 10:31:19 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2022/12/03 15:53:40 adam Exp $
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION= 6
COMMENT= PHP extension for SQL Relay
EXTRACT_SUFX= .tar.gz
Index: pkgsrc/databases/py-sqlrelay/Makefile
diff -u pkgsrc/databases/py-sqlrelay/Makefile:1.35 pkgsrc/databases/py-sqlrelay/Makefile:1.36
--- pkgsrc/databases/py-sqlrelay/Makefile:1.35 Wed Oct 26 10:31:19 2022
+++ pkgsrc/databases/py-sqlrelay/Makefile Sat Dec 3 15:53:40 2022
@@ -1,25 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2022/10/26 10:31:19 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2022/12/03 15:53:40 adam Exp $
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 6
COMMENT= Python extension for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
LICENSE= modified-bsd
-# TODO: switch to PYTHON_VERSIONS_INCOMPATIBLE
-#PYTHON_VERSIONS_ACCEPTED= 37 27 # 37 fails as of 1.0.0
-
-.include "../../lang/python/pyversion.mk"
-
CONFIGURE_ARGS+= --disable-perl
-
-#.if ${_PYTHON_VERSION} == 27
-#CONFIGURE_ARGS+= --disable-python3
-#.else
-#CONFIGURE_ARGS+= --disable-python
-#.endif
CONFIGURE_ARGS+= --with-python-prefix=${PREFIX}
CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX}
@@ -27,6 +15,8 @@ BUILD_DIRS= src/api/python
PY_PATCHPLIST= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../databases/sqlrelay/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/ruby-sqlrelay/Makefile
diff -u pkgsrc/databases/ruby-sqlrelay/Makefile:1.31 pkgsrc/databases/ruby-sqlrelay/Makefile:1.32
--- pkgsrc/databases/ruby-sqlrelay/Makefile:1.31 Wed Oct 26 10:31:20 2022
+++ pkgsrc/databases/ruby-sqlrelay/Makefile Sat Dec 3 15:53:40 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2022/10/26 10:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2022/12/03 15:53:40 adam Exp $
COMMENT= Ruby extension for SQL Relay
-PKGREVISION= 6
.include "../../databases/sqlrelay/Makefile.common"
Index: pkgsrc/databases/sqlrelay/Makefile
diff -u pkgsrc/databases/sqlrelay/Makefile:1.76 pkgsrc/databases/sqlrelay/Makefile:1.77
--- pkgsrc/databases/sqlrelay/Makefile:1.76 Wed Oct 26 10:31:01 2022
+++ pkgsrc/databases/sqlrelay/Makefile Sat Dec 3 15:53:40 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2022/10/26 10:31:01 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2022/12/03 15:53:40 adam Exp $
COMMENT= Database connection pooling middleware and API
-PKGREVISION= 6
.include "../../databases/sqlrelay/Makefile.common"
@@ -26,6 +25,8 @@ CONFIGURE_ARGS+= --disable-sqlite
CONFIGURE_ARGS+= --disable-sap
CONFIGURE_ARGS+= --disable-tcl
+MAKE_JOBS_SAFE= no
+
INSTALL_MAKE_FLAGS+= EXAMPLEDIR=${DESTDIR}${EGDIR}
CONF_FILES+= ${EGDIR}/sqlrelay.conf ${PKG_SYSCONFDIR}/sqlrelay.conf
Index: pkgsrc/databases/sqlrelay/Makefile.common
diff -u pkgsrc/databases/sqlrelay/Makefile.common:1.23 pkgsrc/databases/sqlrelay/Makefile.common:1.24
--- pkgsrc/databases/sqlrelay/Makefile.common:1.23 Wed Feb 17 18:29:09 2021
+++ pkgsrc/databases/sqlrelay/Makefile.common Sat Dec 3 15:53:40 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2021/02/17 18:29:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2022/12/03 15:53:40 adam Exp $
# used by databases/p5-sqlrelay/Makefile
# used by databases/php-sqlrelay/Makefile
# used by databases/py-sqlrelay/Makefile
@@ -11,7 +11,7 @@
# used by databases/sqlrelay-sqlite/Makefile
# used by databases/sqlrelay/Makefile
-DISTNAME= sqlrelay-1.8.0
+DISTNAME= sqlrelay-1.9.3
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
@@ -19,18 +19,15 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://sqlrelay.sourceforge.net/
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LANGUAGES= c c++11
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-BUILD_DEFS+= VARBASE
-MAKE_JOBS_SAFE= no
-
-DESCR_SRC= ${.CURDIR}/../../databases/sqlrelay/DESCR
-DISTINFO_FILE= ${.CURDIR}/../../databases/sqlrelay/distinfo
-PATCHDIR= ${.CURDIR}/../../databases/sqlrelay/patches
+USE_LANGUAGES= c c++11
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+BUILD_DEFS+= VARBASE
+
+DESCR_SRC= ${.CURDIR}/../../databases/sqlrelay/DESCR
+DISTINFO_FILE= ${.CURDIR}/../../databases/sqlrelay/distinfo
+PATCHDIR= ${.CURDIR}/../../databases/sqlrelay/patches
CONFIGURE_ARGS+= --disable-werror
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
Index: pkgsrc/databases/sqlrelay/distinfo
diff -u pkgsrc/databases/sqlrelay/distinfo:1.29 pkgsrc/databases/sqlrelay/distinfo:1.30
--- pkgsrc/databases/sqlrelay/distinfo:1.29 Tue Oct 26 10:10:06 2021
+++ pkgsrc/databases/sqlrelay/distinfo Sat Dec 3 15:53:40 2022
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.29 2021/10/26 10:10:06 nia Exp $
+$NetBSD: distinfo,v 1.30 2022/12/03 15:53:40 adam Exp $
-BLAKE2s (sqlrelay-1.8.0.tar.gz) = 71c3255b7a1876adc5d97578a0f7ec3c58107b9158ada13e892a9a67385b0a0c
-SHA512 (sqlrelay-1.8.0.tar.gz) = cfb430f1eb9de4c8dd5c4ee4a89a1c04ba2449cc302155bbf115cd8b50933f7fb690395cb394ce01bfb8e7d83b79168f898baafd1169383ecdfd961347679561
-Size (sqlrelay-1.8.0.tar.gz) = 4684135 bytes
+BLAKE2s (sqlrelay-1.9.3.tar.gz) = 59f17e57399d0324b09c9c2dc3affa0ee19e286abd2bb77f18019d72aa41925f
+SHA512 (sqlrelay-1.9.3.tar.gz) = ad80a7be56ed5ca6eaa2ac97986c2e64ab61ad3ec895d76a3fee2d865e856877a319e16cf996ff92072249b170f2611295d9f8777c8d10c80d6eb6ab7add97e3
+Size (sqlrelay-1.9.3.tar.gz) = 4903142 bytes
SHA1 (patch-Makefile) = 4005ca28daec0180fe298f711b22b3d8dcf02a9a
SHA1 (patch-config.mk.in) = 172f04e655d31705b107f0889d86c48db9e0919a
-SHA1 (patch-configure) = c4c00878bb377ffaed4ec3268956e6be825b7324
+SHA1 (patch-configure) = b00b596b6c0a8353c0aaff8503bc80e3f17febb0
SHA1 (patch-etc_Makefile) = 5c768f50a97489ea06ca586b131ef0324878f8d0
SHA1 (patch-src_api_nodejs_Makefile) = 6f0e569f25fd1e78e088b8e0cd8eb541c2c5d417
SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e
-SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee
SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 603c66ed45f854b833eefbcdbd58e41465fb8120
SHA1 (patch-src_api_ruby_rubyincludes1.h) = 7b06afbbdfc4d0ab4fd1288336eea795f4e1bce7
-SHA1 (patch-src_api_ruby_sqlrelay.cpp) = 3081ffd0e2a373c14e6dd602728f72a1dfb6461b
Index: pkgsrc/databases/sqlrelay-freetds/Makefile
diff -u pkgsrc/databases/sqlrelay-freetds/Makefile:1.36 pkgsrc/databases/sqlrelay-freetds/Makefile:1.37
--- pkgsrc/databases/sqlrelay-freetds/Makefile:1.36 Wed Oct 26 10:31:20 2022
+++ pkgsrc/databases/sqlrelay-freetds/Makefile Sat Dec 3 15:53:40 2022
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.36 2022/10/26 10:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2022/12/03 15:53:40 adam Exp $
PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-freetds/}
-PKGREVISION= 6
COMMENT= FreeTDS support for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
+CONFIGURE_ARGS+= --disable-mysql
+CONFIGURE_ARGS+= --disable-odbc
CONFIGURE_ARGS+= --disable-perl
-CONFIGURE_ARGS+= --with-freetds-prefix=${BUILDLINK_PREFIX.freetds}
CONFIGURE_ARGS+= --disable-postgresql
CONFIGURE_ARGS+= --disable-sqlite
-CONFIGURE_ARGS+= --disable-mysql
-CONFIGURE_ARGS+= --disable-odbc
+CONFIGURE_ARGS+= --with-freetds-prefix=${BUILDLINK_PREFIX.freetds}
BUILD_DIRS= src/connections
Index: pkgsrc/databases/sqlrelay-mysql/Makefile
diff -u pkgsrc/databases/sqlrelay-mysql/Makefile:1.32 pkgsrc/databases/sqlrelay-mysql/Makefile:1.33
--- pkgsrc/databases/sqlrelay-mysql/Makefile:1.32 Wed Oct 26 10:31:20 2022
+++ pkgsrc/databases/sqlrelay-mysql/Makefile Sat Dec 3 15:53:40 2022
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.32 2022/10/26 10:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2022/12/03 15:53:40 adam Exp $
PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-mysql/}
-PKGREVISION= 7
COMMENT= MySQL support for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
LICENSE= gnu-gpl-v2
-CONFIGURE_ARGS+= --with-mysql-prefix=${BUILDLINK_PREFIX.mysql-client}
-CONFIGURE_ARGS+= --disable-postgresql
-CONFIGURE_ARGS+= --disable-sqlite
CONFIGURE_ARGS+= --disable-freetds
CONFIGURE_ARGS+= --disable-odbc
CONFIGURE_ARGS+= --disable-perl
+CONFIGURE_ARGS+= --disable-postgresql
+CONFIGURE_ARGS+= --disable-sqlite
+CONFIGURE_ARGS+= --with-mysql-prefix=${BUILDLINK_PREFIX.mysql-client}
BUILD_DIRS= src/connections
Index: pkgsrc/databases/sqlrelay-nodejs/Makefile
diff -u pkgsrc/databases/sqlrelay-nodejs/Makefile:1.34 pkgsrc/databases/sqlrelay-nodejs/Makefile:1.35
--- pkgsrc/databases/sqlrelay-nodejs/Makefile:1.34 Wed Oct 26 10:31:20 2022
+++ pkgsrc/databases/sqlrelay-nodejs/Makefile Sat Dec 3 15:53:41 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2022/10/26 10:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2022/12/03 15:53:41 adam Exp $
PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-nodejs/}
-PKGREVISION= 4
COMMENT= node.js API for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
@@ -13,8 +12,6 @@ LICENSE= gnu-lgpl-v2
BUILD_DEPENDS+= npm-[0-9]*:../../lang/npm
DEPENDS+= http-parser-[0-9]*:../../www/http-parser
-NODE_VERSIONS_ACCEPTED= 12 10
-
CONFIGURE_ARGS+= --with-nodejs-prefix=${BUILDLINK_PREFIX.nodejs}
CONFIGURE_ARGS+= --disable-postgresql
CONFIGURE_ARGS+= --disable-sqlite
Index: pkgsrc/databases/sqlrelay-odbc/Makefile
diff -u pkgsrc/databases/sqlrelay-odbc/Makefile:1.35 pkgsrc/databases/sqlrelay-odbc/Makefile:1.36
--- pkgsrc/databases/sqlrelay-odbc/Makefile:1.35 Wed Oct 26 10:31:20 2022
+++ pkgsrc/databases/sqlrelay-odbc/Makefile Sat Dec 3 15:53:41 2022
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.35 2022/10/26 10:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2022/12/03 15:53:41 adam Exp $
PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-odbc/}
-PKGREVISION= 6
COMMENT= ODBC support for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
LICENSE= gnu-lgpl-v2
-CONFIGURE_ARGS+= --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc}
CONFIGURE_ARGS+= --disable-freetds
CONFIGURE_ARGS+= --disable-mysql
CONFIGURE_ARGS+= --disable-perl
CONFIGURE_ARGS+= --disable-postgresql
CONFIGURE_ARGS+= --disable-sqlite
+CONFIGURE_ARGS+= --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc}
BUILD_DIRS= src/connections
Index: pkgsrc/databases/sqlrelay-pgsql/Makefile
diff -u pkgsrc/databases/sqlrelay-pgsql/Makefile:1.32 pkgsrc/databases/sqlrelay-pgsql/Makefile:1.33
--- pkgsrc/databases/sqlrelay-pgsql/Makefile:1.32 Wed Oct 26 10:31:20 2022
+++ pkgsrc/databases/sqlrelay-pgsql/Makefile Sat Dec 3 15:53:41 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2022/10/26 10:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2022/12/03 15:53:41 adam Exp $
PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-pgsql/}
-PKGREVISION= 6
COMMENT= PostgreSQL support for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
Index: pkgsrc/databases/sqlrelay-sqlite/Makefile
diff -u pkgsrc/databases/sqlrelay-sqlite/Makefile:1.49 pkgsrc/databases/sqlrelay-sqlite/Makefile:1.50
--- pkgsrc/databases/sqlrelay-sqlite/Makefile:1.49 Wed Nov 23 16:19:44 2022
+++ pkgsrc/databases/sqlrelay-sqlite/Makefile Sat Dec 3 15:53:41 2022
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.49 2022/11/23 16:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.50 2022/12/03 15:53:41 adam Exp $
PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-sqlite/}
-PKGREVISION= 9
COMMENT= SQLite support for SQL Relay
.include "../../databases/sqlrelay/Makefile.common"
-CONFIGURE_ARGS+= --with-sqlite-prefix=${BUILDLINK_PREFIX.sqlite3}
# Configure never does this correctly
CXXFLAGS+= -DSQLITE3=1
-CONFIGURE_ARGS+= --disable-postgresql
-CONFIGURE_ARGS+= --disable-mysql
CONFIGURE_ARGS+= --disable-freetds
+CONFIGURE_ARGS+= --disable-mysql
CONFIGURE_ARGS+= --disable-odbc
CONFIGURE_ARGS+= --disable-perl
+CONFIGURE_ARGS+= --disable-postgresql
+CONFIGURE_ARGS+= --with-sqlite-prefix=${BUILDLINK_PREFIX.sqlite3}
BUILD_DIRS= src/connections
Index: pkgsrc/databases/sqlrelay/patches/patch-configure
diff -u pkgsrc/databases/sqlrelay/patches/patch-configure:1.9 pkgsrc/databases/sqlrelay/patches/patch-configure:1.10
--- pkgsrc/databases/sqlrelay/patches/patch-configure:1.9 Mon Mar 1 14:39:01 2021
+++ pkgsrc/databases/sqlrelay/patches/patch-configure Sat Dec 3 15:53:40 2022
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.9 2021/03/01 14:39:01 taca Exp $
+$NetBSD: patch-configure,v 1.10 2022/12/03 15:53:40 adam Exp $
Cripple iODBC check, we're using UnixODBC and it was getting in the way.
Fix Perl lookup.
Fix Python lookup.
Fix Ruby support.
---- configure.orig 2020-08-26 04:30:07.000000000 +0000
+--- configure.orig 2022-08-09 14:57:21.000000000 +0000
+++ configure
-@@ -28135,7 +28135,7 @@ fi
+@@ -28286,7 +28286,7 @@ fi
@@ -16,7 +16,7 @@ Fix Ruby support.
NAME=iodbc
HEADER=sql.h
LIBNAME=iodbc
-@@ -33961,7 +33961,7 @@ fi
+@@ -34112,7 +34112,7 @@ fi
if ( test -z "$PERL" )
then
@@ -25,239 +25,67 @@ Fix Ruby support.
do
if ( test -d "$i" )
then
-@@ -34149,10 +34149,10 @@ then
+@@ -34300,52 +34300,10 @@ then
pyext=""
-- for pyversion in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0" "2.9" "2.8" "2.7" "2.6" "2.5" "2.4" "2.3" "2.2" "2.1"
+- for pyversion in \
+- "3.20" \
+- "3.19" \
+- "3.18" \
+- "3.17" \
+- "3.16" \
+- "3.15" \
+- "3.14" \
+- "3.13" \
+- "3.12" \
+- "3.11" \
+- "3.10" \
+- "3.9" \
+- "3.8" \
+- "3.7" \
+- "3.6" \
+- "3.5" \
+- "3.4" \
+- "3.3" \
+- "3.2" \
+- "3.1" \
+- "3.0" \
+- "2.9" \
+- "2.8" \
+- "2.7" \
+- "2.6" \
+- "2.5" \
+- "2.4" \
+- "2.3" \
+- "2.2" \
+- "2.1"
+ for pyversion in "${PYVERSSUFFIX}"
do
-- for pyprefix in "$PYTHONPATH" "/usr" "/usr/local" "/usr/pkg" "/usr/local/python$pyversion" "/opt/sfw" "/usr/sfw" "/opt/csw" "/sw"
"/System/Library/Frameworks/Python.framework/Versions/Current" "/boot/common"
+- for pyprefix in \
+- "$PYTHONPATH" \
+- "/usr" \
+- "/usr/local" \
+- "/usr/pkg" \
+- "/usr/local/python$pyversion" \
+- "/opt/sfw" \
+- "/usr/sfw" \
+- "/opt/csw" \
+- "/sw" \
+- "/usr/freeware" \
+- "/System/Library/Frameworks/Python.framework/Versions/Current" \
+- "/boot/common"
+ for pyprefix in "${PREFIX}"
do
if ( test -n "$pyprefix" )
-@@ -34328,219 +34328,9 @@ echo "***** Ruby *******************"
+@@ -34570,7 +34528,7 @@ echo "******************************"
+ echo
+ echo "***** Ruby *******************"
- if ( test "$ENABLE_RUBY" = "yes" )
+-if ( test "$ENABLE_RUBY" = "yes" )
++if ( false )
then
--
-- HAVE_RUBY=""
-- RUBY=""
-- RUBYLIB=""
--
-- if ( test "$cross_compiling" = "yes" )
-- then
--
-- echo "cross compiling..."
--
-- else
--
-- found="no"
--
-- for major in "" "1" "2"
-- do
--
-- for minor in "" "9" "8" "7" "6" "5" "4" "3" "2" "1" "0"
-- do
--
-- for patchlevel in "" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9"
-- do
--
-- for separator in "" "."
-- do
--
-- ruby="ruby$major$separator$minor"
-- if ( test -n "$patchlevel" )
-- then
-- ruby="ruby$major$separator$minor$separator$patchlevel"
-- fi
--
-- HAVE_RUBY=""
-- RUBY=""
-- RUBYLIB=""
--
-- if ( test -n "$RUBYPATH" )
-- then
--
--if ( test -r ""$RUBYPATH/bin/$ruby"" )
--then
-- eval "RUBY=\"$RUBYPATH/bin/$ruby\""
--fi
--
-- else
-- # Extract the first word of ""$ruby"", so it can be a program name with args.
--set dummy "$ruby"; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_RUBY+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$RUBY"; then
-- ac_cv_prog_RUBY="$RUBY" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_RUBY=""$ruby""
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
--fi
--fi
--RUBY=$ac_cv_prog_RUBY
--if test -n "$RUBY"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
--$as_echo "$RUBY" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- if ( test -z "$RUBY" )
-- then
-- for i in "/usr/local/ruby/bin" "/usr/bin" "/usr/local/bin" "/usr/pkg/bin" "/opt/sfw/bin" "/usr/sfw/bin" "/opt/csw/bin" "/sw/bin" "/boot/common/bin"
"/resources/index/bin"
-- do
--
--if ( test -r ""$i/$ruby"" )
--then
-- eval "RUBY=\"$i/$ruby\""
--fi
--
-- if ( test -n "$RUBY" )
-- then
-- found="yes"
-- break
-- fi
-- done
-- fi
-- fi
--
-- if ( test -n "$RUBY" )
-- then
-- HAVE_RUBY="yes"
-- if ( test -n "$CYGWIN" -o -n "$DARWIN" )
-- then
-- RUBYLIB="-lruby"
-- fi
-- found="yes"
-- break
-- fi
-- if ( test -z "$major" -o -z "$minor" -o -z "$patchlevel" )
-- then
-- break
-- fi
--
-- done
-- if ( test "$found" = "yes" )
-- then
-- break
-- fi
-- if ( test -z "$minor" )
-- then
-- break
-- fi
-- done
-- if ( test "$found" = "yes" )
-- then
-- break
-- fi
-- if ( test -z "$major" )
-- then
-- break
-- fi
-- done
-- if ( test "$found" = "yes" )
-- then
-- break
-- fi
-- done
--
-- if ( test -n "$HAVE_RUBY" )
-- then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby.h" >&5
--$as_echo_n "checking for ruby.h... " >&6; }
-- rm -f conftest.rb
-- cat > conftest.rb << END
--require "mkmf"
--drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
--print "\n"
--print "arch = "
--print CONFIG["arch"]
--print "\n"
--print "ruby_version = "
--begin
--print Config::CONFIG["ruby_version"]
--rescue
--print CONFIG["ruby_version"]
--end
--print "\n"
--print "prefix = "
--print CONFIG["prefix"].sub(drive, "")
--print "\n"
--print "exec_prefix = "
--print CONFIG["exec_prefix"].sub(drive, "")
--print "\n"
--print "libdir = "
--print \$libdir.sub(drive, "")
--print "\n"
--print "rubylibdir = "
--print \$rubylibdir.sub(drive, "")
--print "\n"
--print "topdir = "
--print \$topdir
--print "\n"
--print "hdrdir = "
--print \$hdrdir
--print "\n\n"
--print "all:\n"
--print " echo \$(hdrdir)\n"
--END
--
-- HAVE_RUBY_H=""
-- for dir in `eval $RUBY conftest.rb 2>/dev/null | sed -e "s|-x.* | |g" -e "s|-belf||g" -e "s|-mtune=.* | |g" | $MAKE -s -f - | grep -v Entering | grep -v Leaving`
-- do
-- if ( test -r "$dir/ruby.h" )
-- then
-- HAVE_RUBY_H="yes"
-- fi
-- done
-- rm -f conftest.rb
--
-- if ( test -z "$HAVE_RUBY_H" )
-- then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- HAVE_RUBY=""
-- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-- fi
-- fi
-- fi
--
-- if ( test -z "$HAVE_RUBY" )
-- then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The Ruby API will not be built." >&5
--$as_echo "$as_me: WARNING: The Ruby API will not be built." >&2;}
-- fi
--
--
--
--
-+ HAVE_RUBY=yes
-+ RUBY="${RUBY}"
-+ RUBYLIB="-l$(${RUBY} -e 'require "mkmf"; puts RbConfig::CONFIG["RUBY_SO_NAME"]')"
- fi
- echo "******************************"
+ HAVE_RUBY=""
Home |
Main Index |
Thread Index |
Old Index