First step into making mpi-ch fully work with CHECK_FILES.

Also annotate use of C++ and Fortran. Bump revision.

5 files changed, 122 insertions, 15 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index f8bff2a1faf..9d08fe834df 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2006/04/13 01:20:32 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2006/05/16 22:01:18 joerg Exp $
 
 DISTNAME=		mpich-1.2.6
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		parallel
 MASTER_SITES=		ftp://ftp.mcs.anl.gov/pub/mpi/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} mpich-docs.tgz
@@ -16,6 +16,7 @@ DEPENDS+=		{openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/openssh
 
 BUILD_TARGET=		ALL examples
 INSTALL_TARGET=		install-all
+USE_LANGUAGES=		c c++ fortran
 USE_TOOLS+=		perl:run
 HAS_CONFIGURE=		yes
 USE_FORTRAN=		yes
@@ -42,6 +43,13 @@ CONFIGURE_ENV+=		PERLFULLPATH=${PERL5:Q}
 # build PATH in the config file is not a problem
 CHECK_WRKREF_SKIP+=	${PREFIX}/share/examples/mpi-ch/perftest/config.system
 
+PKG_SYSCONFSUBDIR=	mpi-ch
+EGDIR=			${PREFIX}/share/examples/mpi-ch
+CONF_FILES+=		${EGDIR}/mpichconf.h.dat ${PKG_SYSCONFDIR}/mpichconf.h.dat
+CONF_FILES+=		${EGDIR}/mpichlib.conf ${PKG_SYSCONFDIR}/mpichlib.conf
+CONF_FILES+=		${EGDIR}/mpichversion.c ${PKG_SYSCONFDIR}/mpichversion.c
+CONF_FILES+=		${EGDIR}/mpif77.conf ${PKG_SYSCONFDIR}/mpif77.conf
+
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-arch=netbsd
 PLIST_SUBST+=		MPICH_OPSYS=${LOWER_OPSYS:Q}
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index 70f1140cd73..1c5f4589849 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/13 01:20:32 rillig Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/05/16 22:01:18 joerg Exp $
 bin/clog2alog
 bin/clog_print
 bin/mpicc
@@ -24,6 +24,13 @@ bin/mpirun_dbg.xxgdb
 bin/serv_p4
 bin/tarch
 bin/tdevice
+include/basex11.h
+include/mpe.h
+include/mpe_graphics.h
+include/mpe_log.h
+include/mpeexten.h
+include/mpef.h
+include/mpetools.h
 include/mpi.h
 include/mpi2c++/comm.h
 include/mpi2c++/comm_inln.h
@@ -1012,6 +1019,10 @@ share/doc/mpi-ch/mpichman-globus2.pdf
 share/doc/mpi-ch/mpichman-globus2.ps.gz
 share/doc/mpi-ch/mpiman.ps
 share/doc/mpi-ch/romio-users.ps.gz
+share/examples/mpi-ch/mpichconf.h.dat
+share/examples/mpi-ch/mpichlib.conf
+share/examples/mpi-ch/mpichversion.c
+share/examples/mpi-ch/mpif77.conf
 share/examples/mpi-ch/MPI-2-C++/Makefile
 share/examples/mpi-ch/MPI-2-C++/Makefile.in
 share/examples/mpi-ch/MPI-2-C++/README
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index 392de3a65d2..48853bcdce8 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/03/14 01:10:49 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/05/16 22:01:19 joerg Exp $
 
 SHA1 (mpich-1.2.6.tar.gz) = d3dba3993bc7b0bd11ec4e4bdb70374283770cea
 RMD160 (mpich-1.2.6.tar.gz) = dae2e2920a9bc0d3ca050fcb78b32d0f99a36dcf
@@ -10,7 +10,8 @@ SHA1 (patch-aa) = 8a25d520a9fce5ae92cdfc0851c9e8e1abe07d00
 SHA1 (patch-ab) = e04e09b7c32acc8e8e859323bf0710aef053f206
 SHA1 (patch-ac) = 0e34727cd635bf30eab625ec0f3baae0836a51e9
 SHA1 (patch-ad) = f38d4e5ac754e29b5ee5cba47e751f71333f8c8a
-SHA1 (patch-al) = b2849603c42c8349fe4da56e6d56c8e8859ed170
+SHA1 (patch-ae) = 190cc0fb19ca29d0ee86f662b3d8b54c520d9039
+SHA1 (patch-al) = 7f0276736040077fc465b3188d0190833c77f7b2
 SHA1 (patch-at) = d329f3d8a7d76fdb7d57c60bcea8944a990e0fb4
 SHA1 (patch-au) = 453cbb33db19e47ae79d3f2ed8c131ea14c663cf
 SHA1 (patch-av) = 0c2a655aa31b823fe89530bcb0dd709bdee174e2
diff --git a/parallel/mpi-ch/patches/patch-ae b/parallel/mpi-ch/patches/patch-ae
new file mode 100644
index 00000000000..6a222b4c65b
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2006/05/16 22:01:19 joerg Exp $
+
+--- src/fortran/Makefile.in.orig	2006-05-14 16:34:37.000000000 +0000
++++ src/fortran/Makefile.in
+@@ -54,7 +54,7 @@ install: src/lib${FLIBNAME}.a
+ 	cp ${libbuild_dir}/lib${FWRAPNAME}.a ${f77libdir}/lib${FWRAPNAME}.a
+ 	cp ${libbuild_dir}/lib${FLIBNAME}fsup.a ${f77libdir}/lib${FLIBNAME}fsup.a
+ 	cp src/mpif77 ${f77bindir}/mpif77${subname}
+-	cp src/mpif77.conf ${sysconfdir}/mpif77${subname}.conf
++	cp src/mpif77.conf ${prefix}/share/examples/mpi-ch/mpif77${subname}.conf
+ 
+ uninstall:
+ 	-rm ${f77includedir}/mpif.h
diff --git a/parallel/mpi-ch/patches/patch-al b/parallel/mpi-ch/patches/patch-al
index 85442163a38..44e15472dba 100644
--- a/parallel/mpi-ch/patches/patch-al
+++ b/parallel/mpi-ch/patches/patch-al
@@ -1,7 +1,8 @@
-$NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
---- util/mpiinstall.in.orig	2004-07-02 10:34:43.000000000 -0700
-+++ util/mpiinstall.in	2005-03-03 02:43:21.000000000 -0700
-@@ -172,7 +172,7 @@
+$NetBSD: patch-al,v 1.8 2006/05/16 22:01:19 joerg Exp $
+
+--- util/mpiinstall.in.orig	2004-07-02 17:34:43.000000000 +0000
++++ util/mpiinstall.in
+@@ -172,7 +172,7 @@ if [ "$prefix_override" = 1 ] ; then
      bindir=$prefix/bin
      sbindir=$prefix/sbin
      includedir=$prefix/include
@@ -10,9 +11,12 @@ $NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
      libdir=$prefix/lib
      sharedlib_dir=$libdir/shared
      messagecat_dir=$libdir
-@@ -453,9 +453,11 @@
+@@ -451,11 +451,13 @@ MkDir $sbindir
+ MkDir $includedir
+ MkDir $datadir
  MkDir $docdir
- MkDir $sysconfdir
+-MkDir $sysconfdir
++#MkDir $sysconfdir
  
 -MkDir $prefix/examples
 +MkDir $prefix/share/util
@@ -24,7 +28,68 @@ $NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
      MkDir $includedir/mpi2c++
  fi
  
-@@ -697,7 +699,7 @@
+@@ -478,14 +480,14 @@ chmod +x $UNINSTALLFILE
+ if [ -z "$libonly" ] ; then
+     CopyFile ${top_srcdir}/bin/tarch $bindir $XMODE
+     CopyFile ${top_srcdir}/bin/tdevice $bindir $XMODE
+-    CopyFile util/mpichlib.conf ${sysconfdir} 
++    CopyFile util/mpichlib.conf ${prefix}/share/examples/mpi-ch
+     if [ -x "bin/mpichversion.exe" ] ; then
+         CopyFile bin/mpichversion.exe $bindir $XMODE
+     else 
+         CopyFile bin/mpichversion $bindir $XMODE
+     fi
+     # Copy the source file for mpichversion to the sysconfdir
+-    CopyFile ${top_srcdir}/util/mpichversion.c ${sysconfdir}
++    CopyFile ${top_srcdir}/util/mpichversion.c ${prefix}/share/examples/mpi-ch
+     #
+     # mpiman
+     $Show /bin/rm -f $DESTDIR$bindir/mpiman
+@@ -566,12 +568,12 @@ if [ -z "$libonly" ] ; then
+     FixupFile2 bin/mpicc $bindir/mpicc $XMODE
+     if [ -x src/fortran/src/mpif77 -a "@NOF77@" = "0" ] ; then
+         CopyFile src/fortran/src/mpif77 $bindir/mpif77 $XMODE
+-        CopyFile src/fortran/src/mpif77.conf $sysconfdir
++        CopyFile src/fortran/src/mpif77.conf ${prefix}/share/examples/mpi-ch
+         CopyFile $includebuild_dir/mpif.h $includedir
+     fi
+     if [ -x src/fortran/src/mpif90 -a "@NO_F90@" = "0" ] ; then
+         CopyFile src/fortran/src/mpif90 $bindir/mpif90 $XMODE
+-	CopyFile src/fortran/src/mpif90.conf $sysconfdir
++	CopyFile src/fortran/src/mpif90.conf ${prefix}/share/examples/mpi-ch
+     fi
+     #
+     # mpiCC, if C++ selected
+@@ -623,23 +625,23 @@ else
+     else 
+         CopyFile bin/mpichversion $bindir $XMODE
+     fi
+-    CopyFile util/mpichlib.conf ${sysconfdir}
++    CopyFile util/mpichlib.conf ${prefix}/share/examples/mpi-ch
+     # Copy the source file for mpichversion to the sysconfdir
+-    CopyFile $top_srcdir/util/mpichversion.c ${sysconfdir}
++    CopyFile $top_srcdir/util/mpichversion.c ${prefix}/share/examples/mpi-ch
+     FixupFile $top_srcdir/util/mpireconfig.in $bindir/mpireconfig $XMODE
+     # No user include uses mpichconf.h
+-    CopyFile $includebuild_dir/mpichconf.h $sysconfdir/mpichconf.h.dat
++    CopyFile $includebuild_dir/mpichconf.h ${prefix}/share/examples/mpi-ch/mpichconf.h.dat
+     CopyFile $includebuild_dir/mpidefs.h $includedir 
+     CopyFile $includebuild_dir/mpi.h $includedir
+     if [ -s $includebuild_dir/mpif.h -a "@NOF77@" = "0" ] ; then
+         CopyFile $includebuild_dir/mpi_fortdefs.h $includedir
+         CopyFile src/fortran/src/mpif77 $bindir/mpif77 $XMODE
+-	CopyFile src/fortran/src/mpif77.conf $sysconfdir
++	CopyFile src/fortran/src/mpif77.conf ${prefix}/share/examples/mpi-ch
+         CopyFile $includebuild_dir/mpif.h $includedir
+     fi
+     if [ -x src/fortran/src/mpif90 -a "@NO_F90@" = "0" ] ; then
+         CopyFile src/fortran/src/mpif90 $bindir/mpif90 $XMODE
+-	CopyFile src/fortran/src/mpif90.conf $sysconfdir
++	CopyFile src/fortran/src/mpif90.conf ${prefix}/share/examples/mpi-ch
+     fi
+     if [ -s romio/include/mpio.h ] ; then
+         CopyFile romio/include/mpio.h $includedir
+@@ -697,7 +699,7 @@ if [ -z "$libonly" ] ; then
      #	$CPRP -r util/machines $prefix/util/machines.anl
      for file in util/machines/machines* ; do
          if [ -s $file ] ; then 
@@ -33,7 +98,16 @@ $NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
  	fi
      done
      #
-@@ -994,6 +996,8 @@
+@@ -710,7 +712,7 @@ if [ -z "$libonly" ] ; then
+     #CopyFile include/protofix.h $includedir
+     #CopyFile include/patchlevel.h $includedir
+     # No user include uses mpichconf.h
+-    CopyFile $includebuild_dir/mpichconf.h $sysconfdir/mpichconf.h.dat
++    CopyFile $includebuild_dir/mpichconf.h ${prefix}/share/examples/mpi-ch/mpichconf.h.dat
+     CopyFile $includebuild_dir/mpidefs.h $includedir
+     # Install ROMIO files
+     if [ -s romio/include/mpio.h ] ; then
+@@ -994,6 +996,8 @@ fi
  CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
  #
  # Example programs
@@ -42,7 +116,7 @@ $NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
  CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
  #
  # This SHOULD use mpireconfig...
-@@ -1027,14 +1031,16 @@
+@@ -1027,14 +1031,16 @@ CopyFile $top_srcdir/installtest/README 
  $Show "(cd $DESTDIR$prefix/examples ; /bin/rm -f mpirun ; \
  	  ln -s ../bin/mpirun mpirun )"
  echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
@@ -61,7 +135,7 @@ $NetBSD: patch-al,v 1.7 2005/03/03 12:01:30 garbled Exp $
    fi
  fi
  #
-@@ -1043,39 +1049,40 @@
+@@ -1043,39 +1049,40 @@ Savevar=$prefix
  if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
  # Removed the installation of these extra examples.  
      # C++ Example programs