Index: Makefile
===================================================================
--- Makefile	(revision 390640)
+++ Makefile	(working copy)
@@ -30,17 +30,11 @@
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 
-USES=		bison gettext gmake perl5 tar:bzip2 libtool
+USES=		bison gmake perl5 tar:bzip2 libtool
 USE_PERL5=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH=		x86_64
-.endif
-
 CONFLICTS=	avr-gcc-devel*
 
 CONFIGURE_ARGS=	--target=avr --disable-libssp --with-gmp=${LOCALBASE} --enable-languages="c c++"
@@ -49,6 +43,17 @@
 
 INFO=		cpp gcc gccint cppinternals gccinstall
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+.include <bsd.port.pre.mk>
+
+.if (${ARCH} == "amd64")
+ARCH=		x86_64
+.endif
+
 post-configure:
 	${MKDIR} ${WRKSRC}/gcc/include
 
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 390640)
+++ pkg-plist	(working copy)
@@ -227,42 +227,42 @@
 man/man7/fsf-funding.7.gz
 man/man7/gfdl.7.gz
 man/man7/gpl.7.gz
-share/locale/be/LC_MESSAGES/cpplib.mo
-share/locale/be/LC_MESSAGES/gcc.mo
-share/locale/ca/LC_MESSAGES/cpplib.mo
-share/locale/da/LC_MESSAGES/cpplib.mo
-share/locale/da/LC_MESSAGES/gcc.mo
-share/locale/de/LC_MESSAGES/cpplib.mo
-share/locale/de/LC_MESSAGES/gcc.mo
-share/locale/el/LC_MESSAGES/cpplib.mo
-share/locale/el/LC_MESSAGES/gcc.mo
-share/locale/eo/LC_MESSAGES/cpplib.mo
-share/locale/es/LC_MESSAGES/cpplib.mo
-share/locale/es/LC_MESSAGES/gcc.mo
-share/locale/fi/LC_MESSAGES/cpplib.mo
-share/locale/fi/LC_MESSAGES/gcc.mo
-share/locale/fr/LC_MESSAGES/cpplib.mo
-share/locale/fr/LC_MESSAGES/gcc.mo
-share/locale/hr/LC_MESSAGES/gcc.mo
-share/locale/id/LC_MESSAGES/cpplib.mo
-share/locale/id/LC_MESSAGES/gcc.mo
-share/locale/ja/LC_MESSAGES/cpplib.mo
-share/locale/ja/LC_MESSAGES/gcc.mo
-share/locale/nl/LC_MESSAGES/cpplib.mo
-share/locale/nl/LC_MESSAGES/gcc.mo
-share/locale/pt_BR/LC_MESSAGES/cpplib.mo
-share/locale/ru/LC_MESSAGES/cpplib.mo
-share/locale/ru/LC_MESSAGES/gcc.mo
-share/locale/sr/LC_MESSAGES/cpplib.mo
-share/locale/sr/LC_MESSAGES/gcc.mo
-share/locale/sv/LC_MESSAGES/cpplib.mo
-share/locale/sv/LC_MESSAGES/gcc.mo
-share/locale/tr/LC_MESSAGES/cpplib.mo
-share/locale/tr/LC_MESSAGES/gcc.mo
-share/locale/uk/LC_MESSAGES/cpplib.mo
-share/locale/vi/LC_MESSAGES/cpplib.mo
-share/locale/vi/LC_MESSAGES/gcc.mo
-share/locale/zh_CN/LC_MESSAGES/cpplib.mo
-share/locale/zh_CN/LC_MESSAGES/gcc.mo
-share/locale/zh_TW/LC_MESSAGES/cpplib.mo
-share/locale/zh_TW/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/be/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/be/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/da/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/de/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/el/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/el/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/es/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/id/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/id/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gcc.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/cpplib.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gcc.mo