Date: Tue, 23 Sep 2014 20:47:12 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369120 - in head/databases/freetds-devel: . files Message-ID: <201409232047.s8NKlCxn005029@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue Sep 23 20:47:12 2014 New Revision: 369120 URL: http://svnweb.freebsd.org/changeset/ports/369120 QAT: https://qat.redports.org/buildarchive/r369120/ Log: databases/freetds-devel: 0.92.79 -> 0.92.812 - Bringing the -devel port to a recent version PR: 193866 Submitted by: Muhammad Moinur Rahman <5u623l20@gmail.com> Modified: head/databases/freetds-devel/Makefile head/databases/freetds-devel/distinfo head/databases/freetds-devel/files/patch-doc_Makefile.in head/databases/freetds-devel/pkg-plist Modified: head/databases/freetds-devel/Makefile ============================================================================== --- head/databases/freetds-devel/Makefile Tue Sep 23 20:31:40 2014 (r369119) +++ head/databases/freetds-devel/Makefile Tue Sep 23 20:47:12 2014 (r369120) @@ -2,97 +2,91 @@ # $FreeBSD$ PORTNAME= freetds -PORTVERSION= 0.92.79 -PORTREVISION= 2 +PORTVERSION= 0.92.812 PORTEPOCH= 1 CATEGORIES= databases -MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/ +MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/current/ PKGNAMESUFFIX= -devel +DISTNAME= ${PORTNAME}-dev.${PORTVERSION} -MAINTAINER= pi@FreeBSD.org +MAINTAINER= 5u623l20@gmail.com COMMENT= Sybase/Microsoft TDS protocol library LICENSE= LGPL20 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -TDS_VER?= 5.0 -USES= gmake iconv libtool:keepla pkgconfig +WRKSRC= ${WRKDIR}/${PORTNAME}-dev.${PORTVERSION} +TDS_VER?= 7.2 +USES= gmake iconv libtool:keepla pkgconfig tar:bzip2 GNU_GONFIGURE= yes USE_AUTOTOOLS= autoconf:env CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tdsver=${TDS_VER} +CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ + --enable-msdblib --enable-sybase-compat \ + --docdir=${DOCSDIR} USE_LDCONFIG= yes SUB_FILES= pkg-message INSTALL_TARGET= install-strip -PORTDOCS= * - -# OPTIONS_DEFINE= OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB -OPTIONS_DEFINE= MSDBLIB ODBCWIDE ODBC - -OPTIONS_SINGLE= SSL +OPTIONS_DEFINE= DOCS ODBCWIDE +OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS - OPTIONS_DEFAULT= OPENSSL - -OPENSSL_DESC= Use OpenSSL -GNUTLS_DESC= Use GnuTLS -MSDBLIB_DESC= MS SQL Server compatibility (breaks databases/sybtcl) -ODBCWIDE_DESC= Enable Wide ODBC Support -ODBC_DESC= ODBC driver +OPTIONS_RADIO= ODBC +OPTIONS_RADIO_ODBC= IODBC UNIXODBC +ODBCWIDE_DESC= Enable Wide ODBC Support +OPENSSL_USE= OPENSSL=yes +OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_ON= --with-gnutls +IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc +IODBC_CONFIGURE_ON= --with-iodbc=${LOCALBASE} +IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc +UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC +UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE} +ODBCWIDE_CONFIGURE_ON= --enable-odbc-wide CONFLICTS= freetds-0.64.[0-9] .include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} -.endif - -.if ${PORT_OPTIONS:MODBCWIDE} -CONFIGURE_ARGS+= --enable-odbc-wide -.endif - -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls -CONFIGURE_ARGS+= --with-gnutls -.endif - -LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC -CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE} - -# We cannot use msdblib-style by default, because port databases/sybtcl -# relies on sybase-style dblib -.if ${PORT_OPTIONS:MMSDBLIB} -CONFIGURE_ARGS+= --enable-msdblib -TDS_VER= 7.2 +.if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC} +PLIST_SUB+= ODBC="" +.else +PLIST_SUB+= ODBC="@comment " .endif post-extract: - @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist - @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist - @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist + @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample + @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample + @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample post-patch: @${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|<malloc.h>|<stdlib.h>| ; \ - s|/freetds.conf|/freetds.conf.dist|g ; \ - s|/locales.conf|/locales.conf.dist|g ; \ - s|/pool.conf|/pool.conf.dist|g ; \ + 's|/pool.conf|/pool.conf.sample|g ; \ s| common.h||g ; \ + s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \ s|%%ICONV_LIB%%|${ICONV_LIB}|' + @${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \ + s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \ + s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc/${PORTNAME}-${PORTVERSION}/reference ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc/${PORTNAME}-${PORTVERSION}/userguide ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/freetds - @${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${PREFIX}/etc/freetds/interfaces.dist + @${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/userguide + @${MKDIR} ${STAGEDIR}${DOCSDIR}/reference + @${MKDIR} ${STAGEDIR}${DOCSDIR}/images + @${FIND} ${WRKSRC}/doc/userguide \( -type f -o -type l \) \ + -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/userguide ';' + @${FIND} ${WRKSRC}/doc/reference \( -type f -o -type l \) \ + -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/reference ';' + @${FIND} ${WRKSRC}/doc/images -name \*.gif \ + -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/images/ ';' + +.endif .include <bsd.port.mk> Modified: head/databases/freetds-devel/distinfo ============================================================================== --- head/databases/freetds-devel/distinfo Tue Sep 23 20:31:40 2014 (r369119) +++ head/databases/freetds-devel/distinfo Tue Sep 23 20:47:12 2014 (r369120) @@ -1,2 +1,2 @@ -SHA256 (freetds-0.92.79.tar.gz) = 06b9b3fe797552d93365f1f1f84051f6c292bb0f9fca06a3475852700cf71f50 -SIZE (freetds-0.92.79.tar.gz) = 2059576 +SHA256 (freetds-dev.0.92.812.tar.bz2) = 6ac35250b24214de3635e2b8647e1b903f8482b72f5ff7b92cdde6280811c074 +SIZE (freetds-dev.0.92.812.tar.bz2) = 1149663 Modified: head/databases/freetds-devel/files/patch-doc_Makefile.in ============================================================================== --- head/databases/freetds-devel/files/patch-doc_Makefile.in Tue Sep 23 20:31:40 2014 (r369119) +++ head/databases/freetds-devel/files/patch-doc_Makefile.in Tue Sep 23 20:47:12 2014 (r369120) @@ -1,47 +1,20 @@ ---- doc/Makefile.in.orig 2011-09-06 20:44:07.000000000 +0200 -+++ doc/Makefile.in 2011-09-06 20:54:10.000000000 +0200 -@@ -507,7 +507,7 @@ - - info-am: - --install-data-am: install-data-local install-man -+install-data-am: install-man - - install-dvi: install-dvi-am - -@@ -561,7 +561,7 @@ - clean-local dist-hook distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ -- install-data-local install-dvi install-dvi-am install-exec \ -+ install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-man5 \ - install-pdf install-pdf-am install-ps install-ps-am \ -@@ -641,16 +641,16 @@ +--- doc/Makefile.in.orig 2014-09-23 16:23:48.662499737 +0600 ++++ doc/Makefile.in 2014-09-23 16:24:52.193494422 +0600 +@@ -671,16 +671,7 @@ # If we built the documentation ourselves, install that, # else if we have access to distributed documentation, install that. --install-data-local: installdirs $(noinst_DATA) -- $(mkinstalldirs) $(DOCDIR) 2>&1 +-install-data-local: $(INSTALLDIRS) $(noinst_DATA) +- $(MKDIR_P) $(DOCDIR) 2>&1 - if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi; \ -- find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) -exec \ -- $(INSTALL_DATA) {} $(TARGET_DOCDIR)/userguide ';' +- find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) \ +- -exec $(INSTALL) {} $(TARGET_DOCDIR)/userguide ';' - if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \ -- find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \ -- $(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';' -- cd $(srcdir) && find images -name \*.gif -exec \ -- $(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';' -+#install-data-local: installdirs $(noinst_DATA) -+# $(mkinstalldirs) $(DOCDIR) 2>&1 -+# if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi; \ -+# find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) -exec \ -+# $(INSTALL_DATA) {} $(TARGET_DOCDIR)/userguide ';' -+# if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \ -+# find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \ -+# $(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';' -+# cd $(srcdir) && find images -name \*.gif -exec \ -+# $(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';' +- find $$d/$(DOCDIR)/reference \( -type f -o -type l \) \ +- -exec $(INSTALL) {} $(TARGET_DOCDIR)/reference ';' +- find $(srcdir)/images -name \*.gif \ +- -exec $(INSTALL) {} $(TARGET_DOCDIR)/images/ ';' ++install-data-local: uninstall-local: rm -rf $(TARGET_DOCDIR) Modified: head/databases/freetds-devel/pkg-plist ============================================================================== --- head/databases/freetds-devel/pkg-plist Tue Sep 23 20:31:40 2014 (r369119) +++ head/databases/freetds-devel/pkg-plist Tue Sep 23 20:47:12 2014 (r369120) @@ -6,10 +6,10 @@ bin/freebcp bin/osql bin/tdspool bin/tsql -etc/freetds/interfaces.dist -etc/freetds.conf.dist -etc/locales.conf.dist -etc/pool.conf.dist +@sample %%ETCDIR%%/freetds.conf.sample +@sample %%ETCDIR%%/interfaces.sample +@sample %%ETCDIR%%/locales.conf.sample +@sample %%ETCDIR%%/pool.conf.sample include/bkpublic.h include/cspublic.h include/cstypes.h @@ -40,10 +40,29 @@ lib/libsybdb.la lib/libsybdb.so lib/libsybdb.so.5 lib/libsybdb.so.5.0.0 -lib/libtdsodbc.so.0.0.0 -lib/libtdsodbc.so.0 -lib/libtdsodbc.so -lib/libtdsodbc.la -lib/libtdsodbc.a -bin/bsqlodbc -@dirrm etc/freetds +%%ODBC%%lib/libtdsodbc.so.0.0.0 +%%ODBC%%lib/libtdsodbc.so.0 +%%ODBC%%lib/libtdsodbc.so +%%ODBC%%lib/libtdsodbc.la +%%ODBC%%lib/libtdsodbc.a +%%ODBC%%bin/bsqlodbc +%%PORTDOCS%%%%DOCSDIR%%/images/1.gif +%%PORTDOCS%%%%DOCSDIR%%/images/10.gif +%%PORTDOCS%%%%DOCSDIR%%/images/2.gif +%%PORTDOCS%%%%DOCSDIR%%/images/3.gif +%%PORTDOCS%%%%DOCSDIR%%/images/4.gif +%%PORTDOCS%%%%DOCSDIR%%/images/5.gif +%%PORTDOCS%%%%DOCSDIR%%/images/6.gif +%%PORTDOCS%%%%DOCSDIR%%/images/7.gif +%%PORTDOCS%%%%DOCSDIR%%/images/8.gif +%%PORTDOCS%%%%DOCSDIR%%/images/9.gif +%%PORTDOCS%%%%DOCSDIR%%/images/caution.gif +%%PORTDOCS%%%%DOCSDIR%%/images/important.gif +%%PORTDOCS%%%%DOCSDIR%%/images/note.gif +%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif +%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif +%%PORTDOCS%%%%DOCSDIR%%/reference/index.html +%%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm +%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409232047.s8NKlCxn005029>