ports/62877: Update of port databases/libiodbc to version 3.51.1

[Erik H. Bakke]

On Sunday 22 February 2004 12:52, Oliver Eikemeier wrote:
> >>
> >>Please don't. This is a bento bug.
> >
> > I am quite sure there was also a problem in my diff.
> > It looks like I diffed against an intermediary step in the process.
> > So, please consider my latest version of the patch as the real one :)
>
> The lines are from your latest patch. For the bento bug, see PR 56392:
>   http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/56392
>
> It seems to be halfway fixed, but not with USE_X_PREFIX...

Finally I managed to fit this into my schedule.  I believe the included diff 
should solve the problems you and others have seen with the previous versions 
of the update.

This should fix the packing list, the wchar_t problems on 4.9 as well as the 
core problem (which was the out of date version).

If this version does not fix the problems, feel free to change it as you need 
to make it work.  I will move to Australia in a few days, and will be offline 
from Wednesday afternoon (CET) until some time in late April, so I will not 
be able to handle any requests until then.

I am aware that this patch does not update to the very latest version of the 
libiodbc library, but I will submit another update when I am back online 
(along with a maintainer-email update)


diff -ruN libiodbc.old/Makefile libiodbc/Makefile
--- libiodbc.old/Makefile	Sun Mar 21 22:09:58 2004
+++ libiodbc/Makefile	Sun Mar 21 23:54:25 2004
@@ -9,10 +9,9 @@
 #        databases/unixODBC.
 
 PORTNAME=	libiodbc
-PORTVERSION=	3.0.5
-PORTREVISION=	1
+PORTVERSION=	3.51.1
 CATEGORIES=	databases
-MASTER_SITES=	http://www.iodbc.org/dist/
+MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/
 
 MAINTAINER=	ebakke at trolltech.com
 COMMENT=	An ODBC 3.x driver manager, for universal data source access
@@ -23,6 +22,7 @@
 INIDIR=		${PREFIX}/etc/${PORTNAME}
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-iodbc-inidir=${INIDIR} --with-pthread
+CFLAGS += -D_BSD_WCHAR_T_DEFINED_
 
 .if !defined(WITHOUT_GUI)
 USE_GNOME=	gtk12
@@ -33,8 +33,6 @@
 .endif
 
 post-install:
-	@ ${MKDIR} ${PREFIX}/bin && ${INSTALL_PROGRAM} \
-	  ${WRKSRC}/samples/odbctest ${PREFIX}/bin/iodbc-odbctest
 	@ ${MKDIR} ${INIDIR} && \
 	  ${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR}
 .if !defined(NOPORTDOCS)
diff -ruN libiodbc.old/distinfo libiodbc/distinfo
--- libiodbc.old/distinfo	Sun Mar 21 22:09:58 2004
+++ libiodbc/distinfo	Sun Mar 21 22:41:04 2004
@@ -1 +1,2 @@
-MD5 (libiodbc-3.0.5.tar.gz) = fea3df52843bec96293ff37a08cf1478
+MD5 (libiodbc-3.51.1.tar.gz) = c63b6f3d7bc459bdf791517c84402160
+SIZE (libiodbc-3.51.1.tar.gz) = 540563
diff -ruN libiodbc.old/files/patch-configure libiodbc/files/patch-configure
--- libiodbc.old/files/patch-configure	Sun Mar 21 22:09:58 2004
+++ libiodbc/files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
---- configure.orig	Mon Jun 11 16:30:50 2001
-+++ configure	Tue Oct  2 12:25:50 2001
-@@ -6458,8 +6458,8 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+# Always use FreeBSD's libtool port.
-+LIBTOOL='libtool'
- 
- # Prevent multiple expansion
- 
diff -ruN libiodbc.old/pkg-plist libiodbc/pkg-plist
--- libiodbc.old/pkg-plist	Sun Mar 21 22:09:58 2004
+++ libiodbc/pkg-plist	Sun Mar 21 22:41:04 2004
@@ -4,10 +4,11 @@
 %%PORTDOCS%%share/doc/libiodbc/NEWS
 %%PORTDOCS%%share/doc/libiodbc/README
 bin/iodbc-config
-bin/iodbc-odbctest
+bin/iodbctest
 %%GUI%%bin/iodbcadm-gtk
 etc/libiodbc/odbc.ini.sample
 etc/libiodbc/odbcinst.ini.sample
+include/iodbcext.h
 include/iodbcinst.h
 include/isql.h
 include/isqlext.h
@@ -15,8 +16,7 @@
 include/sql.h
 include/sqlext.h
 include/sqltypes.h
-%%GUI%%lib/libdrvproxy-gtk.a
-%%GUI%%lib/libdrvproxy-gtk.la
+include/sqlucode.h
 %%GUI%%lib/libdrvproxy.a
 %%GUI%%lib/libdrvproxy.la
 %%GUI%%lib/libdrvproxy.so
@@ -25,8 +25,6 @@
 lib/libiodbc.la
 lib/libiodbc.so
 lib/libiodbc.so.3
-%%GUI%%lib/libiodbcadm-gtk.a
-%%GUI%%lib/libiodbcadm-gtk.la
 %%GUI%%lib/libiodbcadm.a
 %%GUI%%lib/libiodbcadm.la
 %%GUI%%lib/libiodbcadm.so
@@ -36,3 +34,4 @@
 lib/libiodbcinst.so
 lib/libiodbcinst.so.3
 %%PORTDOCS%%@dirrm share/doc/libiodbc
+ at dirrm etc/libiodbc

-- 
Erik H. Bakke