From 2ba17cf83f9000a8e395778c9d1570405adb6d77 Mon Sep 17 00:00:00 2001 From: wilfried Date: Tue, 5 Jun 2001 12:30:02 +0000 Subject: [PATCH] upgrade to 1.7.9 - Fixed a serious bug in Connection constructor when reading MySQL options - Improved copy constructor and some other methods in Result / ResUse - Many other minor improvements - Produced a complete manual with chapter 5 included - Updated documentation, including a Postscript format add a -docs sub-package --- devel/mysql++/Makefile | 14 +++++- devel/mysql++/files/md5 | 6 +-- .../patches/patch-sqlplusint_connection_cc | 45 ------------------- devel/mysql++/pkg/DESCR-docs | 1 + devel/mysql++/pkg/PLIST-docs | 34 ++++++++++++++ 5 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 devel/mysql++/patches/patch-sqlplusint_connection_cc create mode 100644 devel/mysql++/pkg/DESCR-docs create mode 100644 devel/mysql++/pkg/PLIST-docs diff --git a/devel/mysql++/Makefile b/devel/mysql++/Makefile index 98a1507a4f1..b43a9e89ac1 100644 --- a/devel/mysql++/Makefile +++ b/devel/mysql++/Makefile @@ -1,8 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2001/06/03 05:32:16 brad Exp $ +# $OpenBSD: Makefile,v 1.3 2001/06/05 12:30:02 wilfried Exp $ COMMENT= "C++ API for MySQL" +COMMENT-docs= "C++ API for MySQL documentation" -DISTNAME= mysql++-1.7.8 +VERSION= 1.7.9 +DISTNAME= mysql++-${VERSION} +PKGNAME-docs= mysql++-docs-${VERSION} CATEGORIES= devel NEED_VERSION= 1.402 @@ -24,7 +27,14 @@ LIB_DEPENDS= mysqlclient.10:mysql-client-3.23.*:databases/mysql USE_GMAKE= Yes CONFIGURE_STYLE= gnu autoconf +MULTI_PACKAGES= -docs +SUBPACKAGE?= + pre-configure: @cd ${WRKSRC} && automake -a +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql++/html + ${INSTALL_DATA} ${WRKSRC}/doc/man-html/* ${PREFIX}/share/doc/mysql++/html + .include diff --git a/devel/mysql++/files/md5 b/devel/mysql++/files/md5 index e241a6cc74f..efa03d62c1f 100644 --- a/devel/mysql++/files/md5 +++ b/devel/mysql++/files/md5 @@ -1,3 +1,3 @@ -MD5 (mysql++-1.7.8.tar.gz) = f9b61381dd67676079ab9ca26e46db49 -RMD160 (mysql++-1.7.8.tar.gz) = bcf6be2cb95a350834a8aa3c114eb5f45dc35751 -SHA1 (mysql++-1.7.8.tar.gz) = 4cb71a50b480d74fa79244c65a35601491e59b3a +MD5 (mysql++-1.7.9.tar.gz) = 1312fb4e33dcce07fac5fa9c2ac801f7 +RMD160 (mysql++-1.7.9.tar.gz) = c82da7a9769b5cdcfefe01cd229fbf7561d25166 +SHA1 (mysql++-1.7.9.tar.gz) = 3c0908a28ba9a61e24d30b0f9b598aae94eb884f diff --git a/devel/mysql++/patches/patch-sqlplusint_connection_cc b/devel/mysql++/patches/patch-sqlplusint_connection_cc deleted file mode 100644 index ede5d16d0ee..00000000000 --- a/devel/mysql++/patches/patch-sqlplusint_connection_cc +++ /dev/null @@ -1,45 +0,0 @@ -$OpenBSD: patch-sqlplusint_connection_cc,v 1.1.1.1 2001/04/02 15:13:05 wilfried Exp $ ---- sqlplusint/connection.cc.orig Tue Nov 14 13:17:19 2000 -+++ sqlplusint/connection.cc Mon Feb 12 19:17:09 2001 -@@ -45,7 +45,10 @@ bool Connection::real_connect (cchar *db - { - mysql.options.compress = compress; - mysql.options.connect_timeout=connect_timeout; -- locked = true; mysql.options.my_cnf_file="my"; -+ locked = true; //mysql.options.my_cnf_file="my"; -+ -+ mysql_options(&mysql, MYSQL_READ_DEFAULT_FILE, "my"); -+ - if (mysql_real_connect(&mysql,host,user,passwd,db, port,socket_name,client_flag)) - { - locked = false; -@@ -56,7 +59,7 @@ bool Connection::real_connect (cchar *db - locked = false; Success = is_connected = false; - if (throw_exceptions) throw BadQuery(error()); - } -- mysql.options.my_cnf_file=0; -+ // mysql.options.my_cnf_file=0; - if (!Success) return Success; - if (db && db[0]) // if db is not empty - Success = select_db(db); -@@ -86,7 +89,10 @@ bool Connection::shutdown () { - } - - bool Connection::connect (cchar *db, cchar *host, cchar *user, cchar *passwd) { -- locked = true; mysql.options.my_cnf_file="my"; -+ locked = true; // mysql.options.my_cnf_file="my"; -+ -+ mysql_options(&mysql, MYSQL_READ_DEFAULT_FILE, "my"); -+ - if (mysql_real_connect(&mysql,host,user,passwd,db, 3306,NULL,0)) { - locked = false; - Success = is_connected = true; -@@ -95,7 +101,7 @@ bool Connection::connect (cchar *db, cch - if (throw_exceptions) throw BadQuery(error()); - Success = is_connected = false; - } -- mysql.options.my_cnf_file=0; -+ // mysql.options.my_cnf_file=0; - if (!Success) return Success; - if (db && db[0]) // if db is not empty - Success = select_db(db); diff --git a/devel/mysql++/pkg/DESCR-docs b/devel/mysql++/pkg/DESCR-docs new file mode 100644 index 00000000000..bc679ee061f --- /dev/null +++ b/devel/mysql++/pkg/DESCR-docs @@ -0,0 +1 @@ +MySQL++ documentation in HTML format diff --git a/devel/mysql++/pkg/PLIST-docs b/devel/mysql++/pkg/PLIST-docs new file mode 100644 index 00000000000..12619fa9947 --- /dev/null +++ b/devel/mysql++/pkg/PLIST-docs @@ -0,0 +1,34 @@ +@comment $OpenBSD: PLIST-docs,v 1.1 2001/06/05 12:30:09 wilfried Exp $ +share/doc/mysql++/html/1_Introduction.html +share/doc/mysql++/html/2_Overview.html +share/doc/mysql++/html/3_Important.html +share/doc/mysql++/html/4_Tutorial.html +share/doc/mysql++/html/5_Class.html +share/doc/mysql++/html/6_Template.html +share/doc/mysql++/html/7_Specialized.html +share/doc/mysql++/html/8_Long.html +share/doc/mysql++/html/A_Changelog.html +share/doc/mysql++/html/About_this.html +share/doc/mysql++/html/Appendices.html +share/doc/mysql++/html/B_Do.html +share/doc/mysql++/html/C_Credits.html +share/doc/mysql++/html/Contents.html +share/doc/mysql++/html/D_Copyright.html +share/doc/mysql++/html/E_Feedback.html +share/doc/mysql++/html/Introductory_Material.html +share/doc/mysql++/html/Usage.html +share/doc/mysql++/html/WARNINGS +share/doc/mysql++/html/contents.png +share/doc/mysql++/html/index.html +share/doc/mysql++/html/internals.pl +share/doc/mysql++/html/labels.pl +share/doc/mysql++/html/manual.css +share/doc/mysql++/html/manual.html +share/doc/mysql++/html/next.png +share/doc/mysql++/html/next_g.png +share/doc/mysql++/html/prev.png +share/doc/mysql++/html/prev_g.png +share/doc/mysql++/html/up.png +share/doc/mysql++/html/up_g.png +@dirrm share/doc/mysql++/html +@dirrm share/doc/mysql++