On 2024/09/06 15:16, Theo Buehler wrote:
> On Fri, Sep 06, 2024 at 02:04:58PM +0100, Stuart Henderson wrote:
> > On 2024/09/06 14:00, Stuart Henderson wrote:
> > > ===> Faking installation for nsh-1.2.2
> > > install -c -s -o root -g bin -m 755 nsh
> > > /pobj/nsh-1.2.2/fake-amd64/usr/local/bin/nsh
> > > test -e /usr/local/bin/save.sh || install -m 755 -o root -g bin
> > > /usr/obj/ports/nsh-1.2.2/nsh-1.2.2/save-rw.sh /usr/local/bin/save.sh
> > > install: /usr/local/bin/INS@XIeCpSEu4i: Permission denied
> > > *** Error 1 in /usr/obj/ports/nsh-1.2.2/nsh-1.2.2 (Makefile:63
> > > 'afterinstall')
> >
> > This fixes it:
> >
> > -FAKE_FLAGS = PREFIX=${TRUEPREFIX}
> > +FAKE_FLAGS = DESTDIR=
> >
>
> I ran into the same. It looks like stsp didn't hit it because there was
> a /usr/local/bin/save.sh on the system.
>
> With sthen's diff, both flavors build & package on sparc64.
>
> Something isn't quite right with the plist or the post-install.
> You sample save.sh, but if you regen the plist, you get another
> save.sh which then breaks packaging. Should the post-install
> target not have an 'rm ${PREFIX}/bin/save.sh'?
>
So I think this is probably the diff we want - this is OK sthen
Index: Makefile
===================================================================
RCS file: /cvs/ports/shells/nsh/Makefile,v
diff -u -p -r1.51 Makefile
--- Makefile 19 Jun 2024 15:09:50 -0000 1.51
+++ Makefile 6 Sep 2024 13:23:25 -0000
@@ -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 = 0
MAINTAINER = Tom Smyth <[email protected]>
@@ -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,15 @@ 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
+.for s in extensive-nsh-openbsd-integrate.sh rc.local-nsh-openbsd-integrate.sh
+ ${INSTALL_DATA} ${WRKDIST}/scripts/shell/${s} \
+ ${PREFIX}/share/examples/nsh/
.endfor
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/shells/nsh/distinfo,v
diff -u -p -r1.19 distinfo
--- distinfo 19 Jun 2024 15:09:50 -0000 1.19
+++ distinfo 6 Sep 2024 13:23:25 -0000
@@ -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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/shells/nsh/pkg/PLIST,v
diff -u -p -r1.7 PLIST
--- pkg/PLIST 29 Sep 2023 12:17:08 -0000 1.7
+++ pkg/PLIST 6 Sep 2024 13:23:25 -0000
@@ -16,3 +16,6 @@ bin/save-rw.sh
share/doc/nsh/
share/doc/nsh/COPYRIGHT
share/doc/nsh/README.md
+share/examples/nsh/
+share/examples/nsh/extensive-nsh-openbsd-integrate.sh
+share/examples/nsh/rc.local-nsh-openbsd-integrate.sh
