svn commit: r384234 - in head: Mk devel/gccmakedep devel/gccmakedep/files devel/imake devel/libpciaccess devel/libpciaccess/files graphics/libdrm graphics/mesa-demos x11-drivers/xf86-input-mouse x1...

Koop Mast kwm at FreeBSD.org
Sat Apr 18 15:34:52 UTC 2015 

Author: kwm
Date: Sat Apr 18 15:34:36 2015
New Revision: 384234
URL: https://svnweb.freebsd.org/changeset/ports/384234

Log:
  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

Deleted:
  head/devel/gccmakedep/files/
  head/x11-drivers/xf86-video-i740/files/
  head/x11-drivers/xf86-video-tdfx/files/
  head/x11-fonts/xfs/pkg-install
  head/x11/libxshmfence/files/patch-src__xshmfence_futex.h
Modified:
  head/Mk/bsd.xorg.mk
  head/devel/gccmakedep/Makefile
  head/devel/gccmakedep/distinfo
  head/devel/imake/Makefile
  head/devel/imake/distinfo
  head/devel/libpciaccess/Makefile
  head/devel/libpciaccess/distinfo
  head/devel/libpciaccess/files/patch-src-freebsd_pci.c
  head/devel/libpciaccess/files/patch-src-pciaccess_private.h
  head/devel/libpciaccess/pkg-plist
  head/graphics/libdrm/Makefile
  head/graphics/libdrm/distinfo
  head/graphics/libdrm/pkg-plist
  head/graphics/mesa-demos/Makefile
  head/x11-drivers/xf86-input-mouse/Makefile
  head/x11-drivers/xf86-input-mouse/distinfo
  head/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
  head/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
  head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
  head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
  head/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
  head/x11-drivers/xf86-input-synaptics/Makefile
  head/x11-drivers/xf86-input-synaptics/distinfo
  head/x11-drivers/xf86-video-i740/Makefile
  head/x11-drivers/xf86-video-i740/distinfo
  head/x11-drivers/xf86-video-mga/Makefile
  head/x11-drivers/xf86-video-mga/distinfo
  head/x11-drivers/xf86-video-tdfx/Makefile
  head/x11-drivers/xf86-video-tdfx/distinfo
  head/x11-drivers/xf86-video-vmware/Makefile
  head/x11-drivers/xf86-video-vmware/distinfo
  head/x11-fonts/bdftopcf/Makefile
  head/x11-fonts/bdftopcf/distinfo
  head/x11-fonts/font-util/Makefile
  head/x11-fonts/font-util/distinfo
  head/x11-fonts/fslsfonts/Makefile
  head/x11-fonts/fslsfonts/distinfo
  head/x11-fonts/libFS/Makefile
  head/x11-fonts/libFS/pkg-plist
  head/x11-fonts/libXfont/pkg-plist
  head/x11-fonts/libXfontcache/Makefile
  head/x11-fonts/libXfontcache/pkg-plist
  head/x11-fonts/libXft/Makefile
  head/x11-fonts/libXft/pkg-plist
  head/x11-fonts/libfontenc/Makefile
  head/x11-fonts/libfontenc/pkg-plist
  head/x11-fonts/mkfontscale/Makefile
  head/x11-fonts/mkfontscale/distinfo
  head/x11-fonts/showfont/Makefile
  head/x11-fonts/showfont/distinfo
  head/x11-fonts/xfs/Makefile
  head/x11-fonts/xfs/distinfo
  head/x11-fonts/xfs/pkg-plist
  head/x11-fonts/xfsinfo/Makefile
  head/x11-fonts/xfsinfo/distinfo
  head/x11-toolkits/libXaw/Makefile
  head/x11-toolkits/libXaw/pkg-plist
  head/x11-toolkits/libXmu/Makefile
  head/x11-toolkits/libXmu/pkg-plist
  head/x11-toolkits/libXt/Makefile
  head/x11-toolkits/libXt/pkg-plist
  head/x11/bitmap/Makefile
  head/x11/bitmap/distinfo
  head/x11/fstobdf/Makefile
  head/x11/fstobdf/distinfo
  head/x11/iceauth/Makefile
  head/x11/iceauth/distinfo
  head/x11/libICE/Makefile
  head/x11/libICE/pkg-plist
  head/x11/libSM/Makefile
  head/x11/libSM/pkg-plist
  head/x11/libX11/Makefile
  head/x11/libX11/pkg-plist
  head/x11/libXScrnSaver/Makefile
  head/x11/libXScrnSaver/pkg-plist
  head/x11/libXTrap/Makefile
  head/x11/libXTrap/pkg-plist
  head/x11/libXau/Makefile
  head/x11/libXau/pkg-plist
  head/x11/libXcomposite/Makefile
  head/x11/libXcomposite/pkg-plist
  head/x11/libXcursor/Makefile
  head/x11/libXcursor/pkg-plist
  head/x11/libXdamage/Makefile
  head/x11/libXdamage/pkg-plist
  head/x11/libXdmcp/Makefile
  head/x11/libXdmcp/distinfo
  head/x11/libXdmcp/pkg-plist
  head/x11/libXevie/Makefile
  head/x11/libXevie/pkg-plist
  head/x11/libXext/Makefile
  head/x11/libXext/pkg-plist
  head/x11/libXfixes/Makefile
  head/x11/libXfixes/pkg-plist
  head/x11/libXi/Makefile
  head/x11/libXi/pkg-plist
  head/x11/libXinerama/Makefile
  head/x11/libXinerama/pkg-plist
  head/x11/libXp/Makefile
  head/x11/libXp/distinfo
  head/x11/libXp/pkg-plist
  head/x11/libXpm/Makefile
  head/x11/libXpm/pkg-plist
  head/x11/libXprintAppUtil/Makefile
  head/x11/libXprintAppUtil/pkg-plist
  head/x11/libXprintUtil/Makefile
  head/x11/libXprintUtil/pkg-plist
  head/x11/libXrandr/Makefile
  head/x11/libXrandr/pkg-plist
  head/x11/libXrender/Makefile
  head/x11/libXrender/pkg-plist
  head/x11/libXres/Makefile
  head/x11/libXres/pkg-plist
  head/x11/libXtst/Makefile
  head/x11/libXtst/pkg-plist
  head/x11/libXv/Makefile
  head/x11/libXv/pkg-plist
  head/x11/libXvMC/Makefile
  head/x11/libXvMC/distinfo
  head/x11/libXvMC/pkg-plist
  head/x11/libXxf86dga/Makefile
  head/x11/libXxf86dga/pkg-plist
  head/x11/libXxf86misc/Makefile
  head/x11/libXxf86misc/pkg-plist
  head/x11/libXxf86vm/Makefile
  head/x11/libXxf86vm/distinfo
  head/x11/libXxf86vm/pkg-plist
  head/x11/libdmx/Makefile
  head/x11/libdmx/pkg-plist
  head/x11/liboldX/Makefile
  head/x11/liboldX/pkg-plist
  head/x11/libxcb/Makefile
  head/x11/libxcb/pkg-plist
  head/x11/libxkbcommon/Makefile
  head/x11/libxkbcommon/pkg-plist
  head/x11/libxkbfile/Makefile
  head/x11/libxkbfile/pkg-plist
  head/x11/libxkbui/Makefile
  head/x11/libxkbui/pkg-plist
  head/x11/libxshmfence/Makefile
  head/x11/libxshmfence/distinfo
  head/x11/libxshmfence/files/patch-config.h.in
  head/x11/libxshmfence/files/patch-configure
  head/x11/libxshmfence/files/patch-src__xshmfence_alloc.c
  head/x11/libxshmfence/files/patch-src__xshmfenceint.h
  head/x11/libxshmfence/pkg-plist
  head/x11/pixman/Makefile
  head/x11/pixman/pkg-plist
  head/x11/randrproto/Makefile
  head/x11/randrproto/distinfo
  head/x11/rgb/Makefile
  head/x11/rgb/distinfo
  head/x11/sessreg/Makefile
  head/x11/sessreg/distinfo
  head/x11/xcb-util-cursor/Makefile
  head/x11/xcb-util-cursor/distinfo
  head/x11/xcb-util-cursor/pkg-plist
  head/x11/xcb-util-image/Makefile
  head/x11/xcb-util-image/pkg-plist
  head/x11/xcb-util-keysyms/Makefile
  head/x11/xcb-util-keysyms/pkg-plist
  head/x11/xcb-util-renderutil/Makefile
  head/x11/xcb-util-renderutil/pkg-plist
  head/x11/xcb-util-wm/Makefile
  head/x11/xcb-util-wm/pkg-plist
  head/x11/xcb-util/Makefile
  head/x11/xcb-util/pkg-plist
  head/x11/xedit/Makefile
  head/x11/xedit/distinfo
  head/x11/xkbcomp/Makefile
  head/x11/xkbcomp/distinfo
  head/x11/xkeyboard-config/Makefile
  head/x11/xkeyboard-config/distinfo
  head/x11/xproto/Makefile
  head/x11/xproto/distinfo

Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/Mk/bsd.xorg.mk	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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}/font
 .  endif
 
 . if ${XORG_CAT} == "lib"
-USES+=		pathfix libtool:keepla
+USES+=		pathfix libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=--enable-malloc0returnsnull
 . endif

Modified: head/devel/gccmakedep/Makefile
==============================================================================
--- head/devel/gccmakedep/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/gccmakedep/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gccmakedep
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.3
 CATEGORIES=	devel
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/devel/gccmakedep/distinfo
==============================================================================
--- head/devel/gccmakedep/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/gccmakedep/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/devel/imake/Makefile
==============================================================================
--- head/devel/imake/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/imake/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	imake
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.0.7
 PORTEPOCH=	1
 CATEGORIES=	devel
 

Modified: head/devel/imake/distinfo
==============================================================================
--- head/devel/imake/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/imake/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/devel/libpciaccess/Makefile
==============================================================================
--- head/devel/libpciaccess/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/libpciaccess/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libpciaccess
-PORTVERSION=	0.13.2
-PORTREVISION=	2
+PORTVERSION=	0.13.3
 CATEGORIES=	devel
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/devel/libpciaccess/distinfo
==============================================================================
--- head/devel/libpciaccess/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/libpciaccess/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/devel/libpciaccess/files/patch-src-freebsd_pci.c
==============================================================================
--- head/devel/libpciaccess/files/patch-src-freebsd_pci.c	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/libpciaccess/files/patch-src-freebsd_pci.c	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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;
  }

Modified: head/devel/libpciaccess/files/patch-src-pciaccess_private.h
==============================================================================
--- head/devel/libpciaccess/files/patch-src-pciaccess_private.h	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/libpciaccess/files/patch-src-pciaccess_private.h	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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 );

Modified: head/devel/libpciaccess/pkg-plist
==============================================================================
--- head/devel/libpciaccess/pkg-plist	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/devel/libpciaccess/pkg-plist	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/graphics/libdrm/Makefile
==============================================================================
--- head/graphics/libdrm/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/graphics/libdrm/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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/

Modified: head/graphics/libdrm/distinfo
==============================================================================
--- head/graphics/libdrm/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/graphics/libdrm/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/graphics/libdrm/pkg-plist
==============================================================================
--- head/graphics/libdrm/pkg-plist	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/graphics/libdrm/pkg-plist	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/graphics/mesa-demos/Makefile
==============================================================================
--- head/graphics/mesa-demos/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/graphics/mesa-demos/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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 M
 
 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
 

Modified: head/x11-drivers/xf86-input-mouse/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-mouse/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-mouse/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-mouse
-PORTVERSION=	1.9.0
-PORTREVISION=	6
+PORTVERSION=	1.9.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-drivers/xf86-input-mouse/distinfo
==============================================================================
--- head/x11-drivers/xf86-input-mouse/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-mouse/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
==============================================================================
--- head/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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;

Modified: head/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
==============================================================================
--- head/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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 at _drv_la_LTLIBRARIES = @DRIVER_NAME at _drv.la

Modified: head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
==============================================================================
--- head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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 */

Modified: head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
==============================================================================
--- head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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];

Modified: head/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
==============================================================================
--- head/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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;

Modified: head/x11-drivers/xf86-input-synaptics/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-synaptics/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-synaptics/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.7.4
-PORTREVISION=	3
+PORTVERSION=	1.8.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-drivers/xf86-input-synaptics/distinfo
==============================================================================
--- head/x11-drivers/xf86-input-synaptics/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-input-synaptics/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-drivers/xf86-video-i740/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-i740/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-i740/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-i740
-PORTVERSION=	1.3.4
-PORTREVISION=	5
+PORTVERSION=	1.3.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-drivers/xf86-video-i740/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-i740/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-i740/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-drivers/xf86-video-mga/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-mga/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-mga/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-mga
-PORTVERSION=	1.6.3
-PORTREVISION=	5
+PORTVERSION=	1.6.4
 PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 

Modified: head/x11-drivers/xf86-video-mga/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-mga/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-mga/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-drivers/xf86-video-tdfx/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-tdfx/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-tdfx/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-tdfx
-PORTVERSION=	1.4.5
-PORTREVISION=	7
+PORTVERSION=	1.4.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-drivers/xf86-video-tdfx/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-tdfx/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-tdfx/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-drivers/xf86-video-vmware/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-vmware/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-vmware/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-vmware
-PORTVERSION=	13.0.1
-PORTREVISION=	5
+PORTVERSION=	13.1.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-drivers/xf86-video-vmware/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-vmware/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-drivers/xf86-video-vmware/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/bdftopcf/Makefile
==============================================================================
--- head/x11-fonts/bdftopcf/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/bdftopcf/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bdftopcf
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-fonts/bdftopcf/distinfo
==============================================================================
--- head/x11-fonts/bdftopcf/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/bdftopcf/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/font-util/Makefile
==============================================================================
--- head/x11-fonts/font-util/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/font-util/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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 at FreeBSD.org

Modified: head/x11-fonts/font-util/distinfo
==============================================================================
--- head/x11-fonts/font-util/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/font-util/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/fslsfonts/Makefile
==============================================================================
--- head/x11-fonts/fslsfonts/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/fslsfonts/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fslsfonts
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-fonts/fslsfonts/distinfo
==============================================================================
--- head/x11-fonts/fslsfonts/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/fslsfonts/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/libFS/Makefile
==============================================================================
--- head/x11-fonts/libFS/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libFS/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libFS
 PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-fonts/libFS/pkg-plist
==============================================================================
--- head/x11-fonts/libFS/pkg-plist	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libFS/pkg-plist	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/libXfont/pkg-plist
==============================================================================
--- head/x11-fonts/libXfont/pkg-plist	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libXfont/pkg-plist	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/libXfontcache/Makefile
==============================================================================
--- head/x11-fonts/libXfontcache/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libXfontcache/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXfontcache
 PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-fonts/libXfontcache/pkg-plist
==============================================================================
--- head/x11-fonts/libXfontcache/pkg-plist	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libXfontcache/pkg-plist	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,5 +1,4 @@
 lib/libXfontcache.a
-lib/libXfontcache.la
 lib/libXfontcache.so
 lib/libXfontcache.so.1
 lib/libXfontcache.so.1.0.0

Modified: head/x11-fonts/libXft/Makefile
==============================================================================
--- head/x11-fonts/libXft/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libXft/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libXft
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	gnome at FreeBSD.org
@@ -12,6 +13,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
 
 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>

Modified: head/x11-fonts/libXft/pkg-plist
==============================================================================
--- head/x11-fonts/libXft/pkg-plist	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libXft/pkg-plist	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/libfontenc/Makefile
==============================================================================
--- head/x11-fonts/libfontenc/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libfontenc/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libfontenc
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-fonts/libfontenc/pkg-plist
==============================================================================
--- head/x11-fonts/libfontenc/pkg-plist	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/libfontenc/pkg-plist	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/mkfontscale/Makefile
==============================================================================
--- head/x11-fonts/mkfontscale/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/mkfontscale/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkfontscale
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11 at FreeBSD.org

Modified: head/x11-fonts/mkfontscale/distinfo
==============================================================================
--- head/x11-fonts/mkfontscale/distinfo	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/mkfontscale/distinfo	Sat Apr 18 15:34:36 2015	(r384234)
@@ -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

Modified: head/x11-fonts/showfont/Makefile
==============================================================================
--- head/x11-fonts/showfont/Makefile	Sat Apr 18 15:25:22 2015	(r384233)
+++ head/x11-fonts/showfont/Makefile	Sat Apr 18 15:34:36 2015	(r384234)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	showfont
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	x11-fonts

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-head mailing list