Date: Mon, 9 Jan 2012 17:24:39 GMT From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/163963: Mk/bsd.port.mk, math/spooles-mpich, science/mpqc-mpich -- trailing slashes and MASTER_PORT Message-ID: <201201091724.q09HOdb1025277@lucid-nonsense.infracaninophile.co.uk> Resent-Message-ID: <201201091730.q09HUBUA098476@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs
>State: open
>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:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201091724.q09HOdb1025277>