Remove MySQL 4.1, it has been unsupported upstream for almost 3.5 years.

Approved by:	ale

16 files changed, 0 insertions, 836 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
deleted file mode 100644
index 467c2e6221eb..000000000000
--- a/databases/mysql41-server/Makefile
+++ /dev/null
@@ -1,215 +0,0 @@
-# Created by: Alex Dupre <sysadmin@alexdupre.com>
-# $FreeBSD$
-
-PORTNAME?=	mysql
-PORTVERSION=	4.1.25
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ale
-PKGNAMESUFFIX?=	-server
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-DEPRECATED=	Unsupported upstream, no distfile
-EXPIRATION_DATE=	2013-03-31
-
-SLAVEDIRS=	databases/mysql41-client
-USE_AUTOTOOLS=	libtool
-MAKE_JOBS_SAFE=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--without-debug \
-		--without-readline \
-		--without-libedit \
-		--without-bench \
-		--without-extra-tools \
-		--with-libwrap \
-		--with-mysqlfs \
-		--with-vio \
-		--with-low-memory \
-		--with-comment='FreeBSD port: ${PKGNAME}' \
-		--enable-thread-safe-client
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
-CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
-.endif
-.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
-CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
-.endif
-.if defined(WITH_OPENSSL)
-USE_OPENSSL=	yes
-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
-.if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
-CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "arm"
-BROKEN=		Does not compile on arm
-.endif
-
-.if ${ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
-.if defined(WITH_LINUXTHREADS)
-CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
-CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
-CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
-CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread:${PORTSDIR}/devel/linuxthreads
-CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
-.else
-CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
-CFLAGS+=	${PTHREAD_CFLAGS}
-.endif
-
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-O3 -fno-omit-frame-pointer
-CFLAGS+=	-fno-gcse
-.endif
-CXXFLAGS+=	${CFLAGS} -felide-constructors -fno-rtti
-CXXFLAGS+=	-fno-exceptions
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
-USE_MYSQL=	yes
-WANT_MYSQL_VER=	41
-
-LATEST_LINK=	mysql41-server
-
-CONFLICTS=	mysql-server-[35].* mysql-server-4.[02-9].*
-
-USE_RC_SUBR=	mysql-server
-
-USERS=		mysql
-GROUPS=		mysql
-
-USES+=		bison
-
-.if defined(WITH_NDB)
-PLIST_SUB+=	NDB=""
-.else
-PLIST_SUB+=	NDB="@comment "
-.endif
-
-MAN1=		myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
-		mysqld_safe.1 mysql.server.1 perror.1 replace.1
-
-MAN8=		mysqld.8
-
-INFO=		mysql
-
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
-	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
-	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
-	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
-	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
-	@${ECHO} "	WITH_PROC_SCOPE_PTH=yes	Use process scope threads"
-	@${ECHO} "				(try it if you use libpthread)."
-	@${ECHO} "	BUILD_OPTIMIZED=yes	Enable compiler optimizations"
-	@${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		Enable support for NDB Cluster."
-	@${ECHO} ""
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
-.if defined(WITH_PROC_SCOPE_PTH)
-	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
-.endif
-
-.else
-# MySQL-Client part
-.if defined(CLIENT_ONLY)
-LATEST_LINK=	mysql41-client
-
-CONFLICTS=	mysql-client-[35].* mysql-client-4.[02-9].*
-
-MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-CONFIGURE_ARGS+=--without-server
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts @man_dirs@|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
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
-.if defined(WITH_PROC_SCOPE_PTH)
-	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
-.endif
-
-.else
-# MySQL-Scripts part
-USE_MYSQL=	yes
-WANT_MYSQL_VER=	41
-
-RUN_DEPENDS=	p5-DBD-mysql41>=0:${PORTSDIR}/databases/p5-DBD-mysql41
-.if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp
-.endif
-
-LATEST_LINK=	mysql41-scripts
-
-CONFLICTS=	mysql-scripts-[35].* mysql-scripts-4.[02-9].*
-
-MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
-		mysqld_multi.1 mysql_fix_privilege_tables.1
-
-SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
-		mysql_secure_installation mysql_zap mysqlaccess \
-		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-		mysqldumpslow mysql_explain_log mysql_tableinfo mysqld_multi
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-exec-am install-data-am|install-exec-am|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
-.endif
-.endif
-# Common part
-post-extract:
-	@${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h
-
-.if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
-pre-configure:
-	@${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL."
-	@${FALSE}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
deleted file mode 100644
index c24fd8b48686..000000000000
--- a/databases/mysql41-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mysql-4.1.25.tar.gz) = 58ec4cfdbe20f0e04e37ea0db6e31b849aa54173dc59be55b2ae6be98f65bf59
-SIZE (mysql-4.1.25.tar.gz) = 17659751
diff --git a/databases/mysql41-server/files/mysql-server.in b/databases/mysql41-server/files/mysql-server.in
deleted file mode 100644
index 5052130ec4d7..000000000000
--- a/databases/mysql41-server/files/mysql-server.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-# mysql_limits (bool):	Set to "NO" by default.
-#			Set it to yes to run `limits -e -U mysql`
-#			just before mysql starts.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-
-mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile="${mysql_dbdir}/${hostname}.pid"
-command="%%PREFIX%%/bin/mysqld_safe"
-command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null 2>&1 &"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--ldata=${mysql_dbdir}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-	if checkyesno mysql_limits; then
-		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-	else
-		return 0
-	fi
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql41-server/files/patch-Docs::Makefile.in b/databases/mysql41-server/files/patch-Docs::Makefile.in
deleted file mode 100644
index 803cbea560a2..000000000000
--- a/databases/mysql41-server/files/patch-Docs::Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Docs/Makefile.in.orig	Wed Nov 30 21:37:04 2005
-+++ Docs/Makefile.in	Thu Dec 22 16:03:51 2005
-@@ -324,7 +324,7 @@
- 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
- 
- GT = $(srcdir)/Support/generate-text-files.pl
--all: all-am
-+all:
- 
- .SUFFIXES:
- $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -410,7 +410,7 @@
- install-data: install-data-am
- uninstall: uninstall-am
- 
--install-am: all-am
-+install-am:
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- 
- installcheck: installcheck-am
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in
deleted file mode 100644
index 91e8c1ba718b..000000000000
--- a/databases/mysql41-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig	Thu Dec 22 16:04:09 2005
-+++ Makefile.in	Thu Dec 22 16:04:29 2005
-@@ -348,12 +348,7 @@
- EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- 			README COPYING EXCEPTIONS-CLIENT
- 
--SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
--			@readline_topdir@ sql-common \
--			@thread_dirs@ pstack \
--			@sql_union_dirs@ scripts @man_dirs@ tests \
--			netware @libmysqld_dirs@ \
--			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
-+SUBDIRS =
- 
- DIST_SUBDIRS = . include @docs_dirs@ zlib \
- 			@readline_topdir@ sql-common \
diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure
deleted file mode 100644
index d2825b9a2083..000000000000
--- a/databases/mysql41-server/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	Fri Jul  2 11:24:14 2004
-+++ configure	Fri Jul  2 11:24:37 2004
-@@ -18829,8 +18829,6 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- # Prevent multiple expansion
- 
-@@ -23783,8 +23781,8 @@
- # Some system specific hacks
- #
- 
--MAX_C_OPTIMIZE="-O3"
--MAX_CXX_OPTIMIZE="-O3"
-+MAX_C_OPTIMIZE=""
-+MAX_CXX_OPTIMIZE=""
- 
- case $SYSTEM_TYPE in
-   *solaris2.7*)
diff --git a/databases/mysql41-server/files/patch-man::Makefile.in b/databases/mysql41-server/files/patch-man::Makefile.in
deleted file mode 100644
index e9972576782d..000000000000
--- a/databases/mysql41-server/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig	Fri Nov  3 03:18:34 2006
-+++ man/Makefile.in	Mon Nov 27 23:01:29 2006
-@@ -327,8 +327,8 @@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
- zlib_dir = @zlib_dir@
--man1_MANS = @man1_files@
--man8_MANS = @man8_files@
-+man1_MANS =
-+man8_MANS =
- EXTRA_DIST = $(man1_MANS) $(man8_MANS)
- all: all-am
- 
diff --git a/databases/mysql41-server/files/patch-mysys_default.c b/databases/mysql41-server/files/patch-mysys_default.c
deleted file mode 100644
index 5061f9df6801..000000000000
--- a/databases/mysql41-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mysys/default.c.orig	Fri Apr  8 10:48:24 2005
-+++ mysys/default.c	Fri Apr  8 10:53:25 2005
-@@ -49,9 +49,7 @@
- "sys:/etc/",
- #else
- "/etc/",
--#endif
--#ifdef DATADIR
--DATADIR,
-+"%%PREFIX%%/etc/",
- #endif
- "",					/* Place for defaults_extra_dir */
- #if !defined(__WIN__) && !defined(__NETWARE__)
diff --git a/databases/mysql41-server/files/patch-ndb::src::mgmclient::main.cpp b/databases/mysql41-server/files/patch-ndb::src::mgmclient::main.cpp
deleted file mode 100644
index ef1f6711f469..000000000000
--- a/databases/mysql41-server/files/patch-ndb::src::mgmclient::main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ndb/src/mgmclient/main.cpp.orig	Mon Jan 10 15:36:57 2005
-+++ ndb/src/mgmclient/main.cpp	Mon Jan 10 15:37:26 2005
-@@ -122,7 +122,7 @@
-   }
- #ifdef HAVE_READLINE
-   /* Get a line from the user. */
--  line_read = readline (prompt);    
-+  line_read = readline ((char *)prompt);    
-   /* If the line has any text in it, save it on the history. */
-   if (line_read && *line_read)
-     add_history (line_read);
diff --git a/databases/mysql41-server/files/patch-scripts::Makefile.in b/databases/mysql41-server/files/patch-scripts::Makefile.in
deleted file mode 100644
index b552bc1610a2..000000000000
--- a/databases/mysql41-server/files/patch-scripts::Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- scripts/Makefile.in.orig	Fri Jul 15 12:40:26 2005
-+++ scripts/Makefile.in	Sat Jul 23 11:14:03 2005
-@@ -322,24 +322,7 @@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
- zlib_dir = @zlib_dir@
--bin_SCRIPTS = @server_scripts@ \
--			msql2mysql \
--			mysql_config \
--			mysql_fix_privilege_tables \
--			mysql_fix_extensions \
--			mysql_setpermission \
--			mysql_secure_installation \
--			mysql_zap \
--			mysqlaccess \
--			mysqlbug \
--			mysql_convert_table_format \
--			mysql_find_rows \
--			mysqlhotcopy \
--			mysqldumpslow \
--			mysql_explain_log \
--			mysql_tableinfo \
--			mysqld_multi \
--			mysql_create_system_tables
-+bin_SCRIPTS =
- 
- EXTRA_SCRIPTS = make_binary_distribution.sh \
- 			make_sharedlib_distribution.sh \
-@@ -369,7 +352,7 @@
- 			mysqlaccess.conf \
- 			mysqlbug
- 
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
-+dist_pkgdata_DATA =
- 
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc
deleted file mode 100644
index e79f985fcb69..000000000000
--- a/databases/mysql41-server/files/patch-sql::mysqld.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
diff --git a/databases/mysql41-server/files/patch-sql::mytcpd.h b/databases/mysql41-server/files/patch-sql::mytcpd.h
deleted file mode 100644
index 466e189f2dd0..000000000000
--- a/databases/mysql41-server/files/patch-sql::mytcpd.h
+++ /dev/null
@@ -1,147 +0,0 @@
---- sql/mytcpd.h.orig	Sun Jan  9 13:33:51 2005
-+++ sql/mytcpd.h	Sun Jan  9 13:41:42 2005
-@@ -6,6 +6,25 @@
-   * $FreeBSD: /tmp/pcvs/ports/databases/mysql41-server/files/patch-sql::mytcpd.h,v 1.1 2005-01-10 08:53:10 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/mysql41-server/pkg-descr b/databases/mysql41-server/pkg-descr
deleted file mode 100644
index 6793f7c028d2..000000000000
--- a/databases/mysql41-server/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
deleted file mode 100644
index 2d2241699ad8..000000000000
--- a/databases/mysql41-server/pkg-plist
+++ /dev/null
@@ -1,195 +0,0 @@
-@stopdaemon mysql-server
-bin/comp_err
-bin/isamchk
-bin/isamlog
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_create_system_tables
-bin/mysql_install_db
-bin/mysql_tzinfo_to_sql
-bin/mysql_waitpid
-bin/mysqld_safe
-%%NDB%%bin/ndb_config
-%%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_size.pl
-%%NDB%%bin/ndb_test_platform
-%%NDB%%bin/ndb_waiter
-bin/pack_isam
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters_debug.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_debug.h
-%%NDB%%include/mysql/ndb/ndb_init.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/NdbIndexScanOperation.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/ndb_cluster_connection.hpp
-%%NDB%%include/mysql/ndb/ndbapi/ndb_opt_defaults.h
-%%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
-lib/mysql/libmyisam.a
-lib/mysql/libmyisammrg.a
-lib/mysql/libmystrings.a
-lib/mysql/libmysys.a
-%%NDB%%lib/mysql/libndbclient.a
-%%NDB%%lib/mysql/libndbclient.la
-%%NDB%%lib/mysql/libndbclient.so
-%%NDB%%lib/mysql/libndbclient.so.1
-lib/mysql/libnisam.a
-lib/mysql/libvio.a
-libexec/mysqld
-%%NDB%%libexec/ndb_cpcd
-%%NDB%%libexec/ndb_mgmd
-%%NDB%%libexec/ndbd
-%%DATADIR%%/binary-configure
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/czech/errmsg.txt
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/danish/errmsg.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/dutch/errmsg.txt
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/english/errmsg.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/estonian/errmsg.txt
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/french/errmsg.txt
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/german/errmsg.txt
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/greek/errmsg.txt
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.txt
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/italian/errmsg.txt
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/japanese/errmsg.txt
-%%DATADIR%%/japanese-sjis/errmsg.sys
-%%DATADIR%%/japanese-sjis/errmsg.txt
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/korean/errmsg.txt
-%%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
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/ndb-config-2-node.ini
-%%NDB%%%%DATADIR%%/ndb_size.tmpl
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian-ny/errmsg.txt
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.txt
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/polish/errmsg.txt
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.txt
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/romanian/errmsg.txt
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/russian/errmsg.txt
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.txt
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/slovak/errmsg.txt
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/spanish/errmsg.txt
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.txt
-%%DATADIR%%/ukrainian/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.txt
-%%NDB%%@dirrm include/mysql/ndb/mgmapi
-%%NDB%%@dirrm include/mysql/ndb/ndbapi
-%%NDB%%@dirrm include/mysql/ndb
-%%NDB%%@dirrmtry include/mysql
-@dirrmtry lib/mysql
-@dirrm %%DATADIR%%/charsets
-@dirrm %%DATADIR%%/czech
-@dirrm %%DATADIR%%/danish
-@dirrm %%DATADIR%%/dutch
-@dirrm %%DATADIR%%/english
-@dirrm %%DATADIR%%/estonian
-@dirrm %%DATADIR%%/french
-@dirrm %%DATADIR%%/german
-@dirrm %%DATADIR%%/greek
-@dirrm %%DATADIR%%/hungarian
-@dirrm %%DATADIR%%/italian
-@dirrm %%DATADIR%%/japanese
-@dirrm %%DATADIR%%/japanese-sjis
-@dirrm %%DATADIR%%/korean
-@dirrm %%DATADIR%%/norwegian
-@dirrm %%DATADIR%%/norwegian-ny
-@dirrm %%DATADIR%%/polish
-@dirrm %%DATADIR%%/portuguese
-@dirrm %%DATADIR%%/romanian
-@dirrm %%DATADIR%%/russian
-@dirrm %%DATADIR%%/serbian
-@dirrm %%DATADIR%%/slovak
-@dirrm %%DATADIR%%/spanish
-@dirrm %%DATADIR%%/swedish
-@dirrm %%DATADIR%%/ukrainian
-@dirrmtry %%DATADIR%%
diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client
deleted file mode 100644
index 556634e6ed8a..000000000000
--- a/databases/mysql41-server/pkg-plist.client
+++ /dev/null
@@ -1,55 +0,0 @@
-bin/mysql
-bin/mysql_config
-bin/mysql_fix_privilege_tables
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlbug
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlmanager-pwgen
-bin/mysqlmanagerc
-bin/mysqlshow
-bin/mysqltest
-include/mysql/abi_check
-include/mysql/errmsg.h
-include/mysql/keycache.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_no_pthread.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
-include/mysql/raid.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.la
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.14
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.la
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.14
-%%DATADIR%%/mysql_fix_privilege_tables.sql
-@dirrm include/mysql
-@dirrm lib/mysql
-@dirrm %%DATADIR%%
diff --git a/databases/mysql41-server/pkg-plist.scripts b/databases/mysql41-server/pkg-plist.scripts
deleted file mode 100644
index f77f27a1839c..000000000000
--- a/databases/mysql41-server/pkg-plist.scripts
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/msql2mysql
-bin/mysql_convert_table_format
-bin/mysql_explain_log
-bin/mysql_find_rows
-bin/mysql_fix_extensions
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tableinfo
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqld_multi
-bin/mysqldumpslow
-bin/mysqlhotcopy