From owner-svn-ports-all@FreeBSD.ORG  Mon Mar  3 18:03:21 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C624BBCB;
 Mon,  3 Mar 2014 18:03:21 +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 B3407767;
 Mon,  3 Mar 2014 18:03:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23I3LAM045733;
 Mon, 3 Mar 2014 18:03:21 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23I3LrE045732;
 Mon, 3 Mar 2014 18:03:21 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201403031803.s23I3LrE045732@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 3 Mar 2014 18:03:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r346945 - head/devel/m4
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 18:03:21 -0000

Author: adamw
Date: Mon Mar  3 18:03:21 2014
New Revision: 346945
URL: http://svnweb.freebsd.org/changeset/ports/346945
QAT: https://qat.redports.org/buildarchive/r346945/

Log:
  Leverage OPTIONS helpers to avoid unnecessary inclusion
  of bsd.options.mk.

Modified:
  head/devel/m4/Makefile

Modified: head/devel/m4/Makefile
==============================================================================
--- head/devel/m4/Makefile	Mon Mar  3 17:58:43 2014	(r346944)
+++ head/devel/m4/Makefile	Mon Mar  3 18:03:21 2014	(r346945)
@@ -21,19 +21,13 @@ EXAMPLESDIR=	share/examples/gm4
 
 OPTIONS_DEFINE=		LIBSIGSEGV
 LIBSIGSEGV_DESC=	Use libsigsegv for better diagnostics
+LIBSIGSEGV_LIB_DEPENDS=		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
+LIBSIGSEGV_CONFIGURE_ON=	--with-libsigsegv-prefix=${LOCALBASE}
+LIBSIGSEGV_CONFIGURE_OFF=	--without-libsigsegv-prefix
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 \
 		${STAGEDIR}${PREFIX}/${EXAMPLESDIR}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLIBSIGSEGV}
-LIB_DEPENDS+=		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
-CONFIGURE_ARGS+=	--with-libsigsegv-prefix=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-libsigsegv-prefix
-.endif
-
 .include <bsd.port.mk>