3 files changed, 27 insertions, 57 deletions

diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 7c6f3645e82b..660555747f70 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql++
-PORTVERSION=	2.1.1
+PORTVERSION=	2.3.2
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
 PKGNAMESUFFIX=	-mysql${MYSQL_VER}
@@ -14,42 +14,35 @@ PKGNAMESUFFIX=	-mysql${MYSQL_VER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
 
-USE_MYSQL=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --disable-examples
-USE_LDCONFIG=	yes
-
-USE_GMAKE=      yes
-
 CONFLICTS=	${PORTNAME}*-1.*
 
 NOT_FOR_ARCHS=	amd64 sparc64
 NOT_FOR_ARCHS_REASON_amd64=	Fails to compile
 NOT_FOR_ARCHS_REASON_sparc64=	Fails to compile
 
-.if !defined(NOPORTDOCS)
+USE_MYSQL=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
+USE_LDCONFIG=	yes
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 PORTDOCS=	*
-.endif
+PORTEXAMPLES=	*
+
+PORTSCOUT=	limit:^2\.
 
 post-install:
-	@${RM} -f ${PREFIX}/lib/libmysqlpp.so.3
-	@${LN} -s ${PREFIX}/lib/libmysqlpp.so ${PREFIX}/lib/libmysqlpp.so.3
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/userman/html ${DOCSDIR}/refman/html
-	@${INSTALL_DATA} ${WRKSRC}/doc/userman/html/* ${DOCSDIR}/userman/html
-	@${INSTALL_DATA} ${WRKSRC}/doc/refman/html/* ${DOCSDIR}/refman/html
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/html
+	@(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${DOCSDIR}/html)
+	@${MKDIR} ${DOCSDIR}/pdf
+	@(cd ${WRKSRC}/doc/pdf && ${COPYTREE_SHARE} . ${DOCSDIR}/pdf)
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/*.cpp ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/*.h ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/Makefile.simple ${EXAMPLESDIR}/Makefile.temp
-	@${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
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/mysql++/distinfo b/databases/mysql++/distinfo
index eae847b633a8..0c688473160a 100644
--- a/databases/mysql++/distinfo
+++ b/databases/mysql++/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql++-2.1.1.tar.gz) = 3a42b3422b37c65f88be9162a969d164
-SHA256 (mysql++-2.1.1.tar.gz) = fcd05ac5b4ef0b7b196636907f0ab14860a4b889bd3b3e4f2acc919e2bb05a53
-SIZE (mysql++-2.1.1.tar.gz) = 1855521
+MD5 (mysql++-2.3.2.tar.gz) = e3b839b17872f1e0f2ddbf7cf407b395
+SHA256 (mysql++-2.3.2.tar.gz) = 3544b964964bc8981118119e82e4883dc9d1de8a72861a19e6687719ed3efce9
+SIZE (mysql++-2.3.2.tar.gz) = 1627115
diff --git a/databases/mysql++/pkg-plist b/databases/mysql++/pkg-plist
index 03c506a7d2ce..4c878a18e06c 100644
--- a/databases/mysql++/pkg-plist
+++ b/databases/mysql++/pkg-plist
@@ -1,11 +1,12 @@
+include/mysql++/autoflag.h
 include/mysql++/coldata.h
+include/mysql++/common.h
 include/mysql++/connection.h
 include/mysql++/const_string.h
 include/mysql++/convert.h
 include/mysql++/custom-macros.h
 include/mysql++/custom.h
 include/mysql++/datetime.h
-include/mysql++/defs.h
 include/mysql++/exceptions.h
 include/mysql++/field_names.h
 include/mysql++/field_types.h
@@ -16,7 +17,6 @@ include/mysql++/myset.h
 include/mysql++/mysql++.h
 include/mysql++/noexceptions.h
 include/mysql++/null.h
-include/mysql++/platform.h
 include/mysql++/qparms.h
 include/mysql++/query.h
 include/mysql++/querydef.h
@@ -31,30 +31,7 @@ include/mysql++/tiny_int.h
 include/mysql++/transaction.h
 include/mysql++/type_info.h
 include/mysql++/vallist.h
-@dirrm include/mysql++
 lib/libmysqlpp.so
-lib/libmysqlpp.so.3
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cpp
-%%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%%/stock.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/usequery.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/util.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/xaction.cpp
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+lib/libmysqlpp.so.2
+lib/libmysqlpp.so.%%VERSION%%
+@dirrm include/mysql++