From m.seaman@infracaninophile.co.uk  Mon Jan  9 17:24:48 2012
Return-Path: <m.seaman@infracaninophile.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 234281065670
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jan 2012 17:24:48 +0000 (UTC)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78])
	by mx1.freebsd.org (Postfix) with ESMTP id A4F9E8FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  9 Jan 2012 17:24:47 +0000 (UTC)
Received: from lucid-nonsense.infracaninophile.co.uk (localhost [IPv6:::1])
	by smtp.infracaninophile.co.uk (8.14.5/8.14.5) with ESMTP id q09HOdO1025278
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 9 Jan 2012 17:24:40 GMT
	(envelope-from matthew@lucid-nonsense.infracaninophile.co.uk)
Received: (from matthew@localhost)
	by lucid-nonsense.infracaninophile.co.uk (8.14.5/8.14.5/Submit) id q09HOdb1025277;
	Mon, 9 Jan 2012 17:24:39 GMT
	(envelope-from matthew)
Message-Id: <201201091724.q09HOdb1025277@lucid-nonsense.infracaninophile.co.uk>
Date: Mon, 9 Jan 2012 17:24:39 GMT
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Reply-To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Mk/bsd.port.mk, math/spooles-mpich, science/mpqc-mpich -- trailing slashes and MASTER_PORT
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         163963
>Category:       ports
>Synopsis:       Mk/bsd.port.mk, math/spooles-mpich, science/mpqc-mpich -- trailing slashes and MASTER_PORT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          analyzed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 09 17:30:10 UTC 2012
>Closed-Date:    
>Last-Modified:  Wed Feb 20 05:25:04 UTC 2013
>Originator:     Matthew Seaman
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
Infracaninophile
>Environment:
System: FreeBSD lucid-nonsense.infracaninophile.co.uk 8.2-STABLE FreeBSD 8.2-STABLE #0 r228845: Fri Dec 23 19:13:12 GMT 2011 root@lucid-nonsense.infracaninophile.co.uk:/usr/obj/usr/src/sys/LUCID-NONSENSE amd64


	
>Description:

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


>How-To-Repeat:
	
>Fix:

	

--- trailing-slash.diff begins here ---
? Mk/bsd.port.mk.save
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.699
diff -u -u -r1.699 bsd.port.mk
--- Mk/bsd.port.mk	9 Nov 2011 08:53:12 -0000	1.699
+++ Mk/bsd.port.mk	9 Jan 2012 17:13:26 -0000
@@ -1202,7 +1202,7 @@
 
 .if ${MASTERDIR} != ${.CURDIR}
 SLAVE_PORT?=	yes
-MASTER_PORT?=${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.*\/([^\/]+\/[^\/]+)$/\\1/}
+MASTER_PORT?=${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.*\/([^\/]+\/[^\/]+)\/?$/\\1/}
 .else
 SLAVE_PORT?=	no
 MASTER_PORT?=
Index: math/spooles-mpich/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/spooles-mpich/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- math/spooles-mpich/Makefile	19 Oct 2004 02:10:31 -0000	1.6
+++ math/spooles-mpich/Makefile	9 Jan 2012 17:13:26 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/math/spooles-mpich/Makefile,v 1.6 2004/10/19 02:10:31 maho Exp $
 #
 
-MASTERDIR=	${.CURDIR}/../spooles/
+MASTERDIR=	${.CURDIR}/../spooles
 WITH_MPI=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: science/mpqc-mpich/Makefile
===================================================================
RCS file: /home/ncvs/ports/science/mpqc-mpich/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- science/mpqc-mpich/Makefile	19 Nov 2006 08:42:07 -0000	1.10
+++ science/mpqc-mpich/Makefile	9 Jan 2012 17:13:26 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/science/mpqc-mpich/Makefile,v 1.10 2006/11/19 08:42:07 maho Exp $
 #
 
-MASTERDIR=	${.CURDIR}/../mpqc/
+MASTERDIR=	${.CURDIR}/../mpqc
 
 PKGNAMESUFFIX=	-mpich
 
--- trailing-slash.diff ends here ---


>Release-Note:
>Audit-Trail:

Date: Mon, 9 Jan 2012 18:05:48 +0000
From: Chris Rees <crees@freebsd.org>
Sender: utisoft@gmail.com
To: Matthew Seaman <m.seaman@infracaninophile.co.uk>
Subject: Re: ports/163963: Mk/bsd.port.mk, math/spooles-mpich,
 science/mpqc-mpich -- trailing slashes and MASTER_PORT

 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

Date: Mon, 09 Jan 2012 18:26:00 +0000
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: Chris Rees <crees@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/163963: Mk/bsd.port.mk, math/spooles-mpich, science/mpqc-mpich -- trailing slashes and MASTER_PORT
 -- trailing slashes and MASTER_PORT

 This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
 --------------enig9DED7606952563AB79604029
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 On 09/01/2012 18:05, Chris Rees wrote:
 > On 9 January 2012 17:24, Matthew Seaman <m.seaman@infracaninophile.co.u=
 k> wrote:
 >>
 >> -MASTER_PORT?=3D${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.=
 *\/([^\/]+\/[^\/]+)$/\\1/}
 >> +MASTER_PORT?=3D${MASTERDIR:C/[^\/]+\/\.\.\///:C/[^\/]+\/\.\.\///:C/^.=
 *\/([^\/]+\/[^\/]+)\/?$/\\1/}
 >=20
 > Yuk, backslashes galore!
 >=20
 > Can't we use a different separator instead?
 
 Good idea.
 
 	Cheers,
 
 	Matthew
 
 --=20
 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
 
 
 --------------enig9DED7606952563AB79604029
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.16 (Darwin)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
 iEYEARECAAYFAk8LMUAACgkQ8Mjk52CukIwk9wCfeN9radllXKRrhSOfifb8dODT
 M7UAnAp3pCVf8d+2D/Jm9p9O7lCnQcfF
 =A1Pm
 -----END PGP SIGNATURE-----
 
 --------------enig9DED7606952563AB79604029--
Responsible-Changed-From-To: freebsd-ports-bugs->matthew 
Responsible-Changed-By: matthew 
Responsible-Changed-When: Tue Feb 7 20:46:10 UTC 2012 
Responsible-Changed-Why:  
take my own PR 


http://www.freebsd.org/cgi/query-pr.cgi?pr=163963 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163963: commit references a PR
Date: Fri, 10 Feb 2012 09:33:14 +0000 (UTC)

 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 
Responsible-Changed-By: matthew 
Responsible-Changed-When: Fri Feb 10 09:50:53 UTC 2012 
Responsible-Changed-Why:  

Fixes to math/spooles-mpich and science/mpqc-mpich committed. 
The rest is portmgr territory. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=163963 
State-Changed-From-To: open->analyzed 
State-Changed-By: linimon 
State-Changed-When: Mon Mar 19 23:53:33 UTC 2012 
State-Changed-Why:  
take for -exp. 


Responsible-Changed-From-To: portmgr->linimon 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Mar 19 23:53:33 UTC 2012 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=163963 
Responsible-Changed-From-To: linimon->portmgr 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Feb 20 05:24:40 UTC 2013 
Responsible-Changed-Why:  
I am no longer in a position to test this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163963 
>Unformatted:
