Index: head/deskutils/xchm/Makefile
===================================================================
--- head/deskutils/xchm/Makefile	(revision 421836)
+++ head/deskutils/xchm/Makefile	(revision 421837)
@@ -1,28 +1,29 @@
 # Created by: Pav Lucistnik <pav@oook.cz>
 # $FreeBSD$
 
 PORTNAME=	xchm
 PORTVERSION=	1.23
 PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/xCHM/${PORTNAME}-${PORTVERSION}
 
 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>