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!

5 files changed, 94 insertions, 9 deletions

diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 15e327e912fb..0187092b4d2f 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -1,19 +1,13 @@
-# New ports collection makefile for:	xf86-video-chips
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xf86-video-chips
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org chips display driver
 
 XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
 MAN4=		chips.4x
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index f03b7195566c..a6eb707f460c 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
-SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
+SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
+SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
new file mode 100644
index 000000000000..2ec5982b0be0
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am
@@ -0,0 +1,13 @@
+--- util/Makefile.am.orig	2013-03-25 20:49:28.885754151 +0100
++++ util/Makefile.am	2013-03-25 20:50:10.467748226 +0100
+@@ -3,7 +3,7 @@
+ noinst_PROGRAMS = dRegs mRegs modClock memClock
+ endif
+ 
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
new file mode 100644
index 000000000000..b8d96245a190
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in
@@ -0,0 +1,15 @@
+--- util/Makefile.in.orig	2013-03-25 20:50:53.827746698 +0100
++++ util/Makefile.in	2013-03-25 20:50:55.499747558 +0100
+@@ -238,9 +238,9 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-dRegs_SOURCES = dRegs.c AsmMacros.h
+-mRegs_SOURCES = mRegs.c AsmMacros.h
+-modClock_SOURCES = modClock.c AsmMacros.h
++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h
++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h
++modClock_SOURCES = modClock.c AsmMacros.h iopl.h
+ memClock_SOURCES = modClock.c AsmMacros.h
+ all: all-am
+ 
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_iopl.h b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
new file mode 100644
index 000000000000..50db4d1a3700
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h
@@ -0,0 +1,63 @@
+--- util/iopl.h.orig	2013-03-25 20:48:15.486758154 +0100
++++ util/iopl.h	2013-03-25 20:47:56.000000000 +0100
+@@ -0,0 +1,60 @@
++#ifdef __NetBSD__
++#  include <sys/types.h>
++#  include <machine/pio.h>
++#  include <machine/sysarch.h>
++#else
++#  if defined(__linux__)
++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
++ * #    include <sys/io.h>
++ */
++int iopl(int level);
++#  endif
++#  if defined(SVR4) && defined(i386)
++#    include <sys/types.h>
++#    ifdef NCR
++       /* broken NCR <sys/sysi86.h> */
++#      define __STDC
++#      include <sys/sysi86.h>
++#      undef __STDC
++#    else
++#      include <sys/sysi86.h>
++#    endif
++#    ifdef SVR4
++#      if !defined(sun)
++#        include <sys/seg.h>
++#      endif
++#    endif
++#    include <sys/v86.h>
++#    if defined(sun)
++#      include <sys/psw.h>
++#    endif
++#  endif
++#  include "AsmMacros.h"
++#endif /* NetBSD */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __NetBSD__
++#  define SET_IOPL() i386_iopl(3)
++#  define RESET_IOPL() i386_iopl(0)
++#else
++#  if defined(SVR4) && defined(i386)
++#    ifndef SI86IOPL
++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
++#    else
++#      define SET_IOPL() sysi86(SI86IOPL,3)
++#      define RESET_IOPL() sysi86(SI86IOPL,0)
++#    endif
++#  else
++#    ifdef linux
++#      define SET_IOPL() iopl(3)
++#      define RESET_IOPL() iopl(0)
++#    else
++#      define SET_IOPL() (void)0
++#      define RESET_IOPL() (void)0
++#    endif
++#  endif
++#endif