Date: Sat, 22 Sep 2018 17:45:34 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Cy Schubert <cy@FreeBSD.org> 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 Message-ID: <201809230045.w8N0jYoY069443@slippy.cwsent.com> In-Reply-To: Message from Cy Schubert <cy@FreeBSD.org> of "Sat, 22 Sep 2018 23:31:56 -0000." <201809222331.w8MNVu3C020202@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> > > 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 <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809230045.w8N0jYoY069443>