diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 5e91e0da33bd..db465679f342 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -12,34 +12,26 @@ DISTNAME=	indent-${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU indent
 
+OPTIONS_DEFINE=	DOCS NLS
+
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--program-prefix=g
 MAKE_JOBS_UNSAFE=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+OPTIONS_SUB=	yes
+NLS_CONFIGURE_OFF=	--disable-nls
 
 INFO=		indent
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/indent.html ${STAGEDIR}${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>