Removed mysql3-{client,server} -- obsoleted by mysql-* and mysql4-*

packages, and the original authors have stopped its maintenance.
Thus, there are various vulnerabilities in them now.

23 files changed, 1 insertions, 803 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 0bc19a24e3c..19e818fa81d 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.168 2005/04/11 21:41:29 kristerw Exp $
+# $NetBSD: Makefile,v 1.169 2005/04/22 19:05:27 wiz Exp $
 #
 
 COMMENT=	Databases
@@ -43,8 +43,6 @@ SUBDIR+=	metakit-lib
 SUBDIR+=	myodbc
 SUBDIR+=	mysql-client
 SUBDIR+=	mysql-server
-SUBDIR+=	mysql3-client
-SUBDIR+=	mysql3-server
 SUBDIR+=	mysql4-client
 SUBDIR+=	mysql4-server
 SUBDIR+=	mysqlcc
diff --git a/databases/mysql3-client/DESCR b/databases/mysql3-client/DESCR
deleted file mode 100644
index 23500c3f7ba..00000000000
--- a/databases/mysql3-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/mysql3-client/Makefile b/databases/mysql3-client/Makefile
deleted file mode 100644
index 4527874297c..00000000000
--- a/databases/mysql3-client/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:12 tv Exp $
-
-PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		3
-SVR4_PKGNAME=		mysqc
-COMMENT=		MySQL 3, a free SQL database (client)
-
-.include "Makefile.common"
-
-CONFIGURE_ARGS+=	--without-server
-
-USE_NEW_TEXINFO=	YES
-INFO_FILES=		mysql.info
-
-post-install:
-	cd ${PREFIX}/man/man1; ${RM} -f mysqld.1 safe_mysqld.1
-	cd ${PREFIX}/share/mysql; ${RM} -f mysql.server
-	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
-
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql3-client/Makefile.common b/databases/mysql3-client/Makefile.common
deleted file mode 100644
index 71866cfb8f0..00000000000
--- a/databases/mysql3-client/Makefile.common
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: Makefile.common,v 1.5 2005/04/11 21:45:12 tv Exp $
-
-DISTNAME=		mysql-3.23.58
-CATEGORIES=		databases
-MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-3.23/ \
-			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-3.23/ \
-			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.mysql.com/
-
-EXTRACT_USING_PAX=	# defined
-
-.include "../../mk/bsd.prefs.mk"
-
-# 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
-
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		# defined
-USE_GNU_TOOLS+=		make
-CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
-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
-
-CONFIGURE_ARGS+=	--without-debug
-CONFIGURE_ARGS+=	--without-bench
-CONFIGURE_ARGS+=	--with-low-memory
-
-CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET}
-CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET}
-
-CPPFLAGS+=		-Dunix
-
-# force HAVE_CURSES_H on Solaris since the configure script is broken
-# and does not properly detect this, breaking the build later on.
-.if ${OPSYS} == "SunOS"
-CFLAGS+=		-DHAVE_CURSES_H
-CXXFLAGS+=		-DHAVE_CURSES_H
-.endif
-
-USE_PERL5=		# defined
-USE_LIBTOOL=		# defined
-LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
-
-post-extract:
-	cd ${WRKSRC};							\
-	for dir in dbug heap isam merge mysys strings; do		\
-		${MV} $${dir}/Makefile.in $${dir}/Makefile.in.orig;	\
-		${SED} -e "/^install-exec:/s/install-pkglibLIBRARIES//"	\
-			$${dir}/Makefile.in.orig > $${dir}/Makefile.in;	\
-	done
-	cd ${WRKSRC}/scripts;						\
-	for file in mysql_install_db.sh safe_mysqld.sh; do		\
-		${MV} $${file} $${file}.orig;				\
-		${SED} -e "s,chown,${CHOWN},g"				\
-			$${file}.orig > $${file};			\
-		${RM} $${file}.orig;					\
-	done
-
-.include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql3-client/PLIST b/databases/mysql3-client/PLIST
deleted file mode 100644
index c90bdfec97c..00000000000
--- a/databases/mysql3-client/PLIST
+++ /dev/null
@@ -1,64 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/28 01:01:32 xtraeme Exp $
-bin/msql2mysql
-bin/mysql
-bin/mysqlcheck
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_fix_privilege_tables
-bin/mysql_setpermission
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqldump
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqltest
-include/mysql/dbug.h
-include/mysql/errmsg.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_config.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
-include/mysql/my_no_pthread.h
-include/mysql/raid.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-usage.h
-include/mysql/sslopt-vars.h
-lib/mysql/libmysqlclient.la
-man/man1/isamchk.1
-man/man1/isamlog.1
-man/man1/mysql.1
-man/man1/mysql_zap.1
-man/man1/mysqlaccess.1
-man/man1/mysqladmin.1
-man/man1/mysqld_multi.1
-man/man1/mysqldump.1
-man/man1/mysqlshow.1
-man/man1/perror.1
-man/man1/replace.1
-share/mysql/binary-configure
-share/mysql/make_binary_distribution
-share/mysql/my-huge.cnf
-share/mysql/my-large.cnf
-share/mysql/my-medium.cnf
-share/mysql/my-small.cnf
-share/mysql/mysql-${PKGVERSION}.spec
-share/mysql/mysql-log-rotate
-@dirrm share/mysql
-@dirrm lib/mysql
-@dirrm include/mysql
diff --git a/databases/mysql3-client/buildlink3.mk b/databases/mysql3-client/buildlink3.mk
deleted file mode 100644
index c23a7a460d5..00000000000
--- a/databases/mysql3-client/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/01/20 14:15:04 xtraeme 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>=3.23.58
-BUILDLINK_RECOMMENDED.mysql-client+=	mysql-client>=3.23.58nb3
-BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql3-client
-BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
-.endif	# MYSQL_CLIENT_BUILDLINK3_MK
-
-.include "../../devel/zlib/buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql3-client/distinfo b/databases/mysql3-client/distinfo
deleted file mode 100644
index 4a7072aa7d1..00000000000
--- a/databases/mysql3-client/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 16:33:06 agc Exp $
-
-SHA1 (mysql-3.23.58.tar.gz) = f3383e41e8926c040a295173881414a1e96e0266
-RMD160 (mysql-3.23.58.tar.gz) = b7d436ac7aaa9238e724bf3c62c5f837bef676b6
-Size (mysql-3.23.58.tar.gz) = 12039843 bytes
-SHA1 (patch-af) = 0ac0172c264b9c9e8f173d29085096bc1c611132
-SHA1 (patch-ay) = d607f01b19bc1c5c0e2367d0b39c7703c9d5648f
-SHA1 (patch-az) = b4e2059514e479e27675d68af973386ad9ee5f6d
diff --git a/databases/mysql3-client/patches/patch-af b/databases/mysql3-client/patches/patch-af
deleted file mode 100644
index c5442797a4f..00000000000
--- a/databases/mysql3-client/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/10/28 01:01:32 xtraeme Exp $
-
---- configure.orig	Fri Jun  6 14:39:41 2003
-+++ configure	Wed Jul  9 17:15:10 2003
-@@ -19952,7 +19952,6 @@
- else
-   bench_dirs=""
- fi
--bench_dirs="$bench_dirs mysql-test"
- 
- 
- # Don't build readline, i have it already
diff --git a/databases/mysql3-client/patches/patch-ay b/databases/mysql3-client/patches/patch-ay
deleted file mode 100644
index 554a33f3960..00000000000
--- a/databases/mysql3-client/patches/patch-ay
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2005/01/20 14:15:04 xtraeme Exp $
-
---- scripts/mysqlhotcopy.sh.orig	Sun Dec 21 19:01:29 2003
-+++ scripts/mysqlhotcopy.sh	Thu Sep 23 11:02:45 2004
-@@ -7,6 +7,7 @@
- use File::Path;
- use DBI;
- use Sys::Hostname;
-+use File::Temp;
- 
- =head1 NAME
- 
-@@ -607,7 +608,6 @@
- sub copy_index
- {
-   my ($method, $files, $source, $target) = @_;
--  my $tmpfile="$opt_tmpdir/mysqlhotcopy$$";
-   
-   print "Copying indices for ".@$files." files...\n" unless $opt{quiet};  
-   foreach my $file (@$files)
-@@ -633,23 +633,23 @@
-       }
-       close OUTPUT	   || die "Error on close of $to: $!\n";
-     }
--    elsif ($opt{method} eq 'scp')
-+    elsif ($opt{method} =~ /^scp\b/)
-     {
--      my $tmp=$tmpfile;
--      open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n";
--      if (syswrite(OUTPUT,$buff) != length($buff))
-+      my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir);
-+      die "Can\'t create/open file in $opt_tmpdir\n";
-+      if (syswrite($fh,$buff) != length($buff))
-       {
- 	die "Error when writing data to $tmp: $!\n";
-       }
--      close OUTPUT	     || die "Error on close of $tmp: $!\n";
--      safe_system("scp $tmp $to");
-+      close $fh || die "Error on close of $tmp: $!\n";
-+      safe_system("$opt{method} $tmp $to");
-+      unlink $tmp;
-     }
-     else
-     {
-       die "Can't use unsupported method '$opt{method}'\n";
-     }
-   }
--  unlink "$tmpfile" if  ($opt{method} eq 'scp');
- }
diff --git a/databases/mysql3-client/patches/patch-az b/databases/mysql3-client/patches/patch-az
deleted file mode 100644
index 1db4c9b65ac..00000000000
--- a/databases/mysql3-client/patches/patch-az
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-az,v 1.1 2005/01/20 14:15:04 xtraeme Exp $
-
-mysqlaccess symlink vulnerability
-
---- scripts/mysqlaccess.sh.orig	2005-01-16 14:28:38 -08:00
-+++ scripts/mysqlaccess.sh	2005-01-16 14:28:38 -08:00
-@@ -2,7 +2,7 @@
- # ****************************
- package MySQLaccess;
- #use strict;
--use POSIX qw(tmpnam);
-+use File::Temp qw(tempfile tmpnam);
- use Fcntl;
- 
- BEGIN {
-@@ -32,7 +32,6 @@
- 	$ACCESS_U_BCK = 'user_backup';   
- 	$ACCESS_D_BCK = 'db_backup';     
-         $DIFF      = '/usr/bin/diff'; 
--        $TMP_PATH  = '/tmp';             #path to writable tmp-directory
-         $MYSQLDUMP = '@bindir@/mysqldump';
-                                          #path to mysqldump executable
- 
-@@ -432,7 +431,7 @@
- # no caching on STDOUT
- 	$|=1;
- 
--	$MYSQL_CNF = POSIX::tmpnam();
-+	$MYSQL_CNF = tmpnam();
- 	%MYSQL_CNF = (client    => { },
-                       mysql     => { },
-                       mysqldump => { },
-@@ -577,8 +576,6 @@
- push(@MySQLaccess::Grant::Error,'not_found_mysql')     if !(-x $MYSQL);
- push(@MySQLaccess::Grant::Error,'not_found_diff')      if !(-x $DIFF);
- push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP);
--push(@MySQLaccess::Grant::Error,'not_found_tmp')       if !(-d $TMP_PATH);
--push(@MySQLaccess::Grant::Error,'write_err_tmp')       if !(-w $TMP_PATH);
- if (@MySQLaccess::Grant::Error) {
-    MySQLaccess::Report::Print_Error_Messages() ;
-    exit 0;
-@@ -1777,17 +1774,15 @@
-    @before = sort(@before);
-    @after  = sort(@after);
- 
--   $before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$";
--   $after  = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$";
--   #$after = "/tmp/t0";
--   open(BEFORE,"> $before") ||
--    push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing");
--   open(AFTER,"> $after") ||
--    push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing");
--   print BEFORE join("\n",@before);
--   print AFTER  join("\n",@after);
--   close(BEFORE);
--   close(AFTER);
-+   ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or
-+    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
-+   ($ha, $after)  = tempfile("$MySQLaccess::script.XXXXXX") or
-+    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
-+
-+   print $hb join("\n",@before);
-+   print $ha join("\n",@after);
-+   close $hb;
-+   close $ha;
- 
-    # ----------------------------------
-    # compute difference
-@@ -1800,8 +1795,8 @@
- 
-    # ----------------------------------
-    # cleanup temp. files
--   unlink(BEFORE);
--   unlink(AFTER);
-+   unlink($before);
-+   unlink($after);
- 
-    return \@diffs;
- }
-@@ -2316,14 +2311,6 @@
-    => "The diff program <$MySQLaccess::DIFF> could not be found.\n"
-      ."+ Check your path, or\n"
-      ."+ edit the source of this script to point \$DIFF to the diff program.\n"
-- ,'not_found_tmp'
--   => "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n"
--     ."+ create this directory (writeable!), or\n"
--     ."+ edit the source of this script to point \$TMP_PATH to the right directory.\n"
-- ,'write_err_tmp'
--   => "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n"
--     ."+ make this directory writeable!, or\n"
--     ."+ edit the source of this script to point \$TMP_PATH to another directory.\n"
-  ,'Unrecognized_option'
-    => "Sorry,\n"
-      ."You are using an old version of the mysql-program,\n"
-
diff --git a/databases/mysql3-server/DESCR b/databases/mysql3-server/DESCR
deleted file mode 100644
index 02b7abc487b..00000000000
--- a/databases/mysql3-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/mysql3-server/INSTALL b/databases/mysql3-server/INSTALL
deleted file mode 100644
index 940d1713ef9..00000000000
--- a/databases/mysql3-server/INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2004/10/28 01:02:15 xtraeme Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	${ECHO} "-------------------------------"
-	${ECHO} "Initializing MySQL databases..."
-	${ECHO} "-------------------------------"
-	${PKG_PREFIX}/bin/mysql_install_db --force
-	${CHOWN} -R @MYSQL_USER@:@MYSQL_GROUP@ @MYSQL_DATADIR@
-	;;
-esac
diff --git a/databases/mysql3-server/MESSAGE b/databases/mysql3-server/MESSAGE
deleted file mode 100644
index 4be7d9fd102..00000000000
--- a/databases/mysql3-server/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/10/28 01:02:15 xtraeme 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, 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 Return.)
-
-See the manual for more instructions.
-
-===========================================================================
diff --git a/databases/mysql3-server/Makefile b/databases/mysql3-server/Makefile
deleted file mode 100644
index c0bd400541f..00000000000
--- a/databases/mysql3-server/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:12 tv Exp $
-
-PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		3
-SVR4_PKGNAME=		mysqs
-COMMENT=		MySQL 3, a free SQL database (server)
-
-.include "../../databases/mysql3-client/Makefile.common"
-
-CONFIGURE_ARGS+=	--without-berkeley-db
-USE_GNU_TOOLS+=		make
-
-USE_PKGINSTALL=		YES
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
-PTHREAD_OPTS=		require
-
-CONFIGURE_ARGS+=	--with-pthreads
-
-PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
-PKG_GROUPS=		${MYSQL_GROUP}
-RCD_SCRIPTS=		mysqld
-CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER}
-FILES_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR}
-FILES_SUBST+=		MYSQL_USER=${MYSQL_USER}
-FILES_SUBST+=		MYSQL_GROUP=${MYSQL_GROUP}
-MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
-			MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
-BUILD_DEFS+=		MYSQL_DATADIR
-OWN_DIRS_PERMS+=	${MYSQL_DATADIR} ${MYSQL_USER} ${MYSQL_GROUP} 0700
-
-# XXX TCP wrapper support is broken on (at least) Linux and Solaris.
-# ref: http://bugs.mysql.com/bug.php?id=599
-#      http://mail-index.netbsd.org/tech-pkg/2003/08/07/0003.html
-.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=	--with-libwrap
-.  include "../../security/tcp_wrappers/buildlink3.mk"
-.endif
-
-post-configure:
-	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
-
-post-build:
-	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
-		${MAKE_FLAGS} safe_mysqld mysql_install_db
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/safe_mysqld ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../databases/mysql3-client/buildlink3.mk"
-
-.if ${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
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql3-server/PLIST b/databases/mysql3-server/PLIST
deleted file mode 100644
index 8ade32c9631..00000000000
--- a/databases/mysql3-server/PLIST
+++ /dev/null
@@ -1,121 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
-bin/comp_err
-bin/isamchk
-bin/isamlog
-bin/my_print_defaults
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql.server
-bin/mysql_install_db
-bin/pack_isam
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-bin/safe_mysqld
-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
-libexec/mysqld
-man/man1/mysqld.1
-man/man1/safe_mysqld.1
-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/mysql3-server/distinfo b/databases/mysql3-server/distinfo
deleted file mode 100644
index 7d7cb5be963..00000000000
--- a/databases/mysql3-server/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
-
-SHA1 (mysql-3.23.58.tar.gz) = f3383e41e8926c040a295173881414a1e96e0266
-Size (mysql-3.23.58.tar.gz) = 12039843 bytes
-SHA1 (patch-aa) = 3954608e14c5c7996e699dc3dc083cf93d5944c7
-SHA1 (patch-ab) = 026fe468b4d7517084eea74ae14e115861d7d552
-SHA1 (patch-ae) = 127fb44f62f351236e4f36609f8d3af7469e67cd
-SHA1 (patch-af) = 53d0c68891918e9b0a21a9e30bf4b36aec44d2b8
-SHA1 (patch-al) = 4dea01ae58df622706887c59f303ffaf38384393
-SHA1 (patch-am) = 8e4398480701eb38193babdeac59572cdadbd4ea
diff --git a/databases/mysql3-server/files/mysqld.sh b/databases/mysql3-server/files/mysqld.sh
deleted file mode 100644
index 4307e274f6f..00000000000
--- a/databases/mysql3-server/files/mysqld.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mysqld.sh,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
-#
-
-# PROVIDE: mysqld
-# REQUIRE: DAEMON LOGIN mountall
-# KEYWORD: shutdown
-
-# Note: this needs NetBSD 1.6 or newer
-#
-
-. /etc/rc.subr
-
-name="mysqld"
-rcvar=$name
-command="@PREFIX@/bin/safe_mysqld"
-procname="@PREFIX@/libexec/${name}"
-pidfile="@MYSQL_DATADIR@/`hostname`.pid"
-start_cmd="mysqld_start"
-required_files="@MYSQL_DATADIR@/mysql/host.frm"
-
-mysqld_start()
-{
-	echo "Starting mysqld."
-	ulimit -n 4096
-	${command} ${mysqld_flags} &
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/databases/mysql3-server/patches/patch-aa b/databases/mysql3-server/patches/patch-aa
deleted file mode 100644
index 914e6ce31fc..00000000000
--- a/databases/mysql3-server/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
-
---- Makefile.in.orig	Thu Mar 13 20:32:20 2003
-+++ Makefile.in	Fri Apr 11 13:57:27 2003
-@@ -195,10 +195,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
- 
--SUBDIRS = . include @docs_dirs@ @readline_dir@ \
--			@thread_dirs@ @sql_client_dirs@ \
--			@sql_server_dirs@ scripts tests man \
--			@bench_dirs@ support-files os2
-+SUBDIRS = @thread_dirs@ @sql_server_dirs@ tests @bench_dirs@ support-files
- 
- 
- # Relink after clean
diff --git a/databases/mysql3-server/patches/patch-ab b/databases/mysql3-server/patches/patch-ab
deleted file mode 100644
index 3de14b7e811..00000000000
--- a/databases/mysql3-server/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/28 01:02:16 xtraeme Exp $
-
---- support-files/Makefile.in.orig	Sun Feb 16 09:26:07 2003
-+++ support-files/Makefile.in	Sun Feb 16 09:28:32 2003
-@@ -363,7 +363,7 @@
- 
- info-am:
- 
--install-data-am: install-pkgdataDATA install-pkgdataSCRIPTS
-+install-data-am: install-pkgdataSCRIPTS
- 
- install-exec-am:
- 
diff --git a/databases/mysql3-server/patches/patch-ae b/databases/mysql3-server/patches/patch-ae
deleted file mode 100644
index cfef20a7eaa..00000000000
--- a/databases/mysql3-server/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
-
---- configure.in.orig	Thu Aug 28 13:20:55 2003
-+++ configure.in	Thu Aug 28 13:23:04 2003
-@@ -1846,7 +1846,6 @@
- else
-   bench_dirs=""
- fi
--bench_dirs="$bench_dirs mysql-test"
- AC_SUBST(bench_dirs)
- 
- # Don't build readline, i have it already
diff --git a/databases/mysql3-server/patches/patch-af b/databases/mysql3-server/patches/patch-af
deleted file mode 100644
index cd032133607..00000000000
--- a/databases/mysql3-server/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
-
---- configure.orig	Thu Aug 28 13:24:42 2003
-+++ configure	Thu Aug 28 13:25:36 2003
-@@ -19952,7 +19952,6 @@
- else
-   bench_dirs=""
- fi
--bench_dirs="$bench_dirs mysql-test"
- 
- 
- # Don't build readline, i have it already
diff --git a/databases/mysql3-server/patches/patch-al b/databases/mysql3-server/patches/patch-al
deleted file mode 100644
index c6342945540..00000000000
--- a/databases/mysql3-server/patches/patch-al
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
-
---- include/my_pthread.h.orig	Thu Aug 28 13:26:47 2003
-+++ include/my_pthread.h	Thu Aug 28 13:28:45 2003
-@@ -20,7 +20,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
-@@ -294,7 +300,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/mysql3-server/patches/patch-am b/databases/mysql3-server/patches/patch-am
deleted file mode 100644
index 3f7c2253616..00000000000
--- a/databases/mysql3-server/patches/patch-am
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/10/28 01:02:17 xtraeme Exp $
-
---- scripts/safe_mysqld.sh.orig	Fri Apr 11 13:57:14 2003
-+++ scripts/safe_mysqld.sh	Fri Apr 11 13:58:02 2003
-@@ -195,6 +195,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
-@@ -205,18 +213,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
-@@ -225,11 +231,11 @@
- # Uncomment the following lines if you want all tables to be automaticly
- # checked and repaired at start
- #
--# echo "Checking tables in $DATADIR"
-+# datemsg "Checking tables in $DATADIR"
- # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check -O key_buffer=64M -O sort_buffer=64M $DATADIR/*/*.MYI
- # $MY_BASEDIR_VERSION/bin/isamchk --silent --force -O sort_buffer=64M $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
-@@ -237,7 +243,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 $MYSQL_UNIX_PORT $pid_file	# Some extra safety
-@@ -260,7 +266,7 @@
-     # The only thing is ps x => redhat 5 gives warnings when using ps -x.
-     # kill -9 is used or the process won't react on the kill.
-     numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
-+    datemsg "Number of processes running now: $numofproces"
-     I=1
-     while test "$I" -le "$numofproces"
-     do 
-@@ -272,7 +278,7 @@
- 	#    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