diff options
Diffstat (limited to 'databases/mysql41-server')
| -rw-r--r-- | databases/mysql41-server/Makefile | 12 | ||||
| -rw-r--r-- | databases/mysql41-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql41-server/files/patch-configure | 19 | ||||
| -rw-r--r-- | databases/mysql41-server/pkg-plist | 46 | ||||
| -rw-r--r-- | databases/mysql41-server/pkg-plist.client | 1 |
5 files changed, 64 insertions, 18 deletions
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 902c051d3d8d..32d0273beeb9 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 4.1.2 +PORTVERSION= 4.1.3 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ @@ -21,7 +21,7 @@ MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://mysql.proserve.nl/Downloads/MySQL-4.1/ \ ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha +DISTNAME= ${PORTNAME}-${PORTVERSION}-beta MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -29,10 +29,8 @@ COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql41-client PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql -USE_GNOME= lthack -USE_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes -USE_GMAKE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ @@ -45,6 +43,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ + --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -112,7 +111,7 @@ LATEST_LINK= mysql41-server CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* PLIST_SUB= DB_DIR=${DB_DIR} \ - VER=${PORTVERSION}-alpha + VER=${PORTVERSION}-beta MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -195,6 +194,7 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in + @${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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index 49dac52bbeca..2f841c56292d 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-4.1.2-alpha.tar.gz) = 9877e8d208bedd7065c4f0d86258f64a -SIZE (mysql-4.1.2-alpha.tar.gz) = 16924395 +MD5 (mysql-4.1.3-beta.tar.gz) = 4dd15079ae0fd908fdbb9daf2d01c183 +SIZE (mysql-4.1.3-beta.tar.gz) = 19229478 diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure index 10080e85bfee..d2825b9a2083 100644 --- a/databases/mysql41-server/files/patch-configure +++ b/databases/mysql41-server/files/patch-configure @@ -1,16 +1,15 @@ ---- configure.orig Tue Jun 1 09:08:41 2004 -+++ configure Tue Jun 1 09:08:41 2004 -@@ -18835,9 +18835,6 @@ +--- configure.orig Fri Jul 2 11:24:14 2004 ++++ configure Fri Jul 2 11:24:37 2004 +@@ -18829,8 +18829,6 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' + # Prevent multiple expansion --# Ensure that we have --preserve-dup-deps defines, otherwise we get link --# problems of 'mysql' with CXX=g++ --LIBTOOL="$LIBTOOL --preserve-dup-deps" - - #AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC - -@@ -23625,8 +23622,8 @@ +@@ -23783,8 +23781,8 @@ # Some system specific hacks # diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index fe2ec3230b7f..92598967f383 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -8,14 +8,48 @@ bin/myisamlog bin/myisampack bin/mysql_create_system_tables 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 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 lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a @@ -23,9 +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 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 @@ -156,6 +195,8 @@ share/mysql/romanian/errmsg.sys share/mysql/romanian/errmsg.txt share/mysql/russian/errmsg.sys share/mysql/russian/errmsg.txt +share/mysql/serbian/errmsg.sys +share/mysql/serbian/errmsg.txt share/mysql/slovak/errmsg.sys share/mysql/slovak/errmsg.txt share/mysql/spanish/errmsg.sys @@ -164,6 +205,10 @@ share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt share/mysql/ukrainian/errmsg.sys share/mysql/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 @unexec rmdir %D/lib/mysql 2> /dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags %%PORTDOCS%%@dirrm %%DOCSDIR%% @@ -186,6 +231,7 @@ share/mysql/ukrainian/errmsg.txt @dirrm share/mysql/portuguese @dirrm share/mysql/romanian @dirrm share/mysql/russian +@dirrm share/mysql/serbian @dirrm share/mysql/slovak @dirrm share/mysql/spanish @dirrm share/mysql/swedish diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client index e260e22590c8..802930b61958 100644 --- a/databases/mysql41-server/pkg-plist.client +++ b/databases/mysql41-server/pkg-plist.client @@ -32,6 +32,7 @@ include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h +include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/mysqld_error.h include/mysql/raid.h |