> It picked the wrong qmake, Qt3 <> Qt4 confusion?

This should fix it. Works for me on i386.

N.B.: The patches/ subdirectory needs to be created first.

--
WBR,
  Vadim Zhukov


Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile    10 Nov 2013 22:23:43 -0000      1.6
+++ Makefile    1 Aug 2014 20:39:04 -0000
@@ -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>
Index: patches/patch-Python_configure_py
===================================================================
RCS file: patches/patch-Python_configure_py
diff -N patches/patch-Python_configure_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Python_configure_py   1 Aug 2014 20:39:04 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+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)

Reply via email to