From nobody Thu Jun 02 20:37:33 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 702ED1B5C175; Thu, 2 Jun 2022 20:37:33 +0000 (UTC) (envelope-from git@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 4LDd9n2mMdz4Zm5; Thu, 2 Jun 2022 20:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654202253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUU9KNPmcM3C7a71g3ao6OBxsG2d80p+E3jOvFFspP4=; b=ITH0ZupkBiPIoSQoVJFHHXdyAqEKGIqUAURvkHmMLBJC/KcfPOrq5yVF3mCL3vnD/6LN14 DldFifTwyu8EDPLLF+nOxEXHKRKye8Y4+PpciSp8Oz46SEkC5eoLqxN/R65UEGoqPGE9t1 6bO/pDwksOiLHKGool/zWKe1XiV8zJXlMi7WYozy0jTkI1GebJWwa8hr61lOt2AyB97/FM SxZprpIztGacQp/xtrpTVaCkp/pVS0my36T51VmDYxAEtEwEmNrBF6CDcY4pVGj+UKapmw owI84nbgO2WoxemHOjjbuQWEYXALaufOVzQ917TNtPxMZObdJOijyZM9Oh6o/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3EFDA1B66E; Thu, 2 Jun 2022 20:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 252KbXni075469; Thu, 2 Jun 2022 20:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 252KbXrg075468; Thu, 2 Jun 2022 20:37:33 GMT (envelope-from git) Date: Thu, 2 Jun 2022 20:37:33 GMT Message-Id: <202206022037.252KbXrg075468@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: f3b181530fcb - main - devel/ncurses: Switch to using WITH_DEBUG List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3b181530fcb74df2165caa2c65fab3d45d3d050 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654202253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUU9KNPmcM3C7a71g3ao6OBxsG2d80p+E3jOvFFspP4=; b=pr6SSVe69c9mvGujhZxYlsa1nELD1TqYxn4ji0pRV3a9rZbO/pRVTOwygSZb0e4R4wPDak ztAJ2DlwU2FV4szbW5oSJZbmCMN5xi382QRcXzbhqWBQ3zuHMJ+IVw9F6a5EQ/LD2R5SfM Sl5cUJCjd5ELTBNT9clj/LcaKyp3eAk2hGgULpHG504eifWqSedu0L+f+rHpCCPAe+s6pX s1nonuWZMOyWBDAtuZH+RkmKcYy+nz02TVjQJdpnzwCwlo6BKmOj2xYCvTQ+xV5bY1V/qP rwhBrt/Qgjt1X6Y7n0VM6gwfFWskjVAsOToANrmMJ61Vc8ysfRrUxSDg6fsZMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654202253; a=rsa-sha256; cv=none; b=ht7r/1JbtzFVKd3H274m9EsDHdc+Yivw/PHfQXlVvg4vD/qjdGixBOWU/SE0o5PSk1JVL1 6TYea4BE6y+QLHsRZ9ADhgNDx+AYtD2aS7iE6ixamX3uKERdLyKnSPfLSofA3zMF6qGiqM rnGDmByEq2wzgT3hgHKSjonLh3VdhuG3q+0+tLPS7z1Ws5k0mqyMmP2WhfoxMMJsvMFs/p 1C1isSKZt3d+IU3veLuDGvjvm7vKJNc6BXIJgvHEV2VBOKM6C2CEFI8JpIMtG03/1aZQI7 WJJdh6dJocQyhK4tf3M7JS4pFjg44cYApiS+ADudtr6c5vbBOtNZm9038s8jzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3b181530fcb74df2165caa2c65fab3d45d3d050 commit f3b181530fcb74df2165caa2c65fab3d45d3d050 Author: Ganael LAPLANCHE AuthorDate: 2022-06-02 20:32:18 +0000 Commit: Ganael LAPLANCHE CommitDate: 2022-06-02 20:32:18 +0000 devel/ncurses: Switch to using WITH_DEBUG Rework previous commit and use WITH_DEBUG instead of DEBUG option to get the ports framework auto-adapt STRIP_CMD accordingly. Reported by: danfe, bapt (via ports-committers@) Approved by: blanket (infrastructure change) --- devel/ncurses/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index 463448b1d6b3..1063649e7b09 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/share \ --with-termlib \ --without-manpage-renames -OPTIONS_DEFINE= DEBUG DOCS EXAMPLES MANPAGES PROFILE TRACE +OPTIONS_DEFINE= DOCS EXAMPLES MANPAGES PROFILE TRACE OPTIONS_DEFAULT= DOCS EXAMPLES MANPAGES TRACE_DESC= Add trace() function to all models of ncurses @@ -76,10 +76,16 @@ EXAMPLES_CPP= cursesapp.cc cursesapp.h cursesf.cc cursesf.h cursesm.cc \ TRACE_CONFIGURE_ON= --with-trace PROFILE_CONFIGURE_WITH= profile MANPAGES_CONFIGURE_WITH= manpages -DEBUG_CONFIGURE_WITH= debug OPTIONS_SUB= yes +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --with-debug +PLIST_SUB+= DEBUG="" +.else +PLIST_SUB+= DEBUG="@comment " +.endif + .include .if ${PORT_OPTIONS:MMANPAGES} @@ -95,9 +101,7 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libncurses.so ${ECHO} "INPUT(libncurses.so.${PORTVERSION:R} AS_NEEDED(-ltinfo))" > ${STAGEDIR}${PREFIX}/lib/libncurses.so -.if ! ${PORT_OPTIONS:MDEBUG} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.${DISTVERSION} -.endif # backwards compatibility, remove 2021-07-02 ${RLN} ${STAGEDIR}${PREFIX}/lib/libncurses.so ${STAGEDIR}${PREFIX}/lib/libncursesw.so