On Tue, Nov 07, 2017 at 09:12:25PM +0000, Stuart Henderson wrote:
> On 2017/11/01 08:13, Landry Breuil wrote:
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: [email protected] 2017/11/01 08:13:45
> >
> > Modified files:
> > x11/qwt : Makefile distinfo
> > x11/qwt/patches: patch-qwtconfig_pri
> > x11/qwt/pkg : PLIST
> > Removed files:
> > x11/qwt/files : Makefile.examples
> > x11/qwt/patches: patch-designer_designer_pro
> > patch-doc_man_man3_qwtinstall_3
> > patch-doc_man_man3_qwtlicense_3
> > patch-examples_examples_pri patch-src_src_pro
> > x11/qwt/pkg : README
> >
> > Log message:
> > Updqte to qwt 6.1.3
> >
> > Went in a bulk build without fallout, and a requirement for QGIS3.
> > Remove the plumbing manually installing the examples, its .. awkward.
> >
> > ok rsadowski@ ajacoutot@
> >
>
> I have this on i386 for qwt,qt5..
>
> Reading /usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/designer/designer.pro
> [/usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-i386/designer]
> sed -i -e 's/@$(CXX) -M/@$(CXX) $(CXXFLAGS) -M/'
> /usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-amd64/{src,designer}/Makefile
> sed: /usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-amd64/src/Makefile: No such
> file or directory
> *** Error 1 in x11/qwt (Makefile:48 'post-configure')
Doh'! How can i be so dumb sometimes...
Cant really test right now but this should fixit, commit it for me if
thats ok:
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qwt/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 1 Nov 2017 14:13:45 -0000 1.24
+++ Makefile 7 Nov 2017 23:08:05 -0000
@@ -45,7 +45,7 @@
post-configure:
# ensure CXXFLAGS/-std=c++11 is passed to all clang++ invocations,including
the ones generating dependencies
.if ${FLAVOR:Mqt5}
- sed -i -e 's/@$$(CXX) -M/@$$(CXX) $$(CXXFLAGS) -M/'
${WRKSRC}/build-amd64/{src,designer}/Makefile
+ sed -i -e 's/@$$(CXX) -M/@$$(CXX) $$(CXXFLAGS) -M/'
${WRKBUILD}/{src,designer}/Makefile
.endif
post-install: