svn commit: r468409 - in head/databases/unixODBC: . files

[Bernard Spil]

Author: brnrd
Date: Fri Apr 27 09:03:47 2018
New Revision: 468409
URL: https://svnweb.freebsd.org/changeset/ports/468409

Log:
  databases/unixODBC: Update to 2.3.6

Added:
  head/databases/unixODBC/files/patch-exe_Makefile.am   (contents, props changed)
  head/databases/unixODBC/files/patch-exe_Makefile.in   (contents, props changed)
Modified:
  head/databases/unixODBC/Makefile
  head/databases/unixODBC/distinfo
  head/databases/unixODBC/pkg-plist

Modified: head/databases/unixODBC/Makefile
==============================================================================
--- head/databases/unixODBC/Makefile	Fri Apr 27 08:49:19 2018	(r468408)
+++ head/databases/unixODBC/Makefile	Fri Apr 27 09:03:47 2018	(r468409)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	unixODBC
-PORTVERSION=	2.3.5
+PORTVERSION=	2.3.6
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.unixodbc.org/pub/unixODBC/
 

Modified: head/databases/unixODBC/distinfo
==============================================================================
--- head/databases/unixODBC/distinfo	Fri Apr 27 08:49:19 2018	(r468408)
+++ head/databases/unixODBC/distinfo	Fri Apr 27 09:03:47 2018	(r468409)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518243635
-SHA256 (unixODBC-2.3.5.tar.gz) = 760972e05cc6361aee49d676fb7da8244e0f3a225cd4d3449a951378551b495b
-SIZE (unixODBC-2.3.5.tar.gz) = 1633390
+TIMESTAMP = 1524817314
+SHA256 (unixODBC-2.3.6.tar.gz) = 88b637f647c052ecc3861a3baa275c3b503b193b6a49ff8c28b2568656d14d69
+SIZE (unixODBC-2.3.6.tar.gz) = 1661914

Added: head/databases/unixODBC/files/patch-exe_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/unixODBC/files/patch-exe_Makefile.am	Fri Apr 27 09:03:47 2018	(r468409)
@@ -0,0 +1,27 @@
+From 92b4c96de9addb7c194b31070fa18cd9f3dbed36 Mon Sep 17 00:00:00 2001
+From: lurcher <nick at lurcher.org>
+Date: Mon, 26 Mar 2018 10:45:26 +0100
+Subject: [PATCH] Fix sed problem
+
+---
+ exe/Makefile.am | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/exe/Makefile.am b/exe/Makefile.am
+index 61b7493..31a142e 100644
+--- exe/Makefile.am.orig
++++ exe/Makefile.am
+@@ -60,8 +60,10 @@ dltest_DEPENDENCIES = $(LTDLDEPS)
+ dltest_LDADD = $(LIBLTDL)
+ 
+ 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

Added: head/databases/unixODBC/files/patch-exe_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/unixODBC/files/patch-exe_Makefile.in	Fri Apr 27 09:03:47 2018	(r468409)
@@ -0,0 +1,29 @@
+From 92b4c96de9addb7c194b31070fa18cd9f3dbed36 Mon Sep 17 00:00:00 2001
+From: lurcher <nick at lurcher.org>
+Date: Mon, 26 Mar 2018 10:45:26 +0100
+Subject: [PATCH] Fix sed problem
+
+---
+ exe/Makefile.am | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/exe/Makefile.am b/exe/Makefile.am
+index 61b7493..31a142e 100644
+--- exe/Makefile.in.orig	2018-03-19 11:18:18.000000000 +0100
++++ exe/Makefile.in	2018-04-27 10:38:57.114794000 +0200
+@@ -749,9 +758,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.

Modified: head/databases/unixODBC/pkg-plist
==============================================================================
--- head/databases/unixODBC/pkg-plist	Fri Apr 27 08:49:19 2018	(r468408)
+++ head/databases/unixODBC/pkg-plist	Fri Apr 27 09:03:47 2018	(r468409)
@@ -32,6 +32,9 @@ lib/libodbcinst.la
 lib/libodbcinst.so
 lib/libodbcinst.so.2
 lib/libodbcinst.so.2.0.0
+libdata/pkgconfig/odbc.pc
+libdata/pkgconfig/odbccr.pc
+libdata/pkgconfig/odbcinst.pc
 man/man1/dltest.1.gz
 man/man1/isql.1.gz
 man/man1/iusql.1.gz