head 1.3; access; symbols pkgsrc-2019Q2:1.2.0.48 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.46 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.44 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.42 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.40 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.38 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.36 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.34 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.30 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.28 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.26 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.24 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.22 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.20 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.18 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.16 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.14 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.12 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.10 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.8 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.6 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.4 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.2 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.1.0.92 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.90 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.88 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.86 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.84 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.82 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.80 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.78 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.76 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.74 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.72 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.70 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.68 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.66 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.64 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.62 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.60 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.58 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.56 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.54 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.52 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.50 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.48 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.46 pkgsrc-2008Q1:1.1.0.44 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.42 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.40 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.3 date 2019.09.11.10.53.53; author adam; state dead; branches; next 1.2; commitid BbG15xZi3OJbdACB; 1.2 date 2013.10.27.20.17.40; author markd; state Exp; branches; next 1.1; commitid 1lj8h2Zf4DH0hYax; 1.1 date 2002.06.15.06.54.01; author sjg; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.06.15.06.54.01; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.18.45.04; author jlam; state Exp; branches; next ; desc @@ 1.3 log @removed py-expect @ text @$NetBSD: patch-af,v 1.2 2013/10/27 20:17:40 markd Exp $ --- expvers.py.~1~ Fri Jun 14 13:09:31 2002 +++ expvers.py Fri Jun 14 13:36:32 2002 @@@@ -2,7 +2,7 @@@@ import sys import posix -import strop +import string def exists(path): try: @@@@ -27,12 +27,12 @@@@ def is_executable(path): def pathjoin(dir, base): return '%s/%s' % (dir, base) def pathsplit(path): - p = strop.rfind(path, '/') + p = string.rfind(path, '/') if p >= 0: return (path[:p], path[p+1:]) return ('', path) def splitext(path): - p = strop.rfind(path, '.') + p = string.rfind(path, '.') if p >= 0: return (path[:p], path[p:]) return (path, '') @@@@ -64,21 +64,21 @@@@ def ticks(*cmdargs): wpid = None while wpid != pid: (wpid, wstat) = posix.wait() - v = strop.join(l)[:-1] + v = string.join(l)[:-1] if wstat: raise RuntimeError, v return v def expect_expr(*args): global expect_prog - cmd = 'puts [%s]' % strop.join(map(str, args)) + cmd = 'puts [%s]' % string.join(map(str, args)) result = ticks(expect_prog, '-c', cmd) return result def get_version(prog): version = expect_expr('exp_version') - if strop.count(version, '.') > 1: - p = strop.rfind(version, '.') + if string.count(version, '.') > 1: + p = string.rfind(version, '.') return (version[:p], version) else: return (version, version) @@@@ -105,7 +105,7 @@@@ raise SystemExit, "Cannot find expect interpreter" del d basevers, fullvers = get_version(expect_prog) - libdir = pathjoin(basedir, pathjoin('lib', 'expect' + basevers)) + libdir = pathjoin(basedir, pathjoin('lib', pathjoin('tcl', 'expect' + basevers))) del f else: @@@@ -115,7 +115,7 @@@@ else: elif posix.environ.has_key('EXPECT'): expect_prog = posix.environ['EXPECT'] else: - path = strop.split(posix.environ['PATH'], ':') + path = string.split(posix.environ['PATH'], ':') for dir in path: f = pathjoin(dir, 'expect') if is_executable(f): @ 1.2 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-af,v 1.1 2002/06/15 06:54:01 sjg Exp $ @ 1.1 log @Make this build with python-2.2.1 @ text @d1 1 a1 1 $NetBSD$ d54 9 @ 1.1.2.1 log @file patch-af was added on branch buildlink2 on 2002-06-23 18:45:04 +0000 @ text @d1 62 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 62 $NetBSD: patch-af,v 1.1.2.1 2002/06/23 18:45:04 jlam Exp $ --- expvers.py.~1~ Fri Jun 14 13:09:31 2002 +++ expvers.py Fri Jun 14 13:36:32 2002 @@@@ -2,7 +2,7 @@@@ import sys import posix -import strop +import string def exists(path): try: @@@@ -27,12 +27,12 @@@@ def is_executable(path): def pathjoin(dir, base): return '%s/%s' % (dir, base) def pathsplit(path): - p = strop.rfind(path, '/') + p = string.rfind(path, '/') if p >= 0: return (path[:p], path[p+1:]) return ('', path) def splitext(path): - p = strop.rfind(path, '.') + p = string.rfind(path, '.') if p >= 0: return (path[:p], path[p:]) return (path, '') @@@@ -64,21 +64,21 @@@@ def ticks(*cmdargs): wpid = None while wpid != pid: (wpid, wstat) = posix.wait() - v = strop.join(l)[:-1] + v = string.join(l)[:-1] if wstat: raise RuntimeError, v return v def expect_expr(*args): global expect_prog - cmd = 'puts [%s]' % strop.join(map(str, args)) + cmd = 'puts [%s]' % string.join(map(str, args)) result = ticks(expect_prog, '-c', cmd) return result def get_version(prog): version = expect_expr('exp_version') - if strop.count(version, '.') > 1: - p = strop.rfind(version, '.') + if string.count(version, '.') > 1: + p = string.rfind(version, '.') return (version[:p], version) else: return (version, version) @@@@ -115,7 +115,7 @@@@ else: elif posix.environ.has_key('EXPECT'): expect_prog = posix.environ['EXPECT'] else: - path = strop.split(posix.environ['PATH'], ':') + path = string.split(posix.environ['PATH'], ':') for dir in path: f = pathjoin(dir, 'expect') if is_executable(f): @