[pkgsrc/trunk]: pkgsrc/databases + Remove explicit naming of "-lncurses -lter...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d3c83c57921
branches:  trunk
changeset: 539475:6d3c83c57921
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Mar 06 16:50:38 2008 +0000

description:
+ 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.

diffstat:

 databases/mysql5-client/Makefile        |  13 +++++++----
 databases/mysql5-client/Makefile.common |  10 +++++---
 databases/mysql5-server/Makefile        |  36 ++++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 20 deletions(-)

diffs (148 lines):

diff -r 1d1461a1daa0 -r 6d3c83c57921 databases/mysql5-client/Makefile
--- a/databases/mysql5-client/Makefile  Thu Mar 06 16:15:18 2008 +0000
+++ b/databases/mysql5-client/Makefile  Thu Mar 06 16:50:38 2008 +0000
@@ -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 @@
 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 -r 1d1461a1daa0 -r 6d3c83c57921 databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Thu Mar 06 16:15:18 2008 +0000
+++ b/databases/mysql5-client/Makefile.common   Thu Mar 06 16:50:38 2008 +0000
@@ -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 @@
 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 @@
 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_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
diff -r 1d1461a1daa0 -r 6d3c83c57921 databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Thu Mar 06 16:15:18 2008 +0000
+++ b/databases/mysql5-server/Makefile  Thu Mar 06 16:50:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/01/18 05:06:28 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/06 16:50:38 jlam Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 PKGREVISION=           1
@@ -7,6 +7,8 @@
 
 CONFLICTS=             {mysql-server-[0-9]*,mysql3-server-[0-9]*}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../databases/mysql5-client/Makefile.common"
 
 MAKE_JOBS_SAFE=                no
@@ -43,6 +45,8 @@
                        mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl \
                        mysql-test/mysql-stress-test.pl
 
+INSTALLATION_DIRS=     bin
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
@@ -51,24 +55,34 @@
 .endif
 
 .include "../../databases/mysql5-client/buildlink3.mk"
-BUILDLINK_DEPMETHOD.readline=build
+.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"
-.include "../../security/tcp_wrappers/buildlink3.mk"
 
 post-configure:
        cd ${WRKSRC}/include && cp -f config.h my_config.h
 
 post-build:
-       cd ${WRKSRC}/scripts && env ${MAKE_ENV} ${MAKE_PROGRAM} \
-               ${MAKE_FLAGS} mysqld_safe mysql_install_db
+       cd ${WRKSRC}/scripts && \
+       ${BUILD_MAKE_CMD} 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}/support-files/mysql.server ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/${PKGMANDIR}/man1
-       #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe \
+               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db \
+               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server \
+               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
-               ${PREFIX}/bin/mysql_secure_installation
+               ${DESTDIR}${PREFIX}/bin/mysql_secure_installation
 
 .include "../../mk/bsd.pkg.mk"