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')
The non-qt5 one built ok.
Full log:
>>> Building on i386-2 under x11/qwt,qt5
BDEPENDS =
[x11/qt5/qttools,-main;archivers/bzip2;x11/qt5/qtsvg;x11/qt5/qttools;x11/qt5/qtbase,-main;devel/gmake]
DIST = [x11/qwt:qwt-6.1.3.tar.bz2]
FULLPKGNAME = qwt-6.1.3-qt5
RDEPENDS = [x11/qt5/qtbase,-main;x11/qt5/qttools;x11/qt5/qtsvg]
(Junk lock obtained for i386-2 at 1509973914)
>>> Running depends in x11/qwt,qt5 at 1509973914
last junk was in x11/xfce4/xfce4-cpugraph
/usr/sbin/pkg_add -aI -Dunsigned -Drepair qtbase-5.9.2 qtsvg-5.9.2 qttools-5.9.2
was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair bzip2-1.0.6p8 gmake-4.2.1
qtbase-5.9.2 qtsvg-5.9.2 qttools-5.9.2
/usr/sbin/pkg_add -aI -Dunsigned -Drepair qtbase-5.9.2 qtsvg-5.9.2 qttools-5.9.2
>>> Running show-prepare-results in x11/qwt,qt5 at 1509973916
===> x11/qwt,qt5
===> qwt-6.1.3-qt5 depends on: qttools-* -> qttools-5.9.2
===> qwt-6.1.3-qt5 depends on: gmake-* -> gmake-4.2.1
===> qwt-6.1.3-qt5 depends on: bzip2-* -> bzip2-1.0.6p8
===> qwt-6.1.3-qt5 depends on: qtsvg-* -> qtsvg-5.9.2
===> qwt-6.1.3-qt5 depends on: qttools-* -> qttools-5.9.2
===> qwt-6.1.3-qt5 depends on: qtbase-* -> qtbase-5.9.2
===> Verifying specs: GL Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5OpenGL
Qt5PrintSupport Qt5Svg Qt5Widgets Qt5Xml c++ c++abi pthread m
===> found GL.17.1 Qt5Concurrent.2.2 Qt5Core.2.2 Qt5Designer.2.2 Qt5Gui.2.2
Qt5OpenGL.2.2 Qt5PrintSupport.2.2 Qt5Svg.2.2 Qt5Widgets.2.2 Qt5Xml.2.2 c++.1.0
c++abi.0.0 pthread.25.1 m.10.0
bzip2-1.0.6p8
gmake-4.2.1
qtbase-5.9.2
qtsvg-5.9.2
qttools-5.9.2
(Junk lock released for i386-2 at 1509973917)
distfiles size=4245614
>>> Running patch in x11/qwt,qt5 at 1509973917
===> x11/qwt,qt5
===> Checking files for qwt-6.1.3-qt5
`/mnt/distfiles/qwt-6.1.3.tar.bz2' is up to date.
===> Extracting for qwt-6.1.3-qt5
===> Patching for qwt-6.1.3-qt5
===> Applying OpenBSD patch patch-qwtconfig_pri
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-qwtconfig_pri,v 1.3 2017/11/01 14:13:45 landry Exp $
|
|Index: qwtconfig.pri
|--- qwtconfig.pri.orig
|+++ qwtconfig.pri
--------------------------
Patching file qwtconfig.pri using Plan A...
Hunk #1 succeeded at 19.
Hunk #2 succeeded at 28.
Hunk #3 succeeded at 42.
Hunk #4 succeeded at 63.
done
===> Compiler link: clang -> /usr/bin/clang
===> Compiler link: clang++ -> /usr/bin/clang++
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
>>> Running configure in x11/qwt,qt5 at 1509973918
===> x11/qwt,qt5
===> Configuring for qwt-6.1.3-qt5
/usr/bin/perl /usr/ports/infrastructure/bin/pkg_subst
-DWRKINST=/usr/obj/ports/qwt-6.1.3-qt5/fake-i386-qt5 -DQTVER=qt5
-DLIBqwt_VERSION=7.0 -DMACHINE_ARCH=i386 -DARCH=i386
-DHOMEPAGE=http://qwt.sourceforge.net/ -D^PREFIX=/usr/local -D^SYSCONFDIR=/etc
-DFLAVOR_EXT=-qt5 -DFULLPKGNAME=qwt-6.1.3-qt5 -DMAINTAINER=The\ OpenBSD\ ports\
mailing-list\ \<[email protected]\> -D^BASE_PKGPATH=x11/qwt,qt5
-D^LOCALBASE=/usr/local -D^X11BASE=/usr/X11R6 -D^TRUEPREFIX=/usr/local
-D^RCDIR=/etc/rc.d -D^LOCALSTATEDIR=/var -i -B /usr/obj/ports/qwt-6.1.3-qt5
/usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/qwtconfig.pri
/usr/local/bin/qmake-qt5 PREFIX=/usr/local QMAKE_CFLAGS=-O2 -pipe
QMAKE_CFLAGS_RELEASE=-O2 -pipe QMAKE_CXX=c++ QMAKE_CXXFLAGS=-O2 -pipe
QMAKE_CXXFLAGS_RELEASE=-O2 -pipe QMAKE_LFLAGS= QMAKE_LFLAGS_RELEASE=
-recursive /usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/./qwt.pro
Info: creating stash file
/usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-i386/.qmake.stash
Reading /usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/src/src.pro
[/usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-i386/src]
Reading /usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/textengines/textengines.pro
[/usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-i386/textengines]
Reading /usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/doc/doc.pro
[/usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-i386/doc]
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')
*** Error 1 in x11/qwt (/usr/ports/infrastructure/mk/bsd.port.mk:2711
'/usr/obj/ports/qwt-6.1.3-qt5/qwt-6.1.3/build-i386/.configure_done')
*** Error 1 in x11/qwt (/usr/ports/infrastructure/mk/bsd.port.mk:2425
'configure')
===> Exiting x11/qwt,qt5 with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'configure')
Error: job failed with 256 on i386-2
