diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-14 16:47:40 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2003-12-14 16:47:40 +0000 |
commit | 2f90dc000ff03f25e5349be69c8788e72f94c48c (patch) | |
tree | ce0e8d64f4d23462ff9e7b45096835580a9a30e6 /databases/mysql++1 | |
parent | 8f998ba5d3b090307ca56ab6205bf3991e26bc1a (diff) | |
download | ports-2f90dc000ff03f25e5349be69c8788e72f94c48c.tar.gz ports-2f90dc000ff03f25e5349be69c8788e72f94c48c.zip |
- Fix build on 4.x
- Silence portlint
PR: ports/59547
Submitted by: Sergey Matveychuk <sem@ciam.ru>
Notes
Notes:
svn path=/head/; revision=95802
Diffstat (limited to 'databases/mysql++1')
-rw-r--r-- | databases/mysql++1/Makefile | 8 | ||||
-rw-r--r-- | databases/mysql++1/files/extra-patch-sqlplusint-connection.cc | 11 |
2 files changed, 16 insertions, 3 deletions
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 |