aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--databases/mysql++/Makefile18
-rw-r--r--databases/mysql++/distinfo2
-rw-r--r--databases/mysql++1/Makefile18
-rw-r--r--databases/mysql++1/distinfo2
4 files changed, 30 insertions, 10 deletions
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index e3d11111e600..63ba6aad9fff 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -18,13 +18,21 @@ LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
USE_GMAKE= yes
HAS_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
+CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ -Wno-deprecated"
INSTALLS_SHLIB= yes
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500035
+PATCHFILES= mysql++-gcc-3.0.patch.gz \
+ mysql++-gcc-3.2.patch.gz
+PATCH_SITES= ${MASTER_SITES}
+PATCH_DIST_STRIP=-p1
+.endif
+
pre-configure:
- ${RM} ${WRKSRC}/examples/Makefile.in
- ${ECHO} "all:" >${WRKSRC}/examples/Makefile.in
- ${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
+ @${RM} ${WRKSRC}/examples/Makefile.in
+ @${ECHO} "all:" >${WRKSRC}/examples/Makefile.in
+ @${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
do-install:
@${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
@@ -40,4 +48,4 @@ do-install:
${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
@${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/mysql++
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql++/distinfo b/databases/mysql++/distinfo
index f07fe4cff1c7..26e168e43942 100644
--- a/databases/mysql++/distinfo
+++ b/databases/mysql++/distinfo
@@ -1 +1,3 @@
MD5 (mysql++-1.7.9.tar.gz) = 1312fb4e33dcce07fac5fa9c2ac801f7
+MD5 (mysql++-gcc-3.0.patch.gz) = 00958326410b942d352e6c7ceaafeeb9
+MD5 (mysql++-gcc-3.2.patch.gz) = fe3ef5852e96951a8eb5a172f2f19498
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index e3d11111e600..63ba6aad9fff 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -18,13 +18,21 @@ LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
USE_GMAKE= yes
HAS_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
+CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ -Wno-deprecated"
INSTALLS_SHLIB= yes
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500035
+PATCHFILES= mysql++-gcc-3.0.patch.gz \
+ mysql++-gcc-3.2.patch.gz
+PATCH_SITES= ${MASTER_SITES}
+PATCH_DIST_STRIP=-p1
+.endif
+
pre-configure:
- ${RM} ${WRKSRC}/examples/Makefile.in
- ${ECHO} "all:" >${WRKSRC}/examples/Makefile.in
- ${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
+ @${RM} ${WRKSRC}/examples/Makefile.in
+ @${ECHO} "all:" >${WRKSRC}/examples/Makefile.in
+ @${ECHO} "install:" >>${WRKSRC}/examples/Makefile.in
do-install:
@${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sqlplusint/.libs/libsqlplus.so.1 ${PREFIX}/lib
@@ -40,4 +48,4 @@ do-install:
${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
@${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/mysql++
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mysql++1/distinfo b/databases/mysql++1/distinfo
index f07fe4cff1c7..26e168e43942 100644
--- a/databases/mysql++1/distinfo
+++ b/databases/mysql++1/distinfo
@@ -1 +1,3 @@
MD5 (mysql++-1.7.9.tar.gz) = 1312fb4e33dcce07fac5fa9c2ac801f7
+MD5 (mysql++-gcc-3.0.patch.gz) = 00958326410b942d352e6c7ceaafeeb9
+MD5 (mysql++-gcc-3.2.patch.gz) = fe3ef5852e96951a8eb5a172f2f19498