ports/105844: net/mpich: don't rely on a X11BASE engraved in marble

[Thierry Thomas]

>Number:         105844
>Category:       ports
>Synopsis:       net/mpich: don't rely on a X11BASE engraved in marble
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 25 13:40:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD freefall.freebsd.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 10 03:18:20 UTC 2005 kensmith at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
	As reported by Kris Kennaway:

	As you may know, one of the major projects we are working on in the
	ports community is the push to incorporate Xorg 7.x.  As part of this
	change, X is moving from /usr/X11R6 into /usr/local.  This means that
	all ports that use X need to be flexible enough to deal with X being
	in a new location.
	
	Unfortunately, your port is not currently compliant; when your port
	and everything else is compiled with a nonstandard X11BASE (see
	below), your port fails to compile.
	
	This is probably because it "knows" that X11 files live in /usr/X11R6
	and nowhere else.  Can you please investigate this as a matter of
	priority, and submit a PR with the fixes when you are ready?

>How-To-Repeat:
	See log on pointyhat.

>Fix:
	Please consider the following patch:

--- mpich.diff begins here ---
diff -urN net/mpich.orig/Makefile net/mpich/Makefile
--- net/mpich.orig/Makefile	Mon Aug 28 19:04:22 2006
+++ net/mpich/Makefile	Sat Nov 25 14:00:34 2006
@@ -193,6 +193,11 @@
 .endif
 .endif
 
+pre-configure:
+.for fic in mpe/configure mpe/src/Makefile.in
+	${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${fic}
+.endfor
+
 post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/mpich/bin ${PREFIX}/mpich/lib
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/mpich/doc ${PREFIX}/mpich/include	\
--- mpich.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: