From owner-svn-ports-all@FreeBSD.ORG  Mon Feb  3 07:51:20 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 E29792BD;
 Mon,  3 Feb 2014 07:51:20 +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 CFF2B18BA;
 Mon,  3 Feb 2014 07:51:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s137pKbb067998;
 Mon, 3 Feb 2014 07:51:20 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s137pKp5067997;
 Mon, 3 Feb 2014 07:51:20 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201402030751.s137pKp5067997@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 3 Feb 2014 07:51:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r342391 - head/devel/gmake
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 Feb 2014 07:51:21 -0000

Author: bapt
Date: Mon Feb  3 07:51:20 2014
New Revision: 342391
URL: http://svnweb.freebsd.org/changeset/ports/342391
QAT: https://qat.redports.org/buildarchive/r342391/

Log:
  Use options helpers to reduce inclusions of bsd.port.options.mk
  Remove useless check on USE_GMAKE

Modified:
  head/devel/gmake/Makefile

Modified: head/devel/gmake/Makefile
==============================================================================
--- head/devel/gmake/Makefile	Mon Feb  3 07:46:33 2014	(r342390)
+++ head/devel/gmake/Makefile	Mon Feb  3 07:51:20 2014	(r342391)
@@ -22,26 +22,17 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-prefix=g
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NLS_USES=	gettext iconv
+NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
+			--with-libintl-prefix=${LOCALBASE}
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} \
-		--with-libintl-prefix=${LOCALBASE}
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
 CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
 
 INFO=		make
 
-.ifdef USE_GMAKE
-.error You have `USE_GMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/no-print-dir/s/@itemx/@item/' \
 		${WRKSRC}/doc/make.texi