Remove mysql-server and mysql-client (versions 4.0.26), because

1) they will not be maintained anymore
2) their package directory names where confusing (mysql4-* have a more
   recent version)
These package directories may be used for meta-pkgs in the future (pulling
in the latest mysql?-* packages).

26 files changed, 0 insertions, 1046 deletions

diff --git a/databases/mysql-client/DESCR b/databases/mysql-client/DESCR
deleted file mode 100644
index 23500c3f7ba..00000000000
--- a/databases/mysql-client/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-MySQL is a SQL (Structured Query Language) database server.  SQL is the
-most popular database language in the world.  MySQL is a client-server
-implementation that consists of a server daemon `mysqld' and many
-different client programs/libraries.
-
-The main goals of MySQL are speed and robustness.
-
-The base upon which MySQL is built is a set of routines that have been
-used in a highly demanding production environment for many years.  While
-MySQL is still in development it already offers a rich and highly useful
-function set.
-
-The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
-
-This package contains the MySQL client programs and libraries.
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
deleted file mode 100644
index b585f747414..00000000000
--- a/databases/mysql-client/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2005/04/11 21:45:12 tv Exp $
-
-PKGNAME=		${DISTNAME:S/-/-client-/}
-SVR4_PKGNAME=		mysqc
-COMMENT=		MySQL 4, a free SQL database (client)
-
-CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
-
-.include "Makefile.common"
-
-CONFIGURE_ARGS+=	--without-extra-tools
-CONFIGURE_ARGS+=	--without-server
-CONFIGURE_ARGS+=	--enable-thread-safe-client
-UNWRAP_FILES=		scripts/mysql_config
-
-INFO_FILES=		mysql.info
-MESSAGE_SRC=		${.CURDIR}/../mysql4-client/MESSAGE
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql
-.for f in huge large innodb-heavy-4G small medium
-	${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
-		${PREFIX}/share/examples/mysql/my-${f}.cnf
-.endfor
-
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
deleted file mode 100644
index da2c2c13f05..00000000000
--- a/databases/mysql-client/Makefile.common
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD: Makefile.common,v 1.52 2005/12/05 23:55:04 rillig Exp $
-
-DISTNAME=		mysql-4.0.26
-CATEGORIES=		databases
-MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
-			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
-			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-4.0/
-
-MAINTAINER=		xtraeme@NetBSD.org
-HOMEPAGE=		http://www.mysql.com/
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-
-.include "../../mk/bsd.prefs.mk"
-
-EXTRACT_USING=		pax
-
-# MYSQL_USER		username of the database administrator
-# MYSQL_GROUP		group of the database administrator
-# MYSQL_DATADIR		home directory of the database administrator and
-#			location of the databases
-MYSQL_USER?=		mysql
-MYSQL_GROUP?=		mysql
-MYSQL_DATADIR?=		${VARBASE}/mysql
-
-# MYSQL_CHARSET		default character set
-# MYSQL_EXTRA_CHARSET	additional character set to be compiled in.
-#
-MYSQL_CHARSET?=		latin1
-MYSQL_EXTRA_CHARSET?=	all
-
-CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR:Q}
-CONFIGURE_ARGS+=	--with-named-z-libs=z
-CONFIGURE_ARGS+=	--without-libwrap
-CONFIGURE_ARGS+=	--with-named-curses-libs="-lcurses -ltermcap"
-
-# We always use our own readline, either system- or pkgsrc-supplied.
-CONFIGURE_ARGS+=	--without-readline
-
-# This forces mysql.info _not_ to be rebuilt.
-CONFIGURE_ARGS+=	--without-docs
-
-# Speed up production one-time builds; see "./configure --help" for
-# more information on using or disabling this option.
-CONFIGURE_ARGS+=	--disable-dependency-tracking
-
-CONFIGURE_ARGS+=	--without-debug
-CONFIGURE_ARGS+=	--without-bench
-CONFIGURE_ARGS+=	--with-low-memory
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=	--with-vio
-
-CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET:Q}
-CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q}
-
-.if !empty(MACHINE_ARCH:Mi386)
-CONFIGURE_ARGS+=	--enable-assembler
-.endif
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=		F77=${FALSE:Q}
-
-CPPFLAGS+=		-Dunix
-CFLAGS+=		-DUSE_OLD_FUNCTIONS # 3.23.x compat
-
-# force HAVE_CURSES_H on Solaris since the configure script is broken
-# and does not properly detect this, breaking the build later on.
-CFLAGS.SunOS+=		-DHAVE_CURSES_H
-CXXFLAGS.SunOS+=	-DHAVE_CURSES_H
-
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
-CFLAGS+=	-DSIGNALS_DONT_BREAK_READ
-CXXFLAGS+=	-DSIGNALS_DONT_BREAK_READ
-CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
-CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
-.endif
-
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake perl:run
-LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
-
-SUBST_CLASSES+=		mk scripts
-SUBST_STAGE.mk=		post-extract
-SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
-			merge/Makefile.in mysys/Makefile.in \
-			strings/Makefile.in
-SUBST_SED.mk=		-e "/^install-exec:/s/install-pkglibLIBRARIES//"
-SUBST_MESSAGE.mk=	"Fixing Makefiles."
-SUBST_STAGE.scripts=	post-extract
-SUBST_FILES.scripts=	scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
-			scripts/mysql_secure_installation.sh \
-			support-files/mysql.server.sh
-SUBST_SED.scripts=	-e "s,chown,${CHOWN},g" \
-			-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
-SUBST_MESSAGE.scripts=	"Fixing scripts."
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST
deleted file mode 100644
index 7e09b1282c5..00000000000
--- a/databases/mysql-client/PLIST
+++ /dev/null
@@ -1,65 +0,0 @@
-@comment $NetBSD: PLIST,v 1.16 2005/09/27 00:13:29 xtraeme Exp $
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_explain_log
-bin/mysql_find_rows
-bin/mysql_fix_privilege_tables
-bin/mysql_setpermission
-bin/mysql_tableinfo
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlbug
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlmanager-pwgen
-bin/mysqlmanagerc
-bin/mysqlshow
-bin/mysqltest
-include/mysql/errmsg.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_semaphore.h
-include/mysql/my_sys.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
-include/mysql/raid.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-lib/mysql/libmysqlclient.la
-lib/mysql/libmysqlclient_r.la
-man/man1/mysql.1
-man/man1/mysql_fix_privilege_tables.1
-man/man1/mysql_zap.1
-man/man1/mysqlaccess.1
-man/man1/mysqladmin.1
-man/man1/mysqldump.1
-man/man1/mysqlshow.1
-share/examples/mysql/my-huge.cnf
-share/examples/mysql/my-innodb-heavy-4G.cnf
-share/examples/mysql/my-large.cnf
-share/examples/mysql/my-medium.cnf
-share/examples/mysql/my-small.cnf
-@dirrm share/examples/mysql
-@dirrm lib/mysql
-@dirrm include/mysql
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
deleted file mode 100644
index 6dc8fc35472..00000000000
--- a/databases/mysql-client/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.15 2005/08/12 16:15:03 salo Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	mysql-client
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
-BUILDLINK_PACKAGES+=	mysql-client
-
-.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.0.18nb1
-BUILDLINK_RECOMMENDED.mysql-client?=	mysql-client>=4.0.24
-BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
-BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
-BUILDLINK_INCDIRS.mysql-client?=	include/mysql
-.endif	# MYSQL_CLIENT_BUILDLINK3_MK
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo
deleted file mode 100644
index f068afa4d46..00000000000
--- a/databases/mysql-client/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.21 2005/12/06 19:31:24 joerg Exp $
-
-SHA1 (mysql-4.0.26.tar.gz) = e644df3568a3aa07ede2282bf5d2d9fd9adb865f
-RMD160 (mysql-4.0.26.tar.gz) = 274777aa46091618c8957aa42397d3e42d5318b4
-Size (mysql-4.0.26.tar.gz) = 11144366 bytes
-SHA1 (patch-af) = 0183b07640ccb41ae612e089d96b901dcf75a9b9
-SHA1 (patch-av) = 684c1e2ff1f96652225045653c25707850fe0ff2
-SHA1 (patch-aw) = 23d54ceddd0631aa93b32666853965a5fc7bdfab
-SHA1 (patch-ax) = 49c803e55f483827507b596d695327c2deec81fb
diff --git a/databases/mysql-client/patches/patch-af b/databases/mysql-client/patches/patch-af
deleted file mode 100644
index 6836bb36d44..00000000000
--- a/databases/mysql-client/patches/patch-af
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-af,v 1.11 2005/12/06 19:31:24 joerg Exp $
-
---- configure.orig	2004-11-08 20:11:05.000000000 +0100
-+++ configure	2004-11-08 20:12:44.000000000 +0100
-@@ -20819,7 +20819,7 @@ then
-   FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
- else
-   case $SYSTEM_TYPE in
--    *freebsd*)
-+    *freebsd*|*dragonfly*)
-       FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
-       ;;
-     *darwin*)
-@@ -23938,10 +23938,7 @@ int main(int argv, char **argc)
-   return 0;
- }
- 
--int link_test()
--{
-   return compress(0, (unsigned long*) 0, "", 0);
--}
- 
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -24891,6 +24888,9 @@ case $SYSTEM_TYPE in
-       MAX_C_OPTIMIZE="-O"
-     fi
-     ;;
-+  *dragonfly*)
-+    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
-     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
-@@ -34070,34 +34070,10 @@ else
-   mysqlfs=no
- fi;
- 
--
--echo "$as_me:$LINENO: checking for ORBit" >&5
--echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
--orbit_config_path=`which orbit-config`
--if test -n "$orbit_config_path" -a $? = 0
--then
--  orbit_exec_prefix=`orbit-config --exec-prefix`
--  orbit_includes=`orbit-config --cflags server`
--  orbit_libs=`orbit-config --libs server`
--  orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
--  echo "$as_me:$LINENO: result: found!" >&5
--echo "${ECHO_T}found!" >&6
--  cat >>confdefs.h <<\_ACEOF
--#define HAVE_ORBIT 1
--_ACEOF
--
--else
-   orbit_exec_prefix=
-   orbit_includes=
-   orbit_libs=
-   orbit_idl=
--  echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--fi
--
--
--
--
- 
-   echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
- echo $ECHO_N "checking if we should build MySQLFS... $ECHO_C" >&6
-@@ -34370,7 +34346,7 @@ then
- else
-   bench_dirs=""
- fi
--bench_dirs="$bench_dirs mysql-test"
-+#bench_dirs="$bench_dirs mysql-test"
- 
- 
- # Don't build readline, i have it already
diff --git a/databases/mysql-client/patches/patch-av b/databases/mysql-client/patches/patch-av
deleted file mode 100644
index f56a46df370..00000000000
--- a/databases/mysql-client/patches/patch-av
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
-
---- Makefile.in.orig	2004-11-09 06:37:21.000000000 +0100
-+++ Makefile.in	2004-11-09 06:37:48.000000000 +0100
-@@ -280,12 +280,7 @@
- 
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
--SUBDIRS = . include @docs_dirs@ @readline_dir@ \
--			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts @man_dirs@ tests \
--			BUILD netware os2 @libmysqld_dirs@ \
--			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
--
-+SUBDIRS = . include @sql_client_dirs@ scripts man
- 
- # Relink after clean
- linked_sources = linked_client_sources linked_server_sources \
diff --git a/databases/mysql-client/patches/patch-aw b/databases/mysql-client/patches/patch-aw
deleted file mode 100644
index dd9a99d0c64..00000000000
--- a/databases/mysql-client/patches/patch-aw
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2005/01/20 14:17:15 xtraeme Exp $
-
---- man/Makefile.in.orig	2005-01-20 14:49:43.000000000 +0100
-+++ man/Makefile.in	2005-01-20 14:50:07.000000000 +0100
-@@ -290,9 +290,8 @@
- uname_prog = @uname_prog@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
--man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
--		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
--		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
-+man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
-+		mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
- 
- EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
- 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql-client/patches/patch-ax b/databases/mysql-client/patches/patch-ax
deleted file mode 100644
index be2bb74607f..00000000000
--- a/databases/mysql-client/patches/patch-ax
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ax,v 1.3 2005/09/27 00:13:29 xtraeme Exp $
-
---- scripts/Makefile.in.orig	2005-09-27 01:53:28.000000000 +0200
-+++ scripts/Makefile.in	2005-09-27 01:53:56.000000000 +0200
-@@ -289,23 +289,10 @@
- uname_prog = @uname_prog@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
--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
-+bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
-+		mysql_setpermission mysql_zap mysqlaccess mysqlbug \
-+		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-+		mysqldumpslow mysql_explain_log mysql_tableinfo
- 
- noinst_SCRIPTS = make_binary_distribution \
- 			make_sharedlib_distribution \
diff --git a/databases/mysql-server/DEINSTALL b/databases/mysql-server/DEINSTALL
deleted file mode 100644
index f65239b7d27..00000000000
--- a/databases/mysql-server/DEINSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.6 2004/10/29 10:41:03 tron Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	if [ -d @MYSQL_DATADIR@ ]; then
-		${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, and you don't
-wish to preserve your existing databases, then you may remove the
-following directory:
-
-	@MYSQL_DATADIR@
-===========================================================================
-EOF
-	fi
-esac
diff --git a/databases/mysql-server/DESCR b/databases/mysql-server/DESCR
deleted file mode 100644
index 02b7abc487b..00000000000
--- a/databases/mysql-server/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-MySQL is a SQL (Structured Query Language) database server.  SQL is the
-most popular database language in the world.  MySQL is a client-server
-implementation that consists of a server daemon `mysqld' and many
-different client programs/libraries.
-
-The main goals of MySQL are speed and robustness.
-
-The base upon which MySQL is built is a set of routines that have been
-used in a highly demanding production environment for many years.  While
-MySQL is still in development it already offers a rich and highly useful
-function set.
-
-The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
-
-This package contains the MySQL server programs and libraries.
diff --git a/databases/mysql-server/MESSAGE b/databases/mysql-server/MESSAGE
deleted file mode 100644
index 50ef151f2dd..00000000000
--- a/databases/mysql-server/MESSAGE
+++ /dev/null
@@ -1,31 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.11 2005/09/28 14:15:49 rillig Exp $
-
-The MySQL directory `${MYSQL_DATADIR}' should be owned by the user
-`${MYSQL_USER}' and group `${MYSQL_GROUP}'.  This can be done with:
-
-  chown -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
-
-If this is a new installation, you will likely want to set up the
-initial database tables by using the following command:
-
-  ${PREFIX}/bin/mysql_install_db --user=${MYSQL_USER}
-
-After the tables are set up and the MySQL server is running,
-please remember to set a password for the MySQL root user!
-This is done by running both:
-
-  ${PREFIX}/bin/mysqladmin -u root -p password 'new-password'
-  ${PREFIX}/bin/mysqladmin -h `hostname` -u root -p password 'new-password'
-
-The "Enter password:" prompt is asking for the existing password.
-As there is no existing password, just press the Return key.
-
-There is a script distributed with MySQL that can help you lock down
-an installation.  This script has been installed to
-
-  ${PREFIX}/bin/mysql_secure_installation.
-
-Please see the manual and the MySQL web site for more instructions.
-
-===========================================================================
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
deleted file mode 100644
index c7a319bc228..00000000000
--- a/databases/mysql-server/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.69 2005/12/29 06:21:35 jlam Exp $
-
-PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
-SVR4_PKGNAME=		mysqs
-COMMENT=		MySQL 4, a free SQL database (server)
-
-CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
-
-.include "../../databases/mysql-client/Makefile.common"
-
-
-CONFIGURE_ARGS+=	--with-libwrap
-CONFIGURE_ARGS+=	--with-raid
-CONFIGURE_ARGS+=	--without-berkeley-db
-CONFIGURE_ARGS+=	--without-mysqlfs
-CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
-
-PTHREAD_OPTS+=		require
-CONFIGURE_ARGS+=	--with-pthreads
-
-DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
-
-PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
-PKG_GROUPS=		${MYSQL_GROUP}
-RCD_SCRIPTS=		mysqld
-
-FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
-			MYSQL_DATADIR=${MYSQL_DATADIR:Q} \
-			MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q}
-MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
-			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
-BUILD_DEFS+=		MYSQL_DATADIR
-BUILD_DIRS=		${WRKSRC} ${WRKSRC}/man
-
-.include "../../databases/mysql-client/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-
-post-configure:
-	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
-
-post-build:
-	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
-		${MAKE_FLAGS} mysqld_safe mysql_install_db
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
-		${PREFIX}/bin/mysql_secure_installation
-	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1
-	#${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-server/PLIST b/databases/mysql-server/PLIST
deleted file mode 100644
index 867782cdc5e..00000000000
--- a/databases/mysql-server/PLIST
+++ /dev/null
@@ -1,128 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2005/05/02 20:33:58 reed Exp $
-bin/comp_err
-bin/isamchk
-bin/isamlog
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql.server
-bin/mysql_install
-bin/mysql_install_db
-bin/mysql_secure_installation
-bin/mysql_waitpid
-bin/mysqld_safe
-bin/pack_isam
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-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
-lib/mysql/libnisam.a
-lib/mysql/libvio.a
-libexec/mysqld
-man/man1/mysqld.1
-man/man1/mysqld_multi.1
-@comment man/man1/mysqld_safe.1
-share/examples/rc.d/mysqld
-share/mysql/charsets/Index
-share/mysql/charsets/README
-share/mysql/charsets/cp1251.conf
-share/mysql/charsets/cp1257.conf
-share/mysql/charsets/croat.conf
-share/mysql/charsets/danish.conf
-share/mysql/charsets/dec8.conf
-share/mysql/charsets/dos.conf
-share/mysql/charsets/estonia.conf
-share/mysql/charsets/german1.conf
-share/mysql/charsets/greek.conf
-share/mysql/charsets/hebrew.conf
-share/mysql/charsets/hp8.conf
-share/mysql/charsets/hungarian.conf
-share/mysql/charsets/koi8_ru.conf
-share/mysql/charsets/koi8_ukr.conf
-share/mysql/charsets/latin1.conf
-share/mysql/charsets/latin2.conf
-share/mysql/charsets/latin5.conf
-share/mysql/charsets/swe7.conf
-share/mysql/charsets/usa7.conf
-share/mysql/charsets/win1250.conf
-share/mysql/charsets/win1251.conf
-share/mysql/charsets/win1251ukr.conf
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/danish/errmsg.sys
-share/mysql/danish/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
-share/mysql/english/errmsg.sys
-share/mysql/english/errmsg.txt
-share/mysql/estonian/errmsg.sys
-share/mysql/estonian/errmsg.txt
-share/mysql/french/errmsg.sys
-share/mysql/french/errmsg.txt
-share/mysql/german/errmsg.sys
-share/mysql/german/errmsg.txt
-share/mysql/greek/errmsg.sys
-share/mysql/greek/errmsg.txt
-share/mysql/hungarian/errmsg.sys
-share/mysql/hungarian/errmsg.txt
-share/mysql/italian/errmsg.sys
-share/mysql/italian/errmsg.txt
-share/mysql/japanese/errmsg.sys
-share/mysql/japanese/errmsg.txt
-share/mysql/korean/errmsg.sys
-share/mysql/korean/errmsg.txt
-share/mysql/mi_test_all
-share/mysql/mi_test_all.res
-share/mysql/mysql.server
-share/mysql/norwegian-ny/errmsg.sys
-share/mysql/norwegian-ny/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/portuguese/errmsg.sys
-share/mysql/portuguese/errmsg.txt
-share/mysql/romanian/errmsg.sys
-share/mysql/romanian/errmsg.txt
-share/mysql/russian/errmsg.sys
-share/mysql/russian/errmsg.txt
-share/mysql/slovak/errmsg.sys
-share/mysql/slovak/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/ukrainian/errmsg.sys
-share/mysql/ukrainian/errmsg.txt
-@dirrm share/mysql/ukrainian
-@dirrm share/mysql/swedish
-@dirrm share/mysql/spanish
-@dirrm share/mysql/slovak
-@dirrm share/mysql/russian
-@dirrm share/mysql/romanian
-@dirrm share/mysql/portuguese
-@dirrm share/mysql/polish
-@dirrm share/mysql/norwegian-ny
-@dirrm share/mysql/norwegian
-@dirrm share/mysql/korean
-@dirrm share/mysql/japanese
-@dirrm share/mysql/italian
-@dirrm share/mysql/hungarian
-@dirrm share/mysql/greek
-@dirrm share/mysql/german
-@dirrm share/mysql/french
-@dirrm share/mysql/estonian
-@dirrm share/mysql/english
-@dirrm share/mysql/dutch
-@dirrm share/mysql/danish
-@dirrm share/mysql/czech
-@dirrm share/mysql/charsets
diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo
deleted file mode 100644
index d306651383e..00000000000
--- a/databases/mysql-server/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.33 2006/01/05 19:02:36 joerg Exp $
-
-SHA1 (mysql-4.0.26.tar.gz) = e644df3568a3aa07ede2282bf5d2d9fd9adb865f
-RMD160 (mysql-4.0.26.tar.gz) = 274777aa46091618c8957aa42397d3e42d5318b4
-Size (mysql-4.0.26.tar.gz) = 11144366 bytes
-SHA1 (patch-aa) = d753d777adfa3d1357a285c0c18dfd0f6fc988b6
-SHA1 (patch-af) = 37923c2ddba738764836e3759c3164d0bda6da32
-SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
-SHA1 (patch-am) = 9b65fe456c25a45270cf73ab712191b1f7924ce7
-SHA1 (patch-aq) = 899f90143ed9f36b769e099cadd01b867423d3d7
-SHA1 (patch-ar) = d7c44e5bbed3c58e7516de5e155a82417818a39a
-SHA1 (patch-as) = 54ba4f676dff7ffa4cd7ab7ed7960316ec9ae41d
-SHA1 (patch-aw) = c82aa82430b42eaed2b6f4d588306e663e386ce1
-SHA1 (patch-ax) = 29b3087d240dbbb8a780816a115759994c6f4639
diff --git a/databases/mysql-server/files/mysqld.sh b/databases/mysql-server/files/mysqld.sh
deleted file mode 100644
index 4f3d7164aa5..00000000000
--- a/databases/mysql-server/files/mysqld.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mysqld.sh,v 1.5 2005/10/03 14:34:48 xtraeme Exp $
-#
-# PROVIDE: mysqld
-# REQUIRE: DAEMON LOGIN mountall
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start MySQL:
-#
-# mysqld=YES
-#
-# The following variables are optional:
-#
-#       mysqld_user="mysql"		# user to run mysqld as
-#       mysqld_datadir="/path/to/home"	# path to MySQL database directory
-#
-
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
-
-name="mysqld"
-rcvar=${name}
-command="@PREFIX@/bin/mysqld_safe"
-procname="@PREFIX@/libexec/${name}"
-: ${mysqld_user:=@MYSQL_USER@}
-: ${mysqld_group:=@MYSQL_GROUP@}
-: ${mysqld_datadir:=@MYSQL_DATADIR@}
-pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
-
-extra_commands="initdb"
-initdb_cmd="mysqld_initdb"
-start_precmd="mysqld_precmd"
-start_cmd="mysqld_start"
-
-mysqld_precmd()
-{
-	if [ ! -d ${mysqld_datadir} ]; then
-		mysqld_initdb
-	fi
-}
-
-mysqld_initdb()
-{
-	initdb="@PREFIX@/bin/mysql_install_db"
-	if [ ! -x ${initdb} ]; then
-		return 1
-	fi
-	if [ -f ${mysqld_datadir}/mysql/host.frm ]; then
-		@ECHO@ "The MySQL database has already been initialized."
-		@ECHO@ "Skipping database initialization."
-	else
-		@ECHO@ "Initializing MySQL database system tables."
-		${initdb} --force --user=${mysqld_user} \
-			  --datadir=${mysqld_datadir} || return 1
-		if [ -d ${mysqld_datadir} ]; then
-			@CHOWN@ -R ${mysqld_user}:${mysqld_group} \
-				${mysqld_datadir}
-		fi
-	fi
-}
-
-mysqld_start()
-{
-	for f in $required_files; do
-		if [ ! -r "$f" ]; then
-			@ECHO@ 1>&2 "$0: WARNING: $f is not readable"
-			if [ -z $rc_force ]; then
-				return 1
-			fi
-		fi
-	done
-	@ECHO@ "Starting ${name}."
-	ulimit -n 4096
-	cd @PREFIX@
-	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
-		   --pid-file=${pidfile} ${mysqld_flags} &
-}
-
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	if [ -f /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
-	case "$1" in
-	initdb)
-		eval ${initdb_cmd}
-		;;
-	stop)
-		if [ -r "${pidfile}" ]; then
-			@ECHO@ "Stopping ${name}."
-			kill `@CAT@ ${pidfile}`
-		fi
-		;;
-	*)
-		eval ${start_precmd}
-		eval ${start_cmd}
-		;;
-	esac
-fi
diff --git a/databases/mysql-server/patches/patch-aa b/databases/mysql-server/patches/patch-aa
deleted file mode 100644
index 76be96247ea..00000000000
--- a/databases/mysql-server/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2004/11/09 06:11:48 xtraeme Exp $
-
---- Makefile.in.orig	2004-11-09 06:53:52.000000000 +0100
-+++ Makefile.in	2004-11-09 06:54:21.000000000 +0100
-@@ -280,12 +280,8 @@
- 
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
--SUBDIRS = . include @docs_dirs@ @readline_dir@ \
--			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts @man_dirs@ tests \
--			BUILD netware os2 @libmysqld_dirs@ \
--			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
--
-+SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \
-+	  @bench_dirs@ support-files
- 
- # Relink after clean
- linked_sources = linked_client_sources linked_server_sources \
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
deleted file mode 100644
index 4a21a80da31..00000000000
--- a/databases/mysql-server/patches/patch-af
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-af,v 1.14 2006/01/05 19:02:36 joerg Exp $
-
---- configure.orig	2005-09-02 22:38:41.000000000 +0000
-+++ configure
-@@ -20819,7 +20819,7 @@ then
-   FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
- else
-   case $SYSTEM_TYPE in
--    *freebsd*)
-+    *freebsd* | *dragonfly*)
-       FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
-       ;;
-     *darwin*)
-@@ -24904,6 +24904,9 @@ case $SYSTEM_TYPE in
-        CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-     fi
-     ;;
-+  *dragonfly*)
-+    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-     CFLAGS="$CFLAGS -Dunix"
-@@ -34073,27 +34076,11 @@ fi;
- 
- echo "$as_me:$LINENO: checking for ORBit" >&5
- echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
--orbit_config_path=`which orbit-config`
--if test -n "$orbit_config_path" -a $? = 0
--then
--  orbit_exec_prefix=`orbit-config --exec-prefix`
--  orbit_includes=`orbit-config --cflags server`
--  orbit_libs=`orbit-config --libs server`
--  orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
--  echo "$as_me:$LINENO: result: found!" >&5
--echo "${ECHO_T}found!" >&6
--  cat >>confdefs.h <<\_ACEOF
--#define HAVE_ORBIT 1
--_ACEOF
--
--else
-   orbit_exec_prefix=
-   orbit_includes=
-   orbit_libs=
-   orbit_idl=
-   echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--fi
- 
- 
- 
-@@ -34370,7 +34357,6 @@ then
- else
-   bench_dirs=""
- fi
--bench_dirs="$bench_dirs mysql-test"
- 
- 
- # Don't build readline, i have it already
diff --git a/databases/mysql-server/patches/patch-al b/databases/mysql-server/patches/patch-al
deleted file mode 100644
index ad87d6c8f0c..00000000000
--- a/databases/mysql-server/patches/patch-al
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-al,v 1.6 2004/10/28 01:08:15 xtraeme Exp $
-
---- include/my_pthread.h.orig	2003-12-14 21:23:47.000000000 +0000
-+++ include/my_pthread.h	2003-12-20 12:09:31.000000000 +0000
-@@ -19,7 +19,13 @@
- #ifndef _my_pthread_h
- #define _my_pthread_h
- 
-+/* defines __NetBSD_Version__ */
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include <errno.h>
-+#include <signal.h>
- #ifndef ETIME
- #define ETIME ETIMEDOUT				/* For FreeBSD */
- #endif
-@@ -301,7 +307,11 @@
- #endif
- 
- #ifndef HAVE_NONPOSIX_SIGWAIT
-+#if defined (__NetBSD__) && (__NetBSD_Version__ < 106130000)
-+#define my_sigwait(A,B) __pthread_sigwait((A),(B))
-+#else
- #define my_sigwait(A,B) sigwait((A),(B))
-+#endif
- #else
- int my_sigwait(const sigset_t *set,int *sig);
- #endif
diff --git a/databases/mysql-server/patches/patch-am b/databases/mysql-server/patches/patch-am
deleted file mode 100644
index 3b9f6564a2b..00000000000
--- a/databases/mysql-server/patches/patch-am
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-am,v 1.6 2004/11/09 06:11:48 xtraeme Exp $
-
---- scripts/mysqld_safe.sh.orig	2004-11-09 06:54:47.000000000 +0100
-+++ scripts/mysqld_safe.sh	2004-11-09 06:57:33.000000000 +0100
-@@ -253,6 +253,14 @@
-   fi
- fi
- 
-+datemsg()
-+{
-+	echo -n $(date +'%y%M%d %H:%M:%S')"  "
-+	echo "$*"
-+}
-+
-+exec >>$err_log 2>&1
-+
- #
- # If there exists an old pid file, check if the daemon is already running
- # Note: The switches to 'ps' may depend on your operating system
-@@ -263,18 +271,16 @@
-   then
-     if @FIND_PROC@
-     then    # The pid contains a mysqld process
--      echo "A mysqld process already exists"
--      echo "A mysqld process already exists at " `date` >> $err_log
-+	datemsg "A mysqld process already exists"
-       exit 1
-     fi
-   fi
-   rm -f $pid_file
-   if test -f $pid_file
-   then
--    echo "Fatal error: Can't remove the pid file: $pid_file"
--    echo "Fatal error: Can't remove the pid file: $pid_file at " `date` >> $err_log
--    echo "Please remove it manually and start $0 again"
--    echo "mysqld daemon not started"
-+	datemsg "Fatal error: Can't remove the pid file: $pid_file"
-+	datemsg "Please remove it manually and start $0 again"
-+	datemsg "mysqld daemon not started"
-     exit 1
-   fi
- fi
-@@ -287,11 +293,11 @@
- # Alternatively, you can start mysqld with the "myisam-recover" option. See
- # the manual for details.
- #
--# echo "Checking tables in $DATADIR"
-+# datemsg "Checking tables in $DATADIR"
- # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI
- # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM
- 
--echo "Starting $MYSQLD daemon with databases from $DATADIR"
-+datemsg "Starting $MYSQLD daemon with databases from $DATADIR"
- 
- # Does this work on all systems?
- #if type ulimit | grep "shell builtin" > /dev/null
-@@ -299,7 +305,7 @@
- #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
- #fi
- 
--echo "`date +'%y%m%d %H:%M:%S  mysqld started'`" >> $err_log
-+datemsg  "mysqld started"
- while true
- do
-   rm -f $safe_mysql_unix_port $pid_file	# Some extra safety
-@@ -311,7 +317,7 @@
-   fi
-   if test ! -f $pid_file		# This is removed if normal shutdown
-   then
--    echo "STOPPING server from pid file $pid_file"
-+    datemsg "STOPPING server from pid file $pid_file"
-     break
-   fi
- 
-@@ -324,7 +330,7 @@
-     # kill -9 is used or the process won't react on the kill.
-     numofproces=`ps xa | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
- 
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
-+    datemsg -e "\nNumber of processes running now: $numofproces"
-     I=1
-     while test "$I" -le "$numofproces"
-     do 
-@@ -337,16 +343,14 @@
-       #    echo "TEST $I - $T **"
-       if kill -9 $T
-       then
--        echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
-+	      datemsg "$MYSQLD process hanging, pid $T - killed"
-       else 
-         break
-       fi
-       I=`expr $I + 1`
-     done
-   fi
--  echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
-+  datemsg "mysqld restarted"
- done
- 
--echo "`date +'%y%m%d %H:%M:%S'`  mysqld ended" | tee -a $err_log
--echo "" | tee -a $err_log
--
-+datemsg "mysqld ended"
diff --git a/databases/mysql-server/patches/patch-aq b/databases/mysql-server/patches/patch-aq
deleted file mode 100644
index 2613697b884..00000000000
--- a/databases/mysql-server/patches/patch-aq
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aq,v 1.4 2005/01/20 14:17:15 xtraeme Exp $
-
---- include/Makefile.in.orig	2005-01-20 14:58:40.000000000 +0100
-+++ include/Makefile.in	2005-01-20 14:59:00.000000000 +0100
-@@ -294,13 +294,8 @@
- uname_prog = @uname_prog@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
--BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
--pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h \
--			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
--		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
--			errmsg.h my_global.h my_net.h my_alloc.h \
--			my_getopt.h sslopt-longopts.h my_dir.h \
--			sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
-+BUILT_SOURCES =
-+pkginclude_HEADERS =
- 
- noinst_HEADERS = config-win.h config-os2.h config-netware.h \
- 			nisam.h heap.h merge.h my_bitmap.h\
diff --git a/databases/mysql-server/patches/patch-ar b/databases/mysql-server/patches/patch-ar
deleted file mode 100644
index 94430d2ec9b..00000000000
--- a/databases/mysql-server/patches/patch-ar
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ar,v 1.8 2005/01/20 14:17:15 xtraeme Exp $
-
---- man/Makefile.in.orig	2005-01-20 14:59:26.000000000 +0100
-+++ man/Makefile.in	2005-01-20 14:59:50.000000000 +0100
-@@ -290,14 +290,8 @@
- uname_prog = @uname_prog@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
--man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
--		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
--		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
--
--EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
--		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
--		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
--		mysqld_safe.1.in mysql_fix_privilege_tables.1.in
-+man_MANS = mysqld.1 mysqld_multi.1
-+EXTRA_DIST = mysqld.1.in mysqld_multi.1.in
- 
- CLEANFILES = $(man_MANS)
- SUFFIXES = .in
diff --git a/databases/mysql-server/patches/patch-as b/databases/mysql-server/patches/patch-as
deleted file mode 100644
index c0cc85c0a62..00000000000
--- a/databases/mysql-server/patches/patch-as
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-as,v 1.6 2005/09/27 00:13:29 xtraeme Exp $
-
---- support-files/Makefile.in.orig	2005-09-27 02:01:46.000000000 +0200
-+++ support-files/Makefile.in	2005-09-27 02:01:59.000000000 +0200
-@@ -315,13 +315,7 @@
- 			MySQL-shared-compat.spec.sh
- 
- SUBDIRS = MacOSX
--pkgdata_DATA = my-small.cnf \
--			my-medium.cnf \
--			my-large.cnf \
--			my-huge.cnf \
--      my-innodb-heavy-4G.cnf \
--			mysql-log-rotate \
--			binary-configure
-+pkgdata_DATA =
- 
- pkgdata_SCRIPTS = mysql.server
- noinst_DATA = mysql-@VERSION@.spec \
diff --git a/databases/mysql-server/patches/patch-aw b/databases/mysql-server/patches/patch-aw
deleted file mode 100644
index 1af9ee3c932..00000000000
--- a/databases/mysql-server/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.4 2005/01/20 14:17:15 xtraeme Exp $
-
---- isam/Makefile.in.orig	2005-01-20 15:02:23.000000000 +0100
-+++ isam/Makefile.in	2005-01-20 15:02:37.000000000 +0100
-@@ -134,7 +134,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
-+CCLD = $(CXX)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \
diff --git a/databases/mysql-server/patches/patch-ax b/databases/mysql-server/patches/patch-ax
deleted file mode 100644
index eca36a42e2a..00000000000
--- a/databases/mysql-server/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.4 2005/01/20 14:17:15 xtraeme Exp $
-
---- myisam/Makefile.in.orig	2005-01-20 15:03:02.000000000 +0100
-+++ myisam/Makefile.in	2005-01-20 15:03:12.000000000 +0100
-@@ -158,7 +158,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
-+CCLD = $(CXX)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \