diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile
index 3f7a2c6850aa..130ef286d518 100644
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@@ -1,102 +1,103 @@
 PORTNAME=	tdbc
 DISTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF/tcl/TDBC/${PORTVERSION}
 DISTFILES=	${PORTNAME}${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Common database access interface for Tcl
 WWW=		http://tdbc.tcl.tk
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}${PORTVERSION}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		tcl:86+,tea
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC
 OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC
 OPTIONS_SUB=	yes
 
 USE_LDCONFIG=	yes
 MAKE_ENV+=	DESTDIR=${STAGEDIR}
 CONFIGURE_ARGS+=--enable-threads \
-		--mandir=${PREFIX}/man \
+		--mandir=${PREFIX}/share/man \
 		--includedir=${PREFIX}/include/tdbc
 PLIST_SUB+=	VERSION=${DISTVERSION} \
 		TCL_MAJ=${TCL_VER:R} \
 		TCL_VER=${TCL_VER}
 
 MODULES=	tdbc
 
 # TDBC (code)
 tdbc_CONFIGURE_ARGS=	--with-tcloo=${TCL_LIBDIR}
 
 # MySQL
 MYSQL_VARS=		MODULES+=tdbcmysql
 MYSQL_USES=		mysql:client
 MYSQL_DISTFILES=	${PORTNAME}mysql${PORTVERSION}${EXTRACT_SUFX}
 
 # ODBC
 ODBC_VARS=		MODULES+=tdbcodbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_DISTFILES=		${PORTNAME}odbc${PORTVERSION}${EXTRACT_SUFX}
 tdbcodbc_CONFIGURE_ARGS=--with-tdbc=${WRKDIR}/tdbc${PORTVERSION}
 
 # PostgreSQL
 PGSQL_VARS=		MODULES+=tdbcpostgres
 PGSQL_USES=		pgsql
 PGSQL_DISTFILES=	${PORTNAME}postgres${PORTVERSION}${EXTRACT_SUFX}
 
 # SQLite
 SQLITE_VARS=		MODULES+=tdbcsqlite3
 SQLITE_DISTFILES=	${PORTNAME}sqlite3-${PORTVERSION}${EXTRACT_SUFX}
 SQLITE_PLIST_SUB=	TCL_LIBDIR="${TCL_LIBDIR:S/${LOCALBASE}\///}"
 SQLITE_RUN_DEPENDS=	${LOCALBASE}/lib/sqlite3/pkgIndex.tcl:databases/tcl-sqlite3
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	if [ -d ${WRKDIR}/tdbcsqlite3-${PORTVERSION} ]; then \
 	    ${MV} ${WRKDIR}/tdbcsqlite3-${PORTVERSION} ${WRKDIR}/tdbcsqlite3${PORTVERSION}; \
 	fi
 
 post-patch:
 	${FIND} ${WRKDIR} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 	    -e '/^DESTDIR/s|=|?=|' \
 	    -e '/^INSTALL_PROGRAM/s|$$| -s|' \
 	    -e '/^INSTALL_LIBRARY/s|$$| -s|'
 
 do-configure:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Configuring ${module}"
 	cd ${WRKDIR}/${module}${PORTVERSION} && \
 	    ${SETENV} ${CONFIGURE_ENV} ${SH} configure \
 	    ${CONFIGURE_ARGS} ${${module}_CONFIGURE_ARGS}
 
 .endfor
 
 do-build:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Building ${module}"
 	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
 .endfor
 
 do-install:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Installing ${module}"
 	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 .endfor
 
 do-test:
 .for module in ${MODULES}
 	@echo "================================="
 	@echo "Testing ${module}"
 	cd ${WRKDIR}/${module}${PORTVERSION} && ${SETENV} ${MAKE_ENV} ${MAKE} test
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/tdbc/pkg-plist b/databases/tdbc/pkg-plist
index 748a7266976f..96fd830237f3 100644
--- a/databases/tdbc/pkg-plist
+++ b/databases/tdbc/pkg-plist
@@ -1,39 +1,39 @@
 include/tdbc/tdbc.h
 include/tdbc/tdbcDecls.h
 include/tdbc/tdbcInt.h
 lib/tdbc%%VERSION%%/libtdbc%%VERSION%%.so
 lib/tdbc%%VERSION%%/libtdbcstub%%VERSION%%.a
 lib/tdbc%%VERSION%%/pkgIndex.tcl
 lib/tdbc%%VERSION%%/tdbc.tcl
 lib/tdbc%%VERSION%%/tdbcConfig.sh
-man/man3/Tdbc_Init.3.gz
-man/mann/tdbc.n.gz
-man/mann/tdbc_connection.n.gz
-man/mann/tdbc_mapSqlState.n.gz
-man/mann/tdbc_resultset.n.gz
-man/mann/tdbc_statement.n.gz
-man/mann/tdbc_tokenize.n.gz
+share/man/man3/Tdbc_Init.3.gz
+share/man/mann/tdbc.n.gz
+share/man/mann/tdbc_connection.n.gz
+share/man/mann/tdbc_mapSqlState.n.gz
+share/man/mann/tdbc_resultset.n.gz
+share/man/mann/tdbc_statement.n.gz
+share/man/mann/tdbc_tokenize.n.gz
 @comment MySQL
 %%MYSQL%%include/tdbc/fakemysql.h
 %%MYSQL%%include/tdbc/mysqlStubs.h
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/libtdbcmysql%%VERSION%%.so
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/tdbcmysql.tcl
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/pkgIndex.tcl
-%%MYSQL%%man/mann/tdbc_mysql.n.gz
+%%MYSQL%%share/man/mann/tdbc_mysql.n.gz
 @comment ODBC
 %%ODBC%%include/tdbc/fakesql.h
 %%ODBC%%include/tdbc/odbcStubs.h
 %%ODBC%%lib/tdbcodbc%%VERSION%%/libtdbcodbc%%VERSION%%.so
 %%ODBC%%lib/tdbcodbc%%VERSION%%/tdbcodbc.tcl
 %%ODBC%%lib/tdbcodbc%%VERSION%%/pkgIndex.tcl
-%%ODBC%%man/mann/tdbc_odbc.n.gz
+%%ODBC%%share/man/mann/tdbc_odbc.n.gz
 @comment PGSQL
 %%PGSQL%%include/tdbc/fakepq.h
 %%PGSQL%%include/tdbc/pqStubs.h
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/libtdbcpostgres%%VERSION%%.so
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/tdbcpostgres.tcl
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/pkgIndex.tcl
-%%PGSQL%%man/mann/tdbc_postgres.n.gz
+%%PGSQL%%share/man/mann/tdbc_postgres.n.gz
 @comment SQLITE
 %%SQLITE%%lib/tcl%%TCL_MAJ%%/%%TCL_VER%%/tdbc/sqlite3-%%VERSION%%.tm
-%%SQLITE%%man/mann/tdbc_sqlite3.n.gz
+%%SQLITE%%share/man/mann/tdbc_sqlite3.n.gz