- UPdate to version 3.2.2 [1]

- Convert to USES=mysql
- Use options helpers
- Regenerate patch with make makepatch

3.2.2, 2015.03.18 (r2780)
    o The DBDriver::operator= would leak a live connection if you
      assigned a disconnected DBDriver to it.  Patch by Quentin Armitage.
    o Plugged a potential DBDriver instance leak in Connection ctor.
      Patch by Yury Alekseev.
    o Explicitly #including algorithm.h in examples/multiquery.cpp for
      std::max().
    o Added missing "break;" statements in Transaction ctor taking an
      isolation level parameter, which caused only the last one to do
      the right thing.  Problem noticed by Tony Whyman, fix by me.
    o The bootstrap script now checks for the existence of needed build
      tools before trying to use them.  This lets us emit a clearer
      error message than the shell will.  Original patch by Adrian
      Cornish.
    o Fixed a build problem related to std::min/max with Visual C++ 2013
      due to a change in the definitions provided by its header files.
    o Tracked several changes made to Connector/C made since 3.2.1.
    o Assorted documentation updates.
    o Generating HTML with UTF-8 encoding, not 8859-1
3.2.1, 2013.12.10 (r2756)
    o Connection copy ctor wasn't copying the "throw exceptions"
      flag.  The copy always had exceptions enabled.
    o The resetdb example would print a bogus message about logging in
      as '1'@'1' instead of showing the actual values passed on the
      command line.  This did not affect how it actually logged in.
    o Previous release tarball was missing a few text files present in
      the source repository.
    o Updated build paths for VC++ and MinGW to track a file layout
      change in Connector/C 6.1.2.
3.2.0, 2013.06.20 (r2747)
    o References to MySQL 5.1 have been replaced with 5.6, that
      being the current GA release.
    o All Windows builds now assume you're using Connector/C 6.1
      instead of having installed the MySQL server on your machine
      just to get development files.  If you are running a MySQL
      server on your development machine and don't want to install
      Connector/C just to make MySQL++ happy, see the README-*.txt
      file for your platform to get instructions on fixing the paths
      so the build system finds the development files under the MySQL
      server directory.
    o The generated VC++ 2008 project files now assume you want 64-bit
      executables.  (It is 2013 now, after all.)
      Since the VC++ 2005 project files continue to be configured for
      32-bit builds, the easiest way to get a 32-bit project in VC++
      2008+ is to import the VC++ *2005* project files, rather than
      adjust the build target settings of all 44 vc2008/*.vcproj
      files within the IDE.
    o Added Query::replacefrom(): like insertfrom() but it uses
      REPLACE statements instead of INSERT.  Patch by Adrian Cornish.
    o Added support for SQL "unsigned float" columns.  Patch by
      Leonardo Lang.
    o Added "abicheck" top-level build target, which runs the
      ISPRAS ABI checker tool (http://goo.gl/e19lD) against
      a predecided "ABI-stable" version of MySQL++, comparing it
      against the current version.  This should help avoid future
      unplanned ABI breakages, as happened between 3.0.9 and 3.1.0.
      We have chosen not to revert those changes that broke the ABI,
      but instead have chosen to accept the 3.1.0 ABI as the new
      stable ABI for the rest of the 3.x series.  Running the ABI
      checker is now part of the release process, so we should not
      change the ABI again until 4.0!
    o The Query::insert() and replace() overloads that take a pair
      of iterators now work with containers that only provide forward
      iterators.  Idea by Adrian Cornish.
    o Using libtool again on Autotools systems.  It gives us
      relocatable libraries, which is needed in some linking
      situations.  Patch by Adrian Cornish.
    o VC++ release builds now have optimization enabled.  This might
      also affect other toolchains that create separate Debug and
      Release builds, if Bakefile obeys the directive for those
      systems.  (Such as, perhaps, Xcode.)  Initial patch by Matthew
      Bradbury.
    o Fixed a crash in CommandLine mechanism when the usage message is
      called up for programs that have no "extra" parameter and
      corresponding usage appendage.  Initial patch by "Crazy Pete".
    o Query::storein() now tolerates empty result sets, due either to
      DBMS failure or passing a query that never returns results,
      such as INSERT.
    o Exposed DBDriver::result_empty() as Query::result_empty().  We
      did this primarily because it was needed as a helper for the
      previous fix, but it could also be useful more broadly.
    o Added -Wextra to the pedantic build flags.
    o Fixed the "escape" manipulator so it will work with Null<>
      wrapped types.  Patch by "Kemet".
    o ssqls2parse now depends on libmysqlpp.  (It wasn't getting
      relinked when you changed the library.)
    o The configure script's test for the existence of mysql_ssl_set()
      got broken by a change in the mysql_loc.m4 test, causing it to
      always return "no" even if the platform's MySQL C API library did
      have the function.  Therefore, the SslOption could never be set.
      Fixes this bug: stackoverflow.com/questions/7794408
    o Fixed a missing a "buried headers" ifdef wrapper for
      type_info.cpp.  Patch provided by Xavier Richez.
    o We now export the DBDriver class from the MySQL++ DLL when
      building on Windows.  Client programs can now access it directly,
      instead of being able to access only the fields and members
      exposed through Connection and Query.  Fix suggested by Xavier
      Richez.
    o MinGW builds no longer require that you manually create an import
      library for the MySQL C API DLL from a .def file we provide,
      which would inevitably get outdated.  We can now link directly to
      the DLL, and rely on the MinGW linker to figure out the imports.
    o Split the -l flags out of LDFLAGS in the userman's example
      Makefiles.  They're now in LDLIBS, which causes them to be
      put after -o $(EXE) by the default GNU make rules, where they
      should be.
    o Assorted documentation and build system improvements.
    o Assorted fixes for newer GCCs.

PR:		211431 [1]
Submitted by:	Anon <tfaykpgl@sharklasers.com> [1]
Approved by:	maintainer timeout

5 files changed, 20 insertions, 45 deletions

diff --git a/databases/mysql++3/Makefile b/databases/mysql++3/Makefile
index 7af08f239091..213176b73af5 100644
--- a/databases/mysql++3/Makefile
+++ b/databases/mysql++3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql++
-PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTVERSION=	3.2.2
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/ \
 		T32.TecNik93.com/ports/others_ports/${PORTNAME}/sources/
@@ -12,8 +11,7 @@ PKGNAMESUFFIX=	-mysql${MYSQL_VER}
 MAINTAINER=	dudu@dudu.ro
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
 
-USES=		gmake
-USE_MYSQL=	yes
+USES=		gmake mysql
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --enable-thread-check
 USE_LDCONFIG=	yes
@@ -26,10 +24,12 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} pdf ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
+
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.h ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.cpp ${STAGEDIR}${EXAMPLESDIR}
diff --git a/databases/mysql++3/distinfo b/databases/mysql++3/distinfo
index 005634554d9d..ad8dd29e038e 100644
--- a/databases/mysql++3/distinfo
+++ b/databases/mysql++3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mysql++-3.1.0.tar.gz) = 256c39a583e7d60947916851754c626312428e9b1d8af3309e34d64ff8404e92
-SIZE (mysql++-3.1.0.tar.gz) = 1944101 
+TIMESTAMP = 1469741795
+SHA256 (mysql++-3.2.2.tar.gz) = 55667bee79a5981b1a04e57e3a4fd8b03bf330e4e3371b023c2bf5ba0f50ed17
+SIZE (mysql++-3.2.2.tar.gz) = 3257359
diff --git a/databases/mysql++3/files/patch-Makefile.in b/databases/mysql++3/files/patch-Makefile.in
index 0260a3f21a0a..1a29b46aa6ba 100644
--- a/databases/mysql++3/files/patch-Makefile.in
+++ b/databases/mysql++3/files/patch-Makefile.in
@@ -1,11 +1,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 @@
+--- Makefile.in.orig	2015-03-19 00:55:18 UTC
++++ Makefile.in
+@@ -393,11 +393,11 @@ COND_USE_SOTWOSYMLINKS_1___mysqlpp___so_
  
  ### Targets: ###
  
 -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) 
++all: $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
  
  install: install_mysqlpp
  	$(INSTALL_DIR) $(DESTDIR)$(prefix)/include/mysql++
@@ -14,7 +14,7 @@
  
  uninstall: uninstall_mysqlpp
  	(cd $(DESTDIR)$(prefix)/include/mysql++ ; rm -f *.h)
-@@ -401,47 +401,6 @@
+@@ -415,47 +415,6 @@ clean: 
  	rm -f $(LIBPREFIX)mysqlpp.$(DLLIMP_SUFFIX) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf2)
  	rm -f $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
  	rm -f ssqlsxlat$(EXEEXT)
@@ -62,7 +62,7 @@
  	rm -rf doc/latex doc/pdf ; \
  	cd doc/html/refman ; \
  	rm -f doxygen.css [a-z]*.{dot,html,map,md5,png}
-@@ -475,211 +434,6 @@
+@@ -489,211 +448,6 @@ ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS)
  	
  	$(__ssqlsxlat___mac_setfilecmd)
  
@@ -122,7 +122,7 @@
 -	$(__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)
+-	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
 -	
 -	$(__test_ssqls2___mac_setfilecmd)
 -
@@ -273,8 +273,8 @@
 -
  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 @@
+ 	./config.status
+@@ -722,7 +476,7 @@ doc: doc/html/refman/index.html doc/html
  
  @PACKAGE_NAME@-@PACKAGE_VERSION@: 
  	for d in config doc/html/refman doc/html/userman \
@@ -283,11 +283,11 @@
  	do \
  	mkdir -p @PACKAGE_NAME@-@PACKAGE_VERSION@/$$d ; \
  	done
-@@ -723,12 +477,6 @@
+@@ -736,12 +490,6 @@ doc: doc/html/refman/index.html doc/html
  	done
  	cp config/*.m4 @PACKAGE_NAME@-@PACKAGE_VERSION@/config
  	cp doc/userman/userman.dbx.in @PACKAGE_NAME@-@PACKAGE_VERSION@/doc/userman
--	cp examples/*.cpp examples/*.h examples/*.jpg @PACKAGE_NAME@-@PACKAGE_VERSION@/examples
+-	cp examples/*.{cpp,h,jpg,txt} @PACKAGE_NAME@-@PACKAGE_VERSION@/examples
 -	for d in mfc wforms ; \
 -	do \
 -	mkdir -p @PACKAGE_NAME@-@PACKAGE_VERSION@/examples/vstudio/$$d ; \
@@ -296,7 +296,7 @@
  	cp lib/*.cpp lib/*.h lib/*.in lib/*.pl @PACKAGE_NAME@-@PACKAGE_VERSION@/lib
  	cp test/*.cpp @PACKAGE_NAME@-@PACKAGE_VERSION@/test
  	cp ssx/*.cpp ssx/*.h ssx/*.in @PACKAGE_NAME@-@PACKAGE_VERSION@/ssx
-@@ -852,130 +600,6 @@
+@@ -877,130 +625,6 @@ ssqlsxlat_genv2.o: $(srcdir)/ssx/genv2.c
  ssqlsxlat_main.o: $(srcdir)/ssx/main.cpp
  	$(CXXC) -c -o $@ $(SSQLSXLAT_CXXFLAGS) $(srcdir)/ssx/main.cpp
  
diff --git a/databases/mysql++3/files/patch-lib__tcp_connection.cpp b/databases/mysql++3/files/patch-lib__tcp_connection.cpp
deleted file mode 100644
index f20e0b539617..000000000000
--- a/databases/mysql++3/files/patch-lib__tcp_connection.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./lib/tcp_connection.cpp.orig	2008-03-23 08:50:35.000000000 +0200
-+++ ./lib/tcp_connection.cpp	2008-04-03 23:34:01.000000000 +0300
-@@ -30,6 +30,7 @@
- #include "exceptions.h"
- 
- #if !defined(MYSQLPP_PLATFORM_WINDOWS)
-+#	include <arpa/inet.h>
- #	include <netdb.h>
- #endif
- 
diff --git a/databases/mysql++3/files/patch-lib_refcounted.h b/databases/mysql++3/files/patch-lib_refcounted.h
deleted file mode 100644
index 5992d5a859e4..000000000000
--- a/databases/mysql++3/files/patch-lib_refcounted.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-Patch attached with submission follows:
-
---- lib/refcounted.h.orig	2010-06-03 20:59:23.000000000 +0300
-+++ lib/refcounted.h	2011-11-08 15:45:51.024492252 +0200
-@@ -29,6 +29,7 @@
- #define MYSQLPP_REFCOUNTED_H
- 
- #include <memory>
-+#include <cstddef>
- 
- namespace mysqlpp {
- 
-
-