diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-09-25 20:12:03 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-09-25 20:12:03 +0000 |
| commit | b25105fb9bd11288033eaa06f828cad31f7b6f97 (patch) | |
| tree | 39252a73b6d97609e103a59abfbc51c33d1a650e /cad/qcad | |
| parent | 69662462b77890459fcc974c17c4228426b3cf35 (diff) | |
| download | ports-b25105fb9bd11288033eaa06f828cad31f7b6f97.tar.gz ports-b25105fb9bd11288033eaa06f828cad31f7b6f97.zip | |
Update Qt5 to 5.11.2
PR: 231560
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=480692
Diffstat (limited to 'cad/qcad')
| -rw-r--r-- | cad/qcad/Makefile | 2 | ||||
| -rw-r--r-- | cad/qcad/files/patch-src_3rdparty_3rdparty.pro | 25 | ||||
| -rw-r--r-- | cad/qcad/pkg-plist | 1 |
3 files changed, 21 insertions, 7 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index a3875eaab88f..819c81b6561c 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -4,7 +4,7 @@ PORTNAME= qcad PORTVERSION= 3.21.1.1 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad DIST_SUBDIR= ${PORTNAME} diff --git a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro index e45d162f3770..bfa6892fc13a 100644 --- a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro +++ b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro @@ -1,18 +1,33 @@ ---- src/3rdparty/3rdparty.pro.orig 2015-11-24 15:13:30.000000000 +0100 -+++ src/3rdparty/3rdparty.pro 2015-12-23 10:01:28.113511000 +0100 -@@ -2,12 +2,10 @@ +Second hunk: fix a version of the shipped qtscriptgenerator, as when updating Qt, the new one might +not yet be bundled in the tarball. + +--- src/3rdparty/3rdparty.pro.orig 2018-07-03 13:46:04 UTC ++++ src/3rdparty/3rdparty.pro +@@ -2,21 +2,19 @@ include (../../shared.pri) TEMPLATE = subdirs SUBDIRS = \ spatialindexnavel \ - stemmer \ - quazip + stemmer -+ -+# FreeBSD: prefer quazip and opennurbs from dependent ports -!r_no_opennurbs { - SUBDIRS += opennurbs -} ++# FreeBSD: prefer quazip and opennurbs from dependent ports ++ !rs_no_dxf { SUBDIRS += dxflib } + + !r_mobile { +- exists(qt-labs-qtscriptgenerator-$${QT_VERSION}) { +- SUBDIRS += qt-labs-qtscriptgenerator-$${QT_VERSION} ++ exists(qt-labs-qtscriptgenerator-5.11.1) { ++ SUBDIRS += qt-labs-qtscriptgenerator-5.11.1 + } + else { +- error("Script bindings not available for Qt version $${QT_VERSION}. You can add them to src/3rdparty/qt-labs-qtscriptgenerator-$${QT_VERSION} or use another version of Qt.") ++ error("Script bindings not available for Qt version 5.11.1. You can add them to src/3rdparty/qt-labs-qtscriptgenerator-5.11.1 or use another version of Qt.") + } + } diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist index 14869d39480d..6f039f32e3be 100644 --- a/cad/qcad/pkg-plist +++ b/cad/qcad/pkg-plist @@ -24,7 +24,6 @@ lib/libqcadzip.so.0 lib/libspatialindexnavel.so lib/libspatialindexnavel.so.0 lib/libstemmer.a -share/applications/usr_local_bin_qcadbin.desktop %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calibration.dxf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.dxf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.dxf |