View | Details | Raw Unified | Return to bug 205161 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +3 lines)
Lines 14-20 Link Here
14
LICENSE=	GPLv3
14
LICENSE=	GPLv3
15
15
16
BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
16
BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
17
		${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
17
		${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs \
18
		libquazip.so:${PORTSDIR}/archivers/quazip
18
19
19
MAKE_JOBS_UNSAFE=yes
20
MAKE_JOBS_UNSAFE=yes
20
21
Lines 40-47 Link Here
40
.endif
41
.endif
41
42
42
SHRLIBS=	qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations	\
43
SHRLIBS=	qcadcore qcadecmaapi qcadentity qcadgrid qcadgui qcadoperations	\
43
		qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip \
44
		qcadsnap qcadspatialindex qcadstemmer spatialindexnavel qcadzip 
44
		quazip
45
STALIBS=	dxflib stemmer
45
STALIBS=	dxflib stemmer
46
SHRDIR=		fonts libraries patterns plugins scripts ts
46
SHRDIR=		fonts libraries patterns plugins scripts ts
47
#QSCRIPTS should not be installed to avoid conflicts with texlive-base
47
#QSCRIPTS should not be installed to avoid conflicts with texlive-base
(-)files/patch-src_3rdparty_3rdparty.pro (-6 / +10 lines)
Lines 1-14 Link Here
1
--- ./src/3rdparty/3rdparty.pro.orig	2013-08-06 17:32:09.000000000 +0200
1
--- src/3rdparty/3rdparty.pro.orig	2015-11-24 15:13:30.000000000 +0100
2
+++ ./src/3rdparty/3rdparty.pro	2013-08-08 10:03:33.000000000 +0200
2
+++ src/3rdparty/3rdparty.pro	2015-12-23 10:01:28.113511000 +0100
3
@@ -4,9 +4,8 @@
3
@@ -2,12 +2,10 @@
4
 TEMPLATE = subdirs
5
 SUBDIRS = \
4
     spatialindexnavel \
6
     spatialindexnavel \
5
     stemmer
7
-    stemmer \
8
-    quazip
9
+    stemmer
10
+
11
+# FreeBSD: prefer quazip and opennurbs from dependent ports
6
 
12
 
7
-!r_no_opennurbs {
13
-!r_no_opennurbs {
8
-    SUBDIRS += opennurbs
14
-    SUBDIRS += opennurbs
9
-}
15
-}
10
+# FreeBSD: prefer opennurbs from a dependent port
11
+
12
 !rs_no_dxf {
16
 !rs_no_dxf {
13
     SUBDIRS += dxflib
17
     SUBDIRS += dxflib
14
 }
18
 }
(-)pkg-plist (-2 lines)
Lines 21-28 Link Here
21
lib/libqcadstemmer.so.0
21
lib/libqcadstemmer.so.0
22
lib/libqcadzip.so
22
lib/libqcadzip.so
23
lib/libqcadzip.so.0
23
lib/libqcadzip.so.0
24
lib/libquazip.so
25
lib/libquazip.so.0
26
lib/libspatialindexnavel.so
24
lib/libspatialindexnavel.so
27
lib/libspatialindexnavel.so.0
25
lib/libspatialindexnavel.so.0
28
lib/libstemmer.a
26
lib/libstemmer.a

Return to bug 205161