diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/unixodbc/Makefile | 4 | ||||
| -rw-r--r-- | databases/unixodbc/distinfo | 13 | ||||
| -rw-r--r-- | databases/unixodbc/patches/patch-Drivers_nn_yyparse.c | 15 | ||||
| -rw-r--r-- | databases/unixodbc/patches/patch-Makefile.in | 16 | ||||
| -rw-r--r-- | databases/unixodbc/patches/patch-exe_Makefile.in | 22 |
5 files changed, 24 insertions, 46 deletions
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index cf720ffa13d..4317df0dbb3 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2018/04/14 08:26:34 adam Exp $ +# $NetBSD: Makefile,v 1.40 2018/08/14 13:04:24 adam Exp $ -DISTNAME= unixODBC-2.3.6 +DISTNAME= unixODBC-2.3.7 PKGNAME= ${DISTNAME:S/ODBC/odbc/} CATEGORIES= databases MASTER_SITES= ftp://ftp.unixodbc.org/pub/unixODBC/ diff --git a/databases/unixodbc/distinfo b/databases/unixodbc/distinfo index 50a90859e53..50c83b00573 100644 --- a/databases/unixodbc/distinfo +++ b/databases/unixodbc/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.17 2018/04/14 08:26:34 adam Exp $ +$NetBSD: distinfo,v 1.18 2018/08/14 13:04:24 adam Exp $ -SHA1 (unixODBC-2.3.6.tar.gz) = 23ff27a449e990f9c4b1b29a6369086006454baa -RMD160 (unixODBC-2.3.6.tar.gz) = 6ff50a528a648c188f99604652c273fe375b2287 -SHA512 (unixODBC-2.3.6.tar.gz) = 6518a4169946e847dd710d54724a44d268b98954d30064eadadb703edbbeafac05bd1f42a6845c2fdcdab7ae8987800acd1a5f6b4b96de5f3c8c3e4bc370fe30 -Size (unixODBC-2.3.6.tar.gz) = 1661914 bytes -SHA1 (patch-Drivers_nn_yyparse.c) = c2b1ddbf21eadd2bc07b8373c59920f8505886c5 -SHA1 (patch-exe_Makefile.in) = 85ae24152e0c6c537df2ed12837f436f02b4702e +SHA1 (unixODBC-2.3.7.tar.gz) = a066c4f3fcb19befbaf5a5801b830ec41b7318df +RMD160 (unixODBC-2.3.7.tar.gz) = ebbd9e9cee6888779e572b8a32596f49a8bdad2d +SHA512 (unixODBC-2.3.7.tar.gz) = a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70 +Size (unixODBC-2.3.7.tar.gz) = 1669501 bytes +SHA1 (patch-Makefile.in) = bf15efe813f44ae8b56ef2d4f1baa0be034c2028 diff --git a/databases/unixodbc/patches/patch-Drivers_nn_yyparse.c b/databases/unixodbc/patches/patch-Drivers_nn_yyparse.c deleted file mode 100644 index 3c6ddabfa85..00000000000 --- a/databases/unixodbc/patches/patch-Drivers_nn_yyparse.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Drivers_nn_yyparse.c,v 1.1 2018/04/14 08:26:34 adam Exp $ - -Fix building. - ---- Drivers/nn/yyparse.c.orig 2018-04-14 08:14:33.000000000 +0000 -+++ Drivers/nn/yyparse.c -@@ -82,7 +82,7 @@ - static char sccsid[] - = "@(#)SQL parser for NNSQL(NetNews SQL), Copyright(c) 1995, 1996 by Ke Jin"; - --#include <config.h> -+#include "nnconfig.h" - - #include <nncol.h> - #include <yyenv.h> diff --git a/databases/unixodbc/patches/patch-Makefile.in b/databases/unixodbc/patches/patch-Makefile.in new file mode 100644 index 00000000000..048e3f27ac6 --- /dev/null +++ b/databases/unixodbc/patches/patch-Makefile.in @@ -0,0 +1,16 @@ +$NetBSD: patch-Makefile.in,v 1.1 2018/08/14 13:04:24 adam Exp $ + +Do not create empty files nor directories in /etc. + +--- Makefile.in.orig 2018-08-14 12:57:27.000000000 +0000 ++++ Makefile.in +@@ -961,9 +961,6 @@ uninstall-am: uninstall-pkgconfigDATA + + + install-data-am: install-pkgconfigDATA +- -mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources +- -touch $(DESTDIR)${sysconfdir}/odbcinst.ini +- -touch $(DESTDIR)${sysconfdir}/odbc.ini + cp unixodbc_conf.h $(DESTDIR)${includedir}/unixodbc_conf.h + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/databases/unixodbc/patches/patch-exe_Makefile.in b/databases/unixodbc/patches/patch-exe_Makefile.in deleted file mode 100644 index 4b758de67f6..00000000000 --- a/databases/unixodbc/patches/patch-exe_Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-exe_Makefile.in,v 1.1 2018/04/14 08:26:34 adam Exp $ - -Do not depend on GNU sed. - ---- exe/Makefile.in.orig 2018-04-14 07:58:07.000000000 +0000 -+++ exe/Makefile.in -@@ -749,9 +749,12 @@ uninstall-am: uninstall-binPROGRAMS - - - all-am: -- @sed -i -e "s![@]ODBC_ULEN[@]!`$(CURDIR)/odbc_config$(EXEEXT) --ulen`!" \ -- -e "s![@]ODBC_CFLAGS[@]!`$(CURDIR)/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ -- $(top_builddir)/DriverManager/odbc.pc -+ @sed "s![@]ODBC_ULEN[@]!`$(CURDIR)/odbc_config$(EXEEXT) --ulen`!" \ -+ $(top_builddir)/DriverManager/odbc.pc > $(CURDIR)/odbc.pc.tmp -+ @mv $(CURDIR)/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc -+ @sed "s![@]ODBC_CFLAGS[@]!`$(CURDIR)/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ -+ $(top_builddir)/DriverManager/odbc.pc > $(CURDIR)/odbc.pc.tmp -+ @mv $(CURDIR)/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. |