3 files changed, 7 insertions, 75 deletions

diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 3289e73cbb3e..2cecb7ece17c 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	unixODBC
-PORTVERSION=	2.2.12
-PORTREVISION=	4
+PORTVERSION=	2.2.14
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cowbert@gmail.com
 COMMENT=	ODBC library suite for Unix
 
 CONFLICTS=	libiodbc-[0-9]*
@@ -23,7 +22,7 @@ CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}
 USE_LDCONFIG=	yes
 
-SUB_FILES=	pkg-message
+PORTDOCS=	*
 
 .if defined(WITH_GUI)
 USE_QT_VER=	3
@@ -67,9 +66,5 @@ post-install:
 		${CP} -p ${PREFIX}/etc/${conffile}.sample ${PREFIX}/etc/${conffile} ; \
 	fi
 .endfor
-	@${MKDIR} ${EXAMPLESDIR}/MySQL
-	cd ${WRKSRC}/Drivers/MySQL && ${INSTALL_DATA} iodbc.ini odbc.ini \
-		${EXAMPLESDIR}/MySQL
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo
index 9a9b626f5864..ed4c5e38b2d9 100644
--- a/databases/unixODBC/distinfo
+++ b/databases/unixODBC/distinfo
@@ -1,3 +1,3 @@
-MD5 (unixODBC-2.2.12.tar.gz) = 9a116aad4059c31d231b626ffdf1869a
-SHA256 (unixODBC-2.2.12.tar.gz) = d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
-SIZE (unixODBC-2.2.12.tar.gz) = 2798077
+MD5 (unixODBC-2.2.14.tar.gz) = f47c2efb28618ecf5f33319140a7acd0
+SHA256 (unixODBC-2.2.14.tar.gz) = fea02f2f687f55d4056728a602846fafd0e12d99110986633fb80e1bf0e94da5
+SIZE (unixODBC-2.2.14.tar.gz) = 2189755
diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index e0524a2a433c..e8f7531e82ae 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -20,6 +20,7 @@ include/sql.h
 include/sqlext.h
 include/sqltypes.h
 include/sqlucode.h
+include/unixodbc_conf.h
 include/uodbc_extras.h
 include/uodbc_stats.h
 lib/libboundparam.a
@@ -87,10 +88,6 @@ lib/libodbcpsqlS.a
 lib/libodbcpsqlS.la
 lib/libodbcpsqlS.so
 lib/libodbcpsqlS.so.1
-lib/libodbctxt.a
-lib/libodbctxt.la
-lib/libodbctxt.so
-lib/libodbctxt.so.1
 lib/libodbctxtS.a
 lib/libodbctxtS.la
 lib/libodbctxtS.so
@@ -115,65 +112,5 @@ lib/libtemplate.a
 lib/libtemplate.la
 lib/libtemplate.so
 lib/libtemplate.so.1
-%%EXAMPLESDIR%%/MySQL/iodbc.ini
-%%EXAMPLESDIR%%/MySQL/odbc.ini
-%%PORTDOCS%%%%DOCSDIR%%/AdministratorManual/index.html
-%%PORTDOCS%%%%DOCSDIR%%/AdministratorManual/odbcinst.html
-%%PORTDOCS%%%%DOCSDIR%%/AdministratorManual/php3.html
-%%PORTDOCS%%%%DOCSDIR%%/AdministratorManual/unixODBC.gif
-%%PORTDOCS%%%%DOCSDIR%%/AdministratorManual/unixODBCsetup.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/close.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/conne.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/dsn.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/gloss.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/navi.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/odbc.css
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/query.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/Tutorial/resul.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ProgrammerManual/unixODBC.gif
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/Figure1.gif
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/Figure2.gif
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/Figure3.gif
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/Figure4.gif
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/Figure6.gif
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/My.sql
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/StarOfficeDataGrid.gif
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/index.html
-%%PORTDOCS%%%%DOCSDIR%%/UserManual/unixODBC.gif
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure.vsd
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure2.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure2.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure3.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure3.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure4.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure4.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure5.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure5.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure6.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure6.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure7.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure7.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure8.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure8.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure9.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/InternalStructure9.html
-%%PORTDOCS%%%%DOCSDIR%%/lst/back.gif
-%%PORTDOCS%%%%DOCSDIR%%/lst/next.gif
-%%PORTDOCS%%%%DOCSDIR%%/smallbook.gif
-%%PORTDOCS%%%%DOCSDIR%%/unixODBC.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/lst
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/UserManual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ProgrammerManual/Tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ProgrammerManual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/AdministratorManual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%/MySQL
-@dirrm %%EXAMPLESDIR%%
 @exec mkdir -p %D/etc/ODBCDataSources 2>/dev/null || true
 @dirrmtry etc/ODBCDataSources