[Midnightbsd-cvs] mports [15734] U trunk/x11-drivers/xorg-drivers/pkg-descr: update x.org drivers
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Dec 22 13:13:24 EST 2013
Revision: 15734
http://svnweb.midnightbsd.org/mports/?rev=15734
Author: laffer1
Date: 2013-12-22 13:13:23 -0500 (Sun, 22 Dec 2013)
Log Message:
-----------
update x.org drivers
Modified Paths:
--------------
trunk/x11-drivers/Makefile
trunk/x11-drivers/input-wacom/Makefile
trunk/x11-drivers/input-wacom/distinfo
trunk/x11-drivers/input-wacom/files/wacom.in
trunk/x11-drivers/input-wacom/pkg-descr
trunk/x11-drivers/input-wacom/pkg-plist
trunk/x11-drivers/xf86-input-acecad/Makefile
trunk/x11-drivers/xf86-input-acecad/distinfo
trunk/x11-drivers/xf86-input-elographics/Makefile
trunk/x11-drivers/xf86-input-elographics/distinfo
trunk/x11-drivers/xf86-input-hyperpen/Makefile
trunk/x11-drivers/xf86-input-hyperpen/distinfo
trunk/x11-drivers/xf86-input-joystick/Makefile
trunk/x11-drivers/xf86-input-joystick/distinfo
trunk/x11-drivers/xf86-input-keyboard/Makefile
trunk/x11-drivers/xf86-input-keyboard/distinfo
trunk/x11-drivers/xf86-input-mouse/Makefile
trunk/x11-drivers/xf86-input-mouse/distinfo
trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
trunk/x11-drivers/xf86-input-mouse/pkg-plist
trunk/x11-drivers/xf86-input-mutouch/Makefile
trunk/x11-drivers/xf86-input-mutouch/distinfo
trunk/x11-drivers/xf86-input-penmount/Makefile
trunk/x11-drivers/xf86-input-penmount/distinfo
trunk/x11-drivers/xf86-input-synaptics/Makefile
trunk/x11-drivers/xf86-input-synaptics/distinfo
trunk/x11-drivers/xf86-input-synaptics/pkg-plist
trunk/x11-drivers/xf86-input-vmmouse/Makefile
trunk/x11-drivers/xf86-input-vmmouse/distinfo
trunk/x11-drivers/xf86-input-vmmouse/pkg-plist
trunk/x11-drivers/xf86-input-void/Makefile
trunk/x11-drivers/xf86-input-void/distinfo
trunk/x11-drivers/xf86-video-ark/Makefile
trunk/x11-drivers/xf86-video-ark/distinfo
trunk/x11-drivers/xf86-video-ati/Makefile
trunk/x11-drivers/xf86-video-ati/distinfo
trunk/x11-drivers/xf86-video-ati/pkg-plist
trunk/x11-drivers/xf86-video-dummy/Makefile
trunk/x11-drivers/xf86-video-dummy/distinfo
trunk/x11-drivers/xf86-video-rendition/Makefile
trunk/x11-drivers/xf86-video-rendition/distinfo
trunk/x11-drivers/xf86-video-s3/Makefile
trunk/x11-drivers/xf86-video-s3/distinfo
trunk/x11-drivers/xf86-video-s3virge/Makefile
trunk/x11-drivers/xf86-video-s3virge/distinfo
trunk/x11-drivers/xf86-video-savage/Makefile
trunk/x11-drivers/xf86-video-savage/distinfo
trunk/x11-drivers/xf86-video-siliconmotion/Makefile
trunk/x11-drivers/xf86-video-siliconmotion/distinfo
trunk/x11-drivers/xf86-video-sis/Makefile
trunk/x11-drivers/xf86-video-sis/distinfo
trunk/x11-drivers/xf86-video-tdfx/Makefile
trunk/x11-drivers/xf86-video-tdfx/distinfo
trunk/x11-drivers/xf86-video-tga/Makefile
trunk/x11-drivers/xf86-video-tga/distinfo
trunk/x11-drivers/xf86-video-vesa/Makefile
trunk/x11-drivers/xf86-video-vesa/distinfo
trunk/x11-drivers/xorg-drivers/Makefile
Added Paths:
-----------
trunk/x11-drivers/input-wacom/files/patch-configure.ac
trunk/x11-drivers/input-wacom/files/patch-src-Makefile.in
trunk/x11-drivers/input-wacom/files/patch-src-wcmConfig.c
trunk/x11-drivers/input-wacom/files/patch-src-wcmUSB.c
trunk/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h
trunk/x11-drivers/input-wacom/files/patch-tools-Makefile.in
trunk/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
trunk/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c
trunk/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c
trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
trunk/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
Removed Paths:
-------------
trunk/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c
trunk/x11-drivers/xf86-input-mutouch/files/
trunk/x11-drivers/xf86-input-synaptics/files/patch-configure
trunk/x11-drivers/xf86-video-sunffb/
Property Changed:
----------------
trunk/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
trunk/x11-drivers/input-wacom/files/pkg-message-serial.in
trunk/x11-drivers/input-wacom/files/pkg-message-usb.in
trunk/x11-drivers/input-wacom/files/wacom.in
trunk/x11-drivers/input-wacom/pkg-descr
trunk/x11-drivers/xf86-input-acecad/pkg-descr
trunk/x11-drivers/xf86-input-elographics/pkg-descr
trunk/x11-drivers/xf86-input-hyperpen/pkg-descr
trunk/x11-drivers/xf86-input-joystick/pkg-descr
trunk/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
trunk/x11-drivers/xf86-input-keyboard/pkg-descr
trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
trunk/x11-drivers/xf86-input-mouse/pkg-descr
trunk/x11-drivers/xf86-input-mutouch/pkg-descr
trunk/x11-drivers/xf86-input-penmount/pkg-descr
trunk/x11-drivers/xf86-input-synaptics/pkg-descr
trunk/x11-drivers/xf86-input-vmmouse/pkg-descr
trunk/x11-drivers/xf86-input-void/pkg-descr
trunk/x11-drivers/xf86-video-apm/pkg-descr
trunk/x11-drivers/xf86-video-ark/pkg-descr
trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
trunk/x11-drivers/xf86-video-ati/pkg-descr
trunk/x11-drivers/xf86-video-chips/pkg-descr
trunk/x11-drivers/xf86-video-cirrus/pkg-descr
trunk/x11-drivers/xf86-video-dummy/pkg-descr
trunk/x11-drivers/xf86-video-fbdev/pkg-descr
trunk/x11-drivers/xf86-video-glint/pkg-descr
trunk/x11-drivers/xf86-video-i128/pkg-descr
trunk/x11-drivers/xf86-video-i740/pkg-descr
trunk/x11-drivers/xf86-video-intel/files/extra-i915kms
trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
trunk/x11-drivers/xf86-video-intel/pkg-descr
trunk/x11-drivers/xf86-video-mach64/pkg-descr
trunk/x11-drivers/xf86-video-mga/pkg-descr
trunk/x11-drivers/xf86-video-neomagic/pkg-descr
trunk/x11-drivers/xf86-video-newport/pkg-descr
trunk/x11-drivers/xf86-video-nv/pkg-descr
trunk/x11-drivers/xf86-video-openchrome/files/patch-configure
trunk/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c
trunk/x11-drivers/xf86-video-openchrome/pkg-descr
trunk/x11-drivers/xf86-video-r128/pkg-descr
trunk/x11-drivers/xf86-video-radeonhd/pkg-descr
trunk/x11-drivers/xf86-video-rendition/pkg-descr
trunk/x11-drivers/xf86-video-s3/pkg-descr
trunk/x11-drivers/xf86-video-s3virge/pkg-descr
trunk/x11-drivers/xf86-video-savage/pkg-descr
trunk/x11-drivers/xf86-video-siliconmotion/pkg-descr
trunk/x11-drivers/xf86-video-sis/pkg-descr
trunk/x11-drivers/xf86-video-tdfx/pkg-descr
trunk/x11-drivers/xf86-video-tga/pkg-descr
trunk/x11-drivers/xf86-video-trident/pkg-descr
trunk/x11-drivers/xf86-video-tseng/pkg-descr
trunk/x11-drivers/xf86-video-vesa/pkg-descr
trunk/x11-drivers/xf86-video-vmware/pkg-descr
trunk/x11-drivers/xf86-video-voodoo/pkg-descr
trunk/x11-drivers/xorg-drivers/pkg-descr
Modified: trunk/x11-drivers/Makefile
===================================================================
--- trunk/x11-drivers/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -39,7 +39,6 @@
SUBDIR += xf86-video-savage
SUBDIR += xf86-video-siliconmotion
SUBDIR += xf86-video-sis
-SUBDIR += xf86-video-sunffb
SUBDIR += xf86-video-tdfx
SUBDIR += xf86-video-tga
SUBDIR += xf86-video-trident
Modified: trunk/x11-drivers/input-wacom/Makefile
===================================================================
--- trunk/x11-drivers/input-wacom/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -5,25 +5,25 @@
PORTREVISION= 3
CATEGORIES= x11-drivers kld
MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
- SF/linuxwacom/linuxwacom/${WACOM_VERSION}:linuxwacom
+ SF/linuxwacom/xf86-input-wacom/:linuxwacom
DISTFILES= ${BSDWACOM}.tbz:bsdwacom \
${LINUXWACOM}.tar.bz2:linuxwacom
-EXTRACT_ONLY= ${BSDWACOM}.tbz
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org Wacom tablet driver and kernel module
LICENSE= gpl2
+BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
MAN4= wacom.4x
-MANCOMPRESSED= yes
+MAN1= xsetwacom.1
+#MANCOMPRESSED= yes
USE_GMAKE= yes
USE_RC_SUBR= wacom
-ONLY_FOR_ARCHS= i386
-
KMODDIR?= /boot/modules
XINPUTMODDIR= lib/xorg/modules/input
+MAN1DIR= man/man1
MAN4DIR= man/man4
WRKSRC= ${WRKDIR}
@@ -35,18 +35,24 @@
PKGMESSAGE= ${WRKDIR}/pkg-message-${PORTTYPE}
XORG_CAT= driver
-USE_XORG= xi
+USE_XORG= xi xrandr
-LINUXWACOM= linuxwacom-${WACOM_VERSION}
+LINUXWACOM= xf86-input-wacom-${WACOM_VERSION}
BSDWACOM= bsdwacom-${KLD_VERSION}
-WACOM_VERSION= 0.8.2-2
+WACOM_VERSION= 0.15.0
KLD_VERSION= 40
+PATCH_WRKSRC= ${WRKDIR}/${LINUXWACOM}
+CONFIGURE_WRKSRC= ${WRKDIR}/${LINUXWACOM}
+USE_AUTOTOOLS= autoconf
+MAKE_ARGS+= UDEV_CFLAGS=""
-OPTIONS= UWACOMKLD "Install USB kernel module" On
+OPTIONS_DEFINE= UWACOMKLD
+UWACOMKLD_DESC= Install USB kernel module (not supported on 8.x)
+NO_STAGE= yes
.include <bsd.port.pre.mk>
-.if defined(WITH_UWACOMKLD)
+.if ${PORT_OPTIONS:MUWACOMKLD}
PLIST_SUB+= UWACOMKLD="uwacom.ko"
PORTTYPE= usb
.else
@@ -54,13 +60,8 @@
PORTTYPE= serial
.endif
-do-configure:
- @cd ${WRKDIR}/linuxwacom \
- && ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${LINUXWACOM}.tar.bz2 \
- && ${SETENV} ${MAKE_ENV} ./run_configure
-
do-build:
-.if defined(WITH_UWACOMKLD)
+.if ${PORT_OPTIONS:MUWACOMKLD}
@cd ${WRKDIR}/uwacom \
&& ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${FAKE_MAKEARGS}
.endif
@@ -68,7 +69,7 @@
&& ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${FAKE_MAKEARGS}
do-install:
-.if defined(WITH_UWACOMKLD)
+.if ${PORT_OPTIONS:MUWACOMKLD}
@${MKDIR} ${KMODDIR}
@${INSTALL_KLD} ${WRKDIR}/uwacom/uwacom.ko ${KMODDIR}/
.endif
@@ -77,8 +78,10 @@
&& ${SETENV} ${MAKE_ENV} ${GMAKE} ${FAKE_MAKEARGS} install
@${INSTALL} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/xdrv/wacom_drv.so \
${PREFIX}/${XINPUTMODDIR}/
- @${INSTALL_MAN} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/wacom.4x.gz \
+ @${INSTALL_MAN} ${WRKDIR}/${LINUXWACOM}/man/wacom.4x \
${PREFIX}/${MAN4DIR}/
+ @${INSTALL_MAN} ${WRKDIR}/${LINUXWACOM}/man/xsetwacom.1 \
+ ${PREFIX}/${MAN1DIR}/
plist: clean configure
@${ECHO} "===> Rebuilding PLIST."
@@ -88,7 +91,7 @@
&& ${SETENV} ${MAKE_ENV} PREFIX=${WRKDIR}/plist ./run_configure
@${MKDIR} ${WRKDIR}/plist
@cd ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/util \
- && ${SETENV} ${MAKE_ENV} ${GMAKE} install
+ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL}
@cd ${WRKDIR}/linuxwacom \
&& ${SETENV} ${MAKE_ENV} ./run_configure
@${FIND} ${WRKDIR}/plist/ -not -type d \
Modified: trunk/x11-drivers/input-wacom/distinfo
===================================================================
--- trunk/x11-drivers/input-wacom/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,6 +1,4 @@
SHA256 (xorg/driver/bsdwacom-40.tbz) = 42c37d321768ff29fef10eb088a87a83c94753a1b4ae5f92fd453781039a5df9
-RMD160 (xorg/driver/bsdwacom-40.tbz) = 5fd97a4368406f6414cb26aca142c85a5e4e7280
SIZE (xorg/driver/bsdwacom-40.tbz) = 19305
-SHA256 (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = 1d3b8dc397510309b14239291781135af0c4fab99907d8e0b8aad95465390733
-RMD160 (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = 850ef22abf12e21d69e299b55a2114502fb20d49
-SIZE (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = 1098067
+SHA256 (xorg/driver/xf86-input-wacom-0.15.0.tar.bz2) = 2e9b64c30fb223c46407bd0e105a54a1e83f378eb33ac68bd8a73fdbface000f
+SIZE (xorg/driver/xf86-input-wacom-0.15.0.tar.bz2) = 528528
Added: trunk/x11-drivers/input-wacom/files/patch-configure.ac
===================================================================
--- trunk/x11-drivers/input-wacom/files/patch-configure.ac (rev 0)
+++ trunk/x11-drivers/input-wacom/files/patch-configure.ac 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,11 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -56,7 +56,7 @@ PKG_CHECK_MODULES(XORG, [xorg-server >=
+ PKG_CHECK_MODULES(X11, x11 xi xrandr)
+
+ # Obtain compiler/linker options for libudev used by ISDV4 code
+-PKG_CHECK_MODULES(UDEV, libudev)
++#PKG_CHECK_MODULES(UDEV, libudev)
+
+ # X Server SDK location is required to install wacom header files
+ # This location is also relayed in the xorg-wacom.pc file
Index: trunk/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
===================================================================
--- trunk/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/x11-drivers/input-wacom/files/patch-src-Makefile.in
===================================================================
--- trunk/x11-drivers/input-wacom/files/patch-src-Makefile.in (rev 0)
+++ trunk/x11-drivers/input-wacom/files/patch-src-Makefile.in 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,40 @@
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -97,7 +97,7 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(@DRIVER_NAME at _drv_ladir)"
+ LTLIBRARIES = $(@DRIVER_NAME at _drv_la_LTLIBRARIES)
+ @DRIVER_NAME at _drv_la_LIBADD =
+-am__objects_1 = xf86Wacom.lo wcmCommon.lo wcmConfig.lo wcmISDV4.lo \
++am__objects_1 = xf86Wacom.lo wcmCommon.lo wcmConfig.lo \
+ wcmFilter.lo wcmUSB.lo wcmXCommand.lo wcmValidateDevice.lo \
+ wcmTouchFilter.lo
+ am_ at DRIVER_NAME@_drv_la_OBJECTS = $(am__objects_1)
+@@ -291,7 +291,6 @@ DRIVER_SOURCES = \
+ $(top_srcdir)/src/xf86Wacom.h \
+ $(top_srcdir)/src/wcmCommon.c \
+ $(top_srcdir)/src/wcmConfig.c \
+- $(top_srcdir)/src/wcmISDV4.c \
+ $(top_srcdir)/src/wcmFilter.c \
+ $(top_srcdir)/src/wcmFilter.h \
+ $(top_srcdir)/src/xf86WacomDefs.h \
+@@ -383,7 +382,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wcmCommon.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wcmConfig.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wcmFilter.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wcmISDV4.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wcmTouchFilter.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wcmUSB.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wcmValidateDevice.Plo at am__quote@
+@@ -467,12 +465,7 @@ wcmConfig.lo: $(top_srcdir)/src/wcmConfi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wcmConfig.lo `test -f '$(top_srcdir)/src/wcmConfig.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmConfig.c
+
+-wcmISDV4.lo: $(top_srcdir)/src/wcmISDV4.c
+- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wcmISDV4.lo -MD -MP -MF $(DEPDIR)/wcmISDV4.Tpo -c -o wcmISDV4.lo `test -f '$(top_srcdir)/src/wcmISDV4.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmISDV4.c
+- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wcmISDV4.Tpo $(DEPDIR)/wcmISDV4.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/wcmISDV4.c' object='wcmISDV4.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wcmISDV4.lo `test -f '$(top_srcdir)/src/wcmISDV4.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmISDV4.c
+
+ wcmFilter.lo: $(top_srcdir)/src/wcmFilter.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wcmFilter.lo -MD -MP -MF $(DEPDIR)/wcmFilter.Tpo -c -o wcmFilter.lo `test -f '$(top_srcdir)/src/wcmFilter.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmFilter.c
Added: trunk/x11-drivers/input-wacom/files/patch-src-wcmConfig.c
===================================================================
--- trunk/x11-drivers/input-wacom/files/patch-src-wcmConfig.c (rev 0)
+++ trunk/x11-drivers/input-wacom/files/patch-src-wcmConfig.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,16 @@
+--- src/wcmConfig.c.orig
++++ src/wcmConfig.c
+@@ -373,9 +373,12 @@ wcmDetectDeviceClass(const InputInfoPtr
+ return TRUE;
+
+ /* Bluetooth is also considered as USB */
++#if 0
+ if (gWacomISDV4Device.Detect(pInfo))
+ common->wcmDevCls = &gWacomISDV4Device;
+- else if (gWacomUSBDevice.Detect(pInfo))
++ else
++#endif
++ if (gWacomUSBDevice.Detect(pInfo))
+ common->wcmDevCls = &gWacomUSBDevice;
+ else
+ xf86Msg(X_ERROR, "%s: cannot identify device class.\n", pInfo->name);
Added: trunk/x11-drivers/input-wacom/files/patch-src-wcmUSB.c
===================================================================
--- trunk/x11-drivers/input-wacom/files/patch-src-wcmUSB.c (rev 0)
+++ trunk/x11-drivers/input-wacom/files/patch-src-wcmUSB.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,20 @@
+--- src/wcmUSB.c.orig
++++ src/wcmUSB.c
+@@ -23,10 +23,17 @@
+
+ #include "xf86Wacom.h"
+
++#ifndef __FreeBSD__
+ #include <asm/types.h>
++#endif
+ #include <linux/input.h>
+ #include <sys/utsname.h>
++#ifndef __FreeBSD__
+ #include <linux/version.h>
++#else
++#define LINUX_VERSION_CODE 1
++#define KERNEL_VERSION(a,b,c) 0
++#endif
+
+ #define MAX_USB_EVENTS 32
+
Added: trunk/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h
===================================================================
--- trunk/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h (rev 0)
+++ trunk/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,12 @@
+--- src/xf86WacomDefs.h.orig
++++ src/xf86WacomDefs.h
+@@ -24,7 +24,9 @@
+ * General Defines
+ ****************************************************************************/
+ #include <wacom-util.h>
++#ifndef __FreeBSD__
+ #include <asm/types.h>
++#endif
+ #include <linux/input.h>
+ #define MAX_USB_EVENTS 32
+
Added: trunk/x11-drivers/input-wacom/files/patch-tools-Makefile.in
===================================================================
--- trunk/x11-drivers/input-wacom/files/patch-tools-Makefile.in (rev 0)
+++ trunk/x11-drivers/input-wacom/files/patch-tools-Makefile.in 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig
++++ tools/Makefile.in
+@@ -54,6 +54,6 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-bin_PROGRAMS = xsetwacom$(EXEEXT) isdv4-serial-debugger$(EXEEXT)
++bin_PROGRAMS = xsetwacom$(EXEEXT)
+ @UNITTESTS_TRUE at check_PROGRAMS = xsetwacom-test$(EXEEXT)
+ subdir = tools
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
Index: trunk/x11-drivers/input-wacom/files/pkg-message-serial.in
===================================================================
--- trunk/x11-drivers/input-wacom/files/pkg-message-serial.in 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/files/pkg-message-serial.in 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/input-wacom/files/pkg-message-serial.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/input-wacom/files/pkg-message-usb.in
===================================================================
--- trunk/x11-drivers/input-wacom/files/pkg-message-usb.in 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/files/pkg-message-usb.in 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/input-wacom/files/pkg-message-usb.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-drivers/input-wacom/files/wacom.in
===================================================================
--- trunk/x11-drivers/input-wacom/files/wacom.in 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/files/wacom.in 2013-12-22 18:13:23 UTC (rev 15734)
@@ -20,10 +20,10 @@
# In USB mode the file /boot/loader.conf is also adjusted.
#
-. %%RC_SUBR%%
+. /etc/rc.subr
name="wacom"
-rcvar=${name}_enable
+rcvar=wacom_enable
extra_commands="setup cleanup"
setup_cmd=do_setup
Property changes on: trunk/x11-drivers/input-wacom/files/wacom.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-drivers/input-wacom/pkg-descr
===================================================================
--- trunk/x11-drivers/input-wacom/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
@@ -12,6 +12,3 @@
* not tested
WWW: http://linuxwacom.sourceforge.net/
-
-- Kamikaze
-kamikaze at bsdforen.de
Property changes on: trunk/x11-drivers/input-wacom/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-drivers/input-wacom/pkg-plist
===================================================================
--- trunk/x11-drivers/input-wacom/pkg-plist 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/input-wacom/pkg-plist 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,12 +1,4 @@
-lib/libwacomcfg.so.0
-lib/libwacomcfg.so
-lib/libwacomcfg.la
-lib/libwacomcfg.a
-bin/wacdump
-bin/xidump
bin/xsetwacom
-include/wacomcfg/wacomcfg.h
- at dirrm include/wacomcfg
%%XINPUTMODDIR%%/wacom_drv.so
@dirrmtry %%XINPUTMODDIR%%
@cwd %%KMODDIR%%
Modified: trunk/x11-drivers/xf86-input-acecad/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-acecad/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-acecad/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-input-acecad
-PORTVERSION= 1.4.0
+PORTVERSION= 1.5.0
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org acecad input driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-input-acecad/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-acecad/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-acecad/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
-RMD160 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 3794aa5fb1f0becedac129117e0842122c92a541
-SIZE (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 255888
+SHA256 (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = c3032f38a07b54772299ce8832e16109a685ee63eeefbb17cef9fe1dd100a448
+SIZE (xorg/driver/xf86-input-acecad-1.5.0.tar.bz2) = 262818
Index: trunk/x11-drivers/xf86-input-acecad/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-acecad/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-acecad/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-acecad/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-elographics/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-elographics/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-elographics/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -2,7 +2,8 @@
# $MidnightBSD$
PORTNAME= xf86-input-elographics
-PORTVERSION= 1.2.4
+PORTVERSION= ${ELO_VERSION}
+PORTREVISION= ${ELO_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -10,6 +11,15 @@
LICENSE= mit
XORG_CAT= driver
-MAN4= elographics.4x
+.include <bsd.mport.options.mk>
+
+.if defined(WITH_NEW_XORG)
+ELO_VERSION= 1.4.1
+ELO_REVISION= 0
+.else
+ELO_VERSION= 1.2.4
+ELO_REVISION= 0
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-elographics/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-elographics/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-elographics/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,4 @@
SHA256 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b
-RMD160 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 3a26e33fc700a4525e90e1f75a0bd7620f484628
SIZE (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 259101
+SHA256 (xorg/driver/xf86-input-elographics-1.4.1.tar.bz2) = a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4
+SIZE (xorg/driver/xf86-input-elographics-1.4.1.tar.bz2) = 280311
Index: trunk/x11-drivers/xf86-input-elographics/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-elographics/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-elographics/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-elographics/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-hyperpen/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-hyperpen/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-hyperpen/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= xf86-input-hyperpen
-PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTVERSION= ${HYPERVER}
+PORTREVISION= ${HYPERREVISION}
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -11,4 +11,15 @@
XORG_CAT= driver
+.include <bsd.mport.options.mk>
+
+.if defined(WITH_NEW_XORG)
+HYPERVER= 1.4.1
+HYPERREVISION= 0
+.else
+HYPERVER= 1.3.0
+HYPERREVISION= 6
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-hyperpen/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-hyperpen/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-hyperpen/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,4 @@
SHA256 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
-RMD160 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 884701e64960fd91ad01f58224bfb992b3155fa5
SIZE (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 236593
+SHA256 (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 31a816f032a2adf4be10909811831191a7528152347e1726b04810ff88436816
+SIZE (xorg/driver/xf86-input-hyperpen-1.4.1.tar.bz2) = 266891
Added: trunk/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c
===================================================================
--- trunk/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c (rev 0)
+++ trunk/x11-drivers/xf86-input-hyperpen/files/extra-patch-src_xf86HyperPen.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,75 @@
+--- src/xf86HyperPen.c.orig 2009-02-26 16:31:24.000000000 -0600
++++ src/xf86HyperPen.c 2010-05-03 12:29:11.000000000 -0500
+@@ -719,6 +719,9 @@
+ {
+ LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate;
+ HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp);
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom axis_labels[3] = { 0 };
++#endif
+
+ if (xf86HypOpen(local) != Success) {
+ if (local->fd >= 0) {
+@@ -730,6 +733,9 @@
+ /* Set the real values */
+ InitValuatorAxisStruct(pHyp,
+ 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
+ 0, /* min val */
+ priv->hypXSize, /* max val */
+ LPI2CPM(priv->hypRes), /* resolution */
+@@ -737,6 +743,9 @@
+ LPI2CPM(priv->hypRes)); /* max_res */
+ InitValuatorAxisStruct(pHyp,
+ 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
+ 0, /* min val */
+ priv->hypYSize, /* max val */
+ LPI2CPM(priv->hypRes), /* resolution */
+@@ -744,6 +753,9 @@
+ LPI2CPM(priv->hypRes)); /* max_res */
+ InitValuatorAxisStruct(pHyp,
+ 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[2],
++#endif
+ 0, /* min val */
+ 511, /* max val */
+ 512, /* resolution */
+@@ -765,8 +777,10 @@
+ int loop;
+ LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate;
+ HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp);
+-
+-
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom btn_labels[4] = { 0 };
++ Atom axis_labels[3] = { 0 };
++#endif
+
+ switch (what) {
+ case DEVICE_INIT:
+@@ -779,6 +793,9 @@
+
+ if (InitButtonClassDeviceStruct(pHyp,
+ nbbuttons,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ btn_labels,
++#endif
+ map) == FALSE) {
+ ErrorF("unable to allocate Button class device\n");
+ return !Success;
+@@ -802,6 +819,9 @@
+
+ if (InitValuatorClassDeviceStruct(pHyp,
+ nbaxes,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels,
++#endif
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+ #endif
Deleted: trunk/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c
===================================================================
--- trunk/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-hyperpen/files/patch-src_xf86HyperPen.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,75 +0,0 @@
---- src/xf86HyperPen.c.orig 2009-02-26 16:31:24.000000000 -0600
-+++ src/xf86HyperPen.c 2010-05-03 12:29:11.000000000 -0500
-@@ -719,6 +719,9 @@
- {
- LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate;
- HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp);
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+ Atom axis_labels[3] = { 0 };
-+#endif
-
- if (xf86HypOpen(local) != Success) {
- if (local->fd >= 0) {
-@@ -730,6 +733,9 @@
- /* Set the real values */
- InitValuatorAxisStruct(pHyp,
- 0,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+ axis_labels[0],
-+#endif
- 0, /* min val */
- priv->hypXSize, /* max val */
- LPI2CPM(priv->hypRes), /* resolution */
-@@ -737,6 +743,9 @@
- LPI2CPM(priv->hypRes)); /* max_res */
- InitValuatorAxisStruct(pHyp,
- 1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+ axis_labels[1],
-+#endif
- 0, /* min val */
- priv->hypYSize, /* max val */
- LPI2CPM(priv->hypRes), /* resolution */
-@@ -744,6 +753,9 @@
- LPI2CPM(priv->hypRes)); /* max_res */
- InitValuatorAxisStruct(pHyp,
- 2,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+ axis_labels[2],
-+#endif
- 0, /* min val */
- 511, /* max val */
- 512, /* resolution */
-@@ -765,8 +777,10 @@
- int loop;
- LocalDevicePtr local = (LocalDevicePtr)pHyp->public.devicePrivate;
- HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp);
--
--
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+ Atom btn_labels[4] = { 0 };
-+ Atom axis_labels[3] = { 0 };
-+#endif
-
- switch (what) {
- case DEVICE_INIT:
-@@ -779,6 +793,9 @@
-
- if (InitButtonClassDeviceStruct(pHyp,
- nbbuttons,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+ btn_labels,
-+#endif
- map) == FALSE) {
- ErrorF("unable to allocate Button class device\n");
- return !Success;
-@@ -802,6 +819,9 @@
-
- if (InitValuatorClassDeviceStruct(pHyp,
- nbaxes,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+ axis_labels,
-+#endif
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- xf86GetMotionEvents,
- #endif
Index: trunk/x11-drivers/xf86-input-hyperpen/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-hyperpen/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-hyperpen/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-hyperpen/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-joystick/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-joystick/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-joystick/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= xf86-input-joystick
-PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTVERSION= ${JOYVER}
+PORTREVISION= ${JOYREVISION}
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -11,8 +11,16 @@
XORG_CAT= driver
-MAN4= joystick.4x
+.include <bsd.mport.options.mk>
+.if defined(WITH_NEW_XORG)
+JOYVER= 1.6.2
+JOYREVISION= 0
+.else
+JOYVER= 1.5.0
+JOYREVISION= 1
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/Makefile.in
Modified: trunk/x11-drivers/xf86-input-joystick/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-joystick/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-joystick/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,4 @@
SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
-RMD160 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 9266c2772f0eeb20e8bab47e570794f2af76d7be
SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
+SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
+SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539
Index: trunk/x11-drivers/xf86-input-joystick/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-joystick/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-joystick/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-joystick/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-keyboard/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-keyboard/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-keyboard/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-input-keyboard
-PORTVERSION= 1.5.0
+PORTVERSION= 1.8.0
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org keyboard input driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-input-keyboard/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-keyboard/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-keyboard/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0
-RMD160 (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = fdb474b78f42503eaed73e78e27f7ac9e39513b8
-SIZE (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 301181
+SHA256 (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b
+SIZE (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 323838
Index: trunk/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
===================================================================
--- trunk/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c
===================================================================
--- trunk/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c (rev 0)
+++ trunk/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,14 @@
+Index: src/bsd_kbd.c
+@@ -205,6 +205,12 @@
+ #endif
+ }
+ }
++/*
++ * Switch keyboards which are not attached to console in RAW mode
++ */
++#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
++ ioctl(pInfo->fd, KDSKBMODE, K_RAW);
++#endif
+ return Success;
+ }
+
Added: trunk/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c
===================================================================
--- trunk/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c (rev 0)
+++ trunk/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,24 @@
+Index: src/kbd.c
+@@ -25,6 +25,7 @@
+
+ #include "xf86.h"
+ #include "atKeynames.h"
++#include "xf86Priv.h"
+ #include "xf86Privstr.h"
+
+ #include <X11/extensions/XI.h>
+@@ -392,6 +393,14 @@
+ RemoveEnabledDevice(pInfo->fd);
+ pKbd->KbdOff(pInfo, what);
+ device->public.on = FALSE;
++ /*
++ * Close device file for keyboards which are not attached
++ * to console, otherwise they can't be opened again after
++ * relogin when using session manager like xdm.
++ * X server will take care about console attached keyboards.
++ */
++ if (pInfo->fd != xf86Info.consoleFd)
++ close(pInfo->fd);
+ break;
+
+ default:
Index: trunk/x11-drivers/xf86-input-keyboard/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-keyboard/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-keyboard/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-keyboard/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-mouse/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mouse/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= xf86-input-mouse
-PORTVERSION= 1.7.1
+PORTVERSION= 1.9.0
+PORTREVISION= 0
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -8,10 +9,7 @@
COMMENT= X.Org mouse input driver
LICENSE= mit
-CONFIGURE_ARGS+=--disable-silent-rules
-
XORG_CAT= driver
-USE_XORG= xextproto videoproto
-MAN4= mousedrv.4x
+USES= pathfix
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-mouse/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mouse/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
-RMD160 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 27ec9a6578b2fb97e135afb991b0ff73dc656da4
-SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429
+SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488
+SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339
Modified: trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,32 +1,79 @@
---- src/bsd_mouse.c.orig 2008-11-26 23:11:36.000000000 -0500
-+++ src/bsd_mouse.c 2009-04-07 17:10:17.000000000 -0400
-@@ -1,4 +1,3 @@
--
- /*
- * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
- *
-@@ -71,15 +70,20 @@
- static const char *FindDevice(InputInfoPtr, const char *, int);
+--- 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
+@@ -26,6 +26,24 @@
+ * authorization from the copyright holder(s) and author(s).
+ */
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
++
++/*
++ * XXX - Should this be autoconf'd instead?
++ */
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++
++#if !defined(USBMOUSE_SUPPORT)
++#define USBMOUSE_SUPPORT
++#endif
++#if !defined(HAS_LIB_USB_HID)
++#define HAS_LIB_USB_HID
++#endif
++#if !defined(XPS2_SUPPORT)
+#define XPS2_SUPPORT
+#endif
- /* These are for FreeBSD and DragonFly */
- #define DEFAULT_MOUSE_DEV "/dev/mouse"
- #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
- #define DEFAULT_PS2_DEV "/dev/psm0"
-+#define DEFAULT_USB_DEV "/dev/ums0"
++
++#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) */
++
+ #include <xorg-server.h>
+ #include <X11/X.h>
+@@ -33,9 +51,23 @@
+ #include "xf86Priv.h"
+ #include "xf86_OSlib.h"
+ #include "xf86Xinput.h"
++#include <exevents.h>
+ #include "mouse.h"
+ #include "xisb.h"
+ #include "mipointer.h"
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
++#define HAVE_PROPERTIES 1
++#endif
++#ifdef HAVE_PROPERTIES
++#include <X11/Xatom.h>
++#include <xserver-properties.h>
++/* 1.6 has properties, but no labels */
++#ifdef AXIS_LABEL_PROP
++#define HAVE_LABELS
++#else
++#undef HAVE_LABELS
++#endif
++#endif
+ #ifdef WSCONS_SUPPORT
+ #include <dev/wscons/wsconsio.h>
+ #endif
+@@ -47,9 +79,6 @@
+ #endif
+
+ #include <dev/usb/usb.h>
+-#ifdef USB_GET_REPORT_ID
+-#define USB_NEW_HID
+-#endif
+
+ #define HUP_GENERIC_DESKTOP 0x0001
+ #define HUP_BUTTON 0x0009
+@@ -75,11 +104,13 @@
+ #define DEFAULT_MOUSE_DEV "/dev/mouse"
+ #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
+ #define DEFAULT_PS2_DEV "/dev/psm0"
++#define DEFAULT_USB_DEV "/dev/ums0"
+
static const char *mouseDevs[] = {
- DEFAULT_MOUSE_DEV,
- DEFAULT_SYSMOUSE_DEV,
- DEFAULT_PS2_DEV,
-+ DEFAULT_USB_DEV,
- NULL
+ DEFAULT_MOUSE_DEV,
+ DEFAULT_SYSMOUSE_DEV,
+ DEFAULT_PS2_DEV,
++ DEFAULT_USB_DEV,
+ NULL
};
#elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-@@ -100,7 +104,11 @@
+@@ -100,7 +131,11 @@
#if defined(__NetBSD__)
return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
@@ -33,32 +80,30 @@
- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 |
+#ifdef XPS2_SUPPORT
-+ MSE_XPS2 |
++ MSE_XPS2 |
+#endif
-+ MSE_AUTO | MSE_MISC;
++ MSE_AUTO | MSE_MISC;
#else
- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
#endif
-@@ -179,10 +187,31 @@
- { MOUSE_PROTO_THINK, "ThinkingMouse" },
- { MOUSE_PROTO_SYSMOUSE, "SysMouse" }
+@@ -180,9 +215,30 @@
+ { MOUSE_PROTO_SYSMOUSE, "SysMouse" }
};
--
-+
+
+#ifdef XPS2_SUPPORT
+static struct {
-+ int dmodel;
-+ char *name;
++ int dmodel;
++ const char *name;
+} ps2proto[] = {
-+ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" },
-+ { MOUSE_MODEL_NET, "NetMousePS/2" },
-+ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" },
-+ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" },
-+ { MOUSE_MODEL_INTELLI, "IMPS/2" },
-+ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" },
-+ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" },
-+ { MOUSE_MODEL_4D, "IMPS/2" },
-+ { MOUSE_MODEL_4DPLUS, "IMPS/2" },
++ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" },
++ { MOUSE_MODEL_NET, "NetMousePS/2" },
++ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" },
++ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" },
++ { MOUSE_MODEL_INTELLI, "IMPS/2" },
++ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" },
++ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" },
++ { MOUSE_MODEL_4D, "IMPS/2" },
++ { MOUSE_MODEL_4DPLUS, "IMPS/2" },
+};
+#endif
+
@@ -66,62 +111,58 @@
SetupAuto(InputInfoPtr pInfo, int *protoPara)
{
+#ifdef XPS2_SUPPORT
-+ char *dev;
++ const char *dev;
+#endif
+ const char *proto;
int i;
mousehw_t hw;
mousemode_t mode;
-@@ -190,10 +219,16 @@
+@@ -190,7 +246,13 @@
if (pInfo->fd == -1)
- return NULL;
+ return NULL;
+#ifdef XPS2_SUPPORT
/* set the driver operation level, if applicable */
+ dev = xf86FindOptionValue(pInfo->options, "Device");
+ if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
-+ i = 2;
++ i = 2;
+ else
+#endif
i = 1;
ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
--
-+
- /* interrogate the driver and get some intelligence on the device. */
- hw.iftype = MOUSE_IF_UNKNOWN;
- hw.model = MOUSE_MODEL_GENERIC;
-@@ -209,9 +244,18 @@
- protoPara[0] = mode.syncmask[0];
- protoPara[1] = mode.syncmask[1];
- }
-+ proto = devproto[i].name;
+
+@@ -209,9 +271,18 @@
+ protoPara[0] = mode.syncmask[0];
+ protoPara[1] = mode.syncmask[1];
+ }
++ proto = devproto[i].name;
+#ifdef XPS2_SUPPORT
-+ if (mode.protocol == MOUSE_PROTO_PS2)
-+ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
-+ if (hw.model == ps2proto[i].dmodel) {
-+ proto = ps2proto[i].name;
-+ break;
-+ }
++ if (mode.protocol == MOUSE_PROTO_PS2)
++ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
++ if (hw.model == ps2proto[i].dmodel) {
++ proto = ps2proto[i].name;
++ break;
++ }
+#endif
- xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
-- pInfo->name, devproto[i].name);
-- return devproto[i].name;
-+ pInfo->name, proto);
-+ return proto;
- }
- }
+ xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
+- pInfo->name, devproto[i].name);
+- return devproto[i].name;
++ pInfo->name, proto);
++ return proto;
+ }
+ }
}
-@@ -234,41 +278,41 @@
- (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
- /*
- * As the FreeBSD sysmouse driver defaults to protocol level 0
-- * everytime it is opened we enforce protocol level 1 again at
-+ * everytime it is closed we enforce protocol level 1 again at
- * this point.
- */
- mode.level = 1;
+@@ -234,41 +305,41 @@
+ (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
+ /*
+ * As the FreeBSD sysmouse driver defaults to protocol level 0
+- * everytime it is opened we enforce protocol level 1 again at
++ * everytime it is closed we enforce protocol level 1 again at
+ * this point.
+ */
+ mode.level = 1;
} else
-- mode.level = -1;
+- mode.level = -1;
-#else
- mode.level = -1;
#endif
@@ -151,26 +192,26 @@
+ unsigned int i;
- if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
-- if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
-- if (kill(pid, 0) == 0) {
-- fclose(f);
-- return TRUE;
-- }
+- if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
+- if (kill(pid, 0) == 0) {
+- fclose(f);
+- return TRUE;
+- }
+ if (dev)
-+ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
++ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
+ else
-+ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
++ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
+ if ((f = popen(cmd, "r")) != NULL) {
-+ if (fscanf(f, "%u", &i) == 1 && i > 0) {
-+ pclose(f);
-+ return TRUE;
- }
-- fclose(f);
-+ pclose(f);
++ if (fscanf(f, "%u", &i) == 1 && i > 0) {
++ pclose(f);
++ return TRUE;
+ }
+- fclose(f);
++ pclose(f);
}
return FALSE;
}
-@@ -276,17 +320,17 @@
+@@ -276,17 +347,17 @@
static const char *
FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
{
@@ -182,63 +223,805 @@
struct stat sb;
for (pdev = mouseDevs; *pdev; pdev++) {
-- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
-- if (fd == -1) {
-+ SYSCALL (ret = stat(*pdev, &sb));
-+ if (ret == -1) {
+- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
+- if (fd == -1) {
++ SYSCALL (ret = stat(*pdev, &sb));
++ if (ret == -1) {
#ifdef DEBUG
-- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
-+ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
+- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
++ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
#endif
- } else {
- /*
-@@ -295,28 +339,32 @@
- * the test for whether /dev/sysmouse is usable can be made.
- */
- if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
-- if (fstat(fd, &devMouseStat) == 0)
-- devMouse = TRUE;
-- close(fd);
-+ memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
-+ devMouse = TRUE;
- continue;
- } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
- /* Check if /dev/mouse is the same as /dev/sysmouse. */
-- if (devMouse && fstat(fd, &sb) == 0 &&
-- devMouseStat.st_dev == sb.st_dev &&
-+ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
- devMouseStat.st_ino == sb.st_ino) {
- /* If the same, use /dev/sysmouse. */
- devMouse = FALSE;
- }
-- close(fd);
-- if (MousedRunning())
-+ if (MousedRunning(NULL))
- break;
-- else {
+ } else {
+ /*
+@@ -295,28 +366,32 @@
+ * the test for whether /dev/sysmouse is usable can be made.
+ */
+ if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
+- if (fstat(fd, &devMouseStat) == 0)
+- devMouse = TRUE;
+- close(fd);
++ memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
++ devMouse = TRUE;
+ continue;
+ } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
+ /* Check if /dev/mouse is the same as /dev/sysmouse. */
+- if (devMouse && fstat(fd, &sb) == 0 &&
+- devMouseStat.st_dev == sb.st_dev &&
++ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
+ devMouseStat.st_ino == sb.st_ino) {
+ /* If the same, use /dev/sysmouse. */
+ devMouse = FALSE;
+ }
+- close(fd);
+- if (MousedRunning())
++ if (MousedRunning(NULL))
+ break;
+- else {
-#ifdef DEBUG
-- ErrorF("moused isn't running\n");
+- ErrorF("moused isn't running\n");
-#endif
-- }
- } else {
-- close(fd);
-+ /* Check if /dev/mouse is the same as this device. */
-+ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
-+ devMouseStat.st_ino == sb.st_ino) {
-+ /* If the same, use this device. */
-+ devMouse = FALSE;
+- }
+ } else {
+- close(fd);
++ /* Check if /dev/mouse is the same as this device. */
++ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
++ devMouseStat.st_ino == sb.st_ino) {
++ /* If the same, use this device. */
++ devMouse = FALSE;
++ }
++ if (MousedRunning(*pdev))
++ continue;
++ /* ums(4) does not support anything but SysMouse protocol. */
++ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
++ xf86NameCmp(protocol, "auto") != 0 &&
++ xf86NameCmp(protocol, "sysmouse") != 0)
++ continue;
+ break;
+ }
+ }
+@@ -468,30 +543,78 @@
+
+ #if defined(USBMOUSE_SUPPORT)
+
++#define MAXRIDS 64
++#define MAXACOLS 8
++#define MAXLCOLS 16
+ typedef struct _UsbMseRec {
+ int packetSize;
+- int iid;
+- hid_item_t loc_x; /* x locator item */
+- hid_item_t loc_y; /* y locator item */
+- hid_item_t loc_z; /* z (wheel) locator item */
+- hid_item_t loc_w; /* z (wheel) locator item */
+- hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */
+- unsigned char *buffer;
++ int iid, nrids, nacols, opened;
++ struct {
++ int32_t rid;
++ int size;
++ } rids[MAXRIDS];
++ struct UsbMseAcol {
++ InputInfoPtr pInfo;
++ int nlcols, nbuttons, hasZ, hasW;
++ int xmin, xmax, ymin, ymax, pmin, pmax, px, py;
++ int cxmin, cxmax, cymin, cymax, cpmin, cpmax;
++ struct UsbMseLcol {
++ hid_item_t loc_x; /* x locator item */
++ hid_item_t loc_y; /* y locator item */
++ hid_item_t loc_z; /* z (wheel) locator item */
++ hid_item_t loc_w; /* w (hwheel) locator item */
++ hid_item_t loc_p; /* Tip Pressure */
++ hid_item_t loc_valid; /* Touch Valid */
++ hid_item_t loc_in_range; /* In Range */
++ hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */
++ } lcols[MAXLCOLS];
++ hid_item_t loc_cc; /* contact count */
++ } acols[MAXACOLS];
++ unsigned char *buffer;
+ } UsbMseRec, *UsbMsePtr;
+
++static int *
++usbGetReportSizePtr(UsbMsePtr pUsbMse, int32_t rid)
++{
++ int i;
++
++ for (i = 0; i < pUsbMse->nrids; i++) {
++ if (pUsbMse->rids[i].rid == rid)
++ return (&pUsbMse->rids[i].size);
++ }
++ for (i = 0; i < MAXRIDS; i++) {
++ if (pUsbMse->rids[i].size == 0) {
++ pUsbMse->rids[i].rid = rid;
++ pUsbMse->nrids = max(pUsbMse->nrids, i + 1);
++ return (&pUsbMse->rids[i].size);
++ }
++ }
++ return (NULL);
++}
++
+ static int
+ usbMouseProc(DeviceIntPtr pPointer, int what)
+ {
+ InputInfoPtr pInfo;
+ MouseDevPtr pMse;
+ UsbMsePtr pUsbMse;
++ struct UsbMseAcol *acol;
+ unsigned char map[MSE_MAXBUTTONS + 1];
+- int nbuttons;
++ int nacol, nbuttons;
++#ifdef HAVE_LABELS
++ Atom btn_labels[MSE_MAXBUTTONS] = {0};
++ Atom axes_labels[3] = { 0, 0, 0 };
++#endif
+
+ pInfo = pPointer->public.devicePrivate;
+ pMse = pInfo->private;
+ pMse->device = pPointer;
+ pUsbMse = pMse->mousePriv;
++ for (nacol = 0; nacol < (pUsbMse->nacols - 1); nacol++) {
++ if (pUsbMse->acols[nacol].pInfo == pInfo)
++ break;
++ }
++ acol = &pUsbMse->acols[nacol];
+
+ switch (what) {
+ case DEVICE_INIT:
+@@ -500,38 +623,96 @@
+ for (nbuttons = 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons)
+ map[nbuttons + 1] = nbuttons + 1;
+
+- InitPointerDeviceStruct((DevicePtr)pPointer,
+- map,
+- min(pMse->buttons, MSE_MAXBUTTONS),
+- miPointerGetMotionEvents,
+- pMse->Ctrl,
+- miPointerGetMotionBufferSize());
++#ifdef HAVE_LABELS
++ btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
++ btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
++ btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
++ axes_labels[0] = XIGetKnownProperty((acol->xmin != acol->xmax)
++ ? AXIS_LABEL_PROP_ABS_X : AXIS_LABEL_PROP_REL_X);
++ axes_labels[1] = XIGetKnownProperty((acol->xmin != acol->xmax)
++ ? AXIS_LABEL_PROP_ABS_Y : AXIS_LABEL_PROP_REL_Y);
++ axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
++#endif
++
++ InitButtonClassDeviceStruct(pPointer, min(pMse->buttons, MSE_MAXBUTTONS),
++#ifdef HAVE_LABELS
++ btn_labels,
++#endif
++ map);
++ InitValuatorClassDeviceStruct(pPointer, (acol->pmin != acol->pmax) ? 3 : 2,
++#ifdef HAVE_LABELS
++ axes_labels,
++#endif
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
++ miPointerGetMotionEvents,
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
++ GetMotionHistory,
++#endif
++ GetMotionHistorySize(),
++ (acol->xmin != acol->xmax || acol->ymin != acol->ymax) ?
++ Absolute : Relative);
++ InitPtrFeedbackClassDeviceStruct(pPointer, pMse->Ctrl);
+
+ /* X valuator */
+- xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1);
++ xf86InitValuatorAxisStruct(pPointer, 0,
++#ifdef HAVE_LABELS
++ axes_labels[0],
++#endif
++ (acol->xmin != acol->xmax) ? acol->xmin : -1,
++ (acol->xmin != acol->xmax) ? acol->xmax : -1,
++ 1, 0, 1
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++ , (acol->xmin != acol->xmax) ? Absolute : Relative
++#endif
++ );
+ xf86InitValuatorDefaults(pPointer, 0);
+ /* Y valuator */
+- xf86InitValuatorAxisStruct(pPointer, 1, 0, -1, 1, 0, 1);
++ xf86InitValuatorAxisStruct(pPointer, 1,
++#ifdef HAVE_LABELS
++ axes_labels[1],
++#endif
++ (acol->ymin != acol->ymax) ? acol->ymin : -1,
++ (acol->ymin != acol->ymax) ? acol->ymax : -1,
++ 1, 0, 1
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++ , (acol->ymin != acol->ymax) ? Absolute : Relative
++#endif
++ );
+ xf86InitValuatorDefaults(pPointer, 1);
++ /* Pressure valuator */
++ if (acol->pmin != acol->pmax) {
++ xf86InitValuatorAxisStruct(pPointer, 2,
++#ifdef HAVE_LABELS
++ axes_labels[2],
++#endif
++ acol->pmin, acol->pmax, 1, 0, 1
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++ , Absolute
++#endif
++ );
++ xf86InitValuatorDefaults(pPointer, 2);
++ }
+ xf86MotionHistoryAllocate(pInfo);
+ break;
+
+ case DEVICE_ON:
+- pInfo->fd = xf86OpenSerial(pInfo->options);
+- if (pInfo->fd == -1)
+- xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
+- else {
+- pMse->buffer = XisbNew(pInfo->fd, pUsbMse->packetSize);
+- if (!pMse->buffer) {
+- free(pMse);
+- xf86CloseSerial(pInfo->fd);
+- pInfo->fd = -1;
+- } else {
+- xf86FlushInput(pInfo->fd);
+- if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
+- pInfo))
+- AddEnabledDevice(pInfo->fd);
+- }
++ if (pUsbMse->opened++ == 0) {
++ pInfo->fd = xf86OpenSerial(pInfo->options);
++ if (pInfo->fd == -1)
++ xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
++ else {
++ pMse->buffer = XisbNew(pInfo->fd, pUsbMse->packetSize);
++ if (!pMse->buffer) {
++ free(pMse);
++ xf86CloseSerial(pInfo->fd);
++ pInfo->fd = -1;
++ } else {
++ xf86FlushInput(pInfo->fd);
++ if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
++ pInfo))
++ AddEnabledDevice(pInfo->fd);
++ }
+ }
-+ if (MousedRunning(*pdev))
-+ continue;
-+ /* ums(4) does not support anything but SysMouse protocol. */
-+ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
-+ xf86NameCmp(protocol, "auto") != 0 &&
-+ xf86NameCmp(protocol, "sysmouse") != 0)
-+ continue;
- break;
- }
- }
-@@ -782,7 +830,9 @@
+ }
+ pMse->lastButtons = 0;
+ pMse->lastMappedButtons = 0;
+@@ -553,6 +734,7 @@
+ xf86CloseSerial(pInfo->fd);
+ pInfo->fd = -1;
+ }
++ pUsbMse->opened--;
+ pPointer->public.on = FALSE;
+ usleep(300000);
+ break;
+@@ -568,45 +750,154 @@
+ {
+ MouseDevPtr pMse;
+ UsbMsePtr pUsbMse;
+- int buttons = pMse->lastButtons;
+- int dx = 0, dy = 0, dz = 0, dw = 0;
+- int n, c;
++ int buttons, cc;
++ int dx, dy, dz, dw, dp, upd, v, nx, ny, np, in_range;
++ int n, c, rid, *sizep, nacol, nlcol;
+ unsigned char *pBuf;
++ struct UsbMseAcol *acol;
++ struct UsbMseLcol *lcol;
+
+ pMse = pInfo->private;
+ pUsbMse = pMse->mousePriv;
+
+ XisbBlockDuration(pMse->buffer, -1);
++next:
+ pBuf = pUsbMse->buffer;
+ n = 0;
+- while ((c = XisbRead(pMse->buffer)) >= 0 && n < pUsbMse->packetSize) {
++ if (pUsbMse->iid) {
++ rid = XisbRead(pMse->buffer);
++ if (rid < 0)
++ return;
++ pBuf[n++] = (unsigned char)rid;
++ } else
++ rid = 0;
++ sizep = usbGetReportSizePtr(pUsbMse, rid);
++ if (sizep == NULL || *sizep == 0) {
++ xf86Msg(X_WARNING, "%s: unknown report ID %d\n", pInfo->name, rid);
++ goto next;
++ }
++ while (n < *sizep && (c = XisbRead(pMse->buffer)) >= 0) {
+ pBuf[n++] = (unsigned char)c;
+ }
+ if (n == 0)
+ return;
+- if (n != pUsbMse->packetSize) {
++// xf86MsgVerb(X_INFO, 3, "pkt: %d %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
++// n, pBuf[0], pBuf[1], pBuf[2], pBuf[3], pBuf[4], pBuf[5], pBuf[6], pBuf[7], pBuf[8], pBuf[9]);
++ if (n != *sizep) {
+ LogMessageVerbSigSafe(X_WARNING, -1,
+ "%s: incomplete packet, size %d\n",
+ pInfo->name, n);
+ }
+- /* discard packets with an id that don't match the mouse */
+- /* XXX this is probably not the right thing */
+- if (pUsbMse->iid != 0) {
+- if (*pBuf++ != pUsbMse->iid)
+- return;
+- }
+- dx = hid_get_data(pBuf, &pUsbMse->loc_x);
+- 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)
++ continue;
++ nx = ny = np = upd = 0;
++ buttons = cc = 0;
++ dx = dy = dz = dw = dp = 0;
++ for (nlcol = 0; nlcol < pUsbMse->acols[nacol].nlcols; nlcol++) {
++ lcol = &acol->lcols[nlcol];
++
++ if (lcol->loc_valid.usage != 0 && rid == lcol->loc_valid.report_ID &&
++ hid_get_data(pBuf, &lcol->loc_valid) == 0)
++ continue;
++ if (lcol->loc_in_range.usage != 0 && rid == lcol->loc_in_range.report_ID)
++ in_range = hid_get_data(pBuf, &lcol->loc_in_range);
++ else
++ in_range = 1;
++ if (in_range && lcol->loc_x.usage != 0 && rid == lcol->loc_x.report_ID && nx == 0) {
++ v = hid_get_data(pBuf, &lcol->loc_x);
++ if (acol->xmin != acol->xmax) {
++ v = xf86ScaleAxis(v, acol->xmax, acol->xmin,
++ lcol->loc_x.logical_maximum, lcol->loc_x.logical_minimum);
++ if (acol->cxmin != acol->cxmax)
++ v = xf86ScaleAxis(v, acol->xmax, acol->xmin,
++ acol->cxmax, acol->cxmin);
++ }
++ dx += v;
++ nx++;
++ }
++ if (in_range && lcol->loc_y.usage != 0 && rid == lcol->loc_y.report_ID && ny == 0) {
++ v = hid_get_data(pBuf, &lcol->loc_y);
++ if (acol->xmin != acol->xmax) {
++ v = xf86ScaleAxis(v, acol->ymax, acol->ymin,
++ lcol->loc_y.logical_maximum, lcol->loc_y.logical_minimum);
++ if (acol->cymin != acol->cymax)
++ v = xf86ScaleAxis(v, acol->ymax, acol->ymin,
++ acol->cymax, acol->cymin);
++ }
++ dy += v;
++ ny++;
++ }
++ if (lcol->loc_z.usage != 0 && rid == lcol->loc_z.report_ID) {
++ dz -= hid_get_data(pBuf, &lcol->loc_z);
++ upd = 1;
++ }
++ if (lcol->loc_w.usage != 0 && rid == lcol->loc_w.report_ID) {
++ dw += hid_get_data(pBuf, &lcol->loc_w);
++ upd = 1;
++ }
++ if (lcol->loc_p.usage != 0 && rid == lcol->loc_p.report_ID && np == 0) {
++ v = hid_get_data(pBuf, &lcol->loc_p);
++ v = xf86ScaleAxis(v, acol->pmax, acol->pmin,
++ lcol->loc_p.logical_maximum, lcol->loc_p.logical_minimum);
++ if (acol->cpmin != acol->cpmax)
++ v = xf86ScaleAxis(v, acol->pmax, acol->pmin,
++ acol->cpmax, acol->cpmin);
++ dp += v;
++ np++;
++ }
++
++ for (n = 0; n < acol->nbuttons; n++) {
++ if (lcol->loc_btn[n].usage != 0 && rid == lcol->loc_btn[n].report_ID) {
++ if (hid_get_data(pBuf, &lcol->loc_btn[n]))
++ buttons |= (1 << UMS_BUT(n));
++ upd = 1;
++ }
++ }
++ }
++ if (acol->loc_cc.usage != 0 && rid == acol->loc_cc.report_ID)
++ cc = hid_get_data(pBuf, &acol->loc_cc);
++ else
++ cc = (nx || ny) ? 1 : 0;
++ if (cc > 1)
++ buttons = (1 << UMS_BUT(1));
++ if (nx != 0 && acol->xmin != acol->xmax)
++ dx /= nx;
++ if (ny != 0 && acol->ymin != acol->ymax)
++ dy /= ny;
++ if (np != 0 && acol->pmin != acol->pmax)
++ dp /= np;
++// if (upd || nx || ny || np)
++// xf86MsgVerb(X_INFO, 3, "%d cc %d dx %d dy %d dz %d dw %d press %d buttons %02x\n",
++// nacol, cc, dx, dy, dz, dw, dp, buttons);
++ if (nx != 0 || ny != 0) {
++ if (acol->pmin != acol->pmax) {
++ xf86PostMotionEvent(acol->pInfo->dev,
++ /* is_absolute: */ TRUE,
++ /* first_valuator: */ 0,
++ /* num_valuators: */ 3,
++ dx, dy, dp);
++ } else if (acol->xmin != acol->xmax || acol->ymin != acol->ymax) {
++ xf86PostMotionEvent(acol->pInfo->dev,
++ /* is_absolute: */ TRUE,
++ /* first_valuator: */ 0,
++ /* num_valuators: */ 2,
++ dx, dy);
++ }
++ }
++ if (upd || (nx != 0) || (ny != 0)) {
++ ((MouseDevPtr)acol->pInfo->private)->PostEvent(acol->pInfo, buttons,
++ ((acol->xmin != acol->xmax) ? dx - acol->px : dx),
++ ((acol->ymin != acol->ymax) ? dy - acol->py : dy),
++ dz, dw);
++ }
++ if (nx > 0)
++ acol->px = dx;
++ if (ny > 0)
++ acol->py = dy;
+ }
+- pMse->PostEvent(pInfo, buttons, dx, dy, dz, dw);
+- return;
++ goto next;
+ }
+
+ static void
+@@ -615,14 +906,17 @@
+ usbReadInput ((InputInfoPtr) closure);
+ }
+
+-/* This function is called when the protocol is "usb". */
+ static Bool
+-usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
++usbInitFirst(InputInfoPtr pInfo)
+ {
+ MouseDevPtr pMse = pInfo->private;
+ UsbMsePtr pUsbMse;
+ report_desc_t reportDesc;
+- int i;
++ hid_data_t d;
++ hid_item_t h;
++ struct UsbMseAcol *acol;
++ struct UsbMseLcol *lcol;
++ int mdepth, rsize, *rsizep, acolused, lcolused, used;
+
+ pUsbMse = malloc(sizeof(UsbMseRec));
+ if (pUsbMse == NULL) {
+@@ -631,12 +925,7 @@
+ return FALSE;
+ }
+
+- pMse->protocol = protocol;
+- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
+-
+- /* Collect the options, and process the common options. */
+- COLLECT_INPUT_OPTIONS(pInfo, NULL);
+- xf86ProcessCommonOptions(pInfo, pInfo->options);
++ bzero(pUsbMse, sizeof(UsbMseRec));
+
+ /* Check if the device can be opened. */
+ pInfo->fd = xf86OpenSerial(pInfo->options);
+@@ -652,19 +941,134 @@
+ }
+ /* Get USB informations */
+ reportDesc = hid_get_report_desc(pInfo->fd);
+- /* Get packet size & iid */
+-#ifdef USB_NEW_HID
+- if (ioctl(pInfo->fd, USB_GET_REPORT_ID, &pUsbMse->iid) == -1) {
+- 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];
++ lcol = &acol->lcols[acol->nlcols];
++ acolused = 0;
++ lcolused = 0;
++ d = hid_start_parse(reportDesc, (1 << hid_input) |
++ (1 << hid_collection) | (1 << hid_endcollection), -1);
++ while (hid_get_item(d, &h)) {
++ switch (h.kind) {
++ case hid_collection:
++ if (mdepth != 0)
++ mdepth++;
++ else if (h.collection == 1 &&
++ (h.usage == 0x00010001 || h.usage == 0x00010002 ||
++ (h.usage >= 0x000d0001 && h.usage <= 0x000d000d))) {
++ mdepth++;
++ if (acolused) {
++ if (lcolused) {
++ acol->nlcols++;
++ lcolused = 0;
++ }
++ pUsbMse->nacols++;
++ acolused = 0;
++ acol = &pUsbMse->acols[pUsbMse->nacols];
++ lcol = &acol->lcols[acol->nlcols];
++ }
++ }
++ if (lcolused && (h.collection == 0 ||
++ h.collection == 2 || h.collection == 3)) {
++ acol->nlcols++;
++ lcolused = 0;
++ lcol = &acol->lcols[acol->nlcols];
++ }
++ break;
++ case hid_endcollection:
++ if (mdepth != 0)
++ mdepth--;
++ break;
++ case hid_input:
++ if (h.report_ID != 0)
++ pUsbMse->iid = 1;
++ rsize = pUsbMse->iid +
++ (h.pos + (h.report_size * h.report_count) + 7) / 8;
++ if ((rsizep = usbGetReportSizePtr(pUsbMse, h.report_ID)) != NULL)
++ *rsizep = max(*rsizep, rsize);
++ pUsbMse->packetSize = max(pUsbMse->packetSize, rsize);
++ if (mdepth == 0)
++ break;
++ used = 1;
++ if (h.usage == 0x00010030) { /* X */
++ lcol->loc_x = h;
++ if ((h.flags & 0x04) == 0) {
++ if (acol->xmin == acol->xmax) {
++ acol->xmin = h.logical_minimum;
++ acol->xmax = h.logical_maximum;
++ } else {
++ acol->xmin = min(acol->xmin, h.logical_minimum);
++ acol->xmax = max(acol->xmax, h.logical_maximum);
++ }
++ }
++ } else if (h.usage == 0x00010031) { /* Y */
++ lcol->loc_y = h;
++ if ((h.flags & 0x04) == 0) {
++ if (acol->ymin == acol->ymax) {
++ acol->ymin = h.logical_minimum;
++ acol->ymax = h.logical_maximum;
++ } else {
++ acol->ymin = min(acol->ymin, h.logical_minimum);
++ acol->ymax = max(acol->ymax, h.logical_maximum);
++ }
++ }
++ } else if (h.usage == 0x00010038) { /* Z */
++ lcol->loc_z = h;
++ acol->hasZ = 1;
++ } else if (h.usage == 0x000c0238) { /* W */
++ lcol->loc_w = h;
++ acol->hasW = 1;
++ } else if (h.usage == 0x000d0030) { /* Press */
++ lcol->loc_p = h;
++ if ((h.flags & 0x04) == 0) {
++ if (acol->pmin == acol->pmax) {
++ acol->pmin = h.logical_minimum;
++ acol->pmax = h.logical_maximum;
++ } else {
++ acol->pmin = min(acol->pmin, h.logical_minimum);
++ acol->pmax = max(acol->pmax, h.logical_maximum);
++ }
++ }
++ } else if (h.usage == 0x000d0032) /* In Range */
++ lcol->loc_in_range = h;
++ else if (h.usage == 0x000d0047) /* Valid */
++ lcol->loc_valid = h;
++ else if (h.usage > 0x00090000 &&
++ h.usage <= 0x00090000 + MSE_MAXBUTTONS) { /* Buttons */
++ lcol->loc_btn[(h.usage & 0xffff) - 1] = h;
++ acol->nbuttons = max(acol->nbuttons, h.usage & 0xffff);
++ } else if (h.usage == 0x000d0042) { /* Tip Switch */
++ lcol->loc_btn[0] = h;
++ acol->nbuttons = max(acol->nbuttons, 1);
++ } else if (h.usage == 0x000d0044) { /* Barrel Switch */
++ lcol->loc_btn[1] = h;
++ acol->nbuttons = max(acol->nbuttons, 2);
++ } else if (h.usage == 0x000d0045) { /* Eraser */
++ lcol->loc_btn[3] = h;
++ acol->nbuttons = max(acol->nbuttons, 4);
++ } else if (h.usage == 0x000d0046) { /* Tablet Pick */
++ lcol->loc_btn[2] = h;
++ acol->nbuttons = max(acol->nbuttons, 3);
++ } else if (h.usage == 0x000d0054) /* Contact Count */
++ acol->loc_cc = h;
++ else
++ used = 0;
++ lcolused += used;
++ acolused += used;
++ break;
++ default:
++ break;
++ }
++ }
++ if (lcolused)
++ acol->nlcols++;
++ if (acolused)
++ pUsbMse->nacols++;
++ hid_end_parse(d);
++ xf86Msg(X_DEFAULT, "%s: Found %d usable logical collections\n",
++ pInfo->name, pUsbMse->nacols);
++
+ /* Allocate buffer */
+ if (pUsbMse->packetSize <= 8) {
+ pUsbMse->buffer = pMse->protoBuf;
+@@ -674,56 +1078,129 @@
+ if (pUsbMse->buffer == NULL) {
+ xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name);
+ free(pUsbMse);
+- free(pMse);
+ xf86CloseSerial(pInfo->fd);
+ return FALSE;
+ }
+-#ifdef USB_NEW_HID
+- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
+- hid_input, &pUsbMse->loc_x, pUsbMse->iid) < 0) {
+- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name);
+- }
+- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y),
+- hid_input, &pUsbMse->loc_y, pUsbMse->iid) < 0) {
+- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name);
+- }
+- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL),
+- hid_input, &pUsbMse->loc_z, pUsbMse->iid) < 0) {
+- }
+-#else
+- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
+- hid_input, &pUsbMse->loc_x) < 0) {
+- xf86Msg(X_WARNING, "%s: no x locator\n", pInfo->name);
+- }
+- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y),
+- hid_input, &pUsbMse->loc_y) < 0) {
+- xf86Msg(X_WARNING, "%s: no y locator\n", pInfo->name);
+- }
+- if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL),
+- hid_input, &pUsbMse->loc_z) < 0) {
+- }
+-#endif
+- /* Probe for number of buttons */
+- for (i = 1; i <= MSE_MAXBUTTONS; i++) {
+- if (!hid_locate(reportDesc, HID_USAGE2(HUP_BUTTON, i),
+- hid_input, &pUsbMse->loc_btn[i-1]
+-#ifdef USB_NEW_HID
+- , pUsbMse->iid
+-#endif
+- ))
+- break;
+- }
+- pMse->buttons = i-1;
+
+ xf86CloseSerial(pInfo->fd);
+ pInfo->fd = -1;
+
+ /* Private structure */
+ pMse->mousePriv = pUsbMse;
++ return TRUE;
++}
++
++/* This function is called when the protocol is "usb". */
++static Bool
++usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
++{
++ InputInfoPtr pMatch;
++ MouseDevPtr pMse = pInfo->private;
++ UsbMsePtr pUsbMse;
++ struct UsbMseAcol *acol;
++ char *str;
++ int i, colopt;
++
++ pMse->protocol = protocol;
++ xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
++
++ /* Collect the options, and process the common options. */
++ COLLECT_INPUT_OPTIONS(pInfo, NULL);
++ xf86ProcessCommonOptions(pInfo, pInfo->options);
++
++ /* Check if this HID device is already opened. */
++ for (pMatch = xf86FirstLocalDevice(); pMatch != NULL; pMatch = pMatch->next) {
++ if ((pInfo != pMatch) && strstr(pMatch->drv->driverName, "mouse")) {
++ char *dev1, *dev2;
++
++ dev1 = xf86SetStrOption(pInfo->options, "Device", NULL);
++ dev2 = xf86SetStrOption(pMatch->options, "Device", NULL);
++ if (strcmp(dev1, dev2) == 0) {
++ free(dev1);
++ free(dev2);
++ break;
++ }
++ free(dev1);
++ free(dev2);
++ }
++ }
++ if (pMatch == NULL) {
++ xf86Msg(X_DEFAULT, "%s: Opening new HID device\n", pInfo->name);
++ if (!usbInitFirst(pInfo)) {
++ free(pMse);
++ return FALSE;
++ }
++ } else {
++ pMse->mousePriv = ((MouseDevPtr)pMatch->private)->mousePriv;
++ xf86Msg(X_DEFAULT, "%s: Attaching to already opened HID device\n",
++ pInfo->name);
++ }
++ pUsbMse = pMse->mousePriv;
++
++ /* Attach to collection, respecting "Collection" option. */
++ colopt = xf86SetIntOption(pInfo->options, "Collection", 0);
++ for (i = 0; i < pUsbMse->nacols; i++) {
++ if (pUsbMse->acols[i].pInfo == NULL &&
++ (colopt == 0 || i == colopt - 1)) {
++ pUsbMse->acols[i].pInfo = pInfo;
++ break;
++ }
++ }
++ xf86Msg(colopt == 0 ? X_DEFAULT : X_CONFIG,
++ "%s: Collection: %d\n", pInfo->name,
++ i == pUsbMse->nacols ? colopt : i + 1);
++ if (i == pUsbMse->nacols) {
++ xf86Msg(X_ERROR,
++ "%s: Application collection not found or already handled\n",
++ pInfo->name);
++ free(pMse);
++ return FALSE;
++ }
++
++ acol = &pUsbMse->acols[i];
++ pMse->buttons = acol->nbuttons;
++ if (pMse->buttons == 2)
++ pMse->buttons = 3;
++ if (acol->xmin != acol->xmax || acol->ymin != acol->ymax)
++ pMse->disableXY = TRUE;
++ pMse->hasZ = acol->hasZ;
++ pMse->hasW = acol->hasW;
+
+ /* Process common mouse options (like Emulate3Buttons, etc). */
+ pMse->CommonOptions(pInfo);
+
++ /* Process "Calibration" option. */
++ str = xf86CheckStrOption(pInfo->options, "Calibration", NULL);
++ if (str != NULL && (acol->xmin != acol->xmax || acol->ymin != acol->ymax)) {
++ int j, xmin, xmax, ymin, ymax, pmin, pmax;
++
++ j = sscanf(str, "%d %d %d %d %d %d", &xmin, &xmax, &ymin, &ymax, &pmin, &pmax);
++ if (j == 4) {
++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d\n",
++ pInfo->name, xmin, xmax, ymin, ymax);
++ acol->cxmin = xmin;
++ acol->cxmax = xmax;
++ acol->cymin = ymin;
++ acol->cymax = ymax;
++ } else if (j == 6) {
++ xf86Msg(X_CONFIG, "%s: Calibration: %d %d %d %d %d %d\n",
++ pInfo->name, xmin, xmax, ymin, ymax, pmin, pmax);
++ acol->cxmin = xmin;
++ acol->cxmax = xmax;
++ acol->cymin = ymin;
++ acol->cymax = ymax;
++ acol->cpmin = pmin;
++ acol->cpmax = pmax;
++ } else
++ xf86Msg(X_WARNING, "%s: Calibration: Invalid arguments\n",
++ pInfo->name);
++ free(str);
++ } else if (acol->xmin != acol->xmax || acol->ymin != acol->ymax) {
++ xf86Msg(X_DEFAULT, "%s: Calibration: %d %d %d %d %d %d\n",
++ pInfo->name, acol->xmin, acol->xmax, acol->ymin, acol->ymax,
++ acol->pmin, acol->pmax);
++ }
++
+ /* Setup the local procs. */
+ pInfo->device_control = usbMouseProc;
+ pInfo->read_input = usbReadInput;
+@@ -766,7 +1243,9 @@
p->CheckProtocol = CheckProtocol;
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
p->SetupAuto = SetupAuto;
Property changes on: trunk/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in (rev 0)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,11 @@
+--- ./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 @@
+ # _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
+- at DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
++ at DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid
+ @DRIVER_NAME at _drv_ladir = @inputdir@
+
+ # We have to list all the mouse drivers here, even if we don't build them, so
Added: trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c (rev 0)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,195 @@
+--- 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 @@
+
+ pMse = pInfo->private;
+
+- pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
++ i = xf86SetIntOption(pInfo->options, "Buttons", 0);
++ if (i != 0)
++ pMse->buttons = i;
+ if (!pMse->buttons) {
+ pMse->buttons = MSE_DFLTBUTTONS;
+ buttons_from = X_DEFAULT;
+ }
+ origButtons = pMse->buttons;
+
++ s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
++ if (s) {
++ int b, n = 0;
++ char *s1 = s;
++ /* keep getting numbers which are buttons */
++ while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
++ /* check sanity for a button */
++ if (b < 0 || b > MSE_MAXBUTTONS) {
++ xf86Msg(X_WARNING,
++ "ButtonMapping: Invalid button number = %d\n", b);
++ break;
++ };
++ pMse->buttonMap[n++] = 1 << (b-1);
++ if (b > pMse->buttons) pMse->buttons = b;
++ }
++ free(s);
++ }
++ /* get maximum of mapped buttons */
++ for (i = pMse->buttons-1; i >= 0; i--) {
++ int f = ffs (pMse->buttonMap[i]);
++ if (f > pMse->buttons)
++ pMse->buttons = f;
++ }
++
+ pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
+ "Emulate3Buttons", FALSE);
+ if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
+@@ -298,6 +324,8 @@
+ "Emulate3Timeout", 50);
+ if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
+ MessageType from = X_CONFIG;
++ if (pMse->buttons < 3)
++ pMse->buttons = 3;
+ if (pMse->emulate3ButtonsSoft)
+ from = X_DEFAULT;
+ xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
+@@ -305,6 +333,8 @@
+ }
+
+ pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
++ if (pMse->chordMiddle && pMse->buttons < 3)
++ pMse->buttons = 3;
+ pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
+ if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
+ pMse->invX = -1;
+@@ -315,7 +345,7 @@
+ } else
+ pMse->invY = 1;
+ pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
+-
++ pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
+
+ if (pMse->pDragLock)
+ free(pMse->pDragLock);
+@@ -425,14 +455,17 @@
+ free(s);
+ }
+
+- s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
++ s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
++ pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
+ if (s) {
+ int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+ char *msg = NULL;
+
+ pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
+ pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
+- if (!xf86NameCmp(s, "x")) {
++ if (!xf86NameCmp(s, "off")) {
++ msg = xstrdup("off");
++ } else if (!xf86NameCmp(s, "x")) {
+ pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
+ msg = xstrdup("X axis");
+ } else if (!xf86NameCmp(s, "y")) {
+@@ -568,29 +601,6 @@
+ pInfo->name, wheelButton, pMse->wheelInertia,
+ pMse->wheelButtonTimeout);
+ }
+- s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
+- if (s) {
+- int b, n = 0;
+- char *s1 = s;
+- /* keep getting numbers which are buttons */
+- while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
+- /* check sanity for a button */
+- if (b < 0 || b > MSE_MAXBUTTONS) {
+- xf86Msg(X_WARNING,
+- "ButtonMapping: Invalid button number = %d\n", b);
+- break;
+- };
+- pMse->buttonMap[n++] = 1 << (b-1);
+- if (b > pMse->buttons) pMse->buttons = b;
+- }
+- free(s);
+- }
+- /* get maximum of mapped buttons */
+- for (i = pMse->buttons-1; i >= 0; i--) {
+- int f = ffs (pMse->buttonMap[i]);
+- if (f > pMse->buttons)
+- pMse->buttons = f;
+- }
+ if (origButtons != pMse->buttons)
+ buttons_from = X_CONFIG;
+ xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
+@@ -668,7 +678,6 @@
+ }
+ pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
+ pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
+- mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
+ }
+
+ static void
+@@ -959,6 +968,8 @@
+ /* 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);
++ pMse->hasZ = 1;
++ pMse->hasW = 0;
+
+ protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
+
+@@ -2136,7 +2147,7 @@
+
+ if (pMse->emulateWheel) {
+ /* Emulate wheel button handling */
+- if(pMse->wheelButton == 0)
++ if (pMse->wheelButton == 0)
+ wheelButtonMask = 0;
+ else
+ wheelButtonMask = 1 << (pMse->wheelButton - 1);
+@@ -2220,6 +2231,9 @@
+ }
+ }
+ }
++ } else {
++ pMse->wheelXDistance = 0;
++ pMse->wheelYDistance = 0;
+ }
+
+ /* Absorb the mouse movement while the wheel button is pressed. */
+@@ -2237,7 +2251,7 @@
+ if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
+ buttonTimer(pInfo);
+
+- if (dx || dy)
++ if ((dx || dy) && !pMse->disableXY)
+ xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
+
+ if (change) {
+@@ -2349,12 +2363,10 @@
+ int dx, int dy, int dz, int dw)
+ {
+ MouseDevPtr pMse;
+- mousePrivPtr mousepriv;
+ int zbutton = 0, wbutton = 0, zbuttoncount = 0, wbuttoncount = 0;
+ int i, b, buttons = 0;
+
+ pMse = pInfo->private;
+- mousepriv = (mousePrivPtr)pMse->mousePriv;
+
+ if (pMse->protocolID == PROT_MMHIT)
+ b = reverseBits(hitachMap, truebuttons);
+@@ -2447,11 +2459,11 @@
+
+ /* Accumulate the scaled dx, dy in the private variables
+ fracdx,fracdy and return the integer number part */
+- if (mousepriv) {
+- mousepriv->fracdx += mousepriv->sensitivity*dx;
+- mousepriv->fracdy += mousepriv->sensitivity*dy;
+- mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
+- mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
++ if (pMse->sensitivity != 0) {
++ pMse->fracdx += pMse->sensitivity*dx;
++ pMse->fracdy += pMse->sensitivity*dy;
++ pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
++ pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
+ }
+
+ /* If mouse wheel movement has to be mapped on a button, we need to
Added: trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h (rev 0)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,25 @@
+--- 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 @@
+ Bool emulate3ButtonsSoft;
+ int emulate3Timeout;/* Timeout for 3 button emulation */
+ Bool chordMiddle;
++ Bool disableXY;
+ Bool flipXY;
+ int invX;
+ int invY;
+ int resolution;
++ Bool hasW;
++ Bool hasZ;
+ int negativeZ; /* button mask */
+ int positiveZ; /* button mask */
+ int negativeW; /* button mask */
+@@ -259,6 +262,8 @@
+ int doubleClickOldSourceState;
+ int lastMappedButtons;
+ int buttonMap[MSE_MAXBUTTONS];
++ float fracdx,fracdy;
++ float sensitivity;
+ } MouseDevRec, *MouseDevPtr;
+
+ #endif /* _XF86OSMOUSE_H_ */
Added: trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h (rev 0)
+++ trunk/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,11 @@
+--- 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 @@
+ int acc;
+ CARD32 pnpLast;
+ Bool disablePnPauto;
+- float fracdx,fracdy;
+- float sensitivity;
+ } mousePrivRec, *mousePrivPtr;
+
+ /* mouse proto flags */
Index: trunk/x11-drivers/xf86-input-mouse/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mouse/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-mouse/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-mouse/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-input-mouse/pkg-plist 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mouse/pkg-plist 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,5 +1,9 @@
+include/xorg/xf86-mouse-properties.h
lib/xorg/modules/input/mouse_drv.la
lib/xorg/modules/input/mouse_drv.so
+libdata/pkgconfig/xorg-mouse.pc
+man/man4/mousedrv.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
+ at dirrmtry include/xorg
Modified: trunk/x11-drivers/xf86-input-mutouch/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-mutouch/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mutouch/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= xf86-input-mutouch
-PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTVERSION= 1.3.0
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -10,6 +9,11 @@
LICENSE= mit
XORG_CAT= driver
-MAN4= mutouch.4x
+.include <bsd.mport.options.mk>
+
+.if !defined(WITH_NEW_XORG)
+IGNORE= does not build with xorg-server 1.7.7
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-mutouch/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-mutouch/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mutouch/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
-RMD160 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = d4488b58d7826d9b31cd73dbf9c7113408383645
-SIZE (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 246240
+SHA256 (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = e28907ec71f010353550e897c7a1f161b59969c6ad84379fb5285e032448a43c
+SIZE (xorg/driver/xf86-input-mutouch-1.3.0.tar.bz2) = 268865
Index: trunk/x11-drivers/xf86-input-mutouch/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-mutouch/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-mutouch/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-mutouch/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-penmount/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-penmount/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-penmount/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= xf86-input-penmount
-PORTVERSION= 1.4.1
+PORTVERSION= ${PEN_VERSION}
+PORTREVISION= ${PEN_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -9,6 +10,15 @@
LICENSE= mit
XORG_CAT= driver
-MAN4= penmount.4x
+.include <bsd.mport.options.mk>
+
+.if defined(WITH_NEW_XORG)
+PEN_VERSION= 1.5.0
+PEN_REVISION= 0
+.else
+PEN_VERSION= 1.4.1
+PEN_REVISION= 1
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-penmount/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-penmount/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-penmount/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,4 @@
SHA256 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182
-RMD160 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 447f0e064e60531dbe9e30785566ea26a842d3ee
SIZE (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 255951
+SHA256 (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = f45a85911a59647ba24f84c15f49d31d5f62a9bb86ca56881bf3ecbc21113ce7
+SIZE (xorg/driver/xf86-input-penmount-1.5.0.tar.bz2) = 276864
Index: trunk/x11-drivers/xf86-input-penmount/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-penmount/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-penmount/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-penmount/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-synaptics/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-synaptics/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= xf86-input-synaptics
-PORTVERSION= 1.2.1
+PORTVERSION= ${SYNAPTICS_VERSION}
+PORTREVISION= ${SYNAPTICS_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -10,17 +11,19 @@
CONFLICTS= synaptics-[0-9]*
-USE_GNOME= gnomehack
-USE_XORG= x11
+USES= pathfix
+USE_XORG= x11 xtst
XORG_CAT= driver
-MAN1= syndaemon.1 \
- synclient.1
-MAN4= synaptics.4x
+.if defined(WITH_NEW_XORG)
+SYNAPTICS_VERSION= 1.7.2
+SYNAPTICS_REVISION= 0
+PLIST_SUB+= NEW="" OLD="@comment "
+.else
+SYNAPTICS_VERSION= 1.6.4
+SYNAPTICS_REVISION= 0
+PLIST_SUB+= NEW="@comment " OLD=""
+EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in
+.endif
-post-install:
- ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
- ${PREFIX}/share/hal/fdi/policy/10osvendor/
-
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-synaptics/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-synaptics/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,4 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
-RMD160 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 301f767cc3ae3cbc5984dbdf6111069c80de435b
-SIZE (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 295524
+SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
+SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
+SHA256 (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd
+SIZE (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 448170
Added: trunk/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in (rev 0)
+++ trunk/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in 2013-12-22 18:13:23 UTC (rev 15734)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2013-04-04 14:47:16.881259598 +0200
++++ Makefile.in 2013-04-04 14:47:20.568244417 +0200
+@@ -321,7 +321,7 @@
+ --with-sdkdir='$${includedir}/xorg' \
+ --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
+
+-SUBDIRS = include src man tools conf test
++SUBDIRS = include src man tools test
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xorg-synaptics.pc
Deleted: trunk/x11-drivers/xf86-input-synaptics/files/patch-configure
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/files/patch-configure 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-synaptics/files/patch-configure 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +0,0 @@
---- configure.orig 2009-04-25 14:02:33.000000000 -0500
-+++ configure 2009-04-25 14:02:34.000000000 -0500
-@@ -21128,7 +21128,7 @@
- $as_echo "yes" >&6; }
- :
- fi
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir="${prefix}/include/xorg"
-
-
- CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
Index: trunk/x11-drivers/xf86-input-synaptics/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-synaptics/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-synaptics/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-synaptics/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/pkg-plist 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-synaptics/pkg-plist 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,16 +1,16 @@
bin/synclient
bin/syndaemon
include/xorg/synaptics-properties.h
-include/xorg/synaptics.h
+%%OLD%%include/xorg/synaptics.h
lib/xorg/modules/input/synaptics_drv.la
lib/xorg/modules/input/synaptics_drv.so
libdata/pkgconfig/xorg-synaptics.pc
-share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+man/man1/synclient.1.gz
+man/man1/syndaemon.1.gz
+man/man4/synaptics.4x.gz
+%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
@dirrmtry include/xorg
- at dirrmtry share/hal/fdi/policy/10osvendor
- at dirrmtry share/hal/fdi/policy
- at dirrmtry share/hal/fdi
- at dirrmtry share/hal
Modified: trunk/x11-drivers/xf86-input-vmmouse/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-vmmouse/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-vmmouse/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,22 +1,28 @@
# $MidnightBSD$
PORTNAME= xf86-input-vmmouse
-PORTVERSION= 12.6.9
+PORTVERSION= 13.0.0
+PORTREVISION= 0
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org vmmouse input driver
LICENSE= mit
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
XORG_CAT= driver
CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
+USE_GMAKE= yes
-MAN1= vmmouse_detect.1
-MAN4= vmmouse.4x
-
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures.
-USE_GMAKE= yes
+.include <bsd.mport.options.mk>
+.if defined(WITH_NEW_XORG)
+PLIST_SUB+= NEW=""
+.else
+PLIST_SUB+= NEW="@comment "
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-vmmouse/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-vmmouse/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-vmmouse/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
-RMD160 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = d65477e0f6e5d61a6b7e80532a6c79feff81c968
-SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
+SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c
+SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269
Index: trunk/x11-drivers/xf86-input-vmmouse/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-vmmouse/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-vmmouse/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-vmmouse/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-input-vmmouse/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-input-vmmouse/pkg-plist 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-vmmouse/pkg-plist 2013-12-22 18:13:23 UTC (rev 15734)
@@ -2,6 +2,9 @@
libexec/hal/scripts/hal-probe-vmmouse
lib/xorg/modules/input/vmmouse_drv.la
lib/xorg/modules/input/vmmouse_drv.so
+man/man1/vmmouse_detect.1.gz
+man/man4/vmmouse.4x.gz
+%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
Modified: trunk/x11-drivers/xf86-input-void/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-void/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-void/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,15 +1,25 @@
# $MidnightBSD$
PORTNAME= xf86-input-void
-PORTVERSION= 1.3.1
-PORTREVISION= 0
+PORTVERSION= ${VOID_VERSION}
+PORTREVISION= ${VOID_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org void input driver
-LICENSE= x11
+LICENSE= mit
+
XORG_CAT= driver
-MAN4= void.4x
+.include <bsd.mport.options.mk>
+
+.if defined(WITH_NEW_XORG)
+VOID_VERSION= 1.4.0
+VOID_REVISION= 0
+.else
+VOID_VERSION= 1.3.1
+VOID_REVISION= 0
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-input-void/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-void/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-void/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,4 @@
SHA256 (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674
-RMD160 (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = e1088ee141eb7142db5a7e8fa1db8a0fa3c79df4
SIZE (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = 242189
+SHA256 (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505
+SIZE (xorg/driver/xf86-input-void-1.4.0.tar.bz2) = 273454
Index: trunk/x11-drivers/xf86-input-void/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-void/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-input-void/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-input-void/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-apm/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-apm/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-apm/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-apm/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-ark/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-ark/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ark/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-ark
-PORTVERSION= 0.7.3
+PORTVERSION= 0.7.5
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org ark display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-ark/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-ark/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ark/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
-RMD160 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 264b097e82d57220ad5a61a818f4abdc80b8854b
-SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
+SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
+SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
Index: trunk/x11-drivers/xf86-video-ark/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-ark/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ark/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-ark/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-ati/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-ati/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ati/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= xf86-video-ati
-PORTVERSION= 6.14.3
-PORTREVISION= 1
+PORTVERSION= ${ATI_VERSION}
+PORTREVISION= ${ATI_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -10,9 +10,22 @@
LICENSE= mit
USE_GL= gl
-
XORG_CAT= driver
-USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4= ati.4x radeon.4x
+USE_XORG= xf86driproto xineramaproto xf86miscproto glproto
+.include <bsd.mport.options.mk>
+
+.if !defined(WITH_NEW_XORG)
+ATI_VERSION= 6.14.6
+ATI_REVISION= 1
+CONFIGURE_ARGS+=--disable-kms
+PLIST_SUB+= OLD=""
+.else
+ATI_VERSION= 7.2.0
+ATI_REVISION= 1
+CONFIGURE_ARGS+=--disable-udev
+EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c
+PLIST_SUB+= OLD="@comment "
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-video-ati/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-ati/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ati/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,4 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
-RMD160 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = fc39fd2a16c6de65ad9ae87b30fdad15134bc139
-SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119
+SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
+SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
+SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4
+SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = 824613
Index: trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-ati/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-ati/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ati/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-ati/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-ati/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-ati/pkg-plist 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-ati/pkg-plist 2013-12-22 18:13:23 UTC (rev 15734)
@@ -2,13 +2,15 @@
lib/xorg/modules/drivers/ati_drv.so
lib/xorg/modules/drivers/radeon_drv.la
lib/xorg/modules/drivers/radeon_drv.so
-lib/xorg/modules/multimedia/theatre200_drv.la
-lib/xorg/modules/multimedia/theatre200_drv.so
-lib/xorg/modules/multimedia/theatre_detect_drv.la
-lib/xorg/modules/multimedia/theatre_detect_drv.so
-lib/xorg/modules/multimedia/theatre_drv.la
-lib/xorg/modules/multimedia/theatre_drv.so
+%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la
+%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so
+%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la
+%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
+%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
+%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
+man/man4/ati.4x.gz
+man/man4/radeon.4x.gz
@dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules/multimedia
+%%OLD%%@dirrmtry lib/xorg/modules/multimedia
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
Index: trunk/x11-drivers/xf86-video-chips/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-chips/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-chips/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-chips/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-cirrus/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-cirrus/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-cirrus/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-cirrus/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-dummy/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-dummy/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-dummy/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-dummy
-PORTVERSION= 0.3.4
+PORTVERSION= 0.3.7
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org dummy display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-dummy/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-dummy/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-dummy/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
-RMD160 (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = aac23243d85dc9b17447de96b7aaf5e7e5d4d504
-SIZE (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 255658
+SHA256 (xorg/driver/xf86-video-dummy-0.3.7.tar.bz2) = 56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680
+SIZE (xorg/driver/xf86-video-dummy-0.3.7.tar.bz2) = 279806
Index: trunk/x11-drivers/xf86-video-dummy/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-dummy/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-dummy/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-dummy/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-fbdev/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-fbdev/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-fbdev/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-fbdev/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-glint/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-glint/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-glint/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-glint/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-i128/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-i128/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-i128/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-i128/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-i740/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-i740/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-i740/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-i740/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-i915kms
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-i915kms 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-i915kms 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-i915kms
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-intel/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-intel/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-intel/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-intel/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-mach64/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-mach64/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-mach64/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-mach64/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-mga/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-mga/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-mga/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-mga/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-neomagic/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-neomagic/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-neomagic/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-neomagic/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-newport/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-newport/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-newport/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-newport/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-nv/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-nv/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-nv/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-nv/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-openchrome/files/patch-configure
===================================================================
--- trunk/x11-drivers/xf86-video-openchrome/files/patch-configure 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-openchrome/files/patch-configure 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-openchrome/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c
===================================================================
--- trunk/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-openchrome/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-openchrome/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-openchrome/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-openchrome/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-r128/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-r128/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-r128/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-r128/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-radeonhd/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-radeonhd/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-radeonhd/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-radeonhd/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-rendition/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-rendition/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-rendition/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-rendition
-PORTVERSION= 4.2.4
+PORTVERSION= 4.2.5
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org rendition display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-rendition/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-rendition/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-rendition/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
-RMD160 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 69ae066e959ffc5f9ac92b258c2fbac057d7e86b
-SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
+SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
+SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
Index: trunk/x11-drivers/xf86-video-rendition/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-rendition/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-rendition/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-rendition/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-s3/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-s3/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-s3/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-s3
-PORTVERSION= 0.6.3
+PORTVERSION= 0.6.5
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org s3 display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-s3/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-s3/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-s3/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
-RMD160 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 105b4f0e954772e074120c769ee817ed5cec8a9f
-SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
+SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
+SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
Index: trunk/x11-drivers/xf86-video-s3/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-s3/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-s3/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-s3/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-s3virge/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-s3virge/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-s3virge
-PORTVERSION= 1.10.4
+PORTVERSION= 1.10.6
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org s3virge display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-s3virge/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-s3virge/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
-RMD160 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 0a60c63a28272dd404cfe33f62307d5cb0f1a981
-SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
+SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
Index: trunk/x11-drivers/xf86-video-s3virge/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-s3virge/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-s3virge/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-s3virge/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-savage/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-savage/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-savage/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-savage
-PORTVERSION= 2.3.2
+PORTVERSION= 2.3.7
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org savage display driver
+
LICENSE= mit
USE_GL= gl
Modified: trunk/x11-drivers/xf86-video-savage/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-savage/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-savage/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 54bde0077a2369fbdd42b0b25803f3c7147a58792997b14e45ee0b856199ddf1
-RMD160 (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 0221945e67a85940e06460db261361ecdbd82af8
-SIZE (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 366731
+SHA256 (xorg/driver/xf86-video-savage-2.3.7.tar.bz2) = 041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44
+SIZE (xorg/driver/xf86-video-savage-2.3.7.tar.bz2) = 395249
Index: trunk/x11-drivers/xf86-video-savage/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-savage/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-savage/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-savage/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-siliconmotion/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-siliconmotion/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-siliconmotion/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-siliconmotion
-PORTVERSION= 1.7.3
+PORTVERSION= 1.7.7
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org siliconmotion display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-siliconmotion/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-siliconmotion/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-siliconmotion/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
-RMD160 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 12c61e9785d280c4ab8cb253dc4879dffa8c5975
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 330623
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
Index: trunk/x11-drivers/xf86-video-siliconmotion/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-siliconmotion/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-siliconmotion/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-siliconmotion/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-sis/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-sis/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-sis/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-sis
-PORTVERSION= 0.10.2
+PORTVERSION= 0.10.7
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org sis display driver
+
LICENSE= bsd3
CONFLICTS= xf86-video-sis-intel-[0-9]*
Modified: trunk/x11-drivers/xf86-video-sis/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-sis/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-sis/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2
-RMD160 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = ba5773d307af3c5d1b6820c48d2934165aae910e
-SIZE (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 642160
+SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
+SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
Index: trunk/x11-drivers/xf86-video-sis/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-sis/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-sis/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-sis/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-tdfx/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-tdfx/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-tdfx/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-tdfx
-PORTVERSION= 1.4.3
+PORTVERSION= 1.4.5
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org tdfx display driver
+
LICENSE= mit
USE_GL= gl
Modified: trunk/x11-drivers/xf86-video-tdfx/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-tdfx/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-tdfx/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
-RMD160 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 2aaf601c6375f6b37f2a9f65424367fe9e3e6d83
-SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
+SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
Index: trunk/x11-drivers/xf86-video-tdfx/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-tdfx/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-tdfx/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-tdfx/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-tga/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-tga/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-tga/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,11 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-tga
-PORTVERSION= 1.2.1
+PORTVERSION= 1.2.2
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org tga display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-tga/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-tga/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-tga/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
-RMD160 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 413f5dc91086cd1d177ee24f01738d27b72e62fc
-SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
+SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
+SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
Index: trunk/x11-drivers/xf86-video-tga/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-tga/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-tga/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-tga/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-trident/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-trident/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-trident/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-trident/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-tseng/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-tseng/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-tseng/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-tseng/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xf86-video-vesa/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-vesa/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-vesa/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,12 +1,12 @@
# $MidnightBSD$
PORTNAME= xf86-video-vesa
-PORTVERSION= 2.3.0
-PORTREVISION= 1
+PORTVERSION= 2.3.3
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org vesa display driver
+
LICENSE= mit
XORG_CAT= driver
Modified: trunk/x11-drivers/xf86-video-vesa/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-vesa/distinfo 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-vesa/distinfo 2013-12-22 18:13:23 UTC (rev 15734)
@@ -1,3 +1,2 @@
-SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
-RMD160 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 7e7c11f6cc094bb898c57d26a70f6c4c0ab83d0f
-SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
+SHA256 (xorg/driver/xf86-video-vesa-2.3.3.tar.bz2) = ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8
+SIZE (xorg/driver/xf86-video-vesa-2.3.3.tar.bz2) = 300571
Index: trunk/x11-drivers/xf86-video-vesa/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-vesa/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-vesa/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-vesa/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-vmware/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-vmware/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-vmware/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-vmware/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-drivers/xf86-video-voodoo/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-voodoo/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xf86-video-voodoo/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xf86-video-voodoo/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-drivers/xorg-drivers/Makefile
===================================================================
--- trunk/x11-drivers/xorg-drivers/Makefile 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xorg-drivers/Makefile 2013-12-22 18:13:23 UTC (rev 15734)
@@ -11,7 +11,7 @@
COMMENT= X.org drivers meta-port
LICENSE= agg
-.MAKE.FreeBSD_UL= yes
+.MAKE.FreeBSD_UL= yes
VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers
INPUTDIR= ${PREFIX}/lib/xorg/modules/input
@@ -35,7 +35,6 @@
mach64 \
nv \
r128 \
- radeonhd \
vesa \
apm \
ark \
@@ -46,7 +45,6 @@
glint \
i128 \
i740 \
- imstt \
mga \
neomagic \
newport \
@@ -69,7 +67,6 @@
MACH64 \
NV \
R128 \
- RADEONHD \
VESA
.for type in input video
Index: trunk/x11-drivers/xorg-drivers/pkg-descr
===================================================================
--- trunk/x11-drivers/xorg-drivers/pkg-descr 2013-12-22 18:12:42 UTC (rev 15733)
+++ trunk/x11-drivers/xorg-drivers/pkg-descr 2013-12-22 18:13:23 UTC (rev 15734)
Property changes on: trunk/x11-drivers/xorg-drivers/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list