From owner-svn-ports-all@freebsd.org Wed Dec 30 00:00:46 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 232EDA55539; Wed, 30 Dec 2015 00:00:46 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB5571BA5; Wed, 30 Dec 2015 00:00:45 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBU00j3v034370; Wed, 30 Dec 2015 00:00:45 GMT (envelope-from mr@FreeBSD.org) Received: (from mr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBU00iA3034366; Wed, 30 Dec 2015 00:00:44 GMT (envelope-from mr@FreeBSD.org) Message-Id: <201512300000.tBU00iA3034366@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mr set sender to mr@FreeBSD.org using -f From: Michael Reifenberger Date: Wed, 30 Dec 2015 00:00:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404790 - in head/cad/qcad: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2015 00:00:46 -0000 Author: mr Date: Wed Dec 30 00:00:44 2015 New Revision: 404790 URL: https://svnweb.freebsd.org/changeset/ports/404790 Log: Try to resolve conflict with archivers/quazip by disabling the internal one from qcad. PR: 205161 Submitted by: Arrigo Marchiori Modified: head/cad/qcad/Makefile head/cad/qcad/files/patch-src_3rdparty_3rdparty.pro head/cad/qcad/pkg-plist Modified: head/cad/qcad/Makefile ============================================================================== --- head/cad/qcad/Makefile Tue Dec 29 22:15:28 2015 (r404789) +++ head/cad/qcad/Makefile Wed Dec 30 00:00:44 2015 (r404790) @@ -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 Modified: head/cad/qcad/files/patch-src_3rdparty_3rdparty.pro ============================================================================== --- head/cad/qcad/files/patch-src_3rdparty_3rdparty.pro Tue Dec 29 22:15:28 2015 (r404789) +++ head/cad/qcad/files/patch-src_3rdparty_3rdparty.pro Wed Dec 30 00:00:44 2015 (r404790) @@ -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 } Modified: head/cad/qcad/pkg-plist ============================================================================== --- head/cad/qcad/pkg-plist Tue Dec 29 22:15:28 2015 (r404789) +++ head/cad/qcad/pkg-plist Wed Dec 30 00:00:44 2015 (r404790) @@ -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