Date: Fri, 20 Dec 2013 08:11:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336991 - in branches/2014Q1/shells/fish: . files Message-ID: <201312200811.rBK8BcX7051937@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Dec 20 08:11:38 2013 New Revision: 336991 URL: http://svnweb.freebsd.org/changeset/ports/336991 Log: MFH: r336965 - Fix build on -current - Support staging PR: ports/184844 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Added: branches/2014Q1/shells/fish/files/ - copied from r336965, head/shells/fish/files/ Modified: branches/2014Q1/shells/fish/Makefile branches/2014Q1/shells/fish/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/shells/fish/Makefile ============================================================================== --- branches/2014Q1/shells/fish/Makefile Fri Dec 20 08:10:51 2013 (r336990) +++ branches/2014Q1/shells/fish/Makefile Fri Dec 20 08:11:38 2013 (r336991) @@ -11,30 +11,19 @@ MAINTAINER= ports@FreeBSD.org COMMENT= User friendly command line shell OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USES= iconv -USE_GMAKE= yes +USES= gmake iconv USE_AUTOTOOLS= autoconf -CONFIGURE_ARGS= --docdir=${WRKDIR}/tmproot CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread ${ICONV_LIB} -MAN1= fish.1 fish_indent.1 fish_pager.1 fishd.1 mimedb.1 - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ENV+= ac_cv_func_gettext=yes -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--without-gettext -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENV= ac_cv_func_gettext=yes +NLS_CONFIGURE_OFF= --without-gettext post-patch: @${REINPLACE_CMD} -e \ @@ -49,17 +38,8 @@ post-patch: s|ncurses.h||' ${WRKSRC}/configure.ac post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR}) -.endif .for i in fish fish_indent fish_pager fishd mimedb - @${STRIP_CMD} ${PREFIX}/bin/${i} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor - if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \ - ${TRUE}; \ - else \ - ${ECHO_CMD} '${PREFIX}/bin/${PORTNAME}' >> /etc/shells; \ - fi .include <bsd.port.mk> Modified: branches/2014Q1/shells/fish/pkg-plist ============================================================================== --- branches/2014Q1/shells/fish/pkg-plist Fri Dec 20 08:10:51 2013 (r336990) +++ branches/2014Q1/shells/fish/pkg-plist Fri Dec 20 08:11:38 2013 (r336991) @@ -4,6 +4,11 @@ bin/fish_pager bin/fishd bin/mimedb %%ETCDIR%%/config.fish +man/man1/fish.1.gz +man/man1/fish_indent.1.gz +man/man1/fish_pager.1.gz +man/man1/fishd.1.gz +man/man1/mimedb.1.gz %%PORTDOCS%%%%DOCSDIR%%/commands.html %%PORTDOCS%%%%DOCSDIR%%/design.html %%PORTDOCS%%%%DOCSDIR%%/doc_8h_source.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312200811.rBK8BcX7051937>