2 files changed, 32 insertions, 25 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 9e2ed0088854..b10c75d5d33f 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lynx
 PORTVERSION=	2.8.6d4
-CATEGORIES=     www ipv6
+CATEGORIES=	www ipv6
 MASTER_SITES=	http://lynx.isc.org/current/
 DISTNAME=	${PORTNAME}2.8.6dev.4
 
@@ -16,7 +16,6 @@ COMMENT=	A non-graphical, text-based World-Wide Web client
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-8-6
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -26,22 +25,22 @@ CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--enable-scrollbar --enable-addrlist-page
 
 .ifndef NO_OPENSSL
-USE_OPENSSL=    yes
+USE_OPENSSL=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 .ifdef USE_OPENSSL
-CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
+CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .endif
 
 .if ${OSVERSION} >= 400014
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6
 .else
-CONFIGURE_ARGS+= --disable-ipv6
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+= CC="${CC} -I${LOCALBASE}/include -Darc4random_push=" LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV+=	CC="${CC} -I${LOCALBASE}/include -Darc4random_push=" LDFLAGS="${LDFLAGS}" \
 		LIBS=-lncurses
 MAKE_FLAGS=	helpdir=${L_HELP} docdir=${L_DOC} -f
 MAKEFILE=	makefile
@@ -52,6 +51,14 @@ L_LIB=		${PREFIX}/etc
 L_DOC=		${PREFIX}/share/doc/lynx
 L_HELP=		${PREFIX}/share/lynx_help
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_DOC}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index 4fe110e73685..fec13ec17eb0 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -67,24 +67,24 @@ share/doc/lynx/test/spaces.html
 share/doc/lynx/test/tabtest.html
 share/doc/lynx/test/unicode.html
 share/doc/lynx/test/utf-8-demo.html
-share/locale/ca/LC_MESSAGES/lynx.mo
-share/locale/cs/LC_MESSAGES/lynx.mo
-share/locale/da/LC_MESSAGES/lynx.mo
-share/locale/de/LC_MESSAGES/lynx.mo
-share/locale/et/LC_MESSAGES/lynx.mo
-share/locale/fr/LC_MESSAGES/lynx.mo
-share/locale/hu/LC_MESSAGES/lynx.mo
-share/locale/it/LC_MESSAGES/lynx.mo
-share/locale/ja/LC_MESSAGES/lynx.mo
-share/locale/nl/LC_MESSAGES/lynx.mo
-share/locale/pt_BR/LC_MESSAGES/lynx.mo
-share/locale/ru/LC_MESSAGES/lynx.mo
-share/locale/sl/LC_MESSAGES/lynx.mo
-share/locale/sv/LC_MESSAGES/lynx.mo
-share/locale/tr/LC_MESSAGES/lynx.mo
-share/locale/uk/LC_MESSAGES/lynx.mo
-share/locale/zh_CN/LC_MESSAGES/lynx.mo
-share/locale/zh_TW/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/da/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/de/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/et/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/it/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/lynx.mo
 share/lynx_help/Lynx_users_guide.html
 share/lynx_help/about_lynx.html
 share/lynx_help/keystrokes/alt_edit_help.html