summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--parallel/mpi-ch/Makefile19
-rw-r--r--parallel/mpi-ch/distinfo5
-rw-r--r--parallel/mpi-ch/patches/patch-ab13
-rw-r--r--parallel/mpi-ch/patches/patch-ac12
-rw-r--r--parallel/mpi-ch/patches/patch-ad12
5 files changed, 58 insertions, 3 deletions
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 0181f1265d2..4c53f80d224 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 23:10:34 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/03/14 01:10:49 joerg Exp $
DISTNAME= mpich-1.2.6
PKGREVISION= 3
@@ -45,6 +45,9 @@ CHECK_WRKREF_SKIP+= ${PREFIX}/share/examples/mpi-ch/perftest/config.system
.if ${OPSYS} == "NetBSD"
CONFIGURE_ARGS+= --with-arch=netbsd
PLIST_SUBST+= MPICH_OPSYS=${LOWER_OPSYS:Q}
+.elif ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+= --with-arch=freebsd
+PLIST_SUBST+= MPICH_OPSYS=freebsd
.elif ${OPSYS} == "IRIX"
CONFIGURE_ARGS+= --with-arch=IRIX${ABI:S/32/N32/}
PLIST_SUBST+= MPICH_OPSYS="${OPSYS}${ABI:S/32/N32/}"
@@ -61,8 +64,20 @@ BUILD_DEFS+= MPI_RSH
PLIST_SRC+= ${PKGDIR}/PLIST
-.if ${MPI_RSH} == "rsh"
pre-configure:
+ set -e; for f in MPI-2-C++ examples/perftest/config/confdb mpe \
+ mpe/slog2sdk mpe/slog2sdk/trace_rlog mpe/slog2sdk/trace_sample\
+ mpid/ch_p4/p4 romio/confdb src/fortran/config; do \
+ ${INSTALL} ${PKGSRCDIR}/mk/gnu-config/config.guess \
+ ${WRKSRC}/$$f; \
+ done
+ set -e; for f in MPI-2-C++ examples/perftest/config/confdb mpe \
+ mpe/slog2sdk mpe/slog2sdk/trace_rlog mpe/slog2sdk/trace_sample\
+ romio/confdb src/fortran/config; do \
+ ${INSTALL} ${PKGSRCDIR}/mk/gnu-config/config.sub \
+ ${WRKSRC}/$$f; \
+ done
+.if ${MPI_RSH} == "rsh"
@${ECHO} "======================================================================";
@${ECHO} "Remember to enable 'shell' and 'login' in your /etc/inetd.conf and";
@${ECHO} "restart inetd -- otherwise, the configure script will disable 'rsh'!";
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index 7ecbae1dc7d..392de3a65d2 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/09/06 08:10:59 abs Exp $
+$NetBSD: distinfo,v 1.11 2006/03/14 01:10:49 joerg Exp $
SHA1 (mpich-1.2.6.tar.gz) = d3dba3993bc7b0bd11ec4e4bdb70374283770cea
RMD160 (mpich-1.2.6.tar.gz) = dae2e2920a9bc0d3ca050fcb78b32d0f99a36dcf
@@ -7,6 +7,9 @@ SHA1 (mpich-docs.tgz) = fb7a9c7459998b9b74584d2afc4553027d94ad10
RMD160 (mpich-docs.tgz) = 85c7d200794b1d494f812eb4e5de904bcf681f2b
Size (mpich-docs.tgz) = 326405 bytes
SHA1 (patch-aa) = 8a25d520a9fce5ae92cdfc0851c9e8e1abe07d00
+SHA1 (patch-ab) = e04e09b7c32acc8e8e859323bf0710aef053f206
+SHA1 (patch-ac) = 0e34727cd635bf30eab625ec0f3baae0836a51e9
+SHA1 (patch-ad) = f38d4e5ac754e29b5ee5cba47e751f71333f8c8a
SHA1 (patch-al) = b2849603c42c8349fe4da56e6d56c8e8859ed170
SHA1 (patch-at) = d329f3d8a7d76fdb7d57c60bcea8944a990e0fb4
SHA1 (patch-au) = 453cbb33db19e47ae79d3f2ed8c131ea14c663cf
diff --git a/parallel/mpi-ch/patches/patch-ab b/parallel/mpi-ch/patches/patch-ab
new file mode 100644
index 00000000000..0501bc76e3c
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/03/14 01:10:49 joerg Exp $
+
+--- bin/tarch.orig 2006-03-13 19:02:55.000000000 +0000
++++ bin/tarch
+@@ -137,7 +137,7 @@ for LARCH in $ARCHLIST ; do
+ cray|CRAY*) GARCH=CRAY ;;
+ next) FARCH=NeXT ; break ;;
+ KSR1|KSR2) FARCH=ksr ; break ;;
+- FreeBSD) FARCH=freebsd ; break ;;
++ FreeBSD|DragonFly) FARCH=freebsd ; break ;;
+ NetBSD) FARCH=netbsd ; break ;;
+ i386) GARCH=ipsc2 ;;
+ ULTRIX|RISC) GARCH=dec5000 ;;
diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac
new file mode 100644
index 00000000000..b2f24e0fb27
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.4 2006/03/14 01:10:49 joerg Exp $
+
+--- mpid/ch_p4/p4/servers/serv_p4.c.orig 2006-03-13 23:25:07.000000000 +0000
++++ mpid/ch_p4/p4/servers/serv_p4.c
+@@ -74,7 +74,6 @@ extern char *crypt();
+ extern char *sys_errlist[];
+ #define strerror(n) sys_errlist[n]
+ #endif
+-extern int errno;
+
+ char tmpbuf[1024];
+ char *fromhost;
diff --git a/parallel/mpi-ch/patches/patch-ad b/parallel/mpi-ch/patches/patch-ad
new file mode 100644
index 00000000000..054f53e0972
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 2006/03/14 01:10:49 joerg Exp $
+
+--- mpid/server/serv_p4.c.orig 2006-03-14 00:20:07.000000000 +0000
++++ mpid/server/serv_p4.c
+@@ -170,7 +170,6 @@ extern char *crypt();
+ extern char *sys_errlist[];
+ #define strerror(n) sys_errlist[n]
+ #endif
+-extern int errno;
+
+ char tmpbuf[1024];
+ char *fromhost;