[pkgsrc/trunk]: pkgsrc/databases Make sure the paths to bison-yacc, lex and p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d206b4f5e34
branches:  trunk
changeset: 601618:4d206b4f5e34
user:      hans <hans%pkgsrc.org@localhost>
date:      Thu Mar 22 14:46:28 2012 +0000

description:
Make sure the paths to bison-yacc, lex and perl are correct in the
installed src/Makefile.global. Don't assume they all exist in ${PREFIX}.

diffstat:

 databases/postgresql83-client/Makefile |  6 ++++--
 databases/postgresql84-client/Makefile |  6 ++++--
 databases/postgresql90-client/Makefile |  5 +++--
 databases/postgresql91-client/Makefile |  5 +++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diffs (78 lines):

diff -r 89a629485bd1 -r 4d206b4f5e34 databases/postgresql83-client/Makefile
--- a/databases/postgresql83-client/Makefile    Thu Mar 22 14:25:25 2012 +0000
+++ b/databases/postgresql83-client/Makefile    Thu Mar 22 14:46:28 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/09/27 11:03:59 adam Exp $
+# $NetBSD: Makefile,v 1.25 2012/03/22 14:46:28 hans Exp $
 
 PKGNAME=       ${DISTNAME:C/-/83-client-/}
 COMMENT=       PostgreSQL database client programs
@@ -53,7 +53,9 @@
 SUBST_STAGE.pgxs=      post-build
 SUBST_MESSAGE.pgxs=    Fixing workdir tools references in pgxs Makefile
 SUBST_FILES.pgxs=      src/Makefile.global
-SUBST_SED.pgxs=                -e 's,${WRKDIR}/.tools,${PREFIX},'
+SUBST_SED.pgxs=                -e 's,${TOOLS_CMD.bison},${TOOLS_PATH.bison},'
+SUBST_SED.pgxs+=       -e 's,${TOOLS_CMD.lex},${TOOLS_PATH.lex},'
+SUBST_SED.pgxs+=       -e 's,${TOOLS_CMD.perl},${PERL5},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper/bin/ld,${LD},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=       -e 's,${WRKSRC},/dev/null,'
diff -r 89a629485bd1 -r 4d206b4f5e34 databases/postgresql84-client/Makefile
--- a/databases/postgresql84-client/Makefile    Thu Mar 22 14:25:25 2012 +0000
+++ b/databases/postgresql84-client/Makefile    Thu Mar 22 14:46:28 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/09/27 11:04:30 adam Exp $
+# $NetBSD: Makefile,v 1.16 2012/03/22 14:46:29 hans Exp $
 
 PKGNAME=       ${DISTNAME:C/-/84-client-/}
 COMMENT=       PostgreSQL database client programs
@@ -53,7 +53,9 @@
 SUBST_STAGE.pgxs=      post-build
 SUBST_MESSAGE.pgxs=    Fixing workdir tools references in pgxs Makefile
 SUBST_FILES.pgxs=      src/Makefile.global
-SUBST_SED.pgxs=                -e 's,${WRKDIR}/.tools,${PREFIX},'
+SUBST_SED.pgxs=                -e 's,${TOOLS_CMD.bison},${TOOLS_PATH.bison},'
+SUBST_SED.pgxs+=       -e 's,${TOOLS_CMD.lex},${TOOLS_PATH.lex},'
+SUBST_SED.pgxs+=       -e 's,${TOOLS_CMD.perl},${PERL5},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper/bin/ld,${LD},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=       -e 's,${WRKSRC},/dev/null,'
diff -r 89a629485bd1 -r 4d206b4f5e34 databases/postgresql90-client/Makefile
--- a/databases/postgresql90-client/Makefile    Thu Mar 22 14:25:25 2012 +0000
+++ b/databases/postgresql90-client/Makefile    Thu Mar 22 14:46:28 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/12/26 04:34:19 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2012/03/22 14:46:29 hans Exp $
 
 PKGNAME=       ${DISTNAME:C/-/90-client-/}
 COMMENT=       PostgreSQL database client programs
@@ -56,7 +56,8 @@
 SUBST_STAGE.pgxs=      post-build
 SUBST_MESSAGE.pgxs=    Fixing workdir tools references in pgxs Makefile
 SUBST_FILES.pgxs=      src/Makefile.global
-SUBST_SED.pgxs=                -e 's,${WRKDIR}/.tools,${PREFIX},'
+SUBST_SED.pgxs=                -e 's,${TOOLS_CMD.bison},${TOOLS_PATH.bison},'
+SUBST_SED.pgxs+=       -e 's,${TOOLS_CMD.lex},${TOOLS_PATH.lex},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper/bin/ld,${LD},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=       -e 's,${PREFIX}/bin/mkdir,${MKDIR:[1]},'
diff -r 89a629485bd1 -r 4d206b4f5e34 databases/postgresql91-client/Makefile
--- a/databases/postgresql91-client/Makefile    Thu Mar 22 14:25:25 2012 +0000
+++ b/databases/postgresql91-client/Makefile    Thu Mar 22 14:46:28 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/01/01 03:49:48 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/03/22 14:46:29 hans Exp $
 
 PKGNAME=       ${DISTNAME:C/-/91-client-/}
 COMMENT=       PostgreSQL database client programs
@@ -52,7 +52,8 @@
 SUBST_STAGE.pgxs=      post-build
 SUBST_MESSAGE.pgxs=    Fixing workdir tools references in pgxs Makefile
 SUBST_FILES.pgxs=      src/Makefile.global
-SUBST_SED.pgxs=                -e 's,${WRKDIR}/.tools,${PREFIX},'
+SUBST_SED.pgxs=                -e 's,${TOOLS_CMD.bison},${TOOLS_PATH.bison},'
+SUBST_SED.pgxs+=       -e 's,${TOOLS_CMD.lex},${TOOLS_PATH.lex},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper/bin/ld,${LD},'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=       -e 's,${PREFIX}/bin/mkdir,${MKDIR:[1]},'