${LD} incorrectly rewritten

[brook%biology.nmsu.edu@localhost (Brook Milligan)]

Ok, I found the problem.  I had originally thought it was some general
rewriting magic, but there was a too general SUBST rule in the
postgresql*-client packages for rewriting the Makefile.global file.
The original rule

 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'

matched the

LD = /pkg_comp/obj/pkgsrc/databases/postgresql84-client/default/.wrapper/bin/ld

line and created the incorrect ${PREFIX}/bin/ld value for ${LD}.

I propose the patch below to fix this for all of the postgresql
packages.  While there are no other lines in this file that will match
the original rule, I propose adding a more specialized rule and
keeping the general one just in case other tools are added in the
future.  Comments?

Thanks for your help.

Cheers,
Brook


Index: postgresql83-client/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql83-client/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- postgresql83-client/Makefile        19 Dec 2010 09:53:53 -0000      1.19
+++ postgresql83-client/Makefile        7 Feb 2011 05:06:08 -0000
@@ -57,6 +57,7 @@
 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,${WRKDIR}/.wrapper/bin/ld,/usr/bin/ld,'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=       -e 's,${WRKSRC},/dev/null,'
 
Index: postgresql84-client/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql84-client/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- postgresql84-client/Makefile        19 Dec 2010 09:53:41 -0000      1.11
+++ postgresql84-client/Makefile        7 Feb 2011 05:06:08 -0000
@@ -57,6 +57,7 @@
 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,${WRKDIR}/.wrapper/bin/ld,/usr/bin/ld,'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=       -e 's,${WRKSRC},/dev/null,'
 
Index: postgresql90-client/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql90-client/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- postgresql90-client/Makefile        24 Dec 2010 03:41:38 -0000      1.4
+++ postgresql90-client/Makefile        7 Feb 2011 05:06:08 -0000
@@ -60,6 +60,7 @@
 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,${WRKDIR}/.wrapper/bin/ld,/usr/bin/ld,'
 SUBST_SED.pgxs+=       -e 's,${WRKDIR}/.wrapper,${PREFIX},'
 SUBST_SED.pgxs+=       -e 's,${WRKSRC},/dev/null,'