Received: by mail.netbsd.org (Postfix, from userid 605) id D7EEE84E8E; Sat, 7 Dec 2019 07:44:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 600A384DBB for ; Sat, 7 Dec 2019 07:44:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PQzisGiyKkap for ; Sat, 7 Dec 2019 07:44:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DDC8284D9B for ; Sat, 7 Dec 2019 07:44:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DB997FA97; Sat, 7 Dec 2019 07:44:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157570467698390" MIME-Version: 1.0 Date: Sat, 7 Dec 2019 07:44:36 +0000 From: "Iain Hibbert" Subject: CVS commit: pkgsrc/cad/qcad To: pkgsrc-changes@NetBSD.org Reply-To: plunky@netbsd.org X-Mailer: log_accum Message-Id: <20191207074436.DB997FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157570467698390 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: plunky Date: Sat Dec 7 07:44:36 UTC 2019 Modified Files: pkgsrc/cad/qcad: Makefile Log Message: ensure debug binaries are not built, by using target 'release' instead of 'all' To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 pkgsrc/cad/qcad/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157570467698390 Content-Disposition: inline Content-Length: 1729 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/cad/qcad/Makefile diff -u pkgsrc/cad/qcad/Makefile:1.79 pkgsrc/cad/qcad/Makefile:1.80 --- pkgsrc/cad/qcad/Makefile:1.79 Wed Nov 13 00:26:49 2019 +++ pkgsrc/cad/qcad/Makefile Sat Dec 7 07:44:36 2019 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.79 2019/11/13 00:26:49 gdt Exp $ +# $NetBSD: Makefile,v 1.80 2019/12/07 07:44:36 plunky Exp $ # DISTNAME= qcad-3.23.0.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_GITHUB:=qcad/} EXTRACT_USING= bsdtar @@ -27,21 +27,6 @@ SUBST_FILES.paths+= scripts/Help/ShowRea SUBST_FILES.paths+= scripts/Widgets/LibraryBrowser/LibraryBrowser.js SUBST_VARS.paths= PREFIX -# Don't build intermediate libraries with the same name in debug mode -# as in release mode. (Resolves regular libraries ending up in debug -# mode, which breaks plugin loading.) -# Reported on QCad Community Edition forum: -# https://qcad.org/rsforum/viewtopic.php?f=76&t=6708 -# -SUBST_CLASSES+= dbgmode -SUBST_STAGE.dbgmode= post-configure -SUBST_MESSAGE.dbgmode= Debug mode: lib*.so -> lib*_debug.so -SUBST_FILES.dbgmode= src/3rdparty/dxflib/Makefile.Debug -SUBST_FILES.dbgmode+= src/core/Makefile.Debug -SUBST_FILES.dbgmode+= src/entity/Makefile.Debug -SUBST_FILES.dbgmode+= src/operations/Makefile.Debug -SUBST_SED.dbgmode= -e 's,\(lib[dq]..*\)\(\.so\),\1_debug\2,g' - .include "../../mk/bsd.prefs.mk" PLIST_VARS+= glx egl .if ${OPSYS} != "Darwin" @@ -54,6 +39,9 @@ PLIST.egl= yes AUTO_MKDIRS= yes +# ensure we don't build debug libs +BUILD_TARGET= release + # # The QCad build system normally links direct to a release dir but this # causes a lot of problems with libtool dependencies. We patch it so that --_----------=_157570467698390--