diff options
| -rw-r--r-- | math/scilab/distinfo | 6 | ||||
| -rw-r--r-- | math/scilab/patches/patch-aa | 42 | ||||
| -rw-r--r-- | math/scilab/patches/patch-ab | 42 |
3 files changed, 79 insertions, 11 deletions
diff --git a/math/scilab/distinfo b/math/scilab/distinfo index a2fca0f7511..abc39bd73d6 100644 --- a/math/scilab/distinfo +++ b/math/scilab/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2003/09/12 20:46:48 dmcmahill Exp $ +$NetBSD: distinfo,v 1.11 2003/11/01 12:26:21 dmcmahill Exp $ SHA1 (scilab-2.7/scilab-2.7.src.tar.gz) = ce1ab6cb06d938239590e31ac3701ced6f9b3505 Size (scilab-2.7/scilab-2.7.src.tar.gz) = 9510676 bytes @@ -6,8 +6,8 @@ SHA1 (scilab-2.7/scicos.tar.gz) = 05ed3013854d8db5fc02651d351f17ee7c5a0dce Size (scilab-2.7/scicos.tar.gz) = 82793 bytes SHA1 (scilab-2.7/scicos_blocks.tar.gz) = bdf4eef1a47417a8f816ae213fc4e262e2605b79 Size (scilab-2.7/scicos_blocks.tar.gz) = 3219 bytes -SHA1 (patch-aa) = 93efb013a8651829dcef30b13fa6de085375d76c -SHA1 (patch-ab) = 2a13fc2bf4bd6dc55dc12480acb4f44b8c5ef14f +SHA1 (patch-aa) = beff3639c05a493be2f4ca677ce7116b46447c20 +SHA1 (patch-ab) = 9ae2f21964a26cf881790314d9f5db12a640794a SHA1 (patch-ac) = 8d8e2352815b4c1ad61545ccb7e430169eae876e SHA1 (patch-ad) = 3554377aa2188f55355218408a9e12b5faef177b SHA1 (patch-ae) = 3428eab766c3a87afdfe25161d8e9b9513f624c0 diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa index 7465ea4b405..08202828ebe 100644 --- a/math/scilab/patches/patch-aa +++ b/math/scilab/patches/patch-aa @@ -1,11 +1,45 @@ -$NetBSD: patch-aa,v 1.7 2003/02/22 04:31:06 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.8 2003/11/01 12:26:21 dmcmahill Exp $ ---- configure.in.orig Thu Feb 20 22:05:02 2003 -+++ configure.in Fri Feb 21 06:46:43 2003 -@@ -992,5 +992,5 @@ +--- configure.in.orig 2003-02-06 02:42:05.000000000 -0500 ++++ configure.in +@@ -427,8 +427,8 @@ case "$host" in + *-*-solaris*) + # standard compilers + CC=cc +- CC_OPTIONS='-O -DSVR4 -DSYSV -Dsolaris' +- CC_LDFLAGS= ++ CC_OPTIONS="${CFLAGS} -DSVR4 -DSYSV -Dsolaris" ++ CC_LDFLAGS="${LDFLAGS}" + if test "$WITH_G77" != yes; then + #AC_CHECK_PROG(F77,f77,yes,no) + AC_CHECK_PROGS(F77,f77 f90 f2c-f77,no) +@@ -438,9 +438,9 @@ case "$host" in + FC="$F77" + fi + #FC="$F77" +- FC_OPTIONS=-O ++ FC_OPTIONS="${FFLAGS}" + FC_OPTIONS_O0= +- FC_LDFLAGS= ++ FC_LDFLAGS="${LDFLAGS}" + LD=ld + LD_LDFLAGS= + if test "$enable_debug" = yes; then +@@ -459,7 +459,7 @@ case "$host" in + FC=g77 + FC_OPTIONS=-O2 + FC_OPTIONS_O0= +- FC_LDFLAGS='-t' ++ FC_LDFLAGS="${LDFLAGS} -t" + # for solaris 2.7 with gcc/g77 2.95.2, binutils 2.9 + # the correct value should be + # FC_LDFLAGS='-t -Wl,-export-dynamic' +@@ -991,7 +991,7 @@ case "$host" in + FC="$F77" FC_OPTIONS="${FFLAGS}" FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[0-9]*//g'` - FC_LDFLAGS="${LDLAGS} -Wl,-R${X11BASE}/lib" + FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" FC_PICFLAGS='-fPIC' # check for --export-dynamic + ac_save_LDFLAGS="$LDFLAGS" diff --git a/math/scilab/patches/patch-ab b/math/scilab/patches/patch-ab index 7e63a7f1cac..84d37bf1300 100644 --- a/math/scilab/patches/patch-ab +++ b/math/scilab/patches/patch-ab @@ -1,11 +1,45 @@ -$NetBSD: patch-ab,v 1.5 2003/02/22 04:31:06 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.6 2003/11/01 12:26:21 dmcmahill Exp $ ---- configure.orig Thu Feb 20 22:05:02 2003 -+++ configure Fri Feb 21 06:47:13 2003 -@@ -10229,5 +10229,5 @@ +--- configure.orig 2003-02-06 02:42:04.000000000 -0500 ++++ configure +@@ -7085,8 +7085,8 @@ echo "$as_me: error: Unable to configure + *-*-solaris*) + # standard compilers + CC=cc +- CC_OPTIONS='-O -DSVR4 -DSYSV -Dsolaris' +- CC_LDFLAGS= ++ CC_OPTIONS="${CFLAGS} -DSVR4 -DSYSV -Dsolaris" ++ CC_LDFLAGS="${LDFLAGS}" + if test "$WITH_G77" != yes; then + #AC_CHECK_PROG(F77,f77,yes,no) + for ac_prog in f77 f90 f2c-f77 +@@ -7137,9 +7137,9 @@ echo "$as_me: error: Unable to configure + #FC="$F77" + FC_OPTIONS=-O + FC_OPTIONS_O0= +- FC_LDFLAGS= ++ FC_LDFLAGS="${LDFLAGS}" + LD=ld +- LD_LDFLAGS= ++ LD_LDFLAGS="${LDFLAGS}" + if test "$enable_debug" = yes; then + CC_OPTIONS='-g -DSVR4 -DSYSV -Dsolaris' + FC_OPTIONS=-g +@@ -7156,7 +7156,7 @@ echo "$as_me: error: Unable to configure + FC=g77 + FC_OPTIONS=-O2 + FC_OPTIONS_O0= +- FC_LDFLAGS='-t' ++ FC_LDFLAGS="${LDFLAGS} -t" + # for solaris 2.7 with gcc/g77 2.95.2, binutils 2.9 + # the correct value should be + # FC_LDFLAGS='-t -Wl,-export-dynamic' +@@ -10228,7 +10228,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + FC="$F77" FC_OPTIONS="${FFLAGS}" FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O0-9*//g'` - FC_LDFLAGS="${LDLAGS} -Wl,-R${X11BASE}/lib" + FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" FC_PICFLAGS='-fPIC' # check for --export-dynamic + ac_save_LDFLAGS="$LDFLAGS" |