Attachment #180237 for bug #217305

View | Details | Raw Unified | Return to bug 217305
Collapse All | Expand All

Lines 61-67 MASTER_SITES_PYQT5= SF/pyqt/PyQt5/PyQt-$ Link Here

(-)Mk/Uses/pyqt.mk (-1 / +1 lines)
61	MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \	61	MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
62	GENTOO	62	GENTOO
63		63
64	SIP_VERSION= 4.18	64	SIP_VERSION= 4.19.1
65	QSCI2_VERSION= 2.9.1	65	QSCI2_VERSION= 2.9.1
66	PYQT4_VERSION= 4.11.4	66	PYQT4_VERSION= 4.11.4
67	PYQT5_VERSION= 5.6	67	PYQT5_VERSION= 5.6

Lines 1-3 Link Here

(-)devel/py-sip/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1473848835	1	TIMESTAMP = 1487809848
2	SHA256 (sip-4.18.tar.gz) = f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6	2	SHA256 (sip-4.19.1.tar.gz) = 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e
3	SIZE (sip-4.18.tar.gz) = 991980	3	SIZE (sip-4.19.1.tar.gz) = 1000644




sip 4.16.5 has switched the Makefile lines that invoke the moc utility from
an invocation with an explicit source file name to "$<".

This works with GNU make, but not make(1), where it $< evaluates to nothing
in this context.

Switch back to the previous version to avoid having to depend on devel/gmake
(figuring out which ports need it is not trivial).
--- siputils.py
+++ siputils.py
@@ -1683,7 +1683,7 @@
             cpp = "moc_" + root + ".cpp"
 
             mfile.write("\n%s: %s\n" % (cpp, mf))
-            mfile.write("\t$(MOC) -o %s $<\n" % cpp)
+            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
 
         mfile.write("\n$(TARGET): $(OFILES)\n")
 
@@ -1980,7 +1980,7 @@
                 mf = os.path.join(self._src_dir, mf)
 
             mfile.write("\n%s: %s\n" % (cpp, mf))
-            mfile.write("\t$(MOC) -o %s $<\n" % cpp)
+            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
 
         mfile.write("\n$(TARGET): $(OFILES)\n")
 

Lines 12-17 DISTNAME= ${SIP_DISTNAME} Link Here

(-)devel/py-sip/Makefile (+13 lines)
12	MAINTAINER= kde@FreeBSD.org	12	MAINTAINER= kde@FreeBSD.org
13	COMMENT= Python to C and C++ bindings generator	13	COMMENT= Python to C and C++ bindings generator
14		14
		15	LICENSE= Riverbank
		16	LICENSE_NAME= Riverbank Computing Limited
		17	LICENSE_FILE= ${WRKSRC}/LICENSE
		18	LICENSE_PERMS= auto-accept
		19
15	USES= python pyqt:sip	20	USES= python pyqt:sip
16	USE_PYTHON= concurrent py3kplist	21	USE_PYTHON= concurrent py3kplist
17	USE_PYQT= #	22	USE_PYQT= #
Lines 27-35 PORTDOCS= * Link Here
27	OPTIONS_DEFINE= DOCS DEBUG	32	OPTIONS_DEFINE= DOCS DEBUG
28	DEBUG_CONFIGURE_ON= --debug	33	DEBUG_CONFIGURE_ON= --debug
29		34
		35	pre-patch:
		36	${REINPLACE_CMD} 's\|%s $$<\\n\" % cpp\|%s %s\\n" % (cpp, mf)\|'\
		37	${WRKSRC}/siputils.py
		38
30	do-configure:	39	do-configure:
31	cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}	40	cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
32		41
		42	pre-install:
		43	@${STRIP_CMD} ${WRKSRC}/sipgen/sip
		44	@${STRIP_CMD} ${WRKSRC}/siplib/sip.so
		45
33	post-install:	46	post-install:
34	${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \	47	${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \
35	${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}	48	${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}

Return to bug 217305

Lines 1-28 Link Here

(-)devel/py-sip/files/patch-siputils.py (-28 lines)
1	sip 4.16.5 has switched the Makefile lines that invoke the moc utility from
2	an invocation with an explicit source file name to "$<".
3
4	This works with GNU make, but not make(1), where it $< evaluates to nothing
5	in this context.
6
7	Switch back to the previous version to avoid having to depend on devel/gmake
8	(figuring out which ports need it is not trivial).
9	--- siputils.py
10	+++ siputils.py
11	@@ -1683,7 +1683,7 @@
12	cpp = "moc_" + root + ".cpp"
13
14	mfile.write("\n%s: %s\n" % (cpp, mf))
15	- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
16	+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
17
18	mfile.write("\n$(TARGET): $(OFILES)\n")
19
20	@@ -1980,7 +1980,7 @@
21	mf = os.path.join(self._src_dir, mf)
22
23	mfile.write("\n%s: %s\n" % (cpp, mf))
24	- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
25	+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
26
27	mfile.write("\n$(TARGET): $(OFILES)\n")
28