On Sat, Aug 23, 2025 at 03:50:21PM +0200, Theo Buehler wrote:
> > The KSH found at configure time is propagated to most scripts that are
> > installed. It's quite possible that all of these work as intended with
> > /bin/ksh, but maybe it's best to not take any chances.
>
> Depending on shells/ksh93 is problematic due to the conflict with
> devel/libast. Now both have consumers, so the conflict bit me in my
> last bulk:
Thanks for the head up.
What about statically compiling ksh?
Index: shells/ksh93/Makefile
===================================================================
RCS file: /cvs/ports/shells/ksh93/Makefile,v
diff -u -p -r1.25 Makefile
--- shells/ksh93/Makefile 1 Sep 2024 09:54:01 -0000 1.25
+++ shells/ksh93/Makefile 24 Aug 2025 10:31:29 -0000
@@ -6,13 +6,7 @@ GH_PROJECT = ksh
GH_TAGNAME = v${V}
PKGNAME = ksh93-$V
EPOCH = 0
-
-SO_VERSION = 0.0
-
-SHARED_LIBS += ast ${SO_VERSION} # 0.0
-SHARED_LIBS += cmd ${SO_VERSION} # 0.0
-SHARED_LIBS += dll ${SO_VERSION} # 0.0
-SHARED_LIBS += shell ${SO_VERSION} # 0.0
+REVISION = 0
CATEGORIES = shells
@@ -27,7 +21,7 @@ WANTLIB += c m util
MAKE_ENV = CC="${CC}" CCFLAGS="${CFLAGS}" LDFLAGS="-lm" \
SHELL=/bin/sh TMPDIR="${WRKDIR}" \
- DYLIB_VERSION="${SO_VERSION}"
+ AST_NO_DYLIB=y
USE_GROFF = Yes
@@ -40,20 +34,13 @@ do-build:
HOSTTYPE="${HOSTTYPE}"
do-install:
- ${INSTALL_PROGRAM} ${AST_ARCH}/dyn/bin/ksh ${PREFIX}/bin/ksh93
+ ${INSTALL_PROGRAM} ${AST_ARCH}/bin/ksh ${PREFIX}/bin/ksh93
cd ${PREFIX}/bin && ln ksh93 rksh93
- ${INSTALL_DATA} ${AST_ARCH}/lib/lib{ast,cmd,dll,shell}.a \
- ${PREFIX}/lib
- ${INSTALL_DATA} \
- ${AST_ARCH}/dyn/lib/lib{ast,cmd,dll,shell}.so.${SO_VERSION} \
- ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ksh93
${INSTALL_DATA} ${AST_ARCH}/fun/* ${PREFIX}/share/examples/ksh93
${INSTALL_MAN} ${AST_ARCH}/man/man1/sh.1 ${PREFIX}/man/man1/ksh93.1
cd ${PREFIX}/man/man1 && ln ksh93.1 rksh93.1
${INSTALL_MAN} ${AST_ARCH}/man/man3/shell.3 ${PREFIX}/man/man3
- ${INSTALL_DATA_DIR} ${PREFIX}/include/ast
- ${INSTALL_DATA} ${AST_INC}/* ${PREFIX}/include/ast
do-test:
cd ${WRKSRC} && env -i ${MAKE_ENV} /bin/sh bin/package test \
Index: shells/ksh93/patches/patch-src_cmd_INIT_dylink_sh
===================================================================
RCS file: shells/ksh93/patches/patch-src_cmd_INIT_dylink_sh
diff -N shells/ksh93/patches/patch-src_cmd_INIT_dylink_sh
--- shells/ksh93/patches/patch-src_cmd_INIT_dylink_sh 1 Sep 2024 09:54:01
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Index: src/cmd/INIT/dylink.sh
---- src/cmd/INIT/dylink.sh.orig
-+++ src/cmd/INIT/dylink.sh
-@@ -120,6 +120,11 @@ case ${exec_file} in
- ;;
- esac
- sym_links="$lib_linkname $prefix$module_name$suffix"
-+ case $HOSTTYPE in
-+ openbsd.*) lib_linkname=lib$module_name$suffix.$version
-+ sym_links=""
-+ ;;
-+ esac
- # ... remove possible old versions
- (set +o noglob; exec rm -f "$dest_dir/lib/lib$module_name".*)
- # ... execute linker command
Index: shells/ksh93/pkg/PLIST
===================================================================
RCS file: /cvs/ports/shells/ksh93/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- shells/ksh93/pkg/PLIST 1 Sep 2024 09:54:01 -0000 1.6
+++ shells/ksh93/pkg/PLIST 24 Aug 2025 10:31:29 -0000
@@ -1,114 +1,5 @@
-@conflict libast-*
@shell bin/ksh93
@shell bin/rksh93
-include/ast/
-include/ast/align.h
-include/ast/aso.h
-include/ast/ast.h
-include/ast/ast_api.h
-include/ast/ast_ccode.h
-include/ast/ast_common.h
-include/ast/ast_dir.h
-include/ast/ast_dirent.h
-include/ast/ast_fcntl.h
-include/ast/ast_float.h
-include/ast/ast_fs.h
-include/ast/ast_iconv.h
-include/ast/ast_lib.h
-include/ast/ast_limits.h
-include/ast/ast_map.h
-include/ast/ast_mmap.h
-include/ast/ast_mode.h
-include/ast/ast_ndbm.h
-include/ast/ast_nl_types.h
-include/ast/ast_param.h
-include/ast/ast_sizeof.h
-include/ast/ast_standards.h
-include/ast/ast_std.h
-include/ast/ast_stdio.h
-include/ast/ast_sys.h
-include/ast/ast_time.h
-include/ast/ast_tty.h
-include/ast/ast_wait.h
-include/ast/ast_wchar.h
-include/ast/ast_wctype.h
-include/ast/ast_windows.h
-include/ast/bytesex.h
-include/ast/ccode.h
-include/ast/cdt.h
-include/ast/cmd.h
-include/ast/cmdarg.h
-include/ast/cmdext.h
-include/ast/cmdlist.h
-include/ast/debug.h
-include/ast/dirent.h
-include/ast/dlldefs.h
-include/ast/endian.h
-include/ast/error.h
-include/ast/find.h
-include/ast/fmtmsg.h
-include/ast/fnmatch.h
-include/ast/fnv.h
-include/ast/fts.h
-include/ast/ftw.h
-include/ast/ftwalk.h
-include/ast/glob.h
-include/ast/hash.h
-include/ast/hashkey.h
-include/ast/hashpart.h
-include/ast/history.h
-include/ast/iconv.h
-include/ast/ip6.h
-include/ast/lc.h
-include/ast/ls.h
-include/ast/magic.h
-include/ast/magicid.h
-include/ast/mc.h
-include/ast/mime.h
-include/ast/mnt.h
-include/ast/modecanon.h
-include/ast/modex.h
-include/ast/namval.h
-include/ast/nl_types.h
-include/ast/nval.h
-include/ast/option.h
-include/ast/proc.h
-include/ast/re_comp.h
-include/ast/recfmt.h
-include/ast/regex.h
-include/ast/regexp.h
-include/ast/releaseflags.h
-include/ast/sfdisc.h
-include/ast/sfio.h
-include/ast/sfio_s.h
-include/ast/sfio_t.h
-include/ast/shcmd.h
-include/ast/shell.h
-include/ast/sig.h
-include/ast/stak.h
-include/ast/stdio.h
-include/ast/stk.h
-include/ast/sum.h
-include/ast/swap.h
-include/ast/tar.h
-include/ast/times.h
-include/ast/tm.h
-include/ast/tmx.h
-include/ast/tok.h
-include/ast/tv.h
-include/ast/vdb.h
-include/ast/wait.h
-include/ast/wchar.h
-include/ast/wctype.h
-include/ast/wordexp.h
-@static-lib lib/libast.a
-@lib lib/libast.so.${LIBast_VERSION}
-@static-lib lib/libcmd.a
-@lib lib/libcmd.so.${LIBcmd_VERSION}
-@static-lib lib/libdll.a
-@lib lib/libdll.so.${LIBdll_VERSION}
-@static-lib lib/libshell.a
-@lib lib/libshell.so.${LIBshell_VERSION}
@man man/man1/ksh93.1
@man man/man1/rksh93.1
@man man/man3/shell.3
Index: devel/libast/Makefile
===================================================================
RCS file: /cvs/ports/devel/libast/Makefile,v
diff -u -p -r1.28 Makefile
--- devel/libast/Makefile 21 Jul 2025 15:31:49 -0000 1.28
+++ devel/libast/Makefile 24 Aug 2025 10:31:29 -0000
@@ -2,7 +2,7 @@ COMMENT= library of assorted spiffy thi
DISTNAME= libast-0.7
PKGNAME= ${DISTNAME}
-REVISION = 12
+REVISION = 13
SHARED_LIBS += ast 3.0 # .2.1
CATEGORIES= devel
Index: devel/libast/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libast/pkg/PLIST,v
diff -u -p -r1.6 PLIST
--- devel/libast/pkg/PLIST 28 Feb 2023 10:13:04 -0000 1.6
+++ devel/libast/pkg/PLIST 24 Aug 2025 10:31:29 -0000
@@ -1,4 +1,4 @@
-@conflict ksh93-*
+@conflict ksh93-<1.0.10p0v0
bin/libast-config
include/libast/
include/libast.h
