From owner-svn-ports-all@FreeBSD.ORG Tue May 7 06:31:55 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 78EE6181; Tue, 7 May 2013 06:31:55 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C71E1F0; Tue, 7 May 2013 06:31:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r476VtFN066406; Tue, 7 May 2013 06:31:55 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r476VtCE066405; Tue, 7 May 2013 06:31:55 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201305070631.r476VtCE066405@svn.freebsd.org> From: Jason Helfman Date: Tue, 7 May 2013 06:31:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317574 - head/devel/gettext 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2013 06:31:55 -0000 Author: jgh Date: Tue May 7 06:31:54 2013 New Revision: 317574 URL: http://svnweb.freebsd.org/changeset/ports/317574 Log: - remove warning for USE_GETTEXT as environment variable - while here convert knobs to optionsNG framework Approved by: portmgr (bapt@) Modified: head/devel/gettext/Makefile Modified: head/devel/gettext/Makefile ============================================================================== --- head/devel/gettext/Makefile Tue May 7 06:31:06 2013 (r317573) +++ head/devel/gettext/Makefile Tue May 7 06:31:54 2013 (r317574) @@ -41,12 +41,9 @@ MAN3= bind_textdomain_codeset.3 bindtex textdomain.3 INFO= autosprintf gettext -.ifdef USE_GETTEXT -.error USE_GETTEXT is defined as an environment variable, or in the arguments \ - to "make". Please unset it and restart the build. -.endif +.include -.if defined (NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nodocs .endif @@ -62,7 +59,7 @@ pre-extract: post-patch: @${FIND} ${WRKSRC} -name configure -print | ${XARGS} \ ${REINPLACE_CMD} -e 's|mkdir gmkdir|mkdir|; s|gawk|awk|' -.if defined (NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} .for dir in runtime tools @${REINPLACE_CMD} -e 's|^SUBDIRS = doc|SUBDIRS =|' \ ${WRKSRC}/gettext-${dir}/Makefile.in