From owner-svn-ports-all@freebsd.org Sat Sep 22 23:31:57 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCB2310A6ECD; Sat, 22 Sep 2018 23:31:57 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 846FA86EF0; Sat, 22 Sep 2018 23:31:57 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6546322A39; Sat, 22 Sep 2018 23:31:57 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8MNVvOP020204; Sat, 22 Sep 2018 23:31:57 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8MNVu3C020202; Sat, 22 Sep 2018 23:31:56 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201809222331.w8MNVu3C020202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 22 Sep 2018 23:31:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480437 - in head/shells/ksh93-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/shells/ksh93-devel: . files X-SVN-Commit-Revision: 480437 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Sep 2018 23:31:58 -0000 Author: cy Date: Sat Sep 22 23:31:56 2018 New Revision: 480437 URL: https://svnweb.freebsd.org/changeset/ports/480437 Log: As ksh93 is the real ksh devleoped by AT&T, git the user the option of installing ksh as ${LOCALBASE}/bin/ksh instead of as ${LOCALBASE}/bin/ksh93. If the KSH option is chosen, this port will conflict with shells/pdksh. By default the binary that is installed is ksh93 (conflicting with shells/ksh). In the future, we might want to add a little ports infrastructure allowing ports that need a ksh to depend on one of the various ksh or ksh clones in ports. Added: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (contents, props changed) - copied, changed from r480436, head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build Deleted: head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build Modified: head/shells/ksh93-devel/Makefile (contents, props changed) head/shells/ksh93-devel/pkg-plist (contents, props changed) Modified: head/shells/ksh93-devel/Makefile ============================================================================== --- head/shells/ksh93-devel/Makefile Sat Sep 22 23:19:40 2018 (r480436) +++ head/shells/ksh93-devel/Makefile Sat Sep 22 23:31:56 2018 (r480437) @@ -27,7 +27,8 @@ GH_ACCOUNT= att GH_PROJECT= ast GH_TAGNAME= ${HASH} -CONFLICTS= ksh93-* +KSH93_CONFLICTS= ksh93-* +KSH_CONFLICTS= pdksh-* USES= meson ninja FETCH_ENV= HTTP_AUTH=basic:*:I\ accept\ www.opensource.org/licenses/cpl:. @@ -39,13 +40,27 @@ STATIC_MAKE_ENV= LDFLAGS+=-static BROKEN_aarch64= Fails to compile: needs sbrk +OPTIONS_DEFAULT= KSH93 +OPTIONS_SINGLE= BIN_KSH +OPTIONS_SINGLE_BIN_KSH= KSH KSH93 +KSH_DESC= Install to ${PREFIX}/bin/ksh +KSH93_DESC= Install to ${PREFIX}/bin/ksh93 + +KSH93_EXTRA_PATCHES= ${FILESDIR}/extra-patch-install-as-ksh93 +KSH93_DESC= Install to ${PREFIX}/bin/ksh93 + +KSH_PLIST_SUB= 93="" +KSH93_PLIST_SUB= 93="93" + .include post-patch: .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100093 @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c .endif +.if ${PORT_OPTIONS:MKSH93} @${MV} ${WRKSRC}/src/cmd/ksh93/ksh.1 ${WRKSRC}/src/cmd/ksh93/ksh93.1 +.endif do-test: cd ${WRKSRC}/src/cmd/ksh93/tests/ && ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests Copied and modified: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (from r480436, head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build) ============================================================================== Modified: head/shells/ksh93-devel/pkg-plist ============================================================================== --- head/shells/ksh93-devel/pkg-plist Sat Sep 22 23:19:40 2018 (r480436) +++ head/shells/ksh93-devel/pkg-plist Sat Sep 22 23:31:56 2018 (r480437) @@ -1,3 +1,3 @@ -@shell bin/ksh93 -bin/shcomp93 -man/man1/ksh93.1.gz +@shell bin/ksh%%93%% +bin/shcomp%%93%% +man/man1/ksh%%93%%.1.gz