Attachment 156847 Details for Bug 198322 – Fix patch for current port version

[patch] Fix patch for current port version

fish.patch (text/plain), 3.60 KB, created by martin on 2015-05-17 06:05:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: martin

Created: 2015-05-17 06:05:06 UTC

Size: 3.60 KB

patch

obsolete

>diff -ruN /usr/ports/shells/fish/Makefile fish/Makefile
>--- /usr/ports/shells/fish/Makefile	2015-04-18 15:20:52.000000000 +0200
>+++ fish/Makefile	2015-05-17 07:50:22.599948310 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	fish
> PORTVERSION=	2.1.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	shells
> MASTER_SITES=	http://fishshell.com/files/${PORTVERSION}/
> 
>@@ -21,6 +21,7 @@
> LDFLAGS+=	-L${LOCALBASE}/lib -pthread ${ICONV_LIB}
> 
> PORTDOCS=	*
>+MANDIRS=	${DATADIR}/man/man1
> 
> OPTIONS_DEFINE=	DOCS NLS
> OPTIONS_SUB=	yes
>@@ -36,8 +37,8 @@
> 		'/^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 ; \
>-		 /fish\/man\/man1/d' ${WRKSRC}/Makefile.in
>+		 s|$$(DESTDIR)$$(bindir)/fish|$$(bindir)/fish|g' \
>+		 ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e \
> 		's|-rdynamic|-Wl,--export-dynamic| ; \
> 		 /pthread_create/d ; \
>diff -ruN /usr/ports/shells/fish/pkg-plist fish/pkg-plist
>--- /usr/ports/shells/fish/pkg-plist	2014-09-30 01:27:26.000000000 +0200
>+++ fish/pkg-plist	2015-05-17 07:36:19.944895504 +0200
>@@ -565,3 +565,74 @@
> %%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

Actions: View | Diff

Attachments on bug 198322: 153851 | 156847