From owner-svn-ports-all@freebsd.org Sun Sep 23 00:48:19 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 3A25610A87D1; Sun, 23 Sep 2018 00:48:19 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 7C85589828; Sun, 23 Sep 2018 00:48:18 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id 3sWmgBaOmwyxU3sWogZ6eb; Sat, 22 Sep 2018 18:45:39 -0600 X-Authority-Analysis: v=2.3 cv=NPJhBHyg c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=kj9zAlcOel0A:10 a=JBFolyDoGHsA:10 a=6I5d2MoRAAAA:8 a=93Ubh6UdAAAA:8 a=YxBL1-UpAAAA:8 a=0sd6cZ3oXVxTHuUqhVYA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=q-6THwuxr82FYj4XiUVi:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 9ACFB25AC; Sat, 22 Sep 2018 17:46:59 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id w8N0jYwv069446; Sat, 22 Sep 2018 17:45:34 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id w8N0jYoY069443; Sat, 22 Sep 2018 17:45:34 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201809230045.w8N0jYoY069443@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r480437 - in head/shells/ksh93-devel: . files In-Reply-To: Message from Cy Schubert of "Sat, 22 Sep 2018 23:31:56 -0000." <201809222331.w8MNVu3C020202@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 22 Sep 2018 17:45:34 -0700 X-CMAE-Envelope: MS4wfBjqR0u1wNy+RVEP6vbjn2Rd5yeevqiefuuEw7pkM1otm5Me4yMjJ9iq8dO66bEOlcjK1IsUrQ6S5lKkr8IcWjUEu227eF59r60fObpbepGxKbV6wKoq lBE4eHftyYL2o3YJJkIHAd1BUmUXFl7vK/Z5dF94cHxwNGF+hqgM3UTNJMMhJLAvERBH4OtRd/vXhTImjb+xVboyG3vjhGI2E1YjdjTM8BX+HWJh75MjlB6y yT7+W3ade+i1TpJlfg1tFs0+dADcLVvppyfogM8jKGXtYLNveP2cFkXGzJdIcD28NUoX8jCZt4jF4s1QkTFAdQ== 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: Sun, 23 Sep 2018 00:48:19 -0000 In message <201809222331.w8MNVu3C020202@repo.freebsd.org>, Cy Schubert writes: > 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 s/git/give/ > 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, pro > ps 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 (r48043 > 6) > +++ head/shells/ksh93-devel/Makefile Sat Sep 22 23:31:56 2018 (r48043 > 7) > @@ -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-ksh > 93 (from r480436, head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.bui > ld) > ============================================================================= > = > > Modified: head/shells/ksh93-devel/pkg-plist > ============================================================================= > = > --- head/shells/ksh93-devel/pkg-plist Sat Sep 22 23:19:40 2018 (r48043 > 6) > +++ head/shells/ksh93-devel/pkg-plist Sat Sep 22 23:31:56 2018 (r48043 > 7) > @@ -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 > -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.