diff options
66 files changed, 459 insertions, 399 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 0ef98078dee3..0a931737bc03 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.11 +PORTVERSION= 5.1.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -165,6 +165,8 @@ CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 +MAN8= mysqlmanager.8 + USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server @@ -181,7 +183,7 @@ post-patch: @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -206,7 +208,7 @@ MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ mysql_convert_table_format mysql_find_rows mysqlhotcopy \ - mysqldumpslow mysql_explain_log mysqld_multi + mysqldumpslow mysqld_multi post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @@ -217,7 +219,7 @@ post-patch: .endif # Common part post-extract: - @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h + @${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index ba45006afcff..6f0502796031 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.11-beta.tar.gz) = f5e807425247f7b726faefa232367fbd -SHA256 (mysql-5.1.11-beta.tar.gz) = 688ae9848b575c3d0b7d30df60881b2502279f5578e55e7856de1315ebc1e534 -SIZE (mysql-5.1.11-beta.tar.gz) = 21291745 +MD5 (mysql-5.1.12-beta.tar.gz) = 942122d1275fe5f8c4b1fa313fb233f6 +SHA256 (mysql-5.1.12-beta.tar.gz) = b4c6185ce66386c184bac5df60401182f38d5df39e7fbed3cdd86f0d0357cd9b +SIZE (mysql-5.1.12-beta.tar.gz) = 23189538 diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in index 3c773a4974af..c142250431e1 100644 --- a/databases/mysql51-server/files/patch-Makefile.in +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -7,11 +7,11 @@ -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_union_dirs@ storage plugin \ +- @sql_union_dirs@ unittest storage plugin \ - @sql_server@ scripts @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - mysql-test support-files @tools_dirs@ \ -- unittest win +- win +SUBDIRS = DIST_SUBDIRS = $(SUBDIRS) BUILD diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure index fbbdc8efd9d1..681fa38d1099 100644 --- a/databases/mysql51-server/files/patch-configure +++ b/databases/mysql51-server/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Sun Dec 21 19:03:09 2003 -+++ configure Wed Dec 24 10:40:53 2003 -@@ -8128,8 +8128,6 @@ +--- configure.orig Thu Oct 26 14:03:58 2006 ++++ configure Tue Nov 7 17:13:30 2006 +@@ -20360,8 +20360,6 @@ # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS; - + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - + # Prevent multiple expansion - -@@ -12678,8 +12644,8 @@ + +@@ -26478,8 +26476,8 @@ # Some system specific hacks # @@ -20,3 +20,12 @@ case $SYSTEM_TYPE in *solaris2.7*) +@@ -46147,7 +46145,7 @@ + + MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" + +- CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" ++ # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" + if test "$have_ndb_debug" = "default" + then + have_ndb_debug=$with_debug diff --git a/databases/mysql51-server/files/patch-extra_yassl_Makefile.in b/databases/mysql51-server/files/patch-extra_yassl_Makefile.in index efb79a7902c4..232d2c3852c2 100644 --- a/databases/mysql51-server/files/patch-extra_yassl_Makefile.in +++ b/databases/mysql51-server/files/patch-extra_yassl_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/Makefile.in.orig Mon Jun 19 10:46:01 2006 -+++ extra/yassl/Makefile.in Mon Jun 19 10:46:16 2006 +--- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006 ++++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006 @@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = taocrypt src testsuite +SUBDIRS = taocrypt src - EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \ + EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \ CMakeLists.txt diff --git a/databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in index d4727bd80632..bca462d08cba 100644 --- a/databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in +++ b/databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/taocrypt/Makefile.in.orig Mon Jun 19 10:52:14 2006 -+++ extra/yassl/taocrypt/Makefile.in Mon Jun 19 10:52:30 2006 -@@ -350,7 +350,7 @@ +--- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006 ++++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006 +@@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = src test benchmark +SUBDIRS = src - EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt + EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp) all: all-recursive diff --git a/databases/mysql51-server/files/patch-include_my_libwrap.h b/databases/mysql51-server/files/patch-include_my_libwrap.h new file mode 100644 index 000000000000..a115f40fc8fc --- /dev/null +++ b/databases/mysql51-server/files/patch-include_my_libwrap.h @@ -0,0 +1,11 @@ +--- include/my_libwrap.h.orig Tue Nov 7 08:39:53 2006 ++++ include/my_libwrap.h Tue Nov 7 08:40:17 2006 +@@ -15,7 +15,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include <my_tcpd.h> + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> diff --git a/databases/mysql51-server/files/patch-sql::mytcpd.h b/databases/mysql51-server/files/patch-include_my_tcpd.h index c8f3ea3db236..38aad1aa57d7 100644 --- a/databases/mysql51-server/files/patch-sql::mytcpd.h +++ b/databases/mysql51-server/files/patch-include_my_tcpd.h @@ -1,7 +1,7 @@ ---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005 +--- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 ++++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 @@ -6,6 +6,25 @@ - * $FreeBSD: /tmp/pcvs/ports/databases/mysql51-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 ale Exp $ + * $FreeBSD$ */ +#ifndef _TCPWRAPPERS_TCPD_H diff --git a/databases/mysql51-server/files/patch-man::Makefile.in b/databases/mysql51-server/files/patch-man::Makefile.in index 35f0e88ddc3d..0b15e2d4ca03 100644 --- a/databases/mysql51-server/files/patch-man::Makefile.in +++ b/databases/mysql51-server/files/patch-man::Makefile.in @@ -1,11 +1,13 @@ ---- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 -+++ man/Makefile.in Sun Nov 27 00:09:03 2005 -@@ -338,7 +338,7 @@ +--- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 ++++ man/Makefile.in Tue Nov 7 08:19:50 2006 +@@ -363,8 +363,8 @@ yassl_libs = @yassl_libs@ - yassl_libs_with_path = @yassl_libs_with_path@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ +man1_MANS = - EXTRA_DIST = $(man1_MANS) ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts::Makefile.in index 827bddd734ad..42e5e507112c 100644 --- a/databases/mysql51-server/files/patch-scripts::Makefile.in +++ b/databases/mysql51-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Fri Jun 2 20:03:10 2006 -+++ scripts/Makefile.in Thu Jun 15 07:56:56 2006 -@@ -371,23 +371,7 @@ +--- scripts/Makefile.in.orig Thu Oct 26 14:03:08 2006 ++++ scripts/Makefile.in Tue Nov 7 08:23:48 2006 +@@ -371,22 +371,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ @@ -18,16 +18,15 @@ - mysql_find_rows \ - mysqlhotcopy \ - mysqldumpslow \ -- mysql_explain_log \ - mysqld_multi \ - mysql_create_system_tables +bin_SCRIPTS = noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -419,7 +403,7 @@ - mysqlaccess.conf \ - mysqlbug + make_sharedlib_distribution +@@ -416,7 +401,7 @@ + mysqlbug \ + make_win_bin_dist -dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql +dist_pkgdata_DATA = diff --git a/databases/mysql51-server/files/patch-sql::mysqld.cc b/databases/mysql51-server/files/patch-sql::mysqld.cc index b44e7d1e1a0e..4feed825cb11 100644 --- a/databases/mysql51-server/files/patch-sql::mysqld.cc +++ b/databases/mysql51-server/files/patch-sql::mysqld.cc @@ -1,14 +1,5 @@ --- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 +++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -121,7 +121,7 @@ - #endif /* __WIN__ */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include "mytcpd.h" - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> @@ -3177,7 +3177,7 @@ init_ssl(); diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 19c853b954c1..c5d3d8763567 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -1,5 +1,4 @@ @unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true -bin/comp_err bin/innochecksum bin/my_print_defaults bin/myisam_ftdump diff --git a/databases/mysql51-server/pkg-plist.scripts b/databases/mysql51-server/pkg-plist.scripts index 6419684159c1..b0a603760ef0 100644 --- a/databases/mysql51-server/pkg-plist.scripts +++ b/databases/mysql51-server/pkg-plist.scripts @@ -1,6 +1,5 @@ bin/msql2mysql bin/mysql_convert_table_format -bin/mysql_explain_log bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_secure_installation diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 0ef98078dee3..0a931737bc03 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.11 +PORTVERSION= 5.1.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -165,6 +165,8 @@ CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 +MAN8= mysqlmanager.8 + USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server @@ -181,7 +183,7 @@ post-patch: @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -206,7 +208,7 @@ MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ mysql_convert_table_format mysql_find_rows mysqlhotcopy \ - mysqldumpslow mysql_explain_log mysqld_multi + mysqldumpslow mysqld_multi post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @@ -217,7 +219,7 @@ post-patch: .endif # Common part post-extract: - @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h + @${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index ba45006afcff..6f0502796031 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.11-beta.tar.gz) = f5e807425247f7b726faefa232367fbd -SHA256 (mysql-5.1.11-beta.tar.gz) = 688ae9848b575c3d0b7d30df60881b2502279f5578e55e7856de1315ebc1e534 -SIZE (mysql-5.1.11-beta.tar.gz) = 21291745 +MD5 (mysql-5.1.12-beta.tar.gz) = 942122d1275fe5f8c4b1fa313fb233f6 +SHA256 (mysql-5.1.12-beta.tar.gz) = b4c6185ce66386c184bac5df60401182f38d5df39e7fbed3cdd86f0d0357cd9b +SIZE (mysql-5.1.12-beta.tar.gz) = 23189538 diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in index 3c773a4974af..c142250431e1 100644 --- a/databases/mysql54-server/files/patch-Makefile.in +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -7,11 +7,11 @@ -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_union_dirs@ storage plugin \ +- @sql_union_dirs@ unittest storage plugin \ - @sql_server@ scripts @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - mysql-test support-files @tools_dirs@ \ -- unittest win +- win +SUBDIRS = DIST_SUBDIRS = $(SUBDIRS) BUILD diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index fbbdc8efd9d1..681fa38d1099 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Sun Dec 21 19:03:09 2003 -+++ configure Wed Dec 24 10:40:53 2003 -@@ -8128,8 +8128,6 @@ +--- configure.orig Thu Oct 26 14:03:58 2006 ++++ configure Tue Nov 7 17:13:30 2006 +@@ -20360,8 +20360,6 @@ # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS; - + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - + # Prevent multiple expansion - -@@ -12678,8 +12644,8 @@ + +@@ -26478,8 +26476,8 @@ # Some system specific hacks # @@ -20,3 +20,12 @@ case $SYSTEM_TYPE in *solaris2.7*) +@@ -46147,7 +46145,7 @@ + + MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" + +- CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" ++ # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" + if test "$have_ndb_debug" = "default" + then + have_ndb_debug=$with_debug diff --git a/databases/mysql54-server/files/patch-extra_yassl_Makefile.in b/databases/mysql54-server/files/patch-extra_yassl_Makefile.in index efb79a7902c4..232d2c3852c2 100644 --- a/databases/mysql54-server/files/patch-extra_yassl_Makefile.in +++ b/databases/mysql54-server/files/patch-extra_yassl_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/Makefile.in.orig Mon Jun 19 10:46:01 2006 -+++ extra/yassl/Makefile.in Mon Jun 19 10:46:16 2006 +--- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006 ++++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006 @@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = taocrypt src testsuite +SUBDIRS = taocrypt src - EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \ + EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \ CMakeLists.txt diff --git a/databases/mysql54-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql54-server/files/patch-extra_yassl_taocrypt_Makefile.in index d4727bd80632..bca462d08cba 100644 --- a/databases/mysql54-server/files/patch-extra_yassl_taocrypt_Makefile.in +++ b/databases/mysql54-server/files/patch-extra_yassl_taocrypt_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/taocrypt/Makefile.in.orig Mon Jun 19 10:52:14 2006 -+++ extra/yassl/taocrypt/Makefile.in Mon Jun 19 10:52:30 2006 -@@ -350,7 +350,7 @@ +--- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006 ++++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006 +@@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = src test benchmark +SUBDIRS = src - EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt + EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp) all: all-recursive diff --git a/databases/mysql54-server/files/patch-include_my_libwrap.h b/databases/mysql54-server/files/patch-include_my_libwrap.h new file mode 100644 index 000000000000..a115f40fc8fc --- /dev/null +++ b/databases/mysql54-server/files/patch-include_my_libwrap.h @@ -0,0 +1,11 @@ +--- include/my_libwrap.h.orig Tue Nov 7 08:39:53 2006 ++++ include/my_libwrap.h Tue Nov 7 08:40:17 2006 +@@ -15,7 +15,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include <my_tcpd.h> + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> diff --git a/databases/mysql54-server/files/patch-sql::mytcpd.h b/databases/mysql54-server/files/patch-include_my_tcpd.h index f641ae38af46..38aad1aa57d7 100644 --- a/databases/mysql54-server/files/patch-sql::mytcpd.h +++ b/databases/mysql54-server/files/patch-include_my_tcpd.h @@ -1,7 +1,7 @@ ---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005 +--- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 ++++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 @@ -6,6 +6,25 @@ - * $FreeBSD: /tmp/pcvs/ports/databases/mysql54-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 ale Exp $ + * $FreeBSD$ */ +#ifndef _TCPWRAPPERS_TCPD_H diff --git a/databases/mysql54-server/files/patch-man::Makefile.in b/databases/mysql54-server/files/patch-man::Makefile.in index 35f0e88ddc3d..0b15e2d4ca03 100644 --- a/databases/mysql54-server/files/patch-man::Makefile.in +++ b/databases/mysql54-server/files/patch-man::Makefile.in @@ -1,11 +1,13 @@ ---- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 -+++ man/Makefile.in Sun Nov 27 00:09:03 2005 -@@ -338,7 +338,7 @@ +--- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 ++++ man/Makefile.in Tue Nov 7 08:19:50 2006 +@@ -363,8 +363,8 @@ yassl_libs = @yassl_libs@ - yassl_libs_with_path = @yassl_libs_with_path@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ +man1_MANS = - EXTRA_DIST = $(man1_MANS) ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am diff --git a/databases/mysql54-server/files/patch-scripts::Makefile.in b/databases/mysql54-server/files/patch-scripts::Makefile.in index 827bddd734ad..42e5e507112c 100644 --- a/databases/mysql54-server/files/patch-scripts::Makefile.in +++ b/databases/mysql54-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Fri Jun 2 20:03:10 2006 -+++ scripts/Makefile.in Thu Jun 15 07:56:56 2006 -@@ -371,23 +371,7 @@ +--- scripts/Makefile.in.orig Thu Oct 26 14:03:08 2006 ++++ scripts/Makefile.in Tue Nov 7 08:23:48 2006 +@@ -371,22 +371,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ @@ -18,16 +18,15 @@ - mysql_find_rows \ - mysqlhotcopy \ - mysqldumpslow \ -- mysql_explain_log \ - mysqld_multi \ - mysql_create_system_tables +bin_SCRIPTS = noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -419,7 +403,7 @@ - mysqlaccess.conf \ - mysqlbug + make_sharedlib_distribution +@@ -416,7 +401,7 @@ + mysqlbug \ + make_win_bin_dist -dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql +dist_pkgdata_DATA = diff --git a/databases/mysql54-server/files/patch-sql::mysqld.cc b/databases/mysql54-server/files/patch-sql::mysqld.cc index b44e7d1e1a0e..4feed825cb11 100644 --- a/databases/mysql54-server/files/patch-sql::mysqld.cc +++ b/databases/mysql54-server/files/patch-sql::mysqld.cc @@ -1,14 +1,5 @@ --- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 +++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -121,7 +121,7 @@ - #endif /* __WIN__ */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include "mytcpd.h" - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> @@ -3177,7 +3177,7 @@ init_ssl(); diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 19c853b954c1..c5d3d8763567 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -1,5 +1,4 @@ @unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true -bin/comp_err bin/innochecksum bin/my_print_defaults bin/myisam_ftdump diff --git a/databases/mysql54-server/pkg-plist.scripts b/databases/mysql54-server/pkg-plist.scripts index 6419684159c1..b0a603760ef0 100644 --- a/databases/mysql54-server/pkg-plist.scripts +++ b/databases/mysql54-server/pkg-plist.scripts @@ -1,6 +1,5 @@ bin/msql2mysql bin/mysql_convert_table_format -bin/mysql_explain_log bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_secure_installation diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 0ef98078dee3..0a931737bc03 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.11 +PORTVERSION= 5.1.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -165,6 +165,8 @@ CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 +MAN8= mysqlmanager.8 + USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server @@ -181,7 +183,7 @@ post-patch: @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -206,7 +208,7 @@ MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ mysql_convert_table_format mysql_find_rows mysqlhotcopy \ - mysqldumpslow mysql_explain_log mysqld_multi + mysqldumpslow mysqld_multi post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @@ -217,7 +219,7 @@ post-patch: .endif # Common part post-extract: - @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h + @${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index ba45006afcff..6f0502796031 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.11-beta.tar.gz) = f5e807425247f7b726faefa232367fbd -SHA256 (mysql-5.1.11-beta.tar.gz) = 688ae9848b575c3d0b7d30df60881b2502279f5578e55e7856de1315ebc1e534 -SIZE (mysql-5.1.11-beta.tar.gz) = 21291745 +MD5 (mysql-5.1.12-beta.tar.gz) = 942122d1275fe5f8c4b1fa313fb233f6 +SHA256 (mysql-5.1.12-beta.tar.gz) = b4c6185ce66386c184bac5df60401182f38d5df39e7fbed3cdd86f0d0357cd9b +SIZE (mysql-5.1.12-beta.tar.gz) = 23189538 diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in index 3c773a4974af..c142250431e1 100644 --- a/databases/mysql55-server/files/patch-Makefile.in +++ b/databases/mysql55-server/files/patch-Makefile.in @@ -7,11 +7,11 @@ -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_union_dirs@ storage plugin \ +- @sql_union_dirs@ unittest storage plugin \ - @sql_server@ scripts @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - mysql-test support-files @tools_dirs@ \ -- unittest win +- win +SUBDIRS = DIST_SUBDIRS = $(SUBDIRS) BUILD diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index fbbdc8efd9d1..681fa38d1099 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-server/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Sun Dec 21 19:03:09 2003 -+++ configure Wed Dec 24 10:40:53 2003 -@@ -8128,8 +8128,6 @@ +--- configure.orig Thu Oct 26 14:03:58 2006 ++++ configure Tue Nov 7 17:13:30 2006 +@@ -20360,8 +20360,6 @@ # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS; - + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - + # Prevent multiple expansion - -@@ -12678,8 +12644,8 @@ + +@@ -26478,8 +26476,8 @@ # Some system specific hacks # @@ -20,3 +20,12 @@ case $SYSTEM_TYPE in *solaris2.7*) +@@ -46147,7 +46145,7 @@ + + MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" + +- CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" ++ # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" + if test "$have_ndb_debug" = "default" + then + have_ndb_debug=$with_debug diff --git a/databases/mysql55-server/files/patch-extra_yassl_Makefile.in b/databases/mysql55-server/files/patch-extra_yassl_Makefile.in index efb79a7902c4..232d2c3852c2 100644 --- a/databases/mysql55-server/files/patch-extra_yassl_Makefile.in +++ b/databases/mysql55-server/files/patch-extra_yassl_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/Makefile.in.orig Mon Jun 19 10:46:01 2006 -+++ extra/yassl/Makefile.in Mon Jun 19 10:46:16 2006 +--- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006 ++++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006 @@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = taocrypt src testsuite +SUBDIRS = taocrypt src - EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \ + EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \ CMakeLists.txt diff --git a/databases/mysql55-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql55-server/files/patch-extra_yassl_taocrypt_Makefile.in index d4727bd80632..bca462d08cba 100644 --- a/databases/mysql55-server/files/patch-extra_yassl_taocrypt_Makefile.in +++ b/databases/mysql55-server/files/patch-extra_yassl_taocrypt_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/taocrypt/Makefile.in.orig Mon Jun 19 10:52:14 2006 -+++ extra/yassl/taocrypt/Makefile.in Mon Jun 19 10:52:30 2006 -@@ -350,7 +350,7 @@ +--- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006 ++++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006 +@@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = src test benchmark +SUBDIRS = src - EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt + EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp) all: all-recursive diff --git a/databases/mysql55-server/files/patch-include_my_libwrap.h b/databases/mysql55-server/files/patch-include_my_libwrap.h new file mode 100644 index 000000000000..a115f40fc8fc --- /dev/null +++ b/databases/mysql55-server/files/patch-include_my_libwrap.h @@ -0,0 +1,11 @@ +--- include/my_libwrap.h.orig Tue Nov 7 08:39:53 2006 ++++ include/my_libwrap.h Tue Nov 7 08:40:17 2006 +@@ -15,7 +15,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include <my_tcpd.h> + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> diff --git a/databases/mysql55-server/files/patch-sql::mytcpd.h b/databases/mysql55-server/files/patch-include_my_tcpd.h index 4844531d1225..38aad1aa57d7 100644 --- a/databases/mysql55-server/files/patch-sql::mytcpd.h +++ b/databases/mysql55-server/files/patch-include_my_tcpd.h @@ -1,7 +1,7 @@ ---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005 +--- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 ++++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 @@ -6,6 +6,25 @@ - * $FreeBSD: /tmp/pcvs/ports/databases/mysql55-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 ale Exp $ + * $FreeBSD$ */ +#ifndef _TCPWRAPPERS_TCPD_H diff --git a/databases/mysql55-server/files/patch-man::Makefile.in b/databases/mysql55-server/files/patch-man::Makefile.in index 35f0e88ddc3d..0b15e2d4ca03 100644 --- a/databases/mysql55-server/files/patch-man::Makefile.in +++ b/databases/mysql55-server/files/patch-man::Makefile.in @@ -1,11 +1,13 @@ ---- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 -+++ man/Makefile.in Sun Nov 27 00:09:03 2005 -@@ -338,7 +338,7 @@ +--- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 ++++ man/Makefile.in Tue Nov 7 08:19:50 2006 +@@ -363,8 +363,8 @@ yassl_libs = @yassl_libs@ - yassl_libs_with_path = @yassl_libs_with_path@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ +man1_MANS = - EXTRA_DIST = $(man1_MANS) ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am diff --git a/databases/mysql55-server/files/patch-scripts::Makefile.in b/databases/mysql55-server/files/patch-scripts::Makefile.in index 827bddd734ad..42e5e507112c 100644 --- a/databases/mysql55-server/files/patch-scripts::Makefile.in +++ b/databases/mysql55-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Fri Jun 2 20:03:10 2006 -+++ scripts/Makefile.in Thu Jun 15 07:56:56 2006 -@@ -371,23 +371,7 @@ +--- scripts/Makefile.in.orig Thu Oct 26 14:03:08 2006 ++++ scripts/Makefile.in Tue Nov 7 08:23:48 2006 +@@ -371,22 +371,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ @@ -18,16 +18,15 @@ - mysql_find_rows \ - mysqlhotcopy \ - mysqldumpslow \ -- mysql_explain_log \ - mysqld_multi \ - mysql_create_system_tables +bin_SCRIPTS = noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -419,7 +403,7 @@ - mysqlaccess.conf \ - mysqlbug + make_sharedlib_distribution +@@ -416,7 +401,7 @@ + mysqlbug \ + make_win_bin_dist -dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql +dist_pkgdata_DATA = diff --git a/databases/mysql55-server/files/patch-sql::mysqld.cc b/databases/mysql55-server/files/patch-sql::mysqld.cc index b44e7d1e1a0e..4feed825cb11 100644 --- a/databases/mysql55-server/files/patch-sql::mysqld.cc +++ b/databases/mysql55-server/files/patch-sql::mysqld.cc @@ -1,14 +1,5 @@ --- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 +++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -121,7 +121,7 @@ - #endif /* __WIN__ */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include "mytcpd.h" - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> @@ -3177,7 +3177,7 @@ init_ssl(); diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 19c853b954c1..c5d3d8763567 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -1,5 +1,4 @@ @unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true -bin/comp_err bin/innochecksum bin/my_print_defaults bin/myisam_ftdump diff --git a/databases/mysql55-server/pkg-plist.scripts b/databases/mysql55-server/pkg-plist.scripts index 6419684159c1..b0a603760ef0 100644 --- a/databases/mysql55-server/pkg-plist.scripts +++ b/databases/mysql55-server/pkg-plist.scripts @@ -1,6 +1,5 @@ bin/msql2mysql bin/mysql_convert_table_format -bin/mysql_explain_log bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_secure_installation diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 0ef98078dee3..0a931737bc03 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.11 +PORTVERSION= 5.1.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -165,6 +165,8 @@ CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 +MAN8= mysqlmanager.8 + USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server @@ -181,7 +183,7 @@ post-patch: @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -206,7 +208,7 @@ MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ mysql_convert_table_format mysql_find_rows mysqlhotcopy \ - mysqldumpslow mysql_explain_log mysqld_multi + mysqldumpslow mysqld_multi post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @@ -217,7 +219,7 @@ post-patch: .endif # Common part post-extract: - @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h + @${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index ba45006afcff..6f0502796031 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.11-beta.tar.gz) = f5e807425247f7b726faefa232367fbd -SHA256 (mysql-5.1.11-beta.tar.gz) = 688ae9848b575c3d0b7d30df60881b2502279f5578e55e7856de1315ebc1e534 -SIZE (mysql-5.1.11-beta.tar.gz) = 21291745 +MD5 (mysql-5.1.12-beta.tar.gz) = 942122d1275fe5f8c4b1fa313fb233f6 +SHA256 (mysql-5.1.12-beta.tar.gz) = b4c6185ce66386c184bac5df60401182f38d5df39e7fbed3cdd86f0d0357cd9b +SIZE (mysql-5.1.12-beta.tar.gz) = 23189538 diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index 3c773a4974af..c142250431e1 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -7,11 +7,11 @@ -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_union_dirs@ storage plugin \ +- @sql_union_dirs@ unittest storage plugin \ - @sql_server@ scripts @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - mysql-test support-files @tools_dirs@ \ -- unittest win +- win +SUBDIRS = DIST_SUBDIRS = $(SUBDIRS) BUILD diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure index fbbdc8efd9d1..681fa38d1099 100644 --- a/databases/mysql60-server/files/patch-configure +++ b/databases/mysql60-server/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Sun Dec 21 19:03:09 2003 -+++ configure Wed Dec 24 10:40:53 2003 -@@ -8128,8 +8128,6 @@ +--- configure.orig Thu Oct 26 14:03:58 2006 ++++ configure Tue Nov 7 17:13:30 2006 +@@ -20360,8 +20360,6 @@ # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS; - + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - + # Prevent multiple expansion - -@@ -12678,8 +12644,8 @@ + +@@ -26478,8 +26476,8 @@ # Some system specific hacks # @@ -20,3 +20,12 @@ case $SYSTEM_TYPE in *solaris2.7*) +@@ -46147,7 +46145,7 @@ + + MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" + +- CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" ++ # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" + if test "$have_ndb_debug" = "default" + then + have_ndb_debug=$with_debug diff --git a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_Makefile.in index efb79a7902c4..232d2c3852c2 100644 --- a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in +++ b/databases/mysql60-server/files/patch-extra_yassl_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/Makefile.in.orig Mon Jun 19 10:46:01 2006 -+++ extra/yassl/Makefile.in Mon Jun 19 10:46:16 2006 +--- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006 ++++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006 @@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = taocrypt src testsuite +SUBDIRS = taocrypt src - EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \ + EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \ CMakeLists.txt diff --git a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in index d4727bd80632..bca462d08cba 100644 --- a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in +++ b/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/taocrypt/Makefile.in.orig Mon Jun 19 10:52:14 2006 -+++ extra/yassl/taocrypt/Makefile.in Mon Jun 19 10:52:30 2006 -@@ -350,7 +350,7 @@ +--- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006 ++++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006 +@@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = src test benchmark +SUBDIRS = src - EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt + EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp) all: all-recursive diff --git a/databases/mysql60-server/files/patch-include_my_libwrap.h b/databases/mysql60-server/files/patch-include_my_libwrap.h new file mode 100644 index 000000000000..a115f40fc8fc --- /dev/null +++ b/databases/mysql60-server/files/patch-include_my_libwrap.h @@ -0,0 +1,11 @@ +--- include/my_libwrap.h.orig Tue Nov 7 08:39:53 2006 ++++ include/my_libwrap.h Tue Nov 7 08:40:17 2006 +@@ -15,7 +15,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include <my_tcpd.h> + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> diff --git a/databases/mysql60-server/files/patch-sql::mytcpd.h b/databases/mysql60-server/files/patch-include_my_tcpd.h index 43afdf1cf96e..38aad1aa57d7 100644 --- a/databases/mysql60-server/files/patch-sql::mytcpd.h +++ b/databases/mysql60-server/files/patch-include_my_tcpd.h @@ -1,7 +1,7 @@ ---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005 +--- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 ++++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 @@ -6,6 +6,25 @@ - * $FreeBSD: /tmp/pcvs/ports/databases/mysql60-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 ale Exp $ + * $FreeBSD$ */ +#ifndef _TCPWRAPPERS_TCPD_H diff --git a/databases/mysql60-server/files/patch-man::Makefile.in b/databases/mysql60-server/files/patch-man::Makefile.in index 35f0e88ddc3d..0b15e2d4ca03 100644 --- a/databases/mysql60-server/files/patch-man::Makefile.in +++ b/databases/mysql60-server/files/patch-man::Makefile.in @@ -1,11 +1,13 @@ ---- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 -+++ man/Makefile.in Sun Nov 27 00:09:03 2005 -@@ -338,7 +338,7 @@ +--- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 ++++ man/Makefile.in Tue Nov 7 08:19:50 2006 +@@ -363,8 +363,8 @@ yassl_libs = @yassl_libs@ - yassl_libs_with_path = @yassl_libs_with_path@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ +man1_MANS = - EXTRA_DIST = $(man1_MANS) ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in index 827bddd734ad..42e5e507112c 100644 --- a/databases/mysql60-server/files/patch-scripts::Makefile.in +++ b/databases/mysql60-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Fri Jun 2 20:03:10 2006 -+++ scripts/Makefile.in Thu Jun 15 07:56:56 2006 -@@ -371,23 +371,7 @@ +--- scripts/Makefile.in.orig Thu Oct 26 14:03:08 2006 ++++ scripts/Makefile.in Tue Nov 7 08:23:48 2006 +@@ -371,22 +371,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ @@ -18,16 +18,15 @@ - mysql_find_rows \ - mysqlhotcopy \ - mysqldumpslow \ -- mysql_explain_log \ - mysqld_multi \ - mysql_create_system_tables +bin_SCRIPTS = noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -419,7 +403,7 @@ - mysqlaccess.conf \ - mysqlbug + make_sharedlib_distribution +@@ -416,7 +401,7 @@ + mysqlbug \ + make_win_bin_dist -dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql +dist_pkgdata_DATA = diff --git a/databases/mysql60-server/files/patch-sql::mysqld.cc b/databases/mysql60-server/files/patch-sql::mysqld.cc index b44e7d1e1a0e..4feed825cb11 100644 --- a/databases/mysql60-server/files/patch-sql::mysqld.cc +++ b/databases/mysql60-server/files/patch-sql::mysqld.cc @@ -1,14 +1,5 @@ --- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 +++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -121,7 +121,7 @@ - #endif /* __WIN__ */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include "mytcpd.h" - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> @@ -3177,7 +3177,7 @@ init_ssl(); diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 19c853b954c1..c5d3d8763567 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -1,5 +1,4 @@ @unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true -bin/comp_err bin/innochecksum bin/my_print_defaults bin/myisam_ftdump diff --git a/databases/mysql60-server/pkg-plist.scripts b/databases/mysql60-server/pkg-plist.scripts index 6419684159c1..b0a603760ef0 100644 --- a/databases/mysql60-server/pkg-plist.scripts +++ b/databases/mysql60-server/pkg-plist.scripts @@ -1,6 +1,5 @@ bin/msql2mysql bin/mysql_convert_table_format -bin/mysql_explain_log bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_secure_installation diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 0ef98078dee3..0a931737bc03 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.11 +PORTVERSION= 5.1.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -165,6 +165,8 @@ CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 +MAN8= mysqlmanager.8 + USE_LDCONFIG= ${PREFIX}/lib/mysql CONFIGURE_ARGS+=--without-server @@ -181,7 +183,7 @@ post-patch: @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -206,7 +208,7 @@ MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ mysql_convert_table_format mysql_find_rows mysqlhotcopy \ - mysqldumpslow mysql_explain_log mysqld_multi + mysqldumpslow mysqld_multi post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in @@ -217,7 +219,7 @@ post-patch: .endif # Common part post-extract: - @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h + @${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index ba45006afcff..6f0502796031 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.11-beta.tar.gz) = f5e807425247f7b726faefa232367fbd -SHA256 (mysql-5.1.11-beta.tar.gz) = 688ae9848b575c3d0b7d30df60881b2502279f5578e55e7856de1315ebc1e534 -SIZE (mysql-5.1.11-beta.tar.gz) = 21291745 +MD5 (mysql-5.1.12-beta.tar.gz) = 942122d1275fe5f8c4b1fa313fb233f6 +SHA256 (mysql-5.1.12-beta.tar.gz) = b4c6185ce66386c184bac5df60401182f38d5df39e7fbed3cdd86f0d0357cd9b +SIZE (mysql-5.1.12-beta.tar.gz) = 23189538 diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in index 3c773a4974af..c142250431e1 100644 --- a/databases/percona55-server/files/patch-Makefile.in +++ b/databases/percona55-server/files/patch-Makefile.in @@ -7,11 +7,11 @@ -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_union_dirs@ storage plugin \ +- @sql_union_dirs@ unittest storage plugin \ - @sql_server@ scripts @man_dirs@ tests \ - netware @libmysqld_dirs@ \ - mysql-test support-files @tools_dirs@ \ -- unittest win +- win +SUBDIRS = DIST_SUBDIRS = $(SUBDIRS) BUILD diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure index fbbdc8efd9d1..681fa38d1099 100644 --- a/databases/percona55-server/files/patch-configure +++ b/databases/percona55-server/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Sun Dec 21 19:03:09 2003 -+++ configure Wed Dec 24 10:40:53 2003 -@@ -8128,8 +8128,6 @@ +--- configure.orig Thu Oct 26 14:03:58 2006 ++++ configure Tue Nov 7 17:13:30 2006 +@@ -20360,8 +20360,6 @@ # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS; - + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - + # Prevent multiple expansion - -@@ -12678,8 +12644,8 @@ + +@@ -26478,8 +26476,8 @@ # Some system specific hacks # @@ -20,3 +20,12 @@ case $SYSTEM_TYPE in *solaris2.7*) +@@ -46147,7 +46145,7 @@ + + MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" + +- CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" ++ # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" + if test "$have_ndb_debug" = "default" + then + have_ndb_debug=$with_debug diff --git a/databases/percona55-server/files/patch-extra_yassl_Makefile.in b/databases/percona55-server/files/patch-extra_yassl_Makefile.in index efb79a7902c4..232d2c3852c2 100644 --- a/databases/percona55-server/files/patch-extra_yassl_Makefile.in +++ b/databases/percona55-server/files/patch-extra_yassl_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/Makefile.in.orig Mon Jun 19 10:46:01 2006 -+++ extra/yassl/Makefile.in Mon Jun 19 10:46:16 2006 +--- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006 ++++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006 @@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = taocrypt src testsuite +SUBDIRS = taocrypt src - EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \ + EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \ CMakeLists.txt diff --git a/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in index d4727bd80632..bca462d08cba 100644 --- a/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in +++ b/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in @@ -1,11 +1,11 @@ ---- extra/yassl/taocrypt/Makefile.in.orig Mon Jun 19 10:52:14 2006 -+++ extra/yassl/taocrypt/Makefile.in Mon Jun 19 10:52:30 2006 -@@ -350,7 +350,7 @@ +--- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006 ++++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006 +@@ -351,7 +351,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -SUBDIRS = src test benchmark +SUBDIRS = src - EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt + EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp) all: all-recursive diff --git a/databases/percona55-server/files/patch-include_my_libwrap.h b/databases/percona55-server/files/patch-include_my_libwrap.h new file mode 100644 index 000000000000..a115f40fc8fc --- /dev/null +++ b/databases/percona55-server/files/patch-include_my_libwrap.h @@ -0,0 +1,11 @@ +--- include/my_libwrap.h.orig Tue Nov 7 08:39:53 2006 ++++ include/my_libwrap.h Tue Nov 7 08:40:17 2006 +@@ -15,7 +15,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include <my_tcpd.h> + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> diff --git a/databases/percona55-server/files/patch-include_my_tcpd.h b/databases/percona55-server/files/patch-include_my_tcpd.h new file mode 100644 index 000000000000..38aad1aa57d7 --- /dev/null +++ b/databases/percona55-server/files/patch-include_my_tcpd.h @@ -0,0 +1,147 @@ +--- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 ++++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 +@@ -6,6 +6,25 @@ + * $FreeBSD$ + */ + ++#ifndef _TCPWRAPPERS_TCPD_H ++#define _TCPWRAPPERS_TCPD_H ++ ++/* someone else may have defined this */ ++#undef __P ++ ++/* use prototypes if we have an ANSI C compiler or are using C++ */ ++#if defined(__STDC__) || defined(__cplusplus) ++#define __P(args) args ++#else ++#define __P(args) () ++#endif ++ ++/* Need definitions of struct sockaddr_in and FILE. */ ++#include <netinet/in.h> ++#include <stdio.h> ++ ++__BEGIN_DECLS ++ + /* Structure to describe one communications endpoint. */ + + #define STRING_LENGTH 128 /* hosts, users, processes */ +@@ -31,10 +50,10 @@ + char pid[10]; /* access via eval_pid(request) */ + struct host_info client[1]; /* client endpoint info */ + struct host_info server[1]; /* server endpoint info */ +- void (*sink) (); /* datagram sink function or 0 */ +- void (*hostname) (); /* address to printable hostname */ +- void (*hostaddr) (); /* address to printable address */ +- void (*cleanup) (); /* cleanup function or 0 */ ++ void (*sink) __P((int)); /* datagram sink function or 0 */ ++ void (*hostname) __P((struct host_info *)); /* address to printable hostname */ ++ void (*hostaddr) __P((struct host_info *)); /* address to printable address */ ++ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */ + struct netconfig *config; /* netdir handle */ + }; + +@@ -67,20 +86,23 @@ + /* Global functions. */ + + #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) +-extern void fromhost(); /* get/validate client host info */ ++extern void fromhost __P((struct request_info *)); /* get/validate client host info */ + #else + #define fromhost sock_host /* no TLI support needed */ + #endif + +-extern int hosts_access(); /* access control */ +-extern void shell_cmd(); /* execute shell command */ +-extern char *percent_x(); /* do %<char> expansion */ +-extern void rfc931(); /* client name from RFC 931 daemon */ +-extern void clean_exit(); /* clean up and exit */ +-extern void refuse(); /* clean up and exit */ +-extern char *xgets(); /* fgets() on steroids */ +-extern char *split_at(); /* strchr() and split */ +-extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ ++extern void shell_cmd __P((char *)); /* execute shell command */ ++extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */ ++#ifdef INET6 ++extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */ ++#else ++extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ ++#endif ++extern void clean_exit __P((struct request_info *)); /* clean up and exit */ ++extern void refuse __P((struct request_info *)); /* clean up and exit */ ++extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ ++extern char *split_at __P((char *, int)); /* strchr() and split */ ++extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */ + + /* Global variables. */ + +@@ -98,9 +120,14 @@ + */ + + #ifdef __STDC__ ++extern int hosts_access(struct request_info *request); ++extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, ++ char *client_user); + extern struct request_info *request_init(struct request_info *,...); + extern struct request_info *request_set(struct request_info *,...); + #else ++extern int hosts_access(); ++extern int hosts_ctl(); + extern struct request_info *request_init(); /* initialize request */ + extern struct request_info *request_set(); /* update request structure */ + #endif +@@ -123,27 +150,27 @@ + * host_info structures serve as caches for the lookup results. + */ + +-extern char *eval_user(); /* client user */ +-extern char *eval_hostname(); /* printable hostname */ +-extern char *eval_hostaddr(); /* printable host address */ +-extern char *eval_hostinfo(); /* host name or address */ +-extern char *eval_client(); /* whatever is available */ +-extern char *eval_server(); /* whatever is available */ ++extern char *eval_user __P((struct request_info *)); /* client user */ ++extern char *eval_hostname __P((struct host_info *)); /* printable hostname */ ++extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */ ++extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */ ++extern char *eval_client __P((struct request_info *)); /* whatever is available */ ++extern char *eval_server __P((struct request_info *)); /* whatever is available */ + #define eval_daemon(r) ((r)->daemon) /* daemon process name */ + #define eval_pid(r) ((r)->pid) /* process id */ + + /* Socket-specific methods, including DNS hostname lookups. */ + +-extern void sock_host(); /* look up endpoint addresses */ +-extern void sock_hostname(); /* translate address to hostname */ +-extern void sock_hostaddr(); /* address to printable address */ ++extern void sock_host __P((struct request_info *)); ++extern void sock_hostname __P((struct host_info *)); ++extern void sock_hostaddr __P((struct host_info *)); + #define sock_methods(r) \ + { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } + + /* The System V Transport-Level Interface (TLI) interface. */ + + #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) +-extern void tli_host(); /* look up endpoint addresses etc. */ ++extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */ + #endif + + /* +@@ -184,7 +211,7 @@ + * behavior. + */ + +-extern void process_options(); /* execute options */ ++extern void process_options __P((char *, struct request_info *)); /* execute options */ + extern int dry_run; /* verification flag */ + + /* Bug workarounds. */ +@@ -223,3 +250,7 @@ + #define strtok my_strtok + extern char *my_strtok(); + #endif ++ ++__END_DECLS ++ ++#endif /* tcpd.h */ diff --git a/databases/percona55-server/files/patch-man::Makefile.in b/databases/percona55-server/files/patch-man::Makefile.in index 35f0e88ddc3d..0b15e2d4ca03 100644 --- a/databases/percona55-server/files/patch-man::Makefile.in +++ b/databases/percona55-server/files/patch-man::Makefile.in @@ -1,11 +1,13 @@ ---- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 -+++ man/Makefile.in Sun Nov 27 00:09:03 2005 -@@ -338,7 +338,7 @@ +--- man/Makefile.in.orig Thu Oct 26 14:03:04 2006 ++++ man/Makefile.in Tue Nov 7 08:19:50 2006 +@@ -363,8 +363,8 @@ yassl_libs = @yassl_libs@ - yassl_libs_with_path = @yassl_libs_with_path@ + yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ +man1_MANS = - EXTRA_DIST = $(man1_MANS) ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am diff --git a/databases/percona55-server/files/patch-scripts::Makefile.in b/databases/percona55-server/files/patch-scripts::Makefile.in index 827bddd734ad..42e5e507112c 100644 --- a/databases/percona55-server/files/patch-scripts::Makefile.in +++ b/databases/percona55-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Fri Jun 2 20:03:10 2006 -+++ scripts/Makefile.in Thu Jun 15 07:56:56 2006 -@@ -371,23 +371,7 @@ +--- scripts/Makefile.in.orig Thu Oct 26 14:03:08 2006 ++++ scripts/Makefile.in Tue Nov 7 08:23:48 2006 +@@ -371,22 +371,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ @@ -18,16 +18,15 @@ - mysql_find_rows \ - mysqlhotcopy \ - mysqldumpslow \ -- mysql_explain_log \ - mysqld_multi \ - mysql_create_system_tables +bin_SCRIPTS = noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution \ -@@ -419,7 +403,7 @@ - mysqlaccess.conf \ - mysqlbug + make_sharedlib_distribution +@@ -416,7 +401,7 @@ + mysqlbug \ + make_win_bin_dist -dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql +dist_pkgdata_DATA = diff --git a/databases/percona55-server/files/patch-sql::mysqld.cc b/databases/percona55-server/files/patch-sql::mysqld.cc index b44e7d1e1a0e..4feed825cb11 100644 --- a/databases/percona55-server/files/patch-sql::mysqld.cc +++ b/databases/percona55-server/files/patch-sql::mysqld.cc @@ -1,14 +1,5 @@ --- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 +++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -121,7 +121,7 @@ - #endif /* __WIN__ */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include "mytcpd.h" - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> @@ -3177,7 +3177,7 @@ init_ssl(); diff --git a/databases/percona55-server/files/patch-sql::mytcpd.h b/databases/percona55-server/files/patch-sql::mytcpd.h deleted file mode 100644 index 981a21991dff..000000000000 --- a/databases/percona55-server/files/patch-sql::mytcpd.h +++ /dev/null @@ -1,147 +0,0 @@ ---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005 -+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005 -@@ -6,6 +6,25 @@ - * $FreeBSD: /tmp/pcvs/ports/databases/percona55-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 ale Exp $ - */ - -+#ifndef _TCPWRAPPERS_TCPD_H -+#define _TCPWRAPPERS_TCPD_H -+ -+/* someone else may have defined this */ -+#undef __P -+ -+/* use prototypes if we have an ANSI C compiler or are using C++ */ -+#if defined(__STDC__) || defined(__cplusplus) -+#define __P(args) args -+#else -+#define __P(args) () -+#endif -+ -+/* Need definitions of struct sockaddr_in and FILE. */ -+#include <netinet/in.h> -+#include <stdio.h> -+ -+__BEGIN_DECLS -+ - /* Structure to describe one communications endpoint. */ - - #define STRING_LENGTH 128 /* hosts, users, processes */ -@@ -31,10 +50,10 @@ - char pid[10]; /* access via eval_pid(request) */ - struct host_info client[1]; /* client endpoint info */ - struct host_info server[1]; /* server endpoint info */ -- void (*sink) (); /* datagram sink function or 0 */ -- void (*hostname) (); /* address to printable hostname */ -- void (*hostaddr) (); /* address to printable address */ -- void (*cleanup) (); /* cleanup function or 0 */ -+ void (*sink) __P((int)); /* datagram sink function or 0 */ -+ void (*hostname) __P((struct host_info *)); /* address to printable hostname */ -+ void (*hostaddr) __P((struct host_info *)); /* address to printable address */ -+ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */ - struct netconfig *config; /* netdir handle */ - }; - -@@ -67,20 +86,23 @@ - /* Global functions. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void fromhost(); /* get/validate client host info */ -+extern void fromhost __P((struct request_info *)); /* get/validate client host info */ - #else - #define fromhost sock_host /* no TLI support needed */ - #endif - --extern int hosts_access(); /* access control */ --extern void shell_cmd(); /* execute shell command */ --extern char *percent_x(); /* do %<char> expansion */ --extern void rfc931(); /* client name from RFC 931 daemon */ --extern void clean_exit(); /* clean up and exit */ --extern void refuse(); /* clean up and exit */ --extern char *xgets(); /* fgets() on steroids */ --extern char *split_at(); /* strchr() and split */ --extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ -+extern void shell_cmd __P((char *)); /* execute shell command */ -+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */ -+#ifdef INET6 -+extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */ -+#else -+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ -+#endif -+extern void clean_exit __P((struct request_info *)); /* clean up and exit */ -+extern void refuse __P((struct request_info *)); /* clean up and exit */ -+extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ -+extern char *split_at __P((char *, int)); /* strchr() and split */ -+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */ - - /* Global variables. */ - -@@ -98,9 +120,14 @@ - */ - - #ifdef __STDC__ -+extern int hosts_access(struct request_info *request); -+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, -+ char *client_user); - extern struct request_info *request_init(struct request_info *,...); - extern struct request_info *request_set(struct request_info *,...); - #else -+extern int hosts_access(); -+extern int hosts_ctl(); - extern struct request_info *request_init(); /* initialize request */ - extern struct request_info *request_set(); /* update request structure */ - #endif -@@ -123,27 +150,27 @@ - * host_info structures serve as caches for the lookup results. - */ - --extern char *eval_user(); /* client user */ --extern char *eval_hostname(); /* printable hostname */ --extern char *eval_hostaddr(); /* printable host address */ --extern char *eval_hostinfo(); /* host name or address */ --extern char *eval_client(); /* whatever is available */ --extern char *eval_server(); /* whatever is available */ -+extern char *eval_user __P((struct request_info *)); /* client user */ -+extern char *eval_hostname __P((struct host_info *)); /* printable hostname */ -+extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */ -+extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */ -+extern char *eval_client __P((struct request_info *)); /* whatever is available */ -+extern char *eval_server __P((struct request_info *)); /* whatever is available */ - #define eval_daemon(r) ((r)->daemon) /* daemon process name */ - #define eval_pid(r) ((r)->pid) /* process id */ - - /* Socket-specific methods, including DNS hostname lookups. */ - --extern void sock_host(); /* look up endpoint addresses */ --extern void sock_hostname(); /* translate address to hostname */ --extern void sock_hostaddr(); /* address to printable address */ -+extern void sock_host __P((struct request_info *)); -+extern void sock_hostname __P((struct host_info *)); -+extern void sock_hostaddr __P((struct host_info *)); - #define sock_methods(r) \ - { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } - - /* The System V Transport-Level Interface (TLI) interface. */ - - #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) --extern void tli_host(); /* look up endpoint addresses etc. */ -+extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */ - #endif - - /* -@@ -184,7 +211,7 @@ - * behavior. - */ - --extern void process_options(); /* execute options */ -+extern void process_options __P((char *, struct request_info *)); /* execute options */ - extern int dry_run; /* verification flag */ - - /* Bug workarounds. */ -@@ -223,3 +250,7 @@ - #define strtok my_strtok - extern char *my_strtok(); - #endif -+ -+__END_DECLS -+ -+#endif /* tcpd.h */ diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 19c853b954c1..c5d3d8763567 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -1,5 +1,4 @@ @unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true -bin/comp_err bin/innochecksum bin/my_print_defaults bin/myisam_ftdump diff --git a/databases/percona55-server/pkg-plist.scripts b/databases/percona55-server/pkg-plist.scripts index 6419684159c1..b0a603760ef0 100644 --- a/databases/percona55-server/pkg-plist.scripts +++ b/databases/percona55-server/pkg-plist.scripts @@ -1,6 +1,5 @@ bin/msql2mysql bin/mysql_convert_table_format -bin/mysql_explain_log bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_secure_installation |