On Mon 13/01/2020 15:11, Bjorn Ketelaars wrote:
> On Mon 13/01/2020 08:44, Martin Ziemer wrote:
> > This patch updates nnn from 1.8 to 2.8.1.
> >
> > I tested it on three amd64 Systems.
> >
> > It would be great, if someone would update the port.
>
>
> Tested lightly. One comment:
>
> > pre-configure:
> > - ${SUBST_CMD} ${WRKSRC}/nlay
>
> There is nothing more to pre-configure. So 'pre-configure:' can be
> removed as well.
>
> With this OK bket@. I will commit this evening, unless someone beats me
> to it.
Just noticed that nnn compiles with '-O3'. As such it makes sense to set
CFLAGS_OPTIMIZATION using MAKE_ENV in the port's Makefile.
Full diff below for reference purposes.
diff --git Makefile Makefile
index ed1d55a940d..c5ec1eda5b6 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
COMMENT = the missing terminal file browser for X
-V = 1.8
+V = 2.8.1
DISTNAME = nnn-v${V}
PKGNAME = nnn-${V}
-REVISION = 0
CATEGORIES = sysutils
@@ -23,24 +22,24 @@ RUN_DEPENDS = shells/bash
USE_GMAKE = Yes
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/nnn
+MAKE_ENV = CFLAGS_OPTIMIZATION="${CFLAGS}"
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/nlay
+WRKDIST = ${WRKDIR}/nnn
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nnn ${PREFIX}/bin/
- ${INSTALL_SCRIPT} ${WRKSRC}/nlay ${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKSRC}/misc/nlay/nlay ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/nnn.1 ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/misc/nlay/nlay.1 ${PREFIX}/man/man1/
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/
- ${INSTALL_DATA}
${WRKSRC}/scripts/auto-completion/bash/nnn-completion.bash \
+ ${INSTALL_DATA} ${WRKSRC}/misc/auto-completion/bash/nnn-completion.bash
\
${PREFIX}/share/bash-completion/completions/nnn
${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
- ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/fish/nnn.fish \
+ ${INSTALL_DATA} ${WRKSRC}/misc/auto-completion/fish/nnn.fish \
${PREFIX}/share/fish/completions/
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
- ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/zsh/_nnn \
+ ${INSTALL_DATA} ${WRKSRC}/misc/auto-completion/zsh/_nnn \
${PREFIX}/share/zsh/site-functions/
.include <bsd.port.mk>
diff --git distinfo distinfo
index 7c6be06b394..976234916bb 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (nnn-v1.8.tar.gz) = 5VioxbeEe8flfyPw3faQ0mbBXGNDDjbolVj69p+jkH8=
-SIZE (nnn-v1.8.tar.gz) = 42453
+SHA256 (nnn-v2.8.1.tar.gz) = 4Pr45ifU+GBQ9XyzHu4hvw4hOK3vjtVBKwc12ptdh7w=
+SIZE (nnn-v2.8.1.tar.gz) = 91353
diff --git patches/patch-nlay patches/patch-nlay
deleted file mode 100644
index 588d664d508..00000000000
--- patches/patch-nlay
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-nlay,v 1.1.1.1 2018/05/07 18:29:00 kn Exp $
-
-Index: nlay
---- nlay.orig
-+++ nlay
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!${LOCALBASE}/bin/bash
-
- #
#############################################################################
- # nlay: a customizable script to play files in different apps by file type
diff --git pkg/PLIST pkg/PLIST
index 21c9b7c63d9..14ef0c04045 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/05/07 18:29:00 kn Exp $
bin/nlay
@bin bin/nnn
+@man man/man1/nlay.1
@man man/man1/nnn.1
share/bash-completion/
share/bash-completion/completions/
