Attachment #156847 for bug #198322

View | Details | Raw Unified | Return to bug 198322 | Differences between
Collapse All | Expand All





PORTNAME=	fish
PORTVERSION=	2.1.1
PORTREVISION=	4
CATEGORIES=	shells
MASTER_SITES=	http://fishshell.com/files/${PORTVERSION}/


LDFLAGS+=	-L${LOCALBASE}/lib -pthread ${ICONV_LIB}

PORTDOCS=	*
MANDIRS=	${DATADIR}/man/man1

OPTIONS_DEFINE=	DOCS NLS
OPTIONS_SUB=	yes

		'/^all:/s|user_doc|| ; \
		 s| "$$(HAVE_GETTEXT)" = 1| x$$(HAVE_GETTEXT) = x1| ; \
		 s| $$(HAVE_GETTEXT) = 1| x$$(HAVE_GETTEXT) = x1| ; \
		 s|$$(DESTDIR)$$(bindir)/fish|$$(bindir)/fish|g' \
		 ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e \
		's|-rdynamic|-Wl,--export-dynamic| ; \
		 /pthread_create/d ; \




%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
%%DATADIR%%/man/man1/alias.1.gz
%%DATADIR%%/man/man1/and.1.gz
%%DATADIR%%/man/man1/begin.1.gz
%%DATADIR%%/man/man1/bg.1.gz
%%DATADIR%%/man/man1/bind.1.gz
%%DATADIR%%/man/man1/block.1.gz
%%DATADIR%%/man/man1/break.1.gz
%%DATADIR%%/man/man1/breakpoint.1.gz
%%DATADIR%%/man/man1/builtin.1.gz
%%DATADIR%%/man/man1/case.1.gz
%%DATADIR%%/man/man1/cd.1.gz
%%DATADIR%%/man/man1/command.1.gz
%%DATADIR%%/man/man1/commandline.1.gz
%%DATADIR%%/man/man1/complete.1.gz
%%DATADIR%%/man/man1/contains.1.gz
%%DATADIR%%/man/man1/continue.1.gz
%%DATADIR%%/man/man1/count.1.gz
%%DATADIR%%/man/man1/dirh.1.gz
%%DATADIR%%/man/man1/dirs.1.gz
%%DATADIR%%/man/man1/echo.1.gz
%%DATADIR%%/man/man1/else.1.gz
%%DATADIR%%/man/man1/emit.1.gz
%%DATADIR%%/man/man1/end.1.gz
%%DATADIR%%/man/man1/eval.1.gz
%%DATADIR%%/man/man1/exec.1.gz
%%DATADIR%%/man/man1/exit.1.gz
%%DATADIR%%/man/man1/fg.1.gz
%%DATADIR%%/man/man1/fish.1.gz
%%DATADIR%%/man/man1/fish_config.1.gz
%%DATADIR%%/man/man1/fish_indent.1.gz
%%DATADIR%%/man/man1/fish_pager.1.gz
%%DATADIR%%/man/man1/fish_prompt.1.gz
%%DATADIR%%/man/man1/fish_right_prompt.1.gz
%%DATADIR%%/man/man1/fish_update_completions.1.gz
%%DATADIR%%/man/man1/fishd.1.gz
%%DATADIR%%/man/man1/for.1.gz
%%DATADIR%%/man/man1/funced.1.gz
%%DATADIR%%/man/man1/funcsave.1.gz
%%DATADIR%%/man/man1/function.1.gz
%%DATADIR%%/man/man1/functions.1.gz
%%DATADIR%%/man/man1/help.1.gz
%%DATADIR%%/man/man1/history.1.gz
%%DATADIR%%/man/man1/if.1.gz
%%DATADIR%%/man/man1/isatty.1.gz
%%DATADIR%%/man/man1/jobs.1.gz
%%DATADIR%%/man/man1/math.1.gz
%%DATADIR%%/man/man1/mimedb.1.gz
%%DATADIR%%/man/man1/nextd.1.gz
%%DATADIR%%/man/man1/not.1.gz
%%DATADIR%%/man/man1/open.1.gz
%%DATADIR%%/man/man1/or.1.gz
%%DATADIR%%/man/man1/popd.1.gz
%%DATADIR%%/man/man1/prevd.1.gz
%%DATADIR%%/man/man1/psub.1.gz
%%DATADIR%%/man/man1/pushd.1.gz
%%DATADIR%%/man/man1/pwd.1.gz
%%DATADIR%%/man/man1/random.1.gz
%%DATADIR%%/man/man1/read.1.gz
%%DATADIR%%/man/man1/return.1.gz
%%DATADIR%%/man/man1/set.1.gz
%%DATADIR%%/man/man1/set_color.1.gz
%%DATADIR%%/man/man1/source.1.gz
%%DATADIR%%/man/man1/status.1.gz
%%DATADIR%%/man/man1/switch.1.gz
%%DATADIR%%/man/man1/test.1.gz
%%DATADIR%%/man/man1/trap.1.gz
%%DATADIR%%/man/man1/type.1.gz
%%DATADIR%%/man/man1/ulimit.1.gz
%%DATADIR%%/man/man1/umask.1.gz
%%DATADIR%%/man/man1/vared.1.gz
%%DATADIR%%/man/man1/while.1.gz

Return to bug 198322

Lines 3-9 Link Here

(-)fish/Makefile (-3 / +4 lines)
3		3
4	PORTNAME= fish	4	PORTNAME= fish
5	PORTVERSION= 2.1.1	5	PORTVERSION= 2.1.1
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= shells	7	CATEGORIES= shells
8	MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/	8	MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/
9		9
Lines 21-26 Link Here
21	LDFLAGS+= -L${LOCALBASE}/lib -pthread ${ICONV_LIB}	21	LDFLAGS+= -L${LOCALBASE}/lib -pthread ${ICONV_LIB}
22		22
23	PORTDOCS= *	23	PORTDOCS= *
		24	MANDIRS= ${DATADIR}/man/man1
24		25
25	OPTIONS_DEFINE= DOCS NLS	26	OPTIONS_DEFINE= DOCS NLS
26	OPTIONS_SUB= yes	27	OPTIONS_SUB= yes
Lines 36-43 Link Here
36	'/^all:/s\|user_doc\|\| ; \	37	'/^all:/s\|user_doc\|\| ; \
37	s\| "$$(HAVE_GETTEXT)" = 1\| x$$(HAVE_GETTEXT) = x1\| ; \	38	s\| "$$(HAVE_GETTEXT)" = 1\| x$$(HAVE_GETTEXT) = x1\| ; \
38	s\| $$(HAVE_GETTEXT) = 1\| x$$(HAVE_GETTEXT) = x1\| ; \	39	s\| $$(HAVE_GETTEXT) = 1\| x$$(HAVE_GETTEXT) = x1\| ; \
39	s\|$$(DESTDIR)$$(bindir)/fish\|$$(bindir)/fish\|g ; \	40	s\|$$(DESTDIR)$$(bindir)/fish\|$$(bindir)/fish\|g' \
40	/fish\/man\/man1/d' ${WRKSRC}/Makefile.in	41	${WRKSRC}/Makefile.in
41	@${REINPLACE_CMD} -e \	42	@${REINPLACE_CMD} -e \
42	's\|-rdynamic\|-Wl,--export-dynamic\| ; \	43	's\|-rdynamic\|-Wl,--export-dynamic\| ; \
43	/pthread_create/d ; \	44	/pthread_create/d ; \

Lines 565-567 Link Here

(-)fish/pkg-plist (+71 lines)
565	%%NLS%%share/locale/en/LC_MESSAGES/fish.mo	565	%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
566	%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo	566	%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
567	%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo	567	%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
		568	%%DATADIR%%/man/man1/alias.1.gz
		569	%%DATADIR%%/man/man1/and.1.gz
		570	%%DATADIR%%/man/man1/begin.1.gz
		571	%%DATADIR%%/man/man1/bg.1.gz
		572	%%DATADIR%%/man/man1/bind.1.gz
		573	%%DATADIR%%/man/man1/block.1.gz
		574	%%DATADIR%%/man/man1/break.1.gz
		575	%%DATADIR%%/man/man1/breakpoint.1.gz
		576	%%DATADIR%%/man/man1/builtin.1.gz
		577	%%DATADIR%%/man/man1/case.1.gz
		578	%%DATADIR%%/man/man1/cd.1.gz
		579	%%DATADIR%%/man/man1/command.1.gz
		580	%%DATADIR%%/man/man1/commandline.1.gz
		581	%%DATADIR%%/man/man1/complete.1.gz
		582	%%DATADIR%%/man/man1/contains.1.gz
		583	%%DATADIR%%/man/man1/continue.1.gz
		584	%%DATADIR%%/man/man1/count.1.gz
		585	%%DATADIR%%/man/man1/dirh.1.gz
		586	%%DATADIR%%/man/man1/dirs.1.gz
		587	%%DATADIR%%/man/man1/echo.1.gz
		588	%%DATADIR%%/man/man1/else.1.gz
		589	%%DATADIR%%/man/man1/emit.1.gz
		590	%%DATADIR%%/man/man1/end.1.gz
		591	%%DATADIR%%/man/man1/eval.1.gz
		592	%%DATADIR%%/man/man1/exec.1.gz
		593	%%DATADIR%%/man/man1/exit.1.gz
		594	%%DATADIR%%/man/man1/fg.1.gz
		595	%%DATADIR%%/man/man1/fish.1.gz
		596	%%DATADIR%%/man/man1/fish_config.1.gz
		597	%%DATADIR%%/man/man1/fish_indent.1.gz
		598	%%DATADIR%%/man/man1/fish_pager.1.gz
		599	%%DATADIR%%/man/man1/fish_prompt.1.gz
		600	%%DATADIR%%/man/man1/fish_right_prompt.1.gz
		601	%%DATADIR%%/man/man1/fish_update_completions.1.gz
		602	%%DATADIR%%/man/man1/fishd.1.gz
		603	%%DATADIR%%/man/man1/for.1.gz
		604	%%DATADIR%%/man/man1/funced.1.gz
		605	%%DATADIR%%/man/man1/funcsave.1.gz
		606	%%DATADIR%%/man/man1/function.1.gz
		607	%%DATADIR%%/man/man1/functions.1.gz
		608	%%DATADIR%%/man/man1/help.1.gz
		609	%%DATADIR%%/man/man1/history.1.gz
		610	%%DATADIR%%/man/man1/if.1.gz
		611	%%DATADIR%%/man/man1/isatty.1.gz
		612	%%DATADIR%%/man/man1/jobs.1.gz
		613	%%DATADIR%%/man/man1/math.1.gz
		614	%%DATADIR%%/man/man1/mimedb.1.gz
		615	%%DATADIR%%/man/man1/nextd.1.gz
		616	%%DATADIR%%/man/man1/not.1.gz
		617	%%DATADIR%%/man/man1/open.1.gz
		618	%%DATADIR%%/man/man1/or.1.gz
		619	%%DATADIR%%/man/man1/popd.1.gz
		620	%%DATADIR%%/man/man1/prevd.1.gz
		621	%%DATADIR%%/man/man1/psub.1.gz
		622	%%DATADIR%%/man/man1/pushd.1.gz
		623	%%DATADIR%%/man/man1/pwd.1.gz
		624	%%DATADIR%%/man/man1/random.1.gz
		625	%%DATADIR%%/man/man1/read.1.gz
		626	%%DATADIR%%/man/man1/return.1.gz
		627	%%DATADIR%%/man/man1/set.1.gz
		628	%%DATADIR%%/man/man1/set_color.1.gz
		629	%%DATADIR%%/man/man1/source.1.gz
		630	%%DATADIR%%/man/man1/status.1.gz
		631	%%DATADIR%%/man/man1/switch.1.gz
632	%%DATADIR%%/man/man1/test.1.gz
633	%%DATADIR%%/man/man1/trap.1.gz
634	%%DATADIR%%/man/man1/type.1.gz
635	%%DATADIR%%/man/man1/ulimit.1.gz
636	%%DATADIR%%/man/man1/umask.1.gz
637	%%DATADIR%%/man/man1/vared.1.gz
638	%%DATADIR%%/man/man1/while.1.gz