From nobody Sat Apr 23 15:06:34 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 5F60A1988494; Sat, 23 Apr 2022 15:06:34 +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 4KlvkL24TDz3DQy; Sat, 23 Apr 2022 15:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650726394; 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=F2jcYTZWJ4+UkJLmRH7p0GshPwJTX+B2UMU4ctid/9U=; b=jzxt7MezC/IX7K8i6i5t6ryixDdJIrPLOOArf3Xl+O2nOVkTxxk+RuLk/zsCebcBMXBY5t 4N/BH8rMYRJ21KeJw0gWODjcHc0FrB/ix+nqA4Zbsij/cfGoo9c3lYXmT70ZKBp5SMpNLh BVQvNTFulTj0pdpCVLGVKgsQJQdOz0XTQkd+f+A5S5sxqX+UfCOwqGPnYqCHHuMKYBskT/ yf6co1Htg0Edryv6u85rDcSE8vBHhz23OeEIn4O0UfqW72hpqfz/JA5081wYjEKcM1Jbh2 b1pGEYH+pnpo+SOk+vZOtMHD2EqOWCrjNd6w0Nz9lFUR6LFEJqctIigHux9BCg== 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 2341914118; Sat, 23 Apr 2022 15:06:34 +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 23NF6YCl002548; Sat, 23 Apr 2022 15:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23NF6YoY002547; Sat, 23 Apr 2022 15:06:34 GMT (envelope-from git) Date: Sat, 23 Apr 2022 15:06:34 GMT Message-Id: <202204231506.23NF6YoY002547@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 848c5afb3647 - main - x11-toolkits/ocaml-labltk: stop guessing Tcl/Tk version and be verbose 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848c5afb364722e8078eba4c4abfd119657e50b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650726394; 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=F2jcYTZWJ4+UkJLmRH7p0GshPwJTX+B2UMU4ctid/9U=; b=pc7I4LZmhO7NaghYO+M/k9/VfFVPTXRC4gk4SvWrRelzteiHS9UmhXao4GnZi8hPlc0zt+ dq0uDiBD3kPhXUMqdjtECCUMtfOGPjcjH4tOw7c5YtWh8L4WDi8QFkr7afSbYCr9sBeXGG i+yWJxGiE6cEQ6yoLWXpYuaOT5YHHmGRZdcnMAekmRVNlG011J/1Gcxt5p2YNY/UUMVkJL qSSlqBjASL7r13ZXlI6MXZFwlhuNKu5pcLjDUfu/a8hVlX/0p2llqrK1kevlr4mVAVRpQ8 BF+ylGj/V8MnLwda18fiFJjN+vB1uLgAD6JQT05Da4iyLYYqzM1xdFIH494u0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650726394; a=rsa-sha256; cv=none; b=Ze3HIgOsG7xUUwTKKnwhfb7mBg1ZJnp5bonqvgG2LkmflY6IEzBZ0kmPQxFYD3yJxq8xXu 4avkLhQ1ME1L/6CAOC+CTpmqPEfhZZGYMnLitkyf/h/LVG+T9Nj+SMMBWefIvsqalUVaRs xBvrejpisFZ2EA6t7uXAnje8xbbJdczQ9BaoRmwycDAOpsezgOSdQKJyIBWhj6JCs0Z/8d pyeiyOn4JfSmMQcvLsVTbnyBNiNl9wzr6NlkShasa4o4BOrvsbAsU2j1AaU6cAHKeqO7hl jK/dpqKcJfiVNvThAO1hD9B4PUrzHLENB0sqpQ0w6vPg1VJP/pwAO6jWFegBQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=848c5afb364722e8078eba4c4abfd119657e50b4 commit 848c5afb364722e8078eba4c4abfd119657e50b4 Author: Alexey Dokuchaev AuthorDate: 2022-04-23 15:05:42 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-23 15:05:42 +0000 x11-toolkits/ocaml-labltk: stop guessing Tcl/Tk version and be verbose When specific Tcl/Tk definitions are not passed to the configure script, it tries to guess installed version, header paths, and the libraries. This routine is not robust and can easily brake in custom environments or in the future. Pass the correct values conveniently offered by our framework instead; this would also slightly speed up configure process. While here, do not pass ${STAGEDIR} via MAKE_ENV, it is already passed on the MAKE_ARGS (as DESTDIR). Adjust the port's Makefile accordingly. --- x11-toolkits/ocaml-labltk/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/x11-toolkits/ocaml-labltk/Makefile b/x11-toolkits/ocaml-labltk/Makefile index 488b62ca2ef5..b37267bda580 100644 --- a/x11-toolkits/ocaml-labltk/Makefile +++ b/x11-toolkits/ocaml-labltk/Makefile @@ -13,17 +13,20 @@ LICENSE= LGPL20 USES= gmake tk HAS_CONFIGURE= yes +CONFIGURE_ARGS= -tkdefs "-I${LOCALBASE}/include -I${TCL_INCLUDEDIR}\ + -I${TK_INCLUDEDIR}" \ + -tklibs "-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}\ + -ltk${TK_SHLIB_VER}" -verbose MAKE_JOBS_UNSAFE=yes -MAKE_ENV+= STAGEDIR="${STAGEDIR}" USE_OCAML= yes ALL_TARGET= all opt post-patch: @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} \ - -e 's/$$(INSTALLDIR)/$$(STAGEDIR)$$(INSTALLDIR)/g' \ - -e 's/$$(INSTALLBINDIR)/$$(STAGEDIR)$$(INSTALLBINDIR)/g' \ - -e 's/$$(STUBLIBDIR)/$$(STAGEDIR)$$(STUBLIBDIR)/g' \ + -e 's/$$(INSTALLDIR)/$$(DESTDIR)$$(INSTALLDIR)/g' \ + -e 's/$$(INSTALLBINDIR)/$$(DESTDIR)$$(INSTALLBINDIR)/g' \ + -e 's/$$(STUBLIBDIR)/$$(DESTDIR)$$(STUBLIBDIR)/g' \ -e 's/mkdir /& -p /g' @${REINPLACE_CMD} -e 's|%%SCRIPTBASE%%|${PREFIX}/lib/ocaml/labltk/|g' \ ${WRKSRC}/lib/Makefile