ports/170175: [PATCH] net/mpich2: fix packging with WITHOUT_X11

[Lung-Pin Chang]

>Number:         170175
>Category:       ports
>Synopsis:       [PATCH] net/mpich2: fix packging with WITHOUT_X11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 25 19:50:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Lung-Pin Chang
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD Archon.iamben.csie.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
Some graphic related component of mpe aren't built nor installed with --disable-graphics (e.g. situation of setting WITHOUT_X11).

Packging would break in such case due to (probably) incorrect pkg-plist. See tinderbox build log at [1].

Please have a look at the attached patch, which passed in our internal tinderbox with the same configuration.

[1]: http://iamben.csie.net/tinderbox/index.php?action=display_markup_log&build=8.3-mpich&id=190

Port maintainer (bf at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mpich2-1.3.2.p1_1,5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/mpich2/pkg-plist /home/iamben/tmp/ports/net/mpich2/pkg-plist
--- /usr/ports/net/mpich2/pkg-plist	2011-02-26 17:56:41.000000000 +0800
+++ /home/iamben/tmp/ports/net/mpich2/pkg-plist	2012-07-26 03:45:56.665586760 +0800
@@ -100,11 +100,11 @@
 %%JAVA%%bin/slog2updater
 etc/mpe_callstack_ldflags.conf
 etc/mpe_f77env.conf
-etc/mpe_graphics.conf
+%%X11%%etc/mpe_graphics.conf
 etc/mpe_help.conf
 etc/mpe_log.conf
 etc/mpe_log_postlib.conf
-etc/mpe_mpianim.conf
+%%X11%%etc/mpe_mpianim.conf
 etc/mpe_mpicheck.conf
 etc/mpe_mpilog.conf
 etc/mpe_mpitrace.conf
@@ -121,7 +121,7 @@
 include/mpe.h
 include/mpe_callstack.h
 include/mpe_graphics.h
-include/mpe_graphicsf.h
+%%X11%%include/mpe_graphicsf.h
 include/mpe_log.h
 include/mpe_log_thread.h
 include/mpe_logf.h
@@ -161,7 +161,7 @@
 %%JAVA%%lib/clogprint.jar
 %%JAVA%%lib/jumpshot.jar
 %%JAVA%%lib/jumpshot_launcher.jar
-lib/libampe.a
+%%X11%%lib/libampe.a
 lib/libfmpich.a
 lib/libfmpich.so
 lib/libfmpich.so.%%VERM%%
@@ -729,10 +729,10 @@
 %%DATADIR%%/examples_collchk/wrong_reals.f
 %%DATADIR%%/examples_collchk/wrong_root.c
 %%DATADIR%%/examples_collchk/wrong_scatterv.c
-%%DATADIR%%/examples_graphics/Makefile
-%%DATADIR%%/examples_graphics/cpi.c
-%%DATADIR%%/examples_graphics/cxgraphics.c
-%%DATADIR%%/examples_graphics/fxgraphics.f
+%%X11%%%%DATADIR%%/examples_graphics/Makefile
+%%X11%%%%DATADIR%%/examples_graphics/cpi.c
+%%X11%%%%DATADIR%%/examples_graphics/cxgraphics.c
+%%X11%%%%DATADIR%%/examples_graphics/fxgraphics.f
 %%DATADIR%%/examples_logging/Makefile
 %%DATADIR%%/examples_logging/comm1_isr.c
 %%DATADIR%%/examples_logging/comm1_isr_loop.c
@@ -761,7 +761,7 @@
 @exec if [ ! -f %B/mpd.conf ]; then cp %B/mpd.conf.dist %B/mpd.conf; fi
 %%JAVA%%@dirrm %%DATADIR%%/logfiles
 @dirrm %%DATADIR%%/examples_logging
- at dirrm %%DATADIR%%/examples_graphics
+%%X11%%@dirrm %%DATADIR%%/examples_graphics
 @dirrm %%DATADIR%%/examples_collchk
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/www4
--- mpich2-1.3.2.p1_1,5.patch ends here ---

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