From owner-freebsd-ports Sun Mar 25 19:30: 7 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9DB3337B71A for ; Sun, 25 Mar 2001 19:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f2Q3U1995822; Sun, 25 Mar 2001 19:30:01 -0800 (PST) (envelope-from gnats) Received: from freedom.ie.cycu.edu.tw (freedom.ie.cycu.edu.tw [140.135.138.6]) by hub.freebsd.org (Postfix) with ESMTP id 1817837B719 for ; Sun, 25 Mar 2001 19:20:54 -0800 (PST) (envelope-from horance@freedom.ie.cycu.edu.tw) Received: (from horance@localhost) by freedom.ie.cycu.edu.tw (8.11.3/8.10.2) id f2Q3KT002278; Mon, 26 Mar 2001 11:20:29 +0800 (CST) Message-Id: <200103260320.f2Q3KT002278@freedom.ie.cycu.edu.tw> Date: Mon, 26 Mar 2001 11:20:29 +0800 (CST) From: horance@freedom.ie.cycu.edu.tw Reply-To: horance@freedom.ie.cycu.edu.tw To: FreeBSD-gnats-submit@freebsd.org Cc: horance@freedom.ie.cycu.edu.tw X-Send-Pr-Version: 3.113 Subject: ports/26089: ports-update: devel/swarm Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26089 >Category: ports >Synopsis: dirty patches for building errors. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 25 19:30:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Horance Chou >Release: FreeBSD 4.3-BETA i386 >Organization: FreeBSD NETLAB Server >Environment: System: FreeBSD freedom.ie.cycu.edu.tw 4.3-BETA FreeBSD 4.3-BETA #0: Sun Mar 25 19:57:15 CST 2001 root@mail.ie.cycu.edu.tw:/usr/src/sys/compile/FREEDOM i386 >Description: the configure scripts in swarm-1.4.1 can't find tcl/tk libs correctly. >How-To-Repeat: >Fix: patches attached below: ------------------------------------------------ diff -rNu swarm.orig/Makefile swarm/Makefile --- swarm.orig/Makefile Mon Mar 26 09:54:22 2001 +++ swarm/Makefile Mon Mar 26 10:17:45 2001 @@ -21,9 +21,9 @@ 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 diff -rNu swarm.orig/files/patch-ad swarm/files/patch-ad --- swarm.orig/files/patch-ad Mon Mar 26 09:54:22 2001 +++ swarm/files/patch-ad Mon Mar 26 10:57:23 2001 @@ -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 -rNu swarm.orig/pkg-descr swarm/pkg-descr --- swarm.orig/pkg-descr Mon Mar 26 09:54:22 2001 +++ swarm/pkg-descr Mon Mar 26 10:58:52 2001 @@ -7,3 +7,5 @@ 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/ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message