Index: head/textproc/wdiff/Makefile
===================================================================
--- head/textproc/wdiff/Makefile	(revision 434804)
+++ head/textproc/wdiff/Makefile	(revision 434805)
@@ -1,34 +1,28 @@
 # Created by: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	wdiff
 PORTVERSION=	1.2.2
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display word differences between text files
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		charsetfix makeinfo
 GNU_CONFIGURE=	yes
 
-USES=		charsetfix makeinfo
+INFO=		wdiff
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-INFO=		wdiff
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CFLAGS+=	-I${LOCALBASE}/include
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_CFLAGS=		-isystem${LOCALBASE}/include
+NLS_USES=		gettext
 
 .include <bsd.port.mk>