6 files changed, 36 insertions, 38 deletions

diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 6d880bccc7d0..7f81d517c606 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	mysqlclient:${PORTSDIR}/databases/mysql322-client
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
-INSTALLS_SHLIB=	yes
+INSTALL_SHLIB=	yes
 
 pre-configure:
 	${RM} ${WRKSRC}/examples/Makefile.in
@@ -25,16 +25,17 @@ pre-configure:
 	${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/sqlplusint/.libs/libsqlplus.a ${PREFIX}/lib
-	(cd ${PREFIX}/lib && ${RM} -f libsqlplus.so && ${LN} -s libsqlplus.so.1 libsqlplus.so)
-	ranlib ${PREFIX}/lib/libsqlplus.a
-	${MKDIR} ${PREFIX}/share/examples/mysql++
-	${MKDIR} ${PREFIX}/share/doc/mysql++
-	${INSTALL_DATA} ${WRKSRC}/examples/*.cc ${PREFIX}/share/examples/mysql++
-	${INSTALL_DATA} ${WRKSRC}/doc/man-text/* ${PREFIX}/share/doc/mysql++
-	${MKDIR} ${PREFIX}/include/mysql
-	${INSTALL_DATA} ${WRKSRC}/sqlplusint/mysql++ ${WRKSRC}/sqlplusint/*.hh ${PREFIX}/include/mysql
-	${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples
+	@${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.a ${PREFIX}/lib
+	@(cd ${PREFIX}/lib && ${RM} -f libsqlplus.so && ${LN} -s libsqlplus.so.1 libsqlplus.so)
+	@ranlib ${PREFIX}/lib/libsqlplus.a
+	@ldconfig -m ${PREFIX}/lib
+	@mkdir -p ${PREFIX}/share/examples/mysql++
+	@mkdir -p ${PREFIX}/share/doc/mysql++
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/*.cc ${PREFIX}/share/examples/mysql++
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/man-text/* ${PREFIX}/share/doc/mysql++
+	@mkdir -p ${PREFIX}/include/mysql
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/mysql++ ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
+	@${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/mysql++
 
 .include <bsd.port.mk>
diff --git a/databases/mysql++/pkg-descr b/databases/mysql++/pkg-descr
index 4b67d189bd74..31e6d161eea8 100644
--- a/databases/mysql++/pkg-descr
+++ b/databases/mysql++/pkg-descr
@@ -1,8 +1,5 @@
-Mysql++ is a complex C++ API for Mysql (And other SQL Databases Soon).
-The goal of this API is too make working with Queries as easy as
-working with other STL Containers.
+   Mysql++ is a complex C++ API for Mysql (And other SQL Databases Soon).
+   The goal of this API is too make working with Queries as easy as
+   working with other STL Containers.
    
-The manual can be found at share/doc/mysql++, and there are some
-examples in share/examples/mysql++ under your PREFIX (see README).
-
-WWW: http://www.mysql.com/download_mysql++.html
+   WWW: http://www.mysql.com/download_mysql++.html
diff --git a/databases/mysql++/pkg-plist b/databases/mysql++/pkg-plist
index 00105172139a..4789fc522dd2 100644
--- a/databases/mysql++/pkg-plist
+++ b/databases/mysql++/pkg-plist
@@ -106,6 +106,7 @@ share/examples/mysql++/simple1.cc
 share/examples/mysql++/sinisa_ex.cc
 share/examples/mysql++/updel_x_.cc
 share/examples/mysql++/util.cc
+share/examples/mysql++/README
 @unexec rmdir include/mysql 2>/dev/null || true
 @dirrm share/doc/mysql++
 @dirrm share/examples/mysql++
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 6d880bccc7d0..7f81d517c606 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	mysqlclient:${PORTSDIR}/databases/mysql322-client
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
-INSTALLS_SHLIB=	yes
+INSTALL_SHLIB=	yes
 
 pre-configure:
 	${RM} ${WRKSRC}/examples/Makefile.in
@@ -25,16 +25,17 @@ pre-configure:
 	${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/sqlplusint/.libs/libsqlplus.a ${PREFIX}/lib
-	(cd ${PREFIX}/lib && ${RM} -f libsqlplus.so && ${LN} -s libsqlplus.so.1 libsqlplus.so)
-	ranlib ${PREFIX}/lib/libsqlplus.a
-	${MKDIR} ${PREFIX}/share/examples/mysql++
-	${MKDIR} ${PREFIX}/share/doc/mysql++
-	${INSTALL_DATA} ${WRKSRC}/examples/*.cc ${PREFIX}/share/examples/mysql++
-	${INSTALL_DATA} ${WRKSRC}/doc/man-text/* ${PREFIX}/share/doc/mysql++
-	${MKDIR} ${PREFIX}/include/mysql
-	${INSTALL_DATA} ${WRKSRC}/sqlplusint/mysql++ ${WRKSRC}/sqlplusint/*.hh ${PREFIX}/include/mysql
-	${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples
+	@${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.a ${PREFIX}/lib
+	@(cd ${PREFIX}/lib && ${RM} -f libsqlplus.so && ${LN} -s libsqlplus.so.1 libsqlplus.so)
+	@ranlib ${PREFIX}/lib/libsqlplus.a
+	@ldconfig -m ${PREFIX}/lib
+	@mkdir -p ${PREFIX}/share/examples/mysql++
+	@mkdir -p ${PREFIX}/share/doc/mysql++
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/*.cc ${PREFIX}/share/examples/mysql++
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/man-text/* ${PREFIX}/share/doc/mysql++
+	@mkdir -p ${PREFIX}/include/mysql
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sqlplusint/mysql++ ${WRKDIR}/${DISTNAME}/sqlplusint/*.hh ${PREFIX}/include/mysql
+	@${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/mysql++
 
 .include <bsd.port.mk>
diff --git a/databases/mysql++1/pkg-descr b/databases/mysql++1/pkg-descr
index 4b67d189bd74..31e6d161eea8 100644
--- a/databases/mysql++1/pkg-descr
+++ b/databases/mysql++1/pkg-descr
@@ -1,8 +1,5 @@
-Mysql++ is a complex C++ API for Mysql (And other SQL Databases Soon).
-The goal of this API is too make working with Queries as easy as
-working with other STL Containers.
+   Mysql++ is a complex C++ API for Mysql (And other SQL Databases Soon).
+   The goal of this API is too make working with Queries as easy as
+   working with other STL Containers.
    
-The manual can be found at share/doc/mysql++, and there are some
-examples in share/examples/mysql++ under your PREFIX (see README).
-
-WWW: http://www.mysql.com/download_mysql++.html
+   WWW: http://www.mysql.com/download_mysql++.html
diff --git a/databases/mysql++1/pkg-plist b/databases/mysql++1/pkg-plist
index 00105172139a..4789fc522dd2 100644
--- a/databases/mysql++1/pkg-plist
+++ b/databases/mysql++1/pkg-plist
@@ -106,6 +106,7 @@ share/examples/mysql++/simple1.cc
 share/examples/mysql++/sinisa_ex.cc
 share/examples/mysql++/updel_x_.cc
 share/examples/mysql++/util.cc
+share/examples/mysql++/README
 @unexec rmdir include/mysql 2>/dev/null || true
 @dirrm share/doc/mysql++
 @dirrm share/examples/mysql++