From nobody Sat Feb 18 08:11:42 2023 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 4PJhGl288fz3rZq2; Sat, 18 Feb 2023 08:11:43 +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 4PJhGl1RGXz4GST; Sat, 18 Feb 2023 08:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676707903; 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=SdxANq7gWyIZ1LTU2CcDgmKIJa8s25xZrJlV40c100A=; b=TMKiWAe7zcMuc3e8MQhB4HNi46NYhkH5ebqZcTg37BekU1ezF9MkMhiKrwpWTPzkETUMmS Pk96pqW22jt2IdcTz71d0qcQ2LcFbEj94diNkaTF79R8YWzqo/8/JZpDQ1FAbiOWcerTg1 +iXhrNgg34E1sUOwrQkEksC22POpf3EFNkvwYoqqRX+ElhDRzZAIqMJmcN6GqhgTotACMU UA8cMN7UozZxLg9or8MUZ4HxRPdfVzbFslh+fFjVxvivG2dTqXuLinEbaQHsEuj3Cz7Lrr UiD+cSK0JZOnIyK/MnNRxyljwCXIhyuJ1mJNiJUmx6YwX1KjLzv9inO2AEMl0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676707903; 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=SdxANq7gWyIZ1LTU2CcDgmKIJa8s25xZrJlV40c100A=; b=GRNcBoYk2ydUA6L5mt28Hy4guD1gTuyeX6uhpTKuueHkc58HgEL+9VSZEtdLrqjcVVLtTC zuPowWSpfDTDO6aWwv4aKFOXX6hG9E/t8Nwpli+J9AyqrV6h37bSvl9xYWBbSXc1Mv4gfR YRXONxizzoTplBw0AdBErPu955aSMltAu7PQuCF3pgPU7JhqjbClpOFle0D2lsS45SVMrb gddca/YGr26DBKtpjYhY1OxSfl/EohWTnoy8e5IBt2Erqd21CZg5yvtP14Vc8oRe2ksQN7 DNDv8oOszqE0oXdv3Hxd/tsuYsE910Kt3Bd7UalnLIT28Ta8kVUB/Ea32habZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676707903; a=rsa-sha256; cv=none; b=J/hIa0cW0ap7QFe8aC1bcTKu2BZmFTYF2Ia7uI+gYNJ8YKajMPGAHb4UBgIk1wZEdmpFuW pwy5c3GWlaSSboJG+ooks3SVi8ufA9pTq7lnhjYyMRRjirGHXwNJx6oUZdVuJGl35IhZjZ z2TdUwKcETbdp5DwKR0afj3hQDZDEJ/VIcwpNKcvb2MINJvS3YPItxTvXNdr9cYxz+6UhG lEXmGet1/z9Auf+k++Htym0ZQum1OuLn5GxefLpDQdXCUGouujBYpHGkvwusi4XIfa9B8l +pR3q9yUNElRxiaasdldMYR+EeXCqlOhM6I2V/XE6Cjv2zDWBkYlo+A1MWbQ3A== 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 4PJhGl0XS7zFsG; Sat, 18 Feb 2023 08:11:43 +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 31I8BgWN050838; Sat, 18 Feb 2023 08:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31I8BgKq050837; Sat, 18 Feb 2023 08:11:42 GMT (envelope-from git) Date: Sat, 18 Feb 2023 08:11:42 GMT Message-Id: <202302180811.31I8BgKq050837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jimmy Olgeni Subject: git: 236da5b7ab42 - main - lang/erlang-runtime21: reduce diff with lang/erlang-runtime22 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: olgeni X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 236da5b7ab4202591aaaf1b5698111712d388c52 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=236da5b7ab4202591aaaf1b5698111712d388c52 commit 236da5b7ab4202591aaaf1b5698111712d388c52 Author: Jimmy Olgeni AuthorDate: 2023-02-17 16:18:15 +0000 Commit: Jimmy Olgeni CommitDate: 2023-02-18 08:10:45 +0000 lang/erlang-runtime21: reduce diff with lang/erlang-runtime22 --- lang/erlang-runtime21/Makefile | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile index 87c0afd0d43b..46cc3c2e6eec 100644 --- a/lang/erlang-runtime21/Makefile +++ b/lang/erlang-runtime21/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared -USES= compiler autoreconf:build,2.69 cpe gmake ncurses perl5 +USES= autoreconf:build,2.69 compiler cpe gmake ncurses perl5 USE_GITHUB= nodefault GH_ACCOUNT= erlang:otp,corba GH_PROJECT= otp:otp corba:corba @@ -123,17 +123,21 @@ pre-configure-WX-off: post-configure-ODBC-on: ${RM} ${WRKSRC}/lib/odbc/SKIP +post-configure-ODBC-off: + echo "disabled by port options" > ${WRKSRC}/lib/odbc/SKIP + pre-build-NATIVE-on: @cd ${WRKSRC} && ${MAKE_CMD} clean post-build-CORBA-on: - cd ${WRKSRC_corba} \ - && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} ${MAKE_CMD} + cd ${WRKSRC_corba} && \ + ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \ + ${MAKE_CMD} post-install-CORBA-on: - cd ${WRKSRC_corba} \ - && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \ - ${MAKE_CMD} release RELEASE_ROOT=${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} + cd ${WRKSRC_corba} && \ + ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \ + ${MAKE_CMD} release RELEASE_ROOT=${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} post-install-DTRACE-on: ${MKDIR} ${STAGEDIR}${DATADIR}/dtrace @@ -160,8 +164,11 @@ post-install-WX-off: ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* post-stage: - ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete - @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* ${DATADIR_REL}/* -type f -o -type l \ - | ${SORT} >> ${TMPPLIST} + ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty \ + -delete + @cd ${STAGEDIR}${PREFIX}; \ + ${FIND} lib/${ERLANG_LIB}/* ${DATADIR_REL}/* -type f -o \ + -type l | \ + ${SORT} >> ${TMPPLIST} .include