Index: head/shells/ksh93-devel/Makefile =================================================================== --- head/shells/ksh93-devel/Makefile (revision 480436) +++ head/shells/ksh93-devel/Makefile (revision 480437) @@ -1,53 +1,68 @@ # $FreeBSD$ # Make sure that your configuration DOES NOT set ANY gcc-related # variables. ksh93 will not compile if you set even the seemingly # most unrelated variable related to gcc configuration. This means # especially any flag which attempts to set the cputype. Setting the # cputype does absolutely nothing except cause systems to fail in # horrible ways. For any modern processor, setting the cputype only # serves to expose gcc bugs and does nothing to speed up any known # program. If you are really unconvinced, go ahead but do not # complain to me about it. PORTNAME= ksh93 PORTVERSION= ${AST_COMMIT_DATE} CATEGORIES= shells PKGNAMESUFFIX= -devel HASH= 4b26777 AST_COMMIT_DATE= 2018.09.20 MAINTAINER= cy@FreeBSD.org COMMENT= Development branch of AT&T KornShell 93 LICENSE= EPL USE_GITHUB= yes 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:. LDFLAGS+= -lm MESON_BUILD_DIR= build MAKE_ENV= CCFLAGS="${CFLAGS}" 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 .include Index: head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build =================================================================== --- head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build (revision 480436) +++ head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build (nonexistent) @@ -1,25 +0,0 @@ ---- src/cmd/ksh93/meson.build.orig 2018-09-20 20:55:29.000000000 -0700 -+++ src/cmd/ksh93/meson.build 2018-09-21 00:13:21.315431000 -0700 -@@ -27,19 +27,19 @@ - dependencies: [libm_dep, libexecinfo_dep, libdl_dep], - install: false) - --ksh93_exe = executable('ksh', ['sh/pmain.c'], c_args: shared_c_args, -+ksh93_exe = executable('ksh93', ['sh/pmain.c'], c_args: shared_c_args, - include_directories: [configuration_incdir, ksh93_incdir], - link_with: [libksh, libast, libcmd, libcoshell, libdll], - dependencies: [libm_dep, libexecinfo_dep, libdl_dep], - install: true) - --shcomp_exe = executable('shcomp', ['sh/shcomp.c'], c_args: shared_c_args, -+shcomp_exe = executable('shcomp93', ['sh/shcomp.c'], c_args: shared_c_args, - include_directories: [configuration_incdir, ksh93_incdir], - link_with: [libksh, libast, libcmd, libcoshell, libdll], - dependencies: [libm_dep, libexecinfo_dep, libdl_dep], - install: true) - --install_man('ksh.1') -+install_man('ksh93.1') - - test_dir = join_paths(meson.current_source_dir(), 'tests') - test_driver = join_paths(test_dir, 'util', 'run_test.sh') Property changes on: head/shells/ksh93-devel/files/patch-src_cmd_ksh93_meson.build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 =================================================================== --- head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (nonexistent) +++ head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (revision 480437) @@ -0,0 +1,25 @@ +--- src/cmd/ksh93/meson.build.orig 2018-09-20 20:55:29.000000000 -0700 ++++ src/cmd/ksh93/meson.build 2018-09-21 00:13:21.315431000 -0700 +@@ -27,19 +27,19 @@ + dependencies: [libm_dep, libexecinfo_dep, libdl_dep], + install: false) + +-ksh93_exe = executable('ksh', ['sh/pmain.c'], c_args: shared_c_args, ++ksh93_exe = executable('ksh93', ['sh/pmain.c'], c_args: shared_c_args, + include_directories: [configuration_incdir, ksh93_incdir], + link_with: [libksh, libast, libcmd, libcoshell, libdll], + dependencies: [libm_dep, libexecinfo_dep, libdl_dep], + install: true) + +-shcomp_exe = executable('shcomp', ['sh/shcomp.c'], c_args: shared_c_args, ++shcomp_exe = executable('shcomp93', ['sh/shcomp.c'], c_args: shared_c_args, + include_directories: [configuration_incdir, ksh93_incdir], + link_with: [libksh, libast, libcmd, libcoshell, libdll], + dependencies: [libm_dep, libexecinfo_dep, libdl_dep], + install: true) + +-install_man('ksh.1') ++install_man('ksh93.1') + + test_dir = join_paths(meson.current_source_dir(), 'tests') + test_driver = join_paths(test_dir, 'util', 'run_test.sh') Property changes on: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/ksh93-devel/pkg-plist =================================================================== --- head/shells/ksh93-devel/pkg-plist (revision 480436) +++ head/shells/ksh93-devel/pkg-plist (revision 480437) @@ -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