Index: head/databases/postgresql-odbc/Makefile
===================================================================
--- head/databases/postgresql-odbc/Makefile	(revision 435465)
+++ head/databases/postgresql-odbc/Makefile	(revision 435466)
@@ -1,43 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTVERSION=	09.05.0400
+PORTVERSION=	09.06.0100
 CATEGORIES=	databases
 MASTER_SITES=	PGSQL/odbc/versions/src
 PKGNAMESUFFIX=	-odbc
 DISTNAME=	psqlodbc-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PostgreSQL ODBC driver
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USES=		libtool pgsql
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-unixodbc=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 
 DOCSDIR=	${PREFIX}/share/doc/postgresql/odbc
 EXAMPLESDIR=	${PREFIX}/share/examples/postgresql/odbc
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	lib/psqlodbcw.so
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.sql ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
Index: head/databases/postgresql-odbc/distinfo
===================================================================
--- head/databases/postgresql-odbc/distinfo	(revision 435465)
+++ head/databases/postgresql-odbc/distinfo	(revision 435466)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470771983
-SHA256 (postgresql/psqlodbc-09.05.0400.tar.gz) = c9fde1c104065e81813d79eb29bb7e715d64697bdda031ff01e40e3ad59e3ad3
-SIZE (postgresql/psqlodbc-09.05.0400.tar.gz) = 812613
+TIMESTAMP = 1488673839
+SHA256 (postgresql/psqlodbc-09.06.0100.tar.gz) = 050c80b25eb6553a718b9ab4ac00dcbadf7a13ee5ae637c30f7dcde8f4a6c962
+SIZE (postgresql/psqlodbc-09.06.0100.tar.gz) = 886110
Index: head/databases/postgresql-odbc/files/patch-odbcapi.c
===================================================================
--- head/databases/postgresql-odbc/files/patch-odbcapi.c	(revision 435465)
+++ head/databases/postgresql-odbc/files/patch-odbcapi.c	(revision 435466)
@@ -1,32 +1,32 @@
---- odbcapi.c.orig	2016-01-10 13:25:14 UTC
+--- odbcapi.c.orig	2017-02-03 13:05:10 UTC
 +++ odbcapi.c
 @@ -913,11 +913,7 @@ RETCODE		SQL_API
  SQLExtendedFetch(HSTMT hstmt,
  				 SQLUSMALLINT fFetchType,
  				 SQLLEN irow,
--#if defined(WITH_UNIXODBC) && (SIZEOF_LONG != 8)
+-#if defined(WITH_UNIXODBC) && (SIZEOF_LONG_INT != 8)
 -				 SQLROWSETSIZE *pcrow,
 -#else
  				 SQLULEN *pcrow,
 -#endif /* WITH_UNIXODBC */
  				 SQLUSMALLINT *rgfRowStatus)
  {
  	RETCODE	ret;
 @@ -927,17 +923,7 @@ SQLExtendedFetch(HSTMT hstmt,
  	ENTER_STMT_CS(stmt);
  	SC_clear_error(stmt);
  	StartRollbackState(stmt);
 -#ifdef WITH_UNIXODBC
 -	{
 -		SQLULEN	retrieved;
 -
 -		ret = PGAPI_ExtendedFetch(hstmt, fFetchType, irow, &retrieved, rgfRowStatus, 0, SC_get_ARDF(stmt)->size_of_rowset_odbc2);
 -		if (pcrow)
 -			*pcrow = retrieved;
 -	}
 -#else
  	ret = PGAPI_ExtendedFetch(hstmt, fFetchType, irow, pcrow, rgfRowStatus, 0, SC_get_ARDF(stmt)->size_of_rowset_odbc2);
 -#endif /* WITH_UNIXODBC */
  	stmt->transition_status = STMT_TRANSITION_EXTENDED_FETCH;
  	ret = DiscardStatementSvp(stmt, ret, FALSE);
  	LEAVE_STMT_CS(stmt);
Index: head/databases/postgresql-odbc/files/patch-psqlodbc.h
===================================================================
--- head/databases/postgresql-odbc/files/patch-psqlodbc.h	(revision 435465)
+++ head/databases/postgresql-odbc/files/patch-psqlodbc.h	(revision 435466)
@@ -1,16 +1,16 @@
---- psqlodbc.h.orig	2016-01-10 13:25:14 UTC
+--- psqlodbc.h.orig	2017-02-03 13:05:10 UTC
 +++ psqlodbc.h
-@@ -175,13 +175,8 @@ typedef	unsigned long long ULONG_PTR;
- #if (SIZEOF_LONG == 8)
- #define	FORMAT_INTEGER	"%d"	/* SQLINTEGER */
+@@ -174,13 +174,8 @@ typedef	unsigned long long ULONG_PTR;
  #define	FORMAT_UINTEGER	"%u"	/* SQLUINTEGER */
+ #define	FORMATI64	"%ld"	/* SQLBIGINT */
+ #define	FORMATI64U	"%lu"	/* SQLUBIGINT */
 -#if defined(WITH_UNIXODBC) && defined(BUILD_LEGACY_64_BIT_MODE)
 -#define FORMAT_LEN	"%d"	/* SQLLEN */
 -#define FORMAT_ULEN	"%u"	/* SQLULEN */
--#else
+-#else /* WITH_UNIXODBC */
  #define FORMAT_LEN	"%ld"	/* SQLLEN */
  #define FORMAT_ULEN	"%lu"	/* SQLULEN */
 -#endif /* WITH_UNIXODBC */
- #else
- #define	FORMAT_LEN	"%ld"	/* SQLLEN */
- #define	FORMAT_ULEN	"%lu"	/* SQLULEN */
+ #else /* SIZEOF_LONG */
+ #define	FORMAT_INTEGER	"%ld"	/* SQLINTEGER */
+ #define	FORMAT_UINTEGER	"%lu"	/* SQLUINTEGER */