Update to 5.0.2 release:

- Use MASTER_SITES_MYSQL
- Add WITHOUT_INNODB knob [1]
- Fix tcp wrappers (hopefully definitely!)
- Add WITH_NDB knob

Submitted by:	sobomax [1]

1 files changed, 43 insertions, 96 deletions

diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index be85c5051fdf..243dddbdd337 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -11,45 +11,45 @@ bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
 bin/mysqld_safe
-bin/ndb_cpcd
-bin/ndb_delete_all
-bin/ndb_desc
-bin/ndb_drop_index
-bin/ndb_drop_table
-bin/ndb_mgm
-bin/ndb_restore
-bin/ndb_select_all
-bin/ndb_select_count
-bin/ndb_show_tables
-bin/ndb_waiter
+%%NDB%%bin/ndb_cpcd
+%%NDB%%bin/ndb_delete_all
+%%NDB%%bin/ndb_desc
+%%NDB%%bin/ndb_drop_index
+%%NDB%%bin/ndb_drop_table
+%%NDB%%bin/ndb_mgm
+%%NDB%%bin/ndb_restore
+%%NDB%%bin/ndb_select_all
+%%NDB%%bin/ndb_select_count
+%%NDB%%bin/ndb_show_tables
+%%NDB%%bin/ndb_waiter
 bin/pack_isam
 bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-include/mysql/ndb/mgmapi/mgmapi.h
-include/mysql/ndb/mgmapi/mgmapi_debug.h
-include/mysql/ndb/ndb_types.h
-include/mysql/ndb/ndb_version.h
-include/mysql/ndb/ndbapi/Ndb.hpp
-include/mysql/ndb/ndbapi/NdbApi.hpp
-include/mysql/ndb/ndbapi/NdbBlob.hpp
-include/mysql/ndb/ndbapi/NdbConnection.hpp
-include/mysql/ndb/ndbapi/NdbCursorOperation.hpp
-include/mysql/ndb/ndbapi/NdbDictionary.hpp
-include/mysql/ndb/ndbapi/NdbError.hpp
-include/mysql/ndb/ndbapi/NdbEventOperation.hpp
-include/mysql/ndb/ndbapi/NdbIndexOperation.hpp
-include/mysql/ndb/ndbapi/NdbOperation.hpp
-include/mysql/ndb/ndbapi/NdbPool.hpp
-include/mysql/ndb/ndbapi/NdbRecAttr.hpp
-include/mysql/ndb/ndbapi/NdbReceiver.hpp
-include/mysql/ndb/ndbapi/NdbResultSet.hpp
-include/mysql/ndb/ndbapi/NdbScanFilter.hpp
-include/mysql/ndb/ndbapi/NdbScanOperation.hpp
-include/mysql/ndb/ndbapi/ndbapi_limits.h
-include/mysql/ndb/ndbapi/ndberror.h
+%%NDB%%include/mysql/ndb/mgmapi/mgmapi.h
+%%NDB%%include/mysql/ndb/mgmapi/mgmapi_debug.h
+%%NDB%%include/mysql/ndb/ndb_types.h
+%%NDB%%include/mysql/ndb/ndb_version.h
+%%NDB%%include/mysql/ndb/ndbapi/Ndb.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbApi.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbBlob.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbConnection.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbCursorOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbDictionary.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbError.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbEventOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbIndexOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbPool.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbRecAttr.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbReceiver.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbResultSet.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbScanFilter.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbScanOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/ndbapi_limits.h
+%%NDB%%include/mysql/ndb/ndbapi/ndberror.h
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -57,66 +57,14 @@ lib/mysql/libmyisam.a
 lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
-lib/mysql/libndbclient.a
-lib/mysql/libndbclient.so
-lib/mysql/libndbclient.so.0
+%%NDB%%lib/mysql/libndbclient.a
+%%NDB%%lib/mysql/libndbclient.so
+%%NDB%%lib/mysql/libndbclient.so.0
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-libexec/ndb_mgmd
-libexec/ndbd
-%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
-%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
+%%NDB%%libexec/ndb_mgmd
+%%NDB%%libexec/ndbd
 %%DATADIR%%/Description.plist
 %%DATADIR%%/Info.plist
 %%DATADIR%%/MySQL-shared-compat.spec
@@ -177,6 +125,7 @@ libexec/ndbd
 %%DATADIR%%/mi_test_all
 %%DATADIR%%/mi_test_all.res
 %%DATADIR%%/my-huge.cnf
+%%DATADIR%%/my-innodb-heavy-4G.cnf
 %%DATADIR%%/my-large.cnf
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
@@ -205,13 +154,11 @@ libexec/ndbd
 %%DATADIR%%/swedish/errmsg.txt
 %%DATADIR%%/ukrainian/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.txt
-@dirrm include/mysql/ndb/mgmapi
-@dirrm include/mysql/ndb/ndbapi
-@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
+%%NDB%%@dirrm include/mysql/ndb/mgmapi
+%%NDB%%@dirrm include/mysql/ndb/ndbapi
+%%NDB%%@dirrm include/mysql/ndb
+%%NDB%%@unexec rmdir %D/include/mysql 2> /dev/null || true
 @unexec rmdir %D/lib/mysql 2> /dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/charsets
 @dirrm %%DATADIR%%/czech
 @dirrm %%DATADIR%%/danish