kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to version 0.9.0 of libdbi-drivers to go with the same version of

Browse source 
libdbi.  This drops support for msgl, sqlite2, firebird and freetds. [1]

Use DISTVERSION in MASTER_SITE instead of duplicating this information.

PR:		178780 [1]
Submitted by:	Douglas Carmichael <dcarmich@dcarmichael.net> [1]
This commit is contained in:
Gerald Pfeifer 2014-03-03 21:36:01 +00:00
parent 92d91cc84b
commit ec1147cf95
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=346970
5 changed files with 9 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
databases/libdbi-drivers/Makefile
View file

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= libdbi-drivers
DISTVERSION= 0.8.3-1
PORTREVISION= 5
DISTVERSION= 0.9.0
CATEGORIES= databases devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.8.3-1
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Drivers for libdbi
@ -19,26 +18,17 @@ CONFIGURE_ARGS= --disable-static \
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
OPTIONS_MULTI= DRIVER
OPTIONS_MULTI_DRIVER= MYSQL MSQL PGSQL SQLITE2 SQLITE3 FIREBIRD FREETDS
OPTIONS_MULTI_DRIVER= MYSQL PGSQL SQLITE3
OPTIONS_DEFAULT= MYSQL PGSQL SQLITE3
SQLITE2_DESC= SQLite 2 Database
OPTIONS_SUB= yes
MYSQL_USE= MYSQL=yes
MYSQL_CONFIGURE_WITH= mysql
MSQL_USE= MSQL=yes
MSQL_CONFIGURE_WITH= msql
PGSQL_USE= PGSQL=yes
PGSQL_CONFIGURE_WITH= pgsql
SQLITE2_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2
SQLITE2_CONFIGURE_WITH= sqlite
SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
SQLITE3_CONFIGURE_WITH= sqlite3
FIREBIRD_LIB_DEPENDS= libgds.so:${PORTSDIR}/databases/firebird20-client
FIREBIRD_CONFIGURE_WITH=firebird
FREETDS_LIB_DEPENDS= libtds.so:${PORTSDIR}/databases/freetds
FREETDS_CONFIGURE_WITH= freetds
PLIST_SUB+= INGRES="@comment "
PLIST_SUB+= ORACLE="@comment "

4
databases/libdbi-drivers/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (libdbi-drivers-0.8.3-1.tar.gz) = 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
SIZE (libdbi-drivers-0.8.3-1.tar.gz) = 1534420
SHA256 (libdbi-drivers-0.9.0.tar.gz) = 43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854
SIZE (libdbi-drivers-0.9.0.tar.gz) = 1829864

66
databases/libdbi-drivers/files/patch-drivers__freetds__dbd_freetds.c
View file

@ -1,66 +0,0 @@
--- ./drivers/freetds/dbd_freetds.c.orig 2007-12-31 14:10:44.000000000 -0800
+++ ./drivers/freetds/dbd_freetds.c 2009-07-20 01:30:00.373376559 -0700
@@ -454,6 +454,7 @@
{
dbi_result_t *res;
char *sql_cmd;
+ char *current_db = NULL;
if (db == NULL || db[0] == '\0') {
/* Use current database */
@@ -461,7 +462,6 @@
return res;
}
- char *current_db = NULL;
if (conn->current_db)
/* Reserved current DB name */
current_db = strdup(conn->current_db);
@@ -509,9 +509,9 @@
{
/* foo's -> 'foo''s' */
size_t len;
+ const char *escaped = "\'";
strcpy(dest, "\'");
- const char *escaped = "\'";
len = _dbd_freetds_escape_chars(dest + 1, orig, strlen(orig), escaped);
@@ -560,6 +560,8 @@
* everything else will be filled in by DBI */
unsigned int idx = 0;
+ unsigned short type = 0;
+ unsigned int attribs = 0;
dbi_result_t *result = NULL;
dbi_row_t *row = NULL;
FREETDSCON *tdscon = (FREETDSCON *) conn->connection;
@@ -629,9 +631,6 @@
return NULL;
}
- unsigned short type = 0;
- unsigned int attribs = 0;
-
_translate_freetds_type(datafmt[idx], &type, &attribs);
/* Fill fields value in result */
_dbd_result_add_field(result, idx, datafmt[idx]->name, type, attribs);
@@ -885,6 +884,7 @@
dbi_row_t *row = NULL;
unsigned int idx = 0;
void *addr = NULL;
+ char **orig;
FREETDSCON *tdscon = (FREETDSCON *) conn->connection;
@@ -912,8 +912,7 @@
dstfmt.format = CS_FMT_UNUSED;
addr = malloc(sizeof(CS_NUMERIC_TYPE));
- char **orig =
- &(result->rows[result->numrows_matched]->field_values[idx].d_string);
+ orig = &(result->rows[result->numrows_matched]->field_values[idx].d_string);
if (cs_convert(tdscon->ctx, datafmt[idx], *orig, &dstfmt, addr, NULL) !=
CS_SUCCEED) {

10
databases/libdbi-drivers/files/patch-drivers__pgsql__dbd_pgsql.c
View file

@ -1,10 +0,0 @@
--- ./drivers/pgsql/dbd_pgsql.c.orig 2008-01-26 09:39:50.000000000 -0800
+++ ./drivers/pgsql/dbd_pgsql.c 2009-07-20 01:30:00.376376795 -0700
@@ -75,6 +75,7 @@
"EUC_JP", "EUC-JP",
"EUC_KR", "EUC-KR",
"UNICODE", "UTF-8",
+ "UTF8", "UTF-8",
"LATIN1", "ISO-8859-1",
"LATIN2", "ISO-8859-2",
"LATIN3", "ISO-8859-3",

90
databases/libdbi-drivers/pkg-plist
View file

@ -4,67 +4,19 @@
%%PGSQL%%lib/dbd/libdbdpgsql.a
%%PGSQL%%lib/dbd/libdbdpgsql.la
%%PGSQL%%lib/dbd/libdbdpgsql.so
%%SQLITE2%%lib/dbd/libdbdsqlite.a
%%SQLITE2%%lib/dbd/libdbdsqlite.la
%%SQLITE2%%lib/dbd/libdbdsqlite.so
%%SQLITE3%%lib/dbd/libdbdsqlite3.a
%%SQLITE3%%lib/dbd/libdbdsqlite3.la
%%SQLITE3%%lib/dbd/libdbdsqlite3.so
%%FIREBIRD%%lib/dbd/libdbdfirebird.a
%%FIREBIRD%%lib/dbd/libdbdfirebird.la
%%FIREBIRD%%lib/dbd/libdbdfirebird.so
%%FREETDS%%lib/dbd/libdbdfreetds.a
%%FREETDS%%lib/dbd/libdbdfreetds.la
%%FREETDS%%lib/dbd/libdbdfreetds.so
@dirrmtry lib/dbd
%%FIREBIRD%%%%DOCSDIR%%/dbd_firebird.pdf
%%INGRES%%%%DOCSDIR%%/dbd_ingres/copying-fdl.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/f25.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/index.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/install-build.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/install-prereq.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/install.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/intro.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/options.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/specific.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres/specific.html
%%INGRES%%%%DOCSDIR%%/dbd_ingres.pdf
%%MSQL%%%%DOCSDIR%%/dbd_msql/c26.html
%%MSQL%%%%DOCSDIR%%/dbd_msql/c30.html
%%MSQL%%%%DOCSDIR%%/dbd_msql/c81.html
%%MSQL%%%%DOCSDIR%%/dbd_msql/f15.html
%%MSQL%%%%DOCSDIR%%/dbd_msql/index.html
%%MSQL%%%%DOCSDIR%%/dbd_msql/x33.html
%%MSQL%%%%DOCSDIR%%/dbd_msql/x47.html
%%MSQL%%%%DOCSDIR%%/dbd_msql.pdf
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c168.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c173.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c35.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c39.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c40.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c44.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c93.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c98.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/copying-fdl.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/f24.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/f29.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/index.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x171.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x176.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x42.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x47.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x56.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x61.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c26.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c29.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c38.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c41.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/f15.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/index.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/x32.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/x35.html
%%ORACLE%%%%DOCSDIR%%/dbd_oracle.pdf
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/copying-fdl.html
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/f30.html
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/index.html
@ -75,53 +27,19 @@
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/options.html
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/specific.html
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql.pdf
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c100.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c118.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c126.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c26.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c34.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c37.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c45.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c92.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/copying-fdl.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f15.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f23.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/index.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x121.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x129.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x197.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x205.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x40.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x48.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x54.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x62.html
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite.pdf
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c102.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c120.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c128.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c26.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c34.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c39.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c47.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c94.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c98.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c134.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/copying-fdl.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f15.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f23.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/index.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x123.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x131.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x195.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x203.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x42.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x50.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x56.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x64.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x137.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x209.html
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
%%INGRES%%@dirrm %%DOCSDIR%%/dbd_ingres
%%MSQL%%@dirrm %%DOCSDIR%%/dbd_msql
%%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
%%ORACLE%%@dirrm %%DOCSDIR%%/dbd_oracle
%%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
%%SQLITE2%%@dirrm %%DOCSDIR%%/dbd_sqlite
%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
@dirrm %%DOCSDIR%%