5 files changed, 14 insertions, 20 deletions

diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 71071eef7d9e..979615c0d54c 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	mysql++
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.7.8
 CATEGORIES=	databases devel
-MASTER_SITES=	http://gd.tuwien.ac.at/db/mysql/mysql++/ \
-		http://www.mysql.com/Downloads/mysql++/
+MASTER_SITES=	ftp://mysql.omnipotent.net/mysql++/ \
+		ftp://mysql.valueclick.com/mysql/mysql++/ \
+		ftp://ftp.u-aizu.ac.jp/ftp/pub/dbms/mysql/mysql.com/mysql++/ \
+		ftp://mirror.aarnet.edu.au/pub/mysql/mysql++
 
 MAINTAINER=	mico@bsd.hu
 
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
+USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
 INSTALL_SHLIB=	yes
diff --git a/databases/mysql++/distinfo b/databases/mysql++/distinfo
index db43e7dd15d8..cfaa2618f43a 100644
--- a/databases/mysql++/distinfo
+++ b/databases/mysql++/distinfo
@@ -1 +1 @@
-MD5 (mysql++-1.7.tar.gz) = 0a600601321c304498cfbc3c386f90ab
+MD5 (mysql++-1.7.8.tar.gz) = f9b61381dd67676079ab9ca26e46db49
diff --git a/databases/mysql++/files/README b/databases/mysql++/files/README
index e73f4e71c1fd..531f16962bc8 100644
--- a/databases/mysql++/files/README
+++ b/databases/mysql++/files/README
@@ -3,18 +3,19 @@
 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 in FreeBSD port mysql-client)
+  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 
+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
 
diff --git a/databases/mysql++/files/patch-aa b/databases/mysql++/files/patch-aa
deleted file mode 100644
index c556e9bfc941..000000000000
--- a/databases/mysql++/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- sqlplusint/Makefile.in.orig	Tue May 16 16:21:47 2000
-+++ sqlplusint/Makefile.in	Thu Jul 20 11:22:08 2000
-@@ -91,7 +91,7 @@
- libsqlplus_la_SOURCES = coldata.cc connection.cc datetime.cc field_names.cc field_types.cc manip.cc query.cc result.cc row.cc set.cc sql_query.cc type_info.cc vallist.cc string_util.cc
- 
- 
--libsqlplus_la_LDFLAGS = -version-info $(SQLPLUS_MAJOR_VERSION):$(SQLPLUS_MINOR_VERSION):$(SQLPLUS_MICRO_VERSION)
-+libsqlplus_la_LDFLAGS = -version-info $(SQLPLUS_MAJOR_VERSION)
- 
- include_HEADERS = sqlplus.hh coldata1.hh coldata2.hh coldata3.hh coldata4.hh compare1.hh compare2.hh compare3.hh connection0.hh connection1.hh connection2.hh connection3.hh const_string1.hh const_string2.hh const_string3.hh 	convert1.hh convert2.hh convert3.hh custom-macros.hh custom.hh datetime1.hh 	datetime2.hh datetime3.hh field_names1.hh field_names2.hh field_names3.hh 	field_types1.hh field_types2.hh field_types3.hh fields1.hh fields2.hh 	manip1.hh manip2.hh manip3.hh null1.hh null2.hh null3.hh query1.hh query2.hh 	query3.hh resiter1.hh result1.hh result2.hh result3.hh row1.hh row2.hh 	row3.hh set1.hh set2.hh set3.hh sql_query0.hh sql_query1.hh sql_query2.hh 	sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh string_util.hh 	define_short defs
- 
diff --git a/databases/mysql++/pkg-plist b/databases/mysql++/pkg-plist
index f295c96e9596..f4cf401b8025 100644
--- a/databases/mysql++/pkg-plist
+++ b/databases/mysql++/pkg-plist
@@ -26,6 +26,7 @@ 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
@@ -104,6 +105,7 @@ share/examples/mysql++/custom3.cc
 share/examples/mysql++/custom4.cc
 share/examples/mysql++/fieldinf1.cc
 share/examples/mysql++/load_file.cc
+share/examples/mysql++/populate.cc
 share/examples/mysql++/resetdb.cc
 share/examples/mysql++/simple1.cc
 share/examples/mysql++/sinisa_ex.cc