+ Honor PKGINFODIR in mysql4-client.

+ Remove explicit naming of "-lncurses -ltermcap" as the way to get
  the termcap libraries.  Including termcap.buildlink3.mk (indirectly
  through including readline/buildlink3.mk) will do the right thing.

+ Remove readline dependency from Makefile.common and add it into
  mysql4-client/Makefile.  Only the -client package needs and uses
  readline.  The -server package only "needs" it to placate the
  configure script, but none of its installed binaries are linked
  against it.

+ Add full DESTDIR support to the -client and -server packages.

Bump the PKGREVISION of mysql4-client to 3.

The PKGREVISION of mysql4-server remains unchanged since there are
no user-visible changes to the binary package.

3 files changed, 41 insertions, 24 deletions

diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index c23de659c07..2eb4a20d1bc 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.25 2008/01/18 05:06:27 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/06 16:01:42 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
+PKGREVISION=		3
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 4, a free SQL database (client)
 
 CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--without-extra-tools
@@ -15,13 +17,19 @@ CONFIGURE_ARGS+=	--enable-thread-safe-client
 UNWRAP_FILES=		scripts/mysql_config
 INFO_FILES=		# PLIST
 
+INSTALLATION_DIRS=	${PKGINFODIR}
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql
+	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info \
+		${DESTDIR}${PREFIX}/${PKGINFODIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${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
+		${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
 .endfor
 
+# We need the full readline on NetBSD<2.0.
+INCOMPAT_READLINE+=	NetBSD-[0-1].*-*
 .include "../../devel/readline/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index c5138530047..cf7e89bd210 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.60 2007/10/16 23:48:59 tnn Exp $
+# $NetBSD: Makefile.common,v 1.61 2008/03/06 16:01:42 jlam Exp $
 
 DISTNAME=		mysql-4.1.22
 CATEGORIES=		databases
@@ -35,7 +35,6 @@ 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"
 
 .if ${OPSYS} == "IRIX"
 CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
@@ -43,16 +42,13 @@ CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
 CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
 .endif
 
-# We always use our own readline, either system- or pkgsrc-supplied.
+# We always use our own readline.  Note that these --without-* settings
+# are confusing, but they just mean "don't use the included readline
+# or libedit".
+#
 CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-libedit
 
-# We need the full readline on NetBSD 1.6.x
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
-USE_BUILTIN.readline=	no
-.include "../../devel/readline/buildlink3.mk"
-.endif
-
 # This forces mysql.info _not_ to be rebuilt.
 CONFIGURE_ARGS+=	--without-docs
 
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index ffa0fc67717..5d6e3396b4b 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/01/18 05:06:27 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2008/03/06 16:01:42 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=		mysqs
@@ -7,6 +7,8 @@ COMMENT=		MySQL 4, a free SQL database (server)
 
 CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../databases/mysql4-client/Makefile.common"
 
 REPLACE_PERL+=		mysql-test/mysql-test-run.pl
@@ -38,11 +40,18 @@ MESSAGE_SUBST+=		MYSQL_DATADIR=${MYSQL_DATADIR} \
 BUILD_DEFS+=		MYSQL_DATADIR
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/man
 
+INSTALLATION_DIRS=	bin
+
 .include "../../databases/mysql4-client/buildlink3.mk"
-BUILDLINK_DEPMETHOD.readline=build
-.include "../../devel/readline/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
+# We only need readline to placate the configure script.  None of the
+# binaries are actually linked against -lreadline, so make this only
+# a build-time dependency.
+#
+BUILDLINK_DEPMETHOD.readline=	build
+.include "../../devel/readline/buildlink3.mk"
+
 post-extract:
 	chmod -x ${WRKSRC}/mysql-test/mysql-test-run.pl
 
@@ -50,15 +59,19 @@ 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 mysqldumpslow
+	cd ${WRKSRC}/scripts && \
+	${BUILD_MAKE_CMD} mysqld_safe mysql_install_db mysqldumpslow
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqldumpslow ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqldumpslow \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server \
+		${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
-		${PREFIX}/bin/mysql_secure_installation
+		${DESTDIR}${PREFIX}/bin/mysql_secure_installation
 
 .include "../../mk/bsd.pkg.mk"