ports/64743: [PATCH] port databases/libiodbc: correct detection of wchar_t

[Oliver Eikemeier]

>Number:         64743
>Category:       ports
>Synopsis:       [PATCH] port databases/libiodbc: correct detection of wchar_t
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 26 00:00:43 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 4.9-STABLE

>Description:

iodbc fails to detect wchar_t on FreeBSD, causing programs that include
the sql.h header to fail.

>How-To-Repeat:

cd /usr/ports/net/openldap22-server; make WITH_ODBC=yes

from config.log:
...
In file included from /usr/local/include/sql.h:84,
                 from configure:20588:
/usr/local/include/sqltypes.h:416: #error Please make sure your system supports the wchar_t type

>Fix:

The patch test for __FreeBSD__, since using _BSD_CT_RUNE_T_ seems a litle to fragile
Probably this should be addressed to the upstream provider, too.

Index: databases/libiodbc/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/libiodbc/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- databases/libiodbc/Makefile	22 Mar 2004 19:11:39 -0000	1.11
+++ databases/libiodbc/Makefile	26 Mar 2004 07:33:49 -0000
@@ -10,7 +10,7 @@
 
 PORTNAME=	libiodbc
 PORTVERSION=	3.51.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/
 
Index: databases/libiodbc/files/patch-include::sqltypes.h
===================================================================
RCS file: databases/libiodbc/files/patch-include::sqltypes.h
diff -N databases/libiodbc/files/patch-include::sqltypes.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ databases/libiodbc/files/patch-include::sqltypes.h	26 Mar 2004 07:44:18 -0000
@@ -0,0 +1,10 @@
+--- include/sqltypes.h.orig	Fri Mar 26 08:33:24 2004
++++ include/sqltypes.h	Fri Mar 26 08:33:37 2004
+@@ -409,6 +409,7 @@
+ #  if defined(_WCHAR_T)			|| \
+       defined(_WCHAR_T_DEFINED)		|| \
+       defined(_WCHAR_T_DECLARED)	|| \
++      defined(__FreeBSD__)		|| \
+       defined(_BSD_WCHAR_T_DEFINED_)
+ typedef wchar_t SQLWCHAR;
+ #  else

>Release-Note:
>Audit-Trail:
>Unformatted: