Attachment #143532 for bug #185884

Lines 23-28 Link Here

(-)devel/py-qt4/bsd.pyqt.mk (+1 lines)
23	PYQT4_DISTINFO_FILE= ${.CURDIR}/../../devel/py-qt4/distinfo	23	PYQT4_DISTINFO_FILE= ${.CURDIR}/../../devel/py-qt4/distinfo
24	QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}	24	QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}
25	QSCI2_DISTINFO_FILE= ${.CURDIR}/../../devel/qscintilla2/distinfo	25	QSCI2_DISTINFO_FILE= ${.CURDIR}/../../devel/qscintilla2/distinfo
		26	PYTHON_PY3K_PLIST_HACK= yes
26		27
27	PYQT4_COMPONENTS= assistant core dbus dbussupport declarative \	28	PYQT4_COMPONENTS= assistant core dbus dbussupport declarative \
28	demo designer designerplugin doc gui help \	29	demo designer designerplugin doc gui help \




ARGS+=		--debug --trace
.endif

.include <bsd.port.pre.mk>

PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
.if ${PYTHON_MAJOR_VER} != "3"
BAD_UIC_PORT_DIR=	port_v3
.else
BAD_UIC_PORT_DIR=	port_v2
.endif

post-patch:
	${RM} -rf ${WRKSRC}/pyuic/uic/${BAD_UIC_PORT_DIR}

do-configure:
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\

		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\
		`ls *.py */*.py */*/*.py`

.include <bsd.port.post.mk>




%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyo
%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.py
%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyc
%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyo

%%API%%share/qt4/qsci/api/python/QtCore.api
@dirrm share/py-sip/QtCore
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic

Lines 149-154 Link Here

(-)devel/llvm33/Makefile (+2 lines)
149	CONFIGURE_ARGS+= --with-optimize-option=-O2	149	CONFIGURE_ARGS+= --with-optimize-option=-O2
150	.endif	150	.endif
151		151
		152	CONFIGURE_ARGS+= --with-python=${LOCALBASE}/bin/python2
		153
152	post-patch:	154	post-patch:
153	${REINPLACE_CMD} -e 's\|${PORTVERSION}svn\|${PORTVERSION}\|g' \	155	${REINPLACE_CMD} -e 's\|${PORTVERSION}svn\|${PORTVERSION}\|g' \
154	${WRKSRC}/configure	156	${WRKSRC}/configure

Lines 33-39 Link Here

(-)emulators/virtualbox-ose/Makefile (-1 / +1 lines)
33	ONLY_FOR_ARCHS= i386 amd64	33	ONLY_FOR_ARCHS= i386 amd64
34	USES= compiler iconv pkgconfig tar:bzip2	34	USES= compiler iconv pkgconfig tar:bzip2
35	USE_GNOME= libidl	35	USE_GNOME= libidl
36	USE_PYTHON_BUILD= yes	36	USE_PYTHON_BUILD= 2
37		37
38	HAS_CONFIGURE= yes	38	HAS_CONFIGURE= yes
39	CONFIGURE_ARGS+= --disable-java --passive-mesa	39	CONFIGURE_ARGS+= --disable-java --passive-mesa

Return to bug 185884

Lines 54-80 Link Here

(-)devel/py-qt4-core/pkg-plist (-22 / +22 lines)
54	%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py	54	%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py
55	%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc	55	%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc
56	%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo	56	%%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo
57	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.py	57	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.py
58	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyc	58	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyc
59	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyo	59	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyo
60	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.py	60	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.py
61	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyc	61	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyc
62	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyo	62	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyo
63	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.py	63	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.py
64	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyc	64	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyc
65	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyo	65	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyo
66	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.py	66	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.py
67	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyc	67	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyc
68	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyo	68	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyo
69	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.py	69	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.py
70	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyc	70	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyc
71	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyo	71	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyo
72	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.py	72	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.py
73	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyc	73	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyc
74	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyo	74	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyo
75	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.py	75	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.py
76	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyc	76	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyc
77	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyo	77	%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyo
78	%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.py	78	%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.py
79	%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyc	79	%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyc
80	%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyo	80	%%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyo
Lines 200-206 Link Here
200	%%API%%share/qt4/qsci/api/python/QtCore.api	200	%%API%%share/qt4/qsci/api/python/QtCore.api
201	@dirrm share/py-sip/QtCore	201	@dirrm share/py-sip/QtCore
202	@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins	202	@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins
203	@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2	203	@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%
204	@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader	204	@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader
205	@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler	205	@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler
206	@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic	206	@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic

Lines 53-60 Link Here

(-)devel/py-qt4-core/Makefile (-2 / +11 lines)
53	ARGS+= --debug --trace	53	ARGS+= --debug --trace
54	.endif	54	.endif
55		55
		56	.include <bsd.port.pre.mk>
		57
		58	PLIST_SUB+= PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
		59	.if ${PYTHON_MAJOR_VER} != "3"
		60	BAD_UIC_PORT_DIR= port_v3
		61	.else
		62	BAD_UIC_PORT_DIR= port_v2
		63	.endif
		64
56	post-patch:	65	post-patch:
57	${RM} -rf ${WRKSRC}/pyuic/uic/port_v3	66	${RM} -rf ${WRKSRC}/pyuic/uic/${BAD_UIC_PORT_DIR}
58		67
59	do-configure:	68	do-configure:
60	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\	69	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
Lines 75-78 Link Here
75	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\	84	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\
76	`ls .py /.py //.py`	85	`ls .py /.py //.py`
77		86
78	.include <bsd.port.mk>	87	.include <bsd.port.post.mk>