summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2015-04-18 15:34:36 +0000
committerKoop Mast <kwm@FreeBSD.org>2015-04-18 15:34:36 +0000
commit1fc509c59162d92657bb57ee9b52ad6f0c5eaff6 (patch)
tree50d837d122ae52af042914c64739f37a28d78d4d
parentUnbreak build on DragonFly and FreeBSD 10+ (diff)
Misc X.org port updates:
Update gccmakedep to 1.0.3. Update imake to 1.0.7. Update libpciaccess to 0.13.3. Update libdrm to 2.4.60. Update bitmap to 1.0.8. Update fstobdf to 1.0.6. Update iceauth to 1.0.7. Update libXdmcp to 1.1.2. Update libXp to 1.0.3. Update libXvMC to 1.0.9. Update libXxf86vm to 1.1.4. Update libxshmfence to 1.2. Update randrproto to 1.4.1. Update rgb to 1.0.6. Update sessreg to 1.1.0. Update xcb-util-cursor to 0.1.2. Update xedit to 1.2.2. Update xkbcomp to 1.3.0. Update xkeyboard-config to 2.14. Update xproto to 7.0.27. Update xf86-input-mouse to 1.9.1. Update xf86-input-synaptics to 1.8.2. Update xf86-video-i710 to 1.3.5. Update xf86-video-mga to 1.6.4. Update xf86-video-tdfx to 1.4.6. Update xf86-video-vmware to 13.1.0. Update bdftopcf to 1.0.5. Update font-util to 1.3.1. Update fslsfonts to 1.0.5. Update mkfontscale to 1.1.2. Update showfont to 1.0.5. Update xfs to 1.1.4. Update xfsinfo to 1.0.5. Remove :keepla from USES=libtool for X libraries in bsd.xorg.mk, and bump all affected ports. PR: 199400 Obtained from: Xorg-devel repo
Notes
Notes: svn path=/head/; revision=384234
-rw-r--r--Mk/bsd.xorg.mk4
-rw-r--r--devel/gccmakedep/Makefile3
-rw-r--r--devel/gccmakedep/distinfo4
-rw-r--r--devel/gccmakedep/files/patch-gccmdep.cpp11
-rw-r--r--devel/imake/Makefile3
-rw-r--r--devel/imake/distinfo4
-rw-r--r--devel/libpciaccess/Makefile3
-rw-r--r--devel/libpciaccess/distinfo4
-rw-r--r--devel/libpciaccess/files/patch-src-freebsd_pci.c38
-rw-r--r--devel/libpciaccess/files/patch-src-pciaccess_private.h6
-rw-r--r--devel/libpciaccess/pkg-plist1
-rw-r--r--graphics/libdrm/Makefile3
-rw-r--r--graphics/libdrm/distinfo4
-rw-r--r--graphics/libdrm/pkg-plist1
-rw-r--r--graphics/mesa-demos/Makefile5
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile3
-rw-r--r--x11-drivers/xf86-input-mouse/distinfo4
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c80
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in6
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_mouse.c30
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_mouse.h8
-rw-r--r--x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h6
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile3
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo4
-rw-r--r--x11-drivers/xf86-video-i740/Makefile3
-rw-r--r--x11-drivers/xf86-video-i740/distinfo4
-rw-r--r--x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c21
-rw-r--r--x11-drivers/xf86-video-mga/Makefile3
-rw-r--r--x11-drivers/xf86-video-mga/distinfo4
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile3
-rw-r--r--x11-drivers/xf86-video-tdfx/distinfo4
-rw-r--r--x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c21
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile3
-rw-r--r--x11-drivers/xf86-video-vmware/distinfo4
-rw-r--r--x11-fonts/bdftopcf/Makefile2
-rw-r--r--x11-fonts/bdftopcf/distinfo4
-rw-r--r--x11-fonts/font-util/Makefile4
-rw-r--r--x11-fonts/font-util/distinfo4
-rw-r--r--x11-fonts/fslsfonts/Makefile2
-rw-r--r--x11-fonts/fslsfonts/distinfo4
-rw-r--r--x11-fonts/libFS/Makefile2
-rw-r--r--x11-fonts/libFS/pkg-plist1
-rw-r--r--x11-fonts/libXfont/pkg-plist1
-rw-r--r--x11-fonts/libXfontcache/Makefile2
-rw-r--r--x11-fonts/libXfontcache/pkg-plist1
-rw-r--r--x11-fonts/libXft/Makefile3
-rw-r--r--x11-fonts/libXft/pkg-plist1
-rw-r--r--x11-fonts/libfontenc/Makefile2
-rw-r--r--x11-fonts/libfontenc/pkg-plist1
-rw-r--r--x11-fonts/mkfontscale/Makefile3
-rw-r--r--x11-fonts/mkfontscale/distinfo4
-rw-r--r--x11-fonts/showfont/Makefile2
-rw-r--r--x11-fonts/showfont/distinfo4
-rw-r--r--x11-fonts/xfs/Makefile7
-rw-r--r--x11-fonts/xfs/distinfo4
-rw-r--r--x11-fonts/xfs/pkg-install12
-rw-r--r--x11-fonts/xfs/pkg-plist2
-rw-r--r--x11-fonts/xfsinfo/Makefile2
-rw-r--r--x11-fonts/xfsinfo/distinfo4
-rw-r--r--x11-toolkits/libXaw/Makefile2
-rw-r--r--x11-toolkits/libXaw/pkg-plist2
-rw-r--r--x11-toolkits/libXmu/Makefile2
-rw-r--r--x11-toolkits/libXmu/pkg-plist2
-rw-r--r--x11-toolkits/libXt/Makefile2
-rw-r--r--x11-toolkits/libXt/pkg-plist1
-rw-r--r--x11/bitmap/Makefile2
-rw-r--r--x11/bitmap/distinfo4
-rw-r--r--x11/fstobdf/Makefile2
-rw-r--r--x11/fstobdf/distinfo4
-rw-r--r--x11/iceauth/Makefile2
-rw-r--r--x11/iceauth/distinfo4
-rw-r--r--x11/libICE/Makefile1
-rw-r--r--x11/libICE/pkg-plist1
-rw-r--r--x11/libSM/Makefile2
-rw-r--r--x11/libSM/pkg-plist1
-rw-r--r--x11/libX11/Makefile2
-rw-r--r--x11/libX11/pkg-plist64
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXScrnSaver/pkg-plist1
-rw-r--r--x11/libXTrap/Makefile2
-rw-r--r--x11/libXTrap/pkg-plist1
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXau/pkg-plist1
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcomposite/pkg-plist1
-rw-r--r--x11/libXcursor/Makefile2
-rw-r--r--x11/libXcursor/pkg-plist1
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdamage/pkg-plist1
-rw-r--r--x11/libXdmcp/Makefile3
-rw-r--r--x11/libXdmcp/distinfo4
-rw-r--r--x11/libXdmcp/pkg-plist1
-rw-r--r--x11/libXevie/Makefile2
-rw-r--r--x11/libXevie/pkg-plist1
-rw-r--r--x11/libXext/Makefile1
-rw-r--r--x11/libXext/pkg-plist31
-rw-r--r--x11/libXfixes/Makefile2
-rw-r--r--x11/libXfixes/pkg-plist1
-rw-r--r--x11/libXi/Makefile1
-rw-r--r--x11/libXi/pkg-plist1
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXinerama/pkg-plist1
-rw-r--r--x11/libXp/Makefile3
-rw-r--r--x11/libXp/distinfo4
-rw-r--r--x11/libXp/pkg-plist1
-rw-r--r--x11/libXpm/Makefile2
-rw-r--r--x11/libXpm/pkg-plist1
-rw-r--r--x11/libXprintAppUtil/Makefile2
-rw-r--r--x11/libXprintAppUtil/pkg-plist1
-rw-r--r--x11/libXprintUtil/Makefile2
-rw-r--r--x11/libXprintUtil/pkg-plist1
-rw-r--r--x11/libXrandr/Makefile2
-rw-r--r--x11/libXrandr/pkg-plist1
-rw-r--r--x11/libXrender/Makefile2
-rw-r--r--x11/libXrender/pkg-plist1
-rw-r--r--x11/libXres/Makefile2
-rw-r--r--x11/libXres/pkg-plist1
-rw-r--r--x11/libXtst/Makefile2
-rw-r--r--x11/libXtst/pkg-plist1
-rw-r--r--x11/libXv/Makefile2
-rw-r--r--x11/libXv/pkg-plist1
-rw-r--r--x11/libXvMC/Makefile3
-rw-r--r--x11/libXvMC/distinfo4
-rw-r--r--x11/libXvMC/pkg-plist2
-rw-r--r--x11/libXxf86dga/Makefile2
-rw-r--r--x11/libXxf86dga/pkg-plist1
-rw-r--r--x11/libXxf86misc/Makefile2
-rw-r--r--x11/libXxf86misc/pkg-plist1
-rw-r--r--x11/libXxf86vm/Makefile3
-rw-r--r--x11/libXxf86vm/distinfo4
-rw-r--r--x11/libXxf86vm/pkg-plist1
-rw-r--r--x11/libdmx/Makefile2
-rw-r--r--x11/libdmx/pkg-plist1
-rw-r--r--x11/liboldX/Makefile2
-rw-r--r--x11/liboldX/pkg-plist1
-rw-r--r--x11/libxcb/Makefile1
-rw-r--r--x11/libxcb/pkg-plist26
-rw-r--r--x11/libxkbcommon/Makefile1
-rw-r--r--x11/libxkbcommon/pkg-plist6
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/libxkbfile/pkg-plist1
-rw-r--r--x11/libxkbui/Makefile2
-rw-r--r--x11/libxkbui/pkg-plist1
-rw-r--r--x11/libxshmfence/Makefile3
-rw-r--r--x11/libxshmfence/distinfo4
-rw-r--r--x11/libxshmfence/files/patch-config.h.in16
-rw-r--r--x11/libxshmfence/files/patch-configure34
-rw-r--r--x11/libxshmfence/files/patch-src__xshmfence_alloc.c19
-rw-r--r--x11/libxshmfence/files/patch-src__xshmfence_futex.h47
-rw-r--r--x11/libxshmfence/files/patch-src__xshmfenceint.h4
-rw-r--r--x11/libxshmfence/pkg-plist1
-rw-r--r--x11/pixman/Makefile1
-rw-r--r--x11/pixman/pkg-plist1
-rw-r--r--x11/randrproto/Makefile2
-rw-r--r--x11/randrproto/distinfo4
-rw-r--r--x11/rgb/Makefile2
-rw-r--r--x11/rgb/distinfo4
-rw-r--r--x11/sessreg/Makefile2
-rw-r--r--x11/sessreg/distinfo4
-rw-r--r--x11/xcb-util-cursor/Makefile10
-rw-r--r--x11/xcb-util-cursor/distinfo4
-rw-r--r--x11/xcb-util-cursor/pkg-plist1
-rw-r--r--x11/xcb-util-image/Makefile1
-rw-r--r--x11/xcb-util-image/pkg-plist1
-rw-r--r--x11/xcb-util-keysyms/Makefile1
-rw-r--r--x11/xcb-util-keysyms/pkg-plist1
-rw-r--r--x11/xcb-util-renderutil/Makefile1
-rw-r--r--x11/xcb-util-renderutil/pkg-plist1
-rw-r--r--x11/xcb-util-wm/Makefile2
-rw-r--r--x11/xcb-util-wm/pkg-plist2
-rw-r--r--x11/xcb-util/Makefile1
-rw-r--r--x11/xcb-util/pkg-plist1
-rw-r--r--x11/xedit/Makefile2
-rw-r--r--x11/xedit/distinfo4
-rw-r--r--x11/xkbcomp/Makefile2
-rw-r--r--x11/xkbcomp/distinfo4
-rw-r--r--x11/xkeyboard-config/Makefile2
-rw-r--r--x11/xkeyboard-config/distinfo4
-rw-r--r--x11/xproto/Makefile2
-rw-r--r--x11/xproto/distinfo4
180 files changed, 310 insertions, 545 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 16668c790da4..3b657f42335e 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -33,6 +33,8 @@ Xorg_Pre_Include= bsd.xorg.mk
USES+= tar:bzip2
.endif
GNU_CONFIGURE= yes
+# for some reason this makes mkfontscale and others fail in the install target
+#INSTALL_TARGET= install-strip
DIST_SUBDIR= xorg/${XORG_CAT}
MASTER_SITES?= ${MASTER_SITE_XORG}
@@ -82,7 +84,7 @@ PLIST_FILES+= "@comment ${FONTSDIR}/fonts.dir" \
. endif
. if ${XORG_CAT} == "lib"
-USES+= pathfix libtool:keepla
+USES+= pathfix libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile
index 63bf1448eb6c..206b90025506 100644
--- a/devel/gccmakedep/Makefile
+++ b/devel/gccmakedep/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gccmakedep
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= devel
MAINTAINER= x11@FreeBSD.org
diff --git a/devel/gccmakedep/distinfo b/devel/gccmakedep/distinfo
index ceb73ede76f1..e4fda9813dac 100644
--- a/devel/gccmakedep/distinfo
+++ b/devel/gccmakedep/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/gccmakedep-1.0.2.tar.bz2) = 063d49685b1002f3d0b89dfa730e9159f685bd51c277a39fc37b6e377a55ae11
-SIZE (xorg/util/gccmakedep-1.0.2.tar.bz2) = 70490
+SHA256 (xorg/util/gccmakedep-1.0.3.tar.bz2) = b275dcf1f7323ed89e8b36f8fbd5da665d8700005f1779fa5b90a1688bbf2ee4
+SIZE (xorg/util/gccmakedep-1.0.3.tar.bz2) = 104766
diff --git a/devel/gccmakedep/files/patch-gccmdep.cpp b/devel/gccmakedep/files/patch-gccmdep.cpp
deleted file mode 100644
index a5d96fdc95a9..000000000000
--- a/devel/gccmakedep/files/patch-gccmdep.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./gccmdep.cpp.orig 2013-06-28 08:58:38.395121863 +0200
-+++ ./gccmdep.cpp 2013-06-28 08:57:53.213147106 +0200
-@@ -9,7 +9,7 @@
- XCOMM
-
- TMP=mdep$$.tmp
--CC=CCCMD
-+CC=${CC:-CCCMD}
- RM=RMCMD
- LN=LNCMD
- MV=MVCMD
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index e85663078be7..fe04f68743c2 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= imake
-PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTVERSION= 1.0.7
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
index 1ed2131833f1..48c6c3eecccf 100644
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/imake-1.0.6.tar.bz2) = fa8983fdb0a72ba8482d1d2683967fb45c29edd7149b25f619f97ea5a599069d
-SIZE (xorg/util/imake-1.0.6.tar.bz2) = 155571
+SHA256 (xorg/util/imake-1.0.7.tar.bz2) = 690c2c4ac1fad2470a5ea73156cf930b8040dc821a0da4e322014a42c045f37e
+SIZE (xorg/util/imake-1.0.7.tar.bz2) = 156543
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index c65ebb2841a5..5b13434a40c7 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libpciaccess
-PORTVERSION= 0.13.2
-PORTREVISION= 2
+PORTVERSION= 0.13.3
CATEGORIES= devel
MAINTAINER= x11@FreeBSD.org
diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo
index fe63f3a388e6..4fca8ae29d39 100644
--- a/devel/libpciaccess/distinfo
+++ b/devel/libpciaccess/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libpciaccess-0.13.2.tar.bz2) = abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19
-SIZE (xorg/lib/libpciaccess-0.13.2.tar.bz2) = 359231
+SHA256 (xorg/lib/libpciaccess-0.13.3.tar.bz2) = 6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3
+SIZE (xorg/lib/libpciaccess-0.13.3.tar.bz2) = 368755
diff --git a/devel/libpciaccess/files/patch-src-freebsd_pci.c b/devel/libpciaccess/files/patch-src-freebsd_pci.c
index e2fd84651958..d69be780182d 100644
--- a/devel/libpciaccess/files/patch-src-freebsd_pci.c
+++ b/devel/libpciaccess/files/patch-src-freebsd_pci.c
@@ -1,5 +1,5 @@
---- src/freebsd_pci.c.orig 2013-08-14 12:31:57.519923558 +0200
-+++ src/freebsd_pci.c 2013-08-14 12:31:36.809923955 +0200
+--- src/freebsd_pci.c.orig 2015-02-03 23:59:14 UTC
++++ src/freebsd_pci.c
@@ -39,6 +39,11 @@
#include <unistd.h>
#include <fcntl.h>
@@ -23,7 +23,7 @@
/**
* FreeBSD private pci_system structure that extends the base pci_system
* structure.
-@@ -105,12 +114,18 @@
+@@ -105,12 +114,18 @@ pci_device_freebsd_map_range(struct pci_
{
const int prot = ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) != 0)
? (PROT_READ | PROT_WRITE) : PROT_READ;
@@ -42,7 +42,7 @@
if (fd == -1)
return errno;
-@@ -120,6 +135,7 @@
+@@ -120,6 +135,7 @@ pci_device_freebsd_map_range(struct pci_
err = errno;
}
@@ -50,7 +50,7 @@
mrd.mr_base = map->base;
mrd.mr_len = map->size;
strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner));
-@@ -140,6 +156,7 @@
+@@ -140,6 +156,7 @@ pci_device_freebsd_map_range(struct pci_
}
close(fd);
@@ -58,7 +58,7 @@
return err;
}
-@@ -148,6 +165,7 @@
+@@ -148,6 +165,7 @@ static int
pci_device_freebsd_unmap_range( struct pci_device *dev,
struct pci_device_mapping *map )
{
@@ -66,7 +66,7 @@
struct mem_range_desc mrd;
struct mem_range_op mro;
int fd;
-@@ -173,6 +191,7 @@
+@@ -173,6 +191,7 @@ pci_device_freebsd_unmap_range( struct p
fprintf(stderr, "Failed to open /dev/mem\n");
}
}
@@ -74,7 +74,7 @@
return pci_device_generic_unmap_range(dev, map);
}
-@@ -295,7 +314,11 @@
+@@ -295,7 +314,11 @@ pci_device_freebsd_read_rom( struct pci_
}
printf("Using rom_base = 0x%lx\n", (long)rom_base);
@@ -86,7 +86,7 @@
if ( memfd == -1 )
return errno;
-@@ -308,7 +331,9 @@
+@@ -308,7 +331,9 @@ pci_device_freebsd_read_rom( struct pci_
memcpy( buffer, bios, dev->rom_size );
munmap( bios, dev->rom_size );
@@ -96,7 +96,7 @@
if (pci_rom) {
pci_device_cfg_write_u32( dev, PCIR_BIOS, rom );
-@@ -343,7 +368,6 @@
+@@ -343,7 +368,6 @@ pci_device_freebsd_get_num_regions( stru
static int
pci_device_freebsd_probe( struct pci_device * dev )
{
@@ -104,7 +104,7 @@
struct pci_bar_io bar;
uint8_t irq;
int err, i;
-@@ -563,136 +587,152 @@
+@@ -563,138 +587,153 @@ pci_system_freebsd_destroy(void)
freebsd_pci_sys = NULL;
}
@@ -115,7 +115,10 @@
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)
--{
++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);
-
@@ -124,6 +127,7 @@
-
- ret->base = base;
- ret->size = size;
+- ret->is_legacy = 1;
- return ret;
-#elif defined(PCI_MAGIC_IO_RANGE)
- ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
@@ -133,11 +137,8 @@
-
- ret->base = base;
- ret->size = size;
+- ret->is_legacy = 1;
- return ret;
-+pci_device_freebsd_open_legacy_io( struct pci_io_handle *ret,
-+ struct pci_device *dev, pciaddr_t base,
-+ pciaddr_t size )
-+{
+#if defined(__sparc64__)
+ ret->memory = mmap( NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+ screenfd, base );
@@ -150,6 +151,7 @@
#endif
+ ret->base = base;
+ ret->size = size;
++ ret->is_legacy = 1;
+ return ret;
}
@@ -333,7 +335,7 @@
}
static const struct pci_system_methods freebsd_pci_methods = {
-@@ -706,9 +746,7 @@
+@@ -708,9 +747,7 @@ static const struct pci_system_methods f
.write = pci_device_freebsd_write,
.fill_capabilities = pci_fill_capabilities_generic,
.open_legacy_io = pci_device_freebsd_open_legacy_io,
@@ -343,7 +345,7 @@
.read32 = pci_device_freebsd_read32,
.read16 = pci_device_freebsd_read16,
.read8 = pci_device_freebsd_read8,
-@@ -790,3 +828,11 @@
+@@ -792,3 +829,11 @@ pci_system_freebsd_create( void )
return 0;
}
diff --git a/devel/libpciaccess/files/patch-src-pciaccess_private.h b/devel/libpciaccess/files/patch-src-pciaccess_private.h
index 2d9cb99c7123..1e0f2c0010d7 100644
--- a/devel/libpciaccess/files/patch-src-pciaccess_private.h
+++ b/devel/libpciaccess/files/patch-src-pciaccess_private.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/pciaccess_private.h.orig 2015-02-03 23:59:14 UTC
++++ src/pciaccess_private.h
+@@ -185,6 +185,7 @@ extern struct pci_system * pci_sys;
extern int pci_system_linux_sysfs_create( void );
extern int pci_system_freebsd_create( void );
diff --git a/devel/libpciaccess/pkg-plist b/devel/libpciaccess/pkg-plist
index 97c5f03e4d43..1c283a8a1e5f 100644
--- a/devel/libpciaccess/pkg-plist
+++ b/devel/libpciaccess/pkg-plist
@@ -1,6 +1,5 @@
include/pciaccess.h
lib/libpciaccess.a
-lib/libpciaccess.la
lib/libpciaccess.so
lib/libpciaccess.so.0
lib/libpciaccess.so.0.11.1
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index cebf98c46d80..3a48656e2ca5 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libdrm
-PORTVERSION= 2.4.58
-PORTREVISION= 1
+PORTVERSION= 2.4.60
PORTEPOCH= 1
CATEGORIES= graphics x11
MASTER_SITES= http://dri.freedesktop.org/libdrm/
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 1964edeaa388..434e17ba58ef 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdrm-2.4.58.tar.bz2) = b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd
-SIZE (libdrm-2.4.58.tar.bz2) = 573202
+SHA256 (libdrm-2.4.60.tar.bz2) = 99575fc6c8e31f59193f5320fd4db7a5478e2641b5266147caab9aa875b59889
+SIZE (libdrm-2.4.60.tar.bz2) = 581786
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index f11d4a357b72..96ab5faf010b 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -23,6 +23,7 @@ include/libdrm/radeon_drm.h
%%RADEON_DRIVERS%%include/libdrm/radeon_surface.h
include/libdrm/savage_drm.h
include/libdrm/sis_drm.h
+include/libdrm/tegra_drm.h
include/libdrm/via_drm.h
%%KMS%%include/libkms/libkms.h
include/xf86drm.h
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 03c325e6646b..f43e8e9d6897 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mesa-demos
PORTVERSION= 8.2.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/${PORTVERSION}/
@@ -11,13 +12,13 @@ COMMENT= OpenGL demos distributed with Mesa
GNU_CONFIGURE= yes
USES= gmake pkgconfig tar:bzip2
-USE_GL= glew glu glut
+USE_GL= egl glew glu glut
USE_XORG= dri2proto glproto x11 xdamage xext xfixes xi xxf86vm
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS+=--disable-egl --disable-gbm --disable-gles2 \
+CONFIGURE_ARGS+=--disable-gles2 \
--disable-osmesa --disable-vg --disable-wayland \
--with-system-data-files
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index c70cd0e3c4d9..e84acae49bd1 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-input-mouse
-PORTVERSION= 1.9.0
-PORTREVISION= 6
+PORTVERSION= 1.9.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index 00bb525f0db8..900699e0397d 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
-SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
+SHA256 (xorg/driver/xf86-input-mouse-1.9.1.tar.bz2) = 3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce
+SIZE (xorg/driver/xf86-input-mouse-1.9.1.tar.bz2) = 348244
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
index 1996722fd2eb..f4d39fabf24b 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
+++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
@@ -1,5 +1,5 @@
---- src/bsd_mouse.c.orig 2012-10-08 03:40:07.000000000 +0200
-+++ src/bsd_mouse.c 2013-07-03 01:00:50.897361950 +0200
+--- src/bsd_mouse.c.orig 2014-08-12 06:36:34 UTC
++++ src/bsd_mouse.c
@@ -26,6 +26,24 @@
* authorization from the copyright holder(s) and author(s).
*/
@@ -59,7 +59,7 @@
#define HUP_GENERIC_DESKTOP 0x0001
#define HUP_BUTTON 0x0009
-@@ -75,11 +104,13 @@
+@@ -75,11 +104,13 @@ static const char *FindDevice(InputInfoP
#define DEFAULT_MOUSE_DEV "/dev/mouse"
#define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
#define DEFAULT_PS2_DEV "/dev/psm0"
@@ -73,20 +73,16 @@
NULL
};
#elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-@@ -100,7 +131,11 @@
- #if defined(__NetBSD__)
- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
-+ return MSE_SERIAL | MSE_BUS | MSE_PS2 |
-+#ifdef XPS2_SUPPORT
-+ MSE_XPS2 |
-+#endif
-+ MSE_AUTO | MSE_MISC;
+@@ -97,7 +128,7 @@ static const char *mouseDevs[] = {
+ static int
+ SupportedInterfaces(void)
+ {
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__)
++#if defined(__NetBSD__)
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
#else
return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
- #endif
-@@ -180,9 +215,30 @@
+@@ -178,9 +209,30 @@ static struct {
{ MOUSE_PROTO_SYSMOUSE, "SysMouse" }
};
@@ -117,7 +113,7 @@
int i;
mousehw_t hw;
mousemode_t mode;
-@@ -190,7 +246,13 @@
+@@ -188,7 +240,13 @@ SetupAuto(InputInfoPtr pInfo, int *proto
if (pInfo->fd == -1)
return NULL;
@@ -131,7 +127,7 @@
i = 1;
ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
-@@ -209,9 +271,18 @@
+@@ -207,9 +265,18 @@ SetupAuto(InputInfoPtr pInfo, int *proto
protoPara[0] = mode.syncmask[0];
protoPara[1] = mode.syncmask[1];
}
@@ -152,7 +148,7 @@
}
}
}
-@@ -234,41 +305,41 @@
+@@ -232,41 +299,41 @@ SetSysMouseRes(InputInfoPtr pInfo, const
(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
/*
* As the FreeBSD sysmouse driver defaults to protocol level 0
@@ -211,7 +207,7 @@
}
return FALSE;
}
-@@ -276,17 +347,17 @@
+@@ -274,17 +341,17 @@ MousedRunning(void)
static const char *
FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
{
@@ -233,7 +229,7 @@
#endif
} else {
/*
-@@ -295,28 +366,32 @@
+@@ -293,28 +360,32 @@ FindDevice(InputInfoPtr pInfo, const cha
* the test for whether /dev/sysmouse is usable can be made.
*/
if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
@@ -279,7 +275,7 @@
break;
}
}
-@@ -468,30 +543,78 @@
+@@ -486,30 +557,78 @@ wsconsPreInit(InputInfoPtr pInfo, const
#if defined(USBMOUSE_SUPPORT)
@@ -366,7 +362,7 @@
switch (what) {
case DEVICE_INIT:
-@@ -500,38 +623,96 @@
+@@ -518,38 +637,96 @@ usbMouseProc(DeviceIntPtr pPointer, int
for (nbuttons = 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons)
map[nbuttons + 1] = nbuttons + 1;
@@ -486,7 +482,7 @@
}
pMse->lastButtons = 0;
pMse->lastMappedButtons = 0;
-@@ -553,6 +734,7 @@
+@@ -571,6 +748,7 @@ usbMouseProc(DeviceIntPtr pPointer, int
xf86CloseSerial(pInfo->fd);
pInfo->fd = -1;
}
@@ -494,7 +490,7 @@
pPointer->public.on = FALSE;
usleep(300000);
break;
-@@ -568,45 +750,154 @@
+@@ -586,45 +764,154 @@ usbReadInput(InputInfoPtr pInfo)
{
MouseDevPtr pMse;
UsbMsePtr pUsbMse;
@@ -551,11 +547,6 @@
- dy = hid_get_data(pBuf, &pUsbMse->loc_y);
- dz = hid_get_data(pBuf, &pUsbMse->loc_z);
- dw = hid_get_data(pBuf, &pUsbMse->loc_w);
--
-- buttons = 0;
-- for (n = 0; n < pMse->buttons; n++) {
-- if (hid_get_data(pBuf, &pUsbMse->loc_btn[n]))
-- buttons |= (1 << UMS_BUT(n));
+ for (nacol = 0; nacol < pUsbMse->nacols; nacol++) {
+ acol = &pUsbMse->acols[nacol];
+ if (acol->pInfo == NULL)
@@ -565,7 +556,11 @@
+ dx = dy = dz = dw = dp = 0;
+ for (nlcol = 0; nlcol < pUsbMse->acols[nacol].nlcols; nlcol++) {
+ lcol = &acol->lcols[nlcol];
-+
+
+- buttons = 0;
+- for (n = 0; n < pMse->buttons; n++) {
+- if (hid_get_data(pBuf, &pUsbMse->loc_btn[n]))
+- buttons |= (1 << UMS_BUT(n));
+ if (lcol->loc_valid.usage != 0 && rid == lcol->loc_valid.report_ID &&
+ hid_get_data(pBuf, &lcol->loc_valid) == 0)
+ continue;
@@ -671,7 +666,7 @@
}
static void
-@@ -615,14 +906,17 @@
+@@ -633,14 +920,17 @@ usbSigioReadInput (int fd, void *closure
usbReadInput ((InputInfoPtr) closure);
}
@@ -692,7 +687,7 @@
pUsbMse = malloc(sizeof(UsbMseRec));
if (pUsbMse == NULL) {
-@@ -631,12 +925,7 @@
+@@ -649,12 +939,7 @@ usbPreInit(InputInfoPtr pInfo, const cha
return FALSE;
}
@@ -706,7 +701,7 @@
/* Check if the device can be opened. */
pInfo->fd = xf86OpenSerial(pInfo->options);
-@@ -652,19 +941,134 @@
+@@ -670,19 +955,134 @@ usbPreInit(InputInfoPtr pInfo, const cha
}
/* Get USB informations */
reportDesc = hid_get_report_desc(pInfo->fd);
@@ -716,13 +711,6 @@
- xf86Msg(X_ERROR, "Error ioctl USB_GET_REPORT_ID on %s : %s\n",
- pInfo->name, strerror(errno));
- return FALSE;
-- }
-- pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
-- pUsbMse->iid);
--#else
-- pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
-- &pUsbMse->iid);
--#endif
+ mdepth = 0;
+ pUsbMse->nacols = 0;
+ acol = &pUsbMse->acols[pUsbMse->nacols];
@@ -842,7 +830,13 @@
+ default:
+ break;
+ }
-+ }
+ }
+- pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
+- pUsbMse->iid);
+-#else
+- pUsbMse->packetSize = hid_report_size(reportDesc, hid_input,
+- &pUsbMse->iid);
+-#endif
+ if (lcolused)
+ acol->nlcols++;
+ if (acolused)
@@ -854,7 +848,7 @@
/* Allocate buffer */
if (pUsbMse->packetSize <= 8) {
pUsbMse->buffer = pMse->protoBuf;
-@@ -674,56 +1078,129 @@
+@@ -692,56 +1092,129 @@ usbPreInit(InputInfoPtr pInfo, const cha
if (pUsbMse->buffer == NULL) {
xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name);
free(pUsbMse);
@@ -1021,7 +1015,7 @@
/* Setup the local procs. */
pInfo->device_control = usbMouseProc;
pInfo->read_input = usbReadInput;
-@@ -766,7 +1243,9 @@
+@@ -784,7 +1257,9 @@ OSMouseInit(int flags)
p->CheckProtocol = CheckProtocol;
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
p->SetupAuto = SetupAuto;
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
index 5b1c89921ea5..ba7c09e4fe00 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- ./src/Makefile.in.orig 2011-07-05 18:09:54.000000000 +0200
-+++ ./src/Makefile.in 2012-03-02 14:02:43.000000000 +0100
-@@ -279,7 +279,7 @@
+--- src/Makefile.in.orig 2015-03-03 05:17:45 UTC
++++ src/Makefile.in
+@@ -344,7 +344,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
index 27118de48943..d4884b7ad585 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
@@ -1,6 +1,6 @@
---- src/mouse.c.orig 2012-10-08 03:40:07.000000000 +0200
-+++ src/mouse.c 2013-07-03 01:04:45.398343993 +0200
-@@ -280,13 +280,39 @@
+--- src/mouse.c.orig 2014-08-12 06:36:34 UTC
++++ src/mouse.c
+@@ -293,13 +293,39 @@ MouseCommonOptions(InputInfoPtr pInfo)
pMse = pInfo->private;
@@ -41,7 +41,7 @@
pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
"Emulate3Buttons", FALSE);
if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
-@@ -298,6 +324,8 @@
+@@ -311,6 +337,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
"Emulate3Timeout", 50);
if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
MessageType from = X_CONFIG;
@@ -50,7 +50,7 @@
if (pMse->emulate3ButtonsSoft)
from = X_DEFAULT;
xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
-@@ -305,6 +333,8 @@
+@@ -318,6 +346,8 @@ MouseCommonOptions(InputInfoPtr pInfo)
}
pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
@@ -59,7 +59,7 @@
pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
pMse->invX = -1;
-@@ -315,7 +345,7 @@
+@@ -328,7 +358,7 @@ MouseCommonOptions(InputInfoPtr pInfo)
} else
pMse->invY = 1;
pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
@@ -68,7 +68,7 @@
if (pMse->pDragLock)
free(pMse->pDragLock);
-@@ -425,14 +455,17 @@
+@@ -438,14 +468,17 @@ MouseCommonOptions(InputInfoPtr pInfo)
free(s);
}
@@ -88,7 +88,7 @@
pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
msg = xstrdup("X axis");
} else if (!xf86NameCmp(s, "y")) {
-@@ -568,29 +601,6 @@
+@@ -594,29 +627,6 @@ MouseCommonOptions(InputInfoPtr pInfo)
pInfo->name, wheelButton, pMse->wheelInertia,
pMse->wheelButtonTimeout);
}
@@ -118,7 +118,7 @@
if (origButtons != pMse->buttons)
buttons_from = X_CONFIG;
xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
-@@ -668,7 +678,6 @@
+@@ -698,7 +708,6 @@ MouseHWOptions(InputInfoPtr pInfo)
}
pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
@@ -126,7 +126,7 @@
}
static void
-@@ -959,6 +968,8 @@
+@@ -986,6 +995,8 @@ MousePreInit(InputDriverPtr drv, InputIn
/* Default Mapping: 1 2 3 8 9 10 11 ... */
for (i = 0; i < MSE_MAXBUTTONS; i++)
pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
@@ -135,7 +135,7 @@
protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
-@@ -2136,7 +2147,7 @@
+@@ -2181,7 +2192,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int
if (pMse->emulateWheel) {
/* Emulate wheel button handling */
@@ -144,7 +144,7 @@
wheelButtonMask = 0;
else
wheelButtonMask = 1 << (pMse->wheelButton - 1);
-@@ -2220,6 +2231,9 @@
+@@ -2271,6 +2282,9 @@ MouseDoPostEvent(InputInfoPtr pInfo, int
}
}
}
@@ -154,7 +154,7 @@
}
/* Absorb the mouse movement while the wheel button is pressed. */
-@@ -2237,7 +2251,7 @@
+@@ -2288,7 +2302,7 @@ MouseDoPostEvent(InputInfoPtr pInfo, int
if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
buttonTimer(pInfo);
@@ -163,7 +163,7 @@
xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
if (change) {
-@@ -2349,12 +2363,10 @@
+@@ -2401,12 +2415,10 @@ MousePostEvent(InputInfoPtr pInfo, int t
int dx, int dy, int dz, int dw)
{
MouseDevPtr pMse;
@@ -176,7 +176,7 @@
if (pMse->protocolID == PROT_MMHIT)
b = reverseBits(hitachMap, truebuttons);
-@@ -2447,11 +2459,11 @@
+@@ -2499,11 +2511,11 @@ MousePostEvent(InputInfoPtr pInfo, int t
/* Accumulate the scaled dx, dy in the private variables
fracdx,fracdy and return the integer number part */
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
index abb2ac9565b2..2001c5b43698 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
@@ -1,6 +1,6 @@
---- src/mouse.h.orig 2012-07-27 08:10:56.000000000 +0200
-+++ src/mouse.h 2012-07-30 00:41:02.000000000 +0200
-@@ -217,10 +217,13 @@
+--- src/mouse.h.orig 2014-08-12 06:36:34 UTC
++++ src/mouse.h
+@@ -220,10 +220,13 @@ typedef struct _MouseDevRec {
Bool emulate3ButtonsSoft;
int emulate3Timeout;/* Timeout for 3 button emulation */
Bool chordMiddle;
@@ -14,7 +14,7 @@
int negativeZ; /* button mask */
int positiveZ; /* button mask */
int negativeW; /* button mask */
-@@ -259,6 +262,8 @@
+@@ -262,6 +265,8 @@ typedef struct _MouseDevRec {
int doubleClickOldSourceState;
int lastMappedButtons;
int buttonMap[MSE_MAXBUTTONS];
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
index 8abb8c3e83fc..d53173133fa7 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
@@ -1,6 +1,6 @@
---- src/mousePriv.h.orig 2012-07-27 08:10:56.000000000 +0200
-+++ src/mousePriv.h 2012-07-30 00:39:00.000000000 +0200
-@@ -63,8 +63,6 @@
+--- src/mousePriv.h.orig 2014-08-12 06:36:34 UTC
++++ src/mousePriv.h
+@@ -63,8 +63,6 @@ typedef struct {
int acc;
CARD32 pnpLast;
Bool disablePnPauto;
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 064b462ba894..b6e5f64e4c73 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-input-synaptics
-PORTVERSION= 1.7.4
-PORTREVISION= 3
+PORTVERSION= 1.8.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index 47b09f20ac7f..1e3f7c49bbdb 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 56a2d2df7bd39e29f56102c62f153e023f3e9b2f5e255309d33fab8e81945af7
-SIZE (xorg/driver/xf86-input-synaptics-1.7.4.tar.bz2) = 451614
+SHA256 (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80
+SIZE (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 484261
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 1fa29f88a72c..3efba7c01b21 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-video-i740
-PORTVERSION= 1.3.4
-PORTREVISION= 5
+PORTVERSION= 1.3.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
index 1907b7d40e0a..9595d0b8566b 100644
--- a/x11-drivers/xf86-video-i740/distinfo
+++ b/x11-drivers/xf86-video-i740/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
-SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
+SHA256 (xorg/driver/xf86-video-i740-1.3.5.tar.bz2) = 1ce02dd0a11fbf6b43b8bca6663c67149d7d740c8985ae18bd956eddeaffe324
+SIZE (xorg/driver/xf86-video-i740-1.3.5.tar.bz2) = 321050
diff --git a/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c b/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c
deleted file mode 100644
index b35e670aae0e..000000000000
--- a/x11-drivers/xf86-video-i740/files/patch-src_i740__driver.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/i740_driver.c.orig 2012-07-17 04:52:30 UTC
-+++ src/i740_driver.c
-@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
-
- #include "compiler.h"
-
--/* Drivers using the mi implementation of backing store need: */
--
--#include "mibstore.h"
--
- /* All drivers using the vgahw module need this */
- /* This driver needs to be modified to not use vgaHW for multihead operation */
- #include "vgaHW.h"
-@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
- }
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index ded2e09bcb2a..50de347658ea 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-video-mga
-PORTVERSION= 1.6.3
-PORTREVISION= 5
+PORTVERSION= 1.6.4
PORTEPOCH= 3
CATEGORIES= x11-drivers
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
index 69c06dacd5c6..a8fea5b4099d 100644
--- a/x11-drivers/xf86-video-mga/distinfo
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mga-1.6.3.tar.bz2) = 7704b1ea35098769787a9c93e903b827be97a99facfb1696aa5236a58ff1c7d7
-SIZE (xorg/driver/xf86-video-mga-1.6.3.tar.bz2) = 454763
+SHA256 (xorg/driver/xf86-video-mga-1.6.4.tar.bz2) = 48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f
+SIZE (xorg/driver/xf86-video-mga-1.6.4.tar.bz2) = 475858
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 372e4b9acd7b..44934653d1a6 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-video-tdfx
-PORTVERSION= 1.4.5
-PORTREVISION= 7
+PORTVERSION= 1.4.6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo
index c726ba67740a..91a5d711ee9d 100644
--- a/x11-drivers/xf86-video-tdfx/distinfo
+++ b/x11-drivers/xf86-video-tdfx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
-SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.6.tar.bz2) = 3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37
+SIZE (xorg/driver/xf86-video-tdfx-1.4.6.tar.bz2) = 368300
diff --git a/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c b/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c
deleted file mode 100644
index b8f9003c3c55..000000000000
--- a/x11-drivers/xf86-video-tdfx/files/patch-src_tdfx__driver.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/tdfx_driver.c.orig 2012-07-17 05:21:16 UTC
-+++ src/tdfx_driver.c
-@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
-
- #include "compiler.h"
-
--/* Drivers using the mi implementation of backing store need: */
--
--#include "mibstore.h"
--
- /* All drivers using the vgahw module need this */
- /* This driver needs to be modified to not use vgaHW for multihead operation */
- #include "vgaHW.h"
-@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
- }
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 1fb5928e816a..07f5cf1ca3eb 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-video-vmware
-PORTVERSION= 13.0.1
-PORTREVISION= 5
+PORTVERSION= 13.1.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
index 1265b6e3b2e8..da0c9d176441 100644
--- a/x11-drivers/xf86-video-vmware/distinfo
+++ b/x11-drivers/xf86-video-vmware/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
-SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401
+SHA256 (xorg/driver/xf86-video-vmware-13.1.0.tar.bz2) = 3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc
+SIZE (xorg/driver/xf86-video-vmware-13.1.0.tar.bz2) = 459255
diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
index 814a969baa01..46c216607938 100644
--- a/x11-fonts/bdftopcf/Makefile
+++ b/x11-fonts/bdftopcf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bdftopcf
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/bdftopcf/distinfo b/x11-fonts/bdftopcf/distinfo
index 564f7b7c46fc..f67dd64725c2 100644
--- a/x11-fonts/bdftopcf/distinfo
+++ b/x11-fonts/bdftopcf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/bdftopcf-1.0.4.tar.bz2) = eaf59057ba3d7cffe29526562ce50868da7da823487a4cfb3e16946e5ffd2798
-SIZE (xorg/app/bdftopcf-1.0.4.tar.bz2) = 116380
+SHA256 (xorg/app/bdftopcf-1.0.5.tar.bz2) = 38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026
+SIZE (xorg/app/bdftopcf-1.0.5.tar.bz2) = 123291
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
index 3437268f390c..513794998f7a 100644
--- a/x11-fonts/font-util/Makefile
+++ b/x11-fonts/font-util/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= font-util
-PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTVERSION= 1.3.1
MASTER_SITES= XORG/individual/font
+
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-util/distinfo b/x11-fonts/font-util/distinfo
index 0121d288665a..97f4e30bfcce 100644
--- a/x11-fonts/font-util/distinfo
+++ b/x11-fonts/font-util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (font-util-1.3.0.tar.bz2) = dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195
-SIZE (font-util-1.3.0.tar.bz2) = 142059
+SHA256 (font-util-1.3.1.tar.bz2) = aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921
+SIZE (font-util-1.3.1.tar.bz2) = 153289
diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile
index d6860cb2cd79..339b1b53d54b 100644
--- a/x11-fonts/fslsfonts/Makefile
+++ b/x11-fonts/fslsfonts/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fslsfonts
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/fslsfonts/distinfo b/x11-fonts/fslsfonts/distinfo
index c3dfb6c69652..1167ad942227 100644
--- a/x11-fonts/fslsfonts/distinfo
+++ b/x11-fonts/fslsfonts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/fslsfonts-1.0.4.tar.bz2) = a38072eebfd195478ea673ebef33c8df0f6f571c5fe19d85248fe9b532d6921c
-SIZE (xorg/app/fslsfonts-1.0.4.tar.bz2) = 117901
+SHA256 (xorg/app/fslsfonts-1.0.5.tar.bz2) = f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6
+SIZE (xorg/app/fslsfonts-1.0.5.tar.bz2) = 125650
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 249f45c04563..ff0bfedf5daf 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libFS
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libFS/pkg-plist b/x11-fonts/libFS/pkg-plist
index 5943a6c59f50..4440e427820d 100644
--- a/x11-fonts/libFS/pkg-plist
+++ b/x11-fonts/libFS/pkg-plist
@@ -1,7 +1,6 @@
%%DOCSDIR%%/FSlib.txt
include/X11/fonts/FSlib.h
lib/libFS.a
-lib/libFS.la
lib/libFS.so
lib/libFS.so.6
lib/libFS.so.6.0.0
diff --git a/x11-fonts/libXfont/pkg-plist b/x11-fonts/libXfont/pkg-plist
index 899e7cc60e58..5c6871711b1f 100644
--- a/x11-fonts/libXfont/pkg-plist
+++ b/x11-fonts/libXfont/pkg-plist
@@ -14,7 +14,6 @@ include/X11/fonts/ft.h
include/X11/fonts/ftfuncs.h
include/X11/fonts/pcf.h
lib/libXfont.a
-lib/libXfont.la
lib/libXfont.so
lib/libXfont.so.1
lib/libXfont.so.1.4.1
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index 63de4fa32ceb..380014203645 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXfontcache
PORTVERSION= 1.0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libXfontcache/pkg-plist b/x11-fonts/libXfontcache/pkg-plist
index d41b929f295c..5916438bc4d6 100644
--- a/x11-fonts/libXfontcache/pkg-plist
+++ b/x11-fonts/libXfontcache/pkg-plist
@@ -1,5 +1,4 @@
lib/libXfontcache.a
-lib/libXfontcache.la
lib/libXfontcache.so
lib/libXfontcache.so.1
lib/libXfontcache.so.1.0.0
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index fcf9cf4db7ce..cb90b9e434f6 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libXft
PORTVERSION= 2.3.2
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= gnome@FreeBSD.org
@@ -12,6 +13,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
XORG_CAT= lib
USE_XORG= xproto:both xrender
+INSTALL_TARGET= install-strip
post-extract:
@${CP} ${FILESDIR}/xft-config.in \
@@ -24,6 +26,5 @@ post-patch:
post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/xft-config \
${STAGEDIR}${PREFIX}/bin/
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXft.so.2
.include <bsd.port.mk>
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index ecb1cb004adc..814f0c57531e 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -2,7 +2,6 @@ bin/xft-config
include/X11/Xft/Xft.h
include/X11/Xft/XftCompat.h
lib/libXft.a
-lib/libXft.la
lib/libXft.so
lib/libXft.so.2
lib/libXft.so.2.3.2
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index e1e831233188..523d1fae7d30 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libfontenc
PORTVERSION= 1.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libfontenc/pkg-plist b/x11-fonts/libfontenc/pkg-plist
index 47bb3cbf20f5..2b0d7c2451b1 100644
--- a/x11-fonts/libfontenc/pkg-plist
+++ b/x11-fonts/libfontenc/pkg-plist
@@ -1,6 +1,5 @@
include/X11/fonts/fontenc.h
lib/libfontenc.a
-lib/libfontenc.la
lib/libfontenc.so
lib/libfontenc.so.1
lib/libfontenc.so.1.0.0
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 4d14a8a116a7..5a312764f887 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mkfontscale
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo
index e6f13fc5d6cd..06e7278008ef 100644
--- a/x11-fonts/mkfontscale/distinfo
+++ b/x11-fonts/mkfontscale/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/mkfontscale-1.1.1.tar.bz2) = 244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731
-SIZE (xorg/app/mkfontscale-1.1.1.tar.bz2) = 139923
+SHA256 (xorg/app/mkfontscale-1.1.2.tar.bz2) = 8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20
+SIZE (xorg/app/mkfontscale-1.1.2.tar.bz2) = 141728
diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile
index 42fc82c0535c..af653f8c4d64 100644
--- a/x11-fonts/showfont/Makefile
+++ b/x11-fonts/showfont/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= showfont
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/showfont/distinfo b/x11-fonts/showfont/distinfo
index 8fc41b564dfb..c653380d2a8d 100644
--- a/x11-fonts/showfont/distinfo
+++ b/x11-fonts/showfont/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/showfont-1.0.4.tar.bz2) = 36b63fcc1d7a02211146a4875425abca0a6db0d508f6144f6c7b1602077b22a1
-SIZE (xorg/app/showfont-1.0.4.tar.bz2) = 118199
+SHA256 (xorg/app/showfont-1.0.5.tar.bz2) = e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89
+SIZE (xorg/app/showfont-1.0.5.tar.bz2) = 125618
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 2f96d9cfa5fa..c4bba5d99c0e 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xfs
-PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTVERSION= 1.1.4
PORTEPOCH= 1
CATEGORIES= x11-fonts
@@ -25,6 +24,8 @@ post-build:
@cd ${WRKSRC}/config/ && ${MAKE_CMD} config
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.sample
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/fs
+ ${INSTALL_SCRIPT} ${WRKSRC}/config/config \
+ ${STAGEDIR}${PREFIX}/etc/X11/fs/config.sample
.include <bsd.port.mk>
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index 7b7d7f082f70..dd421d54b9d0 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7
-SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076
+SHA256 (xorg/app/xfs-1.1.4.tar.bz2) = a40b75e674c091464f85739292b6bf24e2d153f4a2ac456d3ea6b8a64e269ffa
+SIZE (xorg/app/xfs-1.1.4.tar.bz2) = 239623
diff --git a/x11-fonts/xfs/pkg-install b/x11-fonts/xfs/pkg-install
deleted file mode 100644
index 237026033e3d..000000000000
--- a/x11-fonts/xfs/pkg-install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
- exit 0
-fi
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs
-if [ ! -f ${XINITCONFDIR}/config ]; then
- cp ${XINITCONFDIR}/config.default ${XINITCONFDIR}/config
-fi
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index 6119782e3096..b9f291061dc9 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,3 +1,3 @@
bin/xfs
-man/man1/xfs.1.gz
@sample etc/X11/fs/config.sample
+man/man1/xfs.1.gz
diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile
index e052dcde5150..a834bec4f17f 100644
--- a/x11-fonts/xfsinfo/Makefile
+++ b/x11-fonts/xfsinfo/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xfsinfo
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/xfsinfo/distinfo b/x11-fonts/xfsinfo/distinfo
index ddeef91bf9bd..9c4263d0bdc5 100644
--- a/x11-fonts/xfsinfo/distinfo
+++ b/x11-fonts/xfsinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xfsinfo-1.0.4.tar.bz2) = 407998305428c10715e148f110711c580a48c9a0fe49d7819b89835dc0df2f53
-SIZE (xorg/app/xfsinfo-1.0.4.tar.bz2) = 116055
+SHA256 (xorg/app/xfsinfo-1.0.5.tar.bz2) = d38f4b6db4038f52ba1a09123ef497993194288454c0c13d16debe246f120d8f
+SIZE (xorg/app/xfsinfo-1.0.5.tar.bz2) = 122941
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 3da042767ade..f659b6153deb 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXaw
PORTVERSION= 1.0.12
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index b4d2453b9943..877a34bf3e5c 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -73,12 +73,10 @@ lib/libXaw.so
lib/libXaw.so.6
lib/libXaw.so.7
lib/libXaw6.a
-lib/libXaw6.la
lib/libXaw6.so
lib/libXaw6.so.6
lib/libXaw6.so.6.0.1
lib/libXaw7.a
-lib/libXaw7.la
lib/libXaw7.so
lib/libXaw7.so.7
lib/libXaw7.so.7.0.0
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index edc3cf1d6889..7078cc745645 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXmu
PORTVERSION= 1.1.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXmu/pkg-plist b/x11-toolkits/libXmu/pkg-plist
index 4bc579a6620a..242030ed1c61 100644
--- a/x11-toolkits/libXmu/pkg-plist
+++ b/x11-toolkits/libXmu/pkg-plist
@@ -22,12 +22,10 @@ include/X11/Xmu/WinUtil.h
include/X11/Xmu/Xct.h
include/X11/Xmu/Xmu.h
lib/libXmu.a
-lib/libXmu.la
lib/libXmu.so
lib/libXmu.so.6
lib/libXmu.so.6.2.0
lib/libXmuu.a
-lib/libXmuu.la
lib/libXmuu.so
lib/libXmuu.so.1
lib/libXmuu.so.1.0.0
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 58d3d54cfa38..0c27a48c1dbf 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXt
PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist
index 09fd7ff69cc6..b1fd16904580 100644
--- a/x11-toolkits/libXt/pkg-plist
+++ b/x11-toolkits/libXt/pkg-plist
@@ -32,7 +32,6 @@ include/X11/Vendor.h
include/X11/VendorP.h
include/X11/Xtos.h
lib/libXt.a
-lib/libXt.la
lib/libXt.so
lib/libXt.so.6
lib/libXt.so.6.0.0
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 10e8085c4728..6c7aa99af40f 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bitmap
-PORTVERSION= 1.0.7
+PORTVERSION= 1.0.8
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bitmap/distinfo b/x11/bitmap/distinfo
index fbb5a455916d..ec539e6d0d63 100644
--- a/x11/bitmap/distinfo
+++ b/x11/bitmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/bitmap-1.0.7.tar.bz2) = 7ea2823a930ddfe3bfc0c7fbb16a5b463222edf05284c5cdc40a6d3c5c3988af
-SIZE (xorg/app/bitmap-1.0.7.tar.bz2) = 169437
+SHA256 (xorg/app/bitmap-1.0.8.tar.bz2) = 806cdeb80f5466ba9121e8cc6c6af82d3e4b32ef1a57bc5a76c15887640ec35d
+SIZE (xorg/app/bitmap-1.0.8.tar.bz2) = 177558
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index 23f980033424..e256cdd11151 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fstobdf
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo
index 81014c497d2c..34a2ed2df93b 100644
--- a/x11/fstobdf/distinfo
+++ b/x11/fstobdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8
-SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822
+SHA256 (xorg/app/fstobdf-1.0.6.tar.bz2) = 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e
+SIZE (xorg/app/fstobdf-1.0.6.tar.bz2) = 127170
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 9d291633a646..0b371696c013 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= iceauth
-PORTVERSION= 1.0.6
+PORTVERSION= 1.0.7
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo
index 0cef59e2d307..1a41349d6dd0 100644
--- a/x11/iceauth/distinfo
+++ b/x11/iceauth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/iceauth-1.0.6.tar.bz2) = bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4
-SIZE (xorg/app/iceauth-1.0.6.tar.bz2) = 133531
+SHA256 (xorg/app/iceauth-1.0.7.tar.bz2) = 1216af2dee99b318fcf8bf9a259915273bcb37a7f1e7859af4f15d0ebf6f3f0a
+SIZE (xorg/app/iceauth-1.0.7.tar.bz2) = 135656
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 369442b0a138..9a276bad2dc1 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libICE
PORTVERSION= 1.0.9
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libICE/pkg-plist b/x11/libICE/pkg-plist
index 91a0bed34ca1..fb9ad543e9cc 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -5,7 +5,6 @@ include/X11/ICE/ICEmsg.h
include/X11/ICE/ICEproto.h
include/X11/ICE/ICEutil.h
lib/libICE.a
-lib/libICE.la
lib/libICE.so
lib/libICE.so.6
lib/libICE.so.6.3.0
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index caf24c7a7d55..1c143317328b 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libSM
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libSM/pkg-plist b/x11/libSM/pkg-plist
index 06c1f304b654..341fb8f8ca53 100644
--- a/x11/libSM/pkg-plist
+++ b/x11/libSM/pkg-plist
@@ -2,7 +2,6 @@ include/X11/SM/SM.h
include/X11/SM/SMlib.h
include/X11/SM/SMproto.h
lib/libSM.a
-lib/libSM.la
lib/libSM.so
lib/libSM.so.6
lib/libSM.so.6.0.1
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index a9de15231b07..756a8958ee8b 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libX11
PORTVERSION= 1.6.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index 59b6fd37c0bf..1d650da7aec1 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -196,12 +196,10 @@ lib/X11/locale/zh_TW/Compose
lib/X11/locale/zh_TW/XI18N_OBJS
lib/X11/locale/zh_TW/XLC_LOCALE
lib/libX11-xcb.a
-lib/libX11-xcb.la
lib/libX11-xcb.so
lib/libX11-xcb.so.1
lib/libX11-xcb.so.1.0.0
lib/libX11.a
-lib/libX11.la
lib/libX11.so
lib/libX11.so.6
lib/libX11.so.6.3.0
@@ -323,6 +321,7 @@ man/man3/XCloseIM.3.gz
man/man3/XCloseOM.3.gz
man/man3/XColor.3.gz
man/man3/XColormapEvent.3.gz
+man/man3/XCompose.3.gz
man/man3/XConfigureEvent.3.gz
man/man3/XConfigureRequestEvent.3.gz
man/man3/XConfigureWindow.3.gz
@@ -330,7 +329,6 @@ man/man3/XContextDependentDrawing.3.gz
man/man3/XContextualDrawing.3.gz
man/man3/XConvertCase.3.gz
man/man3/XConvertSelection.3.gz
-man/man3/XCompose.3.gz
man/man3/XCopyArea.3.gz
man/man3/XCopyColormapAndFree.3.gz
man/man3/XCopyGC.3.gz
@@ -389,8 +387,6 @@ man/man3/XDrawText16.3.gz
man/man3/XEmptyRegion.3.gz
man/man3/XEnableAccessControl.3.gz
man/man3/XEqualRegion.3.gz
-man/man3/XkbGetDetectableAutoRepeat.3.gz
-man/man3/XkbSetDetectableAutoRepeat.3.gz
man/man3/XErrorEvent.3.gz
man/man3/XEvent.3.gz
man/man3/XEventsQueued.3.gz
@@ -436,9 +432,9 @@ man/man3/XGetAtomName.3.gz
man/man3/XGetAtomNames.3.gz
man/man3/XGetClassHint.3.gz
man/man3/XGetCommand.3.gz
-man/man3/XGetEventData.3.gz
man/man3/XGetErrorDatabaseText.3.gz
man/man3/XGetErrorText.3.gz
+man/man3/XGetEventData.3.gz
man/man3/XGetFontPath.3.gz
man/man3/XGetFontProperty.3.gz
man/man3/XGetGCValues.3.gz
@@ -461,7 +457,6 @@ man/man3/XGetPointerMapping.3.gz
man/man3/XGetRGBColormaps.3.gz
man/man3/XGetScreenSaver.3.gz
man/man3/XGetSelectionOwner.3.gz
-man/man3/XSetEventQueueOwner.3.gz
man/man3/XGetSubImage.3.gz
man/man3/XGetTextProperty.3.gz
man/man3/XGetTransientForHint.3.gz
@@ -615,6 +610,7 @@ man/man3/XSetCloseDownMode.3.gz
man/man3/XSetCommand.3.gz
man/man3/XSetDashes.3.gz
man/man3/XSetErrorHandler.3.gz
+man/man3/XSetEventQueueOwner.3.gz
man/man3/XSetFillRule.3.gz
man/man3/XSetFillStyle.3.gz
man/man3/XSetFont.3.gz
@@ -766,12 +762,12 @@ man/man3/XkbActionCtrls.3.gz
man/man3/XkbAddDeviceLedInfo.3.gz
man/man3/XkbAddGeomColor.3.gz
man/man3/XkbAddGeomDoodad.3.gz
-man/man3/XkbAddGeomKeyAlias.3.gz
man/man3/XkbAddGeomKey.3.gz
+man/man3/XkbAddGeomKeyAlias.3.gz
man/man3/XkbAddGeomOutline.3.gz
+man/man3/XkbAddGeomOverlay.3.gz
man/man3/XkbAddGeomOverlayKey.3.gz
man/man3/XkbAddGeomOverlayRow.3.gz
-man/man3/XkbAddGeomOverlay.3.gz
man/man3/XkbAddGeomProperty.3.gz
man/man3/XkbAddGeomRow.3.gz
man/man3/XkbAddGeomSection.3.gz
@@ -784,7 +780,6 @@ man/man3/XkbAllocDeviceInfo.3.gz
man/man3/XkbAllocDeviceLedInfo.3.gz
man/man3/XkbAllocGeomColors.3.gz
man/man3/XkbAllocGeomDoodads.3.gz
-man/man3/XkbAllocGeometry.3.gz
man/man3/XkbAllocGeomKeyAliases.3.gz
man/man3/XkbAllocGeomKeys.3.gz
man/man3/XkbAllocGeomOutlines.3.gz
@@ -797,21 +792,29 @@ man/man3/XkbAllocGeomRows.3.gz
man/man3/XkbAllocGeomSectionDoodads.3.gz
man/man3/XkbAllocGeomSections.3.gz
man/man3/XkbAllocGeomShapes.3.gz
+man/man3/XkbAllocGeometry.3.gz
man/man3/XkbAllocIndicatorMaps.3.gz
man/man3/XkbAllocKeyboard.3.gz
man/man3/XkbAllocNames.3.gz
man/man3/XkbAllocServerMap.3.gz
man/man3/XkbApplyCompatMapToKey.3.gz
-man/man3/XkbBellEvent.3.gz
man/man3/XkbBell.3.gz
+man/man3/XkbBellEvent.3.gz
+man/man3/XkbChangeControls.3.gz
+man/man3/XkbChangeDeviceInfo.3.gz
+man/man3/XkbChangeEnabledControls.3.gz
+man/man3/XkbChangeIndicators.3.gz
+man/man3/XkbChangeMap.3.gz
+man/man3/XkbChangeNames.3.gz
+man/man3/XkbChangeTypesOfKey.3.gz
man/man3/XkbComputeRowBounds.3.gz
man/man3/XkbComputeSectionBounds.3.gz
man/man3/XkbComputeShapeBounds.3.gz
man/man3/XkbComputeShapeTop.3.gz
-man/man3/XkbCopyKeyTypes.3.gz
man/man3/XkbCopyKeyType.3.gz
-man/man3/XkbDeviceBellEvent.3.gz
+man/man3/XkbCopyKeyTypes.3.gz
man/man3/XkbDeviceBell.3.gz
+man/man3/XkbDeviceBellEvent.3.gz
man/man3/XkbFindOverlayForKey.3.gz
man/man3/XkbForceBell.3.gz
man/man3/XkbForceDeviceBell.3.gz
@@ -822,7 +825,6 @@ man/man3/XkbFreeControls.3.gz
man/man3/XkbFreeDeviceInfo.3.gz
man/man3/XkbFreeGeomColors.3.gz
man/man3/XkbFreeGeomDoodads.3.gz
-man/man3/XkbFreeGeometry.3.gz
man/man3/XkbFreeGeomKeyAliases.3.gz
man/man3/XkbFreeGeomKeys.3.gz
man/man3/XkbFreeGeomOutlines.3.gz
@@ -834,6 +836,7 @@ man/man3/XkbFreeGeomProperties.3.gz
man/man3/XkbFreeGeomRows.3.gz
man/man3/XkbFreeGeomSections.3.gz
man/man3/XkbFreeGeomShapes.3.gz
+man/man3/XkbFreeGeometry.3.gz
man/man3/XkbFreeIndicatorMaps.3.gz
man/man3/XkbFreeKeyboard.3.gz
man/man3/XkbFreeNames.3.gz
@@ -843,11 +846,12 @@ man/man3/XkbGetAutoRepeatRate.3.gz
man/man3/XkbGetAutoResetControls.3.gz
man/man3/XkbGetBounceKeysDelay.3.gz
man/man3/XkbGetCompatMap.3.gz
-man/man3/XkbGetControlsChanges.3.gz
man/man3/XkbGetControls.3.gz
+man/man3/XkbGetControlsChanges.3.gz
+man/man3/XkbGetDetectableAutoRepeat.3.gz
man/man3/XkbGetDeviceButtonActions.3.gz
-man/man3/XkbGetDeviceInfoChanges.3.gz
man/man3/XkbGetDeviceInfo.3.gz
+man/man3/XkbGetDeviceInfoChanges.3.gz
man/man3/XkbGetDeviceLedInfo.3.gz
man/man3/XkbGetGeometry.3.gz
man/man3/XkbGetIndicatorChanges.3.gz
@@ -855,17 +859,17 @@ man/man3/XkbGetIndicatorMap.3.gz
man/man3/XkbGetIndicatorState.3.gz
man/man3/XkbGetKeyActions.3.gz
man/man3/XkbGetKeyBehaviors.3.gz
-man/man3/XkbGetKeyboardByName.3.gz
-man/man3/XkbGetKeyboard.3.gz
man/man3/XkbGetKeyExplicitComponents.3.gz
man/man3/XkbGetKeyModifierMap.3.gz
man/man3/XkbGetKeySyms.3.gz
man/man3/XkbGetKeyTypes.3.gz
man/man3/XkbGetKeyVirtualModMap.3.gz
+man/man3/XkbGetKeyboard.3.gz
+man/man3/XkbGetKeyboardByName.3.gz
man/man3/XkbGetMap.3.gz
+man/man3/XkbGetNameChanges.3.gz
man/man3/XkbGetNamedGeometry.3.gz
man/man3/XkbGetNamedIndicator.3.gz
-man/man3/XkbGetNameChanges.3.gz
man/man3/XkbGetNames.3.gz
man/man3/XkbGetSlowKeysDelay.3.gz
man/man3/XkbGetState.3.gz
@@ -873,22 +877,14 @@ man/man3/XkbGetStickyKeysOptions.3.gz
man/man3/XkbGetUpdatedMap.3.gz
man/man3/XkbGetVirtualMods.3.gz
man/man3/XkbGetXlibControls.3.gz
-man/man3/XkbChangeControls.3.gz
-man/man3/XkbChangeDeviceInfo.3.gz
-man/man3/XkbChangeEnabledControls.3.gz
-man/man3/XkbChangeIndicators.3.gz
-man/man3/XkbChangeMap.3.gz
-man/man3/XkbChangeNames.3.gz
-man/man3/XkbChangeTypesOfKey.3.gz
man/man3/XkbIgnoreExtension.3.gz
man/man3/XkbInitCanonicalKeyTypes.3.gz
+man/man3/XkbKeyAction.3.gz
man/man3/XkbKeyActionEntry.3.gz
man/man3/XkbKeyActionsPtr.3.gz
-man/man3/XkbKeyAction.3.gz
-man/man3/XkbKeycodeToKeysym.3.gz
man/man3/XkbKeyGroupInfo.3.gz
-man/man3/XkbKeyGroupsWidth.3.gz
man/man3/XkbKeyGroupWidth.3.gz
+man/man3/XkbKeyGroupsWidth.3.gz
man/man3/XkbKeyHasActions.3.gz
man/man3/XkbKeyNumActions.3.gz
man/man3/XkbKeyNumGroups.3.gz
@@ -896,10 +892,11 @@ man/man3/XkbKeyNumSyms.3.gz
man/man3/XkbKeySymEntry.3.gz
man/man3/XkbKeySymsOffset.3.gz
man/man3/XkbKeySymsPtr.3.gz
-man/man3/XkbKeysymToModifiers.3.gz
+man/man3/XkbKeyType.3.gz
man/man3/XkbKeyTypeIndex.3.gz
man/man3/XkbKeyTypesForCoreSymbols.3.gz
-man/man3/XkbKeyType.3.gz
+man/man3/XkbKeycodeToKeysym.3.gz
+man/man3/XkbKeysymToModifiers.3.gz
man/man3/XkbLatchGroup.3.gz
man/man3/XkbLatchModifiers.3.gz
man/man3/XkbLibraryVersion.3.gz
@@ -927,10 +924,10 @@ man/man3/XkbResizeKeyType.3.gz
man/man3/XkbSAActionSetCtrls.3.gz
man/man3/XkbSAGroup.3.gz
man/man3/XkbSAPtrDfltValue.3.gz
-man/man3/XkbSARedirectSetVModsMask.3.gz
man/man3/XkbSARedirectSetVMods.3.gz
-man/man3/XkbSARedirectVModsMask.3.gz
+man/man3/XkbSARedirectSetVModsMask.3.gz
man/man3/XkbSARedirectVMods.3.gz
+man/man3/XkbSARedirectVModsMask.3.gz
man/man3/XkbSAScreen.3.gz
man/man3/XkbSASetGroup.3.gz
man/man3/XkbSASetPtrDfltValue.3.gz
@@ -944,6 +941,7 @@ man/man3/XkbSetBounceKeysDelay.3.gz
man/man3/XkbSetCompatMap.3.gz
man/man3/XkbSetControls.3.gz
man/man3/XkbSetDebuggingFlags.3.gz
+man/man3/XkbSetDetectableAutoRepeat.3.gz
man/man3/XkbSetDeviceButtonActions.3.gz
man/man3/XkbSetDeviceInfo.3.gz
man/man3/XkbSetIgnoreLockMods.3.gz
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 62ad47ce731d..e3eae3e35bec 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXScrnSaver
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist
index 851b6d1a9b90..e0e7c2e60b83 100644
--- a/x11/libXScrnSaver/pkg-plist
+++ b/x11/libXScrnSaver/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/scrnsaver.h
lib/libXss.a
-lib/libXss.la
lib/libXss.so
lib/libXss.so.1
lib/libXss.so.1.0.0
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index 7310d43d3054..b8719a8a09d8 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXTrap
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXTrap/pkg-plist b/x11/libXTrap/pkg-plist
index e7974e19e43c..c4a41c7b9b37 100644
--- a/x11/libXTrap/pkg-plist
+++ b/x11/libXTrap/pkg-plist
@@ -1,5 +1,4 @@
lib/libXTrap.a
-lib/libXTrap.la
lib/libXTrap.so
lib/libXTrap.so.6
lib/libXTrap.so.6.4.0
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 68cc026b063c..70de089b59c5 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXau
PORTVERSION= 1.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/pkg-plist b/x11/libXau/pkg-plist
index 6d3b5383dbd0..97448c474d51 100644
--- a/x11/libXau/pkg-plist
+++ b/x11/libXau/pkg-plist
@@ -1,6 +1,5 @@
include/X11/Xauth.h
lib/libXau.a
-lib/libXau.la
lib/libXau.so
lib/libXau.so.6
lib/libXau.so.6.0.0
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 5a6699d3c8cd..84e0bac2d601 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXcomposite
PORTVERSION= 0.4.4
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcomposite/pkg-plist b/x11/libXcomposite/pkg-plist
index 3af38cd28219..cade517092b1 100644
--- a/x11/libXcomposite/pkg-plist
+++ b/x11/libXcomposite/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/Xcomposite.h
lib/libXcomposite.a
-lib/libXcomposite.la
lib/libXcomposite.so
lib/libXcomposite.so.1
lib/libXcomposite.so.1.0.0
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 42f3894e86f8..bbb1645f0065 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXcursor
PORTVERSION= 1.1.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXcursor/pkg-plist b/x11/libXcursor/pkg-plist
index 3b751098efb2..4db82551d947 100644
--- a/x11/libXcursor/pkg-plist
+++ b/x11/libXcursor/pkg-plist
@@ -1,6 +1,5 @@
include/X11/Xcursor/Xcursor.h
lib/libXcursor.a
-lib/libXcursor.la
lib/libXcursor.so
lib/libXcursor.so.1
lib/libXcursor.so.1.0.2
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index bc61501e5550..96f204764207 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXdamage
PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/pkg-plist b/x11/libXdamage/pkg-plist
index 5535a0611c16..6de17c670b8d 100644
--- a/x11/libXdamage/pkg-plist
+++ b/x11/libXdamage/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/Xdamage.h
lib/libXdamage.a
-lib/libXdamage.la
lib/libXdamage.so
lib/libXdamage.so.1
lib/libXdamage.so.1.1.0
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index fb4a51a2dff6..25ef59bf41fe 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libXdmcp
-PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTVERSION= 1.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index 0f4a04b8d477..419a74f2fd71 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
-SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878
+SHA256 (xorg/lib/libXdmcp-1.1.2.tar.bz2) = 81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2
+SIZE (xorg/lib/libXdmcp-1.1.2.tar.bz2) = 331518
diff --git a/x11/libXdmcp/pkg-plist b/x11/libXdmcp/pkg-plist
index 2303160def29..0fc7f2372038 100644
--- a/x11/libXdmcp/pkg-plist
+++ b/x11/libXdmcp/pkg-plist
@@ -1,6 +1,5 @@
include/X11/Xdmcp.h
lib/libXdmcp.a
-lib/libXdmcp.la
lib/libXdmcp.so
lib/libXdmcp.so.6
lib/libXdmcp.so.6.0.0
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index 5f3b2abcaaae..63e6b101174f 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXevie
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXevie/pkg-plist b/x11/libXevie/pkg-plist
index bff99fce9225..c2e3a0a1885f 100644
--- a/x11/libXevie/pkg-plist
+++ b/x11/libXevie/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/Xevie.h
lib/libXevie.a
-lib/libXevie.la
lib/libXevie.so
lib/libXevie.so.1
lib/libXevie.so.1.0.0
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 190f616f07bd..6e4481d3e8bc 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXext
PORTVERSION= 1.3.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index b234e43301f5..08063a290e03 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -1,8 +1,3 @@
-lib/libXext.a
-lib/libXext.la
-lib/libXext.so
-lib/libXext.so.6
-lib/libXext.so.6.4.0
include/X11/extensions/MITMisc.h
include/X11/extensions/XEVI.h
include/X11/extensions/XLbx.h
@@ -19,6 +14,10 @@ include/X11/extensions/security.h
include/X11/extensions/shape.h
include/X11/extensions/sync.h
include/X11/extensions/xtestext1.h
+lib/libXext.a
+lib/libXext.so
+lib/libXext.so.6
+lib/libXext.so.6.4.0
libdata/pkgconfig/xext.pc
man/man3/DBE.3.gz
man/man3/DPMSCapable.3.gz
@@ -42,6 +41,17 @@ man/man3/XShapeQueryExtension.3.gz
man/man3/XShapeQueryExtents.3.gz
man/man3/XShapeQueryVersion.3.gz
man/man3/XShapeSelectInput.3.gz
+man/man3/XShm.3.gz
+man/man3/XShmAttach.3.gz
+man/man3/XShmCreateImage.3.gz
+man/man3/XShmCreatePixmap.3.gz
+man/man3/XShmDetach.3.gz
+man/man3/XShmGetEventBase.3.gz
+man/man3/XShmGetImage.3.gz
+man/man3/XShmPixmapFormat.3.gz
+man/man3/XShmPutImage.3.gz
+man/man3/XShmQueryExtension.3.gz
+man/man3/XShmQueryVersion.3.gz
man/man3/XcupGetReservedColormapEntries.3.gz
man/man3/XcupQueryVersion.3.gz
man/man3/XcupStoreColors.3.gz
@@ -70,14 +80,3 @@ man/man3/XmbufGetScreenInfo.3.gz
man/man3/XmbufGetVersion.3.gz
man/man3/XmbufGetWindowAttributes.3.gz
man/man3/XmbufQueryExtension.3.gz
-man/man3/XShm.3.gz
-man/man3/XShmAttach.3.gz
-man/man3/XShmCreateImage.3.gz
-man/man3/XShmCreatePixmap.3.gz
-man/man3/XShmDetach.3.gz
-man/man3/XShmGetEventBase.3.gz
-man/man3/XShmGetImage.3.gz
-man/man3/XShmPixmapFormat.3.gz
-man/man3/XShmPutImage.3.gz
-man/man3/XShmQueryExtension.3.gz
-man/man3/XShmQueryVersion.3.gz
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index a75917d5e56c..e8650823a9d9 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXfixes
PORTVERSION= 5.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXfixes/pkg-plist b/x11/libXfixes/pkg-plist
index 13ff3a02fe6c..a7a44ecac185 100644
--- a/x11/libXfixes/pkg-plist
+++ b/x11/libXfixes/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/Xfixes.h
lib/libXfixes.a
-lib/libXfixes.la
lib/libXfixes.so
lib/libXfixes.so.3
lib/libXfixes.so.3.1.0
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index ea6e66cdcc83..c82224e27dab 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libXi
PORTVERSION= 1.7.4
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXi/pkg-plist b/x11/libXi/pkg-plist
index 2af238ea8f77..ed1768e22e07 100644
--- a/x11/libXi/pkg-plist
+++ b/x11/libXi/pkg-plist
@@ -1,7 +1,6 @@
include/X11/extensions/XInput.h
include/X11/extensions/XInput2.h
lib/libXi.a
-lib/libXi.la
lib/libXi.so
lib/libXi.so.6
lib/libXi.so.6.1.0
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 011edd366142..3d7703a526bd 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXinerama
PORTVERSION= 1.1.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist
index 0ffc39fe9723..51374c5df11c 100644
--- a/x11/libXinerama/pkg-plist
+++ b/x11/libXinerama/pkg-plist
@@ -1,7 +1,6 @@
include/X11/extensions/Xinerama.h
include/X11/extensions/panoramiXext.h
lib/libXinerama.a
-lib/libXinerama.la
lib/libXinerama.so
lib/libXinerama.so.1
lib/libXinerama.so.1.0.0
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index ea1431d035f3..5296745c586e 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libXp
-PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTVERSION= 1.0.3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXp/distinfo b/x11/libXp/distinfo
index 239c5d11e166..8a1857d33def 100644
--- a/x11/libXp/distinfo
+++ b/x11/libXp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXp-1.0.2.tar.bz2) = 952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5
-SIZE (xorg/lib/libXp-1.0.2.tar.bz2) = 298632
+SHA256 (xorg/lib/libXp-1.0.3.tar.bz2) = 7f360c9905849c3587d48efc0f0ecbc852c19f61a52b18530d6b005cb9148c57
+SIZE (xorg/lib/libXp-1.0.3.tar.bz2) = 316717
diff --git a/x11/libXp/pkg-plist b/x11/libXp/pkg-plist
index 022aae957dfe..61b82f96af0e 100644
--- a/x11/libXp/pkg-plist
+++ b/x11/libXp/pkg-plist
@@ -1,5 +1,4 @@
lib/libXp.a
-lib/libXp.la
lib/libXp.so
lib/libXp.so.6
lib/libXp.so.6.2.0
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 6fc4dd8f4859..0f1b27dbd779 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXpm
PORTVERSION= 3.5.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXpm/pkg-plist b/x11/libXpm/pkg-plist
index 3c207b0b0d92..1bbacdbf5140 100644
--- a/x11/libXpm/pkg-plist
+++ b/x11/libXpm/pkg-plist
@@ -2,7 +2,6 @@ bin/cxpm
bin/sxpm
include/X11/xpm.h
lib/libXpm.a
-lib/libXpm.la
lib/libXpm.so
lib/libXpm.so.4
lib/libXpm.so.4.11.0
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
index 9ff7451e9626..c3261174c5bc 100644
--- a/x11/libXprintAppUtil/Makefile
+++ b/x11/libXprintAppUtil/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXprintAppUtil
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXprintAppUtil/pkg-plist b/x11/libXprintAppUtil/pkg-plist
index 728cfa2d9566..5ab582e1b0a5 100644
--- a/x11/libXprintAppUtil/pkg-plist
+++ b/x11/libXprintAppUtil/pkg-plist
@@ -1,6 +1,5 @@
include/X11/XprintAppUtil/xpapputil.h
lib/libXprintAppUtil.a
-lib/libXprintAppUtil.la
lib/libXprintAppUtil.so
lib/libXprintAppUtil.so.1
lib/libXprintAppUtil.so.1.0.0
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index 6021a9e4df72..17032585fa6b 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXprintUtil
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXprintUtil/pkg-plist b/x11/libXprintUtil/pkg-plist
index 4b11dbdfa39c..bec9bec05250 100644
--- a/x11/libXprintUtil/pkg-plist
+++ b/x11/libXprintUtil/pkg-plist
@@ -1,6 +1,5 @@
include/X11/XprintUtil/xprintutil.h
lib/libXprintUtil.a
-lib/libXprintUtil.la
lib/libXprintUtil.so
lib/libXprintUtil.so.1
lib/libXprintUtil.so.1.0.0
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 94317578be07..50ad938023e6 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXrandr
PORTVERSION= 1.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrandr/pkg-plist b/x11/libXrandr/pkg-plist
index ba615ccde6c6..a3dec325b6ad 100644
--- a/x11/libXrandr/pkg-plist
+++ b/x11/libXrandr/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/Xrandr.h
lib/libXrandr.a
-lib/libXrandr.la
lib/libXrandr.so
lib/libXrandr.so.2
lib/libXrandr.so.2.2.0
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index ddb2ed1f82bd..8d2935707906 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXrender
PORTVERSION= 0.9.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrender/pkg-plist b/x11/libXrender/pkg-plist
index 7baa71f3f4e0..974c8a416f54 100644
--- a/x11/libXrender/pkg-plist
+++ b/x11/libXrender/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/Xrender.h
lib/libXrender.a
-lib/libXrender.la
lib/libXrender.so
lib/libXrender.so.1
lib/libXrender.so.1.3.0
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 1db07b816f2d..37c9e47cb045 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXres
PORTVERSION= 1.0.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXres/pkg-plist b/x11/libXres/pkg-plist
index 274c23b9bbc6..df7ceefa1b31 100644
--- a/x11/libXres/pkg-plist
+++ b/x11/libXres/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/XRes.h
lib/libXRes.a
-lib/libXRes.la
lib/libXRes.so
lib/libXRes.so.1
lib/libXRes.so.1.0.0
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 6a5317b07b18..45bafff222c5 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXtst
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
index e1d987452c27..e89a7a496393 100644
--- a/x11/libXtst/pkg-plist
+++ b/x11/libXtst/pkg-plist
@@ -1,7 +1,6 @@
include/X11/extensions/XTest.h
include/X11/extensions/record.h
lib/libXtst.a
-lib/libXtst.la
lib/libXtst.so
lib/libXtst.so.6
lib/libXtst.so.6.1.0
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index be85e5926117..a5c69abb2cfc 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXv
PORTVERSION= 1.0.10
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXv/pkg-plist b/x11/libXv/pkg-plist
index eef7faf1d432..8e9c51090b63 100644
--- a/x11/libXv/pkg-plist
+++ b/x11/libXv/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/Xvlib.h
lib/libXv.a
-lib/libXv.la
lib/libXv.so
lib/libXv.so.1
lib/libXv.so.1.0.0
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 92357b0e670c..6fab6f6cdbb3 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libXvMC
-PORTVERSION= 1.0.8
-PORTREVISION= 2
+PORTVERSION= 1.0.9
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo
index 227375618f80..0a17c02530cd 100644
--- a/x11/libXvMC/distinfo
+++ b/x11/libXvMC/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXvMC-1.0.8.tar.bz2) = 5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204
-SIZE (xorg/lib/libXvMC-1.0.8.tar.bz2) = 305234
+SHA256 (xorg/lib/libXvMC-1.0.9.tar.bz2) = 0703d7dff6ffc184f1735ca5d4eb9dbb402b522e08e008f2f96aee16c40a5756
+SIZE (xorg/lib/libXvMC-1.0.9.tar.bz2) = 312777
diff --git a/x11/libXvMC/pkg-plist b/x11/libXvMC/pkg-plist
index a7c104ffb971..54ebf75fdefc 100644
--- a/x11/libXvMC/pkg-plist
+++ b/x11/libXvMC/pkg-plist
@@ -1,11 +1,9 @@
include/X11/extensions/XvMClib.h
lib/libXvMC.a
-lib/libXvMC.la
lib/libXvMC.so
lib/libXvMC.so.1
lib/libXvMC.so.1.0.0
lib/libXvMCW.a
-lib/libXvMCW.la
lib/libXvMCW.so
lib/libXvMCW.so.1
lib/libXvMCW.so.1.0.0
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index 4229ec63de73..038aa6a62f4f 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86dga
PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist
index 87bfc54fc733..b49f9fa21af7 100644
--- a/x11/libXxf86dga/pkg-plist
+++ b/x11/libXxf86dga/pkg-plist
@@ -1,7 +1,6 @@
include/X11/extensions/Xxf86dga.h
include/X11/extensions/xf86dga1.h
lib/libXxf86dga.a
-lib/libXxf86dga.la
lib/libXxf86dga.so
lib/libXxf86dga.so.1
lib/libXxf86dga.so.1.0.0
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index dffd60f7ff8f..ec8b65b5388a 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86misc
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86misc/pkg-plist b/x11/libXxf86misc/pkg-plist
index 893a2ff7345e..0c6afaf2e331 100644
--- a/x11/libXxf86misc/pkg-plist
+++ b/x11/libXxf86misc/pkg-plist
@@ -1,5 +1,4 @@
lib/libXxf86misc.a
-lib/libXxf86misc.la
lib/libXxf86misc.so
lib/libXxf86misc.so.1
lib/libXxf86misc.so.1.1.0
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 3c037d6520fc..0aa1cb6634f3 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libXxf86vm
-PORTVERSION= 1.1.3
-PORTREVISION= 2
+PORTVERSION= 1.1.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
index 3205819f70ec..a4121361ccdb 100644
--- a/x11/libXxf86vm/distinfo
+++ b/x11/libXxf86vm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXxf86vm-1.1.3.tar.bz2) = da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8
-SIZE (xorg/lib/libXxf86vm-1.1.3.tar.bz2) = 284279
+SHA256 (xorg/lib/libXxf86vm-1.1.4.tar.bz2) = afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57
+SIZE (xorg/lib/libXxf86vm-1.1.4.tar.bz2) = 295346
diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist
index fc9f5d78fc82..d095e9e000fc 100644
--- a/x11/libXxf86vm/pkg-plist
+++ b/x11/libXxf86vm/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/xf86vmode.h
lib/libXxf86vm.a
-lib/libXxf86vm.la
lib/libXxf86vm.so
lib/libXxf86vm.so.1
lib/libXxf86vm.so.1.0.0
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index c0bcae122e65..95aa26775ab1 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdmx
PORTVERSION= 1.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist
index ee713122733b..63a810c3a648 100644
--- a/x11/libdmx/pkg-plist
+++ b/x11/libdmx/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/dmxext.h
lib/libdmx.a
-lib/libdmx.la
lib/libdmx.so
lib/libdmx.so.1
lib/libdmx.so.1.0.0
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
index ba70b3c08ab3..e2a140c60872 100644
--- a/x11/liboldX/Makefile
+++ b/x11/liboldX/Makefile
@@ -2,7 +2,7 @@
PORTNAME= liboldX
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/liboldX/pkg-plist b/x11/liboldX/pkg-plist
index c9ceec94ea32..0d45ec9b9b54 100644
--- a/x11/liboldX/pkg-plist
+++ b/x11/liboldX/pkg-plist
@@ -1,6 +1,5 @@
include/X11/X10.h
lib/liboldX.a
-lib/liboldX.la
lib/liboldX.so
lib/liboldX.so.6
lib/liboldX.so.6.0.0
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index d8833ebe1927..7c2bd3036b8d 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libxcb
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
index 4245622ea7c4..c2326a64d371 100644
--- a/x11/libxcb/pkg-plist
+++ b/x11/libxcb/pkg-plist
@@ -30,132 +30,106 @@ include/xcb/xtest.h
include/xcb/xv.h
include/xcb/xvmc.h
lib/libxcb-composite.a
-lib/libxcb-composite.la
lib/libxcb-composite.so
lib/libxcb-composite.so.0
lib/libxcb-composite.so.0.0.0
lib/libxcb-damage.a
-lib/libxcb-damage.la
lib/libxcb-damage.so
lib/libxcb-damage.so.0
lib/libxcb-damage.so.0.0.0
lib/libxcb-dpms.a
-lib/libxcb-dpms.la
lib/libxcb-dpms.so
lib/libxcb-dpms.so.0
lib/libxcb-dpms.so.0.0.0
lib/libxcb-dri2.a
-lib/libxcb-dri2.la
lib/libxcb-dri2.so
lib/libxcb-dri2.so.0
lib/libxcb-dri2.so.0.0.0
lib/libxcb-dri3.a
-lib/libxcb-dri3.la
lib/libxcb-dri3.so
lib/libxcb-dri3.so.0
lib/libxcb-dri3.so.0.0.0
lib/libxcb-glx.a
-lib/libxcb-glx.la
lib/libxcb-glx.so
lib/libxcb-glx.so.0
lib/libxcb-glx.so.0.0.0
lib/libxcb-present.a
-lib/libxcb-present.la
lib/libxcb-present.so
lib/libxcb-present.so.0
lib/libxcb-present.so.0.0.0
lib/libxcb-randr.a
-lib/libxcb-randr.la
lib/libxcb-randr.so
lib/libxcb-randr.so.0
lib/libxcb-randr.so.0.1.0
lib/libxcb-record.a
-lib/libxcb-record.la
lib/libxcb-record.so
lib/libxcb-record.so.0
lib/libxcb-record.so.0.0.0
lib/libxcb-render.a
-lib/libxcb-render.la
lib/libxcb-render.so
lib/libxcb-render.so.0
lib/libxcb-render.so.0.0.0
lib/libxcb-res.a
-lib/libxcb-res.la
lib/libxcb-res.so
lib/libxcb-res.so.0
lib/libxcb-res.so.0.0.0
lib/libxcb-screensaver.a
-lib/libxcb-screensaver.la
lib/libxcb-screensaver.so
lib/libxcb-screensaver.so.0
lib/libxcb-screensaver.so.0.0.0
lib/libxcb-shape.a
-lib/libxcb-shape.la
lib/libxcb-shape.so
lib/libxcb-shape.so.0
lib/libxcb-shape.so.0.0.0
lib/libxcb-shm.a
-lib/libxcb-shm.la
lib/libxcb-shm.so
lib/libxcb-shm.so.0
lib/libxcb-shm.so.0.0.0
lib/libxcb-sync.a
-lib/libxcb-sync.la
lib/libxcb-sync.so
lib/libxcb-sync.so.1
lib/libxcb-sync.so.1.0.0
lib/libxcb-xevie.a
-lib/libxcb-xevie.la
lib/libxcb-xevie.so
lib/libxcb-xevie.so.0
lib/libxcb-xevie.so.0.0.0
lib/libxcb-xf86dri.a
-lib/libxcb-xf86dri.la
lib/libxcb-xf86dri.so
lib/libxcb-xf86dri.so.0
lib/libxcb-xf86dri.so.0.0.0
lib/libxcb-xfixes.a
-lib/libxcb-xfixes.la
lib/libxcb-xfixes.so
lib/libxcb-xfixes.so.0
lib/libxcb-xfixes.so.0.0.0
lib/libxcb-xinerama.a
-lib/libxcb-xinerama.la
lib/libxcb-xinerama.so
lib/libxcb-xinerama.so.0
lib/libxcb-xinerama.so.0.0.0
lib/libxcb-xinput.a
-lib/libxcb-xinput.la
lib/libxcb-xinput.so
lib/libxcb-xinput.so.0
lib/libxcb-xinput.so.0.1.0
lib/libxcb-xkb.a
-lib/libxcb-xkb.la
lib/libxcb-xkb.so
lib/libxcb-xkb.so.1
lib/libxcb-xkb.so.1.0.0
lib/libxcb-xprint.a
-lib/libxcb-xprint.la
lib/libxcb-xprint.so
lib/libxcb-xprint.so.0
lib/libxcb-xprint.so.0.0.0
lib/libxcb-xtest.a
-lib/libxcb-xtest.la
lib/libxcb-xtest.so
lib/libxcb-xtest.so.0
lib/libxcb-xtest.so.0.0.0
lib/libxcb-xv.a
-lib/libxcb-xv.la
lib/libxcb-xv.so
lib/libxcb-xv.so.0
lib/libxcb-xv.so.0.0.0
lib/libxcb-xvmc.a
-lib/libxcb-xvmc.la
lib/libxcb-xvmc.so
lib/libxcb-xvmc.so.0
lib/libxcb-xvmc.so.0.0.0
lib/libxcb.a
-lib/libxcb.la
lib/libxcb.so
lib/libxcb.so.1
lib/libxcb.so.1.1.0
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index c8b792141d28..2c1503db2de9 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libxkbcommon
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xkbcommon.org/download/
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index c7a1f5da6379..d1d3b5f186f6 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -5,14 +5,12 @@ include/xkbcommon/xkbcommon-keysyms.h
include/xkbcommon/xkbcommon-names.h
include/xkbcommon/xkbcommon-x11.h
lib/libxkbcommon.a
-lib/libxkbcommon.la
lib/libxkbcommon.so
lib/libxkbcommon.so.0
lib/libxkbcommon.so.0.0.0
-libdata/pkgconfig/xkbcommon.pc
-libdata/pkgconfig/xkbcommon-x11.pc
lib/libxkbcommon-x11.a
-lib/libxkbcommon-x11.la
lib/libxkbcommon-x11.so
lib/libxkbcommon-x11.so.0
lib/libxkbcommon-x11.so.0.0.0
+libdata/pkgconfig/xkbcommon.pc
+libdata/pkgconfig/xkbcommon-x11.pc
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index e76f09f86ab7..7c1d8d295ddc 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxkbfile
PORTVERSION= 1.0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbfile/pkg-plist b/x11/libxkbfile/pkg-plist
index a4cc0c0b53ed..6df18bd9636c 100644
--- a/x11/libxkbfile/pkg-plist
+++ b/x11/libxkbfile/pkg-plist
@@ -5,7 +5,6 @@ include/X11/extensions/XKBrules.h
include/X11/extensions/XKM.h
include/X11/extensions/XKMformat.h
lib/libxkbfile.a
-lib/libxkbfile.la
lib/libxkbfile.so
lib/libxkbfile.so.1
lib/libxkbfile.so.1.0.2
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
index d0c33ec0c9a3..60c2c0dc769e 100644
--- a/x11/libxkbui/Makefile
+++ b/x11/libxkbui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxkbui
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbui/pkg-plist b/x11/libxkbui/pkg-plist
index 3bf75b75edd7..63af4b9e70ba 100644
--- a/x11/libxkbui/pkg-plist
+++ b/x11/libxkbui/pkg-plist
@@ -1,6 +1,5 @@
include/X11/extensions/XKBui.h
lib/libxkbui.a
-lib/libxkbui.la
lib/libxkbui.so
lib/libxkbui.so.1
lib/libxkbui.so.1.0.0
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index bcbb547b0c99..ffaecd4cfce7 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libxshmfence
-PORTVERSION= 1.1
-PORTREVISION= 3
+PORTVERSION= 1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxshmfence/distinfo b/x11/libxshmfence/distinfo
index 3b5cd8708404..294441d35545 100644
--- a/x11/libxshmfence/distinfo
+++ b/x11/libxshmfence/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libxshmfence-1.1.tar.bz2) = dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe
-SIZE (xorg/lib/libxshmfence-1.1.tar.bz2) = 291347
+SHA256 (xorg/lib/libxshmfence-1.2.tar.bz2) = d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c
+SIZE (xorg/lib/libxshmfence-1.2.tar.bz2) = 267170
diff --git a/x11/libxshmfence/files/patch-config.h.in b/x11/libxshmfence/files/patch-config.h.in
index bbb52e10cc3a..ea93bae1d58a 100644
--- a/x11/libxshmfence/files/patch-config.h.in
+++ b/x11/libxshmfence/files/patch-config.h.in
@@ -1,6 +1,6 @@
---- config.h.in 2013-11-27 00:54:40.000000000 -0500
-+++ config.h.in 2013-12-09 16:56:20.000000000 -0500
-@@ -12,6 +12,9 @@
+--- config.h.in.orig 2015-03-04 15:18:49 UTC
++++ config.h.in
+@@ -22,6 +22,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -10,13 +10,3 @@
/* Use pthread primitives */
#undef HAVE_PTHREAD
-@@ -33,6 +36,9 @@
- /* Define to 1 if you have the <sys/types.h> header file. */
- #undef HAVE_SYS_TYPES_H
-
-+/* Use umtx */
-+#undef HAVE_UMTX
-+
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
diff --git a/x11/libxshmfence/files/patch-configure b/x11/libxshmfence/files/patch-configure
index dda82c69cf4f..60947610abad 100644
--- a/x11/libxshmfence/files/patch-configure
+++ b/x11/libxshmfence/files/patch-configure
@@ -1,34 +1,6 @@
---- configure 2013-11-27 00:54:35.000000000 -0500
-+++ configure 2013-12-09 15:03:55.000000000 -0500
-@@ -17633,11 +17633,27 @@
- ac_fn_c_check_header_mongrel "$LINENO" "linux/futex.h" "ac_cv_header_linux_futex_h" "$ac_includes_default"
- if test "x$ac_cv_header_linux_futex_h" = xyes; then :
- FUTEX=yes
-+fi
-+
-+
-+fi
-+
-+if test "x$FUTEX" = "xauto"; then
-+ ac_fn_c_check_header_compile "$LINENO" "sys/umtx.h" "ac_cv_header_sys_umtx_h" "#include <errno.h>
-+ #include <sys/types.h>
-+"
-+if test "x$ac_cv_header_sys_umtx_h" = xyes; then :
-+ FUTEX=yes
- else
- FUTEX=no
- fi
-
-
-+ if test "x$FUTEX" = "xyes"; then
-+
-+$as_echo "#define HAVE_UMTX 1" >>confdefs.h
-+
-+ fi
- fi
-
- if test "x$FUTEX" = "xyes"; then
-@@ -17717,6 +17733,14 @@
+--- configure.orig 2015-03-04 15:22:23 UTC
++++ configure
+@@ -18104,6 +18104,14 @@ else
fi
diff --git a/x11/libxshmfence/files/patch-src__xshmfence_alloc.c b/x11/libxshmfence/files/patch-src__xshmfence_alloc.c
index 682232029c9a..ea14877817ec 100644
--- a/x11/libxshmfence/files/patch-src__xshmfence_alloc.c
+++ b/x11/libxshmfence/files/patch-src__xshmfence_alloc.c
@@ -1,19 +1,24 @@
---- src/xshmfence_alloc.c.orig 2013-11-20 17:13:08.000000000 -0500
-+++ src/xshmfence_alloc.c 2014-07-08 16:39:18.000000000 -0400
-@@ -39,10 +39,14 @@
+--- src/xshmfence_alloc.c.orig 2015-03-04 15:28:23 UTC
++++ src/xshmfence_alloc.c
+@@ -67,15 +67,19 @@ int
xshmfence_alloc_shm(void)
{
char template[] = SHMDIR "/shmfd-XXXXXX";
- int fd;
+ int fd = -1;
+ #if HAVE_MEMFD_CREATE
+ fd = memfd_create("xshmfence", MFD_CLOEXEC|MFD_ALLOW_SEALING);
+ if (fd < 0)
+ #endif
+ {
-#ifdef O_TMPFILE
+#if defined(O_CLOEXEC)
+#if defined(HAVE_MKOSTEMP)
-+ fd = mkostemp(template, O_CLOEXEC);
++ fd = mkostemp(template, O_CLOEXEC);
+#elif defined(O_TMPFILE)
- fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+ fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+#endif
- if (fd < 0)
+ if (fd < 0)
#endif
- {
+ {
diff --git a/x11/libxshmfence/files/patch-src__xshmfence_futex.h b/x11/libxshmfence/files/patch-src__xshmfence_futex.h
deleted file mode 100644
index 253d9d54f947..000000000000
--- a/x11/libxshmfence/files/patch-src__xshmfence_futex.h
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/xshmfence_futex.h
-+++ src/xshmfence_futex.h
-@@ -1,5 +1,6 @@
- /*
- * Copyright © 2013 Keith Packard
-+ * Copyright © 2013-2014 Jung-uk Kim <jkim@FreeBSD.org>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
-@@ -24,6 +25,28 @@
- #define _XSHMFENCE_FUTEX_H_
-
- #include <errno.h>
-+
-+#ifdef HAVE_UMTX
-+
-+#include <sys/limits.h>
-+#include <sys/types.h>
-+#include <sys/umtx.h>
-+
-+static inline int sys_futex(void *addr, int op, int32_t val)
-+{
-+ return _umtx_op(addr, op, (uint32_t)val, NULL, NULL) == -1 ? errno : 0;
-+}
-+
-+static inline int futex_wake(int32_t *addr) {
-+ return sys_futex(addr, UMTX_OP_WAKE, INT_MAX);
-+}
-+
-+static inline int futex_wait(int32_t *addr, int32_t value) {
-+ return sys_futex(addr, UMTX_OP_WAIT_UINT, value);
-+}
-+
-+#else
-+
- #include <stdint.h>
- #include <values.h>
- #include <linux/futex.h>
-@@ -43,6 +66,8 @@
- return sys_futex(addr, FUTEX_WAIT, value, NULL, NULL, 0);
- }
-
-+#endif
-+
- #define barrier() __asm__ __volatile__("": : :"memory")
-
- static inline void atomic_store(int32_t *f, int32_t v)
diff --git a/x11/libxshmfence/files/patch-src__xshmfenceint.h b/x11/libxshmfence/files/patch-src__xshmfenceint.h
index bc8aead76698..9e969d54267f 100644
--- a/x11/libxshmfence/files/patch-src__xshmfenceint.h
+++ b/x11/libxshmfence/files/patch-src__xshmfenceint.h
@@ -1,5 +1,5 @@
---- src/xshmfenceint.h 2013-11-20 17:14:05.000000000 -0500
-+++ src/xshmfenceint.h 2013-12-09 15:14:36.000000000 -0500
+--- src/xshmfenceint.h.orig 2015-03-04 15:38:56 UTC
++++ src/xshmfenceint.h
@@ -23,6 +23,7 @@
#ifndef _XSHMFENCEINT_H_
#define _XSHMFENCEINT_H_
diff --git a/x11/libxshmfence/pkg-plist b/x11/libxshmfence/pkg-plist
index 54519a918119..cca5d27cfb98 100644
--- a/x11/libxshmfence/pkg-plist
+++ b/x11/libxshmfence/pkg-plist
@@ -1,6 +1,5 @@
include/X11/xshmfence.h
lib/libxshmfence.a
-lib/libxshmfence.la
lib/libxshmfence.so
lib/libxshmfence.so.1
lib/libxshmfence.so.1.0.0
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index a04065a0abac..ff0592f83fcc 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pixman
PORTVERSION= 0.32.6
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist
index b1851c0cf05d..f5608f903180 100644
--- a/x11/pixman/pkg-plist
+++ b/x11/pixman/pkg-plist
@@ -1,7 +1,6 @@
include/pixman-1/pixman-version.h
include/pixman-1/pixman.h
lib/libpixman-1.a
-lib/libpixman-1.la
lib/libpixman-1.so
lib/libpixman-1.so.0
lib/libpixman-1.so.0.32.6
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index e1d3b5f6aa45..89ce424e02b0 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= randrproto
-PORTVERSION= 1.4.0
+PORTVERSION= 1.4.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
index 0069318e7dca..5f1b433841ac 100644
--- a/x11/randrproto/distinfo
+++ b/x11/randrproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
-SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300
+SHA256 (xorg/proto/randrproto-1.4.1.tar.bz2) = 543dcb2ebb0622d8a506dcef6470c6dd066f3e3f866552a5060b91ab6129e1dc
+SIZE (xorg/proto/randrproto-1.4.1.tar.bz2) = 143474
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
index bb02b3b89e99..cdfe43344480 100644
--- a/x11/rgb/Makefile
+++ b/x11/rgb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rgb
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/rgb/distinfo b/x11/rgb/distinfo
index cfd2ab370aa3..f73702288ee7 100644
--- a/x11/rgb/distinfo
+++ b/x11/rgb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/rgb-1.0.5.tar.bz2) = 8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857
-SIZE (xorg/app/rgb-1.0.5.tar.bz2) = 130900
+SHA256 (xorg/app/rgb-1.0.6.tar.bz2) = bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0
+SIZE (xorg/app/rgb-1.0.6.tar.bz2) = 139225
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index 2e61e7f6f68b..58950d21f0da 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sessreg
-PORTVERSION= 1.0.8
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
index ef33f2bbd812..bf00b288e37b 100644
--- a/x11/sessreg/distinfo
+++ b/x11/sessreg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/sessreg-1.0.8.tar.bz2) = 0e2accc6272fcc2321aef7370f4ccf0df0fe259b2e942938264e2aaedee6c4c3
-SIZE (xorg/app/sessreg-1.0.8.tar.bz2) = 126979
+SHA256 (xorg/app/sessreg-1.1.0.tar.bz2) = 551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c
+SIZE (xorg/app/sessreg-1.1.0.tar.bz2) = 134484
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 7bf13f1b6d3d..140f3cb4aa73 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xcb-util-cursor
-PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTVERSION= 0.1.2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -11,8 +10,7 @@ COMMENT= XCB cursor library
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util \
${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil \
- ${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:${PORTSDIR}/x11/xcb-util-image \
- ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+ ${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:${PORTSDIR}/x11/xcb-util-image
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util \
${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil \
@@ -20,9 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util
XORG_CAT= lib
USE_XORG= xcb
-USES= gmake
-
-CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf"
+USES= gmake gperf
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/x11/xcb-util-cursor/distinfo b/x11/xcb-util-cursor/distinfo
index 49fa1c37ba58..0dc109a34fc0 100644
--- a/x11/xcb-util-cursor/distinfo
+++ b/x11/xcb-util-cursor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/xcb-util-cursor-0.1.1.tar.bz2) = 517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652
-SIZE (xorg/lib/xcb-util-cursor-0.1.1.tar.bz2) = 280852
+SHA256 (xorg/lib/xcb-util-cursor-0.1.2.tar.bz2) = ed65367b810d47ab637011585135f4a84dd12e235dddcd3b26e0cfb3be21fb3a
+SIZE (xorg/lib/xcb-util-cursor-0.1.2.tar.bz2) = 289714
diff --git a/x11/xcb-util-cursor/pkg-plist b/x11/xcb-util-cursor/pkg-plist
index 029e595db9f1..1a444e3672de 100644
--- a/x11/xcb-util-cursor/pkg-plist
+++ b/x11/xcb-util-cursor/pkg-plist
@@ -1,6 +1,5 @@
include/xcb/xcb_cursor.h
lib/libxcb-cursor.a
-lib/libxcb-cursor.la
lib/libxcb-cursor.so
lib/libxcb-cursor.so.0
lib/libxcb-cursor.so.0.0.0
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 52909b258dd9..4f0849d828d6 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-image
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-image/pkg-plist b/x11/xcb-util-image/pkg-plist
index d26f27c7bf64..29bc2a055417 100644
--- a/x11/xcb-util-image/pkg-plist
+++ b/x11/xcb-util-image/pkg-plist
@@ -2,7 +2,6 @@ include/xcb/xcb_bitops.h
include/xcb/xcb_image.h
include/xcb/xcb_pixel.h
lib/libxcb-image.a
-lib/libxcb-image.la
lib/libxcb-image.so
lib/libxcb-image.so.0
lib/libxcb-image.so.0.0.0
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index a274cc30ebe0..4877fb3a56d5 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-keysyms
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-keysyms/pkg-plist b/x11/xcb-util-keysyms/pkg-plist
index 12c7565145a8..ab02b6f44356 100644
--- a/x11/xcb-util-keysyms/pkg-plist
+++ b/x11/xcb-util-keysyms/pkg-plist
@@ -1,6 +1,5 @@
include/xcb/xcb_keysyms.h
lib/libxcb-keysyms.a
-lib/libxcb-keysyms.la
lib/libxcb-keysyms.so
lib/libxcb-keysyms.so.1
lib/libxcb-keysyms.so.1.0.0
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 330259c16a51..15387734920f 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xcb-util-renderutil
PORTVERSION= 0.3.9
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-renderutil/pkg-plist b/x11/xcb-util-renderutil/pkg-plist
index 4fa985ebfa35..03d7c3774c47 100644
--- a/x11/xcb-util-renderutil/pkg-plist
+++ b/x11/xcb-util-renderutil/pkg-plist
@@ -1,6 +1,5 @@
include/xcb/xcb_renderutil.h
lib/libxcb-render-util.a
-lib/libxcb-render-util.la
lib/libxcb-render-util.so
lib/libxcb-render-util.so.0
lib/libxcb-render-util.so.0.0.0
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index 21b9f3d3f1c9..f558cca5d98d 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xcb-util-wm
PORTVERSION= 0.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util-wm/pkg-plist b/x11/xcb-util-wm/pkg-plist
index 9f7a696cb074..d5c2c8ac65dc 100644
--- a/x11/xcb-util-wm/pkg-plist
+++ b/x11/xcb-util-wm/pkg-plist
@@ -1,12 +1,10 @@
include/xcb/xcb_icccm.h
include/xcb/xcb_ewmh.h
lib/libxcb-icccm.a
-lib/libxcb-icccm.la
lib/libxcb-icccm.so
lib/libxcb-icccm.so.4
lib/libxcb-icccm.so.4.0.0
lib/libxcb-ewmh.a
-lib/libxcb-ewmh.la
lib/libxcb-ewmh.so
lib/libxcb-ewmh.so.2
lib/libxcb-ewmh.so.2.0.0
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 4474eee27ef4..d73ea1fcc609 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xcb-util
PORTVERSION= 0.4.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-util/pkg-plist b/x11/xcb-util/pkg-plist
index 472ca54ef309..c9ee59c2c57f 100644
--- a/x11/xcb-util/pkg-plist
+++ b/x11/xcb-util/pkg-plist
@@ -1,5 +1,4 @@
lib/libxcb-util.a
-lib/libxcb-util.la
lib/libxcb-util.so
lib/libxcb-util.so.1
lib/libxcb-util.so.1.0.0
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index 8d91fb83230e..7316b950ca19 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xedit
-PORTVERSION= 1.2.1
+PORTVERSION= 1.2.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo
index 213620a73138..a6f25d6519f1 100644
--- a/x11/xedit/distinfo
+++ b/x11/xedit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xedit-1.2.1.tar.bz2) = 89b0b0f86b0b5ab2898ee669d394b28c6ac5a9a53f8fae1726ba5664cd36c98e
-SIZE (xorg/app/xedit-1.2.1.tar.bz2) = 520614
+SHA256 (xorg/app/xedit-1.2.2.tar.bz2) = 69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927
+SIZE (xorg/app/xedit-1.2.2.tar.bz2) = 525861
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index e541ea728d9f..a9f7986b4187 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xkbcomp
-PORTVERSION= 1.2.4
+PORTVERSION= 1.3.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
index dbba54bc2a18..4eb98eddd322 100644
--- a/x11/xkbcomp/distinfo
+++ b/x11/xkbcomp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xkbcomp-1.2.4.tar.bz2) = 91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d
-SIZE (xorg/app/xkbcomp-1.2.4.tar.bz2) = 242185
+SHA256 (xorg/app/xkbcomp-1.3.0.tar.bz2) = cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a
+SIZE (xorg/app/xkbcomp-1.3.0.tar.bz2) = 246389
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index e818deaa9f78..d162fcc22d30 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xkeyboard-config
-PORTVERSION= 2.13
+PORTVERSION= 2.14
CATEGORIES= x11
MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME}
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 055cd7a857ce..b4b5aeb67ee5 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.13.tar.bz2) = 7b5be9f2b9a30102512b15308aec55f7f54289df24ac21de82ebb4bf145f9fce
-SIZE (xorg/data/xkeyboard-config-2.13.tar.bz2) = 944375
+SHA256 (xorg/data/xkeyboard-config-2.14.tar.bz2) = dc91458a214c56a35727f9e523fc647615de64137057ca6ee4d4d4474a4bb2ae
+SIZE (xorg/data/xkeyboard-config-2.14.tar.bz2) = 953589
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index 95a4491196ef..05cd1cd34d44 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xproto
-PORTVERSION= 7.0.26
+PORTVERSION= 7.0.27
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index f608f3990f3b..71bdb60d34ed 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xproto-7.0.26.tar.bz2) = 636162c1759805a5a0114a369dffdeccb8af8c859ef6e1445f26a4e6e046514f
-SIZE (xorg/proto/xproto-7.0.26.tar.bz2) = 305321
+SHA256 (xorg/proto/xproto-7.0.27.tar.bz2) = 246f23a6b235c8008183deeb1dcd76d529a099f93600b648b399811b10ea110c
+SIZE (xorg/proto/xproto-7.0.27.tar.bz2) = 305768