Pullup the following changes to the pkgsrc-2003Q4 branch, requested by

Lex Wennmacher.

	revision 1.24
	date: 2003/12/02 20:13:38;  author: wennmach;  state: Exp;  lines: +15 -7
	Disable weak symbols for gcc>3*. While weak symbols do work on
	NetBSD-current, the way mpi-ch test for them and implements them
	(using the #pragma weak directive) is currently broken.

	Fixes PR pkg/23267 by Kouichirou Hiratsuka.
	----------------------------
	revision 1.23
	date: 2003/11/27 17:02:25;  author: wennmach;  state: Exp;  lines: +2 -2
	o fix syntax error in src/fortran/configure
	o avoid removing non-existent files, resulting in "rm: usage:" errors
	----------------------------
	revision 1.22
	date: 2003/11/26 12:42:12;  author: wennmach;  state: Exp;  lines: +2 -1

	Correct the way the endianness is determined.
	(How could this actually ever have worked ???)

5 files changed, 96 insertions, 10 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index ceb9ba9e745..48df736ac0c 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2003/03/29 12:42:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2003/12/07 16:36:49 agc Exp $
 
 DISTNAME=		mpich-1.2.5-1a
 PKGNAME=		mpich-1.2.5.1.1
+PKGREVISION=		3
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-1a//}
 CATEGORIES=		parallel
 MASTER_SITES=		ftp://ftp.mcs.anl.gov/pub/mpi/
@@ -24,16 +25,24 @@ USE_X11=		yes
 
 MPI_RSH?=		ssh
 
-CONFIGURE_ARGS=		-prefix=${PREFIX} --with-arch=netbsd --with-comm=ch_p4
+.include "../../mk/bsd.prefs.mk"
+
+CONFIGURE_ARGS=		-prefix=${PREFIX}
 CONFIGURE_ARGS+=	-docdir=${PREFIX}/share/doc/mpi-ch
 CONFIGURE_ARGS+=	-htmldir=${PREFIX}/share/doc/html/mpi-ch
-CONFIGURE_ARGS+=	--with-mpe -opt=-O --disable-devdebug
-CONFIGURE_ARGS+=	--disable-f90 --disable-f90modules
+CONFIGURE_ARGS+=	-opt=-O
+CONFIGURE_ARGS+=	--with-arch=netbsd
+CONFIGURE_ARGS+=	--with-comm=ch_p4
+CONFIGURE_ARGS+=	--with-mpe
+CONFIGURE_ARGS+=	--disable-devdebug
+CONFIGURE_ARGS+=	--disable-f90
+CONFIGURE_ARGS+=	--disable-f90modules
+.if !empty(CC_VERSION:Mgcc-3*)
+CONFIGURE_ARGS+=	--disable-weak-symbols
+.endif
 
 MAKE_ENV+=		RSHCOMMAND="${MPI_RSH}"
 
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 .if ${MPI_RSH} == "rsh"
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index 0f8877a38e6..56169ff9d70 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2003/03/27 21:07:05 jschauma Exp $
+$NetBSD: distinfo,v 1.3.2.1 2003/12/07 16:36:49 agc Exp $
 
 SHA1 (mpich-1.2.5-1a.tar.gz) = 28d9316601196169a8576ace94daf23f1b673c01
 Size (mpich-1.2.5-1a.tar.gz) = 12381275 bytes
 SHA1 (mpich-docs.tgz) = fb7a9c7459998b9b74584d2afc4553027d94ad10
 Size (mpich-docs.tgz) = 326405 bytes
-SHA1 (patch-aa) = 2575ea0e7c8fd41850432fc6a32dc8999c59828a
+SHA1 (patch-aa) = fa6d5f16cbc88b850906a7cc970ad73e62bee50d
 SHA1 (patch-ak) = 8ad7340a9a95087649a96c823e5d0965922e209b
 SHA1 (patch-al) = 0f889dba558d9bd5122610f2ce2aecda6d6c5323
 SHA1 (patch-am) = ebebecac0ee222284ba75ea300d0fedc99c7fea8
@@ -16,3 +16,5 @@ SHA1 (patch-at) = faeec80f8e35546e830873886d00e4332444a29a
 SHA1 (patch-au) = 00a6f439d2bb65269780f2141dbd588b147e890d
 SHA1 (patch-av) = 5d4330ea9ff8e4fe09879f092b0e4032fba54c13
 SHA1 (patch-aw) = a1a98f08743cd1d33187b37ceb24ff5c4fcd731a
+SHA1 (patch-ax) = 4f11502bf24b69f3aa8994a175529dd5cfda3be1
+SHA1 (patch-ay) = 72ac437696041c4771913e8f36a6b379c9e1057a
diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index 9e3bc0a3687..147309a58b6 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2003/03/27 21:07:05 jschauma Exp $
+$NetBSD: patch-aa,v 1.4.2.1 2003/12/07 16:36:49 agc Exp $
 
 --- configure.orig	Mon Mar 24 16:28:18 2003
 +++ configure	Mon Mar 24 16:29:00 2003
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 2003/03/27 21:07:05 jschauma Exp $
 -  exit (u.c[sizeof (long) - 1] == 1);
 +	int     indian = 1;
 +	
-+	exit(*(char *)&indian));
++	exit(1 - *(char *)&indian);
  }
  EOF
          if test -n "$compile" ; then 
diff --git a/parallel/mpi-ch/patches/patch-ax b/parallel/mpi-ch/patches/patch-ax
new file mode 100644
index 00000000000..9b89d1b5a75
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ax
@@ -0,0 +1,21 @@
+$NetBSD: patch-ax,v 1.2.2.2 2003/12/07 16:36:49 agc Exp $
+
+Correct syntax error in configure.
+
+--- src/fortran/configure.orig	Wed Nov 26 23:05:27 2003
++++ src/fortran/configure	Wed Nov 26 23:06:09 2003
+@@ -4601,12 +4601,12 @@
+     ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&5'
+     if { (eval echo configure:4603: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
+         if test ! -d conftest ; then mkdir conftest2 ; fi
+-	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
++	        { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+         { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+         ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&5'
+         for ldir in "-L" "-Wl,-L," ; do
+             if { (eval echo configure:4609: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
+-	        pac_cv_prog_f77_library_dir_flag="$ldir"
++	        pac_cv_prog_f77_library_dir_flag="${ldir}"
+ 	        break
+             fi
+         done
diff --git a/parallel/mpi-ch/patches/patch-ay b/parallel/mpi-ch/patches/patch-ay
new file mode 100644
index 00000000000..789e7baf1f8
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ay
@@ -0,0 +1,54 @@
+$NetBSD: patch-ay,v 1.1.2.2 2003/12/07 16:36:49 agc Exp $
+
+"rm -rf" with no arguments causes "usage" error messages; avoid this.
+
+--- MPI-2-C++/configure.orig	Wed Nov 26 23:33:22 2003
++++ MPI-2-C++/configure	Wed Nov 26 23:33:37 2003
+@@ -3249,15 +3249,13 @@
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+   libmpi_found=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+   libmpi_found=no
+ fi
+-rm -f conftest*
++rm -rf conftest*
+ if test "$libmpi_found" = "yes"; then
+     echo "$ac_t""yes" 1>&6
+ else
+@@ -3465,12 +3463,10 @@
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+   use_pending=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+   use_pending=no
+ fi
+ rm -f conftest*
+@@ -3976,7 +3972,7 @@
+ EOF
+ 
+ fi
+-/bin/rm -f conftest*
++rm -f conftest*
+ 
+ # Don't ask.  It's an AIX thing.  <sob>
+ if test "$?host" = "0"; then
+@@ -4052,7 +4048,7 @@
+ EOF
+ 
+ fi
+-/bin/rm -f conftest*
++rm -f conftest*
+ 
+ LDFLAGS=$SAVE_LDFLAGS
+ LIBS=$SAVE_LIBS