From 34f7cddebdb9179ef571707a4e7a08d6a875e2d9 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 19 Oct 2002 03:51:00 +0000 Subject: Update databases/odbc-postgresql to version 7.2.3. Pkgsrc changes include Splitting out a common Makefile for future unixodbc-postgresql and iodbc-postgresql packages. Changes from version 7.1.3 include: Remove query size limit (Hiroshi) Remove text field size limit (Hiroshi) Fix for SQLPrimaryKeys in multibyte mode (Hiroshi) Allow ODBC procedure calls (Hiroshi) Improve boolean handing (Aidan Mountford) Most configuration options on setable via DSN (Hiroshi) Multibyte, performance fixes (Hiroshi) Allow driver to be used with iODBC or unixODBC (Peter E) MD5 password encryption support (Bruce) Add more compatibility functions to odbc.sql (Peter E) --- databases/odbc-postgresql/MESSAGE | 4 +- databases/odbc-postgresql/Makefile | 77 ++---------------------------- databases/odbc-postgresql/Makefile.common | 69 ++++++++++++++++++++++++++ databases/odbc-postgresql/PLIST | 9 ++-- databases/odbc-postgresql/distinfo | 13 ++--- databases/odbc-postgresql/patches/patch-aa | 13 ----- databases/odbc-postgresql/patches/patch-ab | 12 ++--- databases/odbc-postgresql/patches/patch-ac | 65 +++++++------------------ databases/odbc-postgresql/patches/patch-ad | 12 ----- databases/odbc-postgresql/patches/patch-ae | 15 ------ 10 files changed, 105 insertions(+), 184 deletions(-) create mode 100644 databases/odbc-postgresql/Makefile.common delete mode 100644 databases/odbc-postgresql/patches/patch-aa delete mode 100644 databases/odbc-postgresql/patches/patch-ad delete mode 100644 databases/odbc-postgresql/patches/patch-ae (limited to 'databases') diff --git a/databases/odbc-postgresql/MESSAGE b/databases/odbc-postgresql/MESSAGE index 040b0fa4ec2..068754ffe1b 100644 --- a/databases/odbc-postgresql/MESSAGE +++ b/databases/odbc-postgresql/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2001/11/01 00:11:56 zuntum Exp $ +$NetBSD: MESSAGE,v 1.2 2002/10/19 03:51:00 jlam Exp $ Please see the ODBC interface section of the PostgreSQL Programmer's Guide (databases/postgresql-docs) for information on configuring and using @@ -7,7 +7,7 @@ ${PKGNAME}. In summary, you will need to create the following configuration file: - /etc/odbcinst.ini + ${PKG_SYSCONFDIR}/odbcinst.ini and add the ODBC compliance functions in diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile index 8f22bfb5208..4e35960dc4f 100644 --- a/databases/odbc-postgresql/Makefile +++ b/databases/odbc-postgresql/Makefile @@ -1,81 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2002/04/03 09:29:55 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/10/19 03:51:00 jlam Exp $ -DISTNAME= postgresql-${DIST_VERS} -PKGNAME= odbc-postgresql-${BASE_VERS} -CATEGORIES= databases -PGSQL_SITES= http://www.postgresql.org/ftpsite/ \ - ftp://ftp.postgresql.org/pub/ \ - ftp://ftp.de.postgresql.org/pub/ \ - ftp://ch.postgresql.org/mirror/postgresql/ \ - ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/ \ - ftp://looking-glass.usask.ca/pub/postgresql/ \ - ftp://ftp.sunsite.auc.dk/mirrors/postgresql/ \ - ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/ -MASTER_SITES?= ${PGSQL_SITES:=source/v${DIST_VERS}/} +.include "Makefile.common" -MAINTAINER= jwise@netbsd.org +PKGNAME= odbc-postgresql-${BASE_VERS} COMMENT= ODBC interface to PostgreSQL -HOMEPAGE= http://odbc.postgresql.org/ - -CONFLICTS+= postgresql-[0-6]* postgresql-7.0* - -# Version numbering scheme: -# -# DIST_VERS version number on the postgresql distfile -# BASE_VERS pkgsrc-mangled version number (convert pl -> .) -# -DIST_VERS?= 7.1.3 -BASE_VERS?= ${DIST_VERS} - -USE_BUILDLINK_ONLY= YES -USE_GMAKE= YES -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} -.else -CONFIGURE_ARGS+= --enable-multibyte # accept default -.endif - -CONFIGURE_ARGS+= --with-odbc CONFIGURE_ARGS+= --with-odbcinst=${PKG_SYSCONFDIR} -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=${BUILDLINK_DIR} - -CONFIGURE_ARGS+= --disable-readline -CONFIGURE_ARGS+= --enable-locale -CONFIGURE_ARGS+= --enable-syslog -CONFIGURE_ARGS+= --with-CXX -CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" - -DIRS_TO_BUILD= src/interfaces/odbc - -do-build: -.for DIR in ${DIRS_TO_BUILD} - cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET} -.endfor - -do-install: -.for DIR in ${DIRS_TO_BUILD} - cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.endfor .include "../../mk/bsd.pkg.mk" diff --git a/databases/odbc-postgresql/Makefile.common b/databases/odbc-postgresql/Makefile.common new file mode 100644 index 00000000000..44ced3509f8 --- /dev/null +++ b/databases/odbc-postgresql/Makefile.common @@ -0,0 +1,69 @@ +# $NetBSD: Makefile.common,v 1.1 2002/10/19 03:51:01 jlam Exp $ + +DISTNAME= postgresql-${DIST_VERS} +CATEGORIES= databases +PGSQL_SITES= http://www.postgresql.org/ftpsite/ \ + ftp://ftp.postgresql.org/pub/ \ + ftp://ftp.de.postgresql.org/pub/ \ + ftp://ch.postgresql.org/mirror/postgresql/ \ + ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/ \ + ftp://looking-glass.usask.ca/pub/postgresql/ \ + ftp://ftp.sunsite.auc.dk/mirrors/postgresql/ \ + ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/ +MASTER_SITES?= ${PGSQL_SITES:=source/v${DIST_VERS}/} + +MAINTAINER= jlam@netbsd.org +HOMEPAGE= http://odbc.postgresql.org/ + +CONFLICTS+= postgresql-[0-6]* postgresql-7.0* +CONFLICTS+= unixodbc-postgresql-[0-9]* iodbc-postgresql-[0-9]* + +# 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_BUILDLINK2= YES +USE_GMAKE= YES +MAKEFILE= 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} +.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} + +CONFIGURE_ARGS+= --disable-readline +CONFIGURE_ARGS+= --enable-locale +CONFIGURE_ARGS+= --enable-syslog +CONFIGURE_ARGS+= --with-CXX +CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" + +BUILD_DIRS= ${WRKSRC}/src/interfaces/odbc diff --git a/databases/odbc-postgresql/PLIST b/databases/odbc-postgresql/PLIST index 3a0fa7b6a55..d77359a3dea 100644 --- a/databases/odbc-postgresql/PLIST +++ b/databases/odbc-postgresql/PLIST @@ -1,11 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2002/04/03 09:24:08 jlam Exp $ -include/pgsql/iodbc/iodbc.h -include/pgsql/iodbc/isql.h -include/pgsql/iodbc/isqlext.h +@comment $NetBSD: PLIST,v 1.4 2002/10/19 03:51:01 jlam Exp $ lib/libpsqlodbc.a lib/libpsqlodbc.so lib/libpsqlodbc.so.0 -lib/libpsqlodbc.so.0.26 +lib/libpsqlodbc.so.0.27 share/postgresql/odbc.sql +share/postgresql/odbc-drop.sql @unexec ${RMDIR} -p %D/share/postgresql 2>/dev/null || ${TRUE} -@unexec ${RMDIR} -p %D/include/pgsql/iodbc 2>/dev/null || ${TRUE} diff --git a/databases/odbc-postgresql/distinfo b/databases/odbc-postgresql/distinfo index b3bff95aec7..8509937bd3b 100644 --- a/databases/odbc-postgresql/distinfo +++ b/databases/odbc-postgresql/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/04/03 09:36:21 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/10/19 03:51:01 jlam Exp $ -SHA1 (postgresql-7.1.3.tar.gz) = d969d73af499e87a7ad052cab5efe6ca9d1d7085 -Size (postgresql-7.1.3.tar.gz) = 8124455 bytes -SHA1 (patch-aa) = 5e83cfb8825b700782405504d56ec87016caf0ff -SHA1 (patch-ab) = f2f108d8a588fe853fcaff5b2d3c1e7b4ddc1d7a -SHA1 (patch-ac) = b54e4cc3618fc2177aa45e34119f5a0132322fb6 -SHA1 (patch-ad) = ebee6367ae28637c0f12913b67ec5069d5840126 -SHA1 (patch-ae) = dbea72e3ee352d0809fe7a88cf973877f82e5dfe +SHA1 (postgresql-7.2.3.tar.gz) = f98acadb3b06ea0f09f82857ca880ec198e3c791 +Size (postgresql-7.2.3.tar.gz) = 9244039 bytes +SHA1 (patch-ab) = 631ff6e24af142ebbb14bb19e61108af9db698d7 +SHA1 (patch-ac) = 8e3556f9a513bf6d5f0099b0e43f55dc73870606 diff --git a/databases/odbc-postgresql/patches/patch-aa b/databases/odbc-postgresql/patches/patch-aa deleted file mode 100644 index db9ea538360..00000000000 --- a/databases/odbc-postgresql/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2002/04/03 09:29:55 jlam Exp $ - ---- config/programs.m4.orig Sat Feb 10 14:31:42 2001 -+++ config/programs.m4 -@@ -85,7 +85,7 @@ - for pgac_rllib in -lreadline -ledit ; do - pgac_save_LIBS=$LIBS - LIBS="${pgac_rllib}${pgac_lib} $LIBS" -- AC_TRY_LINK_FUNC([readline], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2]) -+ AC_TRY_LINK_FUNC([readline], AC_TRY_RUN([int main() { return 0; }], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2])) - LIBS=$pgac_save_LIBS - done - done diff --git a/databases/odbc-postgresql/patches/patch-ab b/databases/odbc-postgresql/patches/patch-ab index 95ea1d2705d..6f9bf53bfb6 100644 --- a/databases/odbc-postgresql/patches/patch-ab +++ b/databases/odbc-postgresql/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2002/04/03 09:29:55 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2002/10/19 03:51:03 jlam Exp $ ---- configure.in.orig Thu Aug 16 11:36:31 2001 +--- configure.in.orig Mon Sep 30 23:34:28 2002 +++ configure.in -@@ -150,6 +150,15 @@ +@@ -150,6 +150,15 @@ PGAC_ARG_REQ(with, libs, [ --with- # @@ -18,8 +18,8 @@ $NetBSD: patch-ab,v 1.1 2002/04/03 09:29:55 jlam Exp $ # Locale (--enable-locale) # AC_MSG_CHECKING([whether to build with locale support]) -@@ -401,6 +410,18 @@ - [AC_MSG_RESULT(no)]) +@@ -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. @@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.1 2002/04/03 09:29:55 jlam Exp $ # # Optionally build the Java/JDBC tools # -@@ -649,8 +670,10 @@ +@@ -682,8 +703,10 @@ fi ## Libraries ## diff --git a/databases/odbc-postgresql/patches/patch-ac b/databases/odbc-postgresql/patches/patch-ac index 8f12225ff0e..d3e2641f669 100644 --- a/databases/odbc-postgresql/patches/patch-ac +++ b/databases/odbc-postgresql/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2002/10/19 03:51:03 jlam Exp $ ---- configure.orig Thu Aug 16 11:36:31 2001 +--- configure.orig Mon Sep 30 23:34:27 2002 +++ configure -@@ -19,6 +19,8 @@ +@@ -19,6 +19,8 @@ ac_help="$ac_help ac_help="$ac_help --with-libs=DIRS alternative spelling of --with-libraries" ac_help="$ac_help @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ --enable-locale enable locale support" ac_help="$ac_help --enable-recode enable character set recode support" -@@ -53,6 +55,8 @@ +@@ -53,6 +55,8 @@ ac_help="$ac_help ac_help="$ac_help --with-python build Python interface module" ac_help="$ac_help @@ -20,14 +20,14 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ --with-java build JDBC interface and Java tools" ac_help="$ac_help --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" -@@ -811,6 +815,32 @@ +@@ -817,6 +821,32 @@ fi # +# Readline support +# +echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6 -+echo "configure:822: checking whether to build with readline support" >&5 ++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 @@ -53,13 +53,13 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -@@ -1905,6 +1935,35 @@ - fi +@@ -1859,6 +1889,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:1941: checking whether to byte-compile Python modules" >&5 ++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 @@ -89,50 +89,19 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ # # Optionally build the Java/JDBC tools # -@@ -3095,8 +3154,9 @@ +@@ -3282,9 +3341,10 @@ fi ## Libraries ## +if test "$enable_readline" = yes; then + echo $ac_n "checking for readline""... $ac_c" 1>&6 --echo "configure:3100: checking for readline" >&5 -+echo "configure:3160: checking for readline" >&5 +-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 -@@ -3118,13 +3178,30 @@ - readline() - ; return 0; } - EOF --if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2 - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi -+rm -fr conftest* -+fi -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi - rm -f conftest* - LIBS=$pgac_save_LIBS - done -@@ -3208,6 +3285,7 @@ +@@ -3408,6 +3468,7 @@ EOF else : fi @@ -140,9 +109,9 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then -@@ -8103,6 +8181,7 @@ - s%@python_moduledir@%$python_moduledir%g - s%@python_extmakefile@%$python_extmakefile%g +@@ -9007,6 +9068,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 diff --git a/databases/odbc-postgresql/patches/patch-ad b/databases/odbc-postgresql/patches/patch-ad deleted file mode 100644 index 85d79f69cac..00000000000 --- a/databases/odbc-postgresql/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/04/03 09:29:56 jlam Exp $ - ---- src/interfaces/odbc/GNUmakefile.orig Mon Mar 26 01:34:17 2001 -+++ src/interfaces/odbc/GNUmakefile -@@ -44,7 +44,6 @@ - - install: all installdirs - for i in $(odbc_headers); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(odbc_includedir)/$$i || exit 1; done -- $(INSTALL_DATA) $(srcdir)/odbcinst.ini $(DESTDIR)$(odbcinst_ini_dir)/odbcinst.ini - $(INSTALL_DATA) $(srcdir)/odbc.sql $(DESTDIR)$(datadir)/odbc.sql - $(MAKE) install-lib - diff --git a/databases/odbc-postgresql/patches/patch-ae b/databases/odbc-postgresql/patches/patch-ae deleted file mode 100644 index 678733f08e7..00000000000 --- a/databases/odbc-postgresql/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2002/04/03 09:29:56 jlam Exp $ - ---- src/makefiles/Makefile.netbsd.orig Sat Dec 16 10:14:25 2000 -+++ src/makefiles/Makefile.netbsd -@@ -3,7 +3,9 @@ - ifdef ELF_SYSTEM - export_dynamic = -Wl,-E - rpath = -Wl,-R$(libdir) --shlib_symbolic = -Wl,-Bsymbolic -+shlib_symbolic = -Wl,-Bsymbolic -lc -+else -+rpath = -R$(libdir) - endif - - DLSUFFIX = .so -- cgit v1.2.3