Index: head/databases/unixODBC/Makefile =================================================================== --- head/databases/unixODBC/Makefile (revision 468408) +++ head/databases/unixODBC/Makefile (revision 468409) @@ -1,36 +1,36 @@ # Created by: Nick Sayer # $FreeBSD$ PORTNAME= unixODBC -PORTVERSION= 2.3.5 +PORTVERSION= 2.3.6 CATEGORIES= databases MASTER_SITES= ftp://ftp.unixodbc.org/pub/unixODBC/ MAINTAINER= brnrd@FreeBSD.org COMMENT= ODBC library suite for Unix LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi OPTIONS_DEFINE= DOCS GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_msql_h=no CONFIGURE_ARGS= --enable-static --enable-shared \ ${ICONV_CONFIGURE_ARG} INSTALL_TARGET= install-strip # :keepla because port uses lt_dlopen USES= iconv libtool:keepla USE_LDCONFIG= yes PORTDOCS= * post-patch: @${REINPLACE_CMD} -e 's|\.ini$$|.ini.sample|' ${WRKSRC}/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "-not -name 'Makefile*'" .include Index: head/databases/unixODBC/distinfo =================================================================== --- head/databases/unixODBC/distinfo (revision 468408) +++ head/databases/unixODBC/distinfo (revision 468409) @@ -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 Index: head/databases/unixODBC/files/patch-exe_Makefile.am =================================================================== --- head/databases/unixODBC/files/patch-exe_Makefile.am (nonexistent) +++ head/databases/unixODBC/files/patch-exe_Makefile.am (revision 468409) @@ -0,0 +1,27 @@ +From 92b4c96de9addb7c194b31070fa18cd9f3dbed36 Mon Sep 17 00:00:00 2001 +From: lurcher +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 Property changes on: head/databases/unixODBC/files/patch-exe_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/unixODBC/files/patch-exe_Makefile.in =================================================================== --- head/databases/unixODBC/files/patch-exe_Makefile.in (nonexistent) +++ head/databases/unixODBC/files/patch-exe_Makefile.in (revision 468409) @@ -0,0 +1,29 @@ +From 92b4c96de9addb7c194b31070fa18cd9f3dbed36 Mon Sep 17 00:00:00 2001 +From: lurcher +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. Property changes on: head/databases/unixODBC/files/patch-exe_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/unixODBC/pkg-plist =================================================================== --- head/databases/unixODBC/pkg-plist (revision 468408) +++ head/databases/unixODBC/pkg-plist (revision 468409) @@ -1,43 +1,46 @@ bin/dltest bin/isql bin/iusql bin/odbc_config bin/odbcinst bin/slencheck @sample etc/odbc.ini.sample @sample etc/odbcinst.ini.sample include/autotest.h include/odbcinst.h include/odbcinstext.h include/sql.h include/sqlext.h include/sqlspi.h include/sqltypes.h include/sqlucode.h include/unixodbc_conf.h include/uodbc_extras.h include/uodbc_stats.h lib/libodbc.a lib/libodbc.la lib/libodbc.so lib/libodbc.so.2 lib/libodbc.so.2.0.0 lib/libodbccr.a lib/libodbccr.la lib/libodbccr.so lib/libodbccr.so.2 lib/libodbccr.so.2.0.0 lib/libodbcinst.a 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 man/man1/odbc_config.1.gz man/man1/odbcinst.1.gz man/man5/odbc.ini.5.gz man/man5/odbcinst.ini.5.gz man/man7/unixODBC.7.gz @dir etc/ODBCDataSources