Attachment #250094 for bug #278468

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




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

PATCH_SITES=	https://github.com/fish-shell/fish-shell/commit/
PATCHFILES+=	85504ca694ae099f023ae0febb363238d9c64e8d.patch:-p1

MAINTAINER=	asomers@FreeBSD.org
COMMENT=	User friendly command line shell
WWW=		https://fishshell.com/


CONFLICTS_INSTALL=	comms/mlan3

MANDIRS=	${DATADIR}/man

PORTDOCS=	*


.endif

post-install:
.for i in fish fish_indent fish_key_reader
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
.endfor
	@${MV} ${STAGEDIR}${ETCDIR}/config.fish ${STAGEDIR}${ETCDIR}/config.fish.sample

post-install-DOCS-on:
	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo

post-install-DOCS-off:
	# required because fish always installs documentation
	@${ECHO_MSG} "====> DOCS disable; removing documentation"
	@${RM} -r ${STAGEDIR}${DOCSDIR}

post-install-MANPAGES-off:
	# required because fish always installs manual pages
	@${ECHO_MSG} "====> MANPAGES disable; removing manual pages"
	for dir in ${MANDIRS:S/^/${STAGEDIR}/} ; do \
		${FIND} $$dir -type f -delete ; \
	done
	@${RM} -r ${STAGEDIR}${DATADIR}/man

.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)b/shells/fish/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1693954987	1	TIMESTAMP = 1712678789
2	SHA256 (fish-3.6.1.tar.xz) = 55402bb47ca6739d8aba25e41780905b5ce1bce0a5e0dd17dca908b5bc0b49b2	2	SHA256 (fish-3.7.1.tar.xz) = 614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250
3	SIZE (fish-3.6.1.tar.xz) = 2866100	3	SIZE (fish-3.7.1.tar.xz) = 2965756
4	SHA256 (85504ca694ae099f023ae0febb363238d9c64e8d.patch) = c8e3395463dab5d7b5a68fe8a16ef47b9aaef5a983ba909e9c132159290a5f08
5	SIZE (85504ca694ae099f023ae0febb363238d9c64e8d.patch) = 1505

Return to bug 278468

Lines 1-12 Link Here

(-)b/shells/fish/Makefile (-10 / +16 lines)
1	PORTNAME= fish	1	PORTNAME= fish
2	DISTVERSION= 3.6.1	2	DISTVERSION= 3.7.1
3	PORTREVISION= 1
4	CATEGORIES= shells	3	CATEGORIES= shells
5	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}/
6		5
7	PATCH_SITES= https://github.com/fish-shell/fish-shell/commit/
8	PATCHFILES+= 85504ca694ae099f023ae0febb363238d9c64e8d.patch:-p1
9
10	MAINTAINER= asomers@FreeBSD.org	6	MAINTAINER= asomers@FreeBSD.org
11	COMMENT= User friendly command line shell	7	COMMENT= User friendly command line shell
12	WWW= https://fishshell.com/	8	WWW= https://fishshell.com/
Lines 25-31 SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py Link Here
25		21
26	CONFLICTS_INSTALL= comms/mlan3	22	CONFLICTS_INSTALL= comms/mlan3
27		23
28	MANDIRS= ${DATADIR}/man/man1	24	MANDIRS= ${DATADIR}/man
29		25
30	PORTDOCS= *	26	PORTDOCS= *
31		27
Lines 47-58 CMAKE_ARGS+= -DCURSES_NEED_NCURSES=TRUE Link Here
47	.endif	43	.endif
48		44
49	post-install:	45	post-install:
50	.for i in fish fish_indent fish_key_reader
51	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
52	.endfor
53	@${MV} ${STAGEDIR}${ETCDIR}/config.fish ${STAGEDIR}${ETCDIR}/config.fish.sample	46	@${MV} ${STAGEDIR}${ETCDIR}/config.fish ${STAGEDIR}${ETCDIR}/config.fish.sample
54		47
55	post-stage-DOCS-on:	48	post-install-DOCS-on:
56	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo	49	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
57		50
		51	post-install-DOCS-off:
		52	# required because fish always installs documentation
		53	@${ECHO_MSG} "====> DOCS disable; removing documentation"
		54	@${RM} -r ${STAGEDIR}${DOCSDIR}
		55
		56	post-install-MANPAGES-off:
		57	# required because fish always installs manual pages
		58	@${ECHO_MSG} "====> MANPAGES disable; removing manual pages"
		59	for dir in ${MANDIRS:S/^/${STAGEDIR}/} ; do \
		60	${FIND} $$dir -type f -delete ; \
		61	done
		62	@${RM} -r ${STAGEDIR}${DATADIR}/man
		63
58	.include <bsd.port.post.mk>	64	.include <bsd.port.post.mk>

Lines 27-32 libdata/pkgconfig/fish.pc Link Here

(-)b/shells/fish/pkg-plist (-3 / +49 lines)
27	%%DATADIR%%/completions/adb.fish	27	%%DATADIR%%/completions/adb.fish
28	%%DATADIR%%/completions/adduser.fish	28	%%DATADIR%%/completions/adduser.fish
29	%%DATADIR%%/completions/adiff.fish	29	%%DATADIR%%/completions/adiff.fish
		30	%%DATADIR%%/completions/age-keygen.fish
		31	%%DATADIR%%/completions/age.fish
		32	%%DATADIR%%/completions/airmon-ng.fish
30	%%DATADIR%%/completions/alias.fish	33	%%DATADIR%%/completions/alias.fish
31	%%DATADIR%%/completions/als.fish	34	%%DATADIR%%/completions/als.fish
32	%%DATADIR%%/completions/alsactl.fish	35	%%DATADIR%%/completions/alsactl.fish
Lines 70-75 libdata/pkgconfig/fish.pc Link Here
70	%%DATADIR%%/completions/apt-zip-list.fish	73	%%DATADIR%%/completions/apt-zip-list.fish
71	%%DATADIR%%/completions/apt.fish	74	%%DATADIR%%/completions/apt.fish
72	%%DATADIR%%/completions/aptitude.fish	75	%%DATADIR%%/completions/aptitude.fish
		76	%%DATADIR%%/completions/ar.fish
73	%%DATADIR%%/completions/arc.fish	77	%%DATADIR%%/completions/arc.fish
74	%%DATADIR%%/completions/archlinux-java.fish	78	%%DATADIR%%/completions/archlinux-java.fish
75	%%DATADIR%%/completions/arepack.fish	79	%%DATADIR%%/completions/arepack.fish
Lines 107-112 libdata/pkgconfig/fish.pc Link Here
107	%%DATADIR%%/completions/bind.fish	111	%%DATADIR%%/completions/bind.fish
108	%%DATADIR%%/completions/bison.fish	112	%%DATADIR%%/completions/bison.fish
109	%%DATADIR%%/completions/black.fish	113	%%DATADIR%%/completions/black.fish
		114	%%DATADIR%%/completions/blender.fish
110	%%DATADIR%%/completions/block.fish	115	%%DATADIR%%/completions/block.fish
111	%%DATADIR%%/completions/bluetoothctl.fish	116	%%DATADIR%%/completions/bluetoothctl.fish
112	%%DATADIR%%/completions/bootctl.fish	117	%%DATADIR%%/completions/bootctl.fish
Lines 122-127 libdata/pkgconfig/fish.pc Link Here
122	%%DATADIR%%/completions/bundle.fish	127	%%DATADIR%%/completions/bundle.fish
123	%%DATADIR%%/completions/bunzip2.fish	128	%%DATADIR%%/completions/bunzip2.fish
124	%%DATADIR%%/completions/busctl.fish	129	%%DATADIR%%/completions/busctl.fish
		130	%%DATADIR%%/completions/bws.fish
125	%%DATADIR%%/completions/bzcat.fish	131	%%DATADIR%%/completions/bzcat.fish
126	%%DATADIR%%/completions/bzip2.fish	132	%%DATADIR%%/completions/bzip2.fish
127	%%DATADIR%%/completions/bzip2recover.fish	133	%%DATADIR%%/completions/bzip2recover.fish
Lines 130-135 libdata/pkgconfig/fish.pc Link Here
130	%%DATADIR%%/completions/cabal.fish	136	%%DATADIR%%/completions/cabal.fish
131	%%DATADIR%%/completions/caddy.fish	137	%%DATADIR%%/completions/caddy.fish
132	%%DATADIR%%/completions/caffeinate.fish	138	%%DATADIR%%/completions/caffeinate.fish
		139	%%DATADIR%%/completions/calendar.fish