$OpenBSD: patch-configure_py,v 1.10 2011/05/17 08:38:32 dcoppa Exp $ --- configure.py.orig Sun May 1 14:50:12 2011 +++ configure.py Fri May 13 17:13:34 2011 @@ -1127,6 +1127,17 @@ def run_command(cmd, envvars=None): cmd is the command to run. """ + try: + localbase = os.environ["LOCALBASE"] + except KeyError: + localbase = "/usr/local" + try: + x11base = os.environ["X11BASE"] + except KeyError: + x11base = "/usr/X11R6" + + cmd = cmd.replace("${LOCALBASE}", localbase).replace("$(LOCALBASE)", localbase) + cmd = cmd.replace("${X11BASE}", x11base).replace("$(X11BASE)", x11base) if opts.verbose: sys.stdout.write(cmd + "\n") @@ -1791,7 +1802,7 @@ Type 'no' to decline the terms of the license. sys.stdout.flush() try: - resp = sys.stdin.readline() + resp = "yes" except KeyboardInterrupt: raise SystemExit except: