From e2f7ed377b91e3e60e12b6991e64904b32cb5283 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Fri, 11 Jul 2008 01:57:00 +0000
Subject: Add missing dependency on X11.  Based on maintainer's PR 39107. Fixes
 build failure with X11_TYPE=native.

While here, bin/mpdroot marked as special perms.

Bump PKGREVISION.
---
 parallel/mpi-ch/Makefile | 14 +++++++++++++-
 parallel/mpi-ch/PLIST    | 12 +++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'parallel')

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 66c28a8ce71..1e949e1d2fb 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2008/05/29 20:25:53 tnn Exp $
+# $NetBSD: Makefile,v 1.56 2008/07/11 01:57:00 obache Exp $
 
 DISTNAME=	mpich2-1.0.7
+PKGREVISION=	1
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/
 
@@ -34,12 +35,16 @@ CONF_FILES+=		share/${PKGBASE}/examples/mpe_callstack_ldflags.conf \
 			${PKG_SYSCONFDIR}/mpe_callstack_ldflags.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_f77env.conf \
 			${PKG_SYSCONFDIR}/mpe_f77env.conf
+CONF_FILES+=		share/${PKGBASE}/examples/mpe_graphics.conf \
+			${PKG_SYSCONFDIR}/mpe_graphics.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_help.conf \
 			${PKG_SYSCONFDIR}/mpe_help.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_log.conf \
 			${PKG_SYSCONFDIR}/mpe_log.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_log_postlib.conf \
 			${PKG_SYSCONFDIR}/mpe_log_postlib.conf
+CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpianim.conf \
+			${PKG_SYSCONFDIR}/mpe_mpianim.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpicheck.conf \
 			${PKG_SYSCONFDIR}/mpe_mpicheck.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpilog.conf \
@@ -55,5 +60,12 @@ CONF_FILES+=		share/${PKGBASE}/examples/mpicxx.conf \
 CONF_FILES+=		share/${PKGBASE}/examples/mpif77.conf \
 			${PKG_SYSCONFDIR}/mpif77.conf
 
+SPECIAL_PERMS+=		bin/mpdroot ${SETUID_ROOT_PERMS}
+
 .include "../../lang/python/application.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.if !defined(_X11_BUILDLINK3_MK)
+CONFIGURE_ARGS+=	--x-includes=${BUILDLINK_PREFIX.libX11}/include
+CONFIGURE_ARGS+=	--x-libraries=${BUILDLINK_PREFIX.libX11}/lib
+.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index c61a0daefda..bd372c4cfbb 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/05/29 20:25:53 tnn Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/07/11 01:57:00 obache Exp $
 bin/check_callstack
 bin/clog2_join
 bin/clog2_print
@@ -52,6 +52,7 @@ include/clog_uuid.h
 include/mpe.h
 include/mpe_callstack.h
 include/mpe_graphics.h
+include/mpe_graphicsf.h
 include/mpe_log.h
 include/mpe_log_thread.h
 include/mpe_logf.h
@@ -62,6 +63,7 @@ include/mpicxx.h
 include/mpif.h
 include/mpio.h
 include/mpiof.h
+lib/libampe.a
 lib/libfmpich.a
 lib/liblmpe.a
 lib/libmpe.a
@@ -779,10 +781,12 @@ share/doc/mpich2/user.pdf
 share/mpich2/examples/mpe_callstack_ldflags.conf
 share/mpich2/examples/mpe_f77env.conf
 share/mpich2/examples/mpe_f77env.conf.in
+share/mpich2/examples/mpe_graphics.conf
 share/mpich2/examples/mpe_help.conf
 share/mpich2/examples/mpe_help.conf.in
 share/mpich2/examples/mpe_log.conf
 share/mpich2/examples/mpe_log_postlib.conf
+share/mpich2/examples/mpe_mpianim.conf
 share/mpich2/examples/mpe_mpicheck.conf
 share/mpich2/examples/mpe_mpilog.conf
 share/mpich2/examples/mpe_mpitrace.conf
@@ -803,6 +807,11 @@ share/mpich2/examples_collchk/wrong_int_byte.c
 share/mpich2/examples_collchk/wrong_reals.f
 share/mpich2/examples_collchk/wrong_root.c
 share/mpich2/examples_collchk/wrong_scatterv.c
+share/mpich2/examples_graphics/Makefile
+share/mpich2/examples_graphics/Makefile.in
+share/mpich2/examples_graphics/cpi.c
+share/mpich2/examples_graphics/cxgraphics.c
+share/mpich2/examples_graphics/fxgraphics.f
 share/mpich2/examples_logging/Makefile
 share/mpich2/examples_logging/Makefile.in
 share/mpich2/examples_logging/comm1_isr.c
@@ -825,6 +834,7 @@ share/mpich2/examples_logging/pthread_sendrecv.c
 share/mpich2/examples_logging/pthread_sendrecv_user.c
 share/mpich2/examples_logging/srtest.c
 @dirrm share/mpich2/examples_logging
+@dirrm share/mpich2/examples_graphics
 @dirrm share/mpich2/examples_collchk
 @dirrm share/mpich2/examples
 @dirrm share/mpich2
-- 
cgit v1.2.3