diff options
| author | ale <ale@FreeBSD.org> | 2005-01-10 21:17:30 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2005-01-10 21:17:30 +0800 |
| commit | 190e261866b71969c3ad8943cab0f2950f0ec073 (patch) | |
| tree | cb367ee8b0c5f177aaa648c216561213d8770811 | |
| parent | 8311ce164b46d567583dab3b09fa48b2b81a03e7 (diff) | |
| download | freebsd-ports-gnome-190e261866b71969c3ad8943cab0f2950f0ec073.tar.gz freebsd-ports-gnome-190e261866b71969c3ad8943cab0f2950f0ec073.tar.zst freebsd-ports-gnome-190e261866b71969c3ad8943cab0f2950f0ec073.zip | |
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]
48 files changed, 1806 insertions, 990 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 187b3fa7705c..6853e8033bbe 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,23 +6,13 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.1 +PORTVERSION= 5.0.2 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ - http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.mysql.cz/Downloads/%SUBDIR%/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ - http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot +MASTER_SITES= ${MASTER_SITE_MYSQL} +MASTER_SITE_SUBDIR= MySQL-5.0 PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -46,7 +36,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -62,11 +51,17 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl +CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif +.if defined(WITHOUT_INNODB) +CONFIGURE_ARGS+=--without-innodb +.endif +.if defined(WITH_NDB) +CONFIGURE_ARGS+=--with-ndbcluster +.endif .include <bsd.port.pre.mk> @@ -115,11 +110,18 @@ CONFLICTS= mysql-server-3.* mysql-server-4.* PLIST_SUB= DB_DIR=${DB_DIR} \ VER=${PORTVERSION}-alpha +.if defined(WITH_NDB) +PLIST_SUB+= NDB="" +.else +PLIST_SUB+= NDB="@comment " +.endif MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 -DOCS= manual.html manual.txt manual_toc.html +.if !defined(NOPORTDOCS) +PORTDOCS= manual.html manual.txt manual_toc.html +.endif INFO= mysql @@ -140,6 +142,8 @@ pre-fetch: @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " (use it if you need even more speed)." + @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." + @${ECHO} " WITH_NDB=yes Disable support for NDB Cluster." @${ECHO} "" post-patch: @@ -176,11 +180,10 @@ post-install: ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/Flags -.for doc in ${DOCS} + @${MKDIR} ${DOCSDIR} +.for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif .else @@ -198,7 +201,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql 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|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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 @@ -217,8 +221,11 @@ USE_MYSQL= yes WANT_MYSQL_VER= 50 USE_PERL5= yes -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 +.if ${PERL_LEVEL} <= 500800 +RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +.endif + LATEST_LINK= mysql50-scripts @@ -238,5 +245,8 @@ post-patch: @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif +# Common part +post-extract: + @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h .include <bsd.port.post.mk> diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 58e4ac6083af..4221c4f3e0f5 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea -SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 +MD5 (mysql-5.0.2-alpha.tar.gz) = 26fe5a7ca84e5c2540abf6d0a782ec36 +SIZE (mysql-5.0.2-alpha.tar.gz) = 22940908 diff --git a/databases/mysql50-server/files/patch-Docs::Makefile.in b/databases/mysql50-server/files/patch-Docs::Makefile.in index e9700bd64e46..e76340001630 100644 --- a/databases/mysql50-server/files/patch-Docs::Makefile.in +++ b/databases/mysql50-server/files/patch-Docs::Makefile.in @@ -1,21 +1,29 @@ ---- Docs/Makefile.in.orig Fri Mar 5 15:59:43 2004 -+++ Docs/Makefile.in Fri Mar 5 16:00:00 2004 -@@ -446,7 +446,7 @@ +--- Docs/Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Docs/Makefile.in Mon Jan 10 11:44:27 2005 +@@ -331,7 +331,7 @@ + check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-all: $(BUILT_SOURCES) ++all: + $(MAKE) $(AM_MAKEFLAGS) all-recursive - all: $(targets) txt_files + .SUFFIXES: +@@ -599,7 +599,7 @@ + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(infodir) --txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \ -+txt_files: ../INSTALL-SOURCE ../COPYING \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -718,7 +718,7 @@ + uninstall-info-am uninstall-info-recursive uninstall-recursive - CLEAN_FILES: $(BUILD_SOURCES) -@@ -609,9 +609,6 @@ - ../INSTALL-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing" "Tutorial" > $@ -- --../INSTALL-WIN-SOURCE: mysql.info $(GT) -- perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@ +-all: $(targets) txt_files ++all: - # We put the description for the binary installation here so that - # people who download source wont have to see it. It is moved up to + txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ + INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in index 356baf88b938..df6774784d9b 100644 --- a/databases/mysql50-server/files/patch-Makefile.in +++ b/databases/mysql50-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Tue Jul 27 08:14:34 2004 -+++ Makefile.in Sat Oct 23 10:39:45 2004 -@@ -293,12 +293,7 @@ +--- Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Makefile.in Mon Jan 10 11:46:31 2005 +@@ -302,12 +302,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING zlib --SUBDIRS = . include @docs_dirs@ \ + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ -- @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts man tests SSL\ -- BUILD netware os2 @libmysqld_dirs@ \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = - # Relink after clean + DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql50-server/files/patch-client::mysql.cc b/databases/mysql50-server/files/patch-client::mysql.cc deleted file mode 100644 index 7e4fdfa6f22d..000000000000 --- a/databases/mysql50-server/files/patch-client::mysql.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 -+++ client/mysql.cc Sun Oct 24 15:55:52 2004 -@@ -294,7 +294,7 @@ - HIST_ENTRY is defined for libedit, but not for the real readline - Need to redefine it for real readline to find it - */ --#if !defined(USE_LIBEDIT_INTERFACE) -+#if !defined(HAVE_HIST_ENTRY) - typedef struct _hist_entry { - const char *line; - const char *data; diff --git a/databases/mysql50-server/files/patch-sql::mysqld.cc b/databases/mysql50-server/files/patch-sql::mysqld.cc index 1d0288494fb5..c98d38bcbd10 100644 --- a/databases/mysql50-server/files/patch-sql::mysqld.cc +++ b/databases/mysql50-server/files/patch-sql::mysqld.cc @@ -1,12 +1,47 @@ ---- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003 -+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003 -@@ -104,7 +104,8 @@ +--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ + #endif /* __WIN__ */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include "mytcpd.h" + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> +@@ -136,15 +136,6 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) +-#define my_fromhost(A) fromhost(A) +-#define my_hosts_access(A) hosts_access(A) +-#define my_eval_client(A) eval_client(A) +-#else +-#define my_fromhost(A) fromhost() +-#define my_hosts_access(A) hosts_access() +-#define my_eval_client(A) eval_client() +-#endif /* __STDC__ */ + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H +@@ -3565,8 +3556,8 @@ + struct request_info req; + signal(SIGCHLD, SIG_DFL); + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +- my_fromhost(&req); +- if (!my_hosts_access(&req)) ++ fromhost(&req); ++ if (!hosts_access(&req)) + { + /* + This may be stupid but refuse() includes an exit(0) +@@ -3574,7 +3565,7 @@ + clean_exit() - same stupid thing ... + */ + syslog(deny_severity, "refused connect from %s", +- my_eval_client(&req)); ++ eval_client(&req)); + + /* + C++ sucks (the gibberish in front just translates the supplied diff --git a/databases/mysql50-server/files/patch-sql::mytcpd.h b/databases/mysql50-server/files/patch-sql::mytcpd.h new file mode 100644 index 000000000000..f98dde57bc23 --- /dev/null +++ b/databases/mysql50-server/files/patch-sql::mytcpd.h @@ -0,0 +1,147 @@ +--- 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/mysql50-server/files/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/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index be85c5051fdf..243dddbdd337 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-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 diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 187b3fa7705c..6853e8033bbe 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,23 +6,13 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.1 +PORTVERSION= 5.0.2 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ - http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.mysql.cz/Downloads/%SUBDIR%/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ - http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot +MASTER_SITES= ${MASTER_SITE_MYSQL} +MASTER_SITE_SUBDIR= MySQL-5.0 PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -46,7 +36,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -62,11 +51,17 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl +CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif +.if defined(WITHOUT_INNODB) +CONFIGURE_ARGS+=--without-innodb +.endif +.if defined(WITH_NDB) +CONFIGURE_ARGS+=--with-ndbcluster +.endif .include <bsd.port.pre.mk> @@ -115,11 +110,18 @@ CONFLICTS= mysql-server-3.* mysql-server-4.* PLIST_SUB= DB_DIR=${DB_DIR} \ VER=${PORTVERSION}-alpha +.if defined(WITH_NDB) +PLIST_SUB+= NDB="" +.else +PLIST_SUB+= NDB="@comment " +.endif MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 -DOCS= manual.html manual.txt manual_toc.html +.if !defined(NOPORTDOCS) +PORTDOCS= manual.html manual.txt manual_toc.html +.endif INFO= mysql @@ -140,6 +142,8 @@ pre-fetch: @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " (use it if you need even more speed)." + @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." + @${ECHO} " WITH_NDB=yes Disable support for NDB Cluster." @${ECHO} "" post-patch: @@ -176,11 +180,10 @@ post-install: ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/Flags -.for doc in ${DOCS} + @${MKDIR} ${DOCSDIR} +.for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif .else @@ -198,7 +201,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql 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|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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 @@ -217,8 +221,11 @@ USE_MYSQL= yes WANT_MYSQL_VER= 50 USE_PERL5= yes -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 +.if ${PERL_LEVEL} <= 500800 +RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +.endif + LATEST_LINK= mysql50-scripts @@ -238,5 +245,8 @@ post-patch: @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif +# Common part +post-extract: + @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h .include <bsd.port.post.mk> diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 58e4ac6083af..4221c4f3e0f5 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea -SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 +MD5 (mysql-5.0.2-alpha.tar.gz) = 26fe5a7ca84e5c2540abf6d0a782ec36 +SIZE (mysql-5.0.2-alpha.tar.gz) = 22940908 diff --git a/databases/mysql51-server/files/patch-Docs::Makefile.in b/databases/mysql51-server/files/patch-Docs::Makefile.in index e9700bd64e46..e76340001630 100644 --- a/databases/mysql51-server/files/patch-Docs::Makefile.in +++ b/databases/mysql51-server/files/patch-Docs::Makefile.in @@ -1,21 +1,29 @@ ---- Docs/Makefile.in.orig Fri Mar 5 15:59:43 2004 -+++ Docs/Makefile.in Fri Mar 5 16:00:00 2004 -@@ -446,7 +446,7 @@ +--- Docs/Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Docs/Makefile.in Mon Jan 10 11:44:27 2005 +@@ -331,7 +331,7 @@ + check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-all: $(BUILT_SOURCES) ++all: + $(MAKE) $(AM_MAKEFLAGS) all-recursive - all: $(targets) txt_files + .SUFFIXES: +@@ -599,7 +599,7 @@ + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(infodir) --txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \ -+txt_files: ../INSTALL-SOURCE ../COPYING \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -718,7 +718,7 @@ + uninstall-info-am uninstall-info-recursive uninstall-recursive - CLEAN_FILES: $(BUILD_SOURCES) -@@ -609,9 +609,6 @@ - ../INSTALL-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing" "Tutorial" > $@ -- --../INSTALL-WIN-SOURCE: mysql.info $(GT) -- perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@ +-all: $(targets) txt_files ++all: - # We put the description for the binary installation here so that - # people who download source wont have to see it. It is moved up to + txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ + INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in index 356baf88b938..df6774784d9b 100644 --- a/databases/mysql51-server/files/patch-Makefile.in +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Tue Jul 27 08:14:34 2004 -+++ Makefile.in Sat Oct 23 10:39:45 2004 -@@ -293,12 +293,7 @@ +--- Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Makefile.in Mon Jan 10 11:46:31 2005 +@@ -302,12 +302,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING zlib --SUBDIRS = . include @docs_dirs@ \ + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ -- @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts man tests SSL\ -- BUILD netware os2 @libmysqld_dirs@ \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = - # Relink after clean + DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql51-server/files/patch-client::mysql.cc b/databases/mysql51-server/files/patch-client::mysql.cc deleted file mode 100644 index 7e4fdfa6f22d..000000000000 --- a/databases/mysql51-server/files/patch-client::mysql.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 -+++ client/mysql.cc Sun Oct 24 15:55:52 2004 -@@ -294,7 +294,7 @@ - HIST_ENTRY is defined for libedit, but not for the real readline - Need to redefine it for real readline to find it - */ --#if !defined(USE_LIBEDIT_INTERFACE) -+#if !defined(HAVE_HIST_ENTRY) - typedef struct _hist_entry { - const char *line; - const char *data; diff --git a/databases/mysql51-server/files/patch-sql::mysqld.cc b/databases/mysql51-server/files/patch-sql::mysqld.cc index 1d0288494fb5..c98d38bcbd10 100644 --- a/databases/mysql51-server/files/patch-sql::mysqld.cc +++ b/databases/mysql51-server/files/patch-sql::mysqld.cc @@ -1,12 +1,47 @@ ---- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003 -+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003 -@@ -104,7 +104,8 @@ +--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ + #endif /* __WIN__ */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include "mytcpd.h" + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> +@@ -136,15 +136,6 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) +-#define my_fromhost(A) fromhost(A) +-#define my_hosts_access(A) hosts_access(A) +-#define my_eval_client(A) eval_client(A) +-#else +-#define my_fromhost(A) fromhost() +-#define my_hosts_access(A) hosts_access() +-#define my_eval_client(A) eval_client() +-#endif /* __STDC__ */ + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H +@@ -3565,8 +3556,8 @@ + struct request_info req; + signal(SIGCHLD, SIG_DFL); + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +- my_fromhost(&req); +- if (!my_hosts_access(&req)) ++ fromhost(&req); ++ if (!hosts_access(&req)) + { + /* + This may be stupid but refuse() includes an exit(0) +@@ -3574,7 +3565,7 @@ + clean_exit() - same stupid thing ... + */ + syslog(deny_severity, "refused connect from %s", +- my_eval_client(&req)); ++ eval_client(&req)); + + /* + C++ sucks (the gibberish in front just translates the supplied diff --git a/databases/mysql51-server/files/patch-sql::mytcpd.h b/databases/mysql51-server/files/patch-sql::mytcpd.h new file mode 100644 index 000000000000..c8f3ea3db236 --- /dev/null +++ b/databases/mysql51-server/files/patch-sql::mytcpd.h @@ -0,0 +1,147 @@ +--- 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/mysql51-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/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index be85c5051fdf..243dddbdd337 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-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 diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 187b3fa7705c..6853e8033bbe 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,23 +6,13 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.1 +PORTVERSION= 5.0.2 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ - http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.mysql.cz/Downloads/%SUBDIR%/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ - http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot +MASTER_SITES= ${MASTER_SITE_MYSQL} +MASTER_SITE_SUBDIR= MySQL-5.0 PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -46,7 +36,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -62,11 +51,17 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl +CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif +.if defined(WITHOUT_INNODB) +CONFIGURE_ARGS+=--without-innodb +.endif +.if defined(WITH_NDB) +CONFIGURE_ARGS+=--with-ndbcluster +.endif .include <bsd.port.pre.mk> @@ -115,11 +110,18 @@ CONFLICTS= mysql-server-3.* mysql-server-4.* PLIST_SUB= DB_DIR=${DB_DIR} \ VER=${PORTVERSION}-alpha +.if defined(WITH_NDB) +PLIST_SUB+= NDB="" +.else +PLIST_SUB+= NDB="@comment " +.endif MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 -DOCS= manual.html manual.txt manual_toc.html +.if !defined(NOPORTDOCS) +PORTDOCS= manual.html manual.txt manual_toc.html +.endif INFO= mysql @@ -140,6 +142,8 @@ pre-fetch: @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " (use it if you need even more speed)." + @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." + @${ECHO} " WITH_NDB=yes Disable support for NDB Cluster." @${ECHO} "" post-patch: @@ -176,11 +180,10 @@ post-install: ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/Flags -.for doc in ${DOCS} + @${MKDIR} ${DOCSDIR} +.for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif .else @@ -198,7 +201,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql 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|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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 @@ -217,8 +221,11 @@ USE_MYSQL= yes WANT_MYSQL_VER= 50 USE_PERL5= yes -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 +.if ${PERL_LEVEL} <= 500800 +RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +.endif + LATEST_LINK= mysql50-scripts @@ -238,5 +245,8 @@ post-patch: @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif +# Common part +post-extract: + @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h .include <bsd.port.post.mk> diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 58e4ac6083af..4221c4f3e0f5 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea -SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 +MD5 (mysql-5.0.2-alpha.tar.gz) = 26fe5a7ca84e5c2540abf6d0a782ec36 +SIZE (mysql-5.0.2-alpha.tar.gz) = 22940908 diff --git a/databases/mysql54-server/files/patch-Docs::Makefile.in b/databases/mysql54-server/files/patch-Docs::Makefile.in index e9700bd64e46..e76340001630 100644 --- a/databases/mysql54-server/files/patch-Docs::Makefile.in +++ b/databases/mysql54-server/files/patch-Docs::Makefile.in @@ -1,21 +1,29 @@ ---- Docs/Makefile.in.orig Fri Mar 5 15:59:43 2004 -+++ Docs/Makefile.in Fri Mar 5 16:00:00 2004 -@@ -446,7 +446,7 @@ +--- Docs/Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Docs/Makefile.in Mon Jan 10 11:44:27 2005 +@@ -331,7 +331,7 @@ + check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-all: $(BUILT_SOURCES) ++all: + $(MAKE) $(AM_MAKEFLAGS) all-recursive - all: $(targets) txt_files + .SUFFIXES: +@@ -599,7 +599,7 @@ + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(infodir) --txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \ -+txt_files: ../INSTALL-SOURCE ../COPYING \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -718,7 +718,7 @@ + uninstall-info-am uninstall-info-recursive uninstall-recursive - CLEAN_FILES: $(BUILD_SOURCES) -@@ -609,9 +609,6 @@ - ../INSTALL-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing" "Tutorial" > $@ -- --../INSTALL-WIN-SOURCE: mysql.info $(GT) -- perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@ +-all: $(targets) txt_files ++all: - # We put the description for the binary installation here so that - # people who download source wont have to see it. It is moved up to + txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ + INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in index 356baf88b938..df6774784d9b 100644 --- a/databases/mysql54-server/files/patch-Makefile.in +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Tue Jul 27 08:14:34 2004 -+++ Makefile.in Sat Oct 23 10:39:45 2004 -@@ -293,12 +293,7 @@ +--- Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Makefile.in Mon Jan 10 11:46:31 2005 +@@ -302,12 +302,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING zlib --SUBDIRS = . include @docs_dirs@ \ + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ -- @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts man tests SSL\ -- BUILD netware os2 @libmysqld_dirs@ \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = - # Relink after clean + DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql54-server/files/patch-client::mysql.cc b/databases/mysql54-server/files/patch-client::mysql.cc deleted file mode 100644 index 7e4fdfa6f22d..000000000000 --- a/databases/mysql54-server/files/patch-client::mysql.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 -+++ client/mysql.cc Sun Oct 24 15:55:52 2004 -@@ -294,7 +294,7 @@ - HIST_ENTRY is defined for libedit, but not for the real readline - Need to redefine it for real readline to find it - */ --#if !defined(USE_LIBEDIT_INTERFACE) -+#if !defined(HAVE_HIST_ENTRY) - typedef struct _hist_entry { - const char *line; - const char *data; diff --git a/databases/mysql54-server/files/patch-sql::mysqld.cc b/databases/mysql54-server/files/patch-sql::mysqld.cc index 1d0288494fb5..c98d38bcbd10 100644 --- a/databases/mysql54-server/files/patch-sql::mysqld.cc +++ b/databases/mysql54-server/files/patch-sql::mysqld.cc @@ -1,12 +1,47 @@ ---- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003 -+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003 -@@ -104,7 +104,8 @@ +--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ + #endif /* __WIN__ */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include "mytcpd.h" + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> +@@ -136,15 +136,6 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) +-#define my_fromhost(A) fromhost(A) +-#define my_hosts_access(A) hosts_access(A) +-#define my_eval_client(A) eval_client(A) +-#else +-#define my_fromhost(A) fromhost() +-#define my_hosts_access(A) hosts_access() +-#define my_eval_client(A) eval_client() +-#endif /* __STDC__ */ + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H +@@ -3565,8 +3556,8 @@ + struct request_info req; + signal(SIGCHLD, SIG_DFL); + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +- my_fromhost(&req); +- if (!my_hosts_access(&req)) ++ fromhost(&req); ++ if (!hosts_access(&req)) + { + /* + This may be stupid but refuse() includes an exit(0) +@@ -3574,7 +3565,7 @@ + clean_exit() - same stupid thing ... + */ + syslog(deny_severity, "refused connect from %s", +- my_eval_client(&req)); ++ eval_client(&req)); + + /* + C++ sucks (the gibberish in front just translates the supplied diff --git a/databases/mysql54-server/files/patch-sql::mytcpd.h b/databases/mysql54-server/files/patch-sql::mytcpd.h new file mode 100644 index 000000000000..f641ae38af46 --- /dev/null +++ b/databases/mysql54-server/files/patch-sql::mytcpd.h @@ -0,0 +1,147 @@ +--- 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/mysql54-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/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 diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 187b3fa7705c..6853e8033bbe 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,23 +6,13 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.1 +PORTVERSION= 5.0.2 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ - http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.mysql.cz/Downloads/%SUBDIR%/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ - http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot +MASTER_SITES= ${MASTER_SITE_MYSQL} +MASTER_SITE_SUBDIR= MySQL-5.0 PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -46,7 +36,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -62,11 +51,17 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl +CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif +.if defined(WITHOUT_INNODB) +CONFIGURE_ARGS+=--without-innodb +.endif +.if defined(WITH_NDB) +CONFIGURE_ARGS+=--with-ndbcluster +.endif .include <bsd.port.pre.mk> @@ -115,11 +110,18 @@ CONFLICTS= mysql-server-3.* mysql-server-4.* PLIST_SUB= DB_DIR=${DB_DIR} \ VER=${PORTVERSION}-alpha +.if defined(WITH_NDB) +PLIST_SUB+= NDB="" +.else +PLIST_SUB+= NDB="@comment " +.endif MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 -DOCS= manual.html manual.txt manual_toc.html +.if !defined(NOPORTDOCS) +PORTDOCS= manual.html manual.txt manual_toc.html +.endif INFO= mysql @@ -140,6 +142,8 @@ pre-fetch: @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " (use it if you need even more speed)." + @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." + @${ECHO} " WITH_NDB=yes Disable support for NDB Cluster." @${ECHO} "" post-patch: @@ -176,11 +180,10 @@ post-install: ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/Flags -.for doc in ${DOCS} + @${MKDIR} ${DOCSDIR} +.for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif .else @@ -198,7 +201,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql 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|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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 @@ -217,8 +221,11 @@ USE_MYSQL= yes WANT_MYSQL_VER= 50 USE_PERL5= yes -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 +.if ${PERL_LEVEL} <= 500800 +RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +.endif + LATEST_LINK= mysql50-scripts @@ -238,5 +245,8 @@ post-patch: @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif +# Common part +post-extract: + @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h .include <bsd.port.post.mk> diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 58e4ac6083af..4221c4f3e0f5 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea -SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 +MD5 (mysql-5.0.2-alpha.tar.gz) = 26fe5a7ca84e5c2540abf6d0a782ec36 +SIZE (mysql-5.0.2-alpha.tar.gz) = 22940908 diff --git a/databases/mysql55-server/files/patch-Docs::Makefile.in b/databases/mysql55-server/files/patch-Docs::Makefile.in index e9700bd64e46..e76340001630 100644 --- a/databases/mysql55-server/files/patch-Docs::Makefile.in +++ b/databases/mysql55-server/files/patch-Docs::Makefile.in @@ -1,21 +1,29 @@ ---- Docs/Makefile.in.orig Fri Mar 5 15:59:43 2004 -+++ Docs/Makefile.in Fri Mar 5 16:00:00 2004 -@@ -446,7 +446,7 @@ +--- Docs/Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Docs/Makefile.in Mon Jan 10 11:44:27 2005 +@@ -331,7 +331,7 @@ + check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-all: $(BUILT_SOURCES) ++all: + $(MAKE) $(AM_MAKEFLAGS) all-recursive - all: $(targets) txt_files + .SUFFIXES: +@@ -599,7 +599,7 @@ + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(infodir) --txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \ -+txt_files: ../INSTALL-SOURCE ../COPYING \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -718,7 +718,7 @@ + uninstall-info-am uninstall-info-recursive uninstall-recursive - CLEAN_FILES: $(BUILD_SOURCES) -@@ -609,9 +609,6 @@ - ../INSTALL-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing" "Tutorial" > $@ -- --../INSTALL-WIN-SOURCE: mysql.info $(GT) -- perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@ +-all: $(targets) txt_files ++all: - # We put the description for the binary installation here so that - # people who download source wont have to see it. It is moved up to + txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ + INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in index 356baf88b938..df6774784d9b 100644 --- a/databases/mysql55-server/files/patch-Makefile.in +++ b/databases/mysql55-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Tue Jul 27 08:14:34 2004 -+++ Makefile.in Sat Oct 23 10:39:45 2004 -@@ -293,12 +293,7 @@ +--- Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Makefile.in Mon Jan 10 11:46:31 2005 +@@ -302,12 +302,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING zlib --SUBDIRS = . include @docs_dirs@ \ + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ -- @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts man tests SSL\ -- BUILD netware os2 @libmysqld_dirs@ \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = - # Relink after clean + DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql55-server/files/patch-client::mysql.cc b/databases/mysql55-server/files/patch-client::mysql.cc deleted file mode 100644 index 7e4fdfa6f22d..000000000000 --- a/databases/mysql55-server/files/patch-client::mysql.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 -+++ client/mysql.cc Sun Oct 24 15:55:52 2004 -@@ -294,7 +294,7 @@ - HIST_ENTRY is defined for libedit, but not for the real readline - Need to redefine it for real readline to find it - */ --#if !defined(USE_LIBEDIT_INTERFACE) -+#if !defined(HAVE_HIST_ENTRY) - typedef struct _hist_entry { - const char *line; - const char *data; diff --git a/databases/mysql55-server/files/patch-sql::mysqld.cc b/databases/mysql55-server/files/patch-sql::mysqld.cc index 1d0288494fb5..c98d38bcbd10 100644 --- a/databases/mysql55-server/files/patch-sql::mysqld.cc +++ b/databases/mysql55-server/files/patch-sql::mysqld.cc @@ -1,12 +1,47 @@ ---- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003 -+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003 -@@ -104,7 +104,8 @@ +--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ + #endif /* __WIN__ */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include "mytcpd.h" + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> +@@ -136,15 +136,6 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) +-#define my_fromhost(A) fromhost(A) +-#define my_hosts_access(A) hosts_access(A) +-#define my_eval_client(A) eval_client(A) +-#else +-#define my_fromhost(A) fromhost() +-#define my_hosts_access(A) hosts_access() +-#define my_eval_client(A) eval_client() +-#endif /* __STDC__ */ + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H +@@ -3565,8 +3556,8 @@ + struct request_info req; + signal(SIGCHLD, SIG_DFL); + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +- my_fromhost(&req); +- if (!my_hosts_access(&req)) ++ fromhost(&req); ++ if (!hosts_access(&req)) + { + /* + This may be stupid but refuse() includes an exit(0) +@@ -3574,7 +3565,7 @@ + clean_exit() - same stupid thing ... + */ + syslog(deny_severity, "refused connect from %s", +- my_eval_client(&req)); ++ eval_client(&req)); + + /* + C++ sucks (the gibberish in front just translates the supplied diff --git a/databases/mysql55-server/files/patch-sql::mytcpd.h b/databases/mysql55-server/files/patch-sql::mytcpd.h new file mode 100644 index 000000000000..4844531d1225 --- /dev/null +++ b/databases/mysql55-server/files/patch-sql::mytcpd.h @@ -0,0 +1,147 @@ +--- 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/mysql55-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/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index be85c5051fdf..243dddbdd337 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-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 diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 187b3fa7705c..6853e8033bbe 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,23 +6,13 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.1 +PORTVERSION= 5.0.2 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ - http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.mysql.cz/Downloads/%SUBDIR%/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ - http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot +MASTER_SITES= ${MASTER_SITE_MYSQL} +MASTER_SITE_SUBDIR= MySQL-5.0 PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -46,7 +36,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -62,11 +51,17 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl +CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif +.if defined(WITHOUT_INNODB) +CONFIGURE_ARGS+=--without-innodb +.endif +.if defined(WITH_NDB) +CONFIGURE_ARGS+=--with-ndbcluster +.endif .include <bsd.port.pre.mk> @@ -115,11 +110,18 @@ CONFLICTS= mysql-server-3.* mysql-server-4.* PLIST_SUB= DB_DIR=${DB_DIR} \ VER=${PORTVERSION}-alpha +.if defined(WITH_NDB) +PLIST_SUB+= NDB="" +.else +PLIST_SUB+= NDB="@comment " +.endif MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 -DOCS= manual.html manual.txt manual_toc.html +.if !defined(NOPORTDOCS) +PORTDOCS= manual.html manual.txt manual_toc.html +.endif INFO= mysql @@ -140,6 +142,8 @@ pre-fetch: @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " (use it if you need even more speed)." + @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." + @${ECHO} " WITH_NDB=yes Disable support for NDB Cluster." @${ECHO} "" post-patch: @@ -176,11 +180,10 @@ post-install: ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/Flags -.for doc in ${DOCS} + @${MKDIR} ${DOCSDIR} +.for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif .else @@ -198,7 +201,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql 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|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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 @@ -217,8 +221,11 @@ USE_MYSQL= yes WANT_MYSQL_VER= 50 USE_PERL5= yes -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 +.if ${PERL_LEVEL} <= 500800 +RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +.endif + LATEST_LINK= mysql50-scripts @@ -238,5 +245,8 @@ post-patch: @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif +# Common part +post-extract: + @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h .include <bsd.port.post.mk> diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index 58e4ac6083af..4221c4f3e0f5 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea -SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 +MD5 (mysql-5.0.2-alpha.tar.gz) = 26fe5a7ca84e5c2540abf6d0a782ec36 +SIZE (mysql-5.0.2-alpha.tar.gz) = 22940908 diff --git a/databases/mysql60-server/files/patch-Docs::Makefile.in b/databases/mysql60-server/files/patch-Docs::Makefile.in index e9700bd64e46..e76340001630 100644 --- a/databases/mysql60-server/files/patch-Docs::Makefile.in +++ b/databases/mysql60-server/files/patch-Docs::Makefile.in @@ -1,21 +1,29 @@ ---- Docs/Makefile.in.orig Fri Mar 5 15:59:43 2004 -+++ Docs/Makefile.in Fri Mar 5 16:00:00 2004 -@@ -446,7 +446,7 @@ +--- Docs/Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Docs/Makefile.in Mon Jan 10 11:44:27 2005 +@@ -331,7 +331,7 @@ + check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-all: $(BUILT_SOURCES) ++all: + $(MAKE) $(AM_MAKEFLAGS) all-recursive - all: $(targets) txt_files + .SUFFIXES: +@@ -599,7 +599,7 @@ + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(infodir) --txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \ -+txt_files: ../INSTALL-SOURCE ../COPYING \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -718,7 +718,7 @@ + uninstall-info-am uninstall-info-recursive uninstall-recursive - CLEAN_FILES: $(BUILD_SOURCES) -@@ -609,9 +609,6 @@ - ../INSTALL-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing" "Tutorial" > $@ -- --../INSTALL-WIN-SOURCE: mysql.info $(GT) -- perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@ +-all: $(targets) txt_files ++all: - # We put the description for the binary installation here so that - # people who download source wont have to see it. It is moved up to + txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ + INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index 356baf88b938..df6774784d9b 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Tue Jul 27 08:14:34 2004 -+++ Makefile.in Sat Oct 23 10:39:45 2004 -@@ -293,12 +293,7 @@ +--- Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Makefile.in Mon Jan 10 11:46:31 2005 +@@ -302,12 +302,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING zlib --SUBDIRS = . include @docs_dirs@ \ + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ -- @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts man tests SSL\ -- BUILD netware os2 @libmysqld_dirs@ \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = - # Relink after clean + DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql60-server/files/patch-client::mysql.cc b/databases/mysql60-server/files/patch-client::mysql.cc deleted file mode 100644 index 7e4fdfa6f22d..000000000000 --- a/databases/mysql60-server/files/patch-client::mysql.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 -+++ client/mysql.cc Sun Oct 24 15:55:52 2004 -@@ -294,7 +294,7 @@ - HIST_ENTRY is defined for libedit, but not for the real readline - Need to redefine it for real readline to find it - */ --#if !defined(USE_LIBEDIT_INTERFACE) -+#if !defined(HAVE_HIST_ENTRY) - typedef struct _hist_entry { - const char *line; - const char *data; diff --git a/databases/mysql60-server/files/patch-sql::mysqld.cc b/databases/mysql60-server/files/patch-sql::mysqld.cc index 1d0288494fb5..c98d38bcbd10 100644 --- a/databases/mysql60-server/files/patch-sql::mysqld.cc +++ b/databases/mysql60-server/files/patch-sql::mysqld.cc @@ -1,12 +1,47 @@ ---- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003 -+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003 -@@ -104,7 +104,8 @@ +--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ + #endif /* __WIN__ */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include "mytcpd.h" + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> +@@ -136,15 +136,6 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) +-#define my_fromhost(A) fromhost(A) +-#define my_hosts_access(A) hosts_access(A) +-#define my_eval_client(A) eval_client(A) +-#else +-#define my_fromhost(A) fromhost() +-#define my_hosts_access(A) hosts_access() +-#define my_eval_client(A) eval_client() +-#endif /* __STDC__ */ + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H +@@ -3565,8 +3556,8 @@ + struct request_info req; + signal(SIGCHLD, SIG_DFL); + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +- my_fromhost(&req); +- if (!my_hosts_access(&req)) ++ fromhost(&req); ++ if (!hosts_access(&req)) + { + /* + This may be stupid but refuse() includes an exit(0) +@@ -3574,7 +3565,7 @@ + clean_exit() - same stupid thing ... + */ + syslog(deny_severity, "refused connect from %s", +- my_eval_client(&req)); ++ eval_client(&req)); + + /* + C++ sucks (the gibberish in front just translates the supplied diff --git a/databases/mysql60-server/files/patch-sql::mytcpd.h b/databases/mysql60-server/files/patch-sql::mytcpd.h new file mode 100644 index 000000000000..43afdf1cf96e --- /dev/null +++ b/databases/mysql60-server/files/patch-sql::mytcpd.h @@ -0,0 +1,147 @@ +--- 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/mysql60-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/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index be85c5051fdf..243dddbdd337 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-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 diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 187b3fa7705c..6853e8033bbe 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,23 +6,13 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.1 +PORTVERSION= 5.0.2 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ - http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ - http://www.mysql.cz/Downloads/%SUBDIR%/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ - http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ -MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot +MASTER_SITES= ${MASTER_SITE_MYSQL} +MASTER_SITE_SUBDIR= MySQL-5.0 PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -46,7 +36,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ - --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -62,11 +51,17 @@ CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET} .endif .if defined(WITH_OPENSSL) USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl +CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif +.if defined(WITHOUT_INNODB) +CONFIGURE_ARGS+=--without-innodb +.endif +.if defined(WITH_NDB) +CONFIGURE_ARGS+=--with-ndbcluster +.endif .include <bsd.port.pre.mk> @@ -115,11 +110,18 @@ CONFLICTS= mysql-server-3.* mysql-server-4.* PLIST_SUB= DB_DIR=${DB_DIR} \ VER=${PORTVERSION}-alpha +.if defined(WITH_NDB) +PLIST_SUB+= NDB="" +.else +PLIST_SUB+= NDB="@comment " +.endif MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 -DOCS= manual.html manual.txt manual_toc.html +.if !defined(NOPORTDOCS) +PORTDOCS= manual.html manual.txt manual_toc.html +.endif INFO= mysql @@ -140,6 +142,8 @@ pre-fetch: @${ECHO} " (use it if you need speed)." @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld." @${ECHO} " (use it if you need even more speed)." + @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." + @${ECHO} " WITH_NDB=yes Disable support for NDB Cluster." @${ECHO} "" post-patch: @@ -176,11 +180,10 @@ post-install: ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/Flags -.for doc in ${DOCS} + @${MKDIR} ${DOCSDIR} +.for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags .endif .else @@ -198,7 +201,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql 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|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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 @@ -217,8 +221,11 @@ USE_MYSQL= yes WANT_MYSQL_VER= 50 USE_PERL5= yes -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50 +.if ${PERL_LEVEL} <= 500800 +RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +.endif + LATEST_LINK= mysql50-scripts @@ -238,5 +245,8 @@ post-patch: @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif +# Common part +post-extract: + @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h .include <bsd.port.post.mk> diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 58e4ac6083af..4221c4f3e0f5 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea -SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 +MD5 (mysql-5.0.2-alpha.tar.gz) = 26fe5a7ca84e5c2540abf6d0a782ec36 +SIZE (mysql-5.0.2-alpha.tar.gz) = 22940908 diff --git a/databases/percona55-server/files/patch-Docs::Makefile.in b/databases/percona55-server/files/patch-Docs::Makefile.in index e9700bd64e46..e76340001630 100644 --- a/databases/percona55-server/files/patch-Docs::Makefile.in +++ b/databases/percona55-server/files/patch-Docs::Makefile.in @@ -1,21 +1,29 @@ ---- Docs/Makefile.in.orig Fri Mar 5 15:59:43 2004 -+++ Docs/Makefile.in Fri Mar 5 16:00:00 2004 -@@ -446,7 +446,7 @@ +--- Docs/Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Docs/Makefile.in Mon Jan 10 11:44:27 2005 +@@ -331,7 +331,7 @@ + check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-all: $(BUILT_SOURCES) ++all: + $(MAKE) $(AM_MAKEFLAGS) all-recursive - all: $(targets) txt_files + .SUFFIXES: +@@ -599,7 +599,7 @@ + installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(infodir) --txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \ -+txt_files: ../INSTALL-SOURCE ../COPYING \ - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -718,7 +718,7 @@ + uninstall-info-am uninstall-info-recursive uninstall-recursive - CLEAN_FILES: $(BUILD_SOURCES) -@@ -609,9 +609,6 @@ - ../INSTALL-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing" "Tutorial" > $@ -- --../INSTALL-WIN-SOURCE: mysql.info $(GT) -- perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@ +-all: $(targets) txt_files ++all: - # We put the description for the binary installation here so that - # people who download source wont have to see it. It is moved up to + txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ + INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in index 356baf88b938..df6774784d9b 100644 --- a/databases/percona55-server/files/patch-Makefile.in +++ b/databases/percona55-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Tue Jul 27 08:14:34 2004 -+++ Makefile.in Sat Oct 23 10:39:45 2004 -@@ -293,12 +293,7 @@ +--- Makefile.in.orig Wed Dec 1 01:08:19 2004 ++++ Makefile.in Mon Jan 10 11:46:31 2005 +@@ -302,12 +302,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING zlib --SUBDIRS = . include @docs_dirs@ \ + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ -- @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts man tests SSL\ -- BUILD netware os2 @libmysqld_dirs@ \ +- @thread_dirs@ pstack \ +- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = - # Relink after clean + DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/percona55-server/files/patch-client::mysql.cc b/databases/percona55-server/files/patch-client::mysql.cc deleted file mode 100644 index 7e4fdfa6f22d..000000000000 --- a/databases/percona55-server/files/patch-client::mysql.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 -+++ client/mysql.cc Sun Oct 24 15:55:52 2004 -@@ -294,7 +294,7 @@ - HIST_ENTRY is defined for libedit, but not for the real readline - Need to redefine it for real readline to find it - */ --#if !defined(USE_LIBEDIT_INTERFACE) -+#if !defined(HAVE_HIST_ENTRY) - typedef struct _hist_entry { - const char *line; - const char *data; diff --git a/databases/percona55-server/files/patch-sql::mysqld.cc b/databases/percona55-server/files/patch-sql::mysqld.cc index 1d0288494fb5..c98d38bcbd10 100644 --- a/databases/percona55-server/files/patch-sql::mysqld.cc +++ b/databases/percona55-server/files/patch-sql::mysqld.cc @@ -1,12 +1,47 @@ ---- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003 -+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003 -@@ -104,7 +104,8 @@ +--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ + #endif /* __WIN__ */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include "mytcpd.h" + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> +@@ -136,15 +136,6 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) +-#define my_fromhost(A) fromhost(A) +-#define my_hosts_access(A) hosts_access(A) +-#define my_eval_client(A) eval_client(A) +-#else +-#define my_fromhost(A) fromhost() +-#define my_hosts_access(A) hosts_access() +-#define my_eval_client(A) eval_client() +-#endif /* __STDC__ */ + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H +@@ -3565,8 +3556,8 @@ + struct request_info req; + signal(SIGCHLD, SIG_DFL); + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +- my_fromhost(&req); +- if (!my_hosts_access(&req)) ++ fromhost(&req); ++ if (!hosts_access(&req)) + { + /* + This may be stupid but refuse() includes an exit(0) +@@ -3574,7 +3565,7 @@ + clean_exit() - same stupid thing ... + */ + syslog(deny_severity, "refused connect from %s", +- my_eval_client(&req)); ++ eval_client(&req)); + + /* + C++ sucks (the gibberish in front just translates the supplied diff --git a/databases/percona55-server/files/patch-sql::mytcpd.h b/databases/percona55-server/files/patch-sql::mytcpd.h new file mode 100644 index 000000000000..981a21991dff --- /dev/null +++ b/databases/percona55-server/files/patch-sql::mytcpd.h @@ -0,0 +1,147 @@ +--- 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 be85c5051fdf..243dddbdd337 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-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 |