mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
databases/freetds-devel: Update version 1.4.145=>1.4.146
- There was an issue regarding missing odbcss.h file while upgrading through ports which has been fixed
This commit is contained in:
Muhammad Moinur Rahman
parent
cc8ccde4db
commit
cfa638a3f3
5 changed files with 70 additions and 15 deletions
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= freetds
|
||||
PORTVERSION= 1.4.145
|
||||
PORTVERSION= 1.4.146
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= https://www.freetds.org/files/current/ \
|
||||
|
|
@ -69,14 +69,10 @@ post-extract:
|
|||
@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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
59
databases/freetds-devel/files/patch-configure
Normal file
59
databases/freetds-devel/files/patch-configure
Normal file
|
|
@ -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 <windows.h>
|
||||
-#endif
|
||||
-#ifdef HAVE_SQL_H
|
||||
-# include <sql.h>
|
||||
-#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
|
||||
-
|
||||
-
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- 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.
|
||||
|
|
|
|||
|
|
@ -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 <sys/stat.h>
|
||||
#endif /* HAVE_SYS_STAT_H */
|
||||
@@ -53,6 +53,10 @@
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
+#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
+#include <sys/socket.h>
|
||||
+#endif
|
||||
+
|
||||
#include <freetds/tds.h>
|
||||
#include <freetds/string.h>
|
||||
#include <freetds/utils/string.h>
|
||||
#include <freetds/tls.h>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue