From owner-svn-ports-head@freebsd.org Wed Feb 28 00:49:47 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0B4AF3A067; Wed, 28 Feb 2018 00:49:46 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E41B7A76A; Wed, 28 Feb 2018 00:49:46 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97B82124CB; Wed, 28 Feb 2018 00:49:46 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1S0nkNV032729; Wed, 28 Feb 2018 00:49:46 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1S0nkWe032726; Wed, 28 Feb 2018 00:49:46 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201802280049.w1S0nkWe032726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Wed, 28 Feb 2018 00:49:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463172 - in head/misc/nnn: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/misc/nnn: . files X-SVN-Commit-Revision: 463172 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Feb 2018 00:49:47 -0000 Author: yuri Date: Wed Feb 28 00:49:46 2018 New Revision: 463172 URL: https://svnweb.freebsd.org/changeset/ports/463172 Log: misc/nnn: Update to 1.7 Changelog: https://github.com/jarun/nnn/releases/tag/v1.7 Port changes: * Shell completion options removed, completions installed unconditionally * Remove files/patch-nnn.c (merged upstream) PR: 226253 Submitted by: Dmitri Goutnik (maintainer) Approved by: tcberner (mentor, implicit) Deleted: head/misc/nnn/files/patch-nnn.c Modified: head/misc/nnn/Makefile head/misc/nnn/distinfo head/misc/nnn/files/patch-Makefile Modified: head/misc/nnn/Makefile ============================================================================== --- head/misc/nnn/Makefile Wed Feb 28 00:47:03 2018 (r463171) +++ head/misc/nnn/Makefile Wed Feb 28 00:49:46 2018 (r463172) @@ -2,7 +2,7 @@ PORTNAME= nnn DISTVERSIONPREFIX= v -DISTVERSION= 1.6 +DISTVERSION= 1.7 CATEGORIES= misc shells MAINTAINER= dg@syrec.org @@ -22,7 +22,7 @@ SHEBANG_FILES= nlay MAKE_ARGS= PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man CFLAGS+= -D_WITH_DPRINTF # enable dprintf prototype -OPTIONS_DEFINE= ATOOL BASH DOCS EXAMPLES FISH MEDIAINFO ZSH +OPTIONS_DEFINE= ATOOL DOCS EXAMPLES MEDIAINFO OPTIONS_DEFAULT= ATOOL MEDIAINFO ATOOL_DESC= List and extract archives MEDIAINFO_DESC= Show media information @@ -30,21 +30,27 @@ MEDIAINFO_DESC= Show media information ATOOL_RUN_DEPENDS= atool:archivers/atool MEDIAINFO_RUN_DEPENDS= mediainfo:multimedia/mediainfo -BASH_PLIST_FILES= etc/bash_completion.d/nnn-completion.bash -FISH_PLIST_FILES= share/fish/completions/nnn.fish -ZSH_PLIST_FILES= share/zsh/site-functions/_nnn - PLIST_FILES= bin/nnn \ bin/nlay \ - man/man1/nnn.1.gz + man/man1/nnn.1.gz \ + etc/bash_completion.d/nnn-completion.bash \ + share/fish/completions/nnn.fish \ + share/zsh/site-functions/_nnn PORTDOCS= README.md PORTEXAMPLES= * -post-install-BASH-on: +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nnn @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/bash/nnn-completion.bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d + @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions + ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/fish/nnn.fish \ + ${STAGEDIR}${PREFIX}/share/fish/completions + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions + ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/zsh/_nnn \ + ${STAGEDIR}${PREFIX}/share/zsh/site-functions post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -53,15 +59,5 @@ post-install-DOCS-on: post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} "copier quitcd" ${STAGEDIR}${EXAMPLESDIR} - -post-install-FISH-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions - ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/fish/nnn.fish \ - ${STAGEDIR}${PREFIX}/share/fish/completions - -post-install-ZSH-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/zsh/_nnn \ - ${STAGEDIR}${PREFIX}/share/zsh/site-functions .include Modified: head/misc/nnn/distinfo ============================================================================== --- head/misc/nnn/distinfo Wed Feb 28 00:47:03 2018 (r463171) +++ head/misc/nnn/distinfo Wed Feb 28 00:49:46 2018 (r463172) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514234740 -SHA256 (jarun-nnn-v1.6_GH0.tar.gz) = e8b10a3b9847ba7ad3317f608691aaebcdaf2b67219d732f7a5d468221d3e83e -SIZE (jarun-nnn-v1.6_GH0.tar.gz) = 37456 +TIMESTAMP = 1519768390 +SHA256 (jarun-nnn-v1.7_GH0.tar.gz) = fbe26efbed8b467352f313b92f8617d873c8cf0209fb6377572cf8d1ddc2747c +SIZE (jarun-nnn-v1.7_GH0.tar.gz) = 40356 Modified: head/misc/nnn/files/patch-Makefile ============================================================================== --- head/misc/nnn/files/patch-Makefile Wed Feb 28 00:47:03 2018 (r463171) +++ head/misc/nnn/files/patch-Makefile Wed Feb 28 00:49:46 2018 (r463172) @@ -1,20 +1,23 @@ ---- Makefile.orig 2017-12-25 13:40:20 UTC +--- Makefile.orig 2018-02-27 20:44:53 UTC +++ Makefile -@@ -10,7 +10,7 @@ ifeq ($(shell pkg-config ncursesw && ech - CFLAGS += $(shell pkg-config --cflags ncursesw) - LDLIBS += $(shell pkg-config --libs ncursesw) +@@ -13,7 +13,7 @@ ifeq ($(shell $(PKG_CONFIG) ncursesw && + CFLAGS += $(shell $(PKG_CONFIG) --cflags ncursesw) + LDLIBS += $(shell $(PKG_CONFIG) --libs ncursesw) else - LDLIBS += -lncurses + LDLIBS += -lncursesw endif DISTFILES = nlay nnn.c nnn.h nnn.1 Makefile README.md LICENSE -@@ -23,7 +23,7 @@ all: $(BIN) $(PLAYER) - $(SRC): nnn.h +@@ -33,9 +33,9 @@ debug: $(SRC) - $(BIN): $(SRC) -- $(CC) -O2 $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS) -+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS) - strip $@ + install: all + install -m 0755 -d $(DESTDIR)$(PREFIX)/bin +- install -m 0755 -t $(DESTDIR)$(PREFIX)/bin $(BIN) $(PLAYER) ++ install -m 0755 $(BIN) $(PLAYER) $(DESTDIR)$(PREFIX)/bin + install -m 0755 -d $(DESTDIR)$(MANPREFIX)/man1 +- install -m 0644 -t $(DESTDIR)$(MANPREFIX)/man1 $(BIN).1 ++ install -m 0644 $(BIN).1 $(DESTDIR)$(MANPREFIX)/man1 - debug: $(SRC) + uninstall: + $(RM) $(DESTDIR)$(PREFIX)/bin/$(BIN)