Date: Sat, 7 Oct 2017 12:14:30 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451456 - in head/x11-toolkits/qwt6: . files Message-ID: <201710071214.v97CEUQd059242@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Sat Oct 7 12:14:30 2017 New Revision: 451456 URL: https://svnweb.freebsd.org/changeset/ports/451456 Log: Update to 6.1.3. PR: 219640 Submitted by: pfg@ Added: head/x11-toolkits/qwt6/files/patch-qwt.prf (contents, props changed) head/x11-toolkits/qwt6/files/patch-textengines_textengines.pri (contents, props changed) Modified: head/x11-toolkits/qwt6/Makefile head/x11-toolkits/qwt6/distinfo head/x11-toolkits/qwt6/files/patch-qwtconfig.pri head/x11-toolkits/qwt6/files/patch-src__src.pro Modified: head/x11-toolkits/qwt6/Makefile ============================================================================== --- head/x11-toolkits/qwt6/Makefile Sat Oct 7 09:49:56 2017 (r451455) +++ head/x11-toolkits/qwt6/Makefile Sat Oct 7 12:14:30 2017 (r451456) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= qwt -PORTVERSION= 6.1.0 -PORTREVISION= 2 +PORTVERSION= 6.1.3 CATEGORIES= x11-toolkits MASTER_SITES= SF PKGNAMESUFFIX= 6 @@ -25,8 +24,6 @@ PLIST_SUB= INCLUDEDIR=include/qwt6 \ OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's,qwtAddLibrary(qwt),qwtAddLibrary(qwt6),g' \ - ${WRKSRC}/qwt.prf ${WRKSRC}/textengines/textengines.pri @${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro post-install-DOCS-on: Modified: head/x11-toolkits/qwt6/distinfo ============================================================================== --- head/x11-toolkits/qwt6/distinfo Sat Oct 7 09:49:56 2017 (r451455) +++ head/x11-toolkits/qwt6/distinfo Sat Oct 7 12:14:30 2017 (r451456) @@ -1,2 +1,3 @@ -SHA256 (qwt-6.1.0.tar.bz2) = a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 -SIZE (qwt-6.1.0.tar.bz2) = 3468850 +TIMESTAMP = 1507295399 +SHA256 (qwt-6.1.3.tar.bz2) = f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 +SIZE (qwt-6.1.3.tar.bz2) = 4245614 Added: head/x11-toolkits/qwt6/files/patch-qwt.prf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/qwt6/files/patch-qwt.prf Sat Oct 7 12:14:30 2017 (r451456) @@ -0,0 +1,8 @@ +--- qwt.prf.orig 2017-10-06 14:51:04 UTC ++++ qwt.prf +@@ -34,4 +34,4 @@ else { + } + + # QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} +-qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt) ++qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt6) Modified: head/x11-toolkits/qwt6/files/patch-qwtconfig.pri ============================================================================== --- head/x11-toolkits/qwt6/files/patch-qwtconfig.pri Sat Oct 7 09:49:56 2017 (r451455) +++ head/x11-toolkits/qwt6/files/patch-qwtconfig.pri Sat Oct 7 12:14:30 2017 (r451456) @@ -1,24 +1,24 @@ ---- ./qwtconfig.pri.orig 2013-05-30 15:18:27.767341000 +0000 -+++ ./qwtconfig.pri 2013-07-13 21:02:00.112110333 +0000 -@@ -19,7 +19,7 @@ +--- qwtconfig.pri.orig 2016-06-13 07:14:23 UTC ++++ qwtconfig.pri +@@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] unix { - QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION + QWT_INSTALL_PREFIX = $$PREFIX + # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION } - win32 { -@@ -27,7 +27,7 @@ +@@ -29,7 +29,7 @@ win32 { } QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc -QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include -+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt6/ ++QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt6 QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib ###################################################################### -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_P # with every Qt upgrade. ###################################################################### @@ -27,7 +27,7 @@ # QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features ###################################################################### -@@ -108,7 +108,7 @@ +@@ -110,7 +110,7 @@ QWT_CONFIG += QwtOpenGL # to your qmake project file. ###################################################################### @@ -36,12 +36,12 @@ ###################################################################### # If you want to build the Qwt designer plugin, -@@ -116,7 +116,7 @@ +@@ -118,7 +118,7 @@ QWT_CONFIG += QwtOpenGL # Otherwise you have to build it from the designer directory. ###################################################################### -QWT_CONFIG += QwtDesigner -+# QWT_CONFIG += QwtDesigner ++#QWT_CONFIG += QwtDesigner ###################################################################### # Compile all Qwt classes into the designer plugin instead Modified: head/x11-toolkits/qwt6/files/patch-src__src.pro ============================================================================== --- head/x11-toolkits/qwt6/files/patch-src__src.pro Sat Oct 7 09:49:56 2017 (r451455) +++ head/x11-toolkits/qwt6/files/patch-src__src.pro Sat Oct 7 12:14:30 2017 (r451456) @@ -1,11 +1,11 @@ ---- ./src/src.pro.orig 2013-05-30 15:18:27.693341000 +0000 -+++ ./src/src.pro 2013-07-13 20:54:02.367114849 +0000 -@@ -15,7 +15,7 @@ - include( $${QWT_ROOT}/qwtfunctions.pri ) +--- src/src.pro.orig 2016-06-13 07:14:23 UTC ++++ src/src.pro +@@ -17,7 +17,7 @@ include( $${QWT_ROOT}/qwtfunctions.pri ) + QWT_OUT_ROOT = $${OUT_PWD}/.. TEMPLATE = lib -TARGET = $$qwtLibraryTarget(qwt) +TARGET = $$qwtLibraryTarget(qwt$${QWT_VER_MAJ}) - DESTDIR = $${QWT_ROOT}/lib + DESTDIR = $${QWT_OUT_ROOT}/lib Added: head/x11-toolkits/qwt6/files/patch-textengines_textengines.pri ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/qwt6/files/patch-textengines_textengines.pri Sat Oct 7 12:14:30 2017 (r451456) @@ -0,0 +1,11 @@ +--- textengines/textengines.pri.orig 2017-10-06 14:51:21 UTC ++++ textengines/textengines.pri +@@ -34,7 +34,7 @@ contains(QWT_CONFIG, QwtFramework) { + CONFIG += lib_bundle + } + +-qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt) ++qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt6) + + # Install directives +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710071214.v97CEUQd059242>