diff options
| -rw-r--r-- | databases/postgresql83-client/Makefile | 6 | ||||
| -rw-r--r-- | databases/postgresql84-client/Makefile | 6 | ||||
| -rw-r--r-- | databases/postgresql90-client/Makefile | 5 | ||||
| -rw-r--r-- | databases/postgresql91-client/Makefile | 5 |
4 files changed, 14 insertions, 8 deletions
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile index 737fa3c87f7..d5d067c05ff 100644 --- a/databases/postgresql83-client/Makefile +++ b/databases/postgresql83-client/Makefile @@ -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_CLASSES+= pgxs 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 --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile index e44ccc95db2..1e2d0b6f1bd 100644 --- a/databases/postgresql84-client/Makefile +++ b/databases/postgresql84-client/Makefile @@ -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_CLASSES+= pgxs 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 --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile index 511af391aa5..1418724bc20 100644 --- a/databases/postgresql90-client/Makefile +++ b/databases/postgresql90-client/Makefile @@ -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_CLASSES+= pgxs 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 --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile index 99a1080037d..902a5364f24 100644 --- a/databases/postgresql91-client/Makefile +++ b/databases/postgresql91-client/Makefile @@ -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_CLASSES+= pgxs 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]},' |