the configure scripts in swarm-1.4.1 can't find tcl/tk libs correctly.

PR:		26089
Submitted by:	Horance Chou <horance@freedom.ie.cycu.edu.tw> MAINTAINER

3 files changed, 24 insertions, 11 deletions

diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 9c2376a..562409b 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -21,9 +21,9 @@ USE_XPM=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
-		--with-tclincludedir=${PREFIX}/include/tcl8.2 \
-		--with-tkincludedir=${PREFIX}/include/tk8.2 \
-		--with-tclscriptdir=${PREFIX}/lib/tcl8.2 \
-		--with-tkscriptdir=${PREFIX}/lib/tk8.2
+		--with-tclincludedir=${PREFIX}/include/tcl8.3 \
+		--with-tkincludedir=${PREFIX}/include/tk8.3 \
+		--with-tclscriptdir=${PREFIX}/lib/tcl8.3 \
+		--with-tkscriptdir=${PREFIX}/lib/tk8.3
 
 .include <bsd.port.mk>
diff --git a/devel/swarm/files/patch-ad b/devel/swarm/files/patch-ad
index 76fc8b8..98225e6 100644
--- a/devel/swarm/files/patch-ad
+++ b/devel/swarm/files/patch-ad
@@ -1,5 +1,5 @@
---- configure.orig	Mon Feb  8 13:59:28 1999
-+++ configure	Thu Nov  4 12:42:01 1999
+--- configure.orig	Mon Feb  8 19:59:28 1999
++++ configure	Mon Mar 26 10:17:49 2001
 @@ -1105,7 +1105,7 @@
  test -n "$OBJC" || OBJC="$CC"
  
@@ -9,14 +9,25 @@
  
  
  # Check whether --enable-shared or --disable-shared was given.
+@@ -1394,8 +1394,8 @@
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
 @@ -2647,8 +2647,8 @@
  if test -n "$with_tcldir" ; then               
    PATH=${with_tcldir}/bin:$PATH
  fi
 -# Extract the first word of "tclsh8.0", so it can be a program name with args.
 -set dummy tclsh8.0; ac_word=$2
-+# Extract the first word of "tclsh8.2", so it can be a program name with args.
-+set dummy tclsh8.2; ac_word=$2
++# Extract the first word of "tclsh8.3", so it can be a program name with args.
++set dummy tclsh8.3; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  echo "configure:2654: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_tclsh8_found'+set}'`\" = set"; then
@@ -25,7 +36,7 @@
  tclLibrary=''
  if test $tclsh8_found = yes; then
 -  tclLibrary=`echo "puts [info library]" | tclsh8.0`
-+  tclLibrary=`echo "puts [info library]" | tclsh8.2`
++  tclLibrary=`echo "puts [info library]" | tclsh8.3`
  else
    if test $tclsh_found = yes; then
      tclLibrary=`echo "puts [info library]" | tclsh`
@@ -34,7 +45,7 @@
        fi
      else
 -      for version in 81 8.1 80 8.0 76 7.6 7.5 7.4 ''; do
-+      for version in 82 8.2 80 8.0 76 7.6 7.5 7.4 ''; do
++      for version in 83 82 8.2 80 8.0 76 7.6 7.5 7.4 ''; do
          if test -r $expand_dir/libtcl${version}${suffix}; then
            tcllibdir=$dir  
            tcllibname=tcl$version
@@ -61,7 +72,7 @@
        fi
      else
 -      for version in 81 8.1 80 8.0 42 4.2 4.1 4.0 ''; do
-+      for version in 82 8.2 80 8.0 42 4.2 4.1 4.0 ''; do
++      for version in 83 82 8.2 80 8.0 42 4.2 4.1 4.0 ''; do
          if test -r $expand_dir/libtk${version}${suffix}; then
            tklibdir=$dir
            tklibname=tk${version}
diff --git a/devel/swarm/pkg-descr b/devel/swarm/pkg-descr
index a6b5431..2e9ace8 100644
--- a/devel/swarm/pkg-descr
+++ b/devel/swarm/pkg-descr
@@ -7,3 +7,5 @@ this architecture, we can implement a large variety of agent based
 models. Our initial target is Unix machines running GNU Objective C
 and X windows: the source code is freely available under GNU Licensing
 terms.
+
+WWW: http://www.swarm.org/