head 1.4; access; symbols pkgsrc-2019Q2:1.3.0.48 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.46 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.44 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.42 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.40 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.38 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.36 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.34 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.30 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.28 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.26 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.24 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.22 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.20 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.18 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.16 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.14 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.12 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.10 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.8 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.6 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.4 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.2 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.2.0.82 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.80 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.78 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.76 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.74 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.72 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.70 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.68 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.66 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.64 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.62 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.60 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.58 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.56 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.54 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.52 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.50 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.48 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.46 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.36 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2019.09.11.10.53.53; author adam; state dead; branches; next 1.3; commitid BbG15xZi3OJbdACB; 1.3 date 2013.10.27.20.17.40; author markd; state Exp; branches; next 1.2; commitid 1lj8h2Zf4DH0hYax; 1.2 date 2004.03.11.17.43.50; author minskim; state Exp; branches; next 1.1; 1.1 date 2001.03.21.23.36.07; author jwise; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.03.21.23.36.07; author jwise; state Exp; branches; next ; desc @@ 1.4 log @removed py-expect @ text @$NetBSD: patch-ab,v 1.3 2013/10/27 20:17:40 markd Exp $ --- configure.orig 2000-11-05 18:07:38.000000000 +0000 +++ configure @@@@ -1357,7 +1357,7 @@@@ echo "$ac_t""$PYTH_vers" 1>&6 # _multiply_ the python version major version by one thousand, but minor # version is only multiplied by one hundred (not really, but for m.n.p # version numbers, it works) -PYTH_versnum=`echo $PYTH_vers | sed 's/b[0-9]//' | +PYTH_versnum=`echo $PYTH_vers | sed 's/b[0-9]//;s/p/\./' | sed 's/^[0-9]\./0&/;s/\.\([0-9]\)\./.0\1./g;s/\.\([0-9]\)$/\.0\1/;s/\.//g' | sed 's/^\(....\)$/\100/'` @@@@ -1395,20 +1395,20 @@@@ echo "$ac_t""$EXP_vers" 1>&6 echo $ac_n "checking Expect library location""... $ac_c" 1>&6 echo "configure:1398: checking Expect library location" >&5 -if test -n "${EXP_LIB}"; then - if test x${enable_forcea:+X} = xX -a -f "${EXP_LIB}"; then - : - elif test x${enable_forcea:+X} = xX; then - { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; } - else - f="${EXP_LIBDIR}/lib${EXP_LIB}.*" - if test "`echo $f`" = "$f"; then - { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; } - fi - fi -else - EXP_LIB="expect${EXP_VERS}" -fi +#if test -n "${EXP_LIB}"; then +# if test x${enable_forcea:+X} = xX -a -f "${EXP_LIB}"; then +# : +# elif test x${enable_forcea:+X} = xX; then +# { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; } +# else +# f="${EXP_LIBDIR}/lib${EXP_LIB}.*" +# if test "`echo $f`" = "$f"; then +# { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; } +# fi +# fi +#else + EXP_LIB="expect`echo ${EXP_VERS} | sed -e 's,\.,,'`" +#fi echo "$ac_t""$EXP_LIB" 1>&6 @@@@ -1542,7 +1542,7 @@@@ case ${EXP_VERS} in esac case ${EXP_VERS} in 5.31*|5.32*) - if ! -f $with_expect/expect_cf.h ; then + if [ ! -f $with_expect/include/expect.h ] ; then { echo "configure: error: Must build with Expect's source tree" 1>&2; exit 1; } fi ;; @ 1.3 log @Fix configure test for expect library. Also merge patch-aa into patch-af as patching same file. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2004/03/11 17:43:50 minskim Exp $ @ 1.2 log @Make this package build with pthread-enabled Python. It will close PR pkg/24748. While here, bl3ify and switch to Tcl 8.4. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2000-11-05 12:07:38.000000000 -0600 d14 16 a29 4 @@@@ -1407,7 +1407,7 @@@@ if test -n "${EXP_LIB}"; then fi fi else d31 13 d45 1 a45 1 fi d48 1 @ 1.1 log @Initial revision @ text @d2 13 a14 3 --- configure.orig Sun Nov 5 10:07:38 2000 +++ configure Wed Mar 21 11:54:56 2001 @@@@ -1407,7 +1407,7 @@@@ d23 1 a23 1 @@@@ -1542,7 +1542,7 @@@@ @ 1.1.1.1 log @Initial import of py-expect-1.9b1, an interface to expect from python. @ text @@