cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.9.0

Browse Source
This commit is contained in:
steven 2017-06-03 16:24:05 +00:00
parent 602a4458c9
commit edc5d31615
9 changed files with 97 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
databases/libdbi-drivers/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.30 2017/04/10 11:45:24 sthen Exp $ # $OpenBSD: Makefile,v 1.31 2017/06/03 16:24:05 steven Exp $
V = 0.8.3-1 V = 0.9.0
REVISION = 12
COMMENT-main = mysql driver for libdbi COMMENT-main = mysql driver for libdbi
COMMENT-pgsql = pgsql driver for libdbi COMMENT-pgsql = pgsql driver for libdbi
COMMENT-sqlite = sqlite driver for libdbi COMMENT-sqlite = sqlite driver for libdbi
@ -26,13 +25,18 @@ PERMIT_PACKAGE_CDROM = Yes
CONFIGURE_STYLE = gnu CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-docs \ CONFIGURE_ARGS = --disable-docs \
--with-dbi-incdir=${LOCALBASE}/include \
--with-dbi-libdir=${LOCALBASE}/lib \ --with-dbi-libdir=${LOCALBASE}/lib \
--with-mysql \ --with-mysql \
--with-pgsql \ --with-pgsql \
--with-pgsql-incdir="${LOCALBASE}/include -I${LOCALBASE}/include/postgresql" \ --with-pgsql-incdir="${LOCALBASE}/include -I${LOCALBASE}/include/postgresql" \
--with-pgsql-libdir=${LOCALBASE}/lib/postgresql \ --with-pgsql-libdir=${LOCALBASE}/lib/postgresql \
--with-sqlite \ --with-sqlite \
--with-sqlite-incdir=${LOCALBASE}/include \
--with-sqlite-libdir=${LOCALBASE}/lib \
--with-sqlite3 \ --with-sqlite3 \
--with-sqlite3-incdir=${LOCALBASE}/include \
--with-sqlite3-libdir=${LOCALBASE}/lib \
--with-freetds \ --with-freetds \
--with-freetds-incdir=${LOCALBASE}/include \ --with-freetds-incdir=${LOCALBASE}/include \
--with-freetds-libdir=${LOCALBASE}/lib --with-freetds-libdir=${LOCALBASE}/lib
@ -59,6 +63,7 @@ RUN_DEPENDS-sqlite3 =
WANTLIB-freetds = ct dbi iconv m pthread ffi gcrypt gmp gnutls WANTLIB-freetds = ct dbi iconv m pthread ffi gcrypt gmp gnutls
WANTLIB-freetds += gpg-error hogweed idn2 intl nettle p11-kit tasn1 z WANTLIB-freetds += gpg-error hogweed idn2 intl nettle p11-kit tasn1 z
WANTLIB-freetds += unistring
LIB_DEPENDS-freetds = databases/freetds \ LIB_DEPENDS-freetds = databases/freetds \
databases/libdbi databases/libdbi
@ -68,7 +73,12 @@ TEST_DEPENDS = databases/libdbi-drivers,-main \
databases/libdbi-drivers,-pgsql \ databases/libdbi-drivers,-pgsql \
databases/libdbi-drivers,-sqlite \ databases/libdbi-drivers,-sqlite \
databases/libdbi-drivers,-sqlite3 \ databases/libdbi-drivers,-sqlite3 \
databases/libdbi-drivers,-freetds databases/libdbi-drivers,-freetds \
databases/mariadb,-server \
databases/postgresql,-server
pre-configure:
chmod +x ${WRKSRC}/tests/test_freetds.sh
post-install: post-install:
.for d in mysql pgsql sqlite sqlite3 .for d in mysql pgsql sqlite sqlite3

4
databases/libdbi-drivers/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libdbi-drivers-0.8.3-1.tar.gz) = SrmUQ5jOdpwN7rZNL3NVXGe8JczSreHM9VIibHsqz3I= SHA256 (libdbi-drivers-0.9.0.tar.gz) = Q9LqzVc6T6/ylvqSXdl/vyrtvxrjXGJjR4IQxhAEyFQ=
SIZE (libdbi-drivers-0.8.3-1.tar.gz) = 1534420 SIZE (libdbi-drivers-0.9.0.tar.gz) = 1829864

45
databases/libdbi-drivers/patches/patch-configure
View File

@ -1,25 +1,24 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/06/02 00:58:58 merdely Exp $ $OpenBSD: patch-configure,v 1.2 2017/06/03 16:24:05 steven Exp $
--- configure.orig Mon Mar 3 12:41:58 2008 Index: configure
+++ configure Sun May 31 17:47:10 2009 --- configure.orig
@@ -11830,7 +11830,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +++ configure
# The `*' in the case matches for architectures that use `case' in @@ -11915,8 +11915,8 @@ if test -z "$GCC" ; then
# $output_verbose_cmd can trigger glob expansion during the loop DEBUG="-g $CFLAGS"
# eval without this substitution. PROFILE="-g -p $CFLAGS"
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" else
+ output_verbose_link_cmd="`$echo \"$output_verbose_link_cmd\" | $Xsed -e "$no_glob_subst"`" - DEBUG="-g -std=gnu99 $CFLAGS"
- PROFILE="-g -p -std=gnu99 $CFLAGS"
for p in `eval $output_verbose_link_cmd`; do + DEBUG="$DEBUG -std=gnu99"
case $p in + PROFILE="$PROFILE -g -p -std=gnu99"
@@ -20209,9 +20209,9 @@ else CFLAGS="-std=gnu99 $CFLAGS"
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
*)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+ DEBUG="${DEBUG} -Wall -D__NO_MATH_INLINES -fsigned-char"
+ CFLAGS="${CFLAGS} -D__NO_MATH_INLINES -fsigned-char"
+ PROFILE="${PROFILE} -pg -D__NO_MATH_INLINES -fsigned-char" ;;
esac
fi fi
@@ -12528,7 +12528,7 @@ else :
fi
SQLITE3_LDFLAGS=""
else
- SQLITE3_LIBS=-lsqlite
+ SQLITE3_LIBS=-lsqlite3
SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir
fi

21
databases/libdbi-drivers/patches/patch-drivers_freetds_dbd_freetds_c
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-drivers_freetds_dbd_freetds_c,v 1.1 2011/07/08 11:32:17 jasper Exp $ $OpenBSD: patch-drivers_freetds_dbd_freetds_c,v 1.2 2017/06/03 16:24:05 steven Exp $
From FreeBSD. From FreeBSD.
--- drivers/freetds/dbd_freetds.c.orig Mon Dec 31 23:10:44 2007 Index: drivers/freetds/dbd_freetds.c
+++ drivers/freetds/dbd_freetds.c Fri Jul 8 13:29:38 2011 --- drivers/freetds/dbd_freetds.c.orig
@@ -454,6 +454,7 @@ dbi_result_t *dbd_list_tables(dbi_conn_t * conn, const +++ drivers/freetds/dbd_freetds.c
@@ -474,6 +474,7 @@ dbi_result_t *dbd_list_tables(dbi_conn_t * conn, const
{ {
dbi_result_t *res; dbi_result_t *res;
char *sql_cmd; char *sql_cmd;
@ -12,7 +13,7 @@ From FreeBSD.
if (db == NULL || db[0] == '\0') { if (db == NULL || db[0] == '\0') {
/* Use current database */ /* Use current database */
@@ -461,7 +462,6 @@ dbi_result_t *dbd_list_tables(dbi_conn_t * conn, const @@ -481,7 +482,6 @@ dbi_result_t *dbd_list_tables(dbi_conn_t * conn, const
return res; return res;
} }
@ -20,7 +21,7 @@ From FreeBSD.
if (conn->current_db) if (conn->current_db)
/* Reserved current DB name */ /* Reserved current DB name */
current_db = strdup(conn->current_db); current_db = strdup(conn->current_db);
@@ -509,9 +509,9 @@ size_t dbd_quote_string(dbi_driver_t * driver, const c @@ -529,9 +529,9 @@ size_t dbd_quote_string(dbi_driver_t * driver, const c
{ {
/* foo's -> 'foo''s' */ /* foo's -> 'foo''s' */
size_t len; size_t len;
@ -31,7 +32,7 @@ From FreeBSD.
len = _dbd_freetds_escape_chars(dest + 1, orig, strlen(orig), escaped); len = _dbd_freetds_escape_chars(dest + 1, orig, strlen(orig), escaped);
@@ -560,6 +560,8 @@ dbi_result_t *dbd_query(dbi_conn_t * conn, const char @@ -580,6 +580,8 @@ dbi_result_t *dbd_query(dbi_conn_t * conn, const char
* everything else will be filled in by DBI */ * everything else will be filled in by DBI */
unsigned int idx = 0; unsigned int idx = 0;
@ -40,7 +41,7 @@ From FreeBSD.
dbi_result_t *result = NULL; dbi_result_t *result = NULL;
dbi_row_t *row = NULL; dbi_row_t *row = NULL;
FREETDSCON *tdscon = (FREETDSCON *) conn->connection; FREETDSCON *tdscon = (FREETDSCON *) conn->connection;
@@ -629,9 +631,6 @@ dbi_result_t *dbd_query(dbi_conn_t * conn, const char @@ -649,9 +651,6 @@ dbi_result_t *dbd_query(dbi_conn_t * conn, const char
return NULL; return NULL;
} }
@ -50,7 +51,7 @@ From FreeBSD.
_translate_freetds_type(datafmt[idx], &type, &attribs); _translate_freetds_type(datafmt[idx], &type, &attribs);
/* Fill fields value in result */ /* Fill fields value in result */
_dbd_result_add_field(result, idx, datafmt[idx]->name, type, attribs); _dbd_result_add_field(result, idx, datafmt[idx]->name, type, attribs);
@@ -885,6 +884,7 @@ dbi_row_t *_dbd_freetds_buffers_binding(dbi_conn_t * c @@ -976,6 +975,7 @@ dbi_row_t *_dbd_freetds_buffers_binding(dbi_conn_t * c
dbi_row_t *row = NULL; dbi_row_t *row = NULL;
unsigned int idx = 0; unsigned int idx = 0;
void *addr = NULL; void *addr = NULL;
@ -58,7 +59,7 @@ From FreeBSD.
FREETDSCON *tdscon = (FREETDSCON *) conn->connection; FREETDSCON *tdscon = (FREETDSCON *) conn->connection;
@@ -912,8 +912,7 @@ dbi_row_t *_dbd_freetds_buffers_binding(dbi_conn_t * c @@ -1003,8 +1003,7 @@ dbi_row_t *_dbd_freetds_buffers_binding(dbi_conn_t * c
dstfmt.format = CS_FMT_UNUSED; dstfmt.format = CS_FMT_UNUSED;
addr = malloc(sizeof(CS_NUMERIC_TYPE)); addr = malloc(sizeof(CS_NUMERIC_TYPE));

14
databases/libdbi-drivers/patches/patch-tests_test_libdbi_sh Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tests_test_libdbi_sh,v 1.1 2017/06/03 16:24:05 steven Exp $
Index: tests/test_libdbi.sh
--- tests/test_libdbi.sh.orig
+++ tests/test_libdbi.sh
@@ -13,7 +13,7 @@ olddir=`pwd`
cd ..
rootdir=`pwd`
for f in `find drivers -name 'libdbd*.so'` ; do
- ln -vs $rootdir/$f $olddir/.plugins
+ ln -s $rootdir/$f $olddir/.plugins
done
cd $olddir

14
databases/libdbi-drivers/patches/patch-tests_test_pgsql_sh Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tests_test_pgsql_sh,v 1.1 2017/06/03 16:24:05 steven Exp $
Index: tests/test_pgsql.sh
--- tests/test_pgsql.sh.orig
+++ tests/test_pgsql.sh
@@ -42,7 +42,7 @@ ABSMYTMPDIR="`cd \"$D\" 2>/dev/null && pwd || echo \"$
# depends on language-pack-en | language-pack-en
# because initdb acquires encoding from locale
export LC_ALL="en_US.UTF-8"
-${BINDIR}/initdb -D ${MYTMPDIR}
+${BINDIR}/initdb -D ${MYTMPDIR} --no-locale
# the non-interactive standalone server is not available in older PGSQL versions
#${BINDIR}/postgres -D ${MYTMPDIR} -h '' -k ${MYTMPDIR} &
${BINDIR}/postmaster -D ${MYTMPDIR} -h '' -k ${ABSMYTMPDIR} &

22
databases/libdbi-drivers/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2016/03/19 10:24:33 sthen Exp $ @comment $OpenBSD: PLIST-main,v 1.3 2017/06/03 16:24:05 steven Exp $
lib/dbd/ lib/dbd/
lib/dbd/libdbdmysql.a lib/dbd/libdbdmysql.a
lib/dbd/libdbdmysql.la lib/dbd/libdbdmysql.la
@ -6,21 +6,21 @@ lib/dbd/libdbdmysql.so
share/doc/libdbi-drivers/ share/doc/libdbi-drivers/
share/doc/libdbi-drivers/dbd_mysql/ share/doc/libdbi-drivers/dbd_mysql/
share/doc/libdbi-drivers/dbd_mysql.pdf share/doc/libdbi-drivers/dbd_mysql.pdf
share/doc/libdbi-drivers/dbd_mysql/c168.html share/doc/libdbi-drivers/dbd_mysql/c101.html
share/doc/libdbi-drivers/dbd_mysql/c173.html share/doc/libdbi-drivers/dbd_mysql/c177.html
share/doc/libdbi-drivers/dbd_mysql/c35.html share/doc/libdbi-drivers/dbd_mysql/c180.html
share/doc/libdbi-drivers/dbd_mysql/c39.html
share/doc/libdbi-drivers/dbd_mysql/c40.html share/doc/libdbi-drivers/dbd_mysql/c40.html
share/doc/libdbi-drivers/dbd_mysql/c43.html
share/doc/libdbi-drivers/dbd_mysql/c44.html share/doc/libdbi-drivers/dbd_mysql/c44.html
share/doc/libdbi-drivers/dbd_mysql/c93.html share/doc/libdbi-drivers/dbd_mysql/c47.html
share/doc/libdbi-drivers/dbd_mysql/c98.html share/doc/libdbi-drivers/dbd_mysql/c98.html
share/doc/libdbi-drivers/dbd_mysql/copying-fdl.html share/doc/libdbi-drivers/dbd_mysql/copying-fdl.html
share/doc/libdbi-drivers/dbd_mysql/f24.html
share/doc/libdbi-drivers/dbd_mysql/f29.html share/doc/libdbi-drivers/dbd_mysql/f29.html
share/doc/libdbi-drivers/dbd_mysql/f32.html
share/doc/libdbi-drivers/dbd_mysql/index.html share/doc/libdbi-drivers/dbd_mysql/index.html
share/doc/libdbi-drivers/dbd_mysql/x171.html share/doc/libdbi-drivers/dbd_mysql/x180.html
share/doc/libdbi-drivers/dbd_mysql/x176.html share/doc/libdbi-drivers/dbd_mysql/x183.html
share/doc/libdbi-drivers/dbd_mysql/x42.html
share/doc/libdbi-drivers/dbd_mysql/x47.html share/doc/libdbi-drivers/dbd_mysql/x47.html
share/doc/libdbi-drivers/dbd_mysql/x56.html share/doc/libdbi-drivers/dbd_mysql/x50.html
share/doc/libdbi-drivers/dbd_mysql/x61.html share/doc/libdbi-drivers/dbd_mysql/x61.html
share/doc/libdbi-drivers/dbd_mysql/x64.html

17
databases/libdbi-drivers/pkg/PLIST-sqlite
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-sqlite,v 1.2 2016/03/19 10:24:33 sthen Exp $ @comment $OpenBSD: PLIST-sqlite,v 1.3 2017/06/03 16:24:05 steven Exp $
lib/dbd/ lib/dbd/
lib/dbd/libdbdsqlite.a lib/dbd/libdbdsqlite.a
lib/dbd/libdbdsqlite.la lib/dbd/libdbdsqlite.la
@ -7,22 +7,13 @@ share/doc/libdbi-drivers/
share/doc/libdbi-drivers/dbd_sqlite/ share/doc/libdbi-drivers/dbd_sqlite/
share/doc/libdbi-drivers/dbd_sqlite.pdf share/doc/libdbi-drivers/dbd_sqlite.pdf
share/doc/libdbi-drivers/dbd_sqlite/c100.html share/doc/libdbi-drivers/dbd_sqlite/c100.html
share/doc/libdbi-drivers/dbd_sqlite/c118.html share/doc/libdbi-drivers/dbd_sqlite/c136.html
share/doc/libdbi-drivers/dbd_sqlite/c126.html
share/doc/libdbi-drivers/dbd_sqlite/c26.html
share/doc/libdbi-drivers/dbd_sqlite/c34.html share/doc/libdbi-drivers/dbd_sqlite/c34.html
share/doc/libdbi-drivers/dbd_sqlite/c37.html
share/doc/libdbi-drivers/dbd_sqlite/c45.html share/doc/libdbi-drivers/dbd_sqlite/c45.html
share/doc/libdbi-drivers/dbd_sqlite/c92.html
share/doc/libdbi-drivers/dbd_sqlite/copying-fdl.html share/doc/libdbi-drivers/dbd_sqlite/copying-fdl.html
share/doc/libdbi-drivers/dbd_sqlite/f15.html
share/doc/libdbi-drivers/dbd_sqlite/f23.html share/doc/libdbi-drivers/dbd_sqlite/f23.html
share/doc/libdbi-drivers/dbd_sqlite/index.html share/doc/libdbi-drivers/dbd_sqlite/index.html
share/doc/libdbi-drivers/dbd_sqlite/x121.html share/doc/libdbi-drivers/dbd_sqlite/x139.html
share/doc/libdbi-drivers/dbd_sqlite/x129.html share/doc/libdbi-drivers/dbd_sqlite/x215.html
share/doc/libdbi-drivers/dbd_sqlite/x197.html
share/doc/libdbi-drivers/dbd_sqlite/x205.html
share/doc/libdbi-drivers/dbd_sqlite/x40.html
share/doc/libdbi-drivers/dbd_sqlite/x48.html share/doc/libdbi-drivers/dbd_sqlite/x48.html
share/doc/libdbi-drivers/dbd_sqlite/x54.html
share/doc/libdbi-drivers/dbd_sqlite/x62.html share/doc/libdbi-drivers/dbd_sqlite/x62.html

19
databases/libdbi-drivers/pkg/PLIST-sqlite3
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-sqlite3,v 1.2 2016/03/19 10:24:33 sthen Exp $ @comment $OpenBSD: PLIST-sqlite3,v 1.3 2017/06/03 16:24:05 steven Exp $
lib/dbd/ lib/dbd/
lib/dbd/libdbdsqlite3.a lib/dbd/libdbdsqlite3.a
lib/dbd/libdbdsqlite3.la lib/dbd/libdbdsqlite3.la
@ -6,23 +6,14 @@ lib/dbd/libdbdsqlite3.so
share/doc/libdbi-drivers/ share/doc/libdbi-drivers/
share/doc/libdbi-drivers/dbd_sqlite3/ share/doc/libdbi-drivers/dbd_sqlite3/
share/doc/libdbi-drivers/dbd_sqlite3.pdf share/doc/libdbi-drivers/dbd_sqlite3.pdf
share/doc/libdbi-drivers/dbd_sqlite3/c102.html share/doc/libdbi-drivers/dbd_sqlite3/c134.html
share/doc/libdbi-drivers/dbd_sqlite3/c120.html
share/doc/libdbi-drivers/dbd_sqlite3/c128.html
share/doc/libdbi-drivers/dbd_sqlite3/c26.html
share/doc/libdbi-drivers/dbd_sqlite3/c34.html share/doc/libdbi-drivers/dbd_sqlite3/c34.html
share/doc/libdbi-drivers/dbd_sqlite3/c39.html
share/doc/libdbi-drivers/dbd_sqlite3/c47.html share/doc/libdbi-drivers/dbd_sqlite3/c47.html
share/doc/libdbi-drivers/dbd_sqlite3/c94.html share/doc/libdbi-drivers/dbd_sqlite3/c98.html
share/doc/libdbi-drivers/dbd_sqlite3/copying-fdl.html share/doc/libdbi-drivers/dbd_sqlite3/copying-fdl.html
share/doc/libdbi-drivers/dbd_sqlite3/f15.html
share/doc/libdbi-drivers/dbd_sqlite3/f23.html share/doc/libdbi-drivers/dbd_sqlite3/f23.html
share/doc/libdbi-drivers/dbd_sqlite3/index.html share/doc/libdbi-drivers/dbd_sqlite3/index.html
share/doc/libdbi-drivers/dbd_sqlite3/x123.html share/doc/libdbi-drivers/dbd_sqlite3/x137.html
share/doc/libdbi-drivers/dbd_sqlite3/x131.html share/doc/libdbi-drivers/dbd_sqlite3/x209.html
share/doc/libdbi-drivers/dbd_sqlite3/x195.html
share/doc/libdbi-drivers/dbd_sqlite3/x203.html
share/doc/libdbi-drivers/dbd_sqlite3/x42.html
share/doc/libdbi-drivers/dbd_sqlite3/x50.html share/doc/libdbi-drivers/dbd_sqlite3/x50.html
share/doc/libdbi-drivers/dbd_sqlite3/x56.html
share/doc/libdbi-drivers/dbd_sqlite3/x64.html share/doc/libdbi-drivers/dbd_sqlite3/x64.html