From 044deef78e277ab669e90cb5d6fdd67285896a20 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 8 May 2008 13:28:39 +0000 Subject: Update freetds to version 0.82. Changes from version 0.63 include: Pkgsrc changes: + Support user-destdir installation. + Document the way that pkgsrc handles the freetds documentation. + Use GENERATE_PLIST instead of creating a .PLIST.doc. + Remove patch-ac and patch-ad due to reports of success compiling FreeTDS on Mac OS X without changes on the freetds@ mailing list. Package changes: - libtds.* has been removed. Its objects are now linked directly into the other client libraries. - support TLSv1 sessions to MSSQL servers - fixed timeout handling - added protocol version discovery - reduced network bandwidth use on Linux and -BSD - fixed conversion NUMERIC->NUMERIC changing precision/scale - added named instance support (mssql2k) - many other code improvements and bug fixes - improved pool server - ODBC: - cursors (mssql) - fixed database setting - fixed SQLGetData result - fixed compute handling in ODBC - paramset support --- databases/freetds/Makefile | 69 ++++++++++++++++++++------------------ databases/freetds/PLIST | 19 +++++++---- databases/freetds/buildlink3.mk | 17 ++++++++-- databases/freetds/distinfo | 10 +++--- databases/freetds/options.mk | 25 ++++++++++++-- databases/freetds/patches/patch-ac | 6 ---- databases/freetds/patches/patch-ad | 18 ---------- 7 files changed, 89 insertions(+), 75 deletions(-) delete mode 100644 databases/freetds/patches/patch-ac delete mode 100644 databases/freetds/patches/patch-ad diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index cec5acf08d9..9e10c16cba0 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,60 +1,63 @@ -# $NetBSD: Makefile,v 1.35 2007/09/25 10:03:52 hira Exp $ +# $NetBSD: Makefile,v 1.36 2008/05/08 13:28:39 jlam Exp $ -DISTNAME= freetds-0.63 -PKGREVISION= 4 +DISTNAME= freetds-0.82 CATEGORIES= databases -MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/ +MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/ \ + ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/old/ \ + ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/current/ MAINTAINER= tsarna@NetBSD.org HOMEPAGE= http://www.freetds.org/ -COMMENT= LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs +COMMENT= Implementation of TDS protocol used by Sybase and MS-SQL servers -USE_LIBTOOL= yes -USE_TOOLS+= gmake +PKG_DESTDIR_SUPPORT= user-destdir .include "options.mk" +USE_LIBTOOL= yes +USE_GNU_READLINE= yes # rl_on_new_line, rl_reset_line_state GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --datadir=${PREFIX}/share -CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} +CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv:Q} CONFIGURE_ARGS+= --with-tdsver=7.0 # no thread-safe resolver functions on NetBSD CONFIGURE_ARGS+= --disable-threadsafe -INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} ETC=${EGDIR:Q} DOCDIR=doc/${PKGBASE:Q} - +DOCDIR= ${PREFIX}/share/doc/freetds EGDIR= ${PREFIX}/share/examples/freetds -CONF_FILES= ${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf +CONF_FILES+= ${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf CONF_FILES+= ${EGDIR}/locales.conf ${PKG_SYSCONFDIR}/locales.conf CONF_FILES+= ${EGDIR}/pool.conf ${PKG_SYSCONFDIR}/pool.conf -.include "../../converters/libiconv/buildlink3.mk" - -PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/.PLIST.doc - -# Workaround a weird problem in the source Makefiles that prevents -# easily changing the installation directory for the documentation. +# doc/Makefile ignores TARGET_DOCDIR for the files listed in +# nobase_data_DATA. Make the Makefiles think the documentation is +# in doc/freetds through symlinks and by overriding DOCDIR. # +MAKE_FLAGS+= DOCDIR=doc/freetds +INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} ETC=${DESTDIR}${EGDIR:Q} + pre-build: - cd ${WRKSRC}/doc/doc && ln -s ${PKGNAME_NOREV:Q} ${PKGBASE:Q} + cd ${WRKSRC}/doc/doc && ln -s ${DISTNAME:Q} freetds -# Dynamically generate PLIST entries for the documentation. This target -# may need to be modified for future FreeTDS releases. +# The FreeTDS documentation is generated by doxygen and the file names +# change from release to release. Rather than having the PLIST change +# radically between releases, just generate the documentation entries +# dynamically for the PLIST. # -${WRKDIR}/.PLIST.doc: - { cd ${WRKSRC}/doc/doc/${PKGNAME_NOREV}; \ - find reference userguide \( -type f -o -type l \) -print; \ - cd ${WRKSRC}/doc; \ - find images -name \*.gif -print; \ - } | sed "s,^,share/doc/"${PKGBASE:Q}"/," | sort -u \ - > ${.TARGET} - { cd ${WRKSRC}/doc/doc/${PKGNAME_NOREV}; \ - find reference userguide -type d -print; \ - ${ECHO} "images"; \ - } | sed "s,^,@dirrm share/doc/"${PKGBASE:Q}"/," | sort -ur \ - >> ${.TARGET} - ${ECHO} "@dirrm share/doc/"${PKGBASE:Q} >> ${.TARGET} +GENERATE_PLIST+= \ + ${ECHO} "@comment The following lines are automatically generated." && \ + ( cd ${WRKSRC}/doc/doc/${DISTNAME} && \ + ${FIND} reference userguide \! -type d -print && \ + cd ${WRKSRC}/doc && ${FIND} images -name "*.gif" -print ) | \ + ${SED} -e "s,^,"${DOCDIR:S|${PREFIX}/||:Q}"/," | ${SORT} && \ + ( cd ${WRKSRC}/doc/doc/${DISTNAME} && \ + ${FIND} reference userguide -type d -print && \ + cd ${WRKSRC}/doc && ${FIND} images -type d -print ) | \ + ${SED} -e "s,^,@dirrm "${DOCDIR:S|${PREFIX}/||:Q}"/," | ${SORT} -r && \ + ${ECHO} "@dirrm "${DOCDIR:S|${PREFIX}/||:Q}; +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST index ea5fac1dc8e..db3e6f4deb8 100644 --- a/databases/freetds/PLIST +++ b/databases/freetds/PLIST @@ -1,7 +1,11 @@ -@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:42:59 jlam Exp $ +@comment $NetBSD: PLIST,v 1.17 2008/05/08 13:28:39 jlam Exp $ bin/bsqldb +${PLIST.odbc}bin/bsqlodbc +bin/datacopy bin/defncopy +bin/fisql bin/freebcp +bin/osql bin/tdspool bin/tsql include/bkpublic.h @@ -13,20 +17,21 @@ include/sqlfront.h include/sybdb.h include/syberror.h include/sybfront.h -include/tds.h include/tds_sysdep_public.h -include/tdsconvert.h -include/tdssrv.h -include/tdsver.h lib/libct.la lib/libsybdb.la -lib/libtds.la ${PLIST.odbc}lib/libtdsodbc.la -lib/libtdssrv.la man/man1/bsqldb.1 +man/man1/bsqlodbc.1 +man/man1/datacopy.1 man/man1/defncopy.1 +man/man1/fisql.1 man/man1/freebcp.1 +man/man1/osql.1 man/man1/tsql.1 +man/man5/freetds.conf.5 +share/doc/freetds/reference/index.html +share/doc/freetds/userguide/index.htm share/examples/freetds/freetds.conf share/examples/freetds/locales.conf share/examples/freetds/pool.conf diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk index f6cd4a89215..ba79f0a601e 100644 --- a/databases/freetds/buildlink3.mk +++ b/databases/freetds/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2008/05/08 13:28:39 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETDS_BUILDLINK3_MK:= ${FREETDS_BUILDLINK3_MK}+ @@ -12,11 +12,22 @@ BUILDLINK_PACKAGES+= freetds BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}freetds .if !empty(FREETDS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63nb2 -BUILDLINK_ABI_DEPENDS.freetds?= freetds>=0.63nb4 +BUILDLINK_API_DEPENDS.freetds+= freetds>=0.82 +BUILDLINK_ABI_DEPENDS.freetds?= freetds>=0.82 BUILDLINK_PKGSRCDIR.freetds?= ../../databases/freetds .endif # FREETDS_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" +pkgbase := freetds +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_BUILD_OPTIONS.freetds:Mgnutls) +. include "../../security/gnutls/buildlink3.mk" +.endif + +.if !empty(PKG_BUILD_OPTIONS.freetds:Mopenssl) +. include "../../security/openssl/buildlink3.mk" +.endif + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo index 48b8eb66260..80444557f30 100644 --- a/databases/freetds/distinfo +++ b/databases/freetds/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.15 2006/03/03 19:34:42 kristerw Exp $ +$NetBSD: distinfo,v 1.16 2008/05/08 13:28:39 jlam Exp $ -SHA1 (freetds-0.63.tar.gz) = b95e630524800155af8fa04e78b5b834120cf48f -RMD160 (freetds-0.63.tar.gz) = ee132f757f698cfc8dabc612012eb8f2486e66dd -Size (freetds-0.63.tar.gz) = 1321466 bytes -SHA1 (patch-ac) = f757e56e3229ba268af73ac4779887a47b70cbef -SHA1 (patch-ad) = 801cf498d29d51b27f6104a95c3340532c772f40 +SHA1 (freetds-0.82.tar.gz) = 7e2a0c9e41c240c2d1c7f69c6f278e9a5bb80c2d +RMD160 (freetds-0.82.tar.gz) = d3596c512022332cdb3bab375950159f1e930a4b +Size (freetds-0.82.tar.gz) = 1596755 bytes diff --git a/databases/freetds/options.mk b/databases/freetds/options.mk index ac89d090fd3..d161ee0f590 100644 --- a/databases/freetds/options.mk +++ b/databases/freetds/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2008/05/08 13:28:39 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freetds -PKG_OPTIONS_OPTIONAL_GROUPS+= odbc +PKG_OPTIONS_OPTIONAL_GROUPS+= odbc tls PKG_OPTIONS_GROUP.odbc= iodbc #unixodbc +PKG_OPTIONS_GROUP.tls= gnutls openssl .include "../../mk/bsd.options.mk" @@ -32,3 +33,23 @@ PLIST.odbc= yes .if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc) CONFIGURE_ARGS+= --disable-odbc .endif + +### +### Use GNU TLS for TLSv1 encrypted session to MSSQL servers. +### +.if !empty(PKG_OPTIONS:Mgnutls) +.include "../../security/gnutls/buildlink3.mk" +CONFIGURE_ARGS+= --with-gnutls +.else +CONFIGURE_ARGS+= --without-gnutls +.endif + +### +### Use OpenSSL for TLSv1 encrypted session to MSSQL servers. +### +.if !empty(PKG_OPTIONS:Mopenssl) +.include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl:Q} +.else +CONFIGURE_ARGS+= --without-openssl +.endif diff --git a/databases/freetds/patches/patch-ac b/databases/freetds/patches/patch-ac deleted file mode 100644 index f977fe81640..00000000000 --- a/databases/freetds/patches/patch-ac +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2004/05/23 18:23:51 danw Exp $ - ---- src/replacements/dummy.c.orig Sun May 23 14:00:52 2004 -+++ src/replacements/dummy.c -@@ -0,0 +1 @@ -+int libreplacements_dummy; diff --git a/databases/freetds/patches/patch-ad b/databases/freetds/patches/patch-ad deleted file mode 100644 index 847cadff019..00000000000 --- a/databases/freetds/patches/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2006/03/03 19:34:42 kristerw Exp $ - ---- src/replacements/Makefile.in.orig 2005-03-30 02:51:58.000000000 +0200 -+++ src/replacements/Makefile.in 2005-10-09 14:21:59.000000000 +0200 -@@ -174,3 +174,3 @@ - noinst_LTLIBRARIES = libreplacements.la --libreplacements_la_SOURCES = iconv.c -+libreplacements_la_SOURCES = iconv.c dummy.c - libreplacements_la_LDFLAGS = -@@ -184,7 +184,7 @@ - LTLIBRARIES = $(noinst_LTLIBRARIES) - - libreplacements_la_DEPENDENCIES = @LTLIBOBJS@ --am_libreplacements_la_OBJECTS = iconv.lo -+am_libreplacements_la_OBJECTS = iconv.lo dummy.lo - libreplacements_la_OBJECTS = $(am_libreplacements_la_OBJECTS) - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -- cgit v1.2.3