diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index ea8caff6f3cc..ba4701b7db70 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -1,96 +1,92 @@ PORTNAME= freetds -PORTVERSION= 1.4.145 +PORTVERSION= 1.4.146 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= https://www.freetds.org/files/current/ \ ftp://ftp.freetds.org/pub/freetds/current/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-dev.${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT= Sybase/Microsoft TDS protocol library - nightly snapshot WWW= http://www.freetds.org/ LICENSE= LGPL20 USES= compiler:c11 cpe gettext-tools gmake iconv \ libtool:keepla localbase:ldflags pkgconfig tar:bzip2 USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} \ --docdir=${DOCSDIR} \ --enable-msdblib \ --enable-sybase-compat \ --sysconfdir=${ETCDIR} \ --with-tdsver=${TDS_VER} \ --mandir=${PREFIX}/share/man INSTALL_TARGET= install-strip CONFLICTS_INSTALL= freetds # etc/freetds/freetds.conf.sample PORTSCOUT= limit:^\d+\.\d+\.\d{3}$ SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME}-dev.${PORTVERSION} PORTDOCS= * TDS_VER?= 7.4 OPTIONS_DEFINE= DOCS ODBCWIDE OPTIONS_DEFAULT= OPENSSL OPTIONS_RADIO= ODBC OPTIONS_RADIO_ODBC= IODBC UNIXODBC OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL ODBCWIDE_DESC= Enable Wide ODBC Support GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ON= --with-gnutls IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc IODBC_CONFIGURE_ON= --with-iodbc=${LOCALBASE} IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc ODBCWIDE_CONFIGURE_ON= --enable-odbc-wide OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE} .include .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.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 @${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \ ${WRKSRC}/src/pool/Makefile.in @${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 @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ ${ICONV_LIB}|g' \ ${WRKSRC}/src/tds/Makefile.in post-install: ${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/userguide @${MKDIR} ${STAGEDIR}${DOCSDIR}/reference @${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 ';' @cd ${WRKSRC}/doc && \ ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR} .include diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo index b1d7564217c6..eaef57949ba1 100644 --- a/databases/freetds-devel/distinfo +++ b/databases/freetds-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709015928 -SHA256 (freetds-dev.1.4.145.tar.bz2) = 728bb44c14327ec31b897fd6014a1c8cca07505d7ce58516896ea183809d7c7e -SIZE (freetds-dev.1.4.145.tar.bz2) = 2407506 +TIMESTAMP = 1709549330 +SHA256 (freetds-dev.1.4.146.tar.bz2) = cba45066c22f8b85ba3caa6dd352f8733d53de1e88dc1dfd4ec845c7a7977ffb +SIZE (freetds-dev.1.4.146.tar.bz2) = 2409317 diff --git a/databases/freetds-devel/files/patch-configure b/databases/freetds-devel/files/patch-configure new file mode 100644 index 000000000000..b0dd840ca7e0 --- /dev/null +++ b/databases/freetds-devel/files/patch-configure @@ -0,0 +1,59 @@ +--- configure.orig 2024-03-02 09:02:14 UTC ++++ configure +@@ -19020,20 +19020,7 @@ fi + printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h + + fi +-ac_fn_c_check_header_compile "$LINENO" "odbcss.h" "ac_cv_header_odbcss_h" "#ifdef HAVE_WINDOWS_H +-# include +-#endif +-#ifdef HAVE_SQL_H +-# include +-#endif + +-" +-if test "x$ac_cv_header_odbcss_h" = xyes +-then : +- printf "%s\n" "#define HAVE_ODBCSS_H 1" >>confdefs.h +- +-fi +- + if test "$ac_cv_header_odbcss_h" = "yes"; then + HAVE_ODBCSS_H_TRUE= + HAVE_ODBCSS_H_FALSE='#' +@@ -21382,8 +21369,8 @@ elif test "x$with_iodbc" != "x" -a "x$with_iodbc" != " + fi + CPPFLAGS="$CPPFLAGS -DIODBC" + ODBC_INC="$with_iodbc/include" +- test -r "$ODBC_INC/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5 +- test -r "$ODBC_INC/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5 ++ test -r "$ODBC_INC/libiodbc/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5 ++ test -r "$ODBC_INC/libiodbc/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5 + ODBC_INC="-I$ODBC_INC" + ODBC_LDFLAGS="-L$with_iodbc/lib -liodbc" + odbc=true +@@ -21983,14 +21970,14 @@ fi + # Put the nasty error message in config.log where it belongs + echo "$GNUTLS_PKG_ERRORS" >&5 + +- CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`" +- NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`" ++ CPPFLAGS="$CPPFLAGS `pkg-config gnutls --cflags`" ++ NETWORK_LIBS="$NETWORK_LIBS `pkg-config gnutls --libs`" + + elif test $pkg_failed = untried; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + printf "%s\n" "no" >&6; } +- CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`" +- NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`" ++ CPPFLAGS="$CPPFLAGS `pkg-config gnutls --cflags`" ++ NETWORK_LIBS="$NETWORK_LIBS `pkg-config gnutls --libs`" + + else + GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS +@@ -26085,5 +26072,3 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi +- +- diff --git a/databases/freetds-devel/files/patch-doc_Makefile.in b/databases/freetds-devel/files/patch-doc_Makefile.in index 6977487ad8ee..0b08f21c3b85 100644 --- a/databases/freetds-devel/files/patch-doc_Makefile.in +++ b/databases/freetds-devel/files/patch-doc_Makefile.in @@ -1,20 +1,20 @@ ---- doc/Makefile.in.orig 2019-03-30 09:02:39 UTC +--- doc/Makefile.in.orig 2024-03-02 09:02:15 UTC +++ doc/Makefile.in -@@ -740,16 +740,7 @@ $(INSTALLDIRS) $(DOCDIR): +@@ -746,16 +746,7 @@ $(INSTALLDIRS) $(DOCDIR): # If we built the documentation ourselves, install that, # else if we have access to distributed documentation, install that. -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) -m 644 {} $(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) -m 644 {} $(TARGET_DOCDIR)/reference ';' - cd $(srcdir) && find images -name \*.gif \ - -exec $(INSTALL) -m 644 {} $(TARGET_DOCDIR)/{} ';' +install-data-local: uninstall-local: rm -rf $(TARGET_DOCDIR) diff --git a/databases/freetds-devel/files/patch-src_tds_tls.c b/databases/freetds-devel/files/patch-src_tds_tls.c index 50a726fd5614..68f0fa2aad2c 100644 --- a/databases/freetds-devel/files/patch-src_tds_tls.c +++ b/databases/freetds-devel/files/patch-src_tds_tls.c @@ -1,13 +1,13 @@ ---- src/tds/tls.c.orig 2015-05-16 09:00:33 UTC +--- src/tds/tls.c.orig 2023-11-24 09:01:53 UTC +++ src/tds/tls.c -@@ -46,6 +46,10 @@ - #include - #endif /* HAVE_SYS_STAT_H */ +@@ -53,6 +53,10 @@ + #include + #endif +#if defined(__FreeBSD__) || defined(__DragonFly__) +#include +#endif + #include - #include + #include #include