From a01331d6efbadbf98d60e4677a70627c2fba767f Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Sat, 26 Jan 2019 11:53:59 +0000 Subject: [PATCH] misc/nnn: update to 2.2 PR: 235022 Submitted by: Sijmen J. Mulder Approved by: Dmitri Goutnik (maintainer) --- misc/nnn/Makefile | 21 +++++++++------------ misc/nnn/distinfo | 6 +++--- misc/nnn/files/patch-Makefile | 11 ----------- 3 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 misc/nnn/files/patch-Makefile diff --git a/misc/nnn/Makefile b/misc/nnn/Makefile index 03014f0f6db3..18caca71883d 100644 --- a/misc/nnn/Makefile +++ b/misc/nnn/Makefile @@ -2,7 +2,7 @@ PORTNAME= nnn DISTVERSIONPREFIX= v -DISTVERSION= 2.0 +DISTVERSION= 2.2 CATEGORIES= misc shells MAINTAINER= dg@syrec.org @@ -11,29 +11,25 @@ COMMENT= Missing terminal file browser for X LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= bash:shells/bash \ - xdg-open:devel/xdg-utils - -USES= gmake localbase ncurses pkgconfig shebangfix +USES= gmake localbase ncurses USE_GITHUB= yes GH_ACCOUNT= jarun -SHEBANG_FILES= nlay -MAKE_ARGS= PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man +MAKE_ARGS= PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man LDLIBS_CURSES=-lncursesw CFLAGS+= -D_WITH_DPRINTF # enable dprintf prototype -OPTIONS_DEFINE= ATOOL DOCS EXAMPLES MEDIAINFO -OPTIONS_DEFAULT= ATOOL MEDIAINFO +OPTIONS_DEFINE= ATOOL DOCS EXAMPLES MEDIAINFO XDG +OPTIONS_DEFAULT= ATOOL MEDIAINFO XDG ATOOL_DESC= List and extract archives +XDG_DESC= Open files with xdg-open MEDIAINFO_DESC= Show media information ATOOL_RUN_DEPENDS= atool:archivers/atool MEDIAINFO_RUN_DEPENDS= mediainfo:multimedia/mediainfo +XDG_RUN_DEPENDS= xdg-open:devel/xdg-utils PLIST_FILES= bin/nnn \ - bin/nlay \ man/man1/nnn.1.gz \ - man/man1/nlay.1.gz \ etc/bash_completion.d/nnn-completion.bash \ share/fish/completions/nnn.fish \ share/zsh/site-functions/_nnn @@ -59,6 +55,7 @@ post-install-DOCS-on: post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} "copier quitcd" ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} "copier quitcd natool nlay" \ + ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/misc/nnn/distinfo b/misc/nnn/distinfo index 553a8f37fd1c..56aeaa74982c 100644 --- a/misc/nnn/distinfo +++ b/misc/nnn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540057424 -SHA256 (jarun-nnn-v2.0_GH0.tar.gz) = 0029efd3d009c197b1646d260350f3f87edca76eef3be6b81846af133d58d6a9 -SIZE (jarun-nnn-v2.0_GH0.tar.gz) = 45791 +TIMESTAMP = 1547657008 +SHA256 (jarun-nnn-v2.2_GH0.tar.gz) = 88dd08d624ae7a61ef749b1e258e4b29ed61ba9fcc5a18813f291ce80efc5e74 +SIZE (jarun-nnn-v2.2_GH0.tar.gz) = 50955 diff --git a/misc/nnn/files/patch-Makefile b/misc/nnn/files/patch-Makefile deleted file mode 100644 index 0e44da843c89..000000000000 --- a/misc/nnn/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2018-10-20 20:30:24 UTC -+++ Makefile -@@ -13,7 +13,7 @@ - CFLAGS += $(shell $(PKG_CONFIG) --cflags ncursesw) - LDLIBS += $(shell $(PKG_CONFIG) --libs ncursesw) - else -- LDLIBS += -lncurses -+ LDLIBS += -lncursesw - endif - - DISTFILES = nlay nlay.1 nnn.c nnn.h nnn.1 Makefile README.md LICENSE