From nobody Sun Aug 28 21:19:54 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 4MG60V5dT7z4bNw4; Sun, 28 Aug 2022 21:19:54 +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 4MG60V4J7cz3rlg; Sun, 28 Aug 2022 21:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661721594; 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=A5x23PUzxWUB05LlpbVf0xInGJVCCsWAOw6MmEL4IFQ=; b=DFXPHv6Tyz2oRAJdeVnHb2DZYSzASyhZ5evVSPds6ATYkPLDgVeWjsGt8WKqV1e939Vswc k/A7Z3sOBeC69EgdoPwGGZ+n/xcTqYkPprqUcPrkaL506dbauNBNZLM3VMu9hVbMld8Oyh 8+W6l5sPS5H//4Ka5laj0bu3L9maMHgDU208NOSQ6KbIkpYxHKpgr0d3/1cECL3cGTHD/0 V2ysJYgZIX09Y8H0wwiY8WVhcGVWVVl5mLUd341irTgBfmUf5L9nTb2CCw3MAczt2/ZDbn bnVaYVaX89IOCoJEcYZ2d/E31gP5qdnSk/HAUYtSRpbhVR8uK1YpiIPXJjLS6g== 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 4MG60V2mmdz1CPp; Sun, 28 Aug 2022 21:19:54 +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 27SLJs6a034526; Sun, 28 Aug 2022 21:19:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27SLJsxg034525; Sun, 28 Aug 2022 21:19:54 GMT (envelope-from git) Date: Sun, 28 Aug 2022 21:19:54 GMT Message-Id: <202208282119.27SLJsxg034525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 6e9237ba47f0 - main - shells/ksh*: Allow the ksh ports to coexist 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e9237ba47f0c0df54a58ca8a1bf79b44d580208 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661721594; 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=A5x23PUzxWUB05LlpbVf0xInGJVCCsWAOw6MmEL4IFQ=; b=COrolB+Lxf5GEutO/QOCoSlGdWCIDN4Fdu2j/cZ28qGC8MNczomDeuWk8/SgqRhA4AgXGa fD9uL873kr41nTnQqdWpWdlixxQyA0jUJaZplFJq0tg1HrZwKi2EEYN8jubXXl3DALL/Yv MqnuAecwU2kp3hJpBQWu37KIn+LgOcCx5NkE3+8JBGpy4enQUpELp0+8IUVOQEYHiFbq9c gnA8GenbkWdqSXCEHQ6cAmSxcoM4mAgujkNuQbIN8iraL+pmwRtyv9Ry6a/QcyggSccZIf 6kf04II37KssUm53rkZ5IFUMBLpBDMaWrhrT/u2wXRSd5awW7zAKtaM9leIfhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661721594; a=rsa-sha256; cv=none; b=iUG1JW8kFaYa8b4Aj87JCIvng9IX7Q4L/2iIL5BAvSd2QFo1tySkw5wCXn03RAlMbBXjrg M0YnSmhpfrIC589/VJyUd/t9/n8rw9EvuIQy1MBS3HBFmb/mkkL7r+7VN4rjHxvmzkxumn svsV1xT1G1SzYiilRe6LxPCTfl4moJCr8+ncpxYcpjC7KswOofl6buBu27ecwyNcz8yuTE VJQa0H9o2/zuskC+caN4xqNG2tfHCwMO0rn4xYz/PL0DqpIZ6U7zxjcLIMT0YiNqV684i3 uLXIJMR3qoy3W7wyrlU2VyNY3BvjznR42C9igt4e229RvJPzMklgKCQ9K02M3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e9237ba47f0c0df54a58ca8a1bf79b44d580208 commit 6e9237ba47f0c0df54a58ca8a1bf79b44d580208 Author: Cy Schubert AuthorDate: 2022-08-28 20:12:47 +0000 Commit: Cy Schubert CommitDate: 2022-08-28 21:16:45 +0000 shells/ksh*: Allow the ksh ports to coexist Add an option to allow the ksh ports to avoid conflicting with each other and to coexist. This allows people who wish to punish themselves by tracking developent to still be able to fall back should upstream cause regressions. This also allows legacy ksh93 to coexist with the recently added ksh93/ksh, which is not entirely compatible with legacy ksh. Applications which require a legacy ksh compatible package should use the ksh93 port installed using one of its options. This allows new and old to exist on the same system. --- shells/ksh-devel/Makefile | 21 ++++++++++++--------- shells/ksh-devel/pkg-plist | 6 +++--- shells/ksh/Makefile | 18 ++++++++++-------- shells/ksh/pkg-plist | 6 +++--- shells/ksh93/Makefile | 13 +++++++++---- shells/ksh93/pkg-plist | 6 +++--- 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 8819a458368c..d9d609bb3f6d 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -36,13 +36,15 @@ GH_TAGNAME= ${HASH} # $PATH. KSH_CONFLICTS= pdksh KSH93_CONFLICTS= ksh2020 ksh93 ast-ksh +KSH93D_CONFLICTS= ksh2020 ksh93 ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC OPTIONS_SINGLE= BIN_KSH -OPTIONS_SINGLE_BIN_KSH= KSH KSH93 +OPTIONS_SINGLE_BIN_KSH= KSH KSH93 KSH93D KSH_DESC= Install to ${PREFIX}/bin/ksh KSH93_DESC= Install to ${PREFIX}/bin/ksh93 +KSH93D_DESC= Install to ${PREFIX}/bin/ksh93d (development) CFLAGS+= -DMAP_TYPE LDFLAGS+= -lm @@ -52,13 +54,14 @@ STATIC_MAKE_ENV= LDFLAGS+=-static KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" +KSH93D_PLIST_SUB= 93="93d" .include -.if ${PORT_OPTIONS:MKSH93} -PNAME= ksh93 -.else -PNAME= ksh +.if ${PORT_OPTIONS:MKSH93D} +PSUFFIX= 93d +.elif ${PORT_OPTIONS:MKSH93} +PSUFFIX= 93 .endif post-patch: @@ -68,10 +71,10 @@ do-build: @cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/${PNAME} - ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PNAME}.1 - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ - cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/ksh${PSUFFIX} + ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ksh${PSUFFIX}.1 + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ + cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ do-test: cd ${WRKSRC}/src/cmd/ksh93/tests/ && ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests diff --git a/shells/ksh-devel/pkg-plist b/shells/ksh-devel/pkg-plist index 39bd9a3d8408..92209428c72c 100644 --- a/shells/ksh-devel/pkg-plist +++ b/shells/ksh-devel/pkg-plist @@ -1,6 +1,6 @@ @shell bin/ksh%%93%% man/man1/ksh%%93%%.1.gz -share/examples/ksh/dirs -share/examples/ksh/popd -share/examples/ksh/pushd +share/examples/ksh%%93%%/dirs +share/examples/ksh%%93%%/popd +share/examples/ksh%%93%%/pushd diff --git a/shells/ksh/Makefile b/shells/ksh/Makefile index 1780a8047211..63c5bf1e506f 100644 --- a/shells/ksh/Makefile +++ b/shells/ksh/Makefile @@ -39,6 +39,7 @@ OPTIONS_SINGLE= BIN_KSH OPTIONS_SINGLE_BIN_KSH= KSH KSH93 KSH_DESC= Install to ${PREFIX}/bin/ksh KSH93_DESC= Install to ${PREFIX}/bin/ksh93 +KSH93N_DESC= Install to ${PREFIX}/bin/ksh93n (new) CFLAGS+= -DMAP_TYPE LDFLAGS+= -lm @@ -48,13 +49,14 @@ STATIC_MAKE_ENV= LDFLAGS+=-static KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" +KSH93N_PLIST_SUB= 93="93n" .include -.if ${PORT_OPTIONS:MKSH93} -PNAME= ksh93 -.else -PNAME= ksh +.if ${PORT_OPTIONS:MKSH93N} +PSUFFIX= 93n +.elif ${PORT_OPTIONS:MKSH93} +PSUFFIX= 93 .endif post-patch: @@ -64,10 +66,10 @@ do-build: @cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/${PNAME} - ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PNAME}.1 - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ - cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/ksh${PSUFFIX} + ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ksh${PSUFFIX}.1 + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ + cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ do-test: cd ${WRKSRC}/src/cmd/ksh93/tests/ && ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests diff --git a/shells/ksh/pkg-plist b/shells/ksh/pkg-plist index 39bd9a3d8408..92209428c72c 100644 --- a/shells/ksh/pkg-plist +++ b/shells/ksh/pkg-plist @@ -1,6 +1,6 @@ @shell bin/ksh%%93%% man/man1/ksh%%93%%.1.gz -share/examples/ksh/dirs -share/examples/ksh/popd -share/examples/ksh/pushd +share/examples/ksh%%93%%/dirs +share/examples/ksh%%93%%/popd +share/examples/ksh%%93%%/pushd diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 964940deabed..7bfbe64740b8 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -39,9 +39,10 @@ KSH93_CONFLICTS= ksh2020 ksh93-devel ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC OPTIONS_SINGLE= BIN_KSH -OPTIONS_SINGLE_BIN_KSH= KSH KSH93 +OPTIONS_SINGLE_BIN_KSH= KSH KSH93 KSH93L KSH_DESC= Install to ${PREFIX}/bin/ksh KSH93_DESC= Install to ${PREFIX}/bin/ksh93 +KSH93L_DESC= Install to ${PREFIX}/bin/ksh93l (legacy) CFLAGS+= -DMAP_TYPE LDFLAGS+= -lm @@ -51,6 +52,7 @@ STATIC_MAKE_ENV= LDFLAGS+=-static KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" +KSH93L_PLIST_SUB= 93="93l" .include @@ -58,7 +60,10 @@ KSH93_PLIST_SUB= 93="93" BROKEN= GCC 9.1 changes the output of `gcc -E` which breaks the conf.sh script, fixed in shells/ksh93-devel .endif -.if ${PORT_OPTIONS:MKSH93} +.if ${PORT_OPTIONS:MKSH93L} +PNAME= ksh93l +PSUFFIX= l +.elif ${PORT_OPTIONS:MKSH93} PNAME= ksh93 .else PNAME= ksh @@ -73,8 +78,8 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/${PNAME} ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PNAME}.1 - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ - cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}/ + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ + cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ do-test: cd ${WRKSRC}/src/cmd/ksh93/tests/ && ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests diff --git a/shells/ksh93/pkg-plist b/shells/ksh93/pkg-plist index 86dc0057f028..92209428c72c 100644 --- a/shells/ksh93/pkg-plist +++ b/shells/ksh93/pkg-plist @@ -1,6 +1,6 @@ @shell bin/ksh%%93%% man/man1/ksh%%93%%.1.gz -share/examples/ksh93/dirs -share/examples/ksh93/popd -share/examples/ksh93/pushd +share/examples/ksh%%93%%/dirs +share/examples/ksh%%93%%/popd +share/examples/ksh%%93%%/pushd