Fri Nov 29 12:53:26 2013 UTC ()
Fix extraction of rpath options from Fortran linker.


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/biology/mpqc/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/biology/mpqc/patches/patch-configure
cvs diff -r1.1.1.1 -r1.2 pkgsrc/biology/mpqc/distinfo (expand / switch to unified diff)

--- pkgsrc/biology/mpqc/distinfo 2013/03/16 12:43:26 1.1.1.1
+++ pkgsrc/biology/mpqc/distinfo 2013/11/29 12:53:26 1.2
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.1.1.1 2013/03/16 12:43:26 asau Exp $ 1$NetBSD: distinfo,v 1.2 2013/11/29 12:53:26 joerg Exp $
2 2
3SHA1 (mpqc-2.3.1.tar.bz2) = f89fcbe6e07e90abe02fc21dbce045a2a749f65d 3SHA1 (mpqc-2.3.1.tar.bz2) = f89fcbe6e07e90abe02fc21dbce045a2a749f65d
4RMD160 (mpqc-2.3.1.tar.bz2) = 0e3b395e9ed663b9c3de120fb4f5a00bc40c7e0f 4RMD160 (mpqc-2.3.1.tar.bz2) = 0e3b395e9ed663b9c3de120fb4f5a00bc40c7e0f
5Size (mpqc-2.3.1.tar.bz2) = 2521392 bytes 5Size (mpqc-2.3.1.tar.bz2) = 2521392 bytes
6SHA1 (patch-configure) = ee1259c038c7a3eeadea1e71c803e6fa2e7972cc 6SHA1 (patch-configure) = 068fd398204ebae1d9373db0dc83c88344f20b99
7SHA1 (patch-configure.in) = 6c72b054c278b3ea10bbe30ba16c480afe08dc3c 7SHA1 (patch-configure.in) = 6c72b054c278b3ea10bbe30ba16c480afe08dc3c
8SHA1 (patch-src_bin_mpqc_ccarunproc) = 3ba0297fcda9b0a105bd1f04dea6345569a47ffe 8SHA1 (patch-src_bin_mpqc_ccarunproc) = 3ba0297fcda9b0a105bd1f04dea6345569a47ffe
9SHA1 (patch-src_bin_mpqc_mpqcrunproc) = f005f8eef684f2b12e27211865f726faabd59ee9 9SHA1 (patch-src_bin_mpqc_mpqcrunproc) = f005f8eef684f2b12e27211865f726faabd59ee9
cvs diff -r1.1.1.1 -r1.2 pkgsrc/biology/mpqc/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/biology/mpqc/patches/patch-configure 2013/03/16 12:43:26 1.1.1.1
+++ pkgsrc/biology/mpqc/patches/patch-configure 2013/11/29 12:53:26 1.2
@@ -1,67 +1,99 @@ @@ -1,67 +1,99 @@
1$NetBSD: patch-configure,v 1.1.1.1 2013/03/16 12:43:26 asau Exp $ 1$NetBSD: patch-configure,v 1.2 2013/11/29 12:53:26 joerg Exp $
2 2
3--- configure.orig 2006-03-22 19:13:52.000000000 +0000 3--- configure.orig 2006-03-22 19:13:52.000000000 +0000
4+++ configure 4+++ configure
5@@ -2290,7 +2290,7 @@ if test "${with_cca_chem_config+set}" =  5@@ -2290,7 +2290,7 @@ if test "${with_cca_chem_config+set}" =
6  6
7 else 7 else
8  8
9- if test "$components" == "yes"; then 9- if test "$components" == "yes"; then
10+ if test "$components" = "yes"; then 10+ if test "$components" = "yes"; then
11 # Extract the first word of "cca-chem-config", so it can be a program name with args. 11 # Extract the first word of "cca-chem-config", so it can be a program name with args.
12 set dummy cca-chem-config; ac_word=$2 12 set dummy cca-chem-config; ac_word=$2
13 echo "$as_me:$LINENO: checking for $ac_word" >&5 13 echo "$as_me:$LINENO: checking for $ac_word" >&5
14@@ -5207,7 +5207,7 @@ case $target_cpu in 14@@ -4349,7 +4349,12 @@ fi
 15
 16 done
 17 ;;
 18- -[lLR]*)
 19+ -R*)
 20+ ac_arg="-Wl,$ac_arg"
 21+ shift
 22+ set X $ac_arg "$@"
 23+ ;;
 24+ -[lLR]*|-Wl*)
 25 ac_exists=false
 26 for ac_i in $ac_cv_f77_libs; do
 27 if test x"$ac_arg" = x"$ac_i"; then
 28@@ -5207,7 +5212,7 @@ case $target_cpu in
15 ;; 29 ;;
16 esac 30 esac
17  31
18-if test X$GXX == Xyes; then 32-if test X$GXX == Xyes; then
19+if test X$GXX = Xyes; then 33+if test X$GXX = Xyes; then
20 echo "$as_me:$LINENO: checking for C++ cpu tuning flag" >&5 34 echo "$as_me:$LINENO: checking for C++ cpu tuning flag" >&5
21 echo $ECHO_N "checking for C++ cpu tuning flag... $ECHO_C" >&6 35 echo $ECHO_N "checking for C++ cpu tuning flag... $ECHO_C" >&6
22  36
23@@ -5265,7 +5265,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu 37@@ -5265,7 +5270,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
24 echo "${ECHO_T}$cxx_tuneflag" >&6 38 echo "${ECHO_T}$cxx_tuneflag" >&6
25 fi 39 fi
26  40
27-if test X$GCC == Xyes; then 41-if test X$GCC == Xyes; then
28+if test X$GCC = Xyes; then 42+if test X$GCC = Xyes; then
29 echo "$as_me:$LINENO: checking for C cpu tuning flag" >&5 43 echo "$as_me:$LINENO: checking for C cpu tuning flag" >&5
30 echo $ECHO_N "checking for C cpu tuning flag... $ECHO_C" >&6 44 echo $ECHO_N "checking for C cpu tuning flag... $ECHO_C" >&6
31 CFLAGS_SAV=$CFLAGS 45 CFLAGS_SAV=$CFLAGS
32@@ -28629,10 +28629,10 @@ ENABLESHARED=$enable_shared 46@@ -6563,7 +6568,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 47 int
 48 main ()
 49 {
 50-pthread_join(0,0);
 51+pthread_create(0,0,0,0);
 52 ;
 53 return 0;
 54 }
 55@@ -6697,7 +6702,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 56 int
 57 main ()
 58 {
 59-pthread_join(0,0);
 60+pthread_create(0,0,0,0);
 61 ;
 62 return 0;
 63 }
 64@@ -28629,10 +28634,10 @@ ENABLESHARED=$enable_shared
33  65
34  66
35  67
36-if test $components == "yes"; then 68-if test $components == "yes"; then
37+if test $components = "yes"; then 69+if test $components = "yes"; then
38  70
39- if test $HAVE_MPI == "yes" && 71- if test $HAVE_MPI == "yes" &&
40- test $HAVE_MPIPP == "no"; then 72- test $HAVE_MPIPP == "no"; then
41+ if test $HAVE_MPI = "yes" && 73+ if test $HAVE_MPI = "yes" &&
42+ test $HAVE_MPIPP = "no"; then 74+ test $HAVE_MPIPP = "no"; then
43 { { echo "$as_me:$LINENO: error: libmpi++ needed for mpi cca components" >&5 75 { { echo "$as_me:$LINENO: error: libmpi++ needed for mpi cca components" >&5
44 echo "$as_me: error: libmpi++ needed for mpi cca components" >&2;} 76 echo "$as_me: error: libmpi++ needed for mpi cca components" >&2;}
45 { (exit 1); exit 1; }; } 77 { (exit 1); exit 1; }; }
46@@ -28808,10 +28808,10 @@ echo "$as_me: WARNING: Ccaffeine not con 78@@ -28808,10 +28813,10 @@ echo "$as_me: WARNING: Ccaffeine not con
47  79
48  80
49  81
50- if test $ENABLE_PYTHON == "yes"; then 82- if test $ENABLE_PYTHON == "yes"; then
51+ if test $ENABLE_PYTHON = "yes"; then 83+ if test $ENABLE_PYTHON = "yes"; then
52 # check for babel python 84 # check for babel python
53 BABEL_PYTHON_ENABLE=`$BABEL_CONFIG --query-var=SUPPORT_PYTHON` 85 BABEL_PYTHON_ENABLE=`$BABEL_CONFIG --query-var=SUPPORT_PYTHON`
54- if test $BABEL_PYTHON_ENABLE == "false"; then 86- if test $BABEL_PYTHON_ENABLE == "false"; then
55+ if test $BABEL_PYTHON_ENABLE = "false"; then 87+ if test $BABEL_PYTHON_ENABLE = "false"; then
56 { { echo "$as_me:$LINENO: error: Babel not properly configured for python" >&5 88 { { echo "$as_me:$LINENO: error: Babel not properly configured for python" >&5
57 echo "$as_me: error: Babel not properly configured for python" >&2;} 89 echo "$as_me: error: Babel not properly configured for python" >&2;}
58 { (exit 1); exit 1; }; } 90 { (exit 1); exit 1; }; }
59@@ -28846,7 +28846,7 @@ echo "$as_me: error: Ccaffeine not prope 91@@ -28846,7 +28851,7 @@ echo "$as_me: error: Ccaffeine not prope
60 echo -e "ccafe bin:\n $CCAFE_BIN" 92 echo -e "ccafe bin:\n $CCAFE_BIN"
61 echo -e "ccafe python enabled:\n $CCAFE_PYTHON_ENABLE" 93 echo -e "ccafe python enabled:\n $CCAFE_PYTHON_ENABLE"
62 echo -e "ccafe mpi enabled\n $CCAFE_MPI_ENABLE" 94 echo -e "ccafe mpi enabled\n $CCAFE_MPI_ENABLE"
63- if test $CCAFE_MPI_ENABLE == "yes"; then 95- if test $CCAFE_MPI_ENABLE == "yes"; then
64+ if test $CCAFE_MPI_ENABLE = "yes"; then 96+ if test $CCAFE_MPI_ENABLE = "yes"; then
65 echo -e "ccafe mpi include:\n $CCAFE_MPI_INCLUDE" 97 echo -e "ccafe mpi include:\n $CCAFE_MPI_INCLUDE"
66 echo -e "ccafe mpi lib:\n $CCAFE_MPI_LIB" 98 echo -e "ccafe mpi lib:\n $CCAFE_MPI_LIB"
67 echo -e "ccafe mpi bin:\n $CCAFE_MPI_BIN" 99 echo -e "ccafe mpi bin:\n $CCAFE_MPI_BIN"