Tue Jul 3 17:42:48 2012 UTC ()
Fix main when using C++ test cases


(joerg)
diff -r1.9 -r1.10 pkgsrc/math/algae/distinfo
diff -r1.4 -r1.5 pkgsrc/math/algae/patches/patch-ab
cvs diff -r1.9 -r1.10 pkgsrc/math/algae/distinfo (expand / switch to unified diff)

--- pkgsrc/math/algae/distinfo 2008/12/14 13:19:15 1.9
+++ pkgsrc/math/algae/distinfo 2012/07/03 17:42:48 1.10
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.9 2008/12/14 13:19:15 tnn Exp $ 1$NetBSD: distinfo,v 1.10 2012/07/03 17:42:48 joerg Exp $
2 2
3SHA1 (algae-4.3.6.tar.gz) = f935540e8479b543d51cf04fc38e6c573679e19c 3SHA1 (algae-4.3.6.tar.gz) = f935540e8479b543d51cf04fc38e6c573679e19c
4RMD160 (algae-4.3.6.tar.gz) = 0dfee737c3eccb59563fd85da8d7772937d5795c 4RMD160 (algae-4.3.6.tar.gz) = 0dfee737c3eccb59563fd85da8d7772937d5795c
5Size (algae-4.3.6.tar.gz) = 1790061 bytes 5Size (algae-4.3.6.tar.gz) = 1790061 bytes
6SHA1 (patch-aa) = c9808abd82f27eb9b41358d8b962553446b473b8 6SHA1 (patch-aa) = c9808abd82f27eb9b41358d8b962553446b473b8
7SHA1 (patch-ab) = 79866650010effa2a7179dc246c835a98b152c1c 7SHA1 (patch-ab) = f98e5bbbf4ee4b21cf7f1c1b9c995195861929a5
8SHA1 (patch-ac) = 0eeb4bf4348cf5bc2ac80d89f7740a24acf1ba7c 8SHA1 (patch-ac) = 0eeb4bf4348cf5bc2ac80d89f7740a24acf1ba7c
9SHA1 (patch-ad) = f169de7ed2a8b0302f8bcd7110ca216526eaf1cb 9SHA1 (patch-ad) = f169de7ed2a8b0302f8bcd7110ca216526eaf1cb
10SHA1 (patch-ae) = 0adef4e7da6ff23e0ea1dd24ae494ac8be2bf067 10SHA1 (patch-ae) = 0adef4e7da6ff23e0ea1dd24ae494ac8be2bf067
11SHA1 (patch-af) = cd1036bf586459815b5b71400ef6cda75963be40 11SHA1 (patch-af) = cd1036bf586459815b5b71400ef6cda75963be40
12SHA1 (patch-ag) = 96e1ffc9fa8e844b83440f22a2d84a513b5cdae2 12SHA1 (patch-ag) = 96e1ffc9fa8e844b83440f22a2d84a513b5cdae2
13SHA1 (patch-ah) = 0d8d0ba684500ecaf1ab4f1d13445dcf89a01980 13SHA1 (patch-ah) = 0d8d0ba684500ecaf1ab4f1d13445dcf89a01980
cvs diff -r1.4 -r1.5 pkgsrc/math/algae/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/math/algae/patches/patch-ab 2005/12/21 17:56:10 1.4
+++ pkgsrc/math/algae/patches/patch-ab 2012/07/03 17:42:48 1.5
@@ -1,27 +1,39 @@ @@ -1,27 +1,39 @@
1$NetBSD: patch-ab,v 1.4 2005/12/21 17:56:10 joerg Exp $ 1$NetBSD: patch-ab,v 1.5 2012/07/03 17:42:48 joerg Exp $
2 2
3--- configure.orig 3--- configure.orig 2003-12-17 03:15:18.000000000 +0000
4+++ configure 4+++ configure
5@@ -1318,7 +1318,7 @@ 5@@ -1331,7 +1331,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
6 LIBS="$LIBS -lm" 6 LIBS="$LIBS -lm"
7 f77_compile='${F77-f77} $FFLAGS -c conftest.f 1>&5 2>&5' 7 f77_compile='${F77-f77} $FFLAGS -c conftest.f 1>&5 2>&5'
8 f77_make='make F77="${F77-f77}" FFLAGS="$FFLAGS" -f conftest.mak conftest.o 1>&5 2>&5' 8 f77_make='make F77="${F77-f77}" FFLAGS="$FFLAGS" -f conftest.mak conftest.o 1>&5 2>&5'
9-c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS conftest.c conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5' 9-c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS conftest.c conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5'
10+c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c && ${F77-f77} conftest.o conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5' 10+c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c && ${F77-f77} conftest.o conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5'
11  11
12 # The next two don't include LDFLAGS, because some loser f77 compilers 12 # The next two don't include LDFLAGS, because some loser f77 compilers
13 # (like on hp) do their own thing with the -L option. 13 # (like on hp) do their own thing with the -L option.
14@@ -4378,60 +4378,12 @@ 14@@ -2561,9 +2561,9 @@ echo $ECHO_N "checking for support of AN
 15 cat > conftest.$ac_ext <<EOF
 16 #line 2562 "configure"
 17 #include "confdefs.h"
 18-int main(int argc, char *argv);
 19+int main(int argc, char **argv);
 20 int t(void);
 21-int main(int argc, char *argv) { return t(); }
 22+int main(int argc, char **argv) { return t(); }
 23 int t(void) { return 0; }
 24 EOF
 25 if eval $ac_compile; then
 26@@ -4435,60 +4435,12 @@ echo "${ECHO_T}\"T\" becomes \"$f77_sym\
15  27
16  28
17 #--------------------------------------------------------------------- 29 #---------------------------------------------------------------------
18-# Where would we expect to find the Fortran libraries? 30-# Where would we expect to find the Fortran libraries?
19-#--------------------------------------------------------------------- 31-#---------------------------------------------------------------------
20- 32-
21- 33-
22-# Check whether --with-fortran-libs or --without-fortran-libs was given. 34-# Check whether --with-fortran-libs or --without-fortran-libs was given.
23-if test "${with_fortran_libs+set}" = set; then 35-if test "${with_fortran_libs+set}" = set; then
24- withval="$with_fortran_libs" 36- withval="$with_fortran_libs"
25- fortran_libs="${withval}" 37- fortran_libs="${withval}"
26-else 38-else
27- # The patterns are not necessarily exclusive, so their order is important. 39- # The patterns are not necessarily exclusive, so their order is important.