From owner-svn-ports-head@FreeBSD.ORG  Mon Mar  3 17:49:25 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 ABE2169B;
 Mon,  3 Mar 2014 17:49:25 +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 992753D9;
 Mon,  3 Mar 2014 17:49:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23HnPlu038147;
 Mon, 3 Mar 2014 17:49:25 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23HnPqe038146;
 Mon, 3 Mar 2014 17:49:25 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201403031749.s23HnPqe038146@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 3 Mar 2014 17:49:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r346942 - head/shells/fish
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 17:49:25 -0000

Author: adamw
Date: Mon Mar  3 17:49:25 2014
New Revision: 346942
URL: http://svnweb.freebsd.org/changeset/ports/346942
QAT: https://qat.redports.org/buildarchive/r346942/

Log:
  Use OPTIONS helper to prevent needing to include
  bsd.port.options.mk.

Modified:
  head/shells/fish/Makefile

Modified: head/shells/fish/Makefile
==============================================================================
--- head/shells/fish/Makefile	Mon Mar  3 17:49:10 2014	(r346941)
+++ head/shells/fish/Makefile	Mon Mar  3 17:49:25 2014	(r346942)
@@ -26,7 +26,7 @@ NLS_USES=		gettext
 NLS_CONFIGURE_ENV=	ac_cv_func_gettext=yes
 NLS_CONFIGURE_OFF=	--without-gettext
 
-.include <bsd.port.options.mk> 
+DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.in
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -41,10 +41,6 @@ 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}