Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Mar 2014 17:49:25 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346942 - head/shells/fish
Message-ID:  <201403031749.s23HnPqe038146@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403031749.s23HnPqe038146>