Attachment #191065 for bug #226253

View | Details | Raw Unified | Return to bug 226253
Collapse All | Expand All





PORTNAME=	nnn
DISTVERSIONPREFIX=	v
DISTVERSION=	1.7
CATEGORIES=	misc shells

MAINTAINER=	dg@syrec.org

MAKE_ARGS=	PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man
CFLAGS+=	-D_WITH_DPRINTF # enable dprintf prototype

OPTIONS_DEFINE=	ATOOL DOCS EXAMPLES MEDIAINFO
OPTIONS_DEFAULT=	ATOOL MEDIAINFO
ATOOL_DESC=	List and extract archives
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 \
		etc/bash_completion.d/nnn-completion.bash \
		share/fish/completions/nnn.fish \
		share/zsh/site-functions/_nnn

PORTDOCS=	README.md
PORTEXAMPLES=	*

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}

	@${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>

Lines 1-3 Link Here

(-)misc/nnn/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1514234740	1	TIMESTAMP = 1519768390
2	SHA256 (jarun-nnn-v1.6_GH0.tar.gz) = e8b10a3b9847ba7ad3317f608691aaebcdaf2b67219d732f7a5d468221d3e83e	2	SHA256 (jarun-nnn-v1.7_GH0.tar.gz) = fbe26efbed8b467352f313b92f8617d873c8cf0209fb6377572cf8d1ddc2747c
3	SIZE (jarun-nnn-v1.6_GH0.tar.gz) = 37456	3	SIZE (jarun-nnn-v1.7_GH0.tar.gz) = 40356




--- Makefile.orig	2018-02-27 20:44:53 UTC
+++ Makefile
@@ -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
@@ -33,9 +33,9 @@ debug: $(SRC)
 $(SRC): nnn.h
 
 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 
 
 uninstall:
 	$(RM) $(DESTDIR)$(PREFIX)/bin/$(BIN)




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')

Return to bug 226253

Lines 2-8 Link Here

(-)misc/nnn/Makefile (-18 / +14 lines)
2		2
3	PORTNAME= nnn	3	PORTNAME= nnn
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.6	5	DISTVERSION= 1.7
6	CATEGORIES= misc shells	6	CATEGORIES= misc shells
7		7
8	MAINTAINER= dg@syrec.org	8	MAINTAINER= dg@syrec.org
Lines 22-28 Link Here
22	MAKE_ARGS= PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man	22	MAKE_ARGS= PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man
23	CFLAGS+= -D_WITH_DPRINTF # enable dprintf prototype	23	CFLAGS+= -D_WITH_DPRINTF # enable dprintf prototype
24		24
25	OPTIONS_DEFINE= ATOOL BASH DOCS EXAMPLES FISH MEDIAINFO ZSH	25	OPTIONS_DEFINE= ATOOL DOCS EXAMPLES MEDIAINFO
26	OPTIONS_DEFAULT= ATOOL MEDIAINFO	26	OPTIONS_DEFAULT= ATOOL MEDIAINFO
27	ATOOL_DESC= List and extract archives	27	ATOOL_DESC= List and extract archives
28	MEDIAINFO_DESC= Show media information	28	MEDIAINFO_DESC= Show media information
Lines 30-50 Link Here
30	ATOOL_RUN_DEPENDS= atool:archivers/atool	30	ATOOL_RUN_DEPENDS= atool:archivers/atool
31	MEDIAINFO_RUN_DEPENDS= mediainfo:multimedia/mediainfo	31	MEDIAINFO_RUN_DEPENDS= mediainfo:multimedia/mediainfo
32		32
33	BASH_PLIST_FILES= etc/bash_completion.d/nnn-completion.bash
34	FISH_PLIST_FILES= share/fish/completions/nnn.fish
35	ZSH_PLIST_FILES= share/zsh/site-functions/_nnn
36
37	PLIST_FILES= bin/nnn \	33	PLIST_FILES= bin/nnn \
38	bin/nlay \	34	bin/nlay \
39	man/man1/nnn.1.gz	35	man/man1/nnn.1.gz \
		36	etc/bash_completion.d/nnn-completion.bash \
		37	share/fish/completions/nnn.fish \
		38	share/zsh/site-functions/_nnn
40		39
41	PORTDOCS= README.md	40	PORTDOCS= README.md
42	PORTEXAMPLES= *	41	PORTEXAMPLES= *
43		42
44	post-install-BASH-on:	43	post-install:
		44	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nnn
45	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d	45	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
46	${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/bash/nnn-completion.bash \	46	${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/bash/nnn-completion.bash \
47	${STAGEDIR}${PREFIX}/etc/bash_completion.d	47	${STAGEDIR}${PREFIX}/etc/bash_completion.d
		48	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
		49	${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/fish/nnn.fish \
		50	${STAGEDIR}${PREFIX}/share/fish/completions
		51	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
		52	${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/zsh/_nnn \
		53	${STAGEDIR}${PREFIX}/share/zsh/site-functions
48		54
49	post-install-DOCS-on:	55	post-install-DOCS-on:
50	@${MKDIR} ${STAGEDIR}${DOCSDIR}	56	@${MKDIR} ${STAGEDIR}${DOCSDIR}
Lines 54-67 Link Here
54	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	60	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
55	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} "copier quitcd" ${STAGEDIR}${EXAMPLESDIR}	61	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} "copier quitcd" ${STAGEDIR}${EXAMPLESDIR}
56		62
57	post-install-FISH-on:
58	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
59	${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/fish/nnn.fish \
60	${STAGEDIR}${PREFIX}/share/fish/completions
61
62	post-install-ZSH-on:
63	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
64	${INSTALL_DATA} ${WRKSRC}/scripts/auto-completion/zsh/_nnn \
65	${STAGEDIR}${PREFIX}/share/zsh/site-functions
66
67	.include <bsd.port.mk>	63	.include <bsd.port.mk>

Lines 1-8 Link Here

(-)misc/nnn/files/patch-Makefile (-11 / +14 lines)
1	--- Makefile.orig 2017-12-25 13:40:20 UTC	1	--- Makefile.orig 2018-02-27 20:44:53 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -10,7 +10,7 @@ ifeq ($(shell pkg-config ncursesw && ech	3	@@ -13,7 +13,7 @@ ifeq ($(shell $(PKG_CONFIG) ncursesw &&
4	CFLAGS += $(shell pkg-config --cflags ncursesw)	4	CFLAGS += $(shell $(PKG_CONFIG) --cflags ncursesw)
5	LDLIBS += $(shell pkg-config --libs ncursesw)	5	LDLIBS += $(shell $(PKG_CONFIG) --libs ncursesw)
6	else	6	else
7	- LDLIBS += -lncurses	7	- LDLIBS += -lncurses
8	+ LDLIBS += -lncursesw	8	+ LDLIBS += -lncursesw
Lines 9-20 Link Here
9	endif	9	endif
10		10
11	DISTFILES = nlay nnn.c nnn.h nnn.1 Makefile README.md LICENSE	11	DISTFILES = nlay nnn.c nnn.h nnn.1 Makefile README.md LICENSE
12	@@ -23,7 +23,7 @@ all: $(BIN) $(PLAYER)	12	@@ -33,9 +33,9 @@ debug: $(SRC)
13	$(SRC): nnn.h
14		13
15	$(BIN): $(SRC)	14	install: all
16	- $(CC) -O2 $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)	15	install -m 0755 -d $(DESTDIR)$(PREFIX)/bin
17	+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)	16	- install -m 0755 -t $(DESTDIR)$(PREFIX)/bin $(BIN) $(PLAYER)
18	strip $@	17	+ install -m 0755 $(BIN) $(PLAYER) $(DESTDIR)$(PREFIX)/bin
		18	install -m 0755 -d $(DESTDIR)$(MANPREFIX)/man1
		19	- install -m 0644 -t $(DESTDIR)$(MANPREFIX)/man1 $(BIN).1
		20	+ install -m 0644 $(BIN).1 $(DESTDIR)$(MANPREFIX)/man1
19		21
20	debug: $(SRC)	22	uninstall:
		23	$(RM) $(DESTDIR)$(PREFIX)/bin/$(BIN)

Lines 1-40 Link Here

(-)misc/nnn/files/patch-nnn.c (-40 lines)
1	Upstreamed, remove after the next release:
2	- https://github.com/jarun/nnn/pull/70
3	- https://github.com/jarun/nnn/pull/69
4
5	--- nnn.c.orig 2017-12-25 13:40:20 UTC
6	+++ nnn.c
7	@@ -260,7 +260,7 @@ static char * const utils[] = {
8	#ifdef __APPLE__
9	"/usr/bin/open",
10	#else
11	- "/usr/bin/xdg-open",
12	+ "xdg-open",
13	#endif
14	"nlay",
15	"atool"
16	@@ -1544,20 +1544,22 @@ show_stats(char fpath, char fname, str
17	/* Show size, blocks, file type */
18	#if defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__APPLE__)
19	dprintf(fd, "\n Size: %-15lld Blocks: %-10lld IO Block: %-6d %s",
20	+ (long long)sb->st_size, (long long)sb->st_blocks, sb->st_blksize, desc);
21	#else
22	dprintf(fd, "\n Size: %-15ld Blocks: %-10ld IO Block: %-6ld %s",
23	-#endif
24	sb->st_size, sb->st_blocks, sb->st_blksize, desc);
25	+#endif
26
27	/* Show containing device, inode, hardlink count */
28	#if defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__APPLE__)
29	sprintf(g_buf, "%xh/%ud", sb->st_dev, sb->st_dev);
30	dprintf(fd, "\n Device: %-15s Inode: %-11llu Links: %-9hu",
31	+ g_buf, (unsigned long long)sb->st_ino, sb->st_nlink);
32	#else
33	sprintf(g_buf, "%lxh/%lud", sb->st_dev, sb->st_dev);
34	dprintf(fd, "\n Device: %-15s Inode: %-11lu Links: %-9lu",
35	-#endif
36	g_buf, sb->st_ino, sb->st_nlink);
37	+#endif
38
39	/* Show major, minor number for block or char device */
40	if (perms[0] == 'b' \|\| perms[0] == 'c')