diff options
| author | Michael Reifenberger <mr@FreeBSD.org> | 2015-12-30 00:00:44 +0000 |
|---|---|---|
| committer | Michael Reifenberger <mr@FreeBSD.org> | 2015-12-30 00:00:44 +0000 |
| commit | b9ccfa9c7a976c7f114a6ab75de88ef200fa8715 (patch) | |
| tree | cc803ff0e7f638050b99e16ede40b155c60f01b2 /cad | |
| parent | 00c02af880d17e15d55e6bb013fa28e435f5780d (diff) | |
Try to resolve conflict with archivers/quazip by disabling the internal one from qcad.
PR: 205161
Submitted by: Arrigo Marchiori
Notes
Notes:
svn path=/head/; revision=404790
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/qcad/Makefile | 8 | ||||
| -rw-r--r-- | cad/qcad/files/patch-src_3rdparty_3rdparty.pro | 16 | ||||
| -rw-r--r-- | cad/qcad/pkg-plist | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index ad5bca4d09c5..3baf73cc5c7b 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -4,7 +4,7 @@ PORTNAME= qcad PORTVERSION= 3.12.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad DIST_SUBDIR= ${PORTNAME} @@ -14,7 +14,8 @@ COMMENT= Professional CAD system LICENSE= GPLv3 BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ - ${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs + ${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs \ + ${LOCALBASE}/lib/libquazip.so:${PORTSDIR}/archivers/quazip MAKE_JOBS_UNSAFE=yes @@ -40,8 +41,7 @@ RESDIR= ${WRKSRC}/release .endif SHRLIBS= qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations \ - qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip \ - quazip + qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip STALIBS= dxflib stemmer SHRDIR= fonts libraries patterns plugins scripts ts #QSCRIPTS should not be installed to avoid conflicts with texlive-base diff --git a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro index 957234e6fb48..e45d162f3770 100644 --- a/cad/qcad/files/patch-src_3rdparty_3rdparty.pro +++ b/cad/qcad/files/patch-src_3rdparty_3rdparty.pro @@ -1,14 +1,18 @@ ---- ./src/3rdparty/3rdparty.pro.orig 2013-08-06 17:32:09.000000000 +0200 -+++ ./src/3rdparty/3rdparty.pro 2013-08-08 10:03:33.000000000 +0200 -@@ -4,9 +4,8 @@ +--- 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 @@ + TEMPLATE = subdirs + SUBDIRS = \ spatialindexnavel \ - stemmer +- stemmer \ +- quazip ++ stemmer ++ ++# FreeBSD: prefer quazip and opennurbs from dependent ports -!r_no_opennurbs { - SUBDIRS += opennurbs -} -+# FreeBSD: prefer opennurbs from a dependent port -+ !rs_no_dxf { SUBDIRS += dxflib } diff --git a/cad/qcad/pkg-plist b/cad/qcad/pkg-plist index 381b2628af47..9d368fa66f79 100644 --- a/cad/qcad/pkg-plist +++ b/cad/qcad/pkg-plist @@ -21,8 +21,6 @@ lib/libqcadstemmer.so lib/libqcadstemmer.so.0 lib/libqcadzip.so lib/libqcadzip.so.0 -lib/libquazip.so -lib/libquazip.so.0 lib/libspatialindexnavel.so lib/libspatialindexnavel.so.0 lib/libstemmer.a |