From owner-svn-ports-all@freebsd.org Sun Mar 28 20:08:25 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A6AD15AD113; Sun, 28 Mar 2021 20:08:25 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F7mx54N4dz3K24; Sun, 28 Mar 2021 20:08:25 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 891E8263DE; Sun, 28 Mar 2021 20:08:25 +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 12SK8PvQ066838; Sun, 28 Mar 2021 20:08:25 GMT (envelope-from mr@FreeBSD.org) Received: (from mr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12SK8Pk3066837; Sun, 28 Mar 2021 20:08:25 GMT (envelope-from mr@FreeBSD.org) Message-Id: <202103282008.12SK8Pk3066837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mr set sender to mr@FreeBSD.org using -f From: Michael Reifenberger Date: Sun, 28 Mar 2021 20:08:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569410 - head/cad/qcad X-SVN-Group: ports-head X-SVN-Commit-Author: mr X-SVN-Commit-Paths: head/cad/qcad X-SVN-Commit-Revision: 569410 X-SVN-Commit-Repository: ports 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.34 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: Sun, 28 Mar 2021 20:08:25 -0000 Author: mr Date: Sun Mar 28 20:08:24 2021 New Revision: 569410 URL: https://svnweb.freebsd.org/changeset/ports/569410 Log: Stop setting MAKE_JOBS_UNSAFE by only building release or debug Submitted by: rakuco@ Differential Revision: https://reviews.freebsd.org/D19219 Modified: head/cad/qcad/Makefile head/cad/qcad/pkg-plist Modified: head/cad/qcad/Makefile ============================================================================== --- head/cad/qcad/Makefile Sun Mar 28 19:35:41 2021 (r569409) +++ head/cad/qcad/Makefile Sun Mar 28 20:08:24 2021 (r569410) @@ -20,8 +20,6 @@ LICENSE= GPLv3 BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs -MAKE_JOBS_UNSAFE=yes - USES= compiler:c++11-lang gl gmake qmake qt:5 USE_GITHUB= yes USE_LDCONFIG= yes @@ -55,6 +53,18 @@ OPTIONS_DEFINE= EXAMPLES CFLAGS_i386= -fPIC CXXFLAGS_i386= -fPIC LDFLAGS_i386= -Wl,-z,notext + +.include + +.if defined(WITH_DEBUG) +ALL_TARGET= debug +PLIST_SUB+= DEBUG_LIB_SUFFIX="_debug" +RESDIR= ${WRKSRC}/debug +.else +ALL_TARGET= release +PLIST_SUB+= DEBUG_LIB_SUFFIX="" +RESDIR= ${WRKSRC}/release +.endif pre-configure: ${MKDIR} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-${_QT_VERSION} Modified: head/cad/qcad/pkg-plist ============================================================================== --- head/cad/qcad/pkg-plist Sun Mar 28 19:35:41 2021 (r569409) +++ head/cad/qcad/pkg-plist Sun Mar 28 20:08:24 2021 (r569410) @@ -578,8 +578,7 @@ lib/libstemmer.a %%DATADIR%%/patterns/metric/xmastree-02.pat %%DATADIR%%/patterns/metric/zigzag.pat %%DATADIR%%/plugins/codecs/readme.txt -%%DATADIR%%/plugins/designer/libqcadcustomwidgets.so -%%DATADIR%%/plugins/designer/libqcadcustomwidgets_debug.so +%%DATADIR%%/plugins/designer/libqcadcustomwidgets%%DEBUG_LIB_SUFFIX%%.so %%DATADIR%%/plugins/designer/readme.txt %%DATADIR%%/plugins/imageformats/libqgif.so %%DATADIR%%/plugins/imageformats/libqico.so @@ -588,10 +587,8 @@ lib/libstemmer.a %%DATADIR%%/plugins/imageformats/libqtga.so %%DATADIR%%/plugins/imageformats/libqtiff.so %%DATADIR%%/plugins/imageformats/readme.txt -%%DATADIR%%/plugins/libqcaddxf.so -%%DATADIR%%/plugins/libqcaddxf_debug.so -%%DATADIR%%/plugins/libqcadscripts.so -%%DATADIR%%/plugins/libqcadscripts_debug.so +%%DATADIR%%/plugins/libqcaddxf%%DEBUG_LIB_SUFFIX%%.so +%%DATADIR%%/plugins/libqcadscripts%%DEBUG_LIB_SUFFIX%%.so %%DATADIR%%/plugins/printsupport/libcupsprintersupport.so %%DATADIR%%/plugins/printsupport/readme.txt %%DATADIR%%/plugins/script/libqtscript_core.so