3 files changed, 31 insertions, 36 deletions

diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index c0873010f32f..c8abefaaccb2 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	mysql++
-PORTVERSION=	1.7.20
+PORTVERSION=	1.7.27
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
 
-MAINTAINER=	mico@bsd.hu
+MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL
 
 USE_MYSQL=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} \
-		--with-mysql-include=${LOCALBASE}/include/mysql/ \
-		--with-mysql-lib=${LOCALBASE}/lib/mysql/
+CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
@@ -28,9 +26,8 @@ INSTALLS_SHLIB=	yes
 USE_GCC=	3.3
 .endif
 
-.if ${OSVERSION} >= 502126
-USE_GCC=	3.3
-.endif
+PKGNAMESUFFIX=	-mysql${MYSQL_VER}
+COMMENT+=	${MYSQL_VER}
 
 pre-configure:
 	@${RM} ${WRKSRC}/examples/Makefile.in
@@ -38,12 +35,12 @@ pre-configure:
 	@${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.so.2 ${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.a ${PREFIX}/lib
-	@(cd ${PREFIX}/lib && ${RM} -f libmysqlpp.so && ${LN} -s libmysqlpp.so.2 libmysqlpp.so)
+	@${INSTALL_PROGRAM} ${WRKSRC}/lib/.libs/libmysqlpp.so.4 ${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKSRC}/lib/.libs/libmysqlpp.a ${PREFIX}/lib
+	@(cd ${PREFIX}/lib && ${RM} -f libmysqlpp.so && ${LN} -s libmysqlpp.so.4 libmysqlpp.so)
 	@ranlib ${PREFIX}/lib/libmysqlpp.a
 	@${MKDIR} ${PREFIX}/include/mysql++
-	@(cd ${WRKSRC}/sqlplusint/; \
+	@(cd ${WRKSRC}/lib/; \
 		${INSTALL_DATA} *.hh ${PREFIX}/include/mysql++; \
 		${INSTALL_DATA} *.h ${PREFIX}/include/mysql++)
 .if !defined(NOPORTDOCS)
diff --git a/databases/mysql++1/distinfo b/databases/mysql++1/distinfo
index 3a999ef415ac..084e19c9f7f0 100644
--- a/databases/mysql++1/distinfo
+++ b/databases/mysql++1/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql++-1.7.20.tar.gz) = 8e842e649654d0e7b8eff4a62d46f607
-SIZE (mysql++-1.7.20.tar.gz) = 914144
+MD5 (mysql++-1.7.27.tar.gz) = 68aabd48b0007735a53ad46dad9c2410
+SIZE (mysql++-1.7.27.tar.gz) = 920003
diff --git a/databases/mysql++1/pkg-plist b/databases/mysql++1/pkg-plist
index 1d9e152f6e05..c5bf1697db59 100644
--- a/databases/mysql++1/pkg-plist
+++ b/databases/mysql++1/pkg-plist
@@ -21,7 +21,7 @@ include/mysql++/query.h
 include/mysql++/resiter.h
 include/mysql++/result.h
 include/mysql++/row.h
-include/mysql++/set.h
+include/mysql++/myset.h
 include/mysql++/sql_query.h
 include/mysql++/sql_string.h
 include/mysql++/sqlplus.hh
@@ -32,7 +32,7 @@ include/mysql++/type_info.h
 include/mysql++/vallist.h
 lib/libmysqlpp.a
 lib/libmysqlpp.so
-lib/libmysqlpp.so.2
+lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/1_Introduction.txt
 %%PORTDOCS%%%%DOCSDIR%%/2_Overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/3_Important.txt
@@ -56,53 +56,51 @@ lib/libmysqlpp.so.2
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.simple
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.bpf
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpf
 %%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/complic1.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom1.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom2.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom3.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom4.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpf
 %%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/dummy.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/examples.bpg
 %%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpf
 %%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpf
 %%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load_file.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/populate.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/populate.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpf
 %%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpf
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple1.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel_ex.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.bpr
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/util.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/util.hh
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel.bpr
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/util.h
 @dirrm include/mysql++
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%