* Rearrange MySQL build structure by providing a Makefile.common that is

  included by both mysql-server/Makefile and mysql-client/Makefile.
* Remove some unnecessary patches from mysql-client.
* Remove build dependency on autoconf as we don't really need to use it.
* Improve detection of native readline library.
* Provide INSTALL/DEINSTALL scripts to perform initial database setup and
  to remind the package administrator to remove unnecessary directories upon
  package removal.
* Use complete path to chown in various installed scripts.  Fixes pkg/12725.
* Install server manpages with the server package.  Fixes pkg/12724.

17 files changed, 295 insertions, 201 deletions

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index c71bdc942a9..5c337670904 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,35 +1,36 @@
-# $NetBSD: Makefile,v 1.13 2001/03/26 13:26:42 bad Exp $
+# $NetBSD: Makefile,v 1.14 2001/05/02 08:22:28 jlam Exp $
 #
 
-DISTNAME=	mysql-3.23.35
-PKGNAME=	${DISTNAME:S/-/-client-/}
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.mysql.com/MySQL-3.23/ \
-		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/
+.include "../../databases/mysql-client/Makefile.common"
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.mysql.com/
-COMMENT=	MySQL, a free SQL database (client)
+PKGNAME=		${DISTNAME:S/-/-client-/}
+COMMENT=		MySQL, a free SQL database (client)
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--without-perl --without-debug --without-bench \
-		--without-server --with-named-curses-libs="-lcurses -ltermcap"
+INFO_FILES=		mysql.info
 
-.if exists(/usr/include/readline.h)
-CONFIGURE_ARGS+=--without-readline
-.endif
+CONFIGURE_ARGS+=	--without-server
 
-CFLAGS+=	-Dunix
-
-USE_PERL5=	yes
-USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+.if exists(/usr/include/readline.h) || exists(/usr/include/readline/readline.h)
+CONFIGURE_ENV+=		readline_lib="edit"
+.else
+DEPENDS+=		readline>=4.0:../../devel/readline
+CPPFLAGS+=		-I${LOCALBASE}/include
+.endif
 
-INFO_FILES=	mysql.info
+# The compilation looks for <readline/readline.h>, so make sure
+# /usr/include/readline.h may be accessed that way if it's the readline
+# header available on the system.
+#
+.if exists(/usr/include/readline.h)
+CPPFLAGS+=		-I${WRKDIR}
 
-EXTRACT_USING_PAX=	yes
+pre-build:
+	${RM} -f ${WRKDIR}/readline
+	${LN} -sf /usr/include ${WRKDIR}/readline
+.endif
 
-pre-install:
+post-install:
+	cd ${PREFIX}/man/man1; ${RM} -f mysqld.1 safe_mysqld.1
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
new file mode 100644
index 00000000000..96223c22380
--- /dev/null
+++ b/databases/mysql-client/Makefile.common
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile.common,v 1.1 2001/05/02 08:22:28 jlam Exp $
+
+DISTNAME=		mysql-3.23.35
+CATEGORIES=		databases
+MASTER_SITES=		ftp://ftp.mysql.com/MySQL-3.23/ \
+			http://www.mysql.com/Downloads/MySQL-3.23/ \
+			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.mysql.com/
+
+EXTRACT_USING_PAX=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+MYSQL_DATADIR?=		/var/mysql
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
+CONFIGURE_ARGS+=	--with-named-z-libs=z
+CONFIGURE_ARGS+=	--with-libwrap
+CONFIGURE_ARGS+=	--with-named-curses-libs="-lcurses -ltermcap"
+CONFIGURE_ARGS+=	--without-perl
+
+# 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
+
+CPPFLAGS+=		-Dunix
+
+USE_PERL5=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+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
diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo
index d723c5faab4..9e8314613d2 100644
--- a/databases/mysql-client/distinfo
+++ b/databases/mysql-client/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:10:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/02 08:22:28 jlam Exp $
 
 SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327
 Size (mysql-3.23.35.tar.gz) = 10929885 bytes
-SHA1 (patch-aa) = db831da5bb127f814d3941875b87fd1ca1010994
-SHA1 (patch-ab) = 80aae154661d64092b4059b29e8c12307fe6394c
-SHA1 (patch-ad) = cc0bccc696a189604dbec5ffe1a25e55e9e5da2d
+SHA1 (patch-af) = c8b613527e92c4a9c85992c135dd35e330580d23
diff --git a/databases/mysql-client/patches/patch-aa b/databases/mysql-client/patches/patch-aa
deleted file mode 100644
index ffa6decec89..00000000000
--- a/databases/mysql-client/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/03/26 13:26:44 bad Exp $
-
---- client/Makefile.in.orig	Mon Jan 22 14:44:00 2001
-+++ client/Makefile.in	Thu Feb  1 22:50:13 2001
-@@ -190,7 +190,7 @@
- mysqltest_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES)
- 
- # Fix for mit-threads
--DEFS = -DUNDEF_THREADS_HACK
-+DEFS = -DUNDEF_THREADS_HACK -Dunix
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/databases/mysql-client/patches/patch-ab b/databases/mysql-client/patches/patch-ab
deleted file mode 100644
index d890cd520f0..00000000000
--- a/databases/mysql-client/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/03/26 13:26:44 bad Exp $
-
---- configure.orig	Mon Jan 22 14:37:14 2001
-+++ configure	Thu Feb  1 22:48:00 2001
-@@ -2050,6 +2050,7 @@
- *) lt_target="$target" ;;
- esac
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- #
- # the following will cause an existing older ltconfig to fail, so
-@@ -2208,6 +2209,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -9328,7 +9330,7 @@
-   # This requires readline to be in a standard place. Mosty for linux
-   # there readline may be a shared library.
-   readline_dir=""
--  readline_link="-lreadline"
-+  readline_link="-ledit"
- fi
- 
- 
diff --git a/databases/mysql-client/patches/patch-ad b/databases/mysql-client/patches/patch-ad
deleted file mode 100644
index 2bc6dc97476..00000000000
--- a/databases/mysql-client/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/03/26 13:26:44 bad Exp $
-
---- readline/Makefile.in.orig	Mon Jan 22 14:43:57 2001
-+++ readline/Makefile.in	Thu Feb  1 22:48:01 2001
-@@ -395,7 +395,8 @@
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
-+install: all
-+	@:
- uninstall-am: uninstall-pkgincludeHEADERS
- uninstall: uninstall-am
- all-am: Makefile $(LIBRARIES) $(HEADERS)
diff --git a/databases/mysql-client/patches/patch-af b/databases/mysql-client/patches/patch-af
new file mode 100644
index 00000000000..4ce9bf24133
--- /dev/null
+++ b/databases/mysql-client/patches/patch-af
@@ -0,0 +1,38 @@
+$NetBSD: patch-af,v 1.1 2001/05/02 08:22:30 jlam Exp $
+
+--- configure.orig	Thu Mar 15 19:52:05 2001
++++ configure
+@@ -5004,7 +5004,10 @@
+ #define HAVE_LIBWRAP 1
+ EOF
+ 
+-        WRAPLIBS="-L$with_libwrap/lib -lwrap"
++	if test "$with_libwrap" != "yes"; then
++	    WRAPLIBS="-L${with_libwrap}/lib"
++	fi
++	WRAPLIBS="${WRAPLIBS} -lwrap"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9345,7 +9348,11 @@
+   # This requires readline to be in a standard place. Mosty for linux
+   # there readline may be a shared library.
+   readline_dir=""
+-  readline_link="-lreadline"
++  if test -z "$readline_lib"
++  then
++    readline_lib="readline"
++  fi
++  readline_link="-l$readline_lib"
+ fi
+ 
+ 
+@@ -10466,7 +10473,7 @@
+ 
+     MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
+     
+-    MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
++    MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
+     
+     LIBS="$MT_LD_ADD $LIBS"
+     echo ""
diff --git a/databases/mysql-client/pkg/DESCR b/databases/mysql-client/pkg/DESCR
index 4693dde9acf..23500c3f7ba 100644
--- a/databases/mysql-client/pkg/DESCR
+++ b/databases/mysql-client/pkg/DESCR
@@ -1,14 +1,15 @@
-*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.
+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 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 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).
+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/pkg/PLIST b/databases/mysql-client/pkg/PLIST
index 91f1fbd6951..2a97dc18c9e 100644
--- a/databases/mysql-client/pkg/PLIST
+++ b/databases/mysql-client/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/03/26 13:26:44 bad Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/05/02 08:22:30 jlam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -45,28 +45,26 @@ lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.10
 lib/mysql/libmysqlclient.so.10.0
-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-3.23.35.spec
-share/mysql/mysql-log-rotate
-share/mysql/mysql.server
 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.1
 man/man1/mysqld_multi.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
 man/man1/perror.1
 man/man1/replace.1
-man/man1/safe_mysqld.1
-@dirrm include/mysql
-@dirrm lib/mysql
+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-3.23.35.spec
+share/mysql/mysql-log-rotate
+share/mysql/mysql.server
 @dirrm share/mysql
+@dirrm lib/mysql
+@dirrm include/mysql
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index a94a236a20f..37bea7909ef 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,66 +1,42 @@
-# $NetBSD: Makefile,v 1.20 2001/03/27 03:19:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2001/05/02 08:22:30 jlam Exp $
 #
 
-DISTNAME=		mysql-3.23.35
-PKGNAME=		${DISTNAME:S/-/-server-/}nb1
-CATEGORIES=		databases
-MASTER_SITES=		ftp://ftp.mysql.com/MySQL-3.23/ \
-			http://www.mysql.com/Downloads/MySQL-3.23/ \
-			ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/
+.include "../../databases/mysql-client/Makefile.common"
 
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.mysql.com/
+PKGNAME=		${DISTNAME:S/-/-server-/}nb1
 COMMENT=		MySQL, a free SQL database (server)
 
-BUILD_DEPENDS=		autoconf-2.13:../../devel/autoconf
-DEPENDS=		${DISTNAME:S/-/-client-/}:../../databases/mysql-client
-
-EXTRACT_USING_PAX=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-MYSQL_DATADIR?=		/var/mysql
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR} \
-			--with-named-z-libs=z \
-			--with-libwrap \
-			--with-named-curses-libs="-lcurses -ltermcap" \
-			--without-perl --without-debug --without-bench \
-			--without-docs --with-low-memory
+DEPENDS+=		${DISTNAME:S/-/-client-/}:../../databases/mysql-client
 
 # hardwire use of included mit-pthreads on NetBSD
 .if (${OPSYS} == "NetBSD")
 CONFIGURE_ARGS+=	--with-mit-threads
 .endif
 
-CFLAGS+=		-Dunix
-
 # platforms on which included mit-pthreads is usable
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
-			NetBSD-*-sparc NetBSD-*-m68k SunOS-*-sparc \
+ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386	\
+			NetBSD-*-sparc NetBSD-*-m68k SunOS-*-sparc	\
 			NetBSD-*-powerpc
 
-USE_PERL5=		yes
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 
-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
+post-configure:
+	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
 
-pre-configure:
-	@cd ${WRKSRC}/mit-pthreads/config && ${LOCALBASE}/bin/autoconf
+post-build:
+	cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
+		${MAKE_FLAGS} safe_mysqld mysql_install_db
 
-post-configure:
-	@cd ${WRKSRC} && ${CP} config.h include/my_config.h
+pre-install:
+	${SED}	-e "s|@MYSQL_DATADIR@|${MYSQL_DATADIR}|g"		\
+		-e "s|@CAT@|${CAT}|g"					\
+		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 
 post-install:
-	@cd ${WRKSRC}/scripts && \
-		${MAKE_PROGRAM} safe_mysqld mysql_install_db && \
-		${INSTALL_SCRIPT} safe_mysqld mysql_install_db ${PREFIX}/bin/
-	${PREFIX}/bin/mysql_install_db --force
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/safe_mysqld ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo
index 82ed78d0ff8..34cbcd9e2dc 100644
--- a/databases/mysql-server/distinfo
+++ b/databases/mysql-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:10:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/02 08:22:30 jlam Exp $
 
 SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327
 Size (mysql-3.23.35.tar.gz) = 10929885 bytes
@@ -6,5 +6,5 @@ SHA1 (patch-aa) = 05c56d81e17893dd267fcd5f68d8c378f024a06f
 SHA1 (patch-ab) = 4f10917780d73cb4a58127b27a5d8c1c9f63e0d3
 SHA1 (patch-ac) = 9ac4beb4f53cc4d4fc4ec52cf30716c8269face8
 SHA1 (patch-ad) = 1aecfee152d303b3d65f3866032d2a6d49538f46
-SHA1 (patch-ae) = c77d019c8638a15ff40e9adb0e8e36762500cbd7
-SHA1 (patch-af) = 44449c93f2e12fb0e99dd02486e62c63555a07d8
+SHA1 (patch-ae) = 46fa106d1f308884594a5479ad16ff58ee9057ba
+SHA1 (patch-af) = c8b613527e92c4a9c85992c135dd35e330580d23
diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae
index f21cd97489b..61c47caf472 100644
--- a/databases/mysql-server/patches/patch-ae
+++ b/databases/mysql-server/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2001/03/26 22:37:34 bad Exp $
+$NetBSD: patch-ae,v 1.4 2001/05/02 08:22:31 jlam Exp $
 
---- configure.in.orig	Fri Mar 16 01:51:51 2001
-+++ configure.in	Sat Mar 24 02:44:15 2001
+--- configure.in.orig	Thu Mar 15 19:51:51 2001
++++ configure.in
 @@ -581,7 +581,10 @@
          AC_MSG_RESULT(yes)
          AC_DEFINE(LIBWRAP)
@@ -14,7 +14,20 @@ $NetBSD: patch-ae,v 1.3 2001/03/26 22:37:34 bad Exp $
          AC_MSG_RESULT(no)
          CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
-@@ -1951,7 +1954,7 @@
+@@ -1589,7 +1592,11 @@
+   # This requires readline to be in a standard place. Mosty for linux
+   # there readline may be a shared library.
+   readline_dir=""
+-  readline_link="-lreadline"
++  if test -z "$readline_lib"
++  then
++    readline_lib="readline"
++  fi
++  readline_link="-l$readline_lib"
+ fi
+ AC_SUBST(readline_dir)
+ AC_SUBST(readline_link)
+@@ -1951,7 +1958,7 @@
      AC_DEFINE(HAVE_mit_thread)
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      AC_SUBST(MT_INCLUDES)
diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af
index 1bee4321ea8..18dc4388306 100644
--- a/databases/mysql-server/patches/patch-af
+++ b/databases/mysql-server/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2001/03/26 22:37:34 bad Exp $
+$NetBSD: patch-af,v 1.4 2001/05/02 08:22:31 jlam Exp $
 
---- configure.orig	Fri Mar 16 01:52:05 2001
-+++ configure	Sat Mar 24 02:42:32 2001
+--- configure.orig	Thu Mar 15 19:52:05 2001
++++ configure
 @@ -5004,7 +5004,10 @@
  #define HAVE_LIBWRAP 1
  EOF
@@ -14,7 +14,20 @@ $NetBSD: patch-af,v 1.3 2001/03/26 22:37:34 bad Exp $
  else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
-@@ -10466,7 +10469,7 @@
+@@ -9345,7 +9348,11 @@
+   # This requires readline to be in a standard place. Mosty for linux
+   # there readline may be a shared library.
+   readline_dir=""
+-  readline_link="-lreadline"
++  if test -z "$readline_lib"
++  then
++    readline_lib="readline"
++  fi
++  readline_link="-l$readline_lib"
+ fi
+ 
+ 
+@@ -10466,7 +10473,7 @@
  
      MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
      
diff --git a/databases/mysql-server/pkg/DEINSTALL b/databases/mysql-server/pkg/DEINSTALL
new file mode 100644
index 00000000000..987c461234b
--- /dev/null
+++ b/databases/mysql-server/pkg/DEINSTALL
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/05/02 08:22:31 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+MYSQL_DATADIR="@MYSQL_DATADIR@"
+
+CAT="@CAT@"
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+
+POST-DEINSTALL)
+	${CAT} << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want
+to remove the following directories:
+
+	${MYSQL_DATADIR}
+===========================================================================
+EOF
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/databases/mysql-server/pkg/DESCR b/databases/mysql-server/pkg/DESCR
index 4693dde9acf..02b7abc487b 100644
--- a/databases/mysql-server/pkg/DESCR
+++ b/databases/mysql-server/pkg/DESCR
@@ -1,14 +1,15 @@
-*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.
+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 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 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).
+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/pkg/INSTALL b/databases/mysql-server/pkg/INSTALL
new file mode 100644
index 00000000000..d7d30dd27ea
--- /dev/null
+++ b/databases/mysql-server/pkg/INSTALL
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/05/02 08:22:31 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+
+POST-INSTALL)
+	echo "-------------------------------"
+	echo "Initializing MySQL databases..."
+	echo "-------------------------------"
+	${PKG_PREFIX}/bin/mysql_install_db --force
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
diff --git a/databases/mysql-server/pkg/PLIST b/databases/mysql-server/pkg/PLIST
index 60470e9e587..619afc9c9aa 100644
--- a/databases/mysql-server/pkg/PLIST
+++ b/databases/mysql-server/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/03/26 13:46:22 bad Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/05/02 08:22:31 jlam Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -18,11 +18,13 @@ 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/libmyisammrg.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
@@ -47,8 +49,6 @@ share/mysql/charsets/usa7.conf
 share/mysql/charsets/win1250.conf
 share/mysql/charsets/win1251.conf
 share/mysql/charsets/win1251ukr.conf
-share/mysql/mi_test_all
-share/mysql/mi_test_all.res
 share/mysql/czech/errmsg.sys
 share/mysql/czech/errmsg.txt
 share/mysql/danish/errmsg.sys
@@ -73,6 +73,8 @@ 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/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
 share/mysql/norwegian/errmsg.sys
@@ -91,26 +93,25 @@ share/mysql/spanish/errmsg.sys
 share/mysql/spanish/errmsg.txt
 share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
-@exec %D/bin/mysql_install_db --force
-@dirrm share/mysql/charsets
-@dirrm share/mysql/czech
-@dirrm share/mysql/danish
-@dirrm share/mysql/dutch
-@dirrm share/mysql/english
-@dirrm share/mysql/estonian
-@dirrm share/mysql/french
-@dirrm share/mysql/german
-@dirrm share/mysql/greek
-@dirrm share/mysql/hungarian
-@dirrm share/mysql/italian
-@dirrm share/mysql/japanese
-@dirrm share/mysql/korean
-@dirrm share/mysql/norwegian
-@dirrm share/mysql/norwegian-ny
-@dirrm share/mysql/polish
-@dirrm share/mysql/portuguese
-@dirrm share/mysql/romanian
-@dirrm share/mysql/russian
-@dirrm share/mysql/slovak
-@dirrm share/mysql/spanish
 @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