diff options
author | Lars Engels <lme@FreeBSD.org> | 2015-07-26 08:35:18 +0000 |
---|---|---|
committer | Lars Engels <lme@FreeBSD.org> | 2015-07-26 08:35:18 +0000 |
commit | bd48ae99b182aea7e7116b6b4a8048d65c8ee6c3 (patch) | |
tree | 0c3debc4a6d30a89237e3a50739347489326bf14 /shells | |
parent | - Fix typo in a patch file (diff) |
- Removed patch suggested by upstream from Makefile, because the other variant has been selected.
- Add additional manpages
- While here, switch to USES= autoreconf and GNU_CONFIGURE
- Bump PORTREVISION
PR: 198322
Submitted by: Martin Sugioarto <martin@sugioarto.com>
Approved by: maintainer (timeout after almost 5 months)
Committed from: Essen FreeBSD Hackathon
Notes
Notes:
svn path=/head/; revision=392912
Diffstat (limited to 'shells')
-rw-r--r-- | shells/fish/Makefile | 11 | ||||
-rw-r--r-- | shells/fish/pkg-plist | 71 |
2 files changed, 77 insertions, 5 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 6b2813488496..f9364eed757b 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -3,7 +3,7 @@ PORTNAME= fish PORTVERSION= 2.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= shells MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/ @@ -12,8 +12,8 @@ COMMENT= User friendly command line shell LICENSE= GPLv2 -USES= cpe gmake iconv -USE_AUTOTOOLS= autoconf +USES= autoreconf cpe gmake iconv +GNU_CONFIGURE= yes CPE_VENDOR= fishshell @@ -21,6 +21,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread ${ICONV_LIB} PORTDOCS= * +MANDIRS= ${DATADIR}/man/man1 OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes @@ -36,8 +37,8 @@ post-patch: '/^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 --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist index 77d5de10673a..3f658e3ffa2a 100644 --- a/shells/fish/pkg-plist +++ b/shells/fish/pkg-plist @@ -565,3 +565,74 @@ man/man1/mimedb.1.gz %%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 |