py-qscintilla could still run qmake from Qt3 on configure. Fix this by

using the detected qmake where appropriate.

Noticed by naddy@ a few weeks ago, committing now that tree is fully unlocked.

editors/py-qscintilla/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/11/10 22:23:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2014/08/14 22:35:00 zhuk Exp $
 
 COMMENT =	Python binding for the Scintilla source code editor
 
@@ -29,16 +29,12 @@ WRKSRC =	${WRKDIST}/Python
 
 NO_TEST =	Yes
 
-# do not use ./setup.py to build
-CONFIGURE_STYLE = no
-
+CONFIGURE_STYLE = simple
+CONFIGURE_SCRIPT =	${MODPY_BIN} ${WRKSRC}/configure.py
 CONFIGURE_ARGS = --qmake=${LOCALBASE}/bin/qmake4 \
 		--qsci-libdir=${LOCALBASE}/lib \
 		--pyqt-sipdir=${LOCALBASE}/share/sip
 
 MAKE_ENV =	INSTALL_ROOT="${WRKINST}"
 
-do-configure:
-	@cd ${WRKSRC} && ${MODPY_BIN} ${WRKSRC}/configure.py ${CONFIGURE_ARGS}
-
 .include <bsd.port.mk>

editors/py-qscintilla/patches/patch-Python_configure_py

@@ -0,0 +1,13 @@
+$OpenBSD: patch-Python_configure_py,v 1.1 2014/08/14 22:35:00 zhuk Exp $
+Use actual found qmake binary path instead of hardcoded one.
+--- Python/configure.py.orig	Fri Aug  1 13:05:13 2014
++++ Python/configure.py	Fri Aug  1 13:05:57 2014
+@@ -635,7 +635,7 @@ def generate_code(target_config, opts):
+     # Generate the Makefile.
+     inform("Creating the Makefile for the Qsci module...")
+ 
+-    qmake_args = ['qmake']
++    qmake_args = [target_config.qmake]
+     if target_config.qmake_spec != '':
+         qmake_args.append('-spec')
+         qmake_args.append(target_config.qmake_spec)