Attachment 48028 Details for Bug 73516 – file.diff

[patch] file.diff

file.diff (text/plain), 11.17 KB, created by sergey on 2004-11-04 09:20:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sergey

Created: 2004-11-04 09:20:25 UTC

Size: 11.17 KB

patch

obsolete

>diff -ruN mysql++/Makefile mysql++-1.7.20/Makefile
>--- mysql++/Makefile    Mon Oct 11 07:55:19 2004
>+++ mysql++-1.7.20/Makefile     Thu Nov  4 09:06:17 2004
>@@ -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_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,8 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 502126
>-BROKEN=                "Does not compile on FreeBSD >= 5.x"
>-.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} < 500039
>+USE_GCC=       3.3
> .endif
> 
> pre-configure:
>@@ -46,19 +34,19 @@
>        @${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 -ruN mysql++/distinfo mysql++-1.7.20/distinfo
>--- mysql++/distinfo    Wed Mar 31 03:06:37 2004
>+++ mysql++-1.7.20/distinfo     Thu Nov  4 08:09:19 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.20.tar.gz) = 8e842e649654d0e7b8eff4a62d46f607
>+SIZE (mysql++-1.7.20.tar.gz) = 914144
>diff -ruN mysql++/files/README mysql++-1.7.20/files/README
>--- mysql++/files/README        Sun Feb 18 14:53:51 2001
>+++ mysql++-1.7.20/files/README Thu Jan  1 00: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++/files/extra-patch-sqlplusint-connection.cc mysql++-1.7.20/files/extra-patch-sqlplusint-connection.cc
>--- mysql++/files/extra-patch-sqlplusint-connection.cc  Sun Dec 14 16:47:40 2003
>+++ mysql++-1.7.20/files/extra-patch-sqlplusint-connection.cc   Thu Jan  1 00: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++/pkg-descr mysql++-1.7.20/pkg-descr
>--- mysql++/pkg-descr   Sun Jun  6 23:21:13 2004
>+++ mysql++-1.7.20/pkg-descr    Thu Nov  4 08:21:10 2004
>@@ -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 -ruN mysql++/pkg-plist mysql++-1.7.20/pkg-plist
>--- mysql++/pkg-plist   Mon Sep 29 21:59:52 2003
>+++ mysql++-1.7.20/pkg-plist    Thu Nov  4 08:29:56 2004
>@@ -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 @@
> %%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%%
>--- mysql++.diff ends here ---

Actions: View | Diff

Attachments on bug 73516: 48028