From 2f90dc000ff03f25e5349be69c8788e72f94c48c Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Sun, 14 Dec 2003 16:47:40 +0000
Subject: [PATCH] - Fix build on 4.x - Silence portlint

PR:		ports/59547
Submitted by:	Sergey Matveychuk <sem@ciam.ru>
---
 databases/mysql++/Makefile                            |  8 +++++---
 .../files/extra-patch-sqlplusint-connection.cc        | 11 +++++++++++
 databases/mysql++1/Makefile                           |  8 +++++---
 .../files/extra-patch-sqlplusint-connection.cc        | 11 +++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 databases/mysql++/files/extra-patch-sqlplusint-connection.cc
 create mode 100644 databases/mysql++1/files/extra-patch-sqlplusint-connection.cc

diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 6dcffc090ad8..1694b5b06444 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -31,6 +31,8 @@ INSTALLS_SHLIB=	yes
 PATCHFILES=	patch_gcc_3.3.gz
 PATCH_SITES=	${MASTER_SITES}
 PATCH_DIST_STRIP=-p1
+.else
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-sqlplusint-connection.cc
 .endif
 
 pre-configure:
@@ -43,13 +45,13 @@ do-install:
 	@${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 -p ${PREFIX}/include/mysql
+	@${MKDIR} ${PREFIX}/include/mysql
 	@(cd ${WRKSRC}/sqlplusint/; \
 	${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
 .if !defined(NOPORTDOCS)
-	@mkdir -p ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/man-text/* ${DOCSDIR}
-	@mkdir -p ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/*.cc ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
 .endif
diff --git a/databases/mysql++/files/extra-patch-sqlplusint-connection.cc b/databases/mysql++/files/extra-patch-sqlplusint-connection.cc
new file mode 100644
index 000000000000..1fd2f951354b
--- /dev/null
+++ b/databases/mysql++/files/extra-patch-sqlplusint-connection.cc
@@ -0,0 +1,11 @@
+--- sqlplusint/connection.cc.orig	Fri Nov 21 15:59:47 2003
++++ sqlplusint/connection.cc	Fri Nov 21 16:00:19 2003
+@@ -109,7 +109,7 @@
+ }
+ 
+ string Connection::info () {
+-  char *i = mysql_info(&mysql);
++  const char *i = mysql_info(&mysql);
+   if (!i)
+     return string();
+   else
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 6dcffc090ad8..1694b5b06444 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -31,6 +31,8 @@ INSTALLS_SHLIB=	yes
 PATCHFILES=	patch_gcc_3.3.gz
 PATCH_SITES=	${MASTER_SITES}
 PATCH_DIST_STRIP=-p1
+.else
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-sqlplusint-connection.cc
 .endif
 
 pre-configure:
@@ -43,13 +45,13 @@ do-install:
 	@${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 -p ${PREFIX}/include/mysql
+	@${MKDIR} ${PREFIX}/include/mysql
 	@(cd ${WRKSRC}/sqlplusint/; \
 	${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
 .if !defined(NOPORTDOCS)
-	@mkdir -p ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/man-text/* ${DOCSDIR}
-	@mkdir -p ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/*.cc ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
 .endif
diff --git a/databases/mysql++1/files/extra-patch-sqlplusint-connection.cc b/databases/mysql++1/files/extra-patch-sqlplusint-connection.cc
new file mode 100644
index 000000000000..1fd2f951354b
--- /dev/null
+++ b/databases/mysql++1/files/extra-patch-sqlplusint-connection.cc
@@ -0,0 +1,11 @@
+--- sqlplusint/connection.cc.orig	Fri Nov 21 15:59:47 2003
++++ sqlplusint/connection.cc	Fri Nov 21 16:00:19 2003
+@@ -109,7 +109,7 @@
+ }
+ 
+ string Connection::info () {
+-  char *i = mysql_info(&mysql);
++  const char *i = mysql_info(&mysql);
+   if (!i)
+     return string();
+   else