Date: Sun, 26 Jul 2015 08:35:18 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392912 - head/shells/fish Message-ID: <201507260835.t6Q8ZIae023561@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Sun Jul 26 08:35:18 2015 New Revision: 392912 URL: https://svnweb.freebsd.org/changeset/ports/392912 Log: - 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 Modified: head/shells/fish/Makefile head/shells/fish/pkg-plist Modified: head/shells/fish/Makefile ============================================================================== --- head/shells/fish/Makefile Sun Jul 26 08:31:21 2015 (r392911) +++ head/shells/fish/Makefile Sun Jul 26 08:35:18 2015 (r392912) @@ -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 shel 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 ; \ Modified: head/shells/fish/pkg-plist ============================================================================== --- head/shells/fish/pkg-plist Sun Jul 26 08:31:21 2015 (r392911) +++ head/shells/fish/pkg-plist Sun Jul 26 08:35:18 2015 (r392912) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507260835.t6Q8ZIae023561>