diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 09648c7ef8fd..25f7255459e1 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -11,23 +11,18 @@ DISTNAME=	${PORTNAME:S/x/X/}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drop in replacement for the "dialog" or "cdialog" programs
 
-USES=		tar:bzip2
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		localbase tar:bzip2
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MNLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
@@ -38,12 +33,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,Xdialog\\-%%version%%,xdialog,' \
 		${WRKSRC}/doc/Xdialog.man
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/samples
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${DOCSDIR}/samples
-.endif
 
 .include <bsd.port.mk>