aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-11-21 05:31:15 +0800
committerpav <pav@FreeBSD.org>2004-11-21 05:31:15 +0800
commitd7135937cd09eee60f0355a35dde447cfdf1314e (patch)
treeb7e2dba060e9fd445d2b9f117b59d17d8561d356 /databases
parentdf29574d5b46a9349799ee725a536221d393bc6a (diff)
downloadfreebsd-ports-gnome-d7135937cd09eee60f0355a35dde447cfdf1314e.tar.gz
freebsd-ports-gnome-d7135937cd09eee60f0355a35dde447cfdf1314e.tar.zst
freebsd-ports-gnome-d7135937cd09eee60f0355a35dde447cfdf1314e.zip
- Update to 1.7.20
PR: ports/73516 Submitted by: Sergey Prikhodko <sergey@network-asp.biz> Approved by: maintainer timeout (2 weeks)
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql++/Makefile38
-rw-r--r--databases/mysql++/distinfo6
-rw-r--r--databases/mysql++/files/README26
-rw-r--r--databases/mysql++/files/extra-patch-sqlplusint-connection.cc11
-rw-r--r--databases/mysql++/pkg-descr8
-rw-r--r--databases/mysql++/pkg-plist157
-rw-r--r--databases/mysql++1/Makefile38
-rw-r--r--databases/mysql++1/distinfo6
-rw-r--r--databases/mysql++1/files/README26
-rw-r--r--databases/mysql++1/files/extra-patch-sqlplusint-connection.cc11
-rw-r--r--databases/mysql++1/pkg-descr8
-rw-r--r--databases/mysql++1/pkg-plist157
12 files changed, 190 insertions, 302 deletions
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 15adf54899b9..c0873010f32f 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -6,12 +6,9 @@
#
PORTNAME= mysql++
-PORTVERSION= 1.7.9
-PORTREVISION= 2
+PORTVERSION= 1.7.20
CATEGORIES= databases devel
-MASTER_SITES= ftp://ftp.free.fr/pub/MySQL/Downloads/mysql++/ \
- ftp://gd.tuwien.ac.at/db/mysql/Downloads/mysql++/ \
- ftp://mirror.sit.wisc.edu/mirrors/mysql/Downloads/mysql++/
+MASTER_SITES= http://tangentsoft.net/mysql++/releases/
MAINTAINER= mico@bsd.hu
COMMENT= Complex C++ API for MySQL
@@ -20,7 +17,6 @@ USE_MYSQL= yes
USE_GMAKE= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ -Wno-deprecated"
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \
--with-mysql-include=${LOCALBASE}/include/mysql/ \
--with-mysql-lib=${LOCALBASE}/lib/mysql/
@@ -28,16 +24,12 @@ INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile on FreeBSD >= 5.x"
+.if ${OSVERSION} < 500039
+USE_GCC= 3.3
.endif
-.if ${OSVERSION} >= 500035
-PATCHFILES= patch_gcc_3.3.gz
-PATCH_SITES= ${MASTER_SITES}
-PATCH_DIST_STRIP=-p1
-.else
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-sqlplusint-connection.cc
+.if ${OSVERSION} >= 502126
+USE_GCC= 3.3
.endif
pre-configure:
@@ -46,19 +38,19 @@ 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}/include/mysql
+ @${INSTALL_PROGRAM} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.so.2 ${PREFIX}/lib
+ @${INSTALL_DATA} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.a ${PREFIX}/lib
+ @(cd ${PREFIX}/lib && ${RM} -f libmysqlpp.so && ${LN} -s libmysqlpp.so.2 libmysqlpp.so)
+ @ranlib ${PREFIX}/lib/libmysqlpp.a
+ @${MKDIR} ${PREFIX}/include/mysql++
@(cd ${WRKSRC}/sqlplusint/; \
- ${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
+ ${INSTALL_DATA} *.hh ${PREFIX}/include/mysql++; \
+ ${INSTALL_DATA} *.h ${PREFIX}/include/mysql++)
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/man-text/* ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/doc/man-text/*.txt ${DOCSDIR}
@${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/examples/*.cc ${EXAMPLESDIR}
- @${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.endif
.include <bsd.port.post.mk>
diff --git a/databases/mysql++/distinfo b/databases/mysql++/distinfo
index 3dae517126a6..3a999ef415ac 100644
--- a/databases/mysql++/distinfo
+++ b/databases/mysql++/distinfo
@@ -1,4 +1,2 @@
-MD5 (mysql++-1.7.9.tar.gz) = 1312fb4e33dcce07fac5fa9c2ac801f7
-SIZE (mysql++-1.7.9.tar.gz) = 749476
-MD5 (patch_gcc_3.3.gz) = c80d705e300b76ab07e10344eb8f19d3
-SIZE (patch_gcc_3.3.gz) = 19755
+MD5 (mysql++-1.7.20.tar.gz) = 8e842e649654d0e7b8eff4a62d46f607
+SIZE (mysql++-1.7.20.tar.gz) = 914144
diff --git a/databases/mysql++/files/README b/databases/mysql++/files/README
deleted file mode 100644
index 531f16962bc8..000000000000
--- a/databases/mysql++/files/README
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-If you haven't met mysql++ before, please take a look at the documentation
-in ../../doc/mysql++ before trying to play with these examples. Thank you.
-
-To compile a mysql++ program,
-
- o you have to have libmysqlclient installed on your system. It's
- provided by the mysql-client port/package. MySQL++ now needs
- MySQL 3.23 client libraries to run, so if you have old 3.22
- libraries, please upgrade them.
-
- o you have to link your programs with the sqlplus library
-
- o you have to add "-D_FIX_FOR_BSD_" to your CXXFLAGS environment
-
-
-For example, you can try to compile simple1.cc with something like this
-
-c++ -D_FIX_FOR_BSD_ -I/usr/local/include/mysql -L/usr/local/lib -lsqlplus simple1.cc -o simple1
-
-
-Happy mysql++'ing.
-
- -Miklos Niedermayer (mico@bsd.hu)
-
diff --git a/databases/mysql++/files/extra-patch-sqlplusint-connection.cc b/databases/mysql++/files/extra-patch-sqlplusint-connection.cc
deleted file mode 100644
index 1fd2f951354b..000000000000
--- a/databases/mysql++/files/extra-patch-sqlplusint-connection.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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++/pkg-descr b/databases/mysql++/pkg-descr
index 54735ed3f941..c5360e56740e 100644
--- a/databases/mysql++/pkg-descr
+++ b/databases/mysql++/pkg-descr
@@ -1,5 +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 C++ wrapper for MySQL's C API.
+It is built around STL principles, to make dealing with
+the database as easy as dealing with an STL container.
-WWW: http://dev.mysql.com/downloads/other/plusplus/
+WWW: http://tangentsoft.net/mysql++/
diff --git a/databases/mysql++/pkg-plist b/databases/mysql++/pkg-plist
index 4348ce39753e..1d9e152f6e05 100644
--- a/databases/mysql++/pkg-plist
+++ b/databases/mysql++/pkg-plist
@@ -1,82 +1,38 @@
-include/mysql/mysql++
-include/mysql/defs
-include/mysql/define_short
-include/mysql/undef_short
-include/mysql/bad_query.hh
-include/mysql/coldata1.hh
-include/mysql/coldata2.hh
-include/mysql/coldata3.hh
-include/mysql/coldata4.hh
-include/mysql/compare1.hh
-include/mysql/compare2.hh
-include/mysql/compare3.hh
-include/mysql/connection0.hh
-include/mysql/connection1.hh
-include/mysql/connection2.hh
-include/mysql/connection3.hh
-include/mysql/const_string1.hh
-include/mysql/const_string2.hh
-include/mysql/const_string3.hh
-include/mysql/convert1.hh
-include/mysql/convert2.hh
-include/mysql/convert3.hh
-include/mysql/custom-macros.hh
-include/mysql/custom.hh
-include/mysql/fields1.hh
-include/mysql/datetime1.hh
-include/mysql/datetime2.hh
-include/mysql/datetime3.hh
-include/mysql/exceptions.hh
-include/mysql/field_names1.hh
-include/mysql/field_names2.hh
-include/mysql/field_names3.hh
-include/mysql/field_types1.hh
-include/mysql/field_types2.hh
-include/mysql/field_types3.hh
-include/mysql/fields2.hh
-include/mysql/manip1.hh
-include/mysql/manip2.hh
-include/mysql/manip3.hh
-include/mysql/null1.hh
-include/mysql/null2.hh
-include/mysql/null3.hh
-include/mysql/query1.hh
-include/mysql/query2.hh
-include/mysql/query3.hh
-include/mysql/resiter1.hh
-include/mysql/result1.hh
-include/mysql/result2.hh
-include/mysql/result3.hh
-include/mysql/row1.hh
-include/mysql/row2.hh
-include/mysql/row3.hh
-include/mysql/set1.hh
-include/mysql/set2.hh
-include/mysql/set3.hh
-include/mysql/sql_query0.hh
-include/mysql/sql_query1.hh
-include/mysql/sql_query2.hh
-include/mysql/sql_query3.hh
-include/mysql/sql_string1.hh
-include/mysql/sql_string2.hh
-include/mysql/sql_string3.hh
-include/mysql/sqlplus.hh
-include/mysql/stream2string1.hh
-include/mysql/stream2string2.hh
-include/mysql/stream2string3.hh
-include/mysql/string_util.hh
-include/mysql/tiny_int1.hh
-include/mysql/tiny_int2.hh
-include/mysql/tiny_int3.hh
-include/mysql/type_info1.hh
-include/mysql/type_info2.hh
-include/mysql/type_info3.hh
-include/mysql/vallist1.hh
-include/mysql/vallist2.hh
-include/mysql/vallist3.hh
-lib/libsqlplus.so.1
-lib/libsqlplus.a
-lib/libsqlplus.so
+include/mysql++/bad_query.h
+include/mysql++/coldata.h
+include/mysql++/compare.h
+include/mysql++/connection.h
+include/mysql++/const_string.h
+include/mysql++/convert.h
+include/mysql++/custom-macros.h
+include/mysql++/custom.h
+include/mysql++/datetime.h
+include/mysql++/defs.h
+include/mysql++/exceptions.h
+include/mysql++/field_names.h
+include/mysql++/field_types.h
+include/mysql++/fields.h
+include/mysql++/manip.h
+include/mysql++/mysql++.h
+include/mysql++/mysql++.hh
+include/mysql++/null.h
+include/mysql++/platform.h
+include/mysql++/query.h
+include/mysql++/resiter.h
+include/mysql++/result.h
+include/mysql++/row.h
+include/mysql++/set.h
+include/mysql++/sql_query.h
+include/mysql++/sql_string.h
+include/mysql++/sqlplus.hh
+include/mysql++/stream2string.h
+include/mysql++/string_util.h
+include/mysql++/tiny_int.h
+include/mysql++/type_info.h
+include/mysql++/vallist.h
+lib/libmysqlpp.a
+lib/libmysqlpp.so
+lib/libmysqlpp.so.2
%%PORTDOCS%%%%DOCSDIR%%/1_Introduction.txt
%%PORTDOCS%%%%DOCSDIR%%/2_Overview.txt
%%PORTDOCS%%%%DOCSDIR%%/3_Important.txt
@@ -97,21 +53,56 @@ lib/libsqlplus.so
%%PORTDOCS%%%%DOCSDIR%%/Usage.txt
%%PORTDOCS%%%%DOCSDIR%%/index.txt
%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpr
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/dummy.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.bpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/populate.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/populate.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/populate.bpr
+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/sinisa_ex.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel_ex.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.cc
%%PORTDOCS%%%%EXAMPLESDIR%%/util.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-@dirrm include/mysql
+%%PORTDOCS%%%%EXAMPLESDIR%%/util.hh
+@dirrm include/mysql++
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 15adf54899b9..c0873010f32f 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -6,12 +6,9 @@
#
PORTNAME= mysql++
-PORTVERSION= 1.7.9
-PORTREVISION= 2
+PORTVERSION= 1.7.20
CATEGORIES= databases devel
-MASTER_SITES= ftp://ftp.free.fr/pub/MySQL/Downloads/mysql++/ \
- ftp://gd.tuwien.ac.at/db/mysql/Downloads/mysql++/ \
- ftp://mirror.sit.wisc.edu/mirrors/mysql/Downloads/mysql++/
+MASTER_SITES= http://tangentsoft.net/mysql++/releases/
MAINTAINER= mico@bsd.hu
COMMENT= Complex C++ API for MySQL
@@ -20,7 +17,6 @@ USE_MYSQL= yes
USE_GMAKE= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ -Wno-deprecated"
CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \
--with-mysql-include=${LOCALBASE}/include/mysql/ \
--with-mysql-lib=${LOCALBASE}/lib/mysql/
@@ -28,16 +24,12 @@ INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile on FreeBSD >= 5.x"
+.if ${OSVERSION} < 500039
+USE_GCC= 3.3
.endif
-.if ${OSVERSION} >= 500035
-PATCHFILES= patch_gcc_3.3.gz
-PATCH_SITES= ${MASTER_SITES}
-PATCH_DIST_STRIP=-p1
-.else
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-sqlplusint-connection.cc
+.if ${OSVERSION} >= 502126
+USE_GCC= 3.3
.endif
pre-configure:
@@ -46,19 +38,19 @@ 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}/include/mysql
+ @${INSTALL_PROGRAM} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.so.2 ${PREFIX}/lib
+ @${INSTALL_DATA} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.a ${PREFIX}/lib
+ @(cd ${PREFIX}/lib && ${RM} -f libmysqlpp.so && ${LN} -s libmysqlpp.so.2 libmysqlpp.so)
+ @ranlib ${PREFIX}/lib/libmysqlpp.a
+ @${MKDIR} ${PREFIX}/include/mysql++
@(cd ${WRKSRC}/sqlplusint/; \
- ${INSTALL_DATA} mysql++ defs undef_short define_short *.hh ${PREFIX}/include/mysql)
+ ${INSTALL_DATA} *.hh ${PREFIX}/include/mysql++; \
+ ${INSTALL_DATA} *.h ${PREFIX}/include/mysql++)
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/man-text/* ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/doc/man-text/*.txt ${DOCSDIR}
@${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/examples/*.cc ${EXAMPLESDIR}
- @${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.endif
.include <bsd.port.post.mk>
diff --git a/databases/mysql++1/distinfo b/databases/mysql++1/distinfo
index 3dae517126a6..3a999ef415ac 100644
--- a/databases/mysql++1/distinfo
+++ b/databases/mysql++1/distinfo
@@ -1,4 +1,2 @@
-MD5 (mysql++-1.7.9.tar.gz) = 1312fb4e33dcce07fac5fa9c2ac801f7
-SIZE (mysql++-1.7.9.tar.gz) = 749476
-MD5 (patch_gcc_3.3.gz) = c80d705e300b76ab07e10344eb8f19d3
-SIZE (patch_gcc_3.3.gz) = 19755
+MD5 (mysql++-1.7.20.tar.gz) = 8e842e649654d0e7b8eff4a62d46f607
+SIZE (mysql++-1.7.20.tar.gz) = 914144
diff --git a/databases/mysql++1/files/README b/databases/mysql++1/files/README
deleted file mode 100644
index 531f16962bc8..000000000000
--- a/databases/mysql++1/files/README
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-If you haven't met mysql++ before, please take a look at the documentation
-in ../../doc/mysql++ before trying to play with these examples. Thank you.
-
-To compile a mysql++ program,
-
- o you have to have libmysqlclient installed on your system. It's
- provided by the mysql-client port/package. MySQL++ now needs
- MySQL 3.23 client libraries to run, so if you have old 3.22
- libraries, please upgrade them.
-
- o you have to link your programs with the sqlplus library
-
- o you have to add "-D_FIX_FOR_BSD_" to your CXXFLAGS environment
-
-
-For example, you can try to compile simple1.cc with something like this
-
-c++ -D_FIX_FOR_BSD_ -I/usr/local/include/mysql -L/usr/local/lib -lsqlplus simple1.cc -o simple1
-
-
-Happy mysql++'ing.
-
- -Miklos Niedermayer (mico@bsd.hu)
-
diff --git a/databases/mysql++1/files/extra-patch-sqlplusint-connection.cc b/databases/mysql++1/files/extra-patch-sqlplusint-connection.cc
deleted file mode 100644
index 1fd2f951354b..000000000000
--- a/databases/mysql++1/files/extra-patch-sqlplusint-connection.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-descr b/databases/mysql++1/pkg-descr
index 54735ed3f941..c5360e56740e 100644
--- a/databases/mysql++1/pkg-descr
+++ b/databases/mysql++1/pkg-descr
@@ -1,5 +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 C++ wrapper for MySQL's C API.
+It is built around STL principles, to make dealing with
+the database as easy as dealing with an STL container.
-WWW: http://dev.mysql.com/downloads/other/plusplus/
+WWW: http://tangentsoft.net/mysql++/
diff --git a/databases/mysql++1/pkg-plist b/databases/mysql++1/pkg-plist
index 4348ce39753e..1d9e152f6e05 100644
--- a/databases/mysql++1/pkg-plist
+++ b/databases/mysql++1/pkg-plist
@@ -1,82 +1,38 @@
-include/mysql/mysql++
-include/mysql/defs
-include/mysql/define_short
-include/mysql/undef_short
-include/mysql/bad_query.hh
-include/mysql/coldata1.hh
-include/mysql/coldata2.hh
-include/mysql/coldata3.hh
-include/mysql/coldata4.hh
-include/mysql/compare1.hh
-include/mysql/compare2.hh
-include/mysql/compare3.hh
-include/mysql/connection0.hh
-include/mysql/connection1.hh
-include/mysql/connection2.hh
-include/mysql/connection3.hh
-include/mysql/const_string1.hh
-include/mysql/const_string2.hh
-include/mysql/const_string3.hh
-include/mysql/convert1.hh
-include/mysql/convert2.hh
-include/mysql/convert3.hh
-include/mysql/custom-macros.hh
-include/mysql/custom.hh
-include/mysql/fields1.hh
-include/mysql/datetime1.hh
-include/mysql/datetime2.hh
-include/mysql/datetime3.hh
-include/mysql/exceptions.hh
-include/mysql/field_names1.hh
-include/mysql/field_names2.hh
-include/mysql/field_names3.hh
-include/mysql/field_types1.hh
-include/mysql/field_types2.hh
-include/mysql/field_types3.hh
-include/mysql/fields2.hh
-include/mysql/manip1.hh
-include/mysql/manip2.hh
-include/mysql/manip3.hh
-include/mysql/null1.hh
-include/mysql/null2.hh
-include/mysql/null3.hh
-include/mysql/query1.hh
-include/mysql/query2.hh
-include/mysql/query3.hh
-include/mysql/resiter1.hh
-include/mysql/result1.hh
-include/mysql/result2.hh
-include/mysql/result3.hh
-include/mysql/row1.hh
-include/mysql/row2.hh
-include/mysql/row3.hh
-include/mysql/set1.hh
-include/mysql/set2.hh
-include/mysql/set3.hh
-include/mysql/sql_query0.hh
-include/mysql/sql_query1.hh
-include/mysql/sql_query2.hh
-include/mysql/sql_query3.hh
-include/mysql/sql_string1.hh
-include/mysql/sql_string2.hh
-include/mysql/sql_string3.hh
-include/mysql/sqlplus.hh
-include/mysql/stream2string1.hh
-include/mysql/stream2string2.hh
-include/mysql/stream2string3.hh
-include/mysql/string_util.hh
-include/mysql/tiny_int1.hh
-include/mysql/tiny_int2.hh
-include/mysql/tiny_int3.hh
-include/mysql/type_info1.hh
-include/mysql/type_info2.hh
-include/mysql/type_info3.hh
-include/mysql/vallist1.hh
-include/mysql/vallist2.hh
-include/mysql/vallist3.hh
-lib/libsqlplus.so.1
-lib/libsqlplus.a
-lib/libsqlplus.so
+include/mysql++/bad_query.h
+include/mysql++/coldata.h
+include/mysql++/compare.h
+include/mysql++/connection.h
+include/mysql++/const_string.h
+include/mysql++/convert.h
+include/mysql++/custom-macros.h
+include/mysql++/custom.h
+include/mysql++/datetime.h
+include/mysql++/defs.h
+include/mysql++/exceptions.h
+include/mysql++/field_names.h
+include/mysql++/field_types.h
+include/mysql++/fields.h
+include/mysql++/manip.h
+include/mysql++/mysql++.h
+include/mysql++/mysql++.hh
+include/mysql++/null.h
+include/mysql++/platform.h
+include/mysql++/query.h
+include/mysql++/resiter.h
+include/mysql++/result.h
+include/mysql++/row.h
+include/mysql++/set.h
+include/mysql++/sql_query.h
+include/mysql++/sql_string.h
+include/mysql++/sqlplus.hh
+include/mysql++/stream2string.h
+include/mysql++/string_util.h
+include/mysql++/tiny_int.h
+include/mysql++/type_info.h
+include/mysql++/vallist.h
+lib/libmysqlpp.a
+lib/libmysqlpp.so
+lib/libmysqlpp.so.2
%%PORTDOCS%%%%DOCSDIR%%/1_Introduction.txt
%%PORTDOCS%%%%DOCSDIR%%/2_Overview.txt
%%PORTDOCS%%%%DOCSDIR%%/3_Important.txt
@@ -97,21 +53,56 @@ lib/libsqlplus.so
%%PORTDOCS%%%%DOCSDIR%%/Usage.txt
%%PORTDOCS%%%%DOCSDIR%%/index.txt
%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/complic1.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.vcproj
%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.bpr
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/dummy.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.bpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/populate.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/populate.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/populate.bpr
+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/sinisa_ex.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel_ex.vcproj
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.bpf
+%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.bpr
%%PORTDOCS%%%%EXAMPLESDIR%%/updel_x_.cc
%%PORTDOCS%%%%EXAMPLESDIR%%/util.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-@dirrm include/mysql
+%%PORTDOCS%%%%EXAMPLESDIR%%/util.hh
+@dirrm include/mysql++
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%