From owner-svn-ports-head@FreeBSD.ORG Sat Jan 25 02:40:18 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9A8D49B; Sat, 25 Jan 2014 02:40:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8BDB81314; Sat, 25 Jan 2014 02:40:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0P2eIT7065121; Sat, 25 Jan 2014 02:40:18 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0P2eIZh065119; Sat, 25 Jan 2014 02:40:18 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401250240.s0P2eIZh065119@svn.freebsd.org> From: Rusmir Dusko Date: Sat, 25 Jan 2014 02:40:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340982 - in head/shells/fish: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 02:40:18 -0000 Author: nemysis Date: Sat Jan 25 02:40:17 2014 New Revision: 340982 URL: http://svnweb.freebsd.org/changeset/ports/340982 QAT: https://qat.redports.org/buildarchive/r340982/ Log: - Add licenses (GPLv2) - Fix DOCS Option, add extra-patch-Makefile.in Reviewed by: horia Added: head/shells/fish/files/ head/shells/fish/files/extra-patch-Makefile.in (contents, props changed) Modified: head/shells/fish/Makefile Modified: head/shells/fish/Makefile ============================================================================== --- head/shells/fish/Makefile Sat Jan 25 02:24:39 2014 (r340981) +++ head/shells/fish/Makefile Sat Jan 25 02:40:17 2014 (r340982) @@ -9,6 +9,8 @@ MASTER_SITES= http://fishshell.com/files MAINTAINER= nemysis@FreeBSD.org COMMENT= User friendly command line shell +LICENSE= GPLv2 + USES= gmake iconv USE_AUTOTOOLS= autoconf @@ -24,6 +26,8 @@ NLS_USES= gettext NLS_CONFIGURE_ENV= ac_cv_func_gettext=yes NLS_CONFIGURE_OFF= --without-gettext +.include + post-patch: @${REINPLACE_CMD} -e \ '/^all:/s|user_doc|| ; \ @@ -37,6 +41,10 @@ post-patch: s|ncurses curses|curses| ; \ s|ncurses.h||' ${WRKSRC}/configure.ac +.if ! ${PORT_OPTIONS:MDOCS} +EXTRA_PATCHES+=${FILESDIR}/extra-patch-Makefile.in +.endif + post-install: .for i in fish fish_indent fish_pager fishd mimedb @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} Added: head/shells/fish/files/extra-patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fish/files/extra-patch-Makefile.in Sat Jan 25 02:40:17 2014 (r340982) @@ -0,0 +1,21 @@ +--- ./Makefile.in.orig 2013-10-19 22:10:26.000000000 +0200 ++++ ./Makefile.in 2014-01-25 02:35:57.000000000 +0100 +@@ -639,12 +639,12 @@ + true; \ + done; + +- $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) +- for i in user_doc/html/* ChangeLog; do \ +- if test -f $$i; then \ +- $(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \ +- fi; \ +- done; ++# $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) ++# for i in user_doc/html/* ChangeLog; do \ ++# if test -f $$i; then \ ++# $(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \ ++# fi; \ ++# done; + $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 + for i in $(MANUALS); do \ + $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \