From owner-svn-ports-all@FreeBSD.ORG  Tue Jan 21 12:06:04 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 93805AE0;
 Tue, 21 Jan 2014 12:06:04 +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 7F91D158C;
 Tue, 21 Jan 2014 12:06:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0LC64wr045507;
 Tue, 21 Jan 2014 12:06:04 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0LC643E045506;
 Tue, 21 Jan 2014 12:06:04 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201401211206.s0LC643E045506@svn.freebsd.org>
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Tue, 21 Jan 2014 12:06:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340602 - head/deskutils/xchm
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: Tue, 21 Jan 2014 12:06:04 -0000

Author: rm
Date: Tue Jan 21 12:06:04 2014
New Revision: 340602
URL: http://svnweb.freebsd.org/changeset/ports/340602
QAT: https://qat.redports.org/buildarchive/r340602/

Log:
  - use options helpers, add NLS to available options list
  - add stage support

Modified:
  head/deskutils/xchm/Makefile

Modified: head/deskutils/xchm/Makefile
==============================================================================
--- head/deskutils/xchm/Makefile	Tue Jan 21 11:52:07 2014	(r340601)
+++ head/deskutils/xchm/Makefile	Tue Jan 21 12:06:04 2014	(r340602)
@@ -13,6 +13,10 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+
 GNU_CONFIGURE=	yes
 USE_WX=		2.6+
 WX_UNICODE=	yes
@@ -20,15 +24,4 @@ WX_CONF_ARGS=	absolute
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 .include <bsd.port.mk>