Attachment 191065 Details for Bug 226253 – patch file

[patch] patch file

nnn-1.7.patch (text/plain), 6.27 KB, created by Dmitri Goutnik on 2018-02-27 22:56:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2018-02-27 22:56:31 UTC

Size: 6.27 KB

patch

obsolete

>Index: misc/nnn/Makefile
>===================================================================
>--- misc/nnn/Makefile	(revision 463150)
>+++ misc/nnn/Makefile	(working copy)
>@@ -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 @@
> 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 @@
> 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}
>@@ -54,14 +60,4 @@
> 	@${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 <bsd.port.mk>
>Index: misc/nnn/distinfo
>===================================================================
>--- misc/nnn/distinfo	(revision 463150)
>+++ misc/nnn/distinfo	(working copy)
>@@ -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
>Index: misc/nnn/files/patch-Makefile
>===================================================================
>--- misc/nnn/files/patch-Makefile	(revision 463150)
>+++ misc/nnn/files/patch-Makefile	(working copy)
>@@ -1,8 +1,8 @@
>---- 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
>@@ -9,12 +9,15 @@
>  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)
>Index: misc/nnn/files/patch-nnn.c
>===================================================================
>--- misc/nnn/files/patch-nnn.c	(revision 463150)
>+++ misc/nnn/files/patch-nnn.c	(nonexistent)
>@@ -1,40 +0,0 @@
>-Upstreamed, remove after the next release:
>-  - https://github.com/jarun/nnn/pull/70
>-  - https://github.com/jarun/nnn/pull/69
>-
>---- nnn.c.orig	2017-12-25 13:40:20 UTC
>-+++ nnn.c
>-@@ -260,7 +260,7 @@ static char * const utils[] = {
>- #ifdef __APPLE__
>- 	"/usr/bin/open",
>- #else
>--	"/usr/bin/xdg-open",
>-+	"xdg-open",
>- #endif
>- 	"nlay",
>- 	"atool"
>-@@ -1544,20 +1544,22 @@ show_stats(char *fpath, char *fname, str
>- 	/* Show size, blocks, file type */
>- #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
>- 	dprintf(fd, "\n    Size: %-15lld Blocks: %-10lld IO Block: %-6d %s",
>-+	       (long long)sb->st_size, (long long)sb->st_blocks, sb->st_blksize, desc);
>- #else
>- 	dprintf(fd, "\n    Size: %-15ld Blocks: %-10ld IO Block: %-6ld %s",
>--#endif
>- 	       sb->st_size, sb->st_blocks, sb->st_blksize, desc);
>-+#endif
>- 
>- 	/* Show containing device, inode, hardlink count */
>- #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
>- 	sprintf(g_buf, "%xh/%ud", sb->st_dev, sb->st_dev);
>- 	dprintf(fd, "\n  Device: %-15s Inode: %-11llu Links: %-9hu",
>-+		g_buf, (unsigned long long)sb->st_ino, sb->st_nlink);
>- #else
>- 	sprintf(g_buf, "%lxh/%lud", sb->st_dev, sb->st_dev);
>- 	dprintf(fd, "\n  Device: %-15s Inode: %-11lu Links: %-9lu",
>--#endif
>- 		g_buf, sb->st_ino, sb->st_nlink);
>-+#endif
>- 
>- 	/* Show major, minor number for block or char device */
>- 	if (perms[0] == 'b' || perms[0] == 'c')
>
>Property changes on: misc/nnn/files/patch-nnn.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

dmgk: maintainer-approval+

Actions: View | Diff

Attachments on bug 226253: 191065