From owner-svn-ports-all@freebsd.org  Sun Sep 11 16:42:04 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3146BD64CF;
 Sun, 11 Sep 2016 16:42:04 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 90476651;
 Sun, 11 Sep 2016 16:42:04 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8BGg3gX070682;
 Sun, 11 Sep 2016 16:42:03 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8BGg3IL070681;
 Sun, 11 Sep 2016 16:42:03 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201609111642.u8BGg3IL070681@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 11 Sep 2016 16:42:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421837 - 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Sep 2016 16:42:04 -0000

Author: amdmi3
Date: Sun Sep 11 16:42:03 2016
New Revision: 421837
URL: https://svnweb.freebsd.org/changeset/ports/421837

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Drop unneeded WX_UNICODE
  - Switch to USES=localbase
  - Actually disable NLS support when NLS option is off

Modified:
  head/deskutils/xchm/Makefile

Modified: head/deskutils/xchm/Makefile
==============================================================================
--- head/deskutils/xchm/Makefile	Sun Sep 11 16:40:59 2016	(r421836)
+++ head/deskutils/xchm/Makefile	Sun Sep 11 16:42:03 2016	(r421837)
@@ -10,19 +10,20 @@ MASTER_SITES=	SF/${PORTNAME}/xCHM/${PORT
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windows HTML Help (.chm) viewer for UNIX
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libchm.so:misc/chmlib
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
-NLS_USES=	gettext
-
 GNU_CONFIGURE=	yes
+USES=		localbase
 USE_WX=		2.8
-WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread
+
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>