diff options
| -rw-r--r-- | databases/mysql++3/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql++3/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql++3/files/patch-Makefile.in | 189 | ||||
| -rw-r--r-- | databases/mysql++3/pkg-plist | 7 |
4 files changed, 123 insertions, 80 deletions
diff --git a/databases/mysql++3/Makefile b/databases/mysql++3/Makefile index faa5604f54f8..3fa1aae87a9e 100644 --- a/databases/mysql++3/Makefile +++ b/databases/mysql++3/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mysql++ -PORTVERSION= 3.0.8 -PORTREVISION= 1 +PORTVERSION= 3.1.0 CATEGORIES= databases devel MASTER_SITES= http://tangentsoft.net/mysql++/releases/ \ T32.TecNik93.com/ports/others_ports/${PORTNAME}/sources/ diff --git a/databases/mysql++3/distinfo b/databases/mysql++3/distinfo index 0716f8d2e2d6..005634554d9d 100644 --- a/databases/mysql++3/distinfo +++ b/databases/mysql++3/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql++-3.0.8.tar.gz) = 7f3bc0db7c4f247a3b5d66c9084fba45b60baeef1846a21b97398905f9e68fee -SIZE (mysql++-3.0.8.tar.gz) = 2529509 +SHA256 (mysql++-3.1.0.tar.gz) = 256c39a583e7d60947916851754c626312428e9b1d8af3309e34d64ff8404e92 +SIZE (mysql++-3.1.0.tar.gz) = 1944101 diff --git a/databases/mysql++3/files/patch-Makefile.in b/databases/mysql++3/files/patch-Makefile.in index cee3659d6f89..0260a3f21a0a 100644 --- a/databases/mysql++3/files/patch-Makefile.in +++ b/databases/mysql++3/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2008-11-27 16:23:04.000000000 +0800 -+++ Makefile.in 2008-12-17 22:04:54.000000000 +0800 -@@ -329,11 +329,11 @@ +--- Makefile.in.orig 2011-08-02 14:23:21.000000000 +0100 ++++ Makefile.in 2011-08-02 14:40:43.000000000 +0100 +@@ -379,11 +379,11 @@ ### Targets: ### --all: $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) test_array_index$(EXEEXT) test_cpool$(EXEEXT) test_datetime$(EXEEXT) test_inttypes$(EXEEXT) test_manip$(EXEEXT) test_null_comparison$(EXEEXT) test_qssqls$(EXEEXT) test_qstream$(EXEEXT) test_string$(EXEEXT) test_tcp$(EXEEXT) test_uds$(EXEEXT) test_wnp$(EXEEXT) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) cgi_jpeg$(EXEEXT) cpool$(EXEEXT) dbinfo$(EXEEXT) deadlock$(EXEEXT) fieldinf$(EXEEXT) for_each$(EXEEXT) load_jpeg$(EXEEXT) multiquery$(EXEEXT) resetdb$(EXEEXT) simple1$(EXEEXT) simple2$(EXEEXT) simple3$(EXEEXT) ssqls1$(EXEEXT) ssqls2$(EXEEXT) ssqls3$(EXEEXT) ssqls4$(EXEEXT) ssqls5$(EXEEXT) store_if$(EXEEXT) tquery1$(EXEEXT) tquery2$(EXEEXT) tquery3$(EXEEXT) transaction$(EXEEXT) -+all: $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +-all: $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) ssqlsxlat$(EXEEXT) test_array_index$(EXEEXT) test_cpool$(EXEEXT) test_datetime$(EXEEXT) test_inttypes$(EXEEXT) test_insertpolicy$(EXEEXT) test_manip$(EXEEXT) test_null_comparison$(EXEEXT) test_query_copy$(EXEEXT) test_qssqls$(EXEEXT) test_qstream$(EXEEXT) test_sqlstream$(EXEEXT) test_ssqls2$(EXEEXT) test_string$(EXEEXT) test_tcp$(EXEEXT) test_uds$(EXEEXT) test_wnp$(EXEEXT) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) cgi_jpeg$(EXEEXT) cpool$(EXEEXT) dbinfo$(EXEEXT) deadlock$(EXEEXT) fieldinf$(EXEEXT) for_each$(EXEEXT) load_jpeg$(EXEEXT) multiquery$(EXEEXT) resetdb$(EXEEXT) simple1$(EXEEXT) simple2$(EXEEXT) simple3$(EXEEXT) ssqls1$(EXEEXT) ssqls2$(EXEEXT) ssqls3$(EXEEXT) ssqls4$(EXEEXT) ssqls5$(EXEEXT) ssqls6$(EXEEXT) store_if$(EXEEXT) tquery1$(EXEEXT) tquery2$(EXEEXT) tquery3$(EXEEXT) tquery4$(EXEEXT) transaction$(EXEEXT) ++all: $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) install: install_mysqlpp $(INSTALL_DIR) $(DESTDIR)$(prefix)/include/mysql++ @@ -14,18 +14,22 @@ uninstall: uninstall_mysqlpp (cd $(DESTDIR)$(prefix)/include/mysql++ ; rm -f *.h) -@@ -349,41 +349,6 @@ - rm -f $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) - rm -f $(LIBPREFIX)mysqlpp.$(DLLIMP_SUFFIX) +@@ -401,47 +401,6 @@ rm -f $(LIBPREFIX)mysqlpp.$(DLLIMP_SUFFIX) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf2) + rm -f $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) + rm -f ssqlsxlat$(EXEEXT) - rm -f test_array_index$(EXEEXT) - rm -f test_cpool$(EXEEXT) - rm -f test_datetime$(EXEEXT) - rm -f test_inttypes$(EXEEXT) +- rm -f test_insertpolicy$(EXEEXT) - rm -f test_manip$(EXEEXT) - rm -f test_null_comparison$(EXEEXT) +- rm -f test_query_copy$(EXEEXT) - rm -f test_qssqls$(EXEEXT) - rm -f test_qstream$(EXEEXT) +- rm -f test_sqlstream$(EXEEXT) +- rm -f test_ssqls2$(EXEEXT) - rm -f test_string$(EXEEXT) - rm -f test_tcp$(EXEEXT) - rm -f test_uds$(EXEEXT) @@ -48,75 +52,97 @@ - rm -f ssqls3$(EXEEXT) - rm -f ssqls4$(EXEEXT) - rm -f ssqls5$(EXEEXT) +- rm -f ssqls6$(EXEEXT) - rm -f store_if$(EXEEXT) - rm -f tquery1$(EXEEXT) - rm -f tquery2$(EXEEXT) - rm -f tquery3$(EXEEXT) +- rm -f tquery4$(EXEEXT) - rm -f transaction$(EXEEXT) rm -rf doc/latex doc/pdf ; \ cd doc/html/refman ; \ rm -f doxygen.css [a-z]*.{dot,html,map,md5,png} -@@ -407,181 +372,6 @@ - rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) - (cd $(DESTDIR)$(libdir) ; $(__mysqlpp___so_symlinks_uninst_cmd)) +@@ -475,211 +434,6 @@ + + $(__ssqlsxlat___mac_setfilecmd) -test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_array_index___mac_setfilecmd) - -test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_cpool___mac_setfilecmd) - -test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_datetime___mac_setfilecmd) - -test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_inttypes___mac_setfilecmd) - +-test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- +- $(__test_insertpolicy___mac_setfilecmd) +- -test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_MANIP_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_MANIP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_manip___mac_setfilecmd) - -test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_null_comparison___mac_setfilecmd) - +-test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- +- $(__test_query_copy___mac_setfilecmd) +- -test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_qssqls___mac_setfilecmd) - -test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_qstream___mac_setfilecmd) - +-test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- +- $(__test_sqlstream___mac_setfilecmd) +- +-test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) +- $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS) +- +- $(__test_ssqls2___mac_setfilecmd) +- -test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_STRING_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_STRING_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_string___mac_setfilecmd) - -test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_TCP_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_TCP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_tcp___mac_setfilecmd) - -test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_UDS_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_UDS_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_uds___mac_setfilecmd) - -test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TEST_WNP_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TEST_WNP_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) - - $(__test_wnp___mac_setfilecmd) - @@ -126,155 +152,153 @@ - $(RANLIB) $@ - -cgi_jpeg$(EXEEXT): $(CGI_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(CGI_JPEG_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(CGI_JPEG_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__cgi_jpeg___mac_setfilecmd) - -cpool$(EXEEXT): $(CPOOL_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(CPOOL_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__cpool___mac_setfilecmd) - -dbinfo$(EXEEXT): $(DBINFO_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(DBINFO_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(DBINFO_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__dbinfo___mac_setfilecmd) - -deadlock$(EXEEXT): $(DEADLOCK_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(DEADLOCK_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(DEADLOCK_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__deadlock___mac_setfilecmd) - -fieldinf$(EXEEXT): $(FIELDINF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(FIELDINF_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(FIELDINF_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__fieldinf___mac_setfilecmd) - -for_each$(EXEEXT): $(FOR_EACH_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(FOR_EACH_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(FOR_EACH_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__for_each___mac_setfilecmd) - -load_jpeg$(EXEEXT): $(LOAD_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(LOAD_JPEG_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(LOAD_JPEG_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__load_jpeg___mac_setfilecmd) - -multiquery$(EXEEXT): $(MULTIQUERY_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(MULTIQUERY_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(MULTIQUERY_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__multiquery___mac_setfilecmd) - -resetdb$(EXEEXT): $(RESETDB_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(RESETDB_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(RESETDB_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__resetdb___mac_setfilecmd) - -simple1$(EXEEXT): $(SIMPLE1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SIMPLE1_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SIMPLE1_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__simple1___mac_setfilecmd) - -simple2$(EXEEXT): $(SIMPLE2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SIMPLE2_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SIMPLE2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__simple2___mac_setfilecmd) - -simple3$(EXEEXT): $(SIMPLE3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SIMPLE3_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SIMPLE3_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__simple3___mac_setfilecmd) - -ssqls1$(EXEEXT): $(SSQLS1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SSQLS1_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SSQLS1_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__ssqls1___mac_setfilecmd) - -ssqls2$(EXEEXT): $(SSQLS2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SSQLS2_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SSQLS2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__ssqls2___mac_setfilecmd) - -ssqls3$(EXEEXT): $(SSQLS3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SSQLS3_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SSQLS3_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__ssqls3___mac_setfilecmd) - -ssqls4$(EXEEXT): $(SSQLS4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SSQLS4_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SSQLS4_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__ssqls4___mac_setfilecmd) - -ssqls5$(EXEEXT): $(SSQLS5_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(SSQLS5_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(SSQLS5_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__ssqls5___mac_setfilecmd) - +-ssqls6$(EXEEXT): $(SSQLS6_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SSQLS6_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- +- $(__ssqls6___mac_setfilecmd) +- -store_if$(EXEEXT): $(STORE_IF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(STORE_IF_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(STORE_IF_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__store_if___mac_setfilecmd) - -tquery1$(EXEEXT): $(TQUERY1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TQUERY1_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TQUERY1_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__tquery1___mac_setfilecmd) - -tquery2$(EXEEXT): $(TQUERY2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TQUERY2_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TQUERY2_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__tquery2___mac_setfilecmd) - -tquery3$(EXEEXT): $(TQUERY3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TQUERY3_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TQUERY3_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__tquery3___mac_setfilecmd) - +-tquery4$(EXEEXT): $(TQUERY4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TQUERY4_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- +- $(__tquery4___mac_setfilecmd) +- -transaction$(EXEEXT): $(TRANSACTION_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) -- $(CXX) -o $@ $(TRANSACTION_OBJECTS) -L. -l@MYSQL_C_LIB@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) +- $(CXX) -o $@ $(TRANSACTION_OBJECTS) -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) - - $(__transaction___mac_setfilecmd) - - lib/ssqls.h: lib/ssqls.pl - cd lib ; ./ssqls.pl - -@@ -589,8 +379,8 @@ - cd lib ; ./querydef.pl - - tags: -- ctags `pwd`/{examples,lib}/*.{cpp,h} -- for d in examples lib ; do cd $$d ; ln -sf ../tags . ; cd .. ; done -+ ctags `pwd`/{lib}/*.{cpp,h} -+ for d in lib ; do cd $$d ; ln -sf ../tags . ; cd .. ; done - - ctags: tags - -@@ -604,7 +394,7 @@ - doc: doc/html/refman/index.html doc/html/userman/index.html + Makefile: configure.ac install.hta.in mysql++.bkl mysql++.spec.in doc/userman/userman.dbx.in lib/Doxyfile.in lib/mysql++.h.in ssx/Doxyfile.in + bakefile_gen + autoreconf +@@ -709,7 +463,7 @@ @PACKAGE_NAME@-@PACKAGE_VERSION@: -- for d in config doc/{.,html}/{refman,userman} examples lib test ; \ -+ for d in config doc/{.,html}/{refman,userman} lib test ; \ + for d in config doc/html/refman doc/html/userman \ +- doc/refman doc/userman examples lib ssx test ; \ ++ doc/refman doc/userman lib ssx test ; \ do \ mkdir -p @PACKAGE_NAME@-@PACKAGE_VERSION@/$$d ; \ done -@@ -618,13 +408,6 @@ +@@ -723,12 +477,6 @@ done cp config/*.m4 @PACKAGE_NAME@-@PACKAGE_VERSION@/config cp doc/userman/userman.dbx.in @PACKAGE_NAME@-@PACKAGE_VERSION@/doc/userman -- cp examples/*.{cpp,h,jpg} @PACKAGE_NAME@-@PACKAGE_VERSION@/examples +- cp examples/*.cpp examples/*.h examples/*.jpg @PACKAGE_NAME@-@PACKAGE_VERSION@/examples - for d in mfc wforms ; \ - do \ - mkdir -p @PACKAGE_NAME@-@PACKAGE_VERSION@/examples/vstudio/$$d ; \ -- cp examples/vstudio/$$d/*.{cpp,h,r*,vcproj} \ -- @PACKAGE_NAME@-@PACKAGE_VERSION@/examples/vstudio/$$d ; \ +- cp examples/vstudio/$$d/* @PACKAGE_NAME@-@PACKAGE_VERSION@/examples/vstudio/$$d ; \ - done - cp lib/*.{cpp,h,in,pl} @PACKAGE_NAME@-@PACKAGE_VERSION@/lib + cp lib/*.cpp lib/*.h lib/*.in lib/*.pl @PACKAGE_NAME@-@PACKAGE_VERSION@/lib cp test/*.cpp @PACKAGE_NAME@-@PACKAGE_VERSION@/test - cd @PACKAGE_NAME@-@PACKAGE_VERSION@ ; ./bootstrap nodoc nomaint -@@ -721,115 +504,6 @@ - mysqlpp_wnp_connection.o: $(srcdir)/lib/wnp_connection.cpp - $(CXXC) -c -o $@ $(MYSQLPP_CXXFLAGS) $(srcdir)/lib/wnp_connection.cpp + cp ssx/*.cpp ssx/*.h ssx/*.in @PACKAGE_NAME@-@PACKAGE_VERSION@/ssx +@@ -852,130 +600,6 @@ + ssqlsxlat_main.o: $(srcdir)/ssx/main.cpp + $(CXXC) -c -o $@ $(SSQLSXLAT_CXXFLAGS) $(srcdir)/ssx/main.cpp -test_array_index_array_index.o: $(srcdir)/test/array_index.cpp - $(CXXC) -c -o $@ $(TEST_ARRAY_INDEX_CXXFLAGS) $(srcdir)/test/array_index.cpp @@ -288,18 +312,30 @@ -test_inttypes_inttypes.o: $(srcdir)/test/inttypes.cpp - $(CXXC) -c -o $@ $(TEST_INTTYPES_CXXFLAGS) $(srcdir)/test/inttypes.cpp - +-test_insertpolicy_insertpolicy.o: $(srcdir)/test/insertpolicy.cpp +- $(CXXC) -c -o $@ $(TEST_INSERTPOLICY_CXXFLAGS) $(srcdir)/test/insertpolicy.cpp +- -test_manip_manip.o: $(srcdir)/test/manip.cpp - $(CXXC) -c -o $@ $(TEST_MANIP_CXXFLAGS) $(srcdir)/test/manip.cpp - -test_null_comparison_null_comparison.o: $(srcdir)/test/null_comparison.cpp - $(CXXC) -c -o $@ $(TEST_NULL_COMPARISON_CXXFLAGS) $(srcdir)/test/null_comparison.cpp - +-test_query_copy_query_copy.o: $(srcdir)/test/query_copy.cpp +- $(CXXC) -c -o $@ $(TEST_QUERY_COPY_CXXFLAGS) $(srcdir)/test/query_copy.cpp +- -test_qssqls_qssqls.o: $(srcdir)/test/qssqls.cpp - $(CXXC) -c -o $@ $(TEST_QSSQLS_CXXFLAGS) $(srcdir)/test/qssqls.cpp - -test_qstream_qstream.o: $(srcdir)/test/qstream.cpp - $(CXXC) -c -o $@ $(TEST_QSTREAM_CXXFLAGS) $(srcdir)/test/qstream.cpp - +-test_sqlstream_sqlstream.o: $(srcdir)/test/sqlstream.cpp +- $(CXXC) -c -o $@ $(TEST_SQLSTREAM_CXXFLAGS) $(srcdir)/test/sqlstream.cpp +- +-test_ssqls2_ssqls2.o: $(srcdir)/test/ssqls2.cpp +- $(CXXC) -c -o $@ $(TEST_SSQLS2_CXXFLAGS) $(srcdir)/test/ssqls2.cpp +- -test_string_string.o: $(srcdir)/test/string.cpp - $(CXXC) -c -o $@ $(TEST_STRING_CXXFLAGS) $(srcdir)/test/string.cpp - @@ -312,9 +348,6 @@ -test_wnp_wnp.o: $(srcdir)/test/wnp.cpp - $(CXXC) -c -o $@ $(TEST_WNP_CXXFLAGS) $(srcdir)/test/wnp.cpp - --excommon_cmdline.o: $(srcdir)/examples/cmdline.cpp -- $(CXXC) -c -o $@ $(EXCOMMON_CXXFLAGS) $(srcdir)/examples/cmdline.cpp -- -excommon_printdata.o: $(srcdir)/examples/printdata.cpp - $(CXXC) -c -o $@ $(EXCOMMON_CXXFLAGS) $(srcdir)/examples/printdata.cpp - @@ -369,6 +402,9 @@ -ssqls5_ssqls5.o: $(srcdir)/examples/ssqls5.cpp - $(CXXC) -c -o $@ $(SSQLS5_CXXFLAGS) $(srcdir)/examples/ssqls5.cpp - +-ssqls6_ssqls6.o: $(srcdir)/examples/ssqls6.cpp +- $(CXXC) -c -o $@ $(SSQLS6_CXXFLAGS) $(srcdir)/examples/ssqls6.cpp +- -store_if_store_if.o: $(srcdir)/examples/store_if.cpp - $(CXXC) -c -o $@ $(STORE_IF_CXXFLAGS) $(srcdir)/examples/store_if.cpp - @@ -381,6 +417,9 @@ -tquery3_tquery3.o: $(srcdir)/examples/tquery3.cpp - $(CXXC) -c -o $@ $(TQUERY3_CXXFLAGS) $(srcdir)/examples/tquery3.cpp - +-tquery4_tquery4.o: $(srcdir)/examples/tquery4.cpp +- $(CXXC) -c -o $@ $(TQUERY4_CXXFLAGS) $(srcdir)/examples/tquery4.cpp +- -transaction_transaction.o: $(srcdir)/examples/transaction.cpp - $(CXXC) -c -o $@ $(TRANSACTION_CXXFLAGS) $(srcdir)/examples/transaction.cpp - diff --git a/databases/mysql++3/pkg-plist b/databases/mysql++3/pkg-plist index 7ad17393d7fa..35c32cd7967a 100644 --- a/databases/mysql++3/pkg-plist +++ b/databases/mysql++3/pkg-plist @@ -1,16 +1,17 @@ include/mysql++/autoflag.h include/mysql++/beemutex.h +include/mysql++/cmdline.h include/mysql++/common.h include/mysql++/comparable.h include/mysql++/connection.h include/mysql++/cpool.h -include/mysql++/custom.h include/mysql++/datetime.h include/mysql++/dbdriver.h include/mysql++/exceptions.h include/mysql++/field.h include/mysql++/field_names.h include/mysql++/field_types.h +include/mysql++/insertpolicy.h include/mysql++/manip.h include/mysql++/myset.h include/mysql++/mysql++.h @@ -24,9 +25,12 @@ include/mysql++/querydef.h include/mysql++/refcounted.h include/mysql++/result.h include/mysql++/row.h +include/mysql++/scopedconnection.h include/mysql++/sql_buffer.h include/mysql++/sql_types.h +include/mysql++/sqlstream.h include/mysql++/ssqls.h +include/mysql++/ssqls2.h include/mysql++/stadapter.h include/mysql++/stream2string.h include/mysql++/tcp_connection.h @@ -34,6 +38,7 @@ include/mysql++/tiny_int.h include/mysql++/transaction.h include/mysql++/type_info.h include/mysql++/uds_connection.h +include/mysql++/utility.h include/mysql++/vallist.h include/mysql++/wnp_connection.h lib/libmysqlpp.so |