Index: head/x11-toolkits/Xaw3d/Makefile
===================================================================
--- head/x11-toolkits/Xaw3d/Makefile	(revision 425631)
+++ head/x11-toolkits/Xaw3d/Makefile	(revision 425632)
@@ -1,44 +1,37 @@
 # Created by: asami
 # $FreeBSD$
 
 PORTNAME=	Xaw3d
 PORTVERSION=	1.5E
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://slackware.cs.utah.edu/pub/slackware/slackware64-13.1/source/x/xaw3d/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3-D Athena Widget set that looks like Motif
 
 LICENSE=	MIT
 
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
-USES=		imake
+USES=		gettext imake
 USE_XORG=	x11 xext xmu xt sm ice xpm
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
 XAWVER=		8
 SUB_LIST=	XAWVER="${XAWVER}"
 
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
-NLS_USES=	gettext
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/X11/Xaw3d
 	@cd ${WRKSRC}/X11/Xaw3d; ${LN} -sf ../../*.h .
-
-post-extract-NLS-off:
-	@${REINPLACE_CMD} -e '/LINTLIBS =/s/=.*/=/' \
-		-e '/#ifdef XawI18nDefines/s//#if 0/' \
-		${WRKSRC}/Imakefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXaw3d.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/Xaw3d/pkg-descr
===================================================================
--- head/x11-toolkits/Xaw3d/pkg-descr	(revision 425631)
+++ head/x11-toolkits/Xaw3d/pkg-descr	(revision 425632)
@@ -1,4 +1,2 @@
 Xaw3d is a Xaw (Athena Widget Set) replacement that looks
 three-dimensional.  The author is Kalib Keithley (kaleb@x.org).
-
-LICENSE: X11
Index: head/x11-toolkits/Xaw3d/pkg-plist
===================================================================
--- head/x11-toolkits/Xaw3d/pkg-plist	(revision 425631)
+++ head/x11-toolkits/Xaw3d/pkg-plist	(revision 425632)
@@ -1,82 +1,82 @@
 lib/libXaw3d.a
 lib/libXaw3d.so
 lib/libXaw3d.so.8
 include/X11/Xaw3d/AllWidgets.h
 include/X11/Xaw3d/AsciiSink.h
 include/X11/Xaw3d/AsciiSinkP.h
 include/X11/Xaw3d/AsciiSrc.h
 include/X11/Xaw3d/AsciiSrcP.h
 include/X11/Xaw3d/AsciiText.h
 include/X11/Xaw3d/AsciiTextP.h
 include/X11/Xaw3d/Box.h
 include/X11/Xaw3d/BoxP.h
 include/X11/Xaw3d/Cardinals.h
 include/X11/Xaw3d/Command.h
 include/X11/Xaw3d/CommandP.h
 include/X11/Xaw3d/Dialog.h
 include/X11/Xaw3d/DialogP.h
 include/X11/Xaw3d/Form.h
 include/X11/Xaw3d/FormP.h
 include/X11/Xaw3d/Grip.h
 include/X11/Xaw3d/GripP.h
 include/X11/Xaw3d/Label.h
 include/X11/Xaw3d/LabelP.h
 include/X11/Xaw3d/Layout.h
 include/X11/Xaw3d/LayoutP.h
 include/X11/Xaw3d/List.h
 include/X11/Xaw3d/ListP.h
 include/X11/Xaw3d/MenuButtoP.h
 include/X11/Xaw3d/MenuButton.h
-%%NLS%%include/X11/Xaw3d/MultiSink.h
-%%NLS%%include/X11/Xaw3d/MultiSinkP.h
-%%NLS%%include/X11/Xaw3d/MultiSrc.h
-%%NLS%%include/X11/Xaw3d/MultiSrcP.h
+include/X11/Xaw3d/MultiSink.h
+include/X11/Xaw3d/MultiSinkP.h
+include/X11/Xaw3d/MultiSrc.h
+include/X11/Xaw3d/MultiSrcP.h
 include/X11/Xaw3d/Paned.h
 include/X11/Xaw3d/PanedP.h
 include/X11/Xaw3d/Panner.h
 include/X11/Xaw3d/PannerP.h
 include/X11/Xaw3d/Porthole.h
 include/X11/Xaw3d/PortholeP.h
 include/X11/Xaw3d/Repeater.h
 include/X11/Xaw3d/RepeaterP.h
 include/X11/Xaw3d/Reports.h
 include/X11/Xaw3d/Scrollbar.h
 include/X11/Xaw3d/ScrollbarP.h
 include/X11/Xaw3d/Simple.h
 include/X11/Xaw3d/SimpleMenP.h
 include/X11/Xaw3d/SimpleMenu.h
 include/X11/Xaw3d/SimpleP.h
 include/X11/Xaw3d/Sme.h
 include/X11/Xaw3d/SmeBSB.h
 include/X11/Xaw3d/SmeBSBP.h
 include/X11/Xaw3d/SmeLine.h
 include/X11/Xaw3d/SmeLineP.h
 include/X11/Xaw3d/SmeP.h
 include/X11/Xaw3d/SmeThreeD.h
 include/X11/Xaw3d/SmeThreeDP.h
 include/X11/Xaw3d/StripCharP.h
 include/X11/Xaw3d/StripChart.h
 include/X11/Xaw3d/Template.c
 include/X11/Xaw3d/Template.h
 include/X11/Xaw3d/TemplateP.h
 include/X11/Xaw3d/Text.h
 include/X11/Xaw3d/TextP.h
 include/X11/Xaw3d/TextSink.h
 include/X11/Xaw3d/TextSinkP.h
 include/X11/Xaw3d/TextSrc.h
 include/X11/Xaw3d/TextSrcP.h
 include/X11/Xaw3d/ThreeD.h
 include/X11/Xaw3d/ThreeDP.h
 include/X11/Xaw3d/Tip.h
 include/X11/Xaw3d/TipP.h
 include/X11/Xaw3d/Toggle.h
 include/X11/Xaw3d/ToggleP.h
 include/X11/Xaw3d/Tree.h
 include/X11/Xaw3d/TreeP.h
-%%NLS%%include/X11/Xaw3d/VendorEP.h
+include/X11/Xaw3d/VendorEP.h
 include/X11/Xaw3d/Viewport.h
 include/X11/Xaw3d/ViewportP.h
 include/X11/Xaw3d/Xaw3dP.h
-%%NLS%%include/X11/Xaw3d/XawImP.h
+include/X11/Xaw3d/XawImP.h
 include/X11/Xaw3d/XawInit.h
 %%PORTDOCS%%share/doc/Xaw3d/README.XAW3D