Attachment #139603 for bug #185884





USE_PYTHON=	yes
USE_PYDISTUTILS=yes
PYTHON_PY3K_PLIST_HACK=yes

OPTIONS_DEFINE=	X11 HTML_NOTEBOOK ZMQ
OPTIONS_DEFAULT=X11 ZMQ

	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
.endif

.include <bsd.port.pre.mk>

.if ${PYTHON_MAJOR_VER} == "3"
PLIST_SUB+=	IPYTHON_SUFFIX="3"
.else
PLIST_SUB+=	IPYTHON_SUFFIX=""
.endif

.include <bsd.port.post.mk>


Lines 1-11 Link Here

(-)devel/ipython/pkg-plist (-8 / +8 lines)
1	bin/ipcluster	1	bin/ipcluster%%IPYTHON_SUFFIX%%
2	bin/ipcontroller	2	bin/ipcontroller%%IPYTHON_SUFFIX%%
3	bin/ipengine	3	bin/ipengine%%IPYTHON_SUFFIX%%
4	bin/iplogger	4	bin/iplogger%%IPYTHON_SUFFIX%%
5	bin/iptest	5	bin/iptest%%IPYTHON_SUFFIX%%
6	bin/ipython	6	bin/ipython%%IPYTHON_SUFFIX%%
7	bin/irunner	7	bin/irunner%%IPYTHON_SUFFIX%%
8	bin/pycolor	8	bin/pycolor%%IPYTHON_SUFFIX%%
9	man/man1/ipcluster.1.gz	9	man/man1/ipcluster.1.gz
10	man/man1/ipcontroller.1.gz	10	man/man1/ipcontroller.1.gz
11	man/man1/ipengine.1.gz	11	man/man1/ipengine.1.gz

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=/usr/local/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 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 16-21 Link Here

(-)math/py-numexpr/Makefile (+1 lines)
16		16
17	USE_PYTHON= yes	17	USE_PYTHON= yes
18	USE_PYDISTUTILS=yes	18	USE_PYDISTUTILS=yes
		19	PYTHON_PY3K_PLIST_HACK=yes
19		20
20	post-patch:	21	post-patch:
21	@${REINPLACE_CMD} -e 's\|$import$ $setuptools$\|\1 do_not_use_\2\|' ${WRKSRC}/${PYSETUP}	22	@${REINPLACE_CMD} -e 's\|$import$ $setuptools$\|\1 do_not_use_\2\|' ${WRKSRC}/${PYSETUP}

Lines 8-14 Link Here

(-)misc/py-pexpect/files/patch-pexpect-__init__.py (-1 / +1 lines)
8	- if TIOCSWINSZ == 2148037735:	8	- if TIOCSWINSZ == 2148037735:
9	- # Same bits, but with sign.	9	- # Same bits, but with sign.
10	- TIOCSWINSZ = -2146929561	10	- TIOCSWINSZ = -2146929561
11	+ TIOCSWINSZ = getattr(termios, 'TIOCSWINSZ', 2148037735L)	11	+ TIOCSWINSZ = getattr(termios, 'TIOCSWINSZ', 2148037735)
12	# Note, assume ws_xpixel and ws_ypixel are zero.	12	# Note, assume ws_xpixel and ws_ypixel are zero.
13	s = struct.pack('HHHH', rows, cols, 0, 0)	13	s = struct.pack('HHHH', rows, cols, 0, 0)
14	fcntl.ioctl(self.fileno(), TIOCSWINSZ, s)	14	fcntl.ioctl(self.fileno(), TIOCSWINSZ, s)

Lines 24-30 Link Here

(-)x11/libxcb/Makefile (-1 / +1 lines)
24	USE_GNOME= libxslt:build	24	USE_GNOME= libxslt:build
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26	USE_XORG= xau xdmcp	26	USE_XORG= xau xdmcp
27	USE_PYTHON_BUILD= yes	27	USE_PYTHON_BUILD= 2
28		28
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30	.for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS	30	.for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS

Lines 13-19 Link Here

(-)x11/xcb-proto/Makefile (-1 / +1 lines)
13		13
14	USE_BZIP2= yes	14	USE_BZIP2= yes
15	USES= pathfix	15	USES= pathfix
16	USE_PYTHON= yes	16	USE_PYTHON= 2
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18		18
19	DATADIR= ${PREFIX}/share/xcb	19	DATADIR= ${PREFIX}/share/xcb

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 16-21 Link Here

(-)devel/ipython/Makefile (-1 / +11 lines)
16		16
17	USE_PYTHON= yes	17	USE_PYTHON= yes
18	USE_PYDISTUTILS=yes	18	USE_PYDISTUTILS=yes
		19	PYTHON_PY3K_PLIST_HACK=yes
19		20
20	OPTIONS_DEFINE= X11 HTML_NOTEBOOK ZMQ	21	OPTIONS_DEFINE= X11 HTML_NOTEBOOK ZMQ
21	OPTIONS_DEFAULT=X11 ZMQ	22	OPTIONS_DEFAULT=X11 ZMQ
Lines 45-48 Link Here
45	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}	46	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
46	.endif	47	.endif
47		48
48	.include <bsd.port.mk>	49	.include <bsd.port.pre.mk>
		50
		51	.if ${PYTHON_MAJOR_VER} == "3"
		52	PLIST_SUB+= IPYTHON_SUFFIX="3"
		53	.else
		54	PLIST_SUB+= IPYTHON_SUFFIX=""
		55	.endif
		56
		57	.include <bsd.port.post.mk>
		58

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>