3 files changed, 13 insertions, 53 deletions

diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index ef368ed5e9ba..98f0602c4a13 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql++
-PORTVERSION=	1.7.28
+PORTVERSION=	1.7.30
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
 
@@ -14,9 +14,7 @@ MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL
 
 USE_MYSQL=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
 INSTALLS_SHLIB=	yes
 
@@ -29,25 +27,19 @@ USE_GCC=	3.3
 PKGNAMESUFFIX=	-mysql${MYSQL_VER}
 COMMENT+=	${MYSQL_VER}
 
-pre-configure:
-	@${RM} ${WRKSRC}/examples/Makefile.in
-	@${ECHO} "all:" >${WRKSRC}/examples/Makefile.in
-	@${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
-
-do-install:
-	@${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}/lib/; \
-		${INSTALL_DATA} *.hh ${PREFIX}/include/mysql++; \
-		${INSTALL_DATA} *.h ${PREFIX}/include/mysql++)
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/man-text/*.txt ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${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|/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
+	@${RM} -f ${EXAMPLESDIR}/Makefile.temp
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql++1/distinfo b/databases/mysql++1/distinfo
index ccdc4350878c..8bcd8b46c333 100644
--- a/databases/mysql++1/distinfo
+++ b/databases/mysql++1/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql++-1.7.28.tar.gz) = 8e0864a7ff66dbd6b51b427f07294040
-SIZE (mysql++-1.7.28.tar.gz) = 807791
+MD5 (mysql++-1.7.30.tar.gz) = 6e45b42e710461ce17b153e58780aed6
+SIZE (mysql++-1.7.30.tar.gz) = 925209
diff --git a/databases/mysql++1/pkg-plist b/databases/mysql++1/pkg-plist
index c5bf1697db59..8d8fa7fef9ed 100644
--- a/databases/mysql++1/pkg-plist
+++ b/databases/mysql++1/pkg-plist
@@ -54,50 +54,18 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%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.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/complic1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.vcproj
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/examples.bpg
-%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel.vcproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel.bpf
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel.bpr
 %%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/util.h