Skip site navigation (1)Skip section navigation (2)
Date:      Sat,  4 Sep 2004 14:12:33 +0300 (EEST)
From:      Sergey Prikhodko <sergey@network-asp.biz>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        mico@bsd.hu
Subject:   ports/71371: [ Update ] databases/mysql++ to 1.7.15
Message-ID:  <20040904111233.D7AD76262@network-asp.biz>
Resent-Message-ID: <200409041120.i84BKMEb093682@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71371
>Category:       ports
>Synopsis:       [ Update ] databases/mysql++ to 1.7.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 04 11:20:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Prikhodko &
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
Network-ASP
>Environment:
System: FreeBSD core 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #3: Tue Jul 27 16:56:56 EEST 2004 sergey@network-asp.biz:/usr/obj/usr/src/sys/RKERNEL i386

>Description:
        
        This is update of databases/mysql++ from 1.7.9 to 1.7.15.
        
        MySQL++ project changed his maintainer and he introdeced 
        some changes that may affect software depends on this one.
        
        Please see list of all changes at 
        http://tangentsoft.net/mysql++/ChangeLog
        
        
        Maintainer (mico@bsd.hu) CC'ed.
        

>How-To-Repeat:
        
>Fix:

--- mysql++.patch begins here ---
diff -ruN mysql++.old/Makefile mysql++/Makefile
--- mysql++.old/Makefile        Fri Feb 20 19:06:53 2004
+++ mysql++/Makefile    Sat Sep  4 13:44:55 2004
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=      mysql++
-PORTVERSION=   1.7.9
-PORTREVISION=  2
+PORTVERSION=   1.7.15
 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
@@ -27,13 +24,6 @@
 INSTALLS_SHLIB=        yes
 
 .include <bsd.port.pre.mk>
-.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
-.endif
 
 pre-configure:
        @${RM} ${WRKSRC}/examples/Makefile.in
@@ -41,19 +31,18 @@
        @${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
+       @${INSTALL_PROGRAM} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.so.1 ${PREFIX}/lib
+       @${INSTALL_DATA} ${WRKSRC}/sqlplusint/.libs/libmysqlpp.a ${PREFIX}/lib
+       @(cd ${PREFIX}/lib && ${RM} -f libmysqlpp.so && ${LN} -s libmysqlpp.so.1 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)
 .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 -ruN mysql++.old/distinfo mysql++/distinfo
--- mysql++.old/distinfo        Wed Mar 31 06:06:37 2004
+++ mysql++/distinfo    Sat Sep  4 13:35:00 2004
@@ -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.15.tar.gz) = 6ad5347d4340b65ae5688e267a62f3d7
+SIZE (mysql++-1.7.15.tar.gz) = 800231
diff -ruN mysql++.old/files/README mysql++/files/README
--- mysql++.old/files/README    Sun Feb 18 16:53:51 2001
+++ mysql++/files/README        Thu Jan  1 03:00:00 1970
@@ -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 -ruN mysql++.old/files/extra-patch-sqlplusint-connection.cc mysql++/files/extra-patch-sqlplusint-connection.cc
--- mysql++.old/files/extra-patch-sqlplusint-connection.cc      Sun Dec 14 18:47:40 2003
+++ mysql++/files/extra-patch-sqlplusint-connection.cc  Thu Jan  1 03:00:00 1970
@@ -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 -ruN mysql++.old/pkg-descr mysql++/pkg-descr
--- mysql++.old/pkg-descr       Mon Jun  7 02:21:13 2004
+++ mysql++/pkg-descr   Sat Sep  4 13:34:55 2004
@@ -2,4 +2,4 @@
 The goal of this API is too make working with Queries as easy as
 working with other STL Containers.
 
-WWW: http://dev.mysql.com/downloads/other/plusplus/
+WWW: http://tangentsoft.net/mysql++/
diff -ruN mysql++.old/pkg-plist mysql++/pkg-plist
--- mysql++.old/pkg-plist       Tue Sep 30 00:59:52 2003
+++ mysql++/pkg-plist   Sat Sep  4 13:34:29 2004
@@ -1,8 +1,3 @@
-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
@@ -22,10 +17,11 @@
 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/define_short.hh
+include/mysql/defs.hh
 include/mysql/exceptions.hh
 include/mysql/field_names1.hh
 include/mysql/field_names2.hh
@@ -33,10 +29,13 @@
 include/mysql/field_types1.hh
 include/mysql/field_types2.hh
 include/mysql/field_types3.hh
+include/mysql/fields1.hh
 include/mysql/fields2.hh
 include/mysql/manip1.hh
 include/mysql/manip2.hh
 include/mysql/manip3.hh
+include/mysql/mysql++-windows.hh
+include/mysql/mysql++.hh
 include/mysql/null1.hh
 include/mysql/null2.hh
 include/mysql/null3.hh
@@ -60,7 +59,6 @@
 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
@@ -74,9 +72,9 @@
 include/mysql/vallist1.hh
 include/mysql/vallist2.hh
 include/mysql/vallist3.hh
-lib/libsqlplus.so.1
-lib/libsqlplus.a
-lib/libsqlplus.so
+lib/libmysqlpp.a
+lib/libmysqlpp.so
+lib/libmysqlpp.so.1
 %%PORTDOCS%%%%DOCSDIR%%/1_Introduction.txt
 %%PORTDOCS%%%%DOCSDIR%%/2_Overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/3_Important.txt
@@ -97,21 +95,55 @@
 %%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%%/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
+%%PORTDOCS%%%%EXAMPLESDIR%%/util.hh
 @dirrm include/mysql
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
--- mysql++.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040904111233.D7AD76262>