pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/percona-toolkit databases/percona-toolkit: R...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f0f42b4bc27
branches:  trunk
changeset: 366967:6f0f42b4bc27
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Aug 20 23:54:33 2017 +0000

description:
databases/percona-toolkit: Remove ${WRKDIR} references in scripts.

Several Perl-generated scripts were installed with the interpreter
being in the tools directory.  Use subst.mk to fix the interpreter
path at the head of these scripts.  Add "sh" as a run-time tool
dependency since several of the scripts installed require a POSIX
shell.

Bump the PKGREVISION due to changes in the installed scripts.

diffstat:

 databases/percona-toolkit/Makefile |  27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r 36b099097c31 -r 6f0f42b4bc27 databases/percona-toolkit/Makefile
--- a/databases/percona-toolkit/Makefile        Sun Aug 20 19:41:13 2017 +0000
+++ b/databases/percona-toolkit/Makefile        Sun Aug 20 23:54:33 2017 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2017/06/12 19:32:59 fhajny Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/20 23:54:33 jlam Exp $
 #
 
 DISTNAME=      percona-toolkit-3.0.3
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://www.percona.com/downloads/percona-toolkit/${PKGVERSION_NOREV}/source/tarball/
 
@@ -10,15 +11,27 @@
 COMMENT=       Advanced command-line tools for open-source databases (MySQL)
 LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=    perl bash:run
+USE_TOOLS+=    perl bash:run sh:run
 
 REPLACE_PERL+= bin/*
 
-CHECK_INTERPRETER_SKIP+=       *pt-ioprofile
-CHECK_INTERPRETER_SKIP+=       *pt-mysql-summary
-CHECK_INTERPRETER_SKIP+=       *pt-pmp
-CHECK_INTERPRETER_SKIP+=       *pt-sift
-CHECK_INTERPRETER_SKIP+=       *pt-stalk
+# Fix paths to bash and sh that were replaced by Perl's MakeMaker to
+# point to the programs in the tools directory.
+#
+SUBST_CLASSES+=                bash
+SUBST_STAGE.bash=      post-build
+SUBST_FILES.bash=      blib/script/pt-ioprofile
+SUBST_FILES.bash+=     blib/script/pt-pmp
+SUBST_FILES.bash+=     blib/script/pt-sift
+SUBST_FILES.bash+=     blib/script/pt-stalk
+SUBST_SED.bash+=       -e 's|^\#!.*|\#!${TOOLS_PATH.bash}|'
+
+SUBST_CLASSES+=                sh
+SUBST_STAGE.sh=                post-build
+SUBST_FILES.sh=                blib/script/pt-mext
+SUBST_FILES.sh+=       blib/script/pt-mysql-summary
+SUBST_FILES.sh+=       blib/script/pt-summary
+SUBST_SED.sh+=         -e 's|^\#!.*|\#!${TOOLS_PATH.sh}|'
 
 DEPENDS+=      p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
 #DEPENDS+=     {perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes



Home | Main Index | Thread Index | Old Index