Attachment #242317 for bug #271558

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

Lines 1-5 Link Here

(-)shells/fish/Makefile (-13 / +5 lines)
1	PORTNAME= fish	1	PORTNAME= fish
2	DISTVERSION= 3.6.0	2	DISTVERSION= 3.6.1
3	CATEGORIES= shells	3	CATEGORIES= shells
4	MASTER_SITES= https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/	4	MASTER_SITES= https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
5		5
Lines 19-27 USES= cmake compiler:c++11-lang cpe localbase ncurses python:3.6+,env \ Link Here
19	CPE_VENDOR= fishshell	19	CPE_VENDOR= fishshell
20	SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py	20	SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py
21		21
22	# sphinx stuff seems to be racy
23	MAKE_JOBS_UNSAFE= yes
24
25	CONFLICTS_INSTALL= comms/mlan3	22	CONFLICTS_INSTALL= comms/mlan3
26		23
27	MANDIRS= ${DATADIR}/man/man1	24	MANDIRS= ${DATADIR}/man/man1
Lines 32-47 OPTIONS_DEFINE= DOCS MANPAGES NLS Link Here
32	OPTIONS_DEFAULT= MANPAGES NLS	29	OPTIONS_DEFAULT= MANPAGES NLS
33	OPTIONS_SUB= yes	30	OPTIONS_SUB= yes
34		31
		32	DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
		33	DOCS_CMAKE_BOOL= BUILD_DOCS
		34	DOCS_VARS= MAKE_JOBS_UNSAFE=yes
		35
35	NLS_USES= gettext	36	NLS_USES= gettext
36	NLS_CMAKE_BOOL= WITH_GETTEXT	37	NLS_CMAKE_BOOL= WITH_GETTEXT
37		38
38	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
39		40
40	.if ${PORT_OPTIONS:MDOCS} \|\| ${PORT_OPTIONS:MMANPAGES}
41	CMAKE_ARGS+= -DBUILD_DOCS=TRUE
42	BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx
43	.endif
44
45	.if ${NCURSESBASE:M${LOCALBASE}}	41	.if ${NCURSESBASE:M${LOCALBASE}}
46	CMAKE_ARGS+= -DCURSES_NEED_NCURSES=TRUE	42	CMAKE_ARGS+= -DCURSES_NEED_NCURSES=TRUE
47	.endif	43	.endif
Lines 55-62 post-install: Link Here
55	post-stage-DOCS-on:	51	post-stage-DOCS-on:
56	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo	52	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
57		53
58	post-stage-MANPAGES-off:
59	@${RM} -rf ${STAGEDIR}${MANPREFIX}/man/man1
60	@${RM} -rf ${STAGEDIR}${DATADIR}/man
61
62	.include <bsd.port.post.mk>	54	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)shells/fish/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1674153299	1	TIMESTAMP = 1684723601
2	SHA256 (fish-3.6.0.tar.xz) = 97044d57773ee7ca15634f693d917ed1c3dc0fa7fde1017f1626d60b83ea6181	2	SHA256 (fish-3.6.1.tar.xz) = 55402bb47ca6739d8aba25e41780905b5ce1bce0a5e0dd17dca908b5bc0b49b2
3	SIZE (fish-3.6.0.tar.xz) = 2892296	3	SIZE (fish-3.6.1.tar.xz) = 2866100




%%DATADIR%%/completions/ant.fish
%%DATADIR%%/completions/apack.fish
%%DATADIR%%/completions/apk.fish
%%DATADIR%%/completions/apkanalyzer.fish
%%DATADIR%%/completions/apm.fish
%%DATADIR%%/completions/apropos.fish
%%DATADIR%%/completions/apt-build.fish

%%DATADIR%%/completions/expect.fish
%%DATADIR%%/completions/ezjail-admin.fish
%%DATADIR%%/completions/fab.fish
%%DATADIR%%/completions/fail2ban-client.fish
%%DATADIR%%/completions/fastboot.fish
%%DATADIR%%/completions/feh.fish
%%DATADIR%%/completions/ffmpeg.fish

%%DATADIR%%/completions/optimus-manager.fish
%%DATADIR%%/completions/optipng.fish
%%DATADIR%%/completions/or.fish
%%DATADIR%%/completions/otool.fish
%%DATADIR%%/completions/ouch.fish
%%DATADIR%%/completions/p4.fish
%%DATADIR%%/completions/pabcnetcclear.fish

%%DATADIR%%/completions/poweroff.fish
%%DATADIR%%/completions/powerpill.fish
%%DATADIR%%/completions/powershell.fish
%%DATADIR%%/completions/pre-commit.fish
%%DATADIR%%/completions/prevd.fish
%%DATADIR%%/completions/prime-run.fish
%%DATADIR%%/completions/proxychains.fish
%%DATADIR%%/completions/prt-get.fish
%%DATADIR%%/completions/ps.fish
%%DATADIR%%/completions/ps2pdf.fish

%%DATADIR%%/completions/scp.fish
%%DATADIR%%/completions/screen.fish
%%DATADIR%%/completions/scrot.fish
%%DATADIR%%/completions/scrypt.fish
%%DATADIR%%/completions/scss.fish
%%DATADIR%%/completions/sed.fish
%%DATADIR%%/completions/seq.fish

%%DATADIR%%/completions/sphinx-quickstart.fish
%%DATADIR%%/completions/sqlsharp.fish
%%DATADIR%%/completions/src.fish
%%DATADIR%%/completions/ssh-copy-id.fish
%%DATADIR%%/completions/ssh.fish
%%DATADIR%%/completions/sshfs.fish
%%DATADIR%%/completions/stack.fish
%%DATADIR%%/completions/starship.fish
%%DATADIR%%/completions/stat.fish
%%DATADIR%%/completions/status.fish
%%DATADIR%%/completions/stow.fish
%%DATADIR%%/completions/strace.fish
%%DATADIR%%/completions/stream.fish
%%DATADIR%%/completions/string.fish

%%DATADIR%%/completions/traceroute.fish
%%DATADIR%%/completions/transmission-remote.fish
%%DATADIR%%/completions/trap.fish
%%DATADIR%%/completions/trash-empty.fish
%%DATADIR%%/completions/trash-list.fish
%%DATADIR%%/completions/trash-put.fish
%%DATADIR%%/completions/trash-restore.fish
%%DATADIR%%/completions/trash.fish
%%DATADIR%%/completions/travis.fish
%%DATADIR%%/completions/tree.fish
%%DATADIR%%/completions/tsc.fish

%%DATADIR%%/functions/__fish_vcs_prompt.fish
%%DATADIR%%/functions/__fish_whatis.fish
%%DATADIR%%/functions/__fish_whatis_current_token.fish
%%DATADIR%%/functions/__ssh_history_completions.fish
%%DATADIR%%/functions/__terlar_git_prompt.fish
%%DATADIR%%/functions/_validate_int.fish
%%DATADIR%%/functions/abbr.fish

%%DATADIR%%/functions/up-or-search.fish
%%DATADIR%%/functions/vared.fish
%%DATADIR%%/groff/fish.tmac
%%DATADIR%%/lynx.lss
%%DATADIR%%/tools/create_manpage_completions.py
%%DATADIR%%/tools/deroff.py
%%DATADIR%%/tools/web_config/delete.png

%%DATADIR%%/tools/web_config/js/colorutils.js
%%DATADIR%%/tools/web_config/js/controllers.js
%%DATADIR%%/tools/web_config/js/filters.js
%%DATADIR%%/tools/web_config/partials/abbreviations.html
%%DATADIR%%/tools/web_config/partials/bindings.html
%%DATADIR%%/tools/web_config/partials/colors.html
%%DATADIR%%/tools/web_config/partials/functions.html

Return to bug 271558

Lines 42-47 libdata/pkgconfig/fish.pc Link Here

(-)shells/fish/pkg-plist (-2 / +14 lines)
42	%%DATADIR%%/completions/ant.fish	42	%%DATADIR%%/completions/ant.fish
43	%%DATADIR%%/completions/apack.fish	43	%%DATADIR%%/completions/apack.fish
44	%%DATADIR%%/completions/apk.fish	44	%%DATADIR%%/completions/apk.fish
		45	%%DATADIR%%/completions/apkanalyzer.fish
45	%%DATADIR%%/completions/apm.fish	46	%%DATADIR%%/completions/apm.fish
46	%%DATADIR%%/completions/apropos.fish	47	%%DATADIR%%/completions/apropos.fish
47	%%DATADIR%%/completions/apt-build.fish	48	%%DATADIR%%/completions/apt-build.fish
Lines 275-280 libdata/pkgconfig/fish.pc Link Here
275	%%DATADIR%%/completions/expect.fish	276	%%DATADIR%%/completions/expect.fish
276	%%DATADIR%%/completions/ezjail-admin.fish	277	%%DATADIR%%/completions/ezjail-admin.fish
277	%%DATADIR%%/completions/fab.fish	278	%%DATADIR%%/completions/fab.fish
		279	%%DATADIR%%/completions/fail2ban-client.fish
278	%%DATADIR%%/completions/fastboot.fish	280	%%DATADIR%%/completions/fastboot.fish
279	%%DATADIR%%/completions/feh.fish	281	%%DATADIR%%/completions/feh.fish
280	%%DATADIR%%/completions/ffmpeg.fish	282	%%DATADIR%%/completions/ffmpeg.fish
Lines 564-569 libdata/pkgconfig/fish.pc Link Here
564	%%DATADIR%%/completions/optimus-manager.fish	566	%%DATADIR%%/completions/optimus-manager.fish
565	%%DATADIR%%/completions/optipng.fish	567	%%DATADIR%%/completions/optipng.fish
566	%%DATADIR%%/completions/or.fish	568	%%DATADIR%%/completions/or.fish
		569	%%DATADIR%%/completions/otool.fish
567	%%DATADIR%%/completions/ouch.fish	570	%%DATADIR%%/completions/ouch.fish
568	%%DATADIR%%/completions/p4.fish	571	%%DATADIR%%/completions/p4.fish
569	%%DATADIR%%/completions/pabcnetcclear.fish	572	%%DATADIR%%/completions/pabcnetcclear.fish
Lines 623-630 libdata/pkgconfig/fish.pc Link Here
623	%%DATADIR%%/completions/poweroff.fish	626	%%DATADIR%%/completions/poweroff.fish
624	%%DATADIR%%/completions/powerpill.fish	627	%%DATADIR%%/completions/powerpill.fish
625	%%DATADIR%%/completions/powershell.fish	628	%%DATADIR%%/completions/powershell.fish
		629	%%DATADIR%%/completions/pre-commit.fish
626	%%DATADIR%%/completions/prevd.fish	630	%%DATADIR%%/completions/prevd.fish
627	%%DATADIR%%/completions/prime-run.fish	631	%%DATADIR%%/completions/prime-run.fish
		632	%%DATADIR%%/completions/proxychains.fish
628	%%DATADIR%%/completions/prt-get.fish	633	%%DATADIR%%/completions/prt-get.fish
629	%%DATADIR%%/completions/ps.fish	634	%%DATADIR%%/completions/ps.fish
630	%%DATADIR%%/completions/ps2pdf.fish	635	%%DATADIR%%/completions/ps2pdf.fish
Lines 707-712 libdata/pkgconfig/fish.pc Link Here
707	%%DATADIR%%/completions/scp.fish	712	%%DATADIR%%/completions/scp.fish
708	%%DATADIR%%/completions/screen.fish	713	%%DATADIR%%/completions/screen.fish
709	%%DATADIR%%/completions/scrot.fish	714	%%DATADIR%%/completions/scrot.fish
		715	%%DATADIR%%/completions/scrypt.fish
710	%%DATADIR%%/completions/scss.fish	716	%%DATADIR%%/completions/scss.fish
711	%%DATADIR%%/completions/sed.fish	717	%%DATADIR%%/completions/sed.fish
712	%%DATADIR%%/completions/seq.fish	718	%%DATADIR%%/completions/seq.fish
Lines 740-751 libdata/pkgconfig/fish.pc Link Here
740	%%DATADIR%%/completions/sphinx-quickstart.fish	746	%%DATADIR%%/completions/sphinx-quickstart.fish
741	%%DATADIR%%/completions/sqlsharp.fish	747	%%DATADIR%%/completions/sqlsharp.fish
742	%%DATADIR%%/completions/src.fish	748	%%DATADIR%%/completions/src.fish
		749	%%DATADIR%%/completions/ssh-copy-id.fish
743	%%DATADIR%%/completions/ssh.fish	750	%%DATADIR%%/completions/ssh.fish
744	%%DATADIR%%/completions/sshfs.fish	751	%%DATADIR%%/completions/sshfs.fish
745	%%DATADIR%%/completions/stack.fish	752	%%DATADIR%%/completions/stack.fish
746	%%DATADIR%%/completions/starship.fish	753	%%DATADIR%%/completions/starship.fish
747	%%DATADIR%%/completions/stat.fish	754	%%DATADIR%%/completions/stat.fish
748	%%DATADIR%%/completions/status.fish	755	%%DATADIR%%/completions/status.fish
		756	%%DATADIR%%/completions/stow.fish
749	%%DATADIR%%/completions/strace.fish	757	%%DATADIR%%/completions/strace.fish
750	%%DATADIR%%/completions/stream.fish	758	%%DATADIR%%/completions/stream.fish
751	%%DATADIR%%/completions/string.fish	759	%%DATADIR%%/completions/string.fish
Lines 791-796 libdata/pkgconfig/fish.pc Link Here
791	%%DATADIR%%/completions/traceroute.fish	799	%%DATADIR%%/completions/traceroute.fish
792	%%DATADIR%%/completions/transmission-remote.fish	800	%%DATADIR%%/completions/transmission-remote.fish
793	%%DATADIR%%/completions/trap.fish	801	%%DATADIR%%/completions/trap.fish
		802	%%DATADIR%%/completions/trash-empty.fish
		803	%%DATADIR%%/completions/trash-list.fish
		804	%%DATADIR%%/completions/trash-put.fish
		805	%%DATADIR%%/completions/trash-restore.fish
		806	%%DATADIR%%/completions/trash.fish
794	%%DATADIR%%/completions/travis.fish	807	%%DATADIR%%/completions/travis.fish
795	%%DATADIR%%/completions/tree.fish	808	%%DATADIR%%/completions/tree.fish
796	%%DATADIR%%/completions/tsc.fish	809	%%DATADIR%%/completions/tsc.fish
Lines 1060-1065 libdata/pkgconfig/fish.pc Link Here
1060	%%DATADIR%%/functions/__fish_vcs_prompt.fish	1073	%%DATADIR%%/functions/__fish_vcs_prompt.fish
1061	%%DATADIR%%/functions/__fish_whatis.fish	1074	%%DATADIR%%/functions/__fish_whatis.fish
1062	%%DATADIR%%/functions/__fish_whatis_current_token.fish	1075	%%DATADIR%%/functions/__fish_whatis_current_token.fish
		1076	%%DATADIR%%/functions/__ssh_history_completions.fish
1063	%%DATADIR%%/functions/__terlar_git_prompt.fish	1077	%%DATADIR%%/functions/__terlar_git_prompt.fish
1064	%%DATADIR%%/functions/_validate_int.fish	1078	%%DATADIR%%/functions/_validate_int.fish
1065	%%DATADIR%%/functions/abbr.fish	1079	%%DATADIR%%/functions/abbr.fish
Lines 1130-1136 libdata/pkgconfig/fish.pc Link Here
1130	%%DATADIR%%/functions/up-or-search.fish	1144	%%DATADIR%%/functions/up-or-search.fish
1131	%%DATADIR%%/functions/vared.fish	1145	%%DATADIR%%/functions/vared.fish
1132	%%DATADIR%%/groff/fish.tmac	1146	%%DATADIR%%/groff/fish.tmac
1133	%%DATADIR%%/lynx.lss
1134	%%DATADIR%%/tools/create_manpage_completions.py	1147	%%DATADIR%%/tools/create_manpage_completions.py
1135	%%DATADIR%%/tools/deroff.py	1148	%%DATADIR%%/tools/deroff.py
1136	%%DATADIR%%/tools/web_config/delete.png	1149	%%DATADIR%%/tools/web_config/delete.png
Lines 1144-1150 libdata/pkgconfig/fish.pc Link Here
1144	%%DATADIR%%/tools/web_config/js/colorutils.js	1157	%%DATADIR%%/tools/web_config/js/colorutils.js
1145	%%DATADIR%%/tools/web_config/js/controllers.js	1158	%%DATADIR%%/tools/web_config/js/controllers.js
1146	%%DATADIR%%/tools/web_config/js/filters.js	1159	%%DATADIR%%/tools/web_config/js/filters.js
1147	%%DATADIR%%/tools/web_config/partials/abbreviations.html
1148	%%DATADIR%%/tools/web_config/partials/bindings.html	1160	%%DATADIR%%/tools/web_config/partials/bindings.html
1149	%%DATADIR%%/tools/web_config/partials/colors.html	1161	%%DATADIR%%/tools/web_config/partials/colors.html
1150	%%DATADIR%%/tools/web_config/partials/functions.html	1162	%%DATADIR%%/tools/web_config/partials/functions.html