diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index 64e10afdfc5..fdc78958b9e 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -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 -REVISION = 12 +V = 0.9.0 COMMENT-main = mysql driver for libdbi COMMENT-pgsql = pgsql driver for libdbi COMMENT-sqlite = sqlite driver for libdbi @@ -26,13 +25,18 @@ PERMIT_PACKAGE_CDROM = Yes CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --disable-docs \ + --with-dbi-incdir=${LOCALBASE}/include \ --with-dbi-libdir=${LOCALBASE}/lib \ --with-mysql \ --with-pgsql \ --with-pgsql-incdir="${LOCALBASE}/include -I${LOCALBASE}/include/postgresql" \ --with-pgsql-libdir=${LOCALBASE}/lib/postgresql \ --with-sqlite \ + --with-sqlite-incdir=${LOCALBASE}/include \ + --with-sqlite-libdir=${LOCALBASE}/lib \ --with-sqlite3 \ + --with-sqlite3-incdir=${LOCALBASE}/include \ + --with-sqlite3-libdir=${LOCALBASE}/lib \ --with-freetds \ --with-freetds-incdir=${LOCALBASE}/include \ --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 += gpg-error hogweed idn2 intl nettle p11-kit tasn1 z +WANTLIB-freetds += unistring LIB_DEPENDS-freetds = databases/freetds \ databases/libdbi @@ -68,7 +73,12 @@ TEST_DEPENDS = databases/libdbi-drivers,-main \ databases/libdbi-drivers,-pgsql \ databases/libdbi-drivers,-sqlite \ 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: .for d in mysql pgsql sqlite sqlite3 diff --git a/databases/libdbi-drivers/distinfo b/databases/libdbi-drivers/distinfo index 9fb442ae687..4f10bc40171 100644 --- a/databases/libdbi-drivers/distinfo +++ b/databases/libdbi-drivers/distinfo @@ -1,2 +1,2 @@ -SHA256 (libdbi-drivers-0.8.3-1.tar.gz) = SrmUQ5jOdpwN7rZNL3NVXGe8JczSreHM9VIibHsqz3I= -SIZE (libdbi-drivers-0.8.3-1.tar.gz) = 1534420 +SHA256 (libdbi-drivers-0.9.0.tar.gz) = Q9LqzVc6T6/ylvqSXdl/vyrtvxrjXGJjR4IQxhAEyFQ= +SIZE (libdbi-drivers-0.9.0.tar.gz) = 1829864 diff --git a/databases/libdbi-drivers/patches/patch-configure b/databases/libdbi-drivers/patches/patch-configure index 80c55c4dd94..106c2c6ff2d 100644 --- a/databases/libdbi-drivers/patches/patch-configure +++ b/databases/libdbi-drivers/patches/patch-configure @@ -1,25 +1,24 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2009/06/02 00:58:58 merdely Exp $ ---- configure.orig Mon Mar 3 12:41:58 2008 -+++ configure Sun May 31 17:47:10 2009 -@@ -11830,7 +11830,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. -- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" -+ output_verbose_link_cmd="`$echo \"$output_verbose_link_cmd\" | $Xsed -e "$no_glob_subst"`" - - for p in `eval $output_verbose_link_cmd`; do - case $p in -@@ -20209,9 +20209,9 @@ else - 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 +$OpenBSD: patch-configure,v 1.2 2017/06/03 16:24:05 steven Exp $ +Index: configure +--- configure.orig ++++ configure +@@ -11915,8 +11915,8 @@ if test -z "$GCC" ; then + DEBUG="-g $CFLAGS" + PROFILE="-g -p $CFLAGS" + else +- DEBUG="-g -std=gnu99 $CFLAGS" +- PROFILE="-g -p -std=gnu99 $CFLAGS" ++ DEBUG="$DEBUG -std=gnu99" ++ PROFILE="$PROFILE -g -p -std=gnu99" + CFLAGS="-std=gnu99 $CFLAGS" fi +@@ -12528,7 +12528,7 @@ else : + fi + SQLITE3_LDFLAGS="" + else +- SQLITE3_LIBS=-lsqlite ++ SQLITE3_LIBS=-lsqlite3 + SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir + fi + diff --git a/databases/libdbi-drivers/patches/patch-drivers_freetds_dbd_freetds_c b/databases/libdbi-drivers/patches/patch-drivers_freetds_dbd_freetds_c index 24475ed37ee..0d0fc144d78 100644 --- a/databases/libdbi-drivers/patches/patch-drivers_freetds_dbd_freetds_c +++ b/databases/libdbi-drivers/patches/patch-drivers_freetds_dbd_freetds_c @@ -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. ---- drivers/freetds/dbd_freetds.c.orig Mon Dec 31 23:10:44 2007 -+++ drivers/freetds/dbd_freetds.c Fri Jul 8 13:29:38 2011 -@@ -454,6 +454,7 @@ dbi_result_t *dbd_list_tables(dbi_conn_t * conn, const +Index: drivers/freetds/dbd_freetds.c +--- drivers/freetds/dbd_freetds.c.orig ++++ drivers/freetds/dbd_freetds.c +@@ -474,6 +474,7 @@ dbi_result_t *dbd_list_tables(dbi_conn_t * conn, const { dbi_result_t *res; char *sql_cmd; @@ -12,7 +13,7 @@ From FreeBSD. if (db == NULL || db[0] == '\0') { /* 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; } @@ -20,7 +21,7 @@ From FreeBSD. if (conn->current_db) /* Reserved current DB name */ 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' */ size_t len; @@ -31,7 +32,7 @@ From FreeBSD. 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 */ unsigned int idx = 0; @@ -40,7 +41,7 @@ From FreeBSD. dbi_result_t *result = NULL; dbi_row_t *row = NULL; 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; } @@ -50,7 +51,7 @@ From FreeBSD. _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 *_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; unsigned int idx = 0; void *addr = NULL; @@ -58,7 +59,7 @@ From FreeBSD. 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; addr = malloc(sizeof(CS_NUMERIC_TYPE)); diff --git a/databases/libdbi-drivers/patches/patch-tests_test_libdbi_sh b/databases/libdbi-drivers/patches/patch-tests_test_libdbi_sh new file mode 100644 index 00000000000..78bc7e1e33f --- /dev/null +++ b/databases/libdbi-drivers/patches/patch-tests_test_libdbi_sh @@ -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 + diff --git a/databases/libdbi-drivers/patches/patch-tests_test_pgsql_sh b/databases/libdbi-drivers/patches/patch-tests_test_pgsql_sh new file mode 100644 index 00000000000..c6f6b95b9b6 --- /dev/null +++ b/databases/libdbi-drivers/patches/patch-tests_test_pgsql_sh @@ -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} & diff --git a/databases/libdbi-drivers/pkg/PLIST-main b/databases/libdbi-drivers/pkg/PLIST-main index c9fe0a6596e..fbc2bf67bfa 100644 --- a/databases/libdbi-drivers/pkg/PLIST-main +++ b/databases/libdbi-drivers/pkg/PLIST-main @@ -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/libdbdmysql.a lib/dbd/libdbdmysql.la @@ -6,21 +6,21 @@ lib/dbd/libdbdmysql.so share/doc/libdbi-drivers/ share/doc/libdbi-drivers/dbd_mysql/ share/doc/libdbi-drivers/dbd_mysql.pdf -share/doc/libdbi-drivers/dbd_mysql/c168.html -share/doc/libdbi-drivers/dbd_mysql/c173.html -share/doc/libdbi-drivers/dbd_mysql/c35.html -share/doc/libdbi-drivers/dbd_mysql/c39.html +share/doc/libdbi-drivers/dbd_mysql/c101.html +share/doc/libdbi-drivers/dbd_mysql/c177.html +share/doc/libdbi-drivers/dbd_mysql/c180.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/c93.html +share/doc/libdbi-drivers/dbd_mysql/c47.html share/doc/libdbi-drivers/dbd_mysql/c98.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/f32.html share/doc/libdbi-drivers/dbd_mysql/index.html -share/doc/libdbi-drivers/dbd_mysql/x171.html -share/doc/libdbi-drivers/dbd_mysql/x176.html -share/doc/libdbi-drivers/dbd_mysql/x42.html +share/doc/libdbi-drivers/dbd_mysql/x180.html +share/doc/libdbi-drivers/dbd_mysql/x183.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/x64.html diff --git a/databases/libdbi-drivers/pkg/PLIST-sqlite b/databases/libdbi-drivers/pkg/PLIST-sqlite index 35ca72b6da7..1b9247b6174 100644 --- a/databases/libdbi-drivers/pkg/PLIST-sqlite +++ b/databases/libdbi-drivers/pkg/PLIST-sqlite @@ -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/libdbdsqlite.a lib/dbd/libdbdsqlite.la @@ -7,22 +7,13 @@ share/doc/libdbi-drivers/ share/doc/libdbi-drivers/dbd_sqlite/ share/doc/libdbi-drivers/dbd_sqlite.pdf share/doc/libdbi-drivers/dbd_sqlite/c100.html -share/doc/libdbi-drivers/dbd_sqlite/c118.html -share/doc/libdbi-drivers/dbd_sqlite/c126.html -share/doc/libdbi-drivers/dbd_sqlite/c26.html +share/doc/libdbi-drivers/dbd_sqlite/c136.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/c92.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/index.html -share/doc/libdbi-drivers/dbd_sqlite/x121.html -share/doc/libdbi-drivers/dbd_sqlite/x129.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/x139.html +share/doc/libdbi-drivers/dbd_sqlite/x215.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 diff --git a/databases/libdbi-drivers/pkg/PLIST-sqlite3 b/databases/libdbi-drivers/pkg/PLIST-sqlite3 index db76209bb69..d2d4e62b91c 100644 --- a/databases/libdbi-drivers/pkg/PLIST-sqlite3 +++ b/databases/libdbi-drivers/pkg/PLIST-sqlite3 @@ -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/libdbdsqlite3.a lib/dbd/libdbdsqlite3.la @@ -6,23 +6,14 @@ lib/dbd/libdbdsqlite3.so share/doc/libdbi-drivers/ share/doc/libdbi-drivers/dbd_sqlite3/ share/doc/libdbi-drivers/dbd_sqlite3.pdf -share/doc/libdbi-drivers/dbd_sqlite3/c102.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/c134.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/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/f15.html share/doc/libdbi-drivers/dbd_sqlite3/f23.html share/doc/libdbi-drivers/dbd_sqlite3/index.html -share/doc/libdbi-drivers/dbd_sqlite3/x123.html -share/doc/libdbi-drivers/dbd_sqlite3/x131.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/x137.html +share/doc/libdbi-drivers/dbd_sqlite3/x209.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