diff options
| author | jlam <jlam@pkgsrc.org> | 2008-03-06 16:50:38 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-03-06 16:50:38 +0000 |
| commit | d10fc61853e4a8bb70726834903581f5cb9b6852 (patch) | |
| tree | afae54b071995c8ae9502f12e509d1bd51221fba /databases/mysql5-server | |
| parent | 7fd87342263c3ed1927efc65ba013bc3f92919ba (diff) | |
| download | pkgsrc-d10fc61853e4a8bb70726834903581f5cb9b6852.tar.gz | |
+ 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 (limited to 'databases/mysql5-server')
| -rw-r--r-- | databases/mysql5-server/Makefile | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index c03239f2863..1a607c0fd94 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -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 @@ COMMENT= MySQL 5, a free SQL database (server) 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 @@ REPLACE_PERL+= mysql-test/mysql-test-run.pl \ 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 @@ CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ .endif .include "../../databases/mysql5-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-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" |