A trailing slash on the definition of MASTERDIR in a slave port breaks the generated value of MASTER_PORT -- eg: maggot:...ports/math/spooles-mpich:% make -V MASTER_PORT /usr/ports/math/spooles/ Applying the patch to bsd.port.mk shown below produces a correct result: maggot:...ports/math/spooles-mpich:% make -V MASTER_PORT math/spooles However, there are only two instances of this trailing slash problem currently in the ports: math/spooles-mpich and science/mpqc-mpich
On 9 January 2012 17:24, Matthew Seaman <m.seaman@infracaninophile.co.uk> wrote: > > -MASTER_PORT?=${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.*\/([^\/]+\/[^\/]+)$/\\1/} > +MASTER_PORT?=${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.*\/([^\/]+\/[^\/]+)\/?$/\\1/} Yuk, backslashes galore! Can't we use a different separator instead? http://people.freebsd.org/~crees/patches/163963.diff uses commas instead of slashes to delimit the regex, getting rid of most of the toothpicks.... Chris
On 09/01/2012 18:05, Chris Rees wrote: > On 9 January 2012 17:24, Matthew Seaman <m.seaman@infracaninophile.co.uk> wrote: >> >> -MASTER_PORT?=${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.*\/([^\/]+\/[^\/]+)$/\\1/} >> +MASTER_PORT?=${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.*\/([^\/]+\/[^\/]+)\/?$/\\1/} > > Yuk, backslashes galore! > > Can't we use a different separator instead? Good idea. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate JID: matthew@infracaninophile.co.uk Kent, CT11 9PW
Responsible Changed From-To: freebsd-ports-bugs->matthew take my own PR
matthew 2012-02-10 09:33:05 UTC FreeBSD ports repository Modified files: science/mpqc-mpich Makefile math/spooles-mpich Makefile Log: Fix the two affected ports PR: 163963 Approved by: maho (maintainer) shaun (mentor) Revision Changes Path 1.7 +1 -1 ports/math/spooles-mpich/Makefile 1.11 +1 -1 ports/science/mpqc-mpich/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Responsible Changed From-To: matthew->portmgr Fixes to math/spooles-mpich and science/mpqc-mpich committed. The rest is portmgr territory.
State Changed From-To: open->analyzed take for -exp.
Responsible Changed From-To: portmgr->linimon
Responsible Changed From-To: linimon->portmgr I am no longer in a position to test this.
Infrastructure PR.
An exp-run is expected for that patch (too bad we do not have a exp-run status)
is it still an issue ?
(In reply to Baptiste Daroussin from comment #11) Yeah, it looks like it is still relevant. Only part of the proposed fix was applied -- the change to the MASTER_PORT variable hasn't been made. Given it's been 7 years since I reported this and I don't recall there being any related problems in the mean time, I am entirely ambivalent about applying the rest of the patch. If you want to just close this, feel free to go ahead.