View | Details | Raw Unified | Return to bug 198322 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-3 / +3 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	fish
4
PORTNAME=	fish
5
PORTVERSION=	2.1.1
5
PORTVERSION=	2.1.1
6
PORTREVISION=	2
6
PORTREVISION=	3
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 12-18 Link Here
12
12
13
LICENSE=	GPLv2
13
LICENSE=	GPLv2
14
14
15
USES=		gmake iconv
15
USES=		gmake iconv:wchar_t
16
USE_AUTOTOOLS=	autoconf
16
USE_AUTOTOOLS=	autoconf
17
17
18
CPPFLAGS+=	-I${LOCALBASE}/include
18
CPPFLAGS+=	-I${LOCALBASE}/include
Lines 35-41 Link Here
35
		 s| "$$(HAVE_GETTEXT)" = 1| x$$(HAVE_GETTEXT) = x1| ; \
35
		 s| "$$(HAVE_GETTEXT)" = 1| x$$(HAVE_GETTEXT) = x1| ; \
36
		 s| $$(HAVE_GETTEXT) = 1| x$$(HAVE_GETTEXT) = x1| ; \
36
		 s| $$(HAVE_GETTEXT) = 1| x$$(HAVE_GETTEXT) = x1| ; \
37
		 s|$$(DESTDIR)$$(bindir)/fish|$$(bindir)/fish|g ; \
37
		 s|$$(DESTDIR)$$(bindir)/fish|$$(bindir)/fish|g ; \
38
		 /fish\/man\/man1/d' ${WRKSRC}/Makefile.in
38
		 ' ${WRKSRC}/Makefile.in
39
	@${REINPLACE_CMD} -e \
39
	@${REINPLACE_CMD} -e \
40
		's|-rdynamic|-Wl,--export-dynamic| ; \
40
		's|-rdynamic|-Wl,--export-dynamic| ; \
41
		 /pthread_create/d ; \
41
		 /pthread_create/d ; \
(-)./pkg-plist (+71 lines)
Lines 541-546 Link Here
541
%%DATADIR%%/functions/umask.fish
541
%%DATADIR%%/functions/umask.fish
542
%%DATADIR%%/functions/up-or-search.fish
542
%%DATADIR%%/functions/up-or-search.fish
543
%%DATADIR%%/functions/vared.fish
543
%%DATADIR%%/functions/vared.fish
544
%%DATADIR%%/man/man1/breakpoint.1
545
%%DATADIR%%/man/man1/ulimit.1
546
%%DATADIR%%/man/man1/fish_config.1
547
%%DATADIR%%/man/man1/mimedb.1
548
%%DATADIR%%/man/man1/fishd.1
549
%%DATADIR%%/man/man1/functions.1
550
%%DATADIR%%/man/man1/bind.1
551
%%DATADIR%%/man/man1/fish_prompt.1
552
%%DATADIR%%/man/man1/trap.1
553
%%DATADIR%%/man/man1/exec.1
554
%%DATADIR%%/man/man1/and.1
555
%%DATADIR%%/man/man1/bg.1
556
%%DATADIR%%/man/man1/funcsave.1
557
%%DATADIR%%/man/man1/switch.1
558
%%DATADIR%%/man/man1/set.1
559
%%DATADIR%%/man/man1/echo.1
560
%%DATADIR%%/man/man1/contains.1
561
%%DATADIR%%/man/man1/pushd.1
562
%%DATADIR%%/man/man1/open.1
563
%%DATADIR%%/man/man1/popd.1
564
%%DATADIR%%/man/man1/test.1
565
%%DATADIR%%/man/man1/read.1
566
%%DATADIR%%/man/man1/alias.1
567
%%DATADIR%%/man/man1/function.1
568
%%DATADIR%%/man/man1/fish_right_prompt.1
569
%%DATADIR%%/man/man1/fg.1
570
%%DATADIR%%/man/man1/fish_indent.1
571
%%DATADIR%%/man/man1/command.1
572
%%DATADIR%%/man/man1/fish.1
573
%%DATADIR%%/man/man1/help.1
574
%%DATADIR%%/man/man1/vared.1
575
%%DATADIR%%/man/man1/isatty.1
576
%%DATADIR%%/man/man1/for.1
577
%%DATADIR%%/man/man1/pwd.1
578
%%DATADIR%%/man/man1/fish_update_completions.1
579
%%DATADIR%%/man/man1/dirs.1
580
%%DATADIR%%/man/man1/cd.1
581
%%DATADIR%%/man/man1/complete.1
582
%%DATADIR%%/man/man1/fish_pager.1
583
%%DATADIR%%/man/man1/dirh.1
584
%%DATADIR%%/man/man1/eval.1
585
%%DATADIR%%/man/man1/break.1
586
%%DATADIR%%/man/man1/jobs.1
587
%%DATADIR%%/man/man1/status.1
588
%%DATADIR%%/man/man1/builtin.1
589
%%DATADIR%%/man/man1/prevd.1
590
%%DATADIR%%/man/man1/funced.1
591
%%DATADIR%%/man/man1/return.1
592
%%DATADIR%%/man/man1/umask.1
593
%%DATADIR%%/man/man1/source.1
594
%%DATADIR%%/man/man1/count.1
595
%%DATADIR%%/man/man1/or.1
596
%%DATADIR%%/man/man1/commandline.1
597
%%DATADIR%%/man/man1/not.1
598
%%DATADIR%%/man/man1/end.1
599
%%DATADIR%%/man/man1/emit.1
600
%%DATADIR%%/man/man1/psub.1
601
%%DATADIR%%/man/man1/exit.1
602
%%DATADIR%%/man/man1/continue.1
603
%%DATADIR%%/man/man1/nextd.1
604
%%DATADIR%%/man/man1/case.1
605
%%DATADIR%%/man/man1/if.1
606
%%DATADIR%%/man/man1/math.1
607
%%DATADIR%%/man/man1/while.1
608
%%DATADIR%%/man/man1/random.1
609
%%DATADIR%%/man/man1/type.1
610
%%DATADIR%%/man/man1/else.1
611
%%DATADIR%%/man/man1/block.1
612
%%DATADIR%%/man/man1/history.1
613
%%DATADIR%%/man/man1/begin.1
614
%%DATADIR%%/man/man1/set_color.1
544
%%DATADIR%%/tools/create_manpage_completions.py
615
%%DATADIR%%/tools/create_manpage_completions.py
545
%%DATADIR%%/tools/deroff.py
616
%%DATADIR%%/tools/deroff.py
546
%%DATADIR%%/tools/web_config/delete.png
617
%%DATADIR%%/tools/web_config/delete.png

Return to bug 198322