Attachment #223410 for bug #254388




# $FreeBSD$

PORTNAME=	fish
DISTVERSION=	3.2.1
CATEGORIES=	shells
MASTER_SITES=	https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/


COMMENT=	User friendly command line shell

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libpcre2-32.so:devel/pcre2

# The python dependency is only needed by shebangfix.  At runtime python is
# only needed by some optional scripts that aren't in PATH.
USES=		cmake compiler:c++11-lang cpe localbase ncurses python:3.6+,env \
		shebangfix tar:xz
CPE_VENDOR=	fishshell
SHEBANG_FILES=	share/tools/*.py share/tools/web_config/webconfig.py

# sphinx stuff seems to be racy
MAKE_JOBS_UNSAFE=	yes

CONFLICTS_INSTALL=	comms/mlan3

CPE_VENDOR=	fishshell

MANDIRS=	${DATADIR}/man/man1

PORTDOCS=	*
OPTIONS_DEFINE=	MANPAGES DOCS NLS
OPTIONS_SUB=	yes

OPTIONS_DEFINE=		DOCS MANPAGES NLS
OPTIONS_DEFAULT=	DOCS MANPAGES NLS
OPTIONS_SUB=		yes
NLS_USES=		gettext
NLS_CMAKE_BOOL=		WITH_GETTEXT

NLS_USES=	gettext
NLS_CMAKE_BOOL=	WITH_GETTEXT

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
CMAKE_ARGS+=	-DBUILD_DOCS=TRUE
BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
.endif

.if ${NCURSESBASE:M${LOCALBASE}}
CMAKE_ARGS+=	-DCURSES_NEED_NCURSES=TRUE
.endif

Lines 1-3 Link Here

(-)shells/fish/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1590245573	1	TIMESTAMP = 1616090214
2	SHA256 (fish-3.1.2.tar.gz) = d5b927203b5ca95da16f514969e2a91a537b2f75bec9b21a584c4cd1c7aa74ed	2	SHA256 (fish-3.2.1.tar.xz) = d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b
3	SIZE (fish-3.1.2.tar.gz) = 6816214	3	SIZE (fish-3.2.1.tar.xz) = 3409808




--- cmake/Install.cmake.orig	2021-03-18 18:04:54 UTC
+++ cmake/Install.cmake
@@ -102,7 +102,7 @@ install(FILES share/config.fish
 fish_create_dirs(${rel_datadir}/fish/vendor_completions.d ${rel_datadir}/fish/vendor_functions.d
     ${rel_datadir}/fish/vendor_conf.d)
 
-fish_try_create_dirs(${rel_datadir}/pkgconfig)
+fish_try_create_dirs(${rel_datadir}/../libdata/pkgconfig)
 configure_file(fish.pc.in fish.pc.noversion @ONLY)
+FISH_TRY_CREATE_DIRS(${rel_datadir}/../libdata/pkgconfig)
 CONFIGURE_FILE(fish.pc.in fish.pc.noversion)
 
 add_custom_command(OUTPUT fish.pc
@@ -115,7 +115,7 @@ add_custom_command(OUTPUT fish.pc
 add_custom_target(build_fish_pc ALL DEPENDS fish.pc)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc
-        DESTINATION ${rel_datadir}/pkgconfig)
+        DESTINATION ${rel_datadir}/../libdata/pkgconfig)
 
 install(DIRECTORY share/completions/
         DESTINATION ${rel_datadir}/fish/completions

Return to bug 254388

Lines 2-8 Link Here

(-)shells/fish/Makefile (-16 / +20 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= fish	4	PORTNAME= fish
5	PORTVERSION= 3.1.2	5	DISTVERSION= 3.2.1
6	CATEGORIES= shells	6	CATEGORIES= shells
7	MASTER_SITES= https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/	7	MASTER_SITES= https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
8		8
Lines 10-45 Link Here
10	COMMENT= User friendly command line shell	10	COMMENT= User friendly command line shell
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
		13	LICENSE_FILE= ${WRKSRC}/COPYING
13		14
14	LIB_DEPENDS+= libpcre2-32.so:devel/pcre2	15	LIB_DEPENDS= libpcre2-32.so:devel/pcre2
15		16
16	# The python dependency is only needed by shebangfix. At runtime python is	17	# The python dependency is only needed by shebangfix. At runtime python is
17	# only needed by some optional scripts that aren't in PATH.	18	# only needed by some optional scripts that aren't in PATH.
18	USES= cmake cpe ncurses python:3.4+,build \	19	USES= cmake compiler:c++11-lang cpe localbase ncurses python:3.6+,env \
19	localbase compiler:c++11-lang shebangfix	20	shebangfix tar:xz
20		21	CPE_VENDOR= fishshell
21	SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py	22	SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py
22		23
		24	# sphinx stuff seems to be racy
		25	MAKE_JOBS_UNSAFE= yes
		26
23	CONFLICTS_INSTALL= comms/mlan3	27	CONFLICTS_INSTALL= comms/mlan3
24		28
25	CPE_VENDOR= fishshell
26
27	MANDIRS= ${DATADIR}/man/man1	29	MANDIRS= ${DATADIR}/man/man1
28		30
29	OPTIONS_DEFAULT= MANPAGES DOCS NLS	31	PORTDOCS= *
30	OPTIONS_DEFINE= MANPAGES DOCS NLS
31	OPTIONS_SUB= yes
32		32
33	MAKE_JOBS_UNSAFE=yes # sphinx stuff seems to be racy	33	OPTIONS_DEFINE= DOCS MANPAGES NLS
34	DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx	34	OPTIONS_DEFAULT= DOCS MANPAGES NLS
35	MANPAGES_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx	35	OPTIONS_SUB= yes
36	NLS_USES= gettext
37	NLS_CMAKE_BOOL= WITH_GETTEXT
38		36
39	PORTDOCS= *	37	NLS_USES= gettext
		38	NLS_CMAKE_BOOL= WITH_GETTEXT
40		39
41	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
42		41
		42	.if ${PORT_OPTIONS:MDOCS} \|\| ${PORT_OPTIONS:MMANPAGES}
		43	CMAKE_ARGS+= -DBUILD_DOCS=TRUE
		44	BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx
		45	.endif
		46
43	.if ${NCURSESBASE:M${LOCALBASE}}	47	.if ${NCURSESBASE:M${LOCALBASE}}
44	CMAKE_ARGS+= -DCURSES_NEED_NCURSES=TRUE	48	CMAKE_ARGS+= -DCURSES_NEED_NCURSES=TRUE
45	.endif	49	.endif

Lines 1-20 Link Here

(-)shells/fish/files/patch-cmake_Install.cmake (-13 / +13 lines)
1	--- cmake/Install.cmake.orig 2020-02-23 21:32:06 UTC	1	--- cmake/Install.cmake.orig 2021-03-18 18:04:54 UTC
2	+++ cmake/Install.cmake	2	+++ cmake/Install.cmake
3	@@ -119,7 +119,7 @@ FISH_CREATE_DIRS(${rel_datadir}/fish/vendor_completion	3	@@ -102,7 +102,7 @@ install(FILES share/config.fish
		4	fish_create_dirs(${rel_datadir}/fish/vendor_completions.d ${rel_datadir}/fish/vendor_functions.d
		5	${rel_datadir}/fish/vendor_conf.d)
4		6
5	# @echo "Installing pkgconfig file"	7	-fish_try_create_dirs(${rel_datadir}/pkgconfig)
6	# $v $(INSTALL) -m 644 fish.pc $(DESTDIR)$(datadir)/pkgconfig	8	+fish_try_create_dirs(${rel_datadir}/../libdata/pkgconfig)
7	-FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig)	9	configure_file(fish.pc.in fish.pc.noversion @ONLY)
8	+FISH_TRY_CREATE_DIRS(${rel_datadir}/../libdata/pkgconfig)
9	CONFIGURE_FILE(fish.pc.in fish.pc.noversion)
10		10
11	ADD_CUSTOM_COMMAND(OUTPUT fish.pc	11	add_custom_command(OUTPUT fish.pc
12	@@ -132,7 +132,7 @@ ADD_CUSTOM_COMMAND(OUTPUT fish.pc	12	@@ -115,7 +115,7 @@ add_custom_command(OUTPUT fish.pc
13	ADD_CUSTOM_TARGET(build_fish_pc ALL DEPENDS fish.pc)	13	add_custom_target(build_fish_pc ALL DEPENDS fish.pc)
14		14
15	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc	15	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc
16	- DESTINATION ${rel_datadir}/pkgconfig)	16	- DESTINATION ${rel_datadir}/pkgconfig)
17	+ DESTINATION ${rel_datadir}/../libdata/pkgconfig)	17	+ DESTINATION ${rel_datadir}/../libdata/pkgconfig)
18		18
19	# @echo "Installing the $(bo)fish completion library$(sgr0)...";	19	install(DIRECTORY share/completions/
20	# $v $(INSTALL) -m 644 $(COMPLETIONS_DIR_FILES:%='%') $(DESTDIR)$(datadir)/fish/completions/	20	DESTINATION ${rel_datadir}/fish/completions

Lines 1-6 Link Here

(-)shells/fish/pkg-plist (-14 / +178 lines)
1	@shell bin/fish	1	@shell bin/fish
2	bin/fish_indent	2	bin/fish_indent
3	bin/fish_key_reader	3	bin/fish_key_reader
		4	share/applications/fish.desktop
		5	share/pixmaps/fish.png
4	%%ETCDIR%%/config.fish	6	%%ETCDIR%%/config.fish
5	libdata/pkgconfig/fish.pc	7	libdata/pkgconfig/fish.pc
6	%%MANPAGES%%man/man1/fish.1.gz	8	%%MANPAGES%%man/man1/fish.1.gz
Lines 7-12 Link Here
7	%%MANPAGES%%man/man1/fish_indent.1.gz	9	%%MANPAGES%%man/man1/fish_indent.1.gz
8	%%MANPAGES%%man/man1/fish_key_reader.1.gz	10	%%MANPAGES%%man/man1/fish_key_reader.1.gz
9	%%DATADIR%%/__fish_build_paths.fish	11	%%DATADIR%%/__fish_build_paths.fish
		12	%%DATADIR%%/completions/..fish
		13	%%DATADIR%%/completions/7z.fish
		14	%%DATADIR%%/completions/7za.fish
		15	%%DATADIR%%/completions/7zr.fish
10	%%DATADIR%%/completions/VBoxHeadless.fish	16	%%DATADIR%%/completions/VBoxHeadless.fish
11	%%DATADIR%%/completions/VBoxSDL.fish	17	%%DATADIR%%/completions/VBoxSDL.fish
12	%%DATADIR%%/completions/a2disconf.fish	18	%%DATADIR%%/completions/a2disconf.fish
Lines 24-32 Link Here
24	%%DATADIR%%/completions/adb.fish	30	%%DATADIR%%/completions/adb.fish
25	%%DATADIR%%/completions/adduser.fish	31	%%DATADIR%%/completions/adduser.fish
26	%%DATADIR%%/completions/adiff.fish	32	%%DATADIR%%/completions/adiff.fish
		33	%%DATADIR%%/completions/alias.fish
27	%%DATADIR%%/completions/als.fish	34	%%DATADIR%%/completions/als.fish
28	%%DATADIR%%/completions/alsactl.fish	35	%%DATADIR%%/completions/alsactl.fish
29	%%DATADIR%%/completions/alsamixer.fish	36	%%DATADIR%%/completions/alsamixer.fish
		37	%%DATADIR%%/completions/alternatives.fish
30	%%DATADIR%%/completions/amixer.fish	38	%%DATADIR%%/completions/amixer.fish
31	%%DATADIR%%/completions/and.fish	39	%%DATADIR%%/completions/and.fish
32	%%DATADIR%%/completions/animate.fish	40	%%DATADIR%%/completions/animate.fish
Lines 36-41 Link Here
36	%%DATADIR%%/completions/ansible.fish	44	%%DATADIR%%/completions/ansible.fish
37	%%DATADIR%%/completions/ant.fish	45	%%DATADIR%%/completions/ant.fish
38	%%DATADIR%%/completions/apack.fish	46	%%DATADIR%%/completions/apack.fish
		47	%%DATADIR%%/completions/apk.fish
39	%%DATADIR%%/completions/apm.fish	48	%%DATADIR%%/completions/apm.fish
40	%%DATADIR%%/completions/apropos.fish	49	%%DATADIR%%/completions/apropos.fish