From owner-svn-ports-head@FreeBSD.ORG  Sat Mar 15 16:37:53 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 331B9CC8;
 Sat, 15 Mar 2014 16:37:53 +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 1F91DB64;
 Sat, 15 Mar 2014 16:37:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2FGbqrY070585;
 Sat, 15 Mar 2014 16:37:52 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2FGbqHV070584;
 Sat, 15 Mar 2014 16:37:52 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201403151637.s2FGbqHV070584@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 15 Mar 2014 16:37:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348349 - head/textproc/multimarkdown
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: Sat, 15 Mar 2014 16:37:53 -0000

Author: adamw
Date: Sat Mar 15 16:37:52 2014
New Revision: 348349
URL: http://svnweb.freebsd.org/changeset/ports/348349
QAT: https://qat.redports.org/buildarchive/r348349/

Log:
  Use _CONFLICTS_INSTALL helper.

Modified:
  head/textproc/multimarkdown/Makefile

Modified: head/textproc/multimarkdown/Makefile
==============================================================================
--- head/textproc/multimarkdown/Makefile	Sat Mar 15 16:35:07 2014	(r348348)
+++ head/textproc/multimarkdown/Makefile	Sat Mar 15 16:37:52 2014	(r348349)
@@ -34,14 +34,12 @@ HELPERS_DESC=	Helper scripts (conflicts 
 CHEAT_SHEET_DISTFILES=	human-markdown-reference-${CHEAT_COMMIT}${EXTRACT_SUFX}:cheat
 EXTRAS_DISTFILES=	MMD-Support-${SUPPORT_COMMIT}${EXTRACT_SUFX}:support
 
+HELPERS_CONFLICTS_INSTALL=	mtools-*
+
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MHELPERS}
-CONFLICTS_INSTALL=	mtools-*
-.endif
-
 post-extract:
 	@${MV} ${WRKDIR}/nddrylliog-greg-${GREG_COMMIT}/* ${WRKSRC}/greg
 .if ${PORT_OPTIONS:MCHEAT_SHEET}