diff options
author | adam <adam@pkgsrc.org> | 2010-12-25 08:37:31 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2010-12-25 08:37:31 +0000 |
commit | b4821a7f4b007b46b3f62eb7f9f2732733f0c44a (patch) | |
tree | 2be2fa26df4589e6218de42d593ea4cabfbdcbc3 /databases/odbc-postgresql | |
parent | ab93b513a5a807025f620e9c4dff0e96e5514549 (diff) | |
download | pkgsrc-b4821a7f4b007b46b3f62eb7f9f2732733f0c44a.tar.gz |
Changes 09.00.0200:
* Fix a bug about sizeof() at idx_fake_oid of info.
* Return 0 for the column size when the size of numeric items are unknown.
Also improve the calculation of scale of numeric items when it is not
explicitly specified.
* Change to use 'if' instead of an inappropriate 'else if' at cursor of convert.
* Remember to set permanent flag to holdable cursors on commit with no
precedent rollback (to savepoint) operations.
This fixes a crash bug in case of cursor operations across transaction.
* Fix a bug about the handling of the SQL_RETRIEVE_DATA option.
* Fix cursor bug introduced by the previous change.
* Move the setting of folder name of libpq or gssapi related dlls from .wxs
file to .bat file.
* Fix a bug which returns incorrect values for SQL_DATETIME_SUB.
Diffstat (limited to 'databases/odbc-postgresql')
-rw-r--r-- | databases/odbc-postgresql/DESCR | 3 | ||||
-rw-r--r-- | databases/odbc-postgresql/Makefile | 60 | ||||
-rw-r--r-- | databases/odbc-postgresql/Makefile.common | 67 | ||||
-rw-r--r-- | databases/odbc-postgresql/PLIST | 23 | ||||
-rw-r--r-- | databases/odbc-postgresql/distinfo | 11 | ||||
-rw-r--r-- | databases/odbc-postgresql/patches/patch-aa | 16 | ||||
-rw-r--r-- | databases/odbc-postgresql/patches/patch-ab | 50 | ||||
-rw-r--r-- | databases/odbc-postgresql/patches/patch-ac | 135 |
8 files changed, 59 insertions, 306 deletions
diff --git a/databases/odbc-postgresql/DESCR b/databases/odbc-postgresql/DESCR index 6ab0931900d..918cc180e1d 100644 --- a/databases/odbc-postgresql/DESCR +++ b/databases/odbc-postgresql/DESCR @@ -1,2 +1 @@ -ODBC interface to PostgreSQL, including library objects and C language -header files. +ODBC interface to PostgreSQL. diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile index 8daaca342a9..27beab41e4d 100644 --- a/databases/odbc-postgresql/Makefile +++ b/databases/odbc-postgresql/Makefile @@ -1,27 +1,41 @@ -# $NetBSD: Makefile,v 1.15 2010/01/17 12:02:09 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/12/25 08:37:31 adam Exp $ + +DISTNAME= psqlodbc-09.00.0200 +PKGNAME= odbc-postgresql-9.0.200 +CATEGORIES= databases +MASTER_SITES= ${PGSQL_MIRRORS:=odbc/versions/src/} + +MAINTAINER= adam@NetBSD.org +HOMEPAGE= http://pgfoundry.org/projects/psqlodbc/ +COMMENT= ODBC interface to PostgreSQL +LICENSE= gnu-gpl-v2 + PKG_DESTDIR_SUPPORT= user-destdir -.include "Makefile.common" - -PKGNAME= odbc-postgresql-${BASE_VERS} -PKGREVISION= 3 -COMMENT= ODBC interface to PostgreSQL - -CONFIGURE_ARGS+= --with-odbcinst=${PKG_SYSCONFDIR:Q} - -post-extract: - set -e; \ - cd ${WRKSRC}; \ - [ ! -d src/backend/port/dynloader ] || ( \ - cd src/backend/port/dynloader; \ - cp freebsd.c dragonfly.c; \ - cp freebsd.h dragonfly.h; \ - ); \ - [ ! -d src/template ] \ - || touch src/template/dragonfly; \ - [ ! -d src/include/port ] \ - || cp src/include/port/freebsd.h src/include/port/dragonfly.h; \ - [ ! -d src/makefiles ] \ - || cp src/makefiles/Makefile.freebsd src/makefiles/Makefile.dragonfly +CONFLICTS+= postgresql-[0-7]* +CONFLICTS+= iodbc-postgresql-[0-9]* +CONFLICTS+= unixodbc-postgresql-[0-9]* + +.include "../../databases/postgresql90/Makefile.mirrors" + +USE_LANGUAGES= c +USE_LIBTOOL= yes +USE_TOOLS+= gmake +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-iodbc +CONFIGURE_ARGS+= --without-unixodbc + +INSTALLATION_DIRS= share/doc/postgresql/odbc +INSTALLATION_DIRS+= share/postgresql + +post-install: + ${INSTALL_DATA} ${WRKSRC}/odbc.sql \ + ${DESTDIR}${PREFIX}/share/postgresql/odbc.sql + ${INSTALL_DATA} ${WRKSRC}/odbc-drop.sql \ + ${DESTDIR}${PREFIX}/share/postgresql/odbc-drop.sql + ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/postgresql/odbc/ +.include "../../databases/iodbc/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/odbc-postgresql/Makefile.common b/databases/odbc-postgresql/Makefile.common deleted file mode 100644 index 2ebca828c51..00000000000 --- a/databases/odbc-postgresql/Makefile.common +++ /dev/null @@ -1,67 +0,0 @@ -# $NetBSD: Makefile.common,v 1.15 2008/08/23 11:23:15 obache Exp $ - -DISTNAME= postgresql-${DIST_VERS} -CATEGORIES= databases -PGSQL_SITES= ftp://ftp-archives.postgresql.org/pub/ -MASTER_SITES?= ${PGSQL_SITES:=source/v${DIST_VERS}/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://pgfoundry.org/projects/psqlodbc/ - -CONFLICTS+= postgresql-[0-6]* postgresql-7.0* -CONFLICTS+= unixodbc-postgresql-[0-9]* iodbc-postgresql-[0-9]* - -DISTINFO_FILE?= ${.CURDIR}/../odbc-postgresql/distinfo -PATCHDIR?= ${.CURDIR}/../odbc-postgresql/patches - -# Version numbering scheme: -# -# DIST_VERS version number on the postgresql distfile -# BASE_VERS pkgsrc-mangled version number (convert pl -> .) -# -DIST_VERS?= 7.2.3 -BASE_VERS?= ${DIST_VERS} - -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake -MAKE_FILE= GNUmakefile -GNU_CONFIGURE= YES - -.include "../../mk/bsd.prefs.mk" - -# PG_MB_ENCODING may be set to any of: -# -# SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL, -# LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, KOI8, WIN, ALT -# -# This variable controls the language encoding on the backend process. - -.if defined(PG_MB_ENCODING) -CONFIGURE_ARGS+= --enable-multibyte=${PG_MB_ENCODING:Q} -.else -CONFIGURE_ARGS+= --enable-multibyte # accept default -.endif - -CONFIGURE_ARGS+= --enable-odbc -CONFIGURE_ARGS+= --without-iodbc -CONFIGURE_ARGS+= --without-unixodbc - -CONFIGURE_ARGS+= --without-java -CONFIGURE_ARGS+= --without-perl -CONFIGURE_ARGS+= --without-python -CONFIGURE_ARGS+= --without-tcl -CONFIGURE_ARGS+= --without-tk - -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/pgsql -CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/html/postgresql -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} - -CONFIGURE_ARGS+= --disable-readline -CONFIGURE_ARGS+= --enable-locale -CONFIGURE_ARGS+= --enable-syslog -CONFIGURE_ARGS+= --with-CXX -CONFIGURE_ARGS+= --with-template=${LOWER_OPSYS:Q} - -BUILD_DIRS= ${WRKSRC}/src/interfaces/odbc - -.include "../../security/openssl/buildlink3.mk" diff --git a/databases/odbc-postgresql/PLIST b/databases/odbc-postgresql/PLIST index 8f46514edf7..c6828d9fa5e 100644 --- a/databases/odbc-postgresql/PLIST +++ b/databases/odbc-postgresql/PLIST @@ -1,7 +1,18 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:36:20 joerg Exp $ -lib/libpsqlodbc.a -lib/libpsqlodbc.so -lib/libpsqlodbc.so.0 -lib/libpsqlodbc.so.0.27 -share/postgresql/odbc.sql +@comment $NetBSD: PLIST,v 1.6 2010/12/25 08:37:31 adam Exp $ +lib/psqlodbcw.la +share/doc/postgresql/odbc/config-opt.html +share/doc/postgresql/odbc/config.html +share/doc/postgresql/odbc/faq.html +share/doc/postgresql/odbc/howto-accesslo.html +share/doc/postgresql/odbc/howto-accessvba.html +share/doc/postgresql/odbc/howto-bo.html +share/doc/postgresql/odbc/howto-ch.html +share/doc/postgresql/odbc/howto-csharp.html +share/doc/postgresql/odbc/howto-vb.html +share/doc/postgresql/odbc/howto-vblo.html +share/doc/postgresql/odbc/index.html +share/doc/postgresql/odbc/release.html +share/doc/postgresql/odbc/unix-compilation.html +share/doc/postgresql/odbc/win32-compilation.html share/postgresql/odbc-drop.sql +share/postgresql/odbc.sql diff --git a/databases/odbc-postgresql/distinfo b/databases/odbc-postgresql/distinfo index 27d96c48993..c3511e67ed7 100644 --- a/databases/odbc-postgresql/distinfo +++ b/databases/odbc-postgresql/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.7 2006/01/02 18:08:35 joerg Exp $ +$NetBSD: distinfo,v 1.8 2010/12/25 08:37:31 adam Exp $ -SHA1 (postgresql-7.2.3.tar.gz) = f98acadb3b06ea0f09f82857ca880ec198e3c791 -RMD160 (postgresql-7.2.3.tar.gz) = 5a99a763bb00d7f36dd606ed4b73e17a1a74487b -Size (postgresql-7.2.3.tar.gz) = 9244039 bytes -SHA1 (patch-aa) = 31f73fec94a37386362be7587163cd9650a853ca -SHA1 (patch-ab) = 631ff6e24af142ebbb14bb19e61108af9db698d7 -SHA1 (patch-ac) = 2a30450035f310b293e13bf5db94f725859b86de +SHA1 (psqlodbc-09.00.0200.tar.gz) = 97ea5394925c239dfb9a8f259e77df5879f26b15 +RMD160 (psqlodbc-09.00.0200.tar.gz) = f13d47e3ac70b090976981ceedb8d39cb266fa19 +Size (psqlodbc-09.00.0200.tar.gz) = 768547 bytes diff --git a/databases/odbc-postgresql/patches/patch-aa b/databases/odbc-postgresql/patches/patch-aa deleted file mode 100644 index f61f8b05601..00000000000 --- a/databases/odbc-postgresql/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2006/01/02 18:08:35 joerg Exp $ - ---- src/Makefile.shlib.orig 2001-11-11 19:20:53.000000000 +0000 -+++ src/Makefile.shlib -@@ -137,6 +137,11 @@ ifeq ($(PORTNAME), bsdi) - endif - endif - -+ifeq ($(PORTNAME), dragonfly) -+ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -+ LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) -+endif -+ - ifeq ($(PORTNAME), freebsd) - ifdef ELF_SYSTEM - shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) diff --git a/databases/odbc-postgresql/patches/patch-ab b/databases/odbc-postgresql/patches/patch-ab deleted file mode 100644 index 6f9bf53bfb6..00000000000 --- a/databases/odbc-postgresql/patches/patch-ab +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/10/19 03:51:03 jlam Exp $ - ---- configure.in.orig Mon Sep 30 23:34:28 2002 -+++ configure.in -@@ -150,6 +150,15 @@ PGAC_ARG_REQ(with, libs, [ --with- - - - # -+# Readline support -+# -+AC_MSG_CHECKING([whether to build with readline support]) -+PGAC_ARG_BOOL(enable, readline, yes, -+ [ --disable-readline disable readline support]) -+AC_MSG_RESULT([$enable_readline]) -+ -+ -+# - # Locale (--enable-locale) - # - AC_MSG_CHECKING([whether to build with locale support]) -@@ -398,6 +407,18 @@ PGAC_ARG_BOOL(with, python, no, [ --wit - AC_MSG_RESULT([$with_python]) - AC_SUBST(with_python) - -+# If python is enabled (above), then optionally byte-compile the modules. -+AC_MSG_CHECKING([whether to byte-compile Python modules]) -+if test "$with_python" = yes; then -+ PGAC_ARG_BOOL(with, python_compile, no, -+ [ --with-python-compile byte-compile modules if Python is enabled]) -+else -+ with_python_compile=no -+fi -+AC_MSG_RESULT([$with_python_compile]) -+AC_SUBST([with_python_compile]) -+ -+ - # - # Optionally build the Java/JDBC tools - # -@@ -682,8 +703,10 @@ fi - ## Libraries - ## - -+if test "$enable_readline" = yes; then - PGAC_CHECK_READLINE - AC_SEARCH_LIBS(using_history, history, [AC_DEFINE(HAVE_HISTORY_FUNCTIONS)]) -+fi - - if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" - then diff --git a/databases/odbc-postgresql/patches/patch-ac b/databases/odbc-postgresql/patches/patch-ac deleted file mode 100644 index 2b647dc41f4..00000000000 --- a/databases/odbc-postgresql/patches/patch-ac +++ /dev/null @@ -1,135 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2006/01/02 18:08:35 joerg Exp $ - ---- configure.orig 2002-10-01 03:34:27.000000000 +0000 -+++ configure -@@ -19,6 +19,8 @@ ac_help="$ac_help - ac_help="$ac_help - --with-libs=DIRS alternative spelling of --with-libraries" - ac_help="$ac_help -+ --disable-readline disable readline support" -+ac_help="$ac_help - --enable-locale enable locale support" - ac_help="$ac_help - --enable-recode enable character set recode support" -@@ -53,6 +55,8 @@ ac_help="$ac_help - ac_help="$ac_help - --with-python build Python interface module" - ac_help="$ac_help -+ --with-python-compile byte-compile modules if Python is enabled" -+ac_help="$ac_help - --with-java build JDBC interface and Java tools" - ac_help="$ac_help - --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" -@@ -694,6 +698,7 @@ case $host_os in - darwin*) template=darwin ;; - dgux*) template=dgux ;; - freebsd*) template=freebsd ;; -+dragonfly*) template=dragonfly ;; - hpux*) template=hpux ;; - irix*) template=irix5 ;; - linux*) template=linux ;; -@@ -817,6 +822,32 @@ fi - - - # -+# Readline support -+# -+echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6 -+echo "configure:828: checking whether to build with readline support" >&5 -+# Check whether --enable-readline was given -+if test x"${enable_readline+set}" = xset; then -+ case $enable_readline in -+ yes) -+ : -+ ;; -+ no) -+ : -+ ;; -+ *) -+ enableval=$enable_readline -+ { echo "configure: error: no argument expected for --enable-readline option" 1>&2; exit 1; } -+ ;; -+ esac # $enable_readline -+else -+ enable_readline=yes -+ -+fi -+echo "$ac_t""$enable_readline" 1>&6 -+ -+ -+# - # Locale (--enable-locale) - # - echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -@@ -1859,6 +1890,35 @@ fi - echo "$ac_t""$with_python" 1>&6 - - -+# If python is enabled (above), then optionally byte-compile the modules. -+echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6 -+echo "configure:1895: checking whether to byte-compile Python modules" >&5 -+if test "$with_python" = yes; then -+ # Check whether --with-python_compile was given -+if test x"${with_python_compile+set}" = xset; then -+ case $with_python_compile in -+ yes) -+ : -+ ;; -+ no) -+ : -+ ;; -+ *) -+ withval=$with_python_compile -+ { echo "configure: error: no argument expected for --with-python_compile option" 1>&2; exit 1; } -+ ;; -+ esac # $with_python_compile -+else -+ with_python_compile=no -+ -+fi -+else -+ with_python_compile=no -+fi -+echo "$ac_t""$with_python_compile" 1>&6 -+ -+ -+ - # - # Optionally build the Java/JDBC tools - # -@@ -2287,6 +2347,7 @@ fi - case $host_os in - freebsd1*|freebsd2*) elf=no;; - freebsd3*|freebsd4*) elf=yes;; -+ dragonfly*) elf=yes;; - esac - - cat > conftest.$ac_ext <<EOF -@@ -3282,9 +3343,10 @@ fi - ## Libraries - ## - -+if test "$enable_readline" = yes; then - - echo $ac_n "checking for readline""... $ac_c" 1>&6 --echo "configure:3288: checking for readline" >&5 -+echo "configure:3348: checking for readline" >&5 - - if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3408,6 +3470,7 @@ EOF - else : - - fi -+fi - - if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" - then -@@ -9007,6 +9070,7 @@ s%@with_tcl@%$with_tcl%g - s%@with_tk@%$with_tk%g - s%@with_perl@%$with_perl%g - s%@with_python@%$with_python%g -+s%@with_python_compile@%$with_python_compile%g - s%@ANT@%$ANT%g - s%@with_java@%$with_java%g - s%@with_krb4@%$with_krb4%g |