[pkgsrc/trunk]: pkgsrc/math/scilab make this work again after the tcl/tk pack...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/math/scilab make this work again after the tcl/tk pack...
From: dmcmahill <dmcmahill%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:46:23 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d27ea759da91
branches:  trunk
changeset: 471386:d27ea759da91
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Sun Mar 28 17:26:21 2004 +0000

description:
make this work again after the tcl/tk package thread enabling

diffstat:

 math/scilab/Makefile         |  15 ++++++++-----
 math/scilab/distinfo         |   5 ++-
 math/scilab/patches/patch-ab |  44 ++++++++++++++++++++++++++++++++++++++++-
 math/scilab/patches/patch-ak |  46 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 10 deletions(-)

diffs (158 lines):

diff -r 18966b7da5a1 -r d27ea759da91 math/scilab/Makefile
--- a/math/scilab/Makefile      Sun Mar 28 15:51:25 2004 +0000
+++ b/math/scilab/Makefile      Sun Mar 28 17:26:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2004/03/19 01:26:58 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.52 2004/03/28 17:26:21 dmcmahill Exp $
 #
 
 DISTNAME=      ${SCIBASE}.src
@@ -31,11 +31,14 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-xaw3d
 
-TCL_DIR=${LOCALBASE}
-CONFIGURE_ARGS+=       --with-tcl-library=${TCL_DIR}/lib
-CONFIGURE_ARGS+=       --with-tcl-include=${TCL_DIR}/include
-CONFIGURE_ARGS+=       --with-tk-library=${TCL_DIR}/lib
-CONFIGURE_ARGS+=       --with-tk-include=${TCL_DIR}/include
+EVAL_PREFIX+=          TCL_PREFIX=tcl
+EVAL_PREFIX+=          TK_PREFIX=tk
+CONFIGURE_ARGS+=       --with-tcl-library=${TCL_PREFIX}/lib
+CONFIGURE_ARGS+=       --with-tcl-include=${TCL_PREFIX}/include
+CONFIGURE_ARGS+=       --with-tk-library=${TK_PREFIX}/lib
+CONFIGURE_ARGS+=       --with-tk-include=${TK_PREFIX}/include
+CONFIGURE_ENV+=                TCL_CONFIG_SH=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
+CONFIGURE_ENV+=                TK_CONFIG_SH=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
 # override HOME to avoid picking up a bad ${HOME}/.scilab during the build
 MAKE_ENV+=             HOME=${WRKSRC}
diff -r 18966b7da5a1 -r d27ea759da91 math/scilab/distinfo
--- a/math/scilab/distinfo      Sun Mar 28 15:51:25 2004 +0000
+++ b/math/scilab/distinfo      Sun Mar 28 17:26:21 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2004/03/19 01:26:58 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2004/03/28 17: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
@@ -7,7 +7,7 @@
 SHA1 (scilab-2.7/scicos_blocks.tar.gz) = bdf4eef1a47417a8f816ae213fc4e262e2605b79
 Size (scilab-2.7/scicos_blocks.tar.gz) = 3219 bytes
 SHA1 (patch-aa) = beff3639c05a493be2f4ca677ce7116b46447c20
-SHA1 (patch-ab) = 9ae2f21964a26cf881790314d9f5db12a640794a
+SHA1 (patch-ab) = 65f64acb3e4f506e1a11554956ecc80ce03cb6a1
 SHA1 (patch-ac) = 8d8e2352815b4c1ad61545ccb7e430169eae876e
 SHA1 (patch-ad) = 3554377aa2188f55355218408a9e12b5faef177b
 SHA1 (patch-ae) = f6517a89612cf3acf38cdfc8e9ea5f1d03476308
@@ -16,3 +16,4 @@
 SHA1 (patch-ah) = c8b5b418c9dd6d809ccfe2ebbd72514c2243a898
 SHA1 (patch-ai) = a99bd6b3cd27a6328343ae9247e291eea635402c
 SHA1 (patch-aj) = 231a10acd752c8dc8039cae8c011f78dbbfa56fa
+SHA1 (patch-ak) = 67cf702688a819ee0641f7a887b6c68f13cd855d
diff -r 18966b7da5a1 -r d27ea759da91 math/scilab/patches/patch-ab
--- a/math/scilab/patches/patch-ab      Sun Mar 28 15:51:25 2004 +0000
+++ b/math/scilab/patches/patch-ab      Sun Mar 28 17:26:21 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2003/11/01 12:26:21 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.7 2004/03/28 17:26:21 dmcmahill Exp $
 
---- configure.orig     2003-02-06 02:42:04.000000000 -0500
+--- configure.orig     Thu Feb  6 07:42:04 2003
 +++ configure
 @@ -7085,8 +7085,8 @@ echo "$as_me: error: Unable to configure
    *-*-solaris*)
@@ -43,3 +43,43 @@
     FC_PICFLAGS='-fPIC'
     # check for --export-dynamic
     ac_save_LDFLAGS="$LDFLAGS"
+@@ -13100,6 +13100,10 @@ CHK_TCL_MIN=$TCL_MINOR_VERSION
+ TCL_LIB_OK=0
+   echo "$as_me:13101: checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION" >&5
+ echo $ECHO_N "checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION... $ECHO_C" >&6
++if test -n "$TCL_CONFIG_SH" ; then  
++      . $TCL_CONFIG_SH
++fi    
++LDFLAGS="$LDFLAGS $TCL_LIBS" 
+ dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* 
/usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib  /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ ."
+ libexts="so so.1.0 sl dylib a"
+ libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN"
+@@ -13256,7 +13260,7 @@ fi
+ done
+ 
+                       if test $TCL_LIB_OK = 1; then
+-                              TCLTK_LIBS=" $TCL_LIB $TCLTK_LIBS"
++                              TCLTK_LIBS=" $TCL_LIB $TCL_LIBS $TCLTK_LIBS"
+                               break;
+                       fi
+               fi
+@@ -13376,6 +13380,10 @@ TK_LIB_OK=0
+ 
+ echo "$as_me:13377: checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION" >&5
+ echo $ECHO_N "checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION... $ECHO_C" >&6
++if test -n "$TK_CONFIG_SH" ; then  
++      . $TK_CONFIG_SH
++fi    
++LDFLAGS="$LDFLAGS $TK_LIBS" 
+ dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* 
/usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.*  /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl 
/usr/local/tcl/lib /usr/tcl/lib /sw/lib "
+ libexts="so so.1.0 sl dylib a"
+ libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN"
+@@ -13553,7 +13561,7 @@ done
+ echo "$as_me: error: tk library not found" >&2;}
+    { (exit 1); exit 1; }; }
+   else
+-        TCLTK_LIBS=$TK_LIB" $TCLTK_LIBS"
++        TCLTK_LIBS=" $TK_LIB $TK_LIBS $TCLTK_LIBS"
+         WITH_TKSCI=1
+   fi
+ 
diff -r 18966b7da5a1 -r d27ea759da91 math/scilab/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/scilab/patches/patch-ak      Sun Mar 28 17:26:21 2004 +0000
@@ -0,0 +1,46 @@
+$NetBSD: patch-ak,v 1.7 2004/03/28 17:26:21 dmcmahill Exp $
+
+--- aclocal.m4.orig    Wed Feb  5 08:23:59 2003
++++ aclocal.m4
+@@ -132,7 +132,11 @@ dnl  TCL_LIB : flag to link against tcl 
+ CHK_TCL_MAJ=$1
+ CHK_TCL_MIN=$2
+ TCL_LIB_OK=0
+-  AC_MSG_CHECKING([for tcl library tcl$1.$2])
++AC_MSG_CHECKING([for tcl library tcl$1.$2])
++if test -n "$TCL_CONFIG_SH" ; then
++      . $TCL_CONFIG_SH
++fi
++LDFLAGS="$LDFLAGS $TCL_LIBS"
+ dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* 
/usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib  /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ ."
+ libexts="so so.1.0 sl dylib a"
+ libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN"
+@@ -287,6 +291,10 @@ CHK_TK_MIN=$2
+ TK_LIB_OK=0
+ 
+ AC_MSG_CHECKING([for tk library tk$1.$2])
++if test -n "$TK_CONFIG_SH" ; then
++      . $TK_CONFIG_SH
++fi
++LDFLAGS="$LDFLAGS $TK_LIBS"
+ dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* 
/usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.*  /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl 
/usr/local/tcl/lib /usr/tcl/lib /sw/lib "
+ libexts="so so.1.0 sl dylib a"
+ libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN"
+@@ -384,7 +392,7 @@ dnl In addition, if the test was OK, the
+               if test $TCL_VERSION_OK = 1; then
+                       AC_CHECK_TCL_LIB($TCL_MAJOR_VERSION,$TCL_MINOR_VERSION)
+                       if test $TCL_LIB_OK = 1; then 
+-                              TCLTK_LIBS=" $TCL_LIB $TCLTK_LIBS"
++                              TCLTK_LIBS=" $TCL_LIB $TCL_LIBS $TCLTK_LIBS"
+                               break;
+                       fi
+               fi
+@@ -416,7 +424,7 @@ dnl In addition, if the test was OK, the
+   if test $TK_LIB_OK = 0; then 
+         AC_MSG_ERROR([tk library not found])
+   else 
+-        TCLTK_LIBS=$TK_LIB" $TCLTK_LIBS"
++        TCLTK_LIBS=" $TK_LIB $TK_LIBS $TCLTK_LIBS"
+         WITH_TKSCI=1
+   fi
+ ])
Prev by Date: [pkgsrc/trunk]: pkgsrc/databases/tcl-fbsql Update the version number to match...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of tcl-fbsql to 1.06.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/databases/tcl-fbsql Update the version number to match...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of tcl-fbsql to 1.06.
Indexes:
Home | Main Index | Thread Index | Old Index