+CC maintainers for sysutils/nnn and www/lynx On 2019/05/25 23:21, bijan wrote: > Oops, forgot to send the actual diff, Sorry > > On 5/25/19 11:04 PM, bijan wrote: > > Hi ports, > > > > The following diff is the update of nnn file manager. > > Hope it helps. > > > > B.E > > >
Please don't make a bunch of style changes in a port update, and where a github project has a proper uploaded tarball, use that rather than a auto-rolled tarball (as was done in the in-tree port). Here is a cleaned up version. However there are runtime problems; it tries to run lynx to display files which gets killed by pledge when it tries to change tty mode. lynx[77894]: pledge "tty", syscall 54 (gdb) bt #0 ioctl () at -:3 #1 0x00001705ec6db2ad in _libc_tcsetattr (fd=2, opt=<optimized out>, t=0x7f7ffffba800) at /usr/src/lib/libc/termios/tcsetattr.c:49 #2 0x00001706ba769066 in _nc_set_tty_mode (buf=<optimized out>) at /usr/src/lib/libcurses/tinfo/lib_ttyflags.c:88 #3 0x00001706ba74afbf in noraw () at /usr/src/lib/libcurses/tinfo/lib_raw.c:195 #4 0x00001706ba765a51 in wgetnstr (win=0x17067abd2000, str=0x7f7ffffba930 "dzS\211%\347\375\061\250\251", <incomplete sequence \373\377\177\177>, maxlen=135) at /usr/src/lib/libcurses/base/lib_getstr.c:102 #5 0x00001706ba76161b in recur_wgetnstr (win=<optimized out>, buf=<optimized out>) at /usr/src/lib/libcurses/base/lib_getch.c:305 #6 _nc_wgetch (win=0x17067abd2000, result=0x7f7ffffbaa28, use_meta=0) at /usr/src/lib/libcurses/base/lib_getch.c:361 #7 0x00001706ba76172a in wgetch (win=0x17067abd2000) at /usr/src/lib/libcurses/base/lib_getch.c:558 This affects the current version too (to replicate: install, run nnn, select a file, press enter). Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/nnn/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 7 May 2018 18:29:00 -0000 1.1.1.1 +++ Makefile 26 May 2019 12:24:11 -0000 @@ -2,7 +2,7 @@ COMMENT = the missing terminal file browser for X -V = 1.8 +V = 2.4 DISTNAME = nnn-v${V} PKGNAME = nnn-${V} @@ -19,19 +19,15 @@ WANTLIB = c curses readline MASTER_SITES = https://github.com/jarun/nnn/releases/download/v${V}/ -RUN_DEPENDS = shells/bash - USE_GMAKE = Yes NO_TEST = Yes -WRKDIST = ${WRKDIR}/nnn +MAKE_FLAGS = CFLAGS_OPTIMIZATION="" -pre-configure: - ${SUBST_CMD} ${WRKSRC}/nlay +WRKDIST = ${WRKDIR}/nnn do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nnn ${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${WRKSRC}/nlay ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/nnn.1 ${PREFIX}/man/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/ Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/nnn/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 7 May 2018 18:29:00 -0000 1.1.1.1 +++ distinfo 26 May 2019 12:24:11 -0000 @@ -1,2 +1,2 @@ -SHA256 (nnn-v1.8.tar.gz) = 5VioxbeEe8flfyPw3faQ0mbBXGNDDjbolVj69p+jkH8= -SIZE (nnn-v1.8.tar.gz) = 42453 +SHA256 (nnn-v2.4.tar.gz) = 9awOmOGw4iUQ0R6a6yjSB7vk5ylYslDxxHObj0n/3Ik= +SIZE (nnn-v2.4.tar.gz) = 62704 Index: patches/patch-nlay =================================================================== RCS file: patches/patch-nlay diff -N patches/patch-nlay --- patches/patch-nlay 7 May 2018 18:29:00 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/nnn/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 7 May 2018 18:29:00 -0000 1.1.1.1 +++ pkg/PLIST 26 May 2019 12:24:11 -0000 @@ -1,5 +1,4 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2018/05/07 18:29:00 kn Exp $ -bin/nlay @bin bin/nnn @man man/man1/nnn.1 share/bash-completion/ > diff --git a/sysutils/nnn/Makefile b/sysutils/nnn/Makefile > index eae01c6..334b358 100644 > --- a/sysutils/nnn/Makefile > +++ b/sysutils/nnn/Makefile > @@ -1,37 +1,31 @@ > # $OpenBSD: Makefile,v 1.1.1.1 2018/05/07 18:29:00 kn Exp $ > > -COMMENT = the missing terminal file browser for X > +COMMENT= snappy terminal file browser for X > > -V = 1.8 > -DISTNAME = nnn-v${V} > -PKGNAME = nnn-${V} > +V= 2.4 > +DISTNAME= nnn-v${V} > +PKGNAME= nnn-${V} > > -CATEGORIES = sysutils > +CATEGORIES= sysutils > > -HOMEPAGE = https://github.com/jarun/nnn/ > +GH_ACCOUNT= jarun > +GH_PROJECT= nnn > +GH_TAGNAME= v$(V) > > -MAINTAINER = Ljuba Nedeljkovic <ljuba....@gmail.com> > +HOMEPAGE= https://github.com/jarun/nnn/ > > -# BSD > -PERMIT_PACKAGE_CDROM = Yes > - > -WANTLIB = c curses readline > - > -MASTER_SITES = > https://github.com/jarun/nnn/releases/download/v${V}/ > +MAINTAINER= Ljuba Nedeljkovic <ljuba....@gmail.com> > > -RUN_DEPENDS = shells/bash > - > -USE_GMAKE = Yes > -NO_TEST = Yes > +# BSD > +PERMIT_PACKAGE_CDROM= Yes > > -WRKDIST = ${WRKDIR}/nnn > +WANTLIB= c curses readline > > -pre-configure: > - ${SUBST_CMD} ${WRKSRC}/nlay > +USE_GMAKE= Yes > +NO_TEST= Yes > > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/nnn ${PREFIX}/bin/ > - ${INSTALL_SCRIPT} ${WRKSRC}/nlay ${PREFIX}/bin/ > ${INSTALL_MAN} ${WRKSRC}/nnn.1 ${PREFIX}/man/man1/ > > ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/ > diff --git a/sysutils/nnn/distinfo b/sysutils/nnn/distinfo > index 7c6be06..47de0f5 100644 > --- a/sysutils/nnn/distinfo > +++ b/sysutils/nnn/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (nnn-v1.8.tar.gz) = 5VioxbeEe8flfyPw3faQ0mbBXGNDDjbolVj69p+jkH8= > -SIZE (nnn-v1.8.tar.gz) = 42453 > +SHA256 (nnn-v2.4.tar.gz) = hZulvUiSAWrtmkgw7h4bA+t06UxPG9gvAojcVZ9zJ+s= > +SIZE (nnn-v2.4.tar.gz) = 62510 > diff --git a/sysutils/nnn/patches/patch-nlay b/sysutils/nnn/patches/patch-nlay > deleted file mode 100644 > index 588d664..0000000 > --- a/sysutils/nnn/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