OK Tom ...

On Fri, 6 Sept 2024 at 14:55, Stefan Sperling <stsp@stsp.name> wrote:

> On Fri, Sep 06, 2024 at 02:27:28PM +0100, Stuart Henderson wrote:
> > So I think this is probably the diff we want - this is OK sthen
>
> Thanks. Here is an updated diff which fixes an issue pointed out
> by Tom where the newly added example scripts won't run properly.
>
> The .sh example scripts expect that certain .nshrc scripts exist at
> a relative path in ../nshrc, for example:
>
>                 /usr/local/bin/nsh -c ../nshrc/write-config.nshrc
>
> There are ways to remove this dependency on external files from these
> scripts. nsh can read commands from stdin nowadays. But since the
> release was tagged like this I'd rather keep the port aligned with
> this release's expectations.
>
> With the diff below these .sh scripts can be run as Tom documented
> it in README.md.
>
> diff /usr/ports
> commit - f640b88fef18c3032a9b02b089db0dee4d88cf43
> path + /usr/ports
> blob - 66bab971f2124f1025600e908dbb4984214bfd85
> file + shells/nsh/Makefile
> --- shells/nsh/Makefile
> +++ shells/nsh/Makefile
> @@ -2,10 +2,9 @@ COMMENT =      network switch style shell
>
>  CATEGORIES =   shells net
>  HOMEPAGE =     https://www.nmedia.net/nsh/
> -V =            1.2.1
> +V =            1.2.2
>  DISTNAME =     nsh-${V}
>  SITES =
> https://github.com/yellowman/nsh/releases/download/v${V}/
> -REVISION
> <https://github.com/yellowman/nsh/releases/download/v$%7BV%7D/-REVISION>
> =     0
>
>  MAINTAINER =   Tom Smyth <tom.smyth@wirelessconnect.eu>
>
> @@ -29,10 +28,10 @@ MAKE_ENV =  CC="${CC}" \
>                 LDFLAGS="-L${LOCALBASE}/lib"
>  LIB_DEPENDS =  databases/sqlite3
>
> -FAKE_FLAGS =   PREFIX=${TRUEPREFIX}
> +FAKE_FLAGS =   DESTDIR=
>
>  .if ${FLAVOR:Mstatic}
> -MAKE_FLAGS +=  LDFLAGS="-L${LOCALBASE}/lib -ledit -ltermcap -lsqlite3 -lm
> -lpthread -static"
> +ALL_TARGET =   static
>  .endif
>
>  NO_TEST=       Yes
> @@ -41,9 +40,20 @@ post-install:
>  .for i in save-ro.sh save-rw.sh
>         ${INSTALL_SCRIPT} ${WRKDIST}/${i} ${PREFIX}/bin
>  .endfor
> +       rm ${PREFIX}/bin/save.sh
>         ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nsh
>  .for i in README.md COPYRIGHT
>         ${INSTALL_DATA} ${WRKDIST}/${i} ${PREFIX}/share/doc/nsh/
>  .endfor
> +       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nsh/shell
> +.for s in extensive-nsh-openbsd-integrate.sh
> rc.local-nsh-openbsd-integrate.sh
> +       ${INSTALL_DATA} ${WRKDIST}/scripts/shell/${s} \
> +               ${PREFIX}/share/examples/nsh/shell
> +.endfor
> +       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nsh/nshrc
> +.for s in enable-sshd.nshrc write-config.nshrc initial-config.nshrc
> +       ${INSTALL_DATA} ${WRKDIST}/scripts/nshrc/${s} \
> +               ${PREFIX}/share/examples/nsh/nshrc
> +.endfor
>
>  .include <bsd.port.mk>
> blob - 644f8cc92d2911a3e757849b207930517cd1eee8
> file + shells/nsh/distinfo
> --- shells/nsh/distinfo
> +++ shells/nsh/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (nsh-1.2.1.tar.gz) = rU/ep0MEA9O7CJacaF3vvMx82MRlUmLc2U/riRgJgTs=
> -SIZE (nsh-1.2.1.tar.gz) = 221571
> +SHA256 (nsh-1.2.2.tar.gz) = EfR0Yya3F7Ej6nfPd+WlqLT+Z8A8ZUb6fcWb1pQamw8=
> +SIZE (nsh-1.2.2.tar.gz) = 228756
> blob - 2897dbbb594af24ccdae8265ac828cc1e17db426
> file + shells/nsh/pkg/PLIST
> --- shells/nsh/pkg/PLIST
> +++ shells/nsh/pkg/PLIST
> @@ -16,3 +16,11 @@ bin/save-rw.sh
>  share/doc/nsh/
>  share/doc/nsh/COPYRIGHT
>  share/doc/nsh/README.md
> +share/examples/nsh/
> +share/examples/nsh/nshrc/
> +share/examples/nsh/nshrc/enable-sshd.nshrc
> +share/examples/nsh/nshrc/initial-config.nshrc
> +share/examples/nsh/nshrc/write-config.nshrc
> +share/examples/nsh/shell/
> +share/examples/nsh/shell/extensive-nsh-openbsd-integrate.sh
> +share/examples/nsh/shell/rc.local-nsh-openbsd-integrate.sh
>
>

-- 
Kindest regards,
Tom Smyth.