From owner-svn-ports-head@FreeBSD.ORG  Thu Jul 24 15:22:00 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 F2A3BC7C;
 Thu, 24 Jul 2014 15:21:59 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFB7C2B19;
 Thu, 24 Jul 2014 15:21:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6OFLx3P096022;
 Thu, 24 Jul 2014 15:21:59 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6OFLxhA096021;
 Thu, 24 Jul 2014 15:21:59 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407241521.s6OFLxhA096021@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 24 Jul 2014 15:21:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r362805 - head/deskutils/calcurse
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.18
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: Thu, 24 Jul 2014 15:22:00 -0000

Author: adamw
Date: Thu Jul 24 15:21:59 2014
New Revision: 362805
URL: http://svnweb.freebsd.org/changeset/ports/362805
QAT: https://qat.redports.org/buildarchive/r362805/

Log:
  Fix build with NLS enabled by removing unnecessary gcc-ism.
  
  While here, use OPTIONS helpers to avoid including bsd.port.options.mk.

Modified:
  head/deskutils/calcurse/Makefile

Modified: head/deskutils/calcurse/Makefile
==============================================================================
--- head/deskutils/calcurse/Makefile	Thu Jul 24 15:15:41 2014	(r362804)
+++ head/deskutils/calcurse/Makefile	Thu Jul 24 15:21:59 2014	(r362805)
@@ -12,29 +12,19 @@ COMMENT=	Text-based calendar and schedul
 LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-asciidoc
 
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MDOCS)
-CONFIGURE_ARGS+=	--disable-docs
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+DOCS_CONFIGURE_ENABLE=	docs
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 post-patch:
-.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${DOCSDIR}|' ${WRKSRC}/doc/Makefile.in
-.endif
+	@${REINPLACE_CMD} -e 's|-R$$found_dir||' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1