+ 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
  mysql5-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 mysql5-client to 3.

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

2 files changed, 14 insertions, 9 deletions

diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 955ad9462ac..dfa6e30b7d0 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2008/01/18 05:06:27 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/06 16:50:38 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		2
+PKGREVISION=		3
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, 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
@@ -20,13 +22,14 @@ AUTO_MKDIRS=	yes
 post-install:
 	cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\
 	done
 .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
-	${INSTALL_DATA} ${WRKSRC}/Docs/manual.chm ${DESTDIR}${PREFIX}/share/doc/mysql/
+	${INSTALL_DATA} ${WRKSRC}/Docs/manual.chm \
+		${DESTDIR}${PREFIX}/share/doc/mysql/
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index d7c4d76ec3c..ea55fc79935 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2008/01/22 00:41:59 rillig Exp $
+# $NetBSD: Makefile.common,v 1.30 2008/03/06 16:50:38 jlam Exp $
 
 DISTNAME=		mysql-5.0.51
 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,7 +42,10 @@ 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
 
@@ -109,7 +111,7 @@ SUBST_SED.scr+=		-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scr=	Fixing scripts.
 
 # Fix broken shared library detection under Mac OS X
-.if ${OPSYS} == Darwin
+.if ${OPSYS} == "Darwin"
 SUBST_CLASSES+=		dylib
 SUBST_STAGE.dylib=	post-patch
 SUBST_FILES.dylib=	configure