4 files changed, 30 insertions, 22 deletions

diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index be7ff56a652e..eabf450422bd 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -6,24 +6,31 @@
 #
 
 PORTNAME=	neXtaw
-PORTVERSION=	0.9
+PORTVERSION=	0.15.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://siag.nu/pub/neXtaw/
 
-MAINTAINER=	tg@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Athena Widgets with N*XTSTEP appearance
 
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
 
-MAN1=		neXtclock.1
+post-patch:
+	@${REINPLACE_CMD} -e 's|version-info.*$$|version-info ${XAWVER}:0:0|g' \
+		${WRKSRC}/X11/neXtaw/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/neXtaw
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/neXtaw
-	${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${PREFIX}/share/doc/neXtaw
-	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${PREFIX}/share/doc/neXtaw
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/CHANGES ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/neXtaw/distinfo b/x11-toolkits/neXtaw/distinfo
index 3031f29ed5d5..c1d904b7b923 100644
--- a/x11-toolkits/neXtaw/distinfo
+++ b/x11-toolkits/neXtaw/distinfo
@@ -1 +1 @@
-MD5 (neXtaw-0.9.tar.gz) = c6b7b2a0f71c5e7de8ff6634e6cb569c
+MD5 (neXtaw-0.15.1.tar.gz) = 1c9cbcef735d8e26f3e48bd529aca6a7
diff --git a/x11-toolkits/neXtaw/pkg-descr b/x11-toolkits/neXtaw/pkg-descr
index bbcca96a1b99..94a2e4a87937 100644
--- a/x11-toolkits/neXtaw/pkg-descr
+++ b/x11-toolkits/neXtaw/pkg-descr
@@ -1,5 +1,5 @@
 This is neXtaw, a modified version of the Athena Widgets with N*XTSTEP
-appearance. It is based on the Xaw3d 1.3 library by Kaleb Keithley.
+appearance. It is based on the Xaw3d 1.5 library by Kaleb Keithley.
 This is not a magic library which will beautify all your apps instantly.
 But with some .Xdefaults fiddling you can make Athena applications look
 and behave much better.
diff --git a/x11-toolkits/neXtaw/pkg-plist b/x11-toolkits/neXtaw/pkg-plist
index f1b75b191a81..545241bf4049 100644
--- a/x11-toolkits/neXtaw/pkg-plist
+++ b/x11-toolkits/neXtaw/pkg-plist
@@ -1,8 +1,3 @@
-bin/neXtclock
-lib/X11/app-defaults/NeXtClock
-lib/libneXtaw.a
-lib/libneXtaw.so
-lib/libneXtaw.so.%%XAWVER%%
 include/X11/neXtaw/AllWidgets.h
 include/X11/neXtaw/AsciiSink.h
 include/X11/neXtaw/AsciiSinkP.h
@@ -61,9 +56,6 @@ include/X11/neXtaw/SmeThreeD.h
 include/X11/neXtaw/SmeThreeDP.h
 include/X11/neXtaw/StripCharP.h
 include/X11/neXtaw/StripChart.h
-include/X11/neXtaw/Template.c
-include/X11/neXtaw/Template.h
-include/X11/neXtaw/TemplateP.h
 include/X11/neXtaw/Text.h
 include/X11/neXtaw/TextP.h
 include/X11/neXtaw/TextSink.h
@@ -74,15 +66,24 @@ include/X11/neXtaw/ThreeD.h
 include/X11/neXtaw/ThreeDP.h
 include/X11/neXtaw/Toggle.h
 include/X11/neXtaw/ToggleP.h
+include/X11/neXtaw/Traversal.h
+include/X11/neXtaw/TraversalP.h
 include/X11/neXtaw/Tree.h
 include/X11/neXtaw/TreeP.h
 include/X11/neXtaw/VendorEP.h
 include/X11/neXtaw/Viewport.h
 include/X11/neXtaw/ViewportP.h
+include/X11/neXtaw/XawAlloc.h
+include/X11/neXtaw/XawI18n.h
 include/X11/neXtaw/XawImP.h
 include/X11/neXtaw/XawInit.h
-share/doc/neXtaw/CHANGES
-share/doc/neXtaw/FAQ
-share/doc/neXtaw/README
+include/X11/neXtaw/XawVersion.h
+include/X11/neXtaw/laygram.h
+lib/libneXtaw.a
+lib/libneXtaw.so
+lib/libneXtaw.so.%%XAWVER%%
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/X11/neXtaw
-@dirrm share/doc/neXtaw