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!

1 files changed, 3 insertions, 14 deletions

diff --git a/devel/imake/files/patch-xmkmf.cpp b/devel/imake/files/patch-xmkmf.cpp
index a08866e3855f..94a238332a9f 100644
--- a/devel/imake/files/patch-xmkmf.cpp
+++ b/devel/imake/files/patch-xmkmf.cpp
@@ -1,17 +1,6 @@
---- work/imake-1.0.2/xmkmf.cpp	2004-04-23 18:42:00.000000000 +0000
-+++ xmkmf.cpp	2009-12-14 20:51:01.695597560 +0000
-@@ -53,6 +53,10 @@
-     args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
- fi
- 
-+if [ -n "$CPP" -a -z "$IMAKECPP" ];then
-+    export IMAKECPP=$CPP
-+fi
-+
- echo imake $imake_defines $args
- case "$do_all" in
- yes)
-@@ -68,3 +72,12 @@
+--- xmkmf.cpp.orig	2012-03-08 06:47:32.000000000 +0100
++++ xmkmf.cpp	2013-03-17 22:53:14.000000000 +0100
+@@ -64,3 +64,12 @@
      imake $imake_defines $args
      ;;
  esac