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!

14 files changed, 192 insertions, 185 deletions

diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile
index 577fd03fda45..07c3ef36a154 100644
--- a/devel/gccmakedep/Makefile
+++ b/devel/gccmakedep/Makefile
@@ -16,16 +16,13 @@ PLIST_FILES=	bin/gccmakedep
 
 .include <bsd.port.pre.mk>
 
-.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
-BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
-
-post-build:
-	${REINPLACE_CMD} -e 's|^CC= *|CC=|' \
-		-e 's|^RM= *|RM=|' \
-		-e 's|^LN= *|LN=|' \
-		-e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep
+# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
+.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
+    ${OSVERSION} >= 1000010
+CONFIGURE_ENV+=	ac_cv_path_RAWCPP="gcpp"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index ba6d0ebe3235..a91239b35550 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -1,8 +1,8 @@
-# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	imake
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 PORTEPOCH=	1
 CATEGORIES=	devel
 
@@ -11,13 +11,17 @@ COMMENT=	Imake and other utilities from X.Org
 
 RUN_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep \
 		makedepend:${PORTSDIR}/devel/makedepend \
-		${PREFIX}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
+		${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
 
 USE_PERL5=	yes
 
 XORG_CAT=	util
 USE_XORG=	xproto
 
+# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
+# which is fatal for imake.
+CPPFLAGS+=	-DDEFAULT_CC=\\\"gcc\\\"
+
 .ifdef USE_IMAKE
 .error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
@@ -34,16 +38,14 @@ MAN1=		ccmakedep.1 \
 
 post-patch:
 	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl
+	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
 
 .include <bsd.port.pre.mk>
 
-.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
-BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
-CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"
-
-post-build:
-	${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf
+# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp.
+.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \
+	${OSVERSION} >= 1000010
+CONFIGURE_ENV+=       ac_cv_path_RAWCPP="gcpp"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
index 1e2fe2cdcd7d..cfd49ab14d9f 100644
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
-SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
+SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
+SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503
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
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index 3954d510716c..77cd8eaf8d57 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -1,19 +1,14 @@
-# New ports collection makefile for:	libpciaccess
-# Date Created:				May 11 2008
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libpciaccess
-PORTVERSION=	0.12.1
+PORTVERSION=	0.13.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Generic PCI access library
 
 BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
-# XXX - Is it a runtime dep too?
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
 
 CONFIGURE_ARGS+=	--with-pciids-path=${LOCALBASE}/share/pciids
diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo
index dd572d7b7e77..b6ce66043082 100644
--- a/devel/libpciaccess/distinfo
+++ b/devel/libpciaccess/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
-SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
+SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
+SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351
diff --git a/devel/libpciaccess/files/patch-src-common_init.c b/devel/libpciaccess/files/patch-src-common_init.c
deleted file mode 100644
index d8028b2a4c2c..000000000000
--- a/devel/libpciaccess/files/patch-src-common_init.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/common_init.c.orig	2008-10-11 18:31:00.000000000 +0000
-+++ src/common_init.c	2009-03-29 20:10:52.000000000 +0000
-@@ -70,7 +70,9 @@
- void
- pci_system_init_dev_mem(int fd)
- {
--#ifdef __OpenBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+    pci_system_freebsd_init_dev_mem(fd);
-+#elif defined(__OpenBSD__)
-     pci_system_openbsd_init_dev_mem(fd);
- #endif
- }
diff --git a/devel/libpciaccess/files/patch-src-freebsd_pci.c b/devel/libpciaccess/files/patch-src-freebsd_pci.c
index 617c011c493f..45eb6dc1c79e 100644
--- a/devel/libpciaccess/files/patch-src-freebsd_pci.c
+++ b/devel/libpciaccess/files/patch-src-freebsd_pci.c
@@ -1,113 +1,169 @@
---- src/freebsd_pci.c.orig	2009-05-07 10:35:59.000000000 -0500
-+++ src/freebsd_pci.c	2009-05-07 10:36:10.000000000 -0500
-@@ -72,6 +72,10 @@
- #define PCIM_BAR_MEM_SPACE      0
- #define PCIM_BAR_IO_SPACE       1
+--- src/freebsd_pci.c.orig	2012-04-09 13:02:57.000000000 -0400
++++ src/freebsd_pci.c	2013-04-16 02:19:10.000000000 -0400
+@@ -1,6 +1,8 @@
+ /*
+  * (C) Copyright Eric Anholt 2006
+  * (C) Copyright IBM Corporation 2006
++ * (C) Copyright Mark Kettenis 2011
++ * (C) Copyright Robert Millan 2012
+  * All Rights Reserved.
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a
+@@ -561,6 +563,138 @@
+     freebsd_pci_sys = NULL;
+ }
  
-+#if defined(__sparc64__)
-+static int screenfd;
++#if defined(__i386__) || defined(__amd64__)
++#include <machine/cpufunc.h>
 +#endif
 +
- /**
-  * FreeBSD private pci_system structure that extends the base pci_system
-  * structure.
-@@ -103,12 +107,18 @@
- {
-     const int prot = ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) != 0) 
-         ? (PROT_READ | PROT_WRITE) : PROT_READ;
-+#if !defined(__sparc64__)
-     struct mem_range_desc mrd;
-     struct mem_range_op mro;
-+#endif
- 
-     int fd, err = 0;
- 
-+#if defined(__sparc64__)
-+    fd = screenfd;
++static struct pci_io_handle *
++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
++{
++#if defined(__i386__) || defined(__amd64__)
++	ret->fd = open("/dev/io", O_RDWR | O_CLOEXEC);
++
++	if (ret->fd < 0)
++		return NULL;
++
++	ret->base = base;
++	ret->size = size;
++	return ret;
++#elif defined(PCI_MAGIC_IO_RANGE)
++	ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
++	    aperturefd, PCI_MAGIC_IO_RANGE + base);
++	if (ret->memory == MAP_FAILED)
++		return NULL;
++
++	ret->base = base;
++	ret->size = size;
++	return ret;
 +#else
-     fd = open("/dev/mem", O_RDWR);
++	return NULL;
 +#endif
-     if (fd == -1)
- 	return errno;
- 
-@@ -118,6 +128,7 @@
- 	err = errno;
-     }
- 
-+#if !defined(__sparc64__)
-     mrd.mr_base = map->base;
-     mrd.mr_len = map->size;
-     strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner));
-@@ -138,6 +149,7 @@
-     }
- 
-     close(fd);
++}
++
++#if defined(__i386__) || defined(__amd64__)
++static void
++pci_device_freebsd_close_io(struct pci_device *dev, struct pci_io_handle *handle)
++{
++	if (handle->fd > -1)
++		close(handle->fd);
++}
 +#endif
- 
-     return err;
- }
-@@ -146,6 +158,7 @@
- pci_device_freebsd_unmap_range( struct pci_device *dev,
- 				struct pci_device_mapping *map )
- {
-+#if !defined(__sparc64__)
-     struct mem_range_desc mrd;
-     struct mem_range_op mro;
-     int fd;
-@@ -171,6 +184,7 @@
- 	    fprintf(stderr, "Failed to open /dev/mem\n");
- 	}
-     }
++
++static uint32_t
++pci_device_freebsd_read32(struct pci_io_handle *handle, uint32_t reg)
++{
++#if defined(__i386__) || defined(__amd64__)
++	return inl(handle->base + reg);
++#else
++	return *(uint32_t *)((uintptr_t)handle->memory + reg);
 +#endif
- 
-     return pci_device_generic_unmap_range(dev, map);
- }
-@@ -293,20 +307,28 @@
-     }
- 
-     printf("Using rom_base = 0x%lx\n", (long)rom_base);
-+#if defined(__sparc64__)
-+    memfd = screenfd;
++}
++
++static uint16_t
++pci_device_freebsd_read16(struct pci_io_handle *handle, uint32_t reg)
++{
++#if defined(__i386__) || defined(__amd64__)
++	return inw(handle->base + reg);
 +#else
-     memfd = open( "/dev/mem", O_RDONLY );
++	return *(uint16_t *)((uintptr_t)handle->memory + reg);
 +#endif
-     if ( memfd == -1 )
- 	return errno;
- 
-     bios = mmap( NULL, dev->rom_size, PROT_READ, 0, memfd, rom_base );
-     if ( bios == MAP_FAILED ) {
-+#if !defined(__sparc64__)
- 	close( memfd );
++}
++
++static uint8_t
++pci_device_freebsd_read8(struct pci_io_handle *handle, uint32_t reg)
++{
++#if defined(__i386__) || defined(__amd64__)
++	return inb(handle->base + reg);
++#else
++	return *(uint8_t *)((uintptr_t)handle->memory + reg);
 +#endif
- 	return errno;
-     }
- 
-     memcpy( buffer, bios, dev->rom_size );
- 
-     munmap( bios, dev->rom_size );
-+#if !defined(__sparc64__)
-     close( memfd );
++}
++
++static void
++pci_device_freebsd_write32(struct pci_io_handle *handle, uint32_t reg,
++    uint32_t data)
++{
++#if defined(__i386__) || defined(__amd64__)
++	outl(handle->base + reg, data);
++#else
++	*(uint16_t *)((uintptr_t)handle->memory + reg) = data;
 +#endif
- 
-     if (pci_rom) {
- 	pci_device_cfg_write_u32( dev, PCIR_BIOS, rom );
-@@ -341,7 +363,6 @@
- static int
- pci_device_freebsd_probe( struct pci_device * dev )
- {
--    struct pci_device_private *priv = (struct pci_device_private *) dev;
-     struct pci_bar_io bar;
-     uint8_t irq;
-     int err, i;
-@@ -644,3 +665,11 @@
- 
-     return 0;
- }
++}
++
++static void
++pci_device_freebsd_write16(struct pci_io_handle *handle, uint32_t reg,
++    uint16_t data)
++{
++#if defined(__i386__) || defined(__amd64__)
++	outw(handle->base + reg, data);
++#else
++	*(uint8_t *)((uintptr_t)handle->memory + reg) = data;
++#endif
++}
 +
-+void
-+pci_system_freebsd_init_dev_mem(int fd)
++static void
++pci_device_freebsd_write8(struct pci_io_handle *handle, uint32_t reg,
++    uint8_t data)
 +{
-+#if defined(__sparc64__)
-+    screenfd = fd;
++#if defined(__i386__) || defined(__amd64__)
++	outb(handle->base + reg, data);
++#else
++	*(uint32_t *)((uintptr_t)handle->memory + reg) = data;
 +#endif
 +}
++
++static int
++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
++    pciaddr_t size, unsigned map_flags, void **addr)
++{
++	struct pci_device_mapping map;
++	int err;
++
++	map.base = base;
++	map.size = size;
++	map.flags = map_flags;
++	map.memory = NULL;
++	err = pci_device_freebsd_map_range(dev, &map);
++	*addr = map.memory;
++
++	return err;
++}
++
++static int
++pci_device_freebsd_unmap_legacy(struct pci_device *dev, void *addr,
++    pciaddr_t size)
++{
++	struct pci_device_mapping map;
++
++	map.memory = addr;
++	map.size = size;
++	map.flags = 0;
++	return pci_device_freebsd_unmap_range(dev, &map);
++}
++
+ static const struct pci_system_methods freebsd_pci_methods = {
+     .destroy = pci_system_freebsd_destroy,
+     .destroy_device = NULL, /* nothing to do for this */
+@@ -571,6 +705,18 @@
+     .read = pci_device_freebsd_read,
+     .write = pci_device_freebsd_write,
+     .fill_capabilities = pci_fill_capabilities_generic,
++    .open_legacy_io = pci_device_freebsd_open_legacy_io,
++#if defined(__i386__) || defined(__amd64__)
++    .close_io = pci_device_freebsd_close_io,
++#endif
++    .read32 = pci_device_freebsd_read32,
++    .read16 = pci_device_freebsd_read16,
++    .read8 = pci_device_freebsd_read8,
++    .write32 = pci_device_freebsd_write32,
++    .write16 = pci_device_freebsd_write16,
++    .write8 = pci_device_freebsd_write8,
++    .map_legacy = pci_device_freebsd_map_legacy,
++    .unmap_legacy = pci_device_freebsd_unmap_legacy,
+ };
+ 
+ /**
diff --git a/devel/libpciaccess/files/patch-src-pciaccess_private.h b/devel/libpciaccess/files/patch-src-pciaccess_private.h
deleted file mode 100644
index 2d9cb99c7123..000000000000
--- a/devel/libpciaccess/files/patch-src-pciaccess_private.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pciaccess_private.h.orig	2008-10-11 18:31:00.000000000 +0000
-+++ src/pciaccess_private.h	2009-03-29 20:07:50.000000000 +0000
-@@ -136,6 +136,7 @@
- 
- extern int pci_system_linux_sysfs_create( void );
- extern int pci_system_freebsd_create( void );
-+extern void pci_system_freebsd_init_dev_mem( int );
- extern int pci_system_netbsd_create( void );
- extern int pci_system_openbsd_create( void );
- extern void pci_system_openbsd_init_dev_mem( int );
diff --git a/devel/lndir/Makefile b/devel/lndir/Makefile
index c915e5a19d51..6e69b0da142e 100644
--- a/devel/lndir/Makefile
+++ b/devel/lndir/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	unixmania@gmail.com
 COMMENT=	Create a shadow directory of symbolic links to another directory tree
 
 XORG_CAT=	util
-USE_XORG=	xproto xorg-macros
+USE_XORG=	xproto
 
 PLIST_FILES=	bin/lndir
 
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index 4f6e0f8b2762..0e57b8ca807e 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -1,20 +1,15 @@
-# New ports collection makefile for:	makedepend
-# Date created:				August 15th 1997
-# Whom:					Ian Vaudrey <i.vaudrey@bigfoot.com>
-#
+# Created by: Ian Vaudrey <i.vaudrey@bigfoot.com>
 # $FreeBSD$
-#
 
 PORTNAME=	makedepend
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	A dependency generator for makefiles
+COMMENT=	Dependency generator for makefiles
 
 XORG_CAT=	util
-USE_GNOME=	pkgconfig
 USE_XORG=	xproto
 
 PLIST_FILES=	bin/makedepend
diff --git a/devel/makedepend/distinfo b/devel/makedepend/distinfo
index 5fce726c8432..40664c90fe67 100644
--- a/devel/makedepend/distinfo
+++ b/devel/makedepend/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
-SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
+SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
+SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683
diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile
index 634a5840066e..15c8dd9762a3 100644
--- a/devel/xorg-macros/Makefile
+++ b/devel/xorg-macros/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	xorg-macros
-# Date Created:				24 Mar 2007
-# Whom:					Eric Anholt <anholt@FreeBSD.org>
-#
+# Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorg-macros
-PORTVERSION=	1.16.1
+PORTVERSION=	1.17
 CATEGORIES=	devel x11
 DISTNAME=	util-macros-$(PORTVERSION)
 
diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo
index cca65f057018..b97705c0ca90 100644
--- a/devel/xorg-macros/distinfo
+++ b/devel/xorg-macros/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933
-SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404
+SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed
+SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029