4 files changed, 46 insertions, 25 deletions

diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 3bfac0e7ddf2..d8fe2a927a48 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -9,7 +9,7 @@
 #        databases/unixODBC.
 
 PORTNAME=	libiodbc
-PORTVERSION=	3.51.2
+PORTVERSION=	3.52.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -20,29 +20,46 @@ COMMENT=	An ODBC 3.x driver manager, for universal data source access
 
 CONFLICTS=	unixODBC-*
 
-USE_INC_LIBTOOL_VER=	13
+USE_GNOME=	gnometarget
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--with-iodbc-inidir=${INIDIR}
 INSTALLS_SHLIB=	yes
+
+MAN1=		iodbc-config.1 iodbctest.1 iodbctestw.1
+
+CPPFLAGS=	${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_
+LDFLAGS=	${PTHREAD_LIBS}
 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
+USE_GNOME+=	gtk12
+MAN1+=		iodbccadm-gtk.1
 PLIST_SUB+=	GUI=""
 .else
 CONFIGURE_ARGS+=	--disable-gui
 PLIST_SUB+=	GUI="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$$CFLAGS -pthread|$$CFLAGS|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|samples||' ${WRKSRC}/Makefile.in
+
 post-install:
-	@ ${MKDIR} ${INIDIR} && \
-	  ${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR}
+	@${MKDIR} ${INIDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR}
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-.for docfile in AUTHORS COPYING ChangeLog NEWS README
-	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS ChangeLog NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+	@${MKDIR} ${EXAMPLESDIR}
+.for file in Makefile iodbctest.c
+	${INSTALL_DATA} ${WRKSRC}/samples/${file} ${EXAMPLESDIR}
 .endfor
 .endif
 
diff --git a/databases/libiodbc/distinfo b/databases/libiodbc/distinfo
index c157592c23d1..acd26eabd2c8 100644
--- a/databases/libiodbc/distinfo
+++ b/databases/libiodbc/distinfo
@@ -1,2 +1,2 @@
-MD5 (libiodbc-3.51.2.tar.gz) = bda106d1f0f4d2550d38a8f86540537f
-SIZE (libiodbc-3.51.2.tar.gz) = 546518
+MD5 (libiodbc-3.52.1.tar.gz) = e6c3cb680a198922589d06b3161aff30
+SIZE (libiodbc-3.52.1.tar.gz) = 568834
diff --git a/databases/libiodbc/files/patch-include::sqltypes.h b/databases/libiodbc/files/patch-include::sqltypes.h
index b1f5ecbd2350..c521292aadd9 100644
--- a/databases/libiodbc/files/patch-include::sqltypes.h
+++ b/databases/libiodbc/files/patch-include::sqltypes.h
@@ -1,10 +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 @@
+--- include/sqltypes.h.orig	Wed Sep 29 19:14:06 2004
++++ include/sqltypes.h	Sat Nov 13 15:26:42 2004
+@@ -387,6 +387,7 @@
  #  if defined(_WCHAR_T)			|| \
        defined(_WCHAR_T_DEFINED)		|| \
-       defined(_WCHAR_T_DECLARED)	|| \
-+      defined(__FreeBSD__)		|| \
+       defined(_WCHAR_T_DECLARED)        || \
++      defined(__FreeBSD__)              || \
        defined(_BSD_WCHAR_T_DEFINED_)
  typedef wchar_t SQLWCHAR;
  #  else
diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist
index 0cbd60981ea6..6ca3a8ce7d8b 100644
--- a/databases/libiodbc/pkg-plist
+++ b/databases/libiodbc/pkg-plist
@@ -1,15 +1,12 @@
-%%PORTDOCS%%share/doc/libiodbc/AUTHORS
-%%PORTDOCS%%share/doc/libiodbc/COPYING
-%%PORTDOCS%%share/doc/libiodbc/ChangeLog
-%%PORTDOCS%%share/doc/libiodbc/NEWS
-%%PORTDOCS%%share/doc/libiodbc/README
 bin/iodbc-config
-bin/iodbctest
 %%GUI%%bin/iodbcadm-gtk
+%%GUI%%bin/iodbctest
+%%GUI%%bin/iodbctestw
 etc/libiodbc/odbc.ini.sample
 etc/libiodbc/odbcinst.ini.sample
 include/iodbcext.h
 include/iodbcinst.h
+include/iodbcunix.h
 include/isql.h
 include/isqlext.h
 include/isqltypes.h
@@ -35,5 +32,12 @@ lib/libiodbcinst.so
 lib/libiodbcinst.so.3
 lib/libodbc.a
 lib/libodbc.so
-%%PORTDOCS%%@dirrm share/doc/libiodbc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/iodbctest.c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/libiodbc