--- databases/freetds/Makefile.orig 2008-12-04 18:53:52.000000000 -0500 +++ databases/freetds/Makefile 2008-12-04 22:30:17.000000000 -0500 @@ -5,15 +5,17 @@ # $FreeBSD: ports/databases/freetds/Makefile,v 1.51 2008/08/20 00:56:30 ade Exp $ PORTNAME= freetds -PORTVERSION= 0.64 -PORTREVISION= 2 +PORTVERSION= 0.82.1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/${PORTNAME}/stable +DISTNAME= freetds-patched +EXTRACT_SUFX= .tgz -MAINTAINER?= ports@FreeBSD.org +MAINTAINER= cowbert@gmail.com COMMENT= Sybase/Microsoft TDS protocol library +WRKSRC= ${WRKDIR}/freetds-0.82.1.dev.20081111 TDS_VER?= 5.0 USE_ICONV= yes @@ -25,8 +27,19 @@ CONFIGURE_ARGS= --with-tdsver=${TDS_VER} USE_LDCONFIG= yes -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -MAN1= datacopy.1 freebcp.1 tsql.1 bsqldb.1 defncopy.1 +PORTDOCS= * + +MAN1= datacopy.1 freebcp.1 tsql.1 bsqldb.1 bsqlodbc.1 \ + defncopy.1 fisql.1 osql.1 + +MAN5= freetds.conf.5 + +OPTIONS= OPENSSL "Use openssl" off \ + IODBC "Use iodbc (Mutually Exclusive)" off \ + UNIXODBC "Use unixodbc (Mutually Exclusive)" off \ + MSDBLIB "MS SQL Server support (breaks databases/sybtcl)" off + +.include .if defined(WITH_OPENSSL) USE_OPENSSL= yes @@ -43,6 +56,10 @@ CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE} .endif +.if defined(WITH_IODBC) && defined(WITH_UNIXODBC) +IGNORE= selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC +.endif + .if defined(WITH_IODBC) || defined(WITH_UNIXODBC) PLIST_SUB+= ODBC="" .else @@ -53,10 +70,7 @@ # relies on sybase-style dblib .if defined(WITH_MSDBLIB) CONFIGURE_ARGS+= --enable-msdblib -.endif - -.if defined(NOPORTDOCS) -EXTRA_PATCHES= ${PATCHDIR}/noportdocs-patch-doc__Makefile.in +TDS_VER= 7.0 .endif post-extract: @@ -73,9 +87,13 @@ s| common.h||g' post-install: +.if !defined(NOPORTDOCS) + @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${DOCSDIR} + @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc ${DOCSDIR} +.endif @${MKDIR} ${PREFIX}/etc/freetds @${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds/interfaces.dist @${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc" @${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names" -.include +.include --- databases/freetds/distinfo.dist 2008-12-04 18:53:52.000000000 -0500 +++ databases/freetds/distinfo 2009-02-09 16:28:45.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (freetds-0.64.tar.gz) = ecfee5d6c96932172a1f29fb215c9d23 -SHA256 (freetds-0.64.tar.gz) = 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b -SIZE (freetds-0.64.tar.gz) = 1414954 +MD5 (freetds-patched.tgz) = 70a0fbb639dca41cd74acf621d93c04a +SHA256 (freetds-patched.tgz) = 8332c626e8fe056185484ad2a990b81e112969a75143e9b128c824dca97a5aec +SIZE (freetds-patched.tgz) = 1643212 --- databases/freetds/pkg-plist.dist 2009-02-09 17:04:18.000000000 -0500 +++ databases/freetds/pkg-plist 2009-02-09 17:09:16.000000000 -0500 @@ -1,13 +1,16 @@ -bin/datacopy -bin/freebcp -bin/tdspool +bin/fisql bin/tsql +bin/freebcp bin/bsqldb bin/defncopy +bin/datacopy +bin/bsqlodbc +bin/osql +bin/tdspool +etc/pool.conf.dist etc/freetds.conf.dist -etc/freetds/interfaces.dist etc/locales.conf.dist -etc/pool.conf.dist +etc/freetds/interfaces.dist include/bkpublic.h include/cspublic.h include/cstypes.h @@ -15,230 +18,19 @@ include/sqldb.h include/sqlfront.h include/sybdb.h -include/syberror.h include/sybfront.h -include/tds.h +include/syberror.h include/tds_sysdep_public.h -include/tdsconvert.h -include/tdssrv.h -include/tdsver.h -lib/libct.a -lib/libct.la -lib/libct.so lib/libct.so.4 -lib/libsybdb.a -lib/libsybdb.la -lib/libsybdb.so +lib/libct.so +lib/libct.la +lib/libct.a lib/libsybdb.so.5 -lib/libtds.a -lib/libtds.la -lib/libtds.so -lib/libtds.so.5 -lib/libtdssrv.a -lib/libtdssrv.la -lib/libtdssrv.so -lib/libtdssrv.so.2 -%%ODBC%%lib/libtdsodbc.so +lib/libsybdb.so +lib/libsybdb.la +lib/libsybdb.a %%ODBC%%lib/libtdsodbc.so.0 -@comment %%ODBC%%lib/libtdsodbc.a -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-11.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/about.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/what.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/tdshistory.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdshistory.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/projects.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/build.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/packages.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/config.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/osissues.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/install.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/choosingtdsprotocol.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdsconf.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/locales.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/envvar.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/configurations.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/confirminstall.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/prepodbc.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcconnattr.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/php.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/dsnless.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcinionly.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcombo.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcdiagnose.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/configs.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/nonwestern.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/domains.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/appendmode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/tdspool.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/stunnel.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/software.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/perl.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/sybsql.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/python.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/troubleshooting.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/serverthere.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/logging.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/pagenodata.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/seemtooslow.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/help.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/mailinglist.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/askingforhelp.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/contrib.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/advocacy.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/programming.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/apireference.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/dblib.api.summary.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/ctlib.api.summary.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/odbc.api.summary.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/samplecode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/acknowledgments.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/contributors.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesfile.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfaceslocation.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacespurpose.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesformat.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/aboutunicode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/iso8859.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicode.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodegoodbad.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodeutf.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodefreetds.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-1.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-2.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-3.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-4.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-5.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-6.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-7.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-8.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-9.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-10.htm -%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html -%%PORTDOCS%%%%DOCSDIR%%/userguide/userguide.css -%%PORTDOCS%%%%DOCSDIR%%/reference/todo.html -%%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html -%%PORTDOCS%%%%DOCSDIR%%/reference/bug.html -%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png -%%PORTDOCS%%%%DOCSDIR%%/reference/files.html -%%PORTDOCS%%%%DOCSDIR%%/reference/functions.html -%%PORTDOCS%%%%DOCSDIR%%/reference/globals.html -%%PORTDOCS%%%%DOCSDIR%%/reference/index.html -%%PORTDOCS%%%%DOCSDIR%%/reference/modules.html -%%PORTDOCS%%%%DOCSDIR%%/reference/pages.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00069.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00080.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00086.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00087.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00088.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00090.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00092.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00121.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00122.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00123.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00124.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00125.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00126.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00127.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00144.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00147.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00170.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00172.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00248.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00249.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00250.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00251.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00252.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00253.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00254.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00255.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00256.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00257.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00258.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00259.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00260.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00261.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00262.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00263.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00264.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00265.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00266.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00267.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00268.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00269.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00270.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00271.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00272.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00273.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00274.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00275.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00276.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00277.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00278.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00279.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00280.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00281.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00282.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00283.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00284.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00285.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00286.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00287.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00288.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00289.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00290.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00291.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00292.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00293.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00294.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00295.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00296.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00297.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00298.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00299.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00300.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00301.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00302.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00303.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00304.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00305.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00306.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00307.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00308.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00309.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00310.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00311.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00312.html -%%PORTDOCS%%%%DOCSDIR%%/reference/a00313.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000000.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000001.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000002.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000003.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000004.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000005.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000006.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000007.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000008.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000009.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000010.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000011.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000012.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000013.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000014.html -%%PORTDOCS%%%%DOCSDIR%%/reference/dirs.html -%%PORTDOCS%%%%DOCSDIR%%/reference/functions_vars.html -%%PORTDOCS%%%%DOCSDIR%%/reference/globals_defs.html -%%PORTDOCS%%%%DOCSDIR%%/reference/globals_enum.html -%%PORTDOCS%%%%DOCSDIR%%/reference/globals_func.html -%%PORTDOCS%%%%DOCSDIR%%/reference/globals_type.html -%%PORTDOCS%%%%DOCSDIR%%/reference/globals_vars.html -%%PORTDOCS%%%%DOCSDIR%%/images/important.gif -%%PORTDOCS%%%%DOCSDIR%%/images/note.gif -%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif -%%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide -%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference -%%PORTDOCS%%@dirrm %%DOCSDIR%%/images -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%ODBC%%lib/libtdsodbc.so +%%ODBC%%lib/libtdsodbc.la +%%ODBC%%lib/libtdsodbc.a @dirrm etc/freetds --- databases/libgda3/Makefile.dist 2009-02-09 16:37:03.000000000 -0500 +++ databases/libgda3/Makefile 2009-02-09 17:10:44.000000000 -0500 @@ -79,7 +79,7 @@ BROKEN= Does not compile on sparc64 .endif -LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-tds=${LOCALBASE} .else CONFIGURE_ARGS+= --without-tds --- databases/ruby-sybct/Makefile.dist 2009-02-09 16:49:30.000000000 -0500 +++ databases/ruby-sybct/Makefile 2009-02-09 17:12:01.000000000 -0500 @@ -16,7 +16,7 @@ MAINTAINER= ports@logvinov.com COMMENT= Ruby module for accessing Sybase databases -LIB_DEPENDS= tds.5:${PORTSDIR}/databases/freetds +LIB_DEPENDS= ct:${PORTSDIR}/databases/freetds USE_RUBY= yes USE_RUBY_EXTCONF= yes --- net/asterisk/Makefile.dist 2009-02-09 16:51:29.000000000 -0500 +++ net/asterisk/Makefile 2009-02-09 17:13:05.000000000 -0500 @@ -106,7 +106,7 @@ .else PLIST_SUB+= WITH_FREETDS="" CONFIGURE_ARGS+= --with-tds=${LOCALBASE} -LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds .endif .if !defined(WITH_POSTGRES) --- net/asterisk12/Makefile.dist 2009-02-09 16:52:05.000000000 -0500 +++ net/asterisk12/Makefile 2009-02-09 17:13:17.000000000 -0500 @@ -89,7 +89,7 @@ .if defined(WITHOUT_FREETDS) PLIST_SUB+= WITH_FREETDS="@comment " .else -LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds PLIST_SUB+= WITH_FREETDS="" MAKE_ENV+= WITH_FREETDS=1 .endif