The FreeBSD x11 team proudly presents

an zeising, kwm, miwi, bapt, eadler production:

Xorg 7.7

Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
Change pkgconf to be a build dependency.
Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use
this.
Trim makefile headers.
Take maintanership of x11/xcb-proto, ok'd by ashish.
If you are running WITH_NEW_XORG=, you need to rebuild all installed
drivers, see UPDATING for more information.
Various fixes to make ports compile.

PR:		ports/177942
Exp-run by:	miwi
Approved by:	portmgr (miwi)

Thanks to all who helped testing!

3 files changed, 52 insertions, 17 deletions

diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 901d3822344f..11183bc5dc8c 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   libXaw
-# Date Created:			25 Jan, 2003
-# Whom:				Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libXaw
-PORTVERSION=	1.0.9
+PORTVERSION=	1.0.11
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 
@@ -16,15 +12,7 @@ COMMENT=	X Athena Widgets library
 XORG_CAT=	lib
 USE_XORG=	printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--without-xmlto
-
-PORTDOCS=	*
-
-.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=--disable-specs
-post-configure:
-	@${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile
-.endif
+CONFIGURE_ARGS+=--without-xmlto
 
 MAN3=		Xaw.3
 
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index 3e67ebd8e5ea..e2007b6f2fd5 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
-SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
+SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
+SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index 9d2af3b87a80..d8c4c79a0285 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -82,4 +82,51 @@ lib/libXaw7.so
 lib/libXaw7.so.7
 libdata/pkgconfig/xaw6.pc
 libdata/pkgconfig/xaw7.pc
+%%DOCSDIR%%/AsciiSink.xml
+%%DOCSDIR%%/AsciiSource.xml
+%%DOCSDIR%%/AsciiText.xml
+%%DOCSDIR%%/Box.xml
+%%DOCSDIR%%/CH1.xml
+%%DOCSDIR%%/CH2.xml
+%%DOCSDIR%%/CH3.xml
+%%DOCSDIR%%/CH4.xml
+%%DOCSDIR%%/CH5.xml
+%%DOCSDIR%%/CH6.xml
+%%DOCSDIR%%/CH7.xml
+%%DOCSDIR%%/Command.xml
+%%DOCSDIR%%/Dialog.xml
+%%DOCSDIR%%/Form.xml
+%%DOCSDIR%%/Grip.xml
+%%DOCSDIR%%/Label.xml
+%%DOCSDIR%%/List.xml
+%%DOCSDIR%%/MenuButton.xml
+%%DOCSDIR%%/Paned.xml
+%%DOCSDIR%%/Panner.xml
+%%DOCSDIR%%/Porthole.xml
+%%DOCSDIR%%/Repeater.xml
+%%DOCSDIR%%/Scrollbar.xml
+%%DOCSDIR%%/Simple.xml
+%%DOCSDIR%%/SimpleMenu.xml
+%%DOCSDIR%%/Sme.xml
+%%DOCSDIR%%/SmeBSB.xml
+%%DOCSDIR%%/SmeLine.xml
+%%DOCSDIR%%/StripChart.xml
+%%DOCSDIR%%/TPage_Credits.xml
+%%DOCSDIR%%/Template.xml
+%%DOCSDIR%%/Template_private_header_file.xml
+%%DOCSDIR%%/Template_public_header_file.xml
+%%DOCSDIR%%/Template_widget_source_file.xml
+%%DOCSDIR%%/Text.xml
+%%DOCSDIR%%/TextActions.xml
+%%DOCSDIR%%/TextActions_default_translation_bindings.xml
+%%DOCSDIR%%/TextActions_text_widget_actions.xml
+%%DOCSDIR%%/TextCustom.xml
+%%DOCSDIR%%/TextFuncs.xml
+%%DOCSDIR%%/TextSink.xml
+%%DOCSDIR%%/TextSource.xml
+%%DOCSDIR%%/Toggle.xml
+%%DOCSDIR%%/Tree.xml
+%%DOCSDIR%%/Viewport.xml
+%%DOCSDIR%%/libXaw.xml
+@dirrmtry %%DOCSDIR%%
 @dirrmtry include/X11/Xaw