[31808] trunk/dports/devel/bazaar/Portfile

jmpp at macports.org jmpp at macports.org
Fri Dec 7 22:59:49 PST 2007


Revision: 31808
          http://trac.macosforge.org/projects/macports/changeset/31808
Author:   jmpp at macports.org
Date:     2007-12-07 22:59:47 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------

Correct erroneous quoting in environment variables passed to MacPorts. These we written with nested quoting
as, e.g, "-L'${prefix}/lib'", but ever since Paul reworked our environemt parser back in 1.4.x days and then
Anders fixed a bug in the new parser in r30273 (which happened after the 1.5.2 release), the '' subquoting
level is illegal. Now a simple "-L${prefix}/lib", or even -L${prefix}/lib without any quoting at all, suffices.

This commit fixes building and destrooting of bazaar per Adam Mercer (ram)'s bug on the dev list. It turned out
to not be a regression with respect to 1.5.s as I anticipated, but rather and improper declaration of the environment,
which only worked back in 1.5.2 days as a side effect of the bug Anders fixed in r30273, if I'm not mistaken.

Modified Paths:
--------------
    trunk/dports/devel/bazaar/Portfile

Modified: trunk/dports/devel/bazaar/Portfile
===================================================================
--- trunk/dports/devel/bazaar/Portfile	2007-12-08 06:13:59 UTC (rev 31807)
+++ trunk/dports/devel/bazaar/Portfile	2007-12-08 06:59:47 UTC (rev 31808)
@@ -27,7 +27,7 @@
 worksrcdir	thelove at canonical.com---dists--bazaar--1.4
 patchfiles	patch-pfs.c patch-pfs-sftp.c patch-unit-sftp.c
 
-configure.cflags-append	"-L'${prefix}/lib'"
+configure.cflags-append	-L${prefix}/lib
 configure.dir    ${workpath}/thelove at canonical.com---dists--bazaar--1.4/build
 build.dir        ${configure.dir}
 
@@ -37,11 +37,11 @@
 configure.cmd    ../src/configure
 
 build.env CFLAGS="-g -O2 -Wall -fno-strict-aliasing \
--I'${prefix}/include' -L'${prefix}/lib' \
+-I${prefix}/include -L${prefix}/lib \
 -lintl -lneon -lgpgme -lpth"
 
-destroot.env CFLAGS="-I'${prefix}/include' -L'${prefix}/lib' -lintl -lneon -lgpgme" \
-LDFLAGS="-L'${prefix}/lib'"
+destroot.env CFLAGS="-I${prefix}/include -L${prefix}/lib -lintl -lneon -lgpgme" \
+LDFLAGS="-L${prefix}/lib"
 destroot.destdir prefix=${destroot}${prefix}
 post-destroot   {
 	file rename ${destroot}${prefix}/bin/annotate ${destroot}${prefix}/bin/annotate-baz

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071207/f401fdf1/attachment.html


More information about the macports-changes mailing list