From nobody Wed Aug 03 14:00:26 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 4LyYQy3X0Pz4XjZl; Wed, 3 Aug 2022 14:00:26 +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 4LyYQy2hh0z3frS; Wed, 3 Aug 2022 14:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659535226; 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=dn/iyw32WgnLg8dyHUuF118bPlKW6CcByw5BDwd4ohg=; b=jjaq5MBRNYb/2EbWMsjwouhrmcHIYjdGkyP+cqlmlyvzQ8KdBDd4qHlLkITRiEaEEqWNpd gIYxWZY6RlLfLR/p29M0XmGtqDy3At3c87gRYtmXRB3V2us71K47jPIyLY4LUDbSOa2wrW EZwcej9mRtUbvxD80CKscwy3hK9ajQpY0lO/xV3dAg1qRVe8guD/b0QgcowOOeGrnCEUiz nLnxaTZDcbGJUPa9fMcinTTO3uuta2NmGcFx5Se8MpI4p/utCNBuVUiDl+XfptOyxCVsjf kQO/yx2P7pRO295HF4XpiADZqGX4cymw/U5C56OesqQ2ioo+zb3/8V6ompFTIg== 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 4LyYQy1lc3ztCy; Wed, 3 Aug 2022 14:00:26 +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 273E0Qna009743; Wed, 3 Aug 2022 14:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273E0QSw009742; Wed, 3 Aug 2022 14:00:26 GMT (envelope-from git) Date: Wed, 3 Aug 2022 14:00:26 GMT Message-Id: <202208031400.273E0QSw009742@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ede4dd761078 - main - shells/zsh: remove the modification of the configure script 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ede4dd761078a3da30f65c3f6eb55f27af51ea26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659535226; 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=dn/iyw32WgnLg8dyHUuF118bPlKW6CcByw5BDwd4ohg=; b=fA6Lrm+GmuDHTkW4S8V57Mtl7eVsh76qDq5Iezspp4fQ6hpX6YB6MSoM8xH44xE9PLj1xa P/q5uOcdF8YFtESyXtD+C5k1lISF0qr6CMUk519OUv7o3y7QdKJ4DHYSZT8pvGg1F4BiyP DHOLkkQk0XQ39MUVtJoGLgO1jabbAY304+VX3GJzhZdVpWlCgeUY5+gFAa22d1T9f4uEhi RNcr10SPcvShuXItDfkvQICI4jODc6xk7wGeg+nvu7ZyuHO7GxZ3fG1MJbngMoW76m+BOY /WUVTqws1jlsGkG/a3mPzemw4PtQD2VfBSoERCbqyz40+ByqNmZkUOm9r5iI+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659535226; a=rsa-sha256; cv=none; b=JNCy8lywovShO8KYGP3YiWTidnIfyu+LqAncAIiVWEPvgIbgEUebejzLFtQaEjn6bu+o+N AWx8MVrUPlaNys5/dfegRSDOvCLZ9Vlbd9isr3eeP2tPIMV0sUQZDxeq/kc8iyLPP7uWYr BAhAYshL096DzntzaEuFSLi5guV4C04AcI1Ch74BGS/cZo1Xyxh3nMAl7sbJgM86w5WJs9 Qhl8JG/qaIx1bb9tAERuPlar+gEH3wli2oVt+mGb3Scx1a1BdPRLm6j8777z/eD29ASyfP TpjWvhb/TpmUhWhQLPqk90jEXmon0Jq+Lk5TZ502FH3EyRc9yz4bM3U+/w4Fpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ede4dd761078a3da30f65c3f6eb55f27af51ea26 commit ede4dd761078a3da30f65c3f6eb55f27af51ea26 Author: Baptiste Daroussin AuthorDate: 2022-08-03 13:51:13 +0000 Commit: Baptiste Daroussin CommitDate: 2022-08-03 13:59:19 +0000 shells/zsh: remove the modification of the configure script We used to modify the configure script to avoid zsh to link against librt because clock_gettime on FreeBSD is in libc not librt. It's been a while that we are configuring zsh with the --as-needed linker flag which means now even if -lrt is passed we will not end up linked to it librt anymore. besides, modifying the configure script at the patch phase makes it newer than stamp.h.in which results in the build system triggering a regeneration of itself (hence the USES= autoreconf we had), not touching anymore that script can remove the need for USES=autoreconf and the load if build dependencies it drags in Removing the USES=autoreconf highlights also the lack of build dependency on perl which is needed to be able to the help files for run-help to work on builtins. this is fixed now --- shells/zsh/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 3abedb61bf6b..e38568d9cbda 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -17,8 +17,9 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept MAKE_JOBS_UNSAFE= yes -USES= autoreconf cpe iconv localbase:ldflags ncurses shebangfix tar:xz +USES= cpe iconv localbase:ldflags ncurses perl5 shebangfix tar:xz +USE_PERL5= build SHEBANG_LANG= zsh zsh_OLD_CMD= zsh # shebang appears as /bin/zsh and just zsh SHEBANG_FILES= Functions/Calendar/* \ @@ -86,8 +87,6 @@ CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif post-patch: -# FreeBSD's clock_gettime(2) is in libc, not librt; see PR 167857 - @${REINPLACE_CMD} -e '/LIBS/s|-lrt||' ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|/etc/|${LOCALBASE}/etc/|" \ ${WRKSRC}/Functions/MIME/zsh-mime-setup ${RM} ${WRKSRC}/Doc/help.txt