Index: head/x11-toolkits/libxaw3dxft/Makefile
===================================================================
--- head/x11-toolkits/libxaw3dxft/Makefile	(revision 359924)
+++ head/x11-toolkits/libxaw3dxft/Makefile	(revision 359925)
@@ -1,33 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	libxaw3dxft
 DISTVERSION=	1.6.2c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/sf-xpaint/${PORTNAME}
 DISTNAME=	libXaw3dXft-${DISTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	3D Xaw (Athena Widget Set) replacement with extended fonts
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		pkgconfig
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USES=		libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_XORG=	xft xmu xpm
 
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--enable-internationalization --enable-arrow-scrollbars
 CPPFLAGS+=	-I${LOCALBASE}/include/freetype2
 
 DOCSDIR=	${LOCALBASE}/share/doc/libXaw3dXft
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} '/^pkgconfigdir/s:=.*:= ${PREFIX}/libdata/pkgconfig:'\
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} '/^typedef.*Pixel;/d' ${WRKSRC}/src/Xaw3dXft.c
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/libxaw3dxft/pkg-plist
===================================================================
--- head/x11-toolkits/libxaw3dxft/pkg-plist	(revision 359924)
+++ head/x11-toolkits/libxaw3dxft/pkg-plist	(revision 359925)
@@ -1,82 +1,82 @@
-lib/libXaw3dxft.a
-lib/libXaw3dxft.la
-lib/libXaw3dxft.so
-lib/libXaw3dxft.so.8
 include/X11/Xaw3dxft/AllWidgets.h
 include/X11/Xaw3dxft/AsciiSink.h
 include/X11/Xaw3dxft/AsciiSinkP.h
 include/X11/Xaw3dxft/AsciiSrc.h
 include/X11/Xaw3dxft/AsciiSrcP.h
 include/X11/Xaw3dxft/AsciiText.h
 include/X11/Xaw3dxft/AsciiTextP.h
 include/X11/Xaw3dxft/Box.h
 include/X11/Xaw3dxft/BoxP.h
 include/X11/Xaw3dxft/Cardinals.h
 include/X11/Xaw3dxft/Command.h
 include/X11/Xaw3dxft/CommandP.h
 include/X11/Xaw3dxft/Dialog.h
 include/X11/Xaw3dxft/DialogP.h
 include/X11/Xaw3dxft/Form.h
 include/X11/Xaw3dxft/FormP.h
 include/X11/Xaw3dxft/Grip.h
 include/X11/Xaw3dxft/GripP.h
 include/X11/Xaw3dxft/Label.h
 include/X11/Xaw3dxft/LabelP.h
 include/X11/Xaw3dxft/Layout.h
 include/X11/Xaw3dxft/LayoutP.h
 include/X11/Xaw3dxft/List.h
 include/X11/Xaw3dxft/ListP.h
 include/X11/Xaw3dxft/MenuButton.h
 include/X11/Xaw3dxft/MenuButtoP.h
 include/X11/Xaw3dxft/MultiSrc.h
 include/X11/Xaw3dxft/MultiSrcP.h
 include/X11/Xaw3dxft/MultiSink.h
 include/X11/Xaw3dxft/MultiSinkP.h
 include/X11/Xaw3dxft/Paned.h
 include/X11/Xaw3dxft/PanedP.h
 include/X11/Xaw3dxft/Panner.h
 include/X11/Xaw3dxft/PannerP.h
 include/X11/Xaw3dxft/Porthole.h
 include/X11/Xaw3dxft/PortholeP.h
 include/X11/Xaw3dxft/Repeater.h
 include/X11/Xaw3dxft/RepeaterP.h
 include/X11/Xaw3dxft/Reports.h
 include/X11/Xaw3dxft/Scrollbar.h
 include/X11/Xaw3dxft/ScrollbarP.h
 include/X11/Xaw3dxft/Simple.h
 include/X11/Xaw3dxft/SimpleP.h
 include/X11/Xaw3dxft/SimpleMenu.h
 include/X11/Xaw3dxft/SimpleMenP.h
 include/X11/Xaw3dxft/Sme.h
 include/X11/Xaw3dxft/SmeP.h
 include/X11/Xaw3dxft/SmeBSB.h
 include/X11/Xaw3dxft/SmeBSBP.h
 include/X11/Xaw3dxft/SmeLine.h
 include/X11/Xaw3dxft/SmeLineP.h
 include/X11/Xaw3dxft/SmeThreeD.h
 include/X11/Xaw3dxft/SmeThreeDP.h
 include/X11/Xaw3dxft/StripChart.h
 include/X11/Xaw3dxft/StripCharP.h
 include/X11/Xaw3dxft/Text.h
 include/X11/Xaw3dxft/TextP.h
 include/X11/Xaw3dxft/TextSink.h
 include/X11/Xaw3dxft/TextSinkP.h
 include/X11/Xaw3dxft/TextSrc.h
 include/X11/Xaw3dxft/TextSrcP.h
 include/X11/Xaw3dxft/ThreeD.h
 include/X11/Xaw3dxft/ThreeDP.h
 include/X11/Xaw3dxft/Tip.h
 include/X11/Xaw3dxft/TipP.h
 include/X11/Xaw3dxft/Toggle.h
 include/X11/Xaw3dxft/ToggleP.h
 include/X11/Xaw3dxft/Tree.h
 include/X11/Xaw3dxft/TreeP.h
 include/X11/Xaw3dxft/Viewport.h
 include/X11/Xaw3dxft/ViewportP.h
 include/X11/Xaw3dxft/XawInit.h
 include/X11/Xaw3dxft/VendorEP.h
 include/X11/Xaw3dxft/Xaw3dP.h
 include/X11/Xaw3dxft/Xaw3dXft.h
 include/X11/Xaw3dxft/XawImP.h
+lib/libXaw3dxft.a
+lib/libXaw3dxft.so
+lib/libXaw3dxft.so.8
+lib/libXaw3dxft.so.8.0.2
 libdata/pkgconfig/libxaw3dxft.pc
 @dirrm include/X11/Xaw3dxft