Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2014 07:51:20 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342391 - head/devel/gmake
Message-ID:  <201402030751.s137pKp5067997@svn.freebsd.org>

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



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