From nobody Fri Nov 26 08:35:47 2021 X-Original-To: dev-commits-ports-all@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 1A56018B4FA0; Fri, 26 Nov 2021 08:35:48 +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 4J0p3l4q1xz4qTH; Fri, 26 Nov 2021 08:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 856BB2D80C; Fri, 26 Nov 2021 08:35:47 +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 1AQ8ZlW4035254; Fri, 26 Nov 2021 08:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQ8Zl1I035253; Fri, 26 Nov 2021 08:35:47 GMT (envelope-from git) Date: Fri, 26 Nov 2021 08:35:47 GMT Message-Id: <202111260835.1AQ8Zl1I035253@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: defd64ec3c9a - main - shells/zsh: Revert "shells/zsh: Add BASE_ZSH option" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: defd64ec3c9a153417550cb82e486e7fbd2544a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637915747; 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=ZvCBd8mZ03apFXOXbhad6e3EH08v1N40XBjkPlBF7Q0=; b=gy7Guglb5d57Gd0voY4sdx39GSC7761X32DphGKApIDR/17k9Y9/NLAf1WAg1buYWJ1dPZ swItWa/NhZKdvIzd/+EP0MYy2yuGR+RG0T4w6+ZsJc3yRyGv2OLeUYodDxptbi9mCLRtfi r93YbVGX5kCfKC6dekKNwWG2uBn/vkcqSQylpxaGR5+lTKLMyxK7oHB0LeNC+vtxG3gldc zxBkYMWiE6XD3YXY+6TKIFX4Hta0GS9RcVTyyG3KFFR4S7bRMLNe0qpPK1UoE5s0VPK2pB +quQAcYIoZ0GMneC/bn2Zhb71/oATDeLiZGr9egHQRzG56IqTgFqeNwkjRyMUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637915747; a=rsa-sha256; cv=none; b=Y/5Cmxgdl1Gm4UwhGSJ96UH9PIzU3YSrsT2eN/RQQTagbo6FlIRUdnAECEFuIiW2BnUBiB rfcK5kZT5NOp0NCMfqVghSpBO/QC5R/XU3Y7eJy42vFwQU/x3HH+SGYEsd3KuhJQrOMJV2 u6DOziHzi30E3M12EAKqzHTQYlqG9A5XtbdUxbrIqNKhufjY+Ti5Hjeu5warE/h16fMIYc E2XSkdDwDyg3GPwBrmrpf6sSuMC6XWdZT8TMSAC4UBhP/ZSzg3s/Yzzrr9LUclMltF3WC0 /ImPdIHtkRSPRmEGrocTJX+VF9Uz82DnY44+dy2jdFb/PTJbzh0jUWf0DYWtMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=defd64ec3c9a153417550cb82e486e7fbd2544a8 commit defd64ec3c9a153417550cb82e486e7fbd2544a8 Author: Yasuhiro Kimura AuthorDate: 2021-11-26 08:30:27 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-11-26 08:34:58 +0000 shells/zsh: Revert "shells/zsh: Add BASE_ZSH option" This reverts commit ae1787aab23e44e369dbb0cc814e8318c6f86e0d. Requested by: maintainer --- shells/zsh/Makefile | 80 ++++++++++++++++++++++++---------------------------- shells/zsh/pkg-plist | 2 -- 2 files changed, 37 insertions(+), 45 deletions(-) diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 3d107054fe63..2298ee440644 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -17,69 +17,69 @@ LICENSE_NAME= ZSH license LICENSE_FILE= ${WRKSRC}/LICENCE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= autoreconf cpe iconv localbase:ldflags ncurses shebangfix \ - tar:xz +MAKE_JOBS_UNSAFE= yes + +USES= autoreconf cpe iconv localbase:ldflags ncurses shebangfix tar:xz -SHEBANG_FILES= Functions/Calendar/* Functions/Misc/* SHEBANG_LANG= zsh -zsh_OLD_CMD= zsh # shebang appears as /bin/zsh and just zsh - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-function-subdirs \ - --enable-maildir-support \ - --enable-multibyte \ - --enable-zsh-secure-free \ - --sysconfdir=${PREFIX}/etc \ - --with-tcsetpgrp +zsh_OLD_CMD= zsh # shebang appears as /bin/zsh and just zsh +SHEBANG_FILES= Functions/Calendar/* \ + Functions/Misc/* + +CONFIGURE_ARGS= --with-tcsetpgrp \ + --enable-function-subdirs \ + --enable-maildir-support \ + --enable-multibyte \ + --enable-zsh-secure-free \ + --sysconfdir=${PREFIX}/etc + # fix PREFIX != LOCALBASE -CONFIGURE_ARGS+= --disable-site-fndir \ - --enable-additional-fpath=${DATADIR}/site-functions -CONFIGURE_ENV+= ac_cv_header_sys_capability_h=no \ - zsh_cv_sys_path_dev_fd=no +CONFIGURE_ARGS+=--disable-site-fndir \ + --enable-additional-fpath=${DATADIR}/site-functions -MAKE_JOBS_UNSAFE= yes -TEST_TARGET= test +CONFIGURE_ENV+= zsh_cv_sys_path_dev_fd=no \ + ac_cv_header_sys_capability_h=no +GNU_CONFIGURE= yes CPPFLAGS+= -DBOOL_DEFINED LDFLAGS+= -Wl,--as-needed +TEST_TARGET= test -SUB_FILES= pkg-message - -PLIST_SUB+= ZSH_VER="${ZSH_VER}" -PORTDOCS= * - -OPTIONS_DEFINE= BASE_ZSH DEBUG DOCS ETCDIR EXAMPLES GDBM MEM PCRE STATIC +OPTIONS_DEFINE= DEBUG ETCDIR GDBM MEM PCRE STATIC \ + DOCS EXAMPLES OPTIONS_SUB= yes -BASE_ZSH_DESC= Make zsh and rzsh also available as /bin/zsh and /bin/rzsh ETCDIR_DESC= System-wide defaults in /etc (instead of $${PREFIX}/etc) GDBM_DESC= Enable GDBM support (GPL) MEM_DESC= Enable zsh-mem options +GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre + DEBUG_CONFIGURE_ENABLE= zsh-debug -DOCS_DISTFILES= ${DISTNAME}-doc${EXTRACT_SUFX}:doc ETCDIR_CONFIGURE_OFF= --enable-etcdir=${PREFIX}/etc -GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_ENABLE= gdbm MEM_CONFIGURE_ENABLE= zsh-mem -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_ENABLE= pcre ## Some modules can only be built as a shared library. ## If you enable STATIC, you may get strange errors if you, a script, ## or a plugin tries to use the regex module. -STATIC_CONFIGURE_ON= --disable-dynamic \ - --with-term-lib="tinfow tinfo" -STATIC_CONFIGURE_OFF= --enable-dynamic \ - --with-term-lib="ncursesw ncurses" STATIC_LDFLAGS= -static +STATIC_CONFIGURE_ON= --disable-dynamic --with-term-lib="tinfow tinfo" +STATIC_CONFIGURE_OFF= --enable-dynamic --with-term-lib="ncursesw ncurses" -DOCS= LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \ - Etc/completion-style-guide Doc/zsh*.html Doc/zsh.dvi +DOCS= LICENCE META-FAQ README \ + Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ Etc/completion-style-guide \ + Doc/zsh*.html Doc/zsh.dvi +DOCS_DISTFILES= ${DISTNAME}-doc${EXTRACT_SUFX}:doc +PORTDOCS= * PORTEXAMPLES= zlogin zshenv zshrc ZSH_VER= ${PORTVERSION} +PLIST_SUB+= ZSH_VER="${ZSH_VER}" +SUB_FILES= pkg-message .include @@ -123,18 +123,12 @@ post-install: ${CHMOD} 644 $$i.zwc ; \ done') -post-install-BASE_ZSH-on: - @${MKDIR} ${STAGEDIR}/bin -.for f in zsh rzsh - ${RLN} ${STAGEDIR}${PREFIX}/bin/${f} ${STAGEDIR}/bin/${f} -.endfor +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/StartupFiles && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}) - .include diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist index 27783c0543af..e51f7e5c411b 100644 --- a/shells/zsh/pkg-plist +++ b/shells/zsh/pkg-plist @@ -1,7 +1,5 @@ @shell bin/zsh @shell bin/rzsh -%%BASE_ZSH%%@shell /bin/zsh -%%BASE_ZSH%%@shell /bin/rzsh bin/zsh-%%ZSH_VER%% %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so