8 files changed, 230 insertions, 65 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 923486636860..b4e58831df78 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -107,6 +107,7 @@
     SUBDIR += mtop
     SUBDIR += myodbc
     SUBDIR += mysql++
+    SUBDIR += mysql++1
     SUBDIR += mysql-administrator
     SUBDIR += mysql-connector-java
     SUBDIR += mysql-editor
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 1e617481742b..723a524357de 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	mysql++
-PORTVERSION=	1.7.40
+PORTVERSION=	2.0.7
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
+PKGNAMESUFFIX=	-mysql${MYSQL_VER}
 
 MAINTAINER=	sergey@network-asp.biz
-COMMENT=	Complex C++ API for MySQL
+COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
 USE_MYSQL=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++
-CONFIGURE_ARGS+=	--disable-examples
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --disable-examples
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
+CONFLICTS=	${PORTNAME}*-1.*
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500039
 USE_GCC=	3.4
 .endif
 
-PKGNAMESUFFIX=	-mysql${MYSQL_VER}
-COMMENT+=	${MYSQL_VER}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/userman/html ${DOCSDIR}/refman/html
@@ -39,9 +42,11 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/examples/*.h ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/Makefile.simple ${EXAMPLESDIR}/Makefile.temp
-	@${SED} -e "s|/usr/include/mysql++|${PREFIX}/include/mysql++|" < ${EXAMPLESDIR}/Makefile.temp | \
-	${SED} -e "s|/usr/include/mysql|${LOCALBASE}/include/mysql|" | \
-	${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" > ${EXAMPLESDIR}/Makefile
+	@${SED} -e "s|-I../lib|-I${PREFIX}/include/mysql++|" < ${EXAMPLESDIR}/Makefile.temp | \
+		${SED} -e "s|/usr/include/mysql|${LOCALBASE}/include/mysql|" | \
+		${SED} -e "s|CXX=g++||" | \
+		${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" \
+		> ${EXAMPLESDIR}/Makefile
 	@${RM} -f ${EXAMPLESDIR}/Makefile.temp
 .endif
 
diff --git a/databases/mysql++/distinfo b/databases/mysql++/distinfo
index c32b70a5fe56..50bad86c6119 100644
--- a/databases/mysql++/distinfo
+++ b/databases/mysql++/distinfo
@@ -1,2 +1,3 @@
-MD5 (mysql++-1.7.40.tar.gz) = 163893856a9e5dbacffcb5ca6ad47c37
-SIZE (mysql++-1.7.40.tar.gz) = 1819351
+MD5 (mysql++-2.0.7.tar.gz) = e2ea3debacf936b0406012c895412ca4
+SHA256 (mysql++-2.0.7.tar.gz) = 35f3a775da8b736b23d8afeb73ed5af6b1be5f108c57a12f836ac3861118dd12
+SIZE (mysql++-2.0.7.tar.gz) = 1970290
diff --git a/databases/mysql++/files/patch-examples__Makefile.base b/databases/mysql++/files/patch-examples__Makefile.base
new file mode 100644
index 000000000000..d89c2b069f7d
--- /dev/null
+++ b/databases/mysql++/files/patch-examples__Makefile.base
@@ -0,0 +1,92 @@
+--- examples/Makefile.base.orig	Wed Nov  2 21:03:09 2005
++++ examples/Makefile.base	Sat Dec 10 16:08:30 2005
+@@ -22,15 +22,6 @@
+ 
+ # --- No user-serviceable parts below :)
+ 
+-define mk-objlist
+-	$(foreach O,$1,\
+-		$(if $(findstring $(BIN_DIR)/,$(O)),$(O),$(BIN_DIR)/$(O)))
+-endef
+-
+-ifndef BIN_DIR
+-	BIN_DIR=.
+-endif
+-
+ BINARIES=resetdb$(EXE) simple1$(EXE) simple2$(EXE) simple3$(EXE) \
+ 		usequery$(EXE) fieldinf1$(EXE) dbinfo$(EXE) cgi_image$(EXE) \
+ 		load_file$(EXE) updel$(EXE) multiquery$(EXE) custom1$(EXE) \
+@@ -67,56 +58,55 @@
+ 
+ 
+ resetdb$(EXE): $(RESETDB_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(RESETDB_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ simple1$(EXE): $(SIMPLE1_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ simple2$(EXE): $(SIMPLE2_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ simple3$(EXE): $(SIMPLE3_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ usequery$(EXE): $(USEQUERY_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(USEQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom1$(EXE): $(CUSTOM1_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom2$(EXE): $(CUSTOM2_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom3$(EXE): $(CUSTOM3_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom4$(EXE): $(CUSTOM4_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM4_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom5$(EXE): $(CUSTOM5_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM5_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom6$(EXE): $(CUSTOM6_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM6_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ fieldinf1$(EXE): $(FIELDINF1_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(FIELDINF1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ dbinfo$(EXE): $(DBINFO_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(DBINFO_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ cgi_image$(EXE): $(CGI_IMAGE_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CGI_IMAGE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ load_file$(EXE): $(LOAD_FILE_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(LOAD_FILE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ updel$(EXE): $(UPDEL_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(UPDEL_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ multiquery$(EXE): $(MULTIQUERY_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
+-
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(MULTIQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ resetdb.$(OBJ): resetdb.cpp util.h
+ simple1.$(OBJ): simple1.cpp util.h
diff --git a/databases/mysql++/files/patch-makemake.sh b/databases/mysql++/files/patch-makemake.sh
new file mode 100644
index 000000000000..acc98d1dd753
--- /dev/null
+++ b/databases/mysql++/files/patch-makemake.sh
@@ -0,0 +1,8 @@
+--- makemake.sh.orig	Wed Nov  2 21:03:09 2005
++++ makemake.sh	Sat Dec 10 15:07:58 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/local/bin/bash
+ 
+ # Display usage message
+ function usage() {
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%%
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 1e617481742b..0ab3758e1799 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -9,25 +9,28 @@ PORTNAME=	mysql++
 PORTVERSION=	1.7.40
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
+PKGNAMESUFFIX=	-mysql${MYSQL_VER}
 
 MAINTAINER=	sergey@network-asp.biz
-COMMENT=	Complex C++ API for MySQL
+COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
 
 USE_MYSQL=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++
-CONFIGURE_ARGS+=	--disable-examples
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++ \
+		--disable-examples
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
+CONFLICTS=	${PORTNAME}*-2.*
+NO_LATEST_LINK=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500039
 USE_GCC=	3.4
 .endif
 
-PKGNAMESUFFIX=	-mysql${MYSQL_VER}
-COMMENT+=	${MYSQL_VER}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/userman/html ${DOCSDIR}/refman/html
@@ -40,8 +43,9 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/Makefile.simple ${EXAMPLESDIR}/Makefile.temp
 	@${SED} -e "s|/usr/include/mysql++|${PREFIX}/include/mysql++|" < ${EXAMPLESDIR}/Makefile.temp | \
-	${SED} -e "s|/usr/include/mysql|${LOCALBASE}/include/mysql|" | \
-	${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" > ${EXAMPLESDIR}/Makefile
+		${SED} -e "s|/usr/include/mysql|${LOCALBASE}/include/mysql|" | \
+		${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" \
+		> ${EXAMPLESDIR}/Makefile
 	@${RM} -f ${EXAMPLESDIR}/Makefile.temp
 .endif
 
diff --git a/databases/mysql++1/distinfo b/databases/mysql++1/distinfo
index c32b70a5fe56..bfc65ea0f3da 100644
--- a/databases/mysql++1/distinfo
+++ b/databases/mysql++1/distinfo
@@ -1,2 +1,3 @@
 MD5 (mysql++-1.7.40.tar.gz) = 163893856a9e5dbacffcb5ca6ad47c37
+SHA256 (mysql++-1.7.40.tar.gz) = 41cc6fb2fa62ecea8d0601a7312ab386dbfd3d27f6d2160fa8ac942c3bea24b9
 SIZE (mysql++-1.7.40.tar.gz) = 1819351