1 files changed, 98 insertions, 45 deletions

diff --git a/databases/mysql++/pkg-plist b/databases/mysql++/pkg-plist
index af2936cae94e..827b46d0e9a8 100644
--- a/databases/mysql++/pkg-plist
+++ b/databases/mysql++/pkg-plist
@@ -11,19 +11,19 @@ include/mysql++/exceptions.h
 include/mysql++/field_names.h
 include/mysql++/field_types.h
 include/mysql++/fields.h
+include/mysql++/lockable.h
 include/mysql++/manip.h
+include/mysql++/myset.h
 include/mysql++/mysql++.h
-include/mysql++/mysql++.hh
+include/mysql++/noexceptions.h
 include/mysql++/null.h
 include/mysql++/platform.h
+include/mysql++/qparms.h
 include/mysql++/query.h
 include/mysql++/resiter.h
 include/mysql++/result.h
 include/mysql++/row.h
-include/mysql++/myset.h
-include/mysql++/sql_query.h
 include/mysql++/sql_string.h
-include/mysql++/sqlplus.hh
 include/mysql++/stream2string.h
 include/mysql++/string_util.h
 include/mysql++/tiny_int.h
@@ -31,24 +31,66 @@ include/mysql++/type_info.h
 include/mysql++/vallist.h
 lib/libmysqlpp.a
 lib/libmysqlpp.so
-lib/libmysqlpp.so.4
+lib/libmysqlpp.so.2
 %%PORTDOCS%%%%DOCSDIR%%/mysqlpp-refman.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mysqlpp-userman.pdf
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/_header.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ColData__Tmpl-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ColData__Tmpl.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ColData__Tmpl__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1FieldNames-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1FieldNames.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1FieldTypes-members.html
@@ -57,6 +99,17 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Fields.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Fields__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Fields__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lock-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lock.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lock__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmpCStr-members.html
@@ -65,9 +118,19 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmpCStr__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1NoExceptions-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1NoExceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1NoExceptions__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Null-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Null.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Null__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1OptionalExceptions-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1OptionalExceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1OptionalExceptions__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Query-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Query.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Query__coll__graph.png
@@ -85,20 +148,11 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Result__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1RowTemplate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1RowTemplate.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1RowTemplate__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryNEParms-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryNEParms.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryParms-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryParms.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryParms__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLString-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLString.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set-members.html
@@ -111,6 +165,9 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1mysql__type__info-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1mysql__type__info.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1null__type.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1scoped__var__set-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1scoped__var__set.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1scoped__var__set__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1subscript__iterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1subscript__iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1subscript__iterator__coll__graph.png
@@ -165,7 +222,6 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/graph_legend.dot
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/graph_legend.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/graph_legend.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/hierarchy.html
@@ -203,16 +259,16 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__36.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__37.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__38.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__39.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__4.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__40.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__41.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__5.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__6.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__7.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__8.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__9.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherits.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/lockable_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/lockable_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/lockable_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/manip_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/manip_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/manip_8h__dep__incl.png
@@ -224,11 +280,12 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8hh-source.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8hh.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/namespacemysqlpp.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/namespaces.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/noexceptions_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/noexceptions_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/noexceptions_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/null_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/null_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/null_8h__dep__incl.png
@@ -236,10 +293,15 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/platform_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/platform_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/platform_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/refman.css
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h__dep__incl.png
@@ -252,16 +314,10 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/row_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/row_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/row_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sqlplus_8hh-source.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sqlplus_8hh.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h__dep__incl.png
@@ -303,16 +359,6 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1equal__list__ba-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1equal__list__ba.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1equal__list__ba__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__dt__base.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__dt__base__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1value__list__b-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1value__list__b.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1value__list__b__coll__graph.png
@@ -330,13 +376,15 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/vallist_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/vallist_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/vallist_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s02.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s04.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s05.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s06.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s07.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/breakages.html
 %%PORTDOCS%%%%DOCSDIR%%/userman/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/licenses.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/ssqls.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/tquery.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/unicode.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/userman.css
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cpp
@@ -345,18 +393,23 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom5.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom6.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/multiquery.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple2.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple3.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/usequery.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/util.h
 @dirrm include/mysql++
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userman/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userman
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%