On 2011-06-06, Stuart Henderson <s...@spacehopper.org> wrote:
> On 2011-06-05, Christian Weisgerber <na...@openbsd.org> wrote:
>> An update to 3.52.7 might also be appropriate, but for the time
>> being this will make iodbc build again.
>
> i have a diff for this, i'll send it out against -current when
> the dust has settled. lots of patches like this in it, sigh..
>
> +- hdll = _iodbcdm_dllopen ("libiodbcadm.so.2");
> ++ hdll = _iodbcdm_dllopen ("libiodbcadm.so");
>
This builds ok, but not otherwise tested yet, I'll probably get
chance in a day or two, but in the meantime: reports welcome.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/iodbc/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 6 Jun 2011 08:10:46 -0000 1.26
+++ Makefile 6 Jun 2011 22:20:17 -0000
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2011/06/06 08:10:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/15 00:22:51 espie Exp $
COMMENT-main= ODBC 3.x driver manager
COMMENT-admin= ODBC 3.x driver manager admin application
-V= 3.52.6
-REVISION-main= 2
-REVISION-admin= 2
+V= 3.52.7
DISTNAME= libiodbc-$V
PKGNAME= iodbc-$V
@@ -15,7 +13,7 @@ PKGNAME-admin= iodbc-admin-$V
CATEGORIES= databases
SHARED_LIBS += iodbcinst 3.15
-SHARED_LIBS += iodbc 3.15
+SHARED_LIBS += iodbc 3.16
SHARED_LIBS += iodbcadm 3.15
SHARED_LIBS += drvproxy 3.15
@@ -34,7 +32,7 @@ MASTER_SITES= ${HOMEPAGE}downloads/iODB
MODULES= devel/gettext
USE_LIBTOOL= Yes
-USE_GROFF = Yes
+USE_GROFF= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-iodbc-inidir="${SYSCONFDIR}/iodbc" \
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/iodbc/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 17 Jul 2009 10:45:05 -0000 1.5
+++ distinfo 6 Jun 2011 22:20:17 -0000
@@ -1,5 +1,5 @@
-MD5 (libiodbc-3.52.6.tar.gz) = dhrVR0Z71jrAsrTz7kta+w==
-RMD160 (libiodbc-3.52.6.tar.gz) = mxVU1Gi5tJ8a+K3NyR89cag3Ux4=
-SHA1 (libiodbc-3.52.6.tar.gz) = W7iTiH987R3h93a5xe0qqtBQi4U=
-SHA256 (libiodbc-3.52.6.tar.gz) = guDWqMKXWVcPuSxH/LmFecqveVHqu3tlxBS7Egn0nyA=
-SIZE (libiodbc-3.52.6.tar.gz) = 757876
+MD5 (libiodbc-3.52.7.tar.gz) = 3b0nTLMdZb5qeNpY/AkHmg==
+RMD160 (libiodbc-3.52.7.tar.gz) = e9rA4Y3WXevUEFnOtZtGU77Ud0s=
+SHA1 (libiodbc-3.52.7.tar.gz) = U5iIeLaJfVznuPYhOPH34OQLfU8=
+SHA256 (libiodbc-3.52.7.tar.gz) = 1wAsx+VmeF8SA/YJbctJsKrQKp2ZRqjspdZjrBqFwMc=
+SIZE (libiodbc-3.52.7.tar.gz) = 1038710
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/databases/iodbc/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 17 Jul 2009 10:45:05 -0000 1.3
+++ patches/patch-configure 6 Jun 2011 22:20:17 -0000
@@ -1,18 +1,18 @@
$OpenBSD: patch-configure,v 1.3 2009/07/17 10:45:05 sthen Exp $
---- configure.orig Mon Oct 8 14:04:50 2007
-+++ configure Mon Mar 17 22:26:24 2008
-@@ -23126,7 +23126,7 @@ fi
- echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread " >&5
- echo $ECHO_N "checking for pthread_mutex_lock in -lpthread ... $ECHO_C" >&6
+--- configure.orig Thu Sep 10 15:34:58 2009
++++ configure Fri Jun 3 11:28:05 2011
+@@ -15078,7 +15078,7 @@ fi
+ { $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in
-lpthread " >&5
+ $as_echo_n "checking for pthread_mutex_lock in -lpthread ... " >&6; }
ac_save_LIBS="$LIBS"
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23187,7 +23187,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+@@ -15140,7 +15140,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
- LIBS="$LIBS -lpthread"
+ LIBS="$LIBS -pthread"
Index: patches/patch-include_sqltypes_h
===================================================================
RCS file: /cvs/ports/databases/iodbc/patches/patch-include_sqltypes_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_sqltypes_h
--- patches/patch-include_sqltypes_h 17 Jul 2009 10:45:05 -0000 1.3
+++ patches/patch-include_sqltypes_h 6 Jun 2011 22:20:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-include_sqltypes_h,v 1.3 2009/07/17 10:45:05 sthen Exp $
---- include/sqltypes.h.orig Sun Oct 7 14:44:49 2007
-+++ include/sqltypes.h Mon Mar 17 22:26:24 2008
-@@ -337,7 +337,7 @@ SQL_INTERVAL_STRUCT;
+--- include/sqltypes.h.orig Wed Sep 9 21:06:24 2009
++++ include/sqltypes.h Fri Jun 3 11:28:05 2011
+@@ -343,7 +343,7 @@ SQL_INTERVAL_STRUCT;
*/
#if (ODBCVER >= 0x0300)
Index: patches/patch-iodbc_connect_c
===================================================================
RCS file: patches/patch-iodbc_connect_c
diff -N patches/patch-iodbc_connect_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbc_connect_c 6 Jun 2011 22:20:17 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- iodbc/connect.c.orig Thu Sep 10 14:04:55 2009
++++ iodbc/connect.c Fri Jun 3 12:35:57 2011
+@@ -2598,7 +2598,7 @@ SQLDriverConnect_Internal (
+ CFRelease (libname);
+ }
+ #else
+- hdll = _iodbcdm_dllopen ("libiodbcadm.so.2");
++ hdll = _iodbcdm_dllopen ("libiodbcadm.so");
+ #endif
+
+ if (!hdll)
Index: patches/patch-iodbcadm_drvconn_c
===================================================================
RCS file: patches/patch-iodbcadm_drvconn_c
diff -N patches/patch-iodbcadm_drvconn_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbcadm_drvconn_c 6 Jun 2011 22:20:17 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- iodbcadm/drvconn.c.orig Thu Sep 10 14:04:55 2009
++++ iodbcadm/drvconn.c Fri Jun 3 12:35:57 2011
+@@ -470,7 +470,7 @@ iodbcdm_drvconn_dialboxw (
+ }
+ }
+ #else
+- CALL_DRVCONN_DIALBOXW ("libdrvproxy.so.2", 'A');
++ CALL_DRVCONN_DIALBOXW ("libdrvproxy.so", 'A');
+ #endif /* __APPLE__ */
+
+ if (sqlStat)
Index: patches/patch-iodbcadm_gtk_administrator_c
===================================================================
RCS file: patches/patch-iodbcadm_gtk_administrator_c
diff -N patches/patch-iodbcadm_gtk_administrator_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbcadm_gtk_administrator_c 6 Jun 2011 22:20:17 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- iodbcadm/gtk/administrator.c.orig Thu Sep 10 14:04:55 2009
++++ iodbcadm/gtk/administrator.c Fri Jun 3 12:35:57 2011
+@@ -111,11 +111,11 @@ static struct
+ char *lib_ver_sym;
+ } iODBC_Components[] =
+ {
+- {"libiodbc.so.2", "iODBC Driver Manager", "iodbc_version"},
+- {"libiodbcadm.so.2", "iODBC Administrator", "iodbcadm_version"},
+- {"libiodbcinst.so.2", "iODBC Installer", "iodbcinst_version"},
+- {"libdrvproxy.so.2", "iODBC Driver Setup Proxy", "iodbcproxy_version"},
+- {"libtranslator.so.2", "iODBC Translation Manager", "iodbctrans_version"}
++ {"libiodbc.so", "iODBC Driver Manager", "iodbc_version"},
++ {"libiodbcadm.so", "iODBC Administrator", "iodbcadm_version"},
++ {"libiodbcinst.so", "iODBC Installer", "iodbcinst_version"},
++ {"libdrvproxy.so", "iODBC Driver Setup Proxy", "iodbcproxy_version"},
++ {"libtranslator.so", "iODBC Translation Manager", "iodbctrans_version"}
+ };
+
+
Index: patches/patch-iodbcinst_SQLConfigDataSource_c
===================================================================
RCS file: patches/patch-iodbcinst_SQLConfigDataSource_c
diff -N patches/patch-iodbcinst_SQLConfigDataSource_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbcinst_SQLConfigDataSource_c 6 Jun 2011 22:20:17
-0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- iodbcinst/SQLConfigDataSource.c.orig Thu Sep 10 14:04:55 2009
++++ iodbcinst/SQLConfigDataSource.c Fri Jun 3 12:35:57 2011
+@@ -452,11 +452,11 @@ SQLConfigDataSource_Internal (HWND hwndParent, WORD fR
+ #else
+ if (waMode == 'A')
+ {
+- CALL_CONFIG_DSN ("libdrvproxy.so.2");
++ CALL_CONFIG_DSN ("libdrvproxy.so");
+ }
+ else
+ {
+- CALL_CONFIG_DSNW ("libdrvproxy.so.2");
++ CALL_CONFIG_DSNW ("libdrvproxy.so");
+ }
+ #endif
+
Index: patches/patch-iodbcinst_SQLConfigDriver_c
===================================================================
RCS file: patches/patch-iodbcinst_SQLConfigDriver_c
diff -N patches/patch-iodbcinst_SQLConfigDriver_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbcinst_SQLConfigDriver_c 6 Jun 2011 22:20:17 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- iodbcinst/SQLConfigDriver.c.orig Thu Sep 10 14:04:55 2009
++++ iodbcinst/SQLConfigDriver.c Fri Jun 3 12:35:57 2011
+@@ -372,11 +372,11 @@ SQLConfigDriver_Internal (HWND hwndParent, WORD fReque
+ #else
+ if (waMode == 'A')
+ {
+- CALL_CONFIG_DRIVER ("libdrvproxy.so.2");
++ CALL_CONFIG_DRIVER ("libdrvproxy.so");
+ }
+ else
+ {
+- CALL_CONFIG_DRIVERW ("libdrvproxy.so.2");
++ CALL_CONFIG_DRIVERW ("libdrvproxy.so");
+ }
+ #endif
+
Index: patches/patch-iodbcinst_SQLCreateDataSource_c
===================================================================
RCS file: patches/patch-iodbcinst_SQLCreateDataSource_c
diff -N patches/patch-iodbcinst_SQLCreateDataSource_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbcinst_SQLCreateDataSource_c 6 Jun 2011 22:20:17
-0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- iodbcinst/SQLCreateDataSource.c.orig Thu Sep 10 14:04:55 2009
++++ iodbcinst/SQLCreateDataSource.c Fri Jun 3 12:35:57 2011
+@@ -157,11 +157,11 @@ CreateDataSource (HWND parent, LPCSTR lpszDSN, SQLCHAR
+ #else
+ if (waMode == 'A')
+ {
+- CALL_DRVCONN_DIALBOX ("libiodbcadm.so.2");
++ CALL_DRVCONN_DIALBOX ("libiodbcadm.so");
+ }
+ else
+ {
+- CALL_DRVCONN_DIALBOXW ("libiodbcadm.so.2");
++ CALL_DRVCONN_DIALBOXW ("libiodbcadm.so");
+ }
+ #endif
+
Index: patches/patch-iodbcinst_SQLGetTranslator_c
===================================================================
RCS file: patches/patch-iodbcinst_SQLGetTranslator_c
diff -N patches/patch-iodbcinst_SQLGetTranslator_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbcinst_SQLGetTranslator_c 6 Jun 2011 22:20:17 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- iodbcinst/SQLGetTranslator.c.orig Thu Sep 10 14:04:55 2009
++++ iodbcinst/SQLGetTranslator.c Fri Jun 3 12:35:57 2011
+@@ -172,7 +172,7 @@ GetTranslator (HWND hwndParent, LPSTR lpszName, WORD c
+ CFRelease (libname);
+ }
+ #else
+- CALL_TRSCHOOSE_DIALBOX ("libiodbcadm.so.2");
++ CALL_TRSCHOOSE_DIALBOX ("libiodbcadm.so");
+ #endif
+
+ if (ret == SQL_NO_DATA)
+@@ -229,7 +229,7 @@ GetTranslator (HWND hwndParent, LPSTR lpszName, WORD c
+ }
+
+ /* The last ressort, a proxy driver */
+- CALL_CONFIG_TRANSLATOR ("libtranslator.so.2");
++ CALL_CONFIG_TRANSLATOR ("libtranslator.so");
+
+ /* Error : ConfigDSN could no be found */
+ PUSH_ERROR (ODBC_ERROR_LOAD_LIB_FAILED);
Index: patches/patch-iodbcinst_SQLManageDataSource_c
===================================================================
RCS file: patches/patch-iodbcinst_SQLManageDataSource_c
diff -N patches/patch-iodbcinst_SQLManageDataSource_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-iodbcinst_SQLManageDataSource_c 6 Jun 2011 22:20:17
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- iodbcinst/SQLManageDataSource.c.orig Thu Sep 10 14:04:55 2009
++++ iodbcinst/SQLManageDataSource.c Fri Jun 3 12:35:57 2011
+@@ -134,7 +134,7 @@ ManageDataSources (HWND hwndParent)
+ }
+
+ #else
+- CALL_ADMIN_DIALBOX ("libiodbcadm.so.2");
++ CALL_ADMIN_DIALBOX ("libiodbcadm.so");
+ #endif
+
+ return retcode;
Index: patches/patch-iodbcinst_unicode_c
===================================================================
RCS file: patches/patch-iodbcinst_unicode_c
diff -N patches/patch-iodbcinst_unicode_c
--- patches/patch-iodbcinst_unicode_c 6 Jun 2011 10:55:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-iodbcinst_unicode_c,v 1.1 2011/06/06 10:55:17 naddy Exp $
---- iodbcinst/unicode.c.orig Sun Jun 5 23:35:43 2011
-+++ iodbcinst/unicode.c Sun Jun 5 23:36:27 2011
-@@ -230,7 +230,7 @@ towlower (wchar_t wc)
-
-
- #if !defined(HAVE_WCSNCASECMP)
--int wcsncasecmp (wchar_t* s1, wchar_t* s2, size_t n)
-+int wcsncasecmp (const wchar_t* s1, const wchar_t* s2, size_t n)
- {
- wchar_t c1, c2;
-
Index: patches/patch-iodbcinst_unicode_h
===================================================================
RCS file: patches/patch-iodbcinst_unicode_h
diff -N patches/patch-iodbcinst_unicode_h
--- patches/patch-iodbcinst_unicode_h 6 Jun 2011 10:55:17 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-iodbcinst_unicode_h,v 1.3 2011/06/06 10:55:17 naddy Exp $
---- iodbcinst/unicode.h.orig Sun Jun 5 23:35:04 2011
-+++ iodbcinst/unicode.h Sun Jun 5 23:36:04 2011
-@@ -151,7 +151,7 @@ wchar_t* wcscat(wchar_t *dest, const wchar_t *src);
- int wcscmp (const wchar_t* s1, const wchar_t* s2);
- #endif
- #if !defined(HAVE_WCSNCASECMP)
--int wcsncasecmp (wchar_t* s1, wchar_t* s2, size_t n);
-+int wcsncasecmp (const wchar_t* s1, const wchar_t* s2, size_t n);
- #endif
-
- #endif /* _UNICODE_H */
Index: patches/patch-samples_Makefile_in
===================================================================
RCS file: /cvs/ports/databases/iodbc/patches/patch-samples_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-samples_Makefile_in
--- patches/patch-samples_Makefile_in 17 Jul 2009 10:45:05 -0000 1.3
+++ patches/patch-samples_Makefile_in 6 Jun 2011 22:20:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-samples_Makefile_in,v 1.3 2009/07/17 10:45:05 sthen Exp $
---- samples/Makefile.in.orig Mon Mar 17 22:28:23 2008
-+++ samples/Makefile.in Mon Mar 17 22:28:35 2008
-@@ -573,9 +573,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+--- samples/Makefile.in.orig Thu Sep 10 15:34:57 2009
++++ samples/Makefile.in Fri Jun 3 11:28:05 2011
+@@ -627,9 +627,9 @@ uninstall-am: uninstall-binPROGRAMS
install-exec-hook:
