Index: head/textproc/gsed/Makefile
===================================================================
--- head/textproc/gsed/Makefile	(revision 359109)
+++ head/textproc/gsed/Makefile	(revision 359110)
@@ -1,65 +1,57 @@
 # Created by: Cyrille Lefevre <clefevre@citeweb.net>
 # $FreeBSD$
 
 PORTNAME=	sed
 PORTVERSION=	4.2.2
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	g
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The GNU stream editor
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
 
 USES=		charsetfix gmake
 PATCH_SUBDIRS=	. doc lib sed
 DATADIR=	${PREFIX}/share/${PKGBASE}
 SAMP_FILES=	binary*.sed dc.sed
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
 PORTDOCS=	AUTHORS BUGS COPYING COPYING.DOC NEWS README THANKS
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 INFO=		sed
 
 OPTIONS_DEFINE=	NLS DOCS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
+NLS_USES=	gettext iconv
+NLS_CONFIGURE_ENABLE=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's,^\* sed:,* GNU sed:,' \
 		${WRKSRC}/doc/config.texi
 	@${REINPLACE_CMD} "s|#include <alloca.h>||" ${WRKSRC}/lib/regex_internal.h
 
 post-configure:
 .for subdir in ${PATCH_SUBDIRS}
 	@${REINPLACE_CMD} -e 's|s,x,x,|s,^,g,|' \
 			  -e 's|^doc_DATA|#doc_DATA|' \
 		${WRKSRC}/${subdir}/Makefile
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${SAMP_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/testsuite/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 # Maintainer only
 test:
 	@cd ${WRKSRC}/testsuite; ${MAKE} check
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>