aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.xorg.mk1
-rw-r--r--devel/imake/Makefile3
-rw-r--r--devel/imake/distinfo6
-rw-r--r--devel/libpciaccess/Makefile3
-rw-r--r--devel/libpciaccess/distinfo6
-rw-r--r--devel/makedepend/Makefile2
-rw-r--r--devel/makedepend/distinfo6
-rw-r--r--devel/xorg-macros/Makefile10
-rw-r--r--devel/xorg-macros/distinfo6
-rw-r--r--x11-clocks/xclock/Makefile3
-rw-r--r--x11-clocks/xclock/distinfo6
-rw-r--r--x11-drivers/input-wacom/Makefile2
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile3
-rw-r--r--x11-drivers/xf86-input-acecad/distinfo6
-rw-r--r--x11-drivers/xf86-input-citron/Makefile2
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile2
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile3
-rw-r--r--x11-drivers/xf86-input-joystick/distinfo6
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile3
-rw-r--r--x11-drivers/xf86-input-keyboard/distinfo6
-rw-r--r--x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c33
-rw-r--r--x11-drivers/xf86-input-keyboard/files/patch-kbd.c18
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile2
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile3
-rw-r--r--x11-drivers/xf86-input-mouse/distinfo6
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile2
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile2
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile3
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo6
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile5
-rw-r--r--x11-drivers/xf86-input-vmmouse/distinfo6
-rw-r--r--x11-drivers/xf86-input-void/Makefile3
-rw-r--r--x11-drivers/xf86-input-void/distinfo6
-rw-r--r--x11-drivers/xf86-video-apm/Makefile3
-rw-r--r--x11-drivers/xf86-video-apm/distinfo6
-rw-r--r--x11-drivers/xf86-video-ark/Makefile3
-rw-r--r--x11-drivers/xf86-video-ark/distinfo6
-rw-r--r--x11-drivers/xf86-video-ati/Makefile3
-rw-r--r--x11-drivers/xf86-video-ati/distinfo6
-rw-r--r--x11-drivers/xf86-video-ati613/Makefile3
-rw-r--r--x11-drivers/xf86-video-ati613/distinfo6
-rw-r--r--x11-drivers/xf86-video-chips/Makefile3
-rw-r--r--x11-drivers/xf86-video-chips/distinfo6
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile3
-rw-r--r--x11-drivers/xf86-video-cirrus/distinfo6
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile2
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile3
-rw-r--r--x11-drivers/xf86-video-dummy/distinfo6
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile3
-rw-r--r--x11-drivers/xf86-video-fbdev/distinfo6
-rw-r--r--x11-drivers/xf86-video-glint/Makefile3
-rw-r--r--x11-drivers/xf86-video-glint/distinfo6
-rw-r--r--x11-drivers/xf86-video-i128/Makefile3
-rw-r--r--x11-drivers/xf86-video-i128/distinfo6
-rw-r--r--x11-drivers/xf86-video-i740/Makefile3
-rw-r--r--x11-drivers/xf86-video-i740/distinfo6
-rw-r--r--x11-drivers/xf86-video-imstt/Makefile2
-rw-r--r--x11-drivers/xf86-video-intel/Makefile2
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c111
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i810_video.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c14
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c97
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c11
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i830_render.c78
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i830_video.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c10
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i915_render.c69
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_i965_render.c78
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c17
-rw-r--r--x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h32
-rw-r--r--x11-drivers/xf86-video-intel29/Makefile10
-rw-r--r--x11-drivers/xf86-video-intel29/distinfo6
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile3
-rw-r--r--x11-drivers/xf86-video-mach64/distinfo6
-rw-r--r--x11-drivers/xf86-video-mga/Makefile3
-rw-r--r--x11-drivers/xf86-video-mga/distinfo6
-rw-r--r--x11-drivers/xf86-video-mga/files/patch-src__mga.h21
-rw-r--r--x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c232
-rw-r--r--x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c115
-rw-r--r--x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c18
-rw-r--r--x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h14
-rw-r--r--x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c10
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile3
-rw-r--r--x11-drivers/xf86-video-neomagic/distinfo6
-rw-r--r--x11-drivers/xf86-video-newport/Makefile3
-rw-r--r--x11-drivers/xf86-video-newport/distinfo6
-rw-r--r--x11-drivers/xf86-video-nouveau/Makefile2
-rw-r--r--x11-drivers/xf86-video-nv/Makefile3
-rw-r--r--x11-drivers/xf86-video-nv/distinfo6
-rw-r--r--x11-drivers/xf86-video-openchrome/Makefile2
-rw-r--r--x11-drivers/xf86-video-r128/Makefile3
-rw-r--r--x11-drivers/xf86-video-r128/distinfo6
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/Makefile2
-rw-r--r--x11-drivers/xf86-video-radeonhd/Makefile2
-rw-r--r--x11-drivers/xf86-video-rdc/Makefile1
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile3
-rw-r--r--x11-drivers/xf86-video-rendition/distinfo6
-rw-r--r--x11-drivers/xf86-video-s3/Makefile4
-rw-r--r--x11-drivers/xf86-video-s3/distinfo6
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile3
-rw-r--r--x11-drivers/xf86-video-s3virge/distinfo6
-rw-r--r--x11-drivers/xf86-video-savage/Makefile3
-rw-r--r--x11-drivers/xf86-video-savage/distinfo6
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile3
-rw-r--r--x11-drivers/xf86-video-siliconmotion/distinfo6
-rw-r--r--x11-drivers/xf86-video-sis-intel/Makefile2
-rw-r--r--x11-drivers/xf86-video-sis/Makefile3
-rw-r--r--x11-drivers/xf86-video-sis/distinfo6
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile2
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile3
-rw-r--r--x11-drivers/xf86-video-tdfx/distinfo6
-rw-r--r--x11-drivers/xf86-video-tga/Makefile3
-rw-r--r--x11-drivers/xf86-video-tga/distinfo6
-rw-r--r--x11-drivers/xf86-video-trident/Makefile3
-rw-r--r--x11-drivers/xf86-video-trident/distinfo6
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile3
-rw-r--r--x11-drivers/xf86-video-tseng/distinfo6
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile3
-rw-r--r--x11-drivers/xf86-video-vesa/distinfo6
-rw-r--r--x11-drivers/xf86-video-via/Makefile2
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile3
-rw-r--r--x11-drivers/xf86-video-vmware/distinfo6
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile3
-rw-r--r--x11-drivers/xf86-video-voodoo/distinfo6
-rw-r--r--x11-drivers/xorg-drivers/Makefile3
-rw-r--r--x11-fonts/bdftopcf/Makefile2
-rw-r--r--x11-fonts/bdftopcf/distinfo6
-rw-r--r--x11-fonts/encodings/Makefile2
-rw-r--r--x11-fonts/encodings/distinfo6
-rw-r--r--x11-fonts/encodings/pkg-plist34
-rw-r--r--x11-fonts/font-adobe-100dpi/Makefile3
-rw-r--r--x11-fonts/font-adobe-100dpi/distinfo6
-rw-r--r--x11-fonts/font-adobe-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-75dpi/distinfo6
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/distinfo6
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/distinfo6
-rw-r--r--x11-fonts/font-adobe-utopia-type1/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-type1/distinfo6
-rw-r--r--x11-fonts/font-alias/Makefile2
-rw-r--r--x11-fonts/font-alias/distinfo6
-rw-r--r--x11-fonts/font-arabic-misc/Makefile2
-rw-r--r--x11-fonts/font-arabic-misc/distinfo6
-rw-r--r--x11-fonts/font-bh-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-100dpi/distinfo6
-rw-r--r--x11-fonts/font-bh-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-75dpi/distinfo6
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo6
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo6
-rw-r--r--x11-fonts/font-bh-ttf/Makefile2
-rw-r--r--x11-fonts/font-bh-ttf/distinfo6
-rw-r--r--x11-fonts/font-bh-type1/Makefile2
-rw-r--r--x11-fonts/font-bh-type1/distinfo6
-rw-r--r--x11-fonts/font-bitstream-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-100dpi/distinfo6
-rw-r--r--x11-fonts/font-bitstream-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-75dpi/distinfo6
-rw-r--r--x11-fonts/font-bitstream-speedo/Makefile2
-rw-r--r--x11-fonts/font-bitstream-speedo/distinfo6
-rw-r--r--x11-fonts/font-bitstream-type1/Makefile2
-rw-r--r--x11-fonts/font-bitstream-type1/distinfo6
-rw-r--r--x11-fonts/font-cronyx-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-cronyx-cyrillic/distinfo6
-rw-r--r--x11-fonts/font-cursor-misc/Makefile2
-rw-r--r--x11-fonts/font-cursor-misc/distinfo6
-rw-r--r--x11-fonts/font-daewoo-misc/Makefile2
-rw-r--r--x11-fonts/font-daewoo-misc/distinfo6
-rw-r--r--x11-fonts/font-dec-misc/Makefile2
-rw-r--r--x11-fonts/font-dec-misc/distinfo6
-rw-r--r--x11-fonts/font-ibm-type1/Makefile2
-rw-r--r--x11-fonts/font-ibm-type1/distinfo6
-rw-r--r--x11-fonts/font-isas-misc/Makefile2
-rw-r--r--x11-fonts/font-isas-misc/distinfo6
-rw-r--r--x11-fonts/font-jis-misc/Makefile2
-rw-r--r--x11-fonts/font-jis-misc/distinfo6
-rw-r--r--x11-fonts/font-micro-misc/Makefile2
-rw-r--r--x11-fonts/font-micro-misc/distinfo6
-rw-r--r--x11-fonts/font-misc-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-misc-cyrillic/distinfo6
-rw-r--r--x11-fonts/font-misc-ethiopic/Makefile2
-rw-r--r--x11-fonts/font-misc-ethiopic/distinfo6
-rw-r--r--x11-fonts/font-misc-meltho/Makefile3
-rw-r--r--x11-fonts/font-misc-meltho/distinfo6
-rw-r--r--x11-fonts/font-misc-misc/Makefile2
-rw-r--r--x11-fonts/font-misc-misc/distinfo6
-rw-r--r--x11-fonts/font-mutt-misc/Makefile2
-rw-r--r--x11-fonts/font-mutt-misc/distinfo6
-rw-r--r--x11-fonts/font-schumacher-misc/Makefile3
-rw-r--r--x11-fonts/font-schumacher-misc/distinfo6
-rw-r--r--x11-fonts/font-schumacher-misc/files/patch-clR6x12.bdf94
-rw-r--r--x11-fonts/font-screen-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-screen-cyrillic/distinfo6
-rw-r--r--x11-fonts/font-sony-misc/Makefile2
-rw-r--r--x11-fonts/font-sony-misc/distinfo6
-rw-r--r--x11-fonts/font-sun-misc/Makefile2
-rw-r--r--x11-fonts/font-sun-misc/distinfo6
-rw-r--r--x11-fonts/font-util/Makefile2
-rw-r--r--x11-fonts/font-util/distinfo6
-rw-r--r--x11-fonts/font-winitzki-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-winitzki-cyrillic/distinfo6
-rw-r--r--x11-fonts/font-xfree86-type1/Makefile2
-rw-r--r--x11-fonts/font-xfree86-type1/distinfo6
-rw-r--r--x11-fonts/fontcacheproto/Makefile2
-rw-r--r--x11-fonts/fontcacheproto/distinfo6
-rw-r--r--x11-fonts/fontsproto/Makefile2
-rw-r--r--x11-fonts/fontsproto/distinfo6
-rw-r--r--x11-fonts/fonttosfnt/Makefile2
-rw-r--r--x11-fonts/fonttosfnt/distinfo6
-rw-r--r--x11-fonts/libFS/Makefile2
-rw-r--r--x11-fonts/libFS/distinfo6
-rw-r--r--x11-fonts/libXfont/Makefile2
-rw-r--r--x11-fonts/libXfont/distinfo6
-rw-r--r--x11-fonts/libXfont/pkg-plist1
-rw-r--r--x11-fonts/libXfontcache/Makefile2
-rw-r--r--x11-fonts/libXfontcache/distinfo6
-rw-r--r--x11-fonts/libfontenc/Makefile2
-rw-r--r--x11-fonts/libfontenc/distinfo6
-rw-r--r--x11-fonts/mkfontdir/Makefile2
-rw-r--r--x11-fonts/mkfontdir/distinfo6
-rw-r--r--x11-fonts/mkfontscale/Makefile3
-rw-r--r--x11-fonts/mkfontscale/distinfo6
-rw-r--r--x11-fonts/mkfontscale/pkg-plist1
-rw-r--r--x11-fonts/xf86bigfontproto/Makefile2
-rw-r--r--x11-fonts/xf86bigfontproto/distinfo6
-rw-r--r--x11-fonts/xf86bigfontproto/pkg-plist1
-rw-r--r--x11-fonts/xfs/Makefile3
-rw-r--r--x11-fonts/xfs/distinfo6
-rw-r--r--x11-fonts/xfs/files/xfs.in2
-rw-r--r--x11-fonts/xorg-fonts-100dpi/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-75dpi/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-cyrillic/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-miscbitmaps/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-truetype/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-type1/Makefile2
-rw-r--r--x11-fonts/xorg-fonts/Makefile2
-rw-r--r--x11-servers/xephyr/Makefile2
-rw-r--r--x11-servers/xephyr/distinfo6
-rw-r--r--x11-servers/xorg-dmx/Makefile2
-rw-r--r--x11-servers/xorg-dmx/distinfo6
-rw-r--r--x11-servers/xorg-nestserver/Makefile2
-rw-r--r--x11-servers/xorg-nestserver/distinfo6
-rw-r--r--x11-servers/xorg-server/Makefile9
-rw-r--r--x11-servers/xorg-server/distinfo6
-rw-r--r--x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h11
-rw-r--r--x11-servers/xorg-server/files/patch-render.c11
-rw-r--r--x11-servers/xorg-server/pkg-plist14
-rw-r--r--x11-servers/xorg-vfbserver/Makefile2
-rw-r--r--x11-servers/xorg-vfbserver/distinfo6
-rw-r--r--x11-themes/xcursor-themes/Makefile5
-rw-r--r--x11-themes/xcursor-themes/distinfo6
-rw-r--r--x11-themes/xcursor-themes/pkg-plist1
-rw-r--r--x11-toolkits/libXaw/Makefile3
-rw-r--r--x11-toolkits/libXaw/distinfo6
-rw-r--r--x11-toolkits/libXaw/pkg-plist7
-rw-r--r--x11-toolkits/libXmu/Makefile2
-rw-r--r--x11-toolkits/libXmu/distinfo6
-rw-r--r--x11-toolkits/libXt/Makefile3
-rw-r--r--x11-toolkits/libXt/distinfo6
-rw-r--r--x11-wm/xcompmgr/Makefile4
-rw-r--r--x11-wm/xcompmgr/distinfo6
-rw-r--r--x11-wm/xcompmgr/pkg-plist1
-rw-r--r--x11/appres/Makefile2
-rw-r--r--x11/appres/distinfo6
-rw-r--r--x11/bigreqsproto/Makefile2
-rw-r--r--x11/bigreqsproto/distinfo6
-rw-r--r--x11/bigreqsproto/pkg-plist1
-rw-r--r--x11/bitmap/Makefile3
-rw-r--r--x11/bitmap/distinfo6
-rw-r--r--x11/compositeproto/Makefile2
-rw-r--r--x11/compositeproto/distinfo6
-rw-r--r--x11/damageproto/Makefile3
-rw-r--r--x11/damageproto/distinfo6
-rw-r--r--x11/dmxproto/Makefile2
-rw-r--r--x11/dmxproto/distinfo6
-rw-r--r--x11/dmxproto/pkg-plist2
-rw-r--r--x11/dri2proto/Makefile2
-rw-r--r--x11/dri2proto/distinfo6
-rw-r--r--x11/editres/Makefile3
-rw-r--r--x11/editres/distinfo6
-rw-r--r--x11/editres/pkg-plist2
-rw-r--r--x11/evieext/Makefile2
-rw-r--r--x11/evieext/distinfo6
-rw-r--r--x11/evieext/pkg-plist1
-rw-r--r--x11/fixesproto/Makefile2
-rw-r--r--x11/fixesproto/distinfo6
-rw-r--r--x11/fixesproto/pkg-plist3
-rw-r--r--x11/glproto/Makefile2
-rw-r--r--x11/glproto/distinfo6
-rw-r--r--x11/iceauth/Makefile2
-rw-r--r--x11/iceauth/distinfo6
-rw-r--r--x11/inputproto/Makefile2
-rw-r--r--x11/inputproto/distinfo6
-rw-r--r--x11/inputproto/pkg-plist5
-rw-r--r--x11/kbproto/Makefile2
-rw-r--r--x11/kbproto/distinfo6
-rw-r--r--x11/libICE/Makefile3
-rw-r--r--x11/libICE/distinfo6
-rw-r--r--x11/libSM/Makefile3
-rw-r--r--x11/libSM/distinfo6
-rw-r--r--x11/libSM/files/patch-configure.ac18
-rw-r--r--x11/libSM/files/patch-src_Makefile.am13
-rw-r--r--x11/libSM/files/patch-src_sm_genid.c43
-rw-r--r--x11/libX11/Makefile4
-rw-r--r--x11/libX11/distinfo6
-rw-r--r--x11/libX11/manpages5
-rw-r--r--x11/libX11/pkg-plist16
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXScrnSaver/distinfo6
-rw-r--r--x11/libXScrnSaver/pkg-plist3
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXau/distinfo6
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcomposite/distinfo6
-rw-r--r--x11/libXcursor/Makefile6
-rw-r--r--x11/libXcursor/distinfo6
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdamage/distinfo6
-rw-r--r--x11/libXdmcp/Makefile3
-rw-r--r--x11/libXdmcp/distinfo6
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXext/distinfo6
-rw-r--r--x11/libXext/pkg-plist20
-rw-r--r--x11/libXfixes/Makefile3
-rw-r--r--x11/libXfixes/distinfo6
-rw-r--r--x11/libXi/Makefile44
-rw-r--r--x11/libXi/distinfo6
-rw-r--r--x11/libXi/pkg-plist3
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXinerama/distinfo6
-rw-r--r--x11/libXinerama/pkg-plist3
-rw-r--r--x11/libXrender/Makefile3
-rw-r--r--x11/libXrender/distinfo6
-rw-r--r--x11/libXrender/pkg-plist3
-rw-r--r--x11/libXres/Makefile3
-rw-r--r--x11/libXres/distinfo6
-rw-r--r--x11/libXtst/Makefile18
-rw-r--r--x11/libXtst/distinfo6
-rw-r--r--x11/libXtst/pkg-plist3
-rw-r--r--x11/libXv/Makefile8
-rw-r--r--x11/libXv/distinfo6
-rw-r--r--x11/libXvMC/Makefile3
-rw-r--r--x11/libXvMC/distinfo6
-rw-r--r--x11/libXvMC/pkg-plist3
-rw-r--r--x11/libXxf86dga/Makefile2
-rw-r--r--x11/libXxf86dga/distinfo6
-rw-r--r--x11/libXxf86dga/pkg-plist2
-rw-r--r--x11/libXxf86misc/Makefile2
-rw-r--r--x11/libXxf86misc/distinfo6
-rw-r--r--x11/libXxf86vm/Makefile2
-rw-r--r--x11/libXxf86vm/distinfo6
-rw-r--r--x11/libXxf86vm/pkg-plist1
-rw-r--r--x11/libdmx/Makefile3
-rw-r--r--x11/libdmx/distinfo6
-rw-r--r--x11/libdmx/pkg-plist1
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/libxkbfile/distinfo6
-rw-r--r--x11/listres/Makefile3
-rw-r--r--x11/listres/distinfo6
-rw-r--r--x11/luit/Makefile3
-rw-r--r--x11/luit/distinfo6
-rw-r--r--x11/mkcomposecache/Makefile3
-rw-r--r--x11/mkcomposecache/distinfo6
-rw-r--r--x11/randrproto/Makefile2
-rw-r--r--x11/randrproto/distinfo6
-rw-r--r--x11/recordproto/Makefile2
-rw-r--r--x11/recordproto/distinfo6
-rw-r--r--x11/recordproto/pkg-plist3
-rw-r--r--x11/renderproto/Makefile2
-rw-r--r--x11/renderproto/distinfo6
-rw-r--r--x11/rgb/Makefile2
-rw-r--r--x11/rgb/distinfo6
-rw-r--r--x11/rstart/Makefile2
-rw-r--r--x11/rstart/distinfo6
-rw-r--r--x11/rstart/pkg-plist18
-rw-r--r--x11/scrnsaverproto/Makefile2
-rw-r--r--x11/scrnsaverproto/distinfo6
-rw-r--r--x11/scrnsaverproto/pkg-plist7
-rw-r--r--x11/sessreg/Makefile2
-rw-r--r--x11/sessreg/distinfo6
-rw-r--r--x11/sessreg/files/patch-utmpx68
-rw-r--r--x11/setxkbmap/Makefile2
-rw-r--r--x11/setxkbmap/distinfo6
-rw-r--r--x11/smproxy/Makefile2
-rw-r--r--x11/smproxy/distinfo6
-rw-r--r--x11/videoproto/Makefile2
-rw-r--r--x11/videoproto/distinfo6
-rw-r--r--x11/viewres/Makefile9
-rw-r--r--x11/viewres/distinfo6
-rw-r--r--x11/viewres/pkg-plist4
-rw-r--r--x11/x11perf/Makefile2
-rw-r--r--x11/x11perf/distinfo6
-rw-r--r--x11/xauth/Makefile2
-rw-r--r--x11/xauth/distinfo6
-rw-r--r--x11/xbacklight/Makefile2
-rw-r--r--x11/xbacklight/distinfo6
-rw-r--r--x11/xbiff/Makefile3
-rw-r--r--x11/xbiff/distinfo6
-rw-r--r--x11/xbitmaps/Makefile2
-rw-r--r--x11/xbitmaps/distinfo6
-rw-r--r--x11/xbitmaps/pkg-plist2
-rw-r--r--x11/xcalc/Makefile3
-rw-r--r--x11/xcalc/distinfo6
-rw-r--r--x11/xclipboard/Makefile3
-rw-r--r--x11/xclipboard/distinfo6
-rw-r--r--x11/xcmiscproto/Makefile2
-rw-r--r--x11/xcmiscproto/distinfo6
-rw-r--r--x11/xcmiscproto/pkg-plist1
-rw-r--r--x11/xcmsdb/Makefile2
-rw-r--r--x11/xcmsdb/distinfo6
-rw-r--r--x11/xcursorgen/Makefile5
-rw-r--r--x11/xcursorgen/distinfo6
-rw-r--r--x11/xdpyinfo/Makefile2
-rw-r--r--x11/xdpyinfo/distinfo6
-rw-r--r--x11/xdriinfo/Makefile2
-rw-r--r--x11/xdriinfo/distinfo6
-rw-r--r--x11/xev/Makefile2
-rw-r--r--x11/xev/distinfo6
-rw-r--r--x11/xextproto/Makefile2
-rw-r--r--x11/xextproto/distinfo6
-rw-r--r--x11/xextproto/pkg-plist64
-rw-r--r--x11/xeyes/Makefile4
-rw-r--r--x11/xeyes/distinfo6
-rw-r--r--x11/xf86dgaproto/Makefile2
-rw-r--r--x11/xf86dgaproto/distinfo6
-rw-r--r--x11/xf86dgaproto/pkg-plist5
-rw-r--r--x11/xf86driproto/Makefile2
-rw-r--r--x11/xf86driproto/distinfo6
-rw-r--r--x11/xf86driproto/pkg-plist5
-rw-r--r--x11/xf86miscproto/Makefile2
-rw-r--r--x11/xf86miscproto/distinfo6
-rw-r--r--x11/xf86vidmodeproto/Makefile2
-rw-r--r--x11/xf86vidmodeproto/distinfo6
-rw-r--r--x11/xf86vidmodeproto/pkg-plist3
-rw-r--r--x11/xgamma/Makefile2
-rw-r--r--x11/xgamma/distinfo6
-rw-r--r--x11/xgc/Makefile3
-rw-r--r--x11/xgc/distinfo6
-rw-r--r--x11/xgc/pkg-plist1
-rw-r--r--x11/xhost/Makefile2
-rw-r--r--x11/xhost/distinfo6
-rw-r--r--x11/xineramaproto/Makefile2
-rw-r--r--x11/xineramaproto/distinfo6
-rw-r--r--x11/xineramaproto/pkg-plist2
-rw-r--r--x11/xinit/Makefile3
-rw-r--r--x11/xinit/distinfo6
-rw-r--r--x11/xinput/Makefile2
-rw-r--r--x11/xinput/distinfo6
-rw-r--r--x11/xkbcomp/Makefile2
-rw-r--r--x11/xkbcomp/distinfo6
-rw-r--r--x11/xkbevd/Makefile2
-rw-r--r--x11/xkbevd/distinfo6
-rw-r--r--x11/xkeyboard-config/Makefile3
-rw-r--r--x11/xkeyboard-config/distinfo6
-rw-r--r--x11/xkeyboard-config/pkg-plist272
-rw-r--r--x11/xkill/Makefile2
-rw-r--r--x11/xkill/distinfo6
-rw-r--r--x11/xlogo/Makefile3
-rw-r--r--x11/xlogo/distinfo6
-rw-r--r--x11/xlsatoms/Makefile2
-rw-r--r--x11/xlsatoms/distinfo6
-rw-r--r--x11/xlsclients/Makefile2
-rw-r--r--x11/xlsclients/distinfo6
-rw-r--r--x11/xmag/Makefile3
-rw-r--r--x11/xmag/distinfo6
-rw-r--r--x11/xman/Makefile3
-rw-r--r--x11/xman/distinfo6
-rw-r--r--x11/xmessage/Makefile3
-rw-r--r--x11/xmessage/distinfo6
-rw-r--r--x11/xmodmap/Makefile2
-rw-r--r--x11/xmodmap/distinfo6
-rw-r--r--x11/xorg-apps/Makefile3
-rw-r--r--x11/xorg-cf-files/Makefile3
-rw-r--r--x11/xorg-cf-files/distinfo6
-rw-r--r--x11/xorg-libraries/Makefile2
-rw-r--r--x11/xorg/Makefile3
-rw-r--r--x11/xpr/Makefile2
-rw-r--r--x11/xpr/distinfo6
-rw-r--r--x11/xprop/Makefile2
-rw-r--r--x11/xprop/distinfo6
-rw-r--r--x11/xproto/Makefile2
-rw-r--r--x11/xproto/distinfo6
-rw-r--r--x11/xproxymanagementprotocol/Makefile2
-rw-r--r--x11/xproxymanagementprotocol/distinfo6
-rw-r--r--x11/xproxymanagementprotocol/pkg-plist4
-rw-r--r--x11/xrandr/Makefile2
-rw-r--r--x11/xrandr/distinfo6
-rw-r--r--x11/xrdb/Makefile2
-rw-r--r--x11/xrdb/distinfo6
-rw-r--r--x11/xrefresh/Makefile2
-rw-r--r--x11/xrefresh/distinfo6
-rw-r--r--x11/xrx/Makefile3
-rw-r--r--x11/xrx/distinfo6
-rw-r--r--x11/xrx/pkg-plist11
-rw-r--r--x11/xset/Makefile2
-rw-r--r--x11/xset/distinfo6
-rw-r--r--x11/xsetroot/Makefile2
-rw-r--r--x11/xsetroot/distinfo6
-rw-r--r--x11/xtrans/Makefile2
-rw-r--r--x11/xtrans/distinfo6
-rw-r--r--x11/xtrans/pkg-plist1
-rw-r--r--x11/xvidtune/Makefile3
-rw-r--r--x11/xvidtune/distinfo6
-rw-r--r--x11/xvinfo/Makefile2
-rw-r--r--x11/xvinfo/distinfo6
-rw-r--r--x11/xwd/Makefile2
-rw-r--r--x11/xwd/distinfo6
-rw-r--r--x11/xwininfo/Makefile2
-rw-r--r--x11/xwininfo/distinfo6
-rw-r--r--x11/xwud/Makefile2
-rw-r--r--x11/xwud/distinfo6
519 files changed, 2277 insertions, 1502 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index fe620f1e8e70..648dfca84e32 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -64,6 +64,7 @@ IGNORE= is for sparc64 only
. if ${XORG_CAT} == "font"
FONTDIR?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
+CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/lib/X11/fonts
NEED_MKFONTFOO= yes
. if ${PORTNAME:M*type1*}x != x
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index 26ed348acec4..b2aba137837e 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= imake
-PORTVERSION= 1.0.2
-PORTREVISION= 4
+PORTVERSION= 1.0.3
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
index e47c5053c7f1..393b5982e730 100644
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/util/imake-1.0.2.tar.bz2) = 02fea5a02ba2857c7d81820c8e8b8e6f
-SHA256 (xorg/util/imake-1.0.2.tar.bz2) = 97cefff4ae76863ebce87496aca715371890505db4a0511d980e92bfe050ac7b
-SIZE (xorg/util/imake-1.0.2.tar.bz2) = 112959
+MD5 (xorg/util/imake-1.0.3.tar.bz2) = ff553c4646edcc9e76b7308991ad421a
+SHA256 (xorg/util/imake-1.0.3.tar.bz2) = 90015244dd7a32594162d2be6e934a258894d1ca2c37422ef727a7f1c0b553ea
+SIZE (xorg/util/imake-1.0.3.tar.bz2) = 139230
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index 7fa7ed04a010..83722a68f0b4 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libpciaccess
-PORTVERSION= 0.10.6
-PORTREVISION= 1
+PORTVERSION= 0.11.0
CATEGORIES= devel
MAINTAINER= x11@FreeBSD.org
diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo
index d9624edb4d9f..abf41dba4551 100644
--- a/devel/libpciaccess/distinfo
+++ b/devel/libpciaccess/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libpciaccess-0.10.6.tar.bz2) = ba25eb7582f69428648e8c67564d68e5
-SHA256 (xorg/lib/libpciaccess-0.10.6.tar.bz2) = b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce
-SIZE (xorg/lib/libpciaccess-0.10.6.tar.bz2) = 267671
+MD5 (xorg/lib/libpciaccess-0.11.0.tar.bz2) = 686320dcec98daad0bdfb8894d4f2a2b
+SHA256 (xorg/lib/libpciaccess-0.11.0.tar.bz2) = 6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab
+SIZE (xorg/lib/libpciaccess-0.11.0.tar.bz2) = 295639
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index a07bca1b590f..e2a161be0bf3 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= makedepend
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/makedepend/distinfo b/devel/makedepend/distinfo
index 6b546929cfe1..874d304632a6 100644
--- a/devel/makedepend/distinfo
+++ b/devel/makedepend/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/util/makedepend-1.0.1.tar.bz2) = 54ab2549d723e51ff2b9cff4d8bf44d1
-SHA256 (xorg/util/makedepend-1.0.1.tar.bz2) = b752ad9f210f82d480c8bf397d62649a4306a5534bc38ae7765b9bfbd416b1d2
-SIZE (xorg/util/makedepend-1.0.1.tar.bz2) = 108276
+MD5 (xorg/util/makedepend-1.0.2.tar.bz2) = 62e58330fe8d1e3e28c7a45779833a48
+SHA256 (xorg/util/makedepend-1.0.2.tar.bz2) = 41a2b090a32d7c5b2654783772248aba472702686e30018cfd9907137a967657
+SIZE (xorg/util/makedepend-1.0.2.tar.bz2) = 116339
diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile
index 89c4e3eccf9c..46c3489bf171 100644
--- a/devel/xorg-macros/Makefile
+++ b/devel/xorg-macros/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-macros
-PORTVERSION= 1.2.1
+PORTVERSION= 1.6.0
CATEGORIES= devel x11
DISTNAME= util-macros-$(PORTVERSION)
@@ -15,6 +15,12 @@ COMMENT= X.Org development aclocal macros
XORG_CAT= util
-PLIST_FILES= share/aclocal/xorg-macros.m4
+MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig"
+
+PLIST_FILES= share/aclocal/xorg-macros.m4 \
+ libdata/pkgconfig/xorg-macros.pc \
+ share/util-macros/INSTALL
+
+PLIST_DIRS= share/util-macros
.include <bsd.port.mk>
diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo
index 0d06bd097628..b1741d48bc33 100644
--- a/devel/xorg-macros/distinfo
+++ b/devel/xorg-macros/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/util/util-macros-1.2.1.tar.bz2) = dc7ddaf9bea8b341510efe4dac125af4
-SHA256 (xorg/util/util-macros-1.2.1.tar.bz2) = 2863ce6c25a40a3c5d6f31721d496a8a8d5e99bb646e73b990d727623a208878
-SIZE (xorg/util/util-macros-1.2.1.tar.bz2) = 48602
+MD5 (xorg/util/util-macros-1.6.0.tar.bz2) = 6a0ac8efb11ad9b867f2e08ef87ad4c4
+SHA256 (xorg/util/util-macros-1.6.0.tar.bz2) = 9d074937d3187f3c776e09a762ea996e0ca28e9784bac57de27d36f9b6955cd1
+SIZE (xorg/util/util-macros-1.6.0.tar.bz2) = 61264
diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile
index bb023c6159fc..83bf7264657a 100644
--- a/x11-clocks/xclock/Makefile
+++ b/x11-clocks/xclock/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xclock
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11-clocks
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-clocks/xclock/distinfo b/x11-clocks/xclock/distinfo
index b5888a5b09bb..6b67f1bd4d7e 100644
--- a/x11-clocks/xclock/distinfo
+++ b/x11-clocks/xclock/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xclock-1.0.3.tar.bz2) = 2b1a3d030d87e62a591db8ee4c0072e6
-SHA256 (xorg/app/xclock-1.0.3.tar.bz2) = 10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f
-SIZE (xorg/app/xclock-1.0.3.tar.bz2) = 113967
+MD5 (xorg/app/xclock-1.0.4.tar.bz2) = bb9fd5e00d39c348a0078b97fdf8258f
+SHA256 (xorg/app/xclock-1.0.4.tar.bz2) = 69b903b6305211c9fc5db394f3d08c0a696aa51942d73db7f594422e7be6edf0
+SIZE (xorg/app/xclock-1.0.4.tar.bz2) = 128766
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index b3a20c1238d8..37b71cf507e3 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -7,7 +7,7 @@
PORTNAME= input-wacom
PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers kld
MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
SF/linuxwacom/linuxwacom/${WACOM_VERSION}:linuxwacom
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 3cfaa5bcf972..51ad8d266732 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-acecad
-PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTVERSION= 1.4.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo
index 2c5d21b59bd8..c4f044b87643 100644
--- a/x11-drivers/xf86-input-acecad/distinfo
+++ b/x11-drivers/xf86-input-acecad/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = dd8821ea9239d86d67a84912f4702adf
-SHA256 (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = aedd5657984d45d76045cc61d54709f9c71e4296a4c06b318086ee320209b504
-SIZE (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = 247705
+MD5 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 51247dc0d73185e35bec326283bc49a5
+SHA256 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
+SIZE (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 255888
diff --git a/x11-drivers/xf86-input-citron/Makefile b/x11-drivers/xf86-input-citron/Makefile
index 6ac8f3c019a9..4c49036ad882 100644
--- a/x11-drivers/xf86-input-citron/Makefile
+++ b/x11-drivers/xf86-input-citron/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-input-citron
PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index c5aff7545f79..c322e840ad3a 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-input-hyperpen
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 650e01e43fd5..7ac0f4635173 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-joystick
-PORTVERSION= 1.4.1
-PORTREVISION= 2
+PORTVERSION= 1.5.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
index 617c2fb79819..9be38201d193 100644
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ b/x11-drivers/xf86-input-joystick/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-joystick-1.4.1.tar.bz2) = 4d25fd27d6b4416b9754f6d4ed66cbb4
-SHA256 (xorg/driver/xf86-input-joystick-1.4.1.tar.bz2) = b4d3143f68b99eae3f186e382437faf8522eb72f9de58d4af2343b090f5fe160
-SIZE (xorg/driver/xf86-input-joystick-1.4.1.tar.bz2) = 289900
+MD5 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 79b20f86d1b2e625ae65e35c3457027f
+SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
+SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
index 2c94a5896b99..1a0ab467f87b 100644
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -5,4 +5,3 @@ libdata/pkgconfig/xorg-joystick.pc
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
-@dirrmtry include/xorg
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index f42febe49885..a24488f4a6cc 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-keyboard
-PORTVERSION= 1.3.2
-PORTREVISION= 3
+PORTVERSION= 1.4.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index 87aab6634f0c..bc439114f1df 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = d6fe929c4f6085d6dd67f197ae9c42f6
-SHA256 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
-SIZE (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 269634
+MD5 (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = fd17158ffeacecc8cc670604460cb98b
+SHA256 (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = 842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5
+SIZE (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = 287234
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c
deleted file mode 100644
index cc82bd4dde9a..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/bsd_kbd.c.orig Mon Oct 3 18:46:14 2005
-+++ src/bsd_kbd.c Fri Sep 29 23:26:17 2006
-@@ -74,6 +74,17 @@
- KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
- int real_leds = 0;
-
-+#if defined (SYSCONS_SUPPORT)
-+ if (pKbd->sunKbd) {
-+ if (leds & 0x08) real_leds |= XLED1;
-+ if (leds & 0x04) real_leds |= XLED4;
-+ if (leds & 0x02) real_leds |= XLED3;
-+ if (leds & 0x01) real_leds |= XLED2;
-+ leds = real_leds;
-+ real_leds = 0;
-+ }
-+#endif
-+
- #ifdef LED_CAP
- if (leds & XLED1) real_leds |= LED_CAP;
- #endif
-@@ -82,8 +93,12 @@
- #endif
- #ifdef LED_SCR
- if (leds & XLED3) real_leds |= LED_SCR;
-+#ifdef LED_COMP
-+ if (leds & XLED4) real_leds |= LED_COMP;
-+#else
- if (leds & XLED4) real_leds |= LED_SCR;
- #endif
-+#endif
-
- switch (pKbd->consType) {
-
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
deleted file mode 100644
index d43b9056148b..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/kbd.c.orig Wed Nov 9 22:31:23 2005
-+++ src/kbd.c Sat Oct 7 21:09:40 2006
-@@ -635,7 +635,6 @@
- return;
- }
-
--#ifndef __sparc64__
- /*
- * PC keyboards generate separate key codes for
- * Alt+Print and Control+Pause but in the X keyboard model
-@@ -648,7 +647,6 @@
- else if (scanCode == KEY_Break)
- scanCode = KEY_Pause;
- }
--#endif
-
- sunKeyboards:
- /*
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 41da9b0a1d7f..74d6a909115a 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-input-magictouch
PORTVERSION= 1.0.0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index f629e4f44908..088123373dfc 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-mouse
-PORTVERSION= 1.4.0
-PORTREVISION= 7
+PORTVERSION= 1.5.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index 9864f5a0bfcf..017bdcb38fa3 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e7dc0759c14a9bfd373917a49e5f7c7d
-SHA256 (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7
-SIZE (xorg/driver/xf86-input-mouse-1.4.0.tar.bz2) = 292626
+MD5 (xorg/driver/xf86-input-mouse-1.5.0.tar.bz2) = c58629fddf0782dad5c02da6aeb35521
+SHA256 (xorg/driver/xf86-input-mouse-1.5.0.tar.bz2) = f303e20872ab2fb20e07a7f734d17723346d2b4b8687ea2086f7a7468d1ab397
+SIZE (xorg/driver/xf86-input-mouse-1.5.0.tar.bz2) = 308189
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index b76430cb25ad..0ddebee520c7 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-input-mutouch
PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 4510c5c029d5..2565374554f7 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-input-penmount
PORTVERSION= 1.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index dccccac65bfa..5ee9b9158b14 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-synaptics
-PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index 316c486ad47c..c437e96a1aee 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-synaptics-1.1.2.tar.bz2) = c8fd6516f9636a3751e401e4b836e160
-SHA256 (xorg/driver/xf86-input-synaptics-1.1.2.tar.bz2) = e4cd4e4d04beab0f0cf1e34ba4e6eb61f591ce3b648b7078b1418ed3df684ced
-SIZE (xorg/driver/xf86-input-synaptics-1.1.2.tar.bz2) = 293527
+MD5 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 29a6f9da5123149e4abc8ff83880ed5c
+SHA256 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
+SIZE (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 295524
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index a747a312ec36..8fd03d1cc963 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -6,15 +6,14 @@
#
PORTNAME= xf86-input-vmmouse
-PORTVERSION= 12.6.3
-PORTREVISION= 3
+PORTVERSION= 12.6.6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org vmmouse input driver
XORG_CAT= driver
-CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
+CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
MAN1= vmmouse_detect.1
MAN4= vmmouse.4x
diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo
index f7fa6a5e46aa..e39e90063383 100644
--- a/x11-drivers/xf86-input-vmmouse/distinfo
+++ b/x11-drivers/xf86-input-vmmouse/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = f5933143d7789557983ecb527092d14e
-SHA256 (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = c39fe6f2a17c8c609421ed17447221209dd416ca142d6f3d0b1052808ef7d604
-SIZE (xorg/driver/xf86-input-vmmouse-12.6.3.tar.bz2) = 252631
+MD5 (xorg/driver/xf86-input-vmmouse-12.6.6.tar.bz2) = 1c57338928a8897b7ca0b5524fcb1223
+SHA256 (xorg/driver/xf86-input-vmmouse-12.6.6.tar.bz2) = 0cb2896b7a284efd6337c019c599fd4d5a6de74a58c6e6c31c31ed399efa8171
+SIZE (xorg/driver/xf86-input-vmmouse-12.6.6.tar.bz2) = 272965
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 4ee20da5e4fa..cd7f6a7d1606 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-void
-PORTVERSION= 1.2.0
-PORTREVISION= 2
+PORTVERSION= 1.3.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
index 9f1c941e7593..3e3b4f9a65d4 100644
--- a/x11-drivers/xf86-input-void/distinfo
+++ b/x11-drivers/xf86-input-void/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = c81fbd9368abbe1488b423ddef477e88
-SHA256 (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = b01706192b00a777640f2be0a0635bbded70c2ef38863d268372d27d2b53e2a5
-SIZE (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = 235491
+MD5 (xorg/driver/xf86-input-void-1.3.0.tar.bz2) = 53bdac9ca56418f4675810ed8a78b3e8
+SHA256 (xorg/driver/xf86-input-void-1.3.0.tar.bz2) = e2165ddf637703e21b3c45d83d56485c39b082b9440053d3885557c4d52b130f
+SIZE (xorg/driver/xf86-input-void-1.3.0.tar.bz2) = 247917
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 805be5ea98dc..cce06334402a 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-apm
-PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTVERSION= 1.2.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
index 9515277f34f0..0d79c320a648 100644
--- a/x11-drivers/xf86-video-apm/distinfo
+++ b/x11-drivers/xf86-video-apm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 673c93df004bb857dc89ae9c78ccf907
-SHA256 (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = f88e2550f970135b535febc180407b92f6cd0b3b0997fb6f0ce282e3a675c4fe
-SIZE (xorg/driver/xf86-video-apm-1.2.1.tar.bz2) = 282068
+MD5 (xorg/driver/xf86-video-apm-1.2.2.tar.bz2) = 48441a19aaf015570b267f2a8e67d8ab
+SHA256 (xorg/driver/xf86-video-apm-1.2.2.tar.bz2) = 678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752
+SIZE (xorg/driver/xf86-video-apm-1.2.2.tar.bz2) = 286085
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index b748f7fc8b53..05ff06d4cc61 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-ark
-PORTVERSION= 0.7.1
-PORTREVISION= 3
+PORTVERSION= 0.7.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
index e7f2a3b8b6ea..df4e7cd29569 100644
--- a/x11-drivers/xf86-video-ark/distinfo
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = be91391f061863617018403cdbd2944f
-SHA256 (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 14c34fb3fc894aad7ca24141cbc2283d955849eec920d058ba1aca2a1f5e3b86
-SIZE (xorg/driver/xf86-video-ark-0.7.1.tar.bz2) = 237009
+MD5 (xorg/driver/xf86-video-ark-0.7.2.tar.bz2) = 4745f5c722b030962cc56eb2443894a0
+SHA256 (xorg/driver/xf86-video-ark-0.7.2.tar.bz2) = db1ef3e15ebd382837f16c1143035dfd9fa6465a77ae2e850201f71508065741
+SIZE (xorg/driver/xf86-video-ark-0.7.2.tar.bz2) = 240099
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 73500001a5c5..52b55d95499c 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.12.4
-PORTREVISION= 1
+PORTVERSION= 6.13.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index 6961aa235c12..2cd830527045 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = e662348f6f957fcedf52818d668ab9f5
-SHA256 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6
-SIZE (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = 915124
+MD5 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 7b2642442091808002963920c7693aeb
+SHA256 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 6d07847d63798f92237175f2645bf964d083b18c4c439e6c787a5f0c3dd68e31
+SIZE (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 1015392
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index 73500001a5c5..52b55d95499c 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.12.4
-PORTREVISION= 1
+PORTVERSION= 6.13.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
index 6961aa235c12..2cd830527045 100644
--- a/x11-drivers/xf86-video-ati613/distinfo
+++ b/x11-drivers/xf86-video-ati613/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = e662348f6f957fcedf52818d668ab9f5
-SHA256 (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = cfde066a7087a19b624f79e95cb9a6c97a847b8802cf38d4ae6022758bf338f6
-SIZE (xorg/driver/xf86-video-ati-6.12.4.tar.bz2) = 915124
+MD5 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 7b2642442091808002963920c7693aeb
+SHA256 (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 6d07847d63798f92237175f2645bf964d083b18c4c439e6c787a5f0c3dd68e31
+SIZE (xorg/driver/xf86-video-ati-6.13.0.tar.bz2) = 1015392
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 2a3546402c68..0c95049dc15d 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-chips
-PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTVERSION= 1.2.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index b2d97d5f4784..5f2228bb0cca 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 2f2643fca6335f18024bffa6c4e0c12f
-SHA256 (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = ed3531c5b283b9b0df7e8fc4aa1b42df89c65a5b48889f786c1a9066190833f3
-SIZE (xorg/driver/xf86-video-chips-1.2.1.tar.bz2) = 340894
+MD5 (xorg/driver/xf86-video-chips-1.2.2.tar.bz2) = a3969c28c3b36ab2caa852a9324e9b70
+SHA256 (xorg/driver/xf86-video-chips-1.2.2.tar.bz2) = ff6fef2cffc62feb3b23f3fee375e502ab7356d571517a89b4de67f0f6037f0e
+SIZE (xorg/driver/xf86-video-chips-1.2.2.tar.bz2) = 346931
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index b80aff020bae..1909893324a0 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-cirrus
-PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTVERSION= 1.3.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
index 6e87cf94c9b6..e1d7b3199924 100644
--- a/x11-drivers/xf86-video-cirrus/distinfo
+++ b/x11-drivers/xf86-video-cirrus/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-cirrus-1.3.0.tar.bz2) = cb614f24698188beb399bd35f1d8906e
-SHA256 (xorg/driver/xf86-video-cirrus-1.3.0.tar.bz2) = 626e3ee292e251465decb569a92ffde8aaa8218e6226d79cc722b5ef8fe2e17e
-SIZE (xorg/driver/xf86-video-cirrus-1.3.0.tar.bz2) = 269386
+MD5 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 8195d03ed0be0975c03441e66a9f53b3
+SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
+SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index 32f742101b22..c6c36fbf03b9 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-cyrix
PORTVERSION= 1.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 217cd44548a3..7885594523c7 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-dummy
-PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTVERSION= 0.3.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
index 70010142b5fd..ffe3f1af2962 100644
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = e7920f4820d3450e9e5cb454fc620895
-SHA256 (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = bcd0111f8cba45125613f45ec67b9425ac6d39194c4d2c896c631efc51e93ba0
-SIZE (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = 233757
+MD5 (xorg/driver/xf86-video-dummy-0.3.3.tar.bz2) = 3ffe3a28f4452e66bf56180e7da9cbc5
+SHA256 (xorg/driver/xf86-video-dummy-0.3.3.tar.bz2) = df3f55de7953dba6d7ce10cc5f355da1a6164f781ad9393a38dae502dba4955d
+SIZE (xorg/driver/xf86-video-dummy-0.3.3.tar.bz2) = 250155
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 598f3476be34..bcd7abca5717 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-fbdev
-PORTVERSION= 0.4.0
-PORTREVISION= 3
+PORTVERSION= 0.4.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo
index c9115eba6f52..01f11b987388 100644
--- a/x11-drivers/xf86-video-fbdev/distinfo
+++ b/x11-drivers/xf86-video-fbdev/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 6572b39fec77b8e6de1c858a93992924
-SHA256 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d
-SIZE (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 242435
+MD5 (xorg/driver/xf86-video-fbdev-0.4.1.tar.bz2) = 79ce1eb9f9d2ed56de70d8e06cb767d9
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.1.tar.bz2) = 2bf857179523433a9cc6c6eea059298db4c865e649aa58dfc67c828f28b7288f
+SIZE (xorg/driver/xf86-video-fbdev-0.4.1.tar.bz2) = 244592
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 21704384442c..99e349c89a61 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-glint
-PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTVERSION= 1.2.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 0a29c808517c..3816aab63197 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 4295a46a75fa98470c6dfb0e1a4f7e9f
-SHA256 (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 41df8be5719a96abd7de5343925023296491fad10a3a9e691acf50f976970bad
-SIZE (xorg/driver/xf86-video-glint-1.2.2.tar.bz2) = 348742
+MD5 (xorg/driver/xf86-video-glint-1.2.4.tar.bz2) = 960df34e129faa411e58c0d6b56d79a3
+SHA256 (xorg/driver/xf86-video-glint-1.2.4.tar.bz2) = 5f8d6e3b02c261d235bae63d95510b940b6c9a775301146b3c229926ed99d76f
+SIZE (xorg/driver/xf86-video-glint-1.2.4.tar.bz2) = 353189
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 01c9af4b8404..a75a6f96e5b3 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-i128
-PORTVERSION= 1.3.1
-PORTREVISION= 3
+PORTVERSION= 1.3.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
index b04208191181..a6f6bc7eccbc 100644
--- a/x11-drivers/xf86-video-i128/distinfo
+++ b/x11-drivers/xf86-video-i128/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 3b170a6df5114420cd4021a057918a09
-SHA256 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75
-SIZE (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 265350
+MD5 (xorg/driver/xf86-video-i128-1.3.3.tar.bz2) = a597e8efeec6ab8bc6ba6d87fceb2dba
+SHA256 (xorg/driver/xf86-video-i128-1.3.3.tar.bz2) = 4d0691ce8e3b54075d05cc34717350be42915174b3930b2c9b7f5e309b32b02e
+SIZE (xorg/driver/xf86-video-i128-1.3.3.tar.bz2) = 280135
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 253268a0947e..7513b721e0c7 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-i740
-PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTVERSION= 1.3.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
index a75899d29888..02368923587d 100644
--- a/x11-drivers/xf86-video-i740/distinfo
+++ b/x11-drivers/xf86-video-i740/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = d0e5a805c546b29b1dd3b55a68d16dc4
-SHA256 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f
-SIZE (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 268468
+MD5 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 4ac1318788f62159965f15131c869e7a
+SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
+SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
index f60095248f68..0598e509f6e5 100644
--- a/x11-drivers/xf86-video-imstt/Makefile
+++ b/x11-drivers/xf86-video-imstt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-imstt
PORTVERSION= 1.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 4b8c60596743..901919ca66f1 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-intel
PORTVERSION= 2.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c b/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c
new file mode 100644
index 000000000000..278354a4b266
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c
@@ -0,0 +1,17 @@
+--- src/ch7017/ch7017.c.orig 2009-04-08 18:59:47.000000000 -0500
++++ src/ch7017/ch7017.c 2010-02-21 12:40:12.000000000 -0600
+@@ -34,13 +34,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+
+ #include "../i2c_vid.h"
+ #include "ch7017_reg.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c b/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c
new file mode 100644
index 000000000000..6dbc0a7c36a4
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c
@@ -0,0 +1,17 @@
+--- src/ch7xxx/ch7xxx.c.orig 2010-02-21 12:42:11.000000000 -0600
++++ src/ch7xxx/ch7xxx.c 2010-02-21 12:44:40.000000000 -0600
+@@ -34,13 +34,11 @@
+ #include <string.h>
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+
+ #include "../i2c_vid.h"
+ #include "ch7xxx.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c
new file mode 100644
index 000000000000..5ccb55a33daf
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c
@@ -0,0 +1,111 @@
+--- src/i810_driver.c.orig 2010-02-21 12:55:16.000000000 -0600
++++ src/i810_driver.c 2010-02-21 13:17:04.000000000 -0600
+@@ -69,8 +69,6 @@
+ */
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+ #include "mibstore.h"
+@@ -490,20 +488,6 @@
+ );
+
+ /*
+- * Tell the loader about symbols from other modules that this module
+- * might refer to.
+- */
+- LoaderRefSymLists(I810vgahwSymbols,
+- I810fbSymbols, I810xaaSymbols, I810ramdacSymbols,
+-#ifdef XF86DRI
+- I810drmSymbols,
+- I810driSymbols,
+-#endif
+- I810shadowFBSymbols,
+- I810vbeSymbols, vbeOptionalSymbols,
+- I810ddcSymbols, NULL);
+-
+- /*
+ * The return value must be non-NULL on success even though there
+ * is no TearDownProc.
+ */
+@@ -809,7 +793,6 @@
+ }
+
+ if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
+- xf86LoaderReqSymLists(I810vbeSymbols, NULL);
+ MonInfo = vbeDoEDID(pVbe, NULL);
+ xf86PrintEDID(MonInfo);
+ xf86SetDDCproperties(pScrn, MonInfo);
+@@ -864,8 +847,6 @@
+ if (!xf86LoadSubModule(pScrn, "vgahw"))
+ return FALSE;
+
+- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
+-
+ /* Allocate a vgaHWRec */
+ if (!vgaHWGetHWRec(pScrn))
+ return FALSE;
+@@ -878,10 +859,6 @@
+ pI810->PciInfo->func);
+ #endif
+
+- if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
+- return FALSE;
+- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+-
+ /* Set pScrn->monitor */
+ pScrn->monitor = pScrn->confScreen->monitor;
+
+@@ -960,7 +937,6 @@
+ I810FreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810xaaSymbols, NULL);
+ }
+
+ #ifdef XF86DRI
+@@ -1244,14 +1220,12 @@
+ I810FreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810fbSymbols, NULL);
+
+ if (!xf86ReturnOptValBool(pI810->Options, OPTION_SW_CURSOR, FALSE)) {
+ if (!xf86LoadSubModule(pScrn, "ramdac")) {
+ I810FreeRec(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
+ }
+
+ if (xf86GetOptValInteger
+@@ -1278,9 +1252,6 @@
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Couldn't load shadowfb module:\n");
+ }
+- else {
+- xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
+- }
+ }
+
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "page flipping %s\n",
+@@ -1312,16 +1283,12 @@
+ #ifdef XF86DRI
+ /* Load the dri module if requested. */
+ if (xf86ReturnOptValBool(pI810->Options, OPTION_DRI, FALSE)) {
+- if (xf86LoadSubModule(pScrn, "dri")) {
+- xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
+- }
++ xf86LoadSubModule(pScrn, "dri");
+ }
+ #endif
+
+ /* We won't be using the VGA access after the probe */
+ I810SetMMIOAccess(pI810);
+- xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
+- xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
+
+ return TRUE;
+ }
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c
new file mode 100644
index 000000000000..ffb2ac39cadf
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c
@@ -0,0 +1,10 @@
+--- src/i810_hwmc.c.orig 2010-02-21 13:40:44.000000000 -0600
++++ src/i810_hwmc.c 2010-02-21 13:41:16.000000000 -0600
+@@ -42,7 +42,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c
new file mode 100644
index 000000000000..c10b5e668836
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c
@@ -0,0 +1,10 @@
+--- src/i810_video.c.orig 2010-02-21 13:17:58.000000000 -0600
++++ src/i810_video.c 2010-02-21 13:18:37.000000000 -0600
+@@ -42,7 +42,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c
new file mode 100644
index 000000000000..05bdb931e945
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c
@@ -0,0 +1,14 @@
+--- src/i830_dri.c.orig 2010-02-21 13:30:37.000000000 -0600
++++ src/i830_dri.c 2010-02-21 13:39:02.000000000 -0600
+@@ -1731,9 +1731,10 @@
+ info.driverName = IS_I965G(pI830) ? "i965" : "i915";
+ info.deviceName = p;
+ info.version = 1;
+-
++#if 0
+ info.CreateBuffers = I830DRI2CreateBuffers;
+ info.DestroyBuffers = I830DRI2DestroyBuffers;
++#endif
+ info.CopyRegion = I830DRI2CopyRegion;
+
+ pI830->drmSubFD = info.fd;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c
new file mode 100644
index 000000000000..776b67f915d1
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c
@@ -0,0 +1,97 @@
+--- src/i830_driver.c.orig 2010-02-21 13:20:12.000000000 -0600
++++ src/i830_driver.c 2010-02-21 13:26:14.000000000 -0600
+@@ -175,8 +175,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86Priv.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+@@ -1050,7 +1048,6 @@
+ if (!xf86LoadSubModule(pScrn, "ddc")) {
+ pI830->ddc2 = FALSE;
+ } else {
+- xf86LoaderReqSymLists(I810ddcSymbols, NULL);
+ pI830->ddc2 = TRUE;
+ }
+
+@@ -1058,8 +1055,6 @@
+ /* Load I2C if we have the code to use it */
+ if (pI830->ddc2) {
+ if (xf86LoadSubModule(pScrn, "i2c")) {
+- xf86LoaderReqSymLists(I810i2cSymbols, NULL);
+-
+ pI830->ddc2 = TRUE;
+ } else {
+ pI830->ddc2 = FALSE;
+@@ -1511,11 +1506,9 @@
+ /* The vgahw module should be loaded here when needed */
+ if (!xf86LoadSubModule(pScrn, "vgahw"))
+ return FALSE;
+- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
+
+ if (!xf86LoadSubModule(pScrn, "ramdac"))
+ return FALSE;
+- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
+
+ return TRUE;
+ }
+@@ -1854,12 +1847,6 @@
+ pI830->PciInfo->func);
+ #endif
+
+- if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
+- PreInitCleanup(pScrn);
+- return FALSE;
+- }
+-
+- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+ pScrn->monitor = pScrn->confScreen->monitor;
+ pScrn->progClock = TRUE;
+ pScrn->rgbBits = 8;
+@@ -1942,8 +1929,6 @@
+ return FALSE;
+ }
+
+- xf86LoaderReqSymLists(I810fbSymbols, NULL);
+-
+ switch (pI830->accel) {
+ #ifdef I830_USE_XAA
+ case ACCEL_XAA:
+@@ -1951,7 +1936,6 @@
+ PreInitCleanup(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I810xaaSymbols, NULL);
+ break;
+ #endif
+
+@@ -1973,7 +1957,6 @@
+ PreInitCleanup(pScrn);
+ return FALSE;
+ }
+- xf86LoaderReqSymLists(I830exaSymbols, NULL);
+ break;
+ }
+ #endif
+@@ -1988,17 +1971,13 @@
+
+ /* We won't be using the VGA access after the probe. */
+ I830SetMMIOAccess(pI830);
+- xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
+- xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
+ }
+
+ #if defined(XF86DRI)
+ /* Load the dri module if requested. */
+ if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
+ pI830->directRenderingType != DRI_DISABLED) {
+- if (xf86LoadSubModule(pScrn, "dri")) {
+- xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
+- }
++ xf86LoadSubModule(pScrn, "dri");
+ }
+ #endif
+
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c
new file mode 100644
index 000000000000..1f4461cd9fe1
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c
@@ -0,0 +1,11 @@
+--- src/i830_i2c.c.orig 2010-02-21 13:27:07.000000000 -0600
++++ src/i830_i2c.c 2010-02-21 13:27:45.000000000 -0600
+@@ -31,8 +31,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+-#include "xf86RAC.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+ #include "mibstore.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c
new file mode 100644
index 000000000000..e292a7dedbf7
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c
@@ -0,0 +1,78 @@
+--- src/i830_render.c.orig 2009-05-12 19:12:11.000000000 -0500
++++ src/i830_render.c 2010-03-07 15:30:45.000000000 -0600
+@@ -210,26 +210,8 @@
+ (dblend << S8_DST_BLEND_FACTOR_SHIFT);
+ }
+
+-static Bool i830_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i830_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+- int w = pPict->pDrawable->width;
+- int h = pPict->pDrawable->height;
+- int i;
+-
+- if ((w > 2048) || (h > 2048))
+- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+- for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
+- i++)
+- {
+- if (i830_tex_formats[i].fmt == pPict->format)
+- break;
+- }
+- if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
+- I830FALLBACK("Unsupported picture format 0x%x\n",
+- (int)pPict->format);
+-
+ if (pPict->repeatType > RepeatReflect)
+ I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
+
+@@ -239,6 +221,26 @@
+ I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ }
+
++ if (pPict->pDrawable)
++ {
++ int w, h, i;
++
++ w = pPict->pDrawable->width;
++ h = pPict->pDrawable->height;
++ if ((w > 2048) || (h > 2048))
++ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++ for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
++ i++)
++ {
++ if (i830_tex_formats[i].fmt == pPict->format)
++ break;
++ }
++ if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
++ I830FALLBACK("Unsupported picture format 0x%x\n",
++ (int)pPict->format);
++ }
++
+ return TRUE;
+ }
+
+@@ -376,9 +378,9 @@
+ "alpha and source value blending.\n");
+ }
+
+- if (!i830_check_composite_texture(pSrcPicture, 0))
++ if (!i830_check_composite_texture(pScrn, pSrcPicture, 0))
+ I830FALLBACK("Check Src picture texture\n");
+- if (pMaskPicture != NULL && !i830_check_composite_texture(pMaskPicture, 1))
++ if (pMaskPicture != NULL && !i830_check_composite_texture(pScrn, pMaskPicture, 1))
+ I830FALLBACK("Check Mask picture texture\n");
+
+ if (!i830_get_dest_format(pDstPicture, &tmp1))
+@@ -392,7 +394,7 @@
+ PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ I830Ptr pI830 = I830PTR(pScrn);
+ uint32_t dst_format, dst_pitch;
+ Bool is_affine_src, is_affine_mask;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c
new file mode 100644
index 000000000000..b93a98e24932
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c
@@ -0,0 +1,10 @@
+--- src/i830_video.c.orig 2010-02-21 13:28:37.000000000 -0600
++++ src/i830_video.c 2010-02-21 13:29:05.000000000 -0600
+@@ -57,7 +57,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c b/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c
new file mode 100644
index 000000000000..ab7f679fb4ac
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c
@@ -0,0 +1,10 @@
+--- src/i915_hwmc.c.orig 2010-02-21 13:42:21.000000000 -0600
++++ src/i915_hwmc.c 2010-02-21 13:42:38.000000000 -0600
+@@ -32,7 +32,6 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c
new file mode 100644
index 000000000000..53b1a0e1e850
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c
@@ -0,0 +1,69 @@
+--- src/i915_render.c.orig 2009-05-12 19:12:11.000000000 -0500
++++ src/i915_render.c 2010-03-07 15:30:45.000000000 -0600
+@@ -167,26 +167,8 @@
+ return TRUE;
+ }
+
+-static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i915_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+- int w = pPict->pDrawable->width;
+- int h = pPict->pDrawable->height;
+- int i;
+-
+- if ((w > 2048) || (h > 2048))
+- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+- for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
+- i++)
+- {
+- if (i915_tex_formats[i].fmt == pPict->format)
+- break;
+- }
+- if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
+- I830FALLBACK("Unsupported picture format 0x%x\n",
+- (int)pPict->format);
+-
+ if (pPict->repeatType > RepeatReflect)
+ I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
+
+@@ -194,6 +176,26 @@
+ pPict->filter != PictFilterBilinear)
+ I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+
++ if (pPict->pDrawable)
++ {
++ int w, h, i;
++
++ w = pPict->pDrawable->width;
++ h = pPict->pDrawable->height;
++ if ((w > 2048) || (h > 2048))
++ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++ for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
++ i++)
++ {
++ if (i915_tex_formats[i].fmt == pPict->format)
++ break;
++ }
++ if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
++ I830FALLBACK("Unsupported picture format 0x%x\n",
++ (int)pPict->format);
++ }
++
+ return TRUE;
+ }
+
+@@ -220,9 +222,9 @@
+ "alpha and source value blending.\n");
+ }
+
+- if (!i915_check_composite_texture(pSrcPicture, 0))
++ if (!i915_check_composite_texture(pScrn, pSrcPicture, 0))
+ I830FALLBACK("Check Src picture texture\n");
+- if (pMaskPicture != NULL && !i915_check_composite_texture(pMaskPicture, 1))
++ if (pMaskPicture != NULL && !i915_check_composite_texture(pScrn, pMaskPicture, 1))
+ I830FALLBACK("Check Mask picture texture\n");
+
+ if (!i915_get_dest_format(pDstPicture, &tmp1))
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c
new file mode 100644
index 000000000000..99b7d787267b
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c
@@ -0,0 +1,78 @@
+--- src/i965_render.c.orig 2009-05-12 19:12:11.000000000 -0500
++++ src/i965_render.c 2010-03-07 15:30:45.000000000 -0600
+@@ -181,26 +181,8 @@
+ return TRUE;
+ }
+
+-static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
++static Bool i965_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+- int w = pPict->pDrawable->width;
+- int h = pPict->pDrawable->height;
+- int i;
+-
+- if ((w > 8192) || (h > 8192))
+- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
+-
+- for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
+- i++)
+- {
+- if (i965_tex_formats[i].fmt == pPict->format)
+- break;
+- }
+- if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
+- I830FALLBACK("Unsupported picture format 0x%x\n",
+- (int)pPict->format);
+-
+ if (pPict->repeatType > RepeatReflect)
+ I830FALLBACK("extended repeat (%d) not supported\n",
+ pPict->repeatType);
+@@ -211,6 +193,26 @@
+ I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ }
+
++ if (pPict->pDrawable)
++ {
++ int w, h, i;
++
++ w = pPict->pDrawable->width;
++ h = pPict->pDrawable->height;
++ if ((w > 8192) || (h > 8192))
++ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
++
++ for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
++ i++)
++ {
++ if (i965_tex_formats[i].fmt == pPict->format)
++ break;
++ }
++ if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
++ I830FALLBACK("Unsupported picture format 0x%x\n",
++ (int)pPict->format);
++ }
++
+ return TRUE;
+ }
+
+@@ -239,9 +241,9 @@
+ }
+ }
+
+- if (!i965_check_composite_texture(pSrcPicture, 0))
++ if (!i965_check_composite_texture(pScrn, pSrcPicture, 0))
+ I830FALLBACK("Check Src picture texture\n");
+- if (pMaskPicture != NULL && !i965_check_composite_texture(pMaskPicture, 1))
++ if (pMaskPicture != NULL && !i965_check_composite_texture(pScrn, pMaskPicture, 1))
+ I830FALLBACK("Check Mask picture texture\n");
+
+ if (!i965_get_dest_format(pDstPicture, &tmp1))
+@@ -1258,7 +1260,7 @@
+ PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+- ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
++ ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ I830Ptr pI830 = I830PTR(pScrn);
+ struct gen4_render_state *render_state= pI830->gen4_render_state;
+ gen4_composite_op *composite_op = &render_state->composite_op;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c b/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c
new file mode 100644
index 000000000000..b54885d9b0d8
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c
@@ -0,0 +1,17 @@
+--- src/ivch/ivch.c.orig 2010-02-21 12:47:05.000000000 -0600
++++ src/ivch/ivch.c 2010-02-21 12:48:09.000000000 -0600
+@@ -31,13 +31,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsproto.h>
+ #include <unistd.h>
+
+ #include "../i2c_vid.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c b/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c
new file mode 100644
index 000000000000..f9d717794304
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c
@@ -0,0 +1,17 @@
+--- src/sil164/sil164.c.orig 2010-02-21 12:49:54.000000000 -0600
++++ src/sil164/sil164.c 2010-02-21 12:50:40.000000000 -0600
+@@ -35,13 +35,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsproto.h>
+
+ #include "../i2c_vid.h"
+ #include "sil164.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c b/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c
new file mode 100644
index 000000000000..89927b3311b2
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c
@@ -0,0 +1,17 @@
+--- src/tfp410/tfp410.c.orig 2010-02-21 12:52:35.000000000 -0600
++++ src/tfp410/tfp410.c 2010-02-21 12:53:19.000000000 -0600
+@@ -34,13 +34,11 @@
+
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Resources.h"
+ #include "compiler.h"
+ #include "miscstruct.h"
+ #include "xf86i2c.h"
+ #include "xf86Crtc.h"
+-#define DPMS_SERVER
+-#include <X11/extensions/dpms.h>
++#include <X11/extensions/dpmsconst.h>
+
+ #include "../i2c_vid.h"
+ #include "tfp410.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h b/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h
new file mode 100644
index 000000000000..46eb72ea63c4
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h
@@ -0,0 +1,32 @@
+--- uxa/uxa-priv.h.orig 2009-05-12 19:12:11.000000000 -0500
++++ uxa/uxa-priv.h 2010-02-21 12:27:32.000000000 -0600
+@@ -42,8 +42,7 @@
+ #define NEED_EVENTS
+ #include <X11/Xproto.h>
+ #ifdef MITSHM
+-#define _XSHM_SERVER_
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #endif
+ #include "scrnintstr.h"
+ #include "pixmapstr.h"
+@@ -319,17 +318,11 @@
+ extern const GCOps uxa_ops;
+
+ #ifdef MITSHM
+-extern ShmFuncs uxa_shm_funcs;
+-
+ /* XXX these come from shmint.h, which isn't exported by the server */
+-void
+-ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+
+-void
+-ShmSetPixmapFormat(ScreenPtr pScreen, int format);
++#include "shmint.h"
+
+-void
+-fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
++extern ShmFuncs uxa_shm_funcs;
+
+ #endif
+
diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile
index 4b8c60596743..30edcb182ff2 100644
--- a/x11-drivers/xf86-video-intel29/Makefile
+++ b/x11-drivers/xf86-video-intel29/Makefile
@@ -5,15 +5,15 @@
# $FreeBSD$
#
-PORTNAME= xf86-video-intel
-PORTVERSION= 2.7.1
-PORTREVISION= 1
+PORTNAME= xf86-video-intel29
+PORTVERSION= 2.9.1
CATEGORIES= x11-drivers
+DISTNAME= xf86-video-intel-${PORTVERSION}
MAINTAINER= x11@FreeBSD.org
COMMENT= Driver for Intel integrated graphics chipsets
-CONFLICTS= xf86-video-i810-[0-9]*
+CONFLICTS= xf86-video-i810-[0-9]* xf86-video-intel-[0-9]*
ONLY_FOR_ARCHS= amd64 i386
USE_GL= gl
@@ -22,4 +22,6 @@ XORG_CAT= driver
USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto
MAN4= intel.4x
+IGNORE= we have to wait of GEM support to get ironlake chips to work
+
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel29/distinfo b/x11-drivers/xf86-video-intel29/distinfo
index 954e3df937f5..a9b91d4ffbf9 100644
--- a/x11-drivers/xf86-video-intel29/distinfo
+++ b/x11-drivers/xf86-video-intel29/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 0eed17138da18ff1fb2b8ab0f076d957
-SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
-SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
+MD5 (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 8951d0366c16991badb7f9050556f4f3
+SHA256 (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
+SIZE (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 789001
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index db0cd0bc7951..40877d30b348 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-mach64
-PORTVERSION= 6.8.1
-PORTREVISION= 1
+PORTVERSION= 6.8.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
index 907a460d60b9..cdec12ebd7f9 100644
--- a/x11-drivers/xf86-video-mach64/distinfo
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-mach64-6.8.1.tar.bz2) = 0856d9c8435cf4350b68fbd57ca6d4fc
-SHA256 (xorg/driver/xf86-video-mach64-6.8.1.tar.bz2) = 7ce5cfa0f5b14181ca2f36858ebbefc6fb89e89028bd97e2bbea6cf41f8055ce
-SIZE (xorg/driver/xf86-video-mach64-6.8.1.tar.bz2) = 465530
+MD5 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 6c0522b2b72a0a47c48d718443616651
+SHA256 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
+SIZE (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 486282
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 3b9b5c3c19b9..8ffe2ccff5f6 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-mga
-PORTVERSION= 1.4.10
-PORTREVISION= 1
+PORTVERSION= 1.4.11
PORTEPOCH= 2
CATEGORIES= x11-drivers
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
index e8fc684882f5..03f6bca6cc5f 100644
--- a/x11-drivers/xf86-video-mga/distinfo
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-mga-1.4.10.tar.bz2) = e2515e7476185a2d0482a3004a84cfd9
-SHA256 (xorg/driver/xf86-video-mga-1.4.10.tar.bz2) = 8d3f196a7b1ddc0efe11c652702dc73f35719c9602e58f93c80a24cd608bcbbb
-SIZE (xorg/driver/xf86-video-mga-1.4.10.tar.bz2) = 409965
+MD5 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 9d1ca965cedb0856296b47442f3c739d
+SHA256 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6
+SIZE (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 415829
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga.h b/x11-drivers/xf86-video-mga/files/patch-src__mga.h
new file mode 100644
index 000000000000..2550f2c9e8a0
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga.h
@@ -0,0 +1,21 @@
+--- ./src/mga.h.orig 2009-07-27 17:24:51.000000000 -0700
++++ ./src/mga.h 2010-03-09 17:58:54.154420020 -0800
+@@ -133,6 +133,10 @@
+ #define PCI_CHIP_MGAG200_EV_PCI 0x0530
+ #endif
+
++#ifndef PCI_CHIP_MGAG200_EH_PCI
++#define PCI_CHIP_MGAG200_EH_PCI 0x0533
++#endif
++
+ /*
+ * Read/write to the DAC via MMIO
+ */
+@@ -474,6 +478,7 @@
+ int is_G200SE:1;
+ int is_G200WB:1;
+ int is_G200EV:1;
++ int is_G200EH:1;
+
+ int KVM;
+
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c
new file mode 100644
index 000000000000..b71a68fd518b
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c
@@ -0,0 +1,232 @@
+--- ./src/mga_dacG.c.orig 2010-03-09 17:58:54.152419708 -0800
++++ ./src/mga_dacG.c 2010-03-09 17:58:54.157420208 -0800
+@@ -211,6 +211,55 @@
+ }
+
+ static void
++MGAG200EHComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
++{
++ unsigned int ulComputedFo;
++ unsigned int ulFDelta;
++ unsigned int ulFPermitedDelta;
++ unsigned int ulFTmpDelta;
++ unsigned int ulTestP;
++ unsigned int ulTestM;
++ unsigned int ulTestN;
++ unsigned int ulVCOMax;
++ unsigned int ulVCOMin;
++ unsigned int ulPLLFreqRef;
++
++ ulVCOMax = 800000;
++ ulVCOMin = 400000;
++ ulPLLFreqRef = 33333;
++
++ ulFDelta = 0xFFFFFFFF;
++ /* Permited delta is 0.5% as VESA Specification */
++ ulFPermitedDelta = lFo * 5 / 1000;
++
++ /* Then we need to minimize the M while staying within 0.5% */
++ for (ulTestP = 16; ulTestP > 0; ulTestP>>= 1) {
++ if ((lFo * ulTestP) > ulVCOMax) continue;
++ if ((lFo * ulTestP) < ulVCOMin) continue;
++
++ for (ulTestM = 1; ulTestM <= 32; ulTestM++) {
++ for (ulTestN = 17; ulTestN <= 256; ulTestN++) {
++ ulComputedFo = (ulPLLFreqRef * ulTestN) / (ulTestM * ulTestP);
++ if (ulComputedFo > lFo)
++ ulFTmpDelta = ulComputedFo - lFo;
++ else
++ ulFTmpDelta = lFo - ulComputedFo;
++
++ if (ulFTmpDelta < ulFDelta) {
++ ulFDelta = ulFTmpDelta;
++ *M = (CARD8)(ulTestM - 1);
++ *N = (CARD8)(ulTestN - 1);
++ *P = (CARD8)(ulTestP - 1);
++ }
++
++ if ((lFo * ulTestP) >= 600000)
++ *P |= 0x80;
++ }
++ }
++ }
++}
++
++static void
+ MGAG200EVPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
+ {
+ MGAPtr pMga = MGAPTR(pScrn);
+@@ -483,6 +532,89 @@
+ outMGAdac(MGA1064_GEN_IO_DATA, ucTmpData);
+ }
+
++static void
++MGAG200EHPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
++{
++ MGAPtr pMga = MGAPTR(pScrn);
++
++ unsigned long ulFallBackCounter, ulLoopCount, ulLockCheckIterations = 0, ulTempCount, ulVCount;
++ unsigned char ucTempByte, ucPixCtrl, ucPLLLocked = FALSE;
++ unsigned char ucM;
++ unsigned char ucN;
++ unsigned char ucP;
++ unsigned char ucS;
++
++ while(ulLockCheckIterations <= 32 && ucPLLLocked == FALSE)
++ {
++ // Set pixclkdis to 1
++ ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
++ ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
++ outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
++
++ // Select PLL Set C
++ ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
++ ucTempByte |= 0x3<<2; //select MGA pixel clock
++ OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
++
++ ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
++ ucPixCtrl &= ~0x80;
++ outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
++
++ // Wait 500 us
++ usleep(500);
++
++ // Program the Pixel PLL Register
++ outMGAdac(MGA1064_EH_PIX_PLLC_N, mgaReg->PllN);
++ outMGAdac(MGA1064_EH_PIX_PLLC_M, mgaReg->PllM);
++ outMGAdac(MGA1064_EH_PIX_PLLC_P, mgaReg->PllP);
++
++ // Wait 500 us
++ usleep(500);
++
++ // Select the pixel PLL by setting pixclksel to 1
++ ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
++ ucTempByte &= ~MGA1064_PIX_CLK_CTL_SEL_MSK;
++ ucTempByte |= MGA1064_PIX_CLK_CTL_SEL_PLL;
++ outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
++
++ // Reset dotclock rate bit.
++ OUTREG8(MGAREG_SEQ_INDEX, 1);
++ ucTempByte = INREG8(MGAREG_SEQ_DATA);
++ OUTREG8(MGAREG_SEQ_DATA, ucTempByte & ~0x8);
++
++ // Set pixclkdis to 0 and pixplldn to 0
++ ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
++ ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_DIS;
++ ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
++ outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
++
++ // Poll VCount. If it increments twice inside 150us,
++ // we assume that the PLL has locked.
++ ulLoopCount = 0;
++ ulVCount = INREG(MGAREG_VCOUNT);
++
++ while(ulLoopCount < 30 && ucPLLLocked == FALSE)
++ {
++ ulTempCount = INREG(MGAREG_VCOUNT);
++
++ if(ulTempCount < ulVCount)
++ {
++ ulVCount = 0;
++ }
++ if ((ucTempByte - ulVCount) > 2)
++ {
++ ucPLLLocked = TRUE;
++ }
++ else
++ {
++ usleep(5);
++ }
++ ulLoopCount++;
++ }
++ ulLockCheckIterations++;
++ }
++}
++
+ /**
+ * Calculate the PLL settings (m, n, p, s).
+ *
+@@ -631,6 +763,12 @@
+ pReg->PllM = m;
+ pReg->PllN = n;
+ pReg->PllP = p;
++ } else if (pMga->is_G200EH) {
++ MGAG200EHComputePLLParam(pScrn, f_out, &m, &n, &p);
++
++ pReg->PllM = m;
++ pReg->PllN = n;
++ pReg->PllP = p;
+ } else {
+ /* Do the calculations for m, n, p and s */
+ MGAGCalcClock( pScrn, f_out, &m, &n, &p, &s );
+@@ -828,6 +966,15 @@
+ pReg->Option2 = 0x0000b000;
+ break;
+
++ case PCI_CHIP_MGAG200_EH_PCI:
++ pReg->DacRegs[MGA1064_MISC_CTL] =
++ MGA1064_MISC_CTL_VGA8 |
++ MGA1064_MISC_CTL_DAC_RAM_CS;
++
++ pReg->Option = 0x00000120;
++ pReg->Option2 = 0x0000b000;
++ break;
++
+ case PCI_CHIP_MGAG200:
+ case PCI_CHIP_MGAG200_PCI:
+ default:
+@@ -1177,7 +1324,7 @@
+ if (pMga->is_G200SE
+ && ((i == 0x2C) || (i == 0x2D) || (i == 0x2E)))
+ continue;
+- if ( (pMga->is_G200EV || pMga->is_G200WB) &&
++ if ( (pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) &&
+ (i >= 0x44) && (i <= 0x4E))
+ continue;
+
+@@ -1218,6 +1365,8 @@
+ MGAG200EVPIXPLLSET(pScrn, mgaReg);
+ } else if (pMga->is_G200WB) {
+ MGAG200WBPIXPLLSET(pScrn, mgaReg);
++ } else if (pMga->is_G200EH) {
++ MGAG200EHPIXPLLSET(pScrn, mgaReg);
+ }
+ ); /* MGA_NOT_HAL */
+ #ifdef USEMGAHAL
+@@ -1402,6 +1551,10 @@
+ mgaReg->PllM = inMGAdac(MGA1064_EV_PIX_PLLC_M);
+ mgaReg->PllN = inMGAdac(MGA1064_EV_PIX_PLLC_N);
+ mgaReg->PllP = inMGAdac(MGA1064_EV_PIX_PLLC_P);
++ } else if (pMga->is_G200EH) {
++ mgaReg->PllM = inMGAdac(MGA1064_EH_PIX_PLLC_M);
++ mgaReg->PllN = inMGAdac(MGA1064_EH_PIX_PLLC_N);
++ mgaReg->PllP = inMGAdac(MGA1064_EH_PIX_PLLC_P);
+ }
+
+ mgaReg->PIXPLLCSaved = TRUE;
+@@ -1584,6 +1737,7 @@
+ { (1 << 0), (1 << 2) },
+ { (1 << 4), (1 << 5) },
+ { (1 << 0), (1 << 1) }, /* G200SE, G200EV and G200WB I2C bits */
++ { (1 << 1), (1 << 0) }, /* G200EH I2C bits */
+ };
+
+
+@@ -1596,6 +1750,8 @@
+
+ if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
+ i2c_index = 3;
++ else if (pMga->is_G200EH)
++ i2c_index = 4;
+ else
+ i2c_index = 0;
+
+@@ -1695,6 +1851,8 @@
+
+ if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
+ i2c_index = 3;
++ else if (pMga->is_G200EH)
++ i2c_index = 4;
+ else
+ i2c_index = 0;
+
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c
new file mode 100644
index 000000000000..cd3f68d96cc6
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c
@@ -0,0 +1,115 @@
+--- ./src/mga_driver.c.orig 2009-07-27 22:11:40.000000000 -0700
++++ ./src/mga_driver.c 2010-03-09 17:58:54.163419467 -0800
+@@ -388,6 +388,22 @@
+ 8192, 0x4000, /* Memory probe size & offset values */
+ },
+
++ /* G200EH */
++ [14] = { 0, 1, 0, 0, 1, 0, 0, 0, new_BARs,
++ (TRANSC_SOLID_FILL | TWO_PASS_COLOR_EXPAND | USE_LINEAR_EXPANSION),
++ {
++ { 50000, 230000 }, /* System VCO frequencies */
++ { 50000, 203400 }, /* Pixel VCO frequencies */
++ { 0, 0 }, /* Video VCO frequencies */
++ 45000, /* Memory clock */
++ 27050, /* PLL reference frequency */
++ 0, /* Supports fast bitblt? */
++ MGA_HOST_PCI /* Host interface */
++ },
++
++ 8192, 0x4000, /* Memory probe size & offset values */
++ },
++
+ };
+
+ #ifdef XSERVER_LIBPCIACCESS
+@@ -415,6 +431,8 @@
+
+ MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_WINBOND_PCI, 13 ),
+
++ MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_EH_PCI, 14 ),
++
+ { 0, 0, 0 },
+ };
+ #endif
+@@ -433,6 +451,7 @@
+ { PCI_CHIP_MGAG200_SE_B_PCI, "mgag200 SE B PCI" },
+ { PCI_CHIP_MGAG200_EV_PCI, "mgag200 EV Maxim" },
+ { PCI_CHIP_MGAG200_WINBOND_PCI, "mgag200 eW Nuvoton" },
++ { PCI_CHIP_MGAG200_EH_PCI, "mgag200eH" },
+ { PCI_CHIP_MGAG400, "mgag400" },
+ { PCI_CHIP_MGAG550, "mgag550" },
+ {-1, NULL }
+@@ -455,6 +474,8 @@
+ RES_SHARED_VGA },
+ { PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI,
+ RES_SHARED_VGA },
++ { PCI_CHIP_MGAG200_EH_PCI, PCI_CHIP_MGAG200_EH_PCI,
++ RES_SHARED_VGA },
+ { PCI_CHIP_MGAG400, PCI_CHIP_MGAG400, RES_SHARED_VGA },
+ { PCI_CHIP_MGAG550, PCI_CHIP_MGAG550, RES_SHARED_VGA },
+ { -1, -1, RES_UNDEFINED }
+@@ -889,6 +910,10 @@
+ attrib_no = 13;
+ break;
+
++ case PCI_CHIP_MGAG200_EH_PCI:
++ attrib_no = 14;
++ break;
++
+ default:
+ return FALSE;
+ }
+@@ -1112,7 +1137,7 @@
+ OUTREG8(MGAREG_CRTCEXT_DATA, tmp | 0x80);
+
+ /* apparently the G200 IP don't have a BIOS to read */
+- if (pMga->is_G200SE || pMga->is_G200EV || pMga->is_G200WB) {
++ if (pMga->is_G200SE || pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) {
+ CARD32 MemoryAt0, MemoryAt1, Offset;
+ CARD32 FirstMemoryVal1, FirstMemoryVal2;
+ CARD32 SecondMemoryVal1, SecondMemoryVal2;
+@@ -1594,6 +1619,7 @@
+ || (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI);
+ pMga->is_G200EV = (pMga->Chipset == PCI_CHIP_MGAG200_EV_PCI);
+ pMga->is_G200WB = (pMga->Chipset == PCI_CHIP_MGAG200_WINBOND_PCI);
++ pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI);
+
+ #ifdef USEMGAHAL
+ if (pMga->chip_attribs->HAL_chipset) {
+@@ -2115,6 +2141,7 @@
+ case PCI_CHIP_MGAG200_SE_B_PCI:
+ case PCI_CHIP_MGAG200_WINBOND_PCI:
+ case PCI_CHIP_MGAG200_EV_PCI:
++ case PCI_CHIP_MGAG200_EH_PCI:
+ case PCI_CHIP_MGAG400:
+ case PCI_CHIP_MGAG550:
+ MGAGSetupFuncs(pScrn);
+@@ -2227,6 +2254,7 @@
+ case PCI_CHIP_MGAG200_SE_B_PCI:
+ case PCI_CHIP_MGAG200_WINBOND_PCI:
+ case PCI_CHIP_MGAG200_EV_PCI:
++ case PCI_CHIP_MGAG200_EH_PCI:
+ pMga->SrcOrg = 0;
+ pMga->DstOrg = 0;
+ break;
+@@ -2413,6 +2441,7 @@
+ case PCI_CHIP_MGAG200_SE_B_PCI:
+ case PCI_CHIP_MGAG200_WINBOND_PCI:
+ case PCI_CHIP_MGAG200_EV_PCI:
++ case PCI_CHIP_MGAG200_EH_PCI:
+ case PCI_CHIP_MGAG400:
+ case PCI_CHIP_MGAG550:
+ maxPitch = 4096;
+@@ -4316,7 +4345,10 @@
+ return MODE_BANDWIDTH;
+ } else if (pMga->is_G200EV
+ && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 327)) {
+- return MODE_BANDWIDTH;
++ return MODE_BANDWIDTH;
++ } else if (pMga->is_G200EH
++ && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 375)) {
++ return MODE_BANDWIDTH;
+ }
+
+ lace = 1 + ((mode->Flags & V_INTERLACE) != 0);
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c
new file mode 100644
index 000000000000..779727093141
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c
@@ -0,0 +1,18 @@
+--- ./src/mga_merge.c.orig 2009-07-27 17:24:03.000000000 -0700
++++ ./src/mga_merge.c 2010-03-09 17:58:54.164420182 -0800
+@@ -362,6 +362,7 @@
+ case PCI_CHIP_MGAG200_SE_B_PCI:
+ case PCI_CHIP_MGAG200_WINBOND_PCI:
+ case PCI_CHIP_MGAG200_EV_PCI:
++ case PCI_CHIP_MGAG200_EH_PCI:
+ case PCI_CHIP_MGAG400:
+ case PCI_CHIP_MGAG550:
+ MGAGSetupFuncs(pScrn);
+@@ -516,6 +517,7 @@
+ case PCI_CHIP_MGAG200_SE_B_PCI:
+ case PCI_CHIP_MGAG200_WINBOND_PCI:
+ case PCI_CHIP_MGAG200_EV_PCI:
++ case PCI_CHIP_MGAG200_EH_PCI:
+ case PCI_CHIP_MGAG400:
+ case PCI_CHIP_MGAG550:
+ maxPitch = 4096;
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h b/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h
new file mode 100644
index 000000000000..25e03a8c22f4
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h
@@ -0,0 +1,14 @@
+--- ./src/mga_reg.h.orig 2009-07-26 20:37:46.000000000 -0700
++++ ./src/mga_reg.h 2010-03-09 17:58:54.165420896 -0800
+@@ -432,6 +432,11 @@
+ #define MGA1064_EV_PIX_PLLC_N 0xb7
+ #define MGA1064_EV_PIX_PLLC_P 0xb8
+
++/* Modified PLL for G200 EH */
++#define MGA1064_EH_PIX_PLLC_M 0xb6
++#define MGA1064_EH_PIX_PLLC_N 0xb7
++#define MGA1064_EH_PIX_PLLC_P 0xb8
++
+
+ #define MGA1064_DISP_CTL 0x8a
+ #define MGA1064_DISP_CTL_DAC1OUTSEL_MASK 0x01
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c
new file mode 100644
index 000000000000..39f5565e12e0
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c
@@ -0,0 +1,10 @@
+--- ./src/mga_storm.c.orig 2009-07-26 20:37:46.000000000 -0700
++++ ./src/mga_storm.c 2010-03-09 17:58:54.168419688 -0800
+@@ -1130,6 +1130,7 @@
+ case PCI_CHIP_MGAG200_SE_B_PCI:
+ case PCI_CHIP_MGAG200_WINBOND_PCI:
+ case PCI_CHIP_MGAG200_EV_PCI:
++ case PCI_CHIP_MGAG200_EH_PCI:
+ pMga->SrcOrg = 0;
+ OUTREG(MGAREG_SRCORG, pMga->realSrcOrg);
+ OUTREG(MGAREG_DSTORG, pMga->DstOrg);
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 439a433e7749..f9d20360c356 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-neomagic
-PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTVERSION= 1.2.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
index 7bf3dd043bc6..6dbde59ce4c7 100644
--- a/x11-drivers/xf86-video-neomagic/distinfo
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 896864e1a2d7333c16333a24eac17d00
-SHA256 (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 1c0dfeb749ad2faacb74cc75e865878e4dde2c6c3dace04be4f65286e6ae966a
-SIZE (xorg/driver/xf86-video-neomagic-1.2.2.tar.bz2) = 278452
+MD5 (xorg/driver/xf86-video-neomagic-1.2.4.tar.bz2) = 2d722ee9b9fe8da49109f280689c9c25
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.4.tar.bz2) = 434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353
+SIZE (xorg/driver/xf86-video-neomagic-1.2.4.tar.bz2) = 281374
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 67a9945f6da1..18fce8099af6 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-newport
-PORTVERSION= 0.2.1
-PORTREVISION= 6
+PORTVERSION= 0.2.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo
index 76c0473d19ce..e3ca5b8d5392 100644
--- a/x11-drivers/xf86-video-newport/distinfo
+++ b/x11-drivers/xf86-video-newport/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 2bd8e5b9ea68e0dcd80dfcaca0eff82c
-SHA256 (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08
-SIZE (xorg/driver/xf86-video-newport-0.2.1.tar.bz2) = 257576
+MD5 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 923baa1ee0429f03ed19ec0be6a4f62b
+SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
+SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 27df6a316bf2..3b523be26344 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xf86-video-nouveau
PORTVERSION= 0.0.10.${SNAPDATE}
DISTVERSIONSUFFIX=.${SNAPREV}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 32ea54e37089..e9980edaa84b 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-nv
-PORTVERSION= 2.1.13
-PORTREVISION= 2
+PORTVERSION= 2.1.16
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo
index ab52ff0559d3..1ed8eada2f0a 100644
--- a/x11-drivers/xf86-video-nv/distinfo
+++ b/x11-drivers/xf86-video-nv/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = c3231c8808a11eb4ca066e43e0f1a273
-SHA256 (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = 60179d0f406ea6a84e5ec6beb80d8b7b472f97c81c63bc5acc3064b5a64c13a3
-SIZE (xorg/driver/xf86-video-nv-2.1.13.tar.bz2) = 397630
+MD5 (xorg/driver/xf86-video-nv-2.1.16.tar.bz2) = fb02d5506e35054348d1c2b2c924530d
+SHA256 (xorg/driver/xf86-video-nv-2.1.16.tar.bz2) = 4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d
+SIZE (xorg/driver/xf86-video-nv-2.1.16.tar.bz2) = 389417
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index f0fa802b9252..d3087e5335f7 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-openchrome
PORTVERSION= 0.2.904
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MASTER_SITES= http://www.openchrome.org/releases/
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 91c4f38a548b..899a8e3528dc 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-r128
-PORTVERSION= 6.8.0
-PORTREVISION= 4
+PORTVERSION= 6.8.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo
index b94c1aeb03b8..9d2081ab52ca 100644
--- a/x11-drivers/xf86-video-r128/distinfo
+++ b/x11-drivers/xf86-video-r128/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 007bec0c6b07d9d3aeca4da18e561efb
-SHA256 (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b
-SIZE (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 409166
+MD5 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 2b90854a62a4d45d652062f582dc8d13
+SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
+SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 56482c91b688..56e47fdee3c9 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-radeonhd
PORTVERSION= 1.3.0.20091101
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nork
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index a4a546f22ad9..63dae81ad6fd 100644
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ b/x11-drivers/xf86-video-radeonhd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-radeonhd
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index 28c69df4a0d8..68c45d32363f 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -8,6 +8,7 @@
PORTNAME= xf86-video-rdc
MASTER_SITES= http://www.SpringDaemons.com/stas/
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= stas@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index e40f2a687b46..434b64c36633 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-rendition
-PORTVERSION= 4.2.1
-PORTREVISION= 2
+PORTVERSION= 4.2.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
index 47272be254be..fd5521f4fd54 100644
--- a/x11-drivers/xf86-video-rendition/distinfo
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = c6b49b99586cc0955295cb1ca93fcac7
-SHA256 (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = 54209ec16c8f032b38cee88752783a7869139b2b30a537f8305d60404f40b0bb
-SIZE (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = 313792
+MD5 (xorg/driver/xf86-video-rendition-4.2.3.tar.bz2) = 9a0a916fe1e7b5c81cd4c80a08e646cc
+SHA256 (xorg/driver/xf86-video-rendition-4.2.3.tar.bz2) = 9d5559fd3029feee5af2493ab8f558c58c426fc89776a1109dab97e3a4764d94
+SIZE (xorg/driver/xf86-video-rendition-4.2.3.tar.bz2) = 315369
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index b035b64c28a2..c5f0f62fdc2f 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-s3
-PORTVERSION= 0.6.1
-PORTREVISION= 3
+PORTVERSION= 0.6.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,5 +14,6 @@ COMMENT= X.Org s3 display driver
XORG_CAT= driver
USE_XORG= videoproto xextproto
+MAN4= s3.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
index edf7adc3f184..b8cd9c295804 100644
--- a/x11-drivers/xf86-video-s3/distinfo
+++ b/x11-drivers/xf86-video-s3/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = a5f1f2f93a50e56bd3aeed009c407337
-SHA256 (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 66646138dcc7ebdf84abc3566802fcd3bf86709a1e34abd78741565e4a786596
-SIZE (xorg/driver/xf86-video-s3-0.6.1.tar.bz2) = 264633
+MD5 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 5eb06d88533fb327d067928faeb20860
+SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
+SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 57f7f742e521..bfda8931ca44 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-s3virge
-PORTVERSION= 1.10.2
-PORTREVISION= 3
+PORTVERSION= 1.10.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
index 93aac418c6ad..d196e281f5a4 100644
--- a/x11-drivers/xf86-video-s3virge/distinfo
+++ b/x11-drivers/xf86-video-s3virge/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 69784e4964d75487d81be4eae3d467dd
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = f96bc804b123f8371f22b0ca99d77b2d209e6f46d0426d7a4f98fe57b778cb52
-SIZE (xorg/driver/xf86-video-s3virge-1.10.2.tar.bz2) = 297071
+MD5 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 6517bbbf808c700502d51acdc44662f8
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
+SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index df4d9dc0ba2f..d518df3c2120 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-savage
-PORTVERSION= 2.2.1
-PORTREVISION= 3
+PORTVERSION= 2.3.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index e33089f37e45..126a6b6394dc 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 62b8aba48b54eaefeae87df502bf219c
-SHA256 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e
-SIZE (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 305286
+MD5 (xorg/driver/xf86-video-savage-2.3.1.tar.bz2) = 66c319f610e3699c3de0f3ef630abb32
+SHA256 (xorg/driver/xf86-video-savage-2.3.1.tar.bz2) = 2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab
+SIZE (xorg/driver/xf86-video-savage-2.3.1.tar.bz2) = 327377
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 304c9a12b77d..cfa486f576bd 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-siliconmotion
-PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTVERSION= 1.7.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index 9d89dcdd4ce9..f2fea3b3cda5 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-siliconmotion-1.7.1.tar.bz2) = 744e5e68caaa545ac7e8523f74fc6579
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.1.tar.bz2) = 4bac7a7101208f494be7301aaa410a75e37d815a9b191629add52cad533320f5
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.1.tar.bz2) = 335351
+MD5 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 29fb322cd3adab52cc7f1ac86f9315bb
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 330623
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index 5b72150c01ab..1ceee027e66d 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xf86-video-sis-intel
PORTVERSION= 300407
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MASTER_SITES= http://downloadmirror.intel.com/15443/eng/
DISTNAME= sis_drv_src_300407
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index deebbae0c5ac..9e69a2401da0 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-sis
-PORTVERSION= 0.10.1
-PORTREVISION= 3
+PORTVERSION= 0.10.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index dfb418922f61..f792633f66a4 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 9f57c2f5ccbd8340db32da1c74083771
-SHA256 (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307
-SIZE (xorg/driver/xf86-video-sis-0.10.1.tar.bz2) = 637423
+MD5 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = f04baa307e49e9f0e5a5c3d2e89a5576
+SHA256 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2
+SIZE (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 642160
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index d017eec28f6f..c8ff25160d4f 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-sunffb
PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 168fc1ba623b..e06236683aaa 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-tdfx
-PORTVERSION= 1.4.1
-PORTREVISION= 3
+PORTVERSION= 1.4.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo
index ab907ff4c5ed..23751ea9a894 100644
--- a/x11-drivers/xf86-video-tdfx/distinfo
+++ b/x11-drivers/xf86-video-tdfx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 59acf2a4f721f9b7abbd121748467b16
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = d741c68a9a90b8bec4dd94e43844346237e9c5cffec98fee8719ec92933b9498
-SIZE (xorg/driver/xf86-video-tdfx-1.4.1.tar.bz2) = 286452
+MD5 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 8161bbf2b100c21b609163f0010766b3
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
+SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 0a31b376727b..4ffe5dfbf894 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-tga
-PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo
index 2375ee35d233..1647a5cb26d6 100644
--- a/x11-drivers/xf86-video-tga/distinfo
+++ b/x11-drivers/xf86-video-tga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = f3bddf0a64932ca9bd72041ccd3b5501
-SHA256 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6
-SIZE (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = 269406
+MD5 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = bcbceda78395de74544c83b46a7700cd
+SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
+SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 3f6d7e9cad7c..97b3c1d368ff 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-trident
-PORTVERSION= 1.3.1
-PORTREVISION= 3
+PORTVERSION= 1.3.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
index 8ea730bbbda8..2121775ed9ee 100644
--- a/x11-drivers/xf86-video-trident/distinfo
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 9f280bef235426394013cb5e1854b823
-SHA256 (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = c74b2af84c4b4f11ea2068ec056574a1ba0402459bada3518c4800307ab7c8bf
-SIZE (xorg/driver/xf86-video-trident-1.3.1.tar.bz2) = 293180
+MD5 (xorg/driver/xf86-video-trident-1.3.3.tar.bz2) = 47f3c5da1942017218355f178f02ef84
+SHA256 (xorg/driver/xf86-video-trident-1.3.3.tar.bz2) = 6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5
+SIZE (xorg/driver/xf86-video-trident-1.3.3.tar.bz2) = 297110
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 923c50fc86e2..51c45edb1b85 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-tseng
-PORTVERSION= 1.2.1
-PORTREVISION= 3
+PORTVERSION= 1.2.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo
index 888a56163072..d2d3236add8e 100644
--- a/x11-drivers/xf86-video-tseng/distinfo
+++ b/x11-drivers/xf86-video-tseng/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 2f687eddae5dafa5dcc05116561e267c
-SHA256 (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 540bb96efb0f2ec61e08fe1cc6e2e887fba34a6332ddf7e947ace59f0fad34ba
-SIZE (xorg/driver/xf86-video-tseng-1.2.1.tar.bz2) = 280383
+MD5 (xorg/driver/xf86-video-tseng-1.2.3.tar.bz2) = 79f63999c88477801ae54dc486272ad6
+SHA256 (xorg/driver/xf86-video-tseng-1.2.3.tar.bz2) = 0556bb3e79da4be87e880f82e2b8504527e760e284680f9463a08f9572507187
+SIZE (xorg/driver/xf86-video-tseng-1.2.3.tar.bz2) = 283944
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 87b633999231..815964632a39 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-vesa
-PORTVERSION= 2.1.0
-PORTREVISION= 3
+PORTVERSION= 2.3.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
index 1309765ad9e6..4bd2425a375f 100644
--- a/x11-drivers/xf86-video-vesa/distinfo
+++ b/x11-drivers/xf86-video-vesa/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = d813269613b4d63ff6dbfbfbd104cc84
-SHA256 (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = de06caf86d3c1a1f086b8b55c054d60218fdf3956e93e411d9ee0d96bb42a6f8
-SIZE (xorg/driver/xf86-video-vesa-2.1.0.tar.bz2) = 245147
+MD5 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 07fa32958aff9b463dd3af5481ef6626
+SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index cf4cbd121739..427d009c8fb2 100644
--- a/x11-drivers/xf86-video-via/Makefile
+++ b/x11-drivers/xf86-video-via/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-via
PORTVERSION= 0.2.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 2442d417229e..61970eb9a522 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-vmware
-PORTVERSION= 10.16.5
-PORTREVISION= 3
+PORTVERSION= 10.16.9
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
index 0988761da421..78e8246a2526 100644
--- a/x11-drivers/xf86-video-vmware/distinfo
+++ b/x11-drivers/xf86-video-vmware/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 6d78c82ea7c2bb0fcb587d7bb4e8f60a
-SHA256 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
-SIZE (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 278790
+MD5 (xorg/driver/xf86-video-vmware-10.16.9.tar.bz2) = 3b3d38abfa1f8be4b1e26dcd236bc94f
+SHA256 (xorg/driver/xf86-video-vmware-10.16.9.tar.bz2) = 835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1
+SIZE (xorg/driver/xf86-video-vmware-10.16.9.tar.bz2) = 275787
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 57233112d49a..7cc591a48b3d 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-voodoo
-PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTVERSION= 1.2.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
index e7e19d782326..463af94c9189 100644
--- a/x11-drivers/xf86-video-voodoo/distinfo
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = ed4ce3a5406ca7958865d39558259726
-SHA256 (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = a2ea804932ea47dd3d9e4b6ea4475b768305e5041dc1899393004ece558b3cda
-SIZE (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = 258827
+MD5 (xorg/driver/xf86-video-voodoo-1.2.3.tar.bz2) = c164effcc839eca1fc1d43a42f4086db
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.3.tar.bz2) = 025d4d99ab19325b72417fadbb099c757412988f800c9511be3e2c3993ae29e9
+SIZE (xorg/driver/xf86-video-voodoo-1.2.3.tar.bz2) = 259096
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 65209779132d..338b26b579fe 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-drivers
-PORTVERSION= 7.4
-PORTREVISION= 3
+PORTVERSION= 7.5
CATEGORIES= x11-drivers
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
index eca20dbe1b7a..c0f054adad00 100644
--- a/x11-fonts/bdftopcf/Makefile
+++ b/x11-fonts/bdftopcf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bdftopcf
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/bdftopcf/distinfo b/x11-fonts/bdftopcf/distinfo
index 6494eb18a401..f86a24df34c3 100644
--- a/x11-fonts/bdftopcf/distinfo
+++ b/x11-fonts/bdftopcf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/bdftopcf-1.0.1.tar.bz2) = 9685fab33d39954ab8a0d22e0969d5a4
-SHA256 (xorg/app/bdftopcf-1.0.1.tar.bz2) = aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3
-SIZE (xorg/app/bdftopcf-1.0.1.tar.bz2) = 85499
+MD5 (xorg/app/bdftopcf-1.0.2.tar.bz2) = 148f20d28caaa69bbe7dcca7c2674fb6
+SHA256 (xorg/app/bdftopcf-1.0.2.tar.bz2) = 11017f0dd637fd3228bd56fdbbd72193fd747c10d893a711c25bf6734c4da06b
+SIZE (xorg/app/bdftopcf-1.0.2.tar.bz2) = 95983
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
index c2b67b538114..3566a27d08a4 100644
--- a/x11-fonts/encodings/Makefile
+++ b/x11-fonts/encodings/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= encodings
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/encodings/distinfo b/x11-fonts/encodings/distinfo
index aa62d5a86549..dc0a6e05174c 100644
--- a/x11-fonts/encodings/distinfo
+++ b/x11-fonts/encodings/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/encodings-1.0.2.tar.bz2) = 11adda157b03d63fd61d95ad7ef00466
-SHA256 (xorg/font/encodings-1.0.2.tar.bz2) = 6d19107b66bbc96c085b0c2dd286ece22dcb73ba56a17fc95b0f2cbc5d6f4eac
-SIZE (xorg/font/encodings-1.0.2.tar.bz2) = 571623
+MD5 (xorg/font/encodings-1.0.3.tar.bz2) = 29637480e7ce12546668631067c19ced
+SHA256 (xorg/font/encodings-1.0.3.tar.bz2) = 07d9766d4aebe05ac572599f8f903a4fe06ab667a8182f2b6cc03e5fb3b80f53
+SIZE (xorg/font/encodings-1.0.3.tar.bz2) = 678895
diff --git a/x11-fonts/encodings/pkg-plist b/x11-fonts/encodings/pkg-plist
index 36d3fe3951f7..fe13e907d9b0 100644
--- a/x11-fonts/encodings/pkg-plist
+++ b/x11-fonts/encodings/pkg-plist
@@ -1,8 +1,25 @@
+lib/X11/fonts/encodings/adobe-dingbats.enc.gz
+lib/X11/fonts/encodings/adobe-standard.enc.gz
+lib/X11/fonts/encodings/adobe-symbol.enc.gz
+lib/X11/fonts/encodings/armscii-8.enc.gz
+lib/X11/fonts/encodings/ascii-0.enc.gz
+lib/X11/fonts/encodings/dec-special.enc.gz
+lib/X11/fonts/encodings/encodings.dir
+lib/X11/fonts/encodings/ibm-cp437.enc.gz
+lib/X11/fonts/encodings/ibm-cp850.enc.gz
+lib/X11/fonts/encodings/ibm-cp852.enc.gz
+lib/X11/fonts/encodings/ibm-cp866.enc.gz
+lib/X11/fonts/encodings/iso8859-11.enc.gz
+lib/X11/fonts/encodings/iso8859-13.enc.gz
+lib/X11/fonts/encodings/iso8859-16.enc.gz
+lib/X11/fonts/encodings/iso8859-6.16.enc.gz
+lib/X11/fonts/encodings/iso8859-6.8x.enc.gz
lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz
lib/X11/fonts/encodings/large/cns11643-1.enc.gz
lib/X11/fonts/encodings/large/cns11643-2.enc.gz
lib/X11/fonts/encodings/large/cns11643-3.enc.gz
+lib/X11/fonts/encodings/large/encodings.dir
lib/X11/fonts/encodings/large/gb18030-0.enc.gz
lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz
lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz
@@ -14,22 +31,6 @@ lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz
-lib/X11/fonts/encodings/large/encodings.dir
-lib/X11/fonts/encodings/adobe-dingbats.enc.gz
-lib/X11/fonts/encodings/adobe-standard.enc.gz
-lib/X11/fonts/encodings/adobe-symbol.enc.gz
-lib/X11/fonts/encodings/armscii-8.enc.gz
-lib/X11/fonts/encodings/ascii-0.enc.gz
-lib/X11/fonts/encodings/dec-special.enc.gz
-lib/X11/fonts/encodings/ibm-cp437.enc.gz
-lib/X11/fonts/encodings/ibm-cp850.enc.gz
-lib/X11/fonts/encodings/ibm-cp852.enc.gz
-lib/X11/fonts/encodings/ibm-cp866.enc.gz
-lib/X11/fonts/encodings/iso8859-11.enc.gz
-lib/X11/fonts/encodings/iso8859-13.enc.gz
-lib/X11/fonts/encodings/iso8859-16.enc.gz
-lib/X11/fonts/encodings/iso8859-6.16.enc.gz
-lib/X11/fonts/encodings/iso8859-6.8x.enc.gz
lib/X11/fonts/encodings/microsoft-cp1250.enc.gz
lib/X11/fonts/encodings/microsoft-cp1251.enc.gz
lib/X11/fonts/encodings/microsoft-cp1252.enc.gz
@@ -48,4 +49,3 @@ lib/X11/fonts/encodings/suneu-greek.enc.gz
lib/X11/fonts/encodings/tcvn-0.enc.gz
lib/X11/fonts/encodings/tis620-2.enc.gz
lib/X11/fonts/encodings/viscii1.1-1.enc.gz
-lib/X11/fonts/encodings/encodings.dir
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
index 7e6bea6ef0c2..4f229c6ad888 100644
--- a/x11-fonts/font-adobe-100dpi/Makefile
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= font-adobe-100dpi
-PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-100dpi/distinfo b/x11-fonts/font-adobe-100dpi/distinfo
index 2a18121b3ad6..150c514aab3b 100644
--- a/x11-fonts/font-adobe-100dpi/distinfo
+++ b/x11-fonts/font-adobe-100dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-adobe-100dpi-1.0.0.tar.bz2) = 443acfe70e26716282f9068730fe92c4
-SHA256 (xorg/font/font-adobe-100dpi-1.0.0.tar.bz2) = f16c1b3a1625c9a225aff2ac12067bd3907d157b0c60625689a5080f092e9a19
-SIZE (xorg/font/font-adobe-100dpi-1.0.0.tar.bz2) = 1064316
+MD5 (xorg/font/font-adobe-100dpi-1.0.1.tar.bz2) = c754c3f4a5e08442bf6972b9466625ed
+SHA256 (xorg/font/font-adobe-100dpi-1.0.1.tar.bz2) = a742bca8d6f8fb76b511f11c2ad2a1d326687fe9f0490a9cf64524c3782cb52c
+SIZE (xorg/font/font-adobe-100dpi-1.0.1.tar.bz2) = 1119575
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
index ac20229d0b2a..44c6f7a5082f 100644
--- a/x11-fonts/font-adobe-75dpi/Makefile
+++ b/x11-fonts/font-adobe-75dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-adobe-75dpi
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-75dpi/distinfo b/x11-fonts/font-adobe-75dpi/distinfo
index 07a503bc94bd..198dd3a64012 100644
--- a/x11-fonts/font-adobe-75dpi/distinfo
+++ b/x11-fonts/font-adobe-75dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-adobe-75dpi-1.0.0.tar.bz2) = 813b5d3723c84388a938ab6732e1329c
-SHA256 (xorg/font/font-adobe-75dpi-1.0.0.tar.bz2) = d62745bee0f5e4f355f237020667d783ae9fea5f18a864d748ae1287bd176339
-SIZE (xorg/font/font-adobe-75dpi-1.0.0.tar.bz2) = 846752
+MD5 (xorg/font/font-adobe-75dpi-1.0.1.tar.bz2) = a47681c97bd012196691c95e34d400f1
+SHA256 (xorg/font/font-adobe-75dpi-1.0.1.tar.bz2) = 4de51765d26b70728a8b6573be89d731be0384466290dbbb216cb05becdf9f71
+SIZE (xorg/font/font-adobe-75dpi-1.0.1.tar.bz2) = 907258
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
index f495514c3a37..d559532a2e07 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-adobe-utopia-100dpi
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-100dpi/distinfo b/x11-fonts/font-adobe-utopia-100dpi/distinfo
index 8a8b10eae693..ff9db5278c3e 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/distinfo
+++ b/x11-fonts/font-adobe-utopia-100dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2) = 5d28a30efef966f8dbbaff9a6619f01a
-SHA256 (xorg/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2) = 1943e1aa70c169b13bc7a308c8e949267f9ce6327479803203fbf10c06a9b5fe
-SIZE (xorg/font/font-adobe-utopia-100dpi-1.0.1.tar.bz2) = 289990
+MD5 (xorg/font/font-adobe-utopia-100dpi-1.0.2.tar.bz2) = 1c3a2c26bd3f6e406fbadc7380efa369
+SHA256 (xorg/font/font-adobe-utopia-100dpi-1.0.2.tar.bz2) = dd8c3f5509589f9232b26273fecde2694bd2bb069c6aaa8f504ad3d24775955e
+SIZE (xorg/font/font-adobe-utopia-100dpi-1.0.2.tar.bz2) = 349250
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
index f147da5b9b81..ddd1790e97ea 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/Makefile
+++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-adobe-utopia-75dpi
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-75dpi/distinfo b/x11-fonts/font-adobe-utopia-75dpi/distinfo
index b52e56e68d16..ffb86ed1aa3e 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/distinfo
+++ b/x11-fonts/font-adobe-utopia-75dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2) = dd912284e4750023f9682812532fa033
-SHA256 (xorg/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2) = ebd4e2194bbc727e3bbda0f5dc1493fe3a211c7cf77e3d41f93135dd04ca7089
-SIZE (xorg/font/font-adobe-utopia-75dpi-1.0.1.tar.bz2) = 213520
+MD5 (xorg/font/font-adobe-utopia-75dpi-1.0.2.tar.bz2) = 71dffebeeb702d10876555c361fb69cf
+SHA256 (xorg/font/font-adobe-utopia-75dpi-1.0.2.tar.bz2) = 3b3ca4ba5b5b73e13b3662b5be16ea92a244adb3303a3625437ff7d385ba6557
+SIZE (xorg/font/font-adobe-utopia-75dpi-1.0.2.tar.bz2) = 272028
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
index cbdf205a97a3..eb6b120a7298 100644
--- a/x11-fonts/font-adobe-utopia-type1/Makefile
+++ b/x11-fonts/font-adobe-utopia-type1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-adobe-utopia-type1
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-utopia-type1/distinfo b/x11-fonts/font-adobe-utopia-type1/distinfo
index 17f27030d46e..a2fda48bfef9 100644
--- a/x11-fonts/font-adobe-utopia-type1/distinfo
+++ b/x11-fonts/font-adobe-utopia-type1/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-adobe-utopia-type1-1.0.1.tar.bz2) = aa7ff4bd20b961afda9c15d103b972a5
-SHA256 (xorg/font/font-adobe-utopia-type1-1.0.1.tar.bz2) = e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc
-SIZE (xorg/font/font-adobe-utopia-type1-1.0.1.tar.bz2) = 208596
+MD5 (xorg/font/font-adobe-utopia-type1-1.0.2.tar.bz2) = ad945b19b2db64dec3a19507848ff63b
+SHA256 (xorg/font/font-adobe-utopia-type1-1.0.2.tar.bz2) = 8c5f2752e44af6219c1b4cfc178f9721f6dd573039e973f61029136c2756e233
+SIZE (xorg/font/font-adobe-utopia-type1-1.0.2.tar.bz2) = 261373
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
index 22233efb048d..8d98a9e7f0f3 100644
--- a/x11-fonts/font-alias/Makefile
+++ b/x11-fonts/font-alias/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-alias
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-alias/distinfo b/x11-fonts/font-alias/distinfo
index c1021a4d8327..06e4712e1cb2 100644
--- a/x11-fonts/font-alias/distinfo
+++ b/x11-fonts/font-alias/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-alias-1.0.1.tar.bz2) = c4776b6f0f2ecdb7670b6fe64b5d2a2d
-SHA256 (xorg/font/font-alias-1.0.1.tar.bz2) = 77db60d63224b9d856129d23c0b0d0e9154a166137daf749d39abfd56a4f89b6
-SIZE (xorg/font/font-alias-1.0.1.tar.bz2) = 42537
+MD5 (xorg/font/font-alias-1.0.2.tar.bz2) = 9d40dba6fb8cb58dacb433fc7bcaafca
+SHA256 (xorg/font/font-alias-1.0.2.tar.bz2) = 438bd6f3f9305edb6ea9905dc92c135d6067bbd7e01df913cb3ef27162b38270
+SIZE (xorg/font/font-alias-1.0.2.tar.bz2) = 93678
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
index 74cab5931d0a..53af69152e1c 100644
--- a/x11-fonts/font-arabic-misc/Makefile
+++ b/x11-fonts/font-arabic-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-arabic-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-arabic-misc/distinfo b/x11-fonts/font-arabic-misc/distinfo
index 8438a375047e..05928e182c27 100644
--- a/x11-fonts/font-arabic-misc/distinfo
+++ b/x11-fonts/font-arabic-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-arabic-misc-1.0.0.tar.bz2) = 81595016e2ff859716fc256ebb136ba6
-SHA256 (xorg/font/font-arabic-misc-1.0.0.tar.bz2) = 90e9dfa3f33805ea2ffe06faa7258d8335cdf415826f963a1d0a76bd8df7bc94
-SIZE (xorg/font/font-arabic-misc-1.0.0.tar.bz2) = 52922
+MD5 (xorg/font/font-arabic-misc-1.0.1.tar.bz2) = 817ceb99636c873ad7679fe2a468678d
+SHA256 (xorg/font/font-arabic-misc-1.0.1.tar.bz2) = f4b0305afd47844d337a87d03aab4359b576dc36464317f86541324ee6ea6f60
+SIZE (xorg/font/font-arabic-misc-1.0.1.tar.bz2) = 102626
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
index b2a5899fc1de..a030575ead4e 100644
--- a/x11-fonts/font-bh-100dpi/Makefile
+++ b/x11-fonts/font-bh-100dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bh-100dpi
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-100dpi/distinfo b/x11-fonts/font-bh-100dpi/distinfo
index 822b09e13410..be79f0f26725 100644
--- a/x11-fonts/font-bh-100dpi/distinfo
+++ b/x11-fonts/font-bh-100dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bh-100dpi-1.0.0.tar.bz2) = e5592de74a5c04e3a2608800dd079197
-SHA256 (xorg/font/font-bh-100dpi-1.0.0.tar.bz2) = ae8a11777579a2242f52ed19b5fdd6c6ef6fe2c2661a49d0599188de78cfee4a
-SIZE (xorg/font/font-bh-100dpi-1.0.0.tar.bz2) = 662648
+MD5 (xorg/font/font-bh-100dpi-1.0.1.tar.bz2) = 8af580b87e17ddacdf0ce3d775248387
+SHA256 (xorg/font/font-bh-100dpi-1.0.1.tar.bz2) = c46d68487b09993266f34ac87a47e035af8a3f42c38f33d26ff18ac0c31c3397
+SIZE (xorg/font/font-bh-100dpi-1.0.1.tar.bz2) = 724728
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
index 87e706164556..db0967f3611c 100644
--- a/x11-fonts/font-bh-75dpi/Makefile
+++ b/x11-fonts/font-bh-75dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bh-75dpi
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-75dpi/distinfo b/x11-fonts/font-bh-75dpi/distinfo
index 3753b064529a..6cda8a1919df 100644
--- a/x11-fonts/font-bh-75dpi/distinfo
+++ b/x11-fonts/font-bh-75dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bh-75dpi-1.0.0.tar.bz2) = 6e51cd02f4ce32e1393e34ab17a9b211
-SHA256 (xorg/font/font-bh-75dpi-1.0.0.tar.bz2) = c79467b440cc9389c75d55fba64d0126d0f2e1e6c019dfafb7d89d07802c05bf
-SIZE (xorg/font/font-bh-75dpi-1.0.0.tar.bz2) = 510710
+MD5 (xorg/font/font-bh-75dpi-1.0.1.tar.bz2) = 53785d2688392aec5cba79fc0ddb23a2
+SHA256 (xorg/font/font-bh-75dpi-1.0.1.tar.bz2) = 8a3175a977f169f0882054ac5bf86c97bfee1dc031415092f75b2cfb57b69d40
+SIZE (xorg/font/font-bh-75dpi-1.0.1.tar.bz2) = 556208
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
index f249698a5d0c..78fe6242d34f 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bh-lucidatypewriter-100dpi
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo b/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo
index 4c6ba21fe921..52b6aabbc4fc 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2) = c44d3f730564da465993e9292a33c235
-SHA256 (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2) = 36d47dcba591037b6af35fc151e3d7a6c9f16f42b3182e083ea140cb584d7013
-SIZE (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2) = 185364
+MD5 (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2) = a2b3951dbc6ddb2e4c7e09519dd13333
+SHA256 (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2) = 8156f7c4e5a3fbd478c287154c7e3c55c6631c148a7b185f604753d118018da9
+SIZE (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2) = 243386
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
index 3982dc0f2f94..098f5019e25e 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bh-lucidatypewriter-75dpi
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo b/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo
index 14ebf5eb9e9f..af10b978e77b 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2) = fdd9be5b9db94ef363a33e39b7977e2b
-SHA256 (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2) = 50f2f36f533a49c65842568052fe4d065354ff6f39ab36dd2129f465741da046
-SIZE (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2) = 152897
+MD5 (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2) = 6397062f2b346ce5bbe5472f3353a9a9
+SHA256 (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2) = 20ff9c5914c6916c96647eeb3ba700468952fdf01925e62516219a7dd6eb3841
+SIZE (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2) = 212451
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
index c5db3d9bc7b5..e172013db31f 100644
--- a/x11-fonts/font-bh-ttf/Makefile
+++ b/x11-fonts/font-bh-ttf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bh-ttf
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-ttf/distinfo b/x11-fonts/font-bh-ttf/distinfo
index de92edaad305..70d266d45f9c 100644
--- a/x11-fonts/font-bh-ttf/distinfo
+++ b/x11-fonts/font-bh-ttf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bh-ttf-1.0.0.tar.bz2) = ad43cf739b3d46ba1e7dc778a0608a52
-SHA256 (xorg/font/font-bh-ttf-1.0.0.tar.bz2) = 7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644
-SIZE (xorg/font/font-bh-ttf-1.0.0.tar.bz2) = 384019
+MD5 (xorg/font/font-bh-ttf-1.0.1.tar.bz2) = 664df71cb510b744b4a10e778445c37b
+SHA256 (xorg/font/font-bh-ttf-1.0.1.tar.bz2) = 1ce72f84a6c4df7f0e949f915346026ebfeaa5b2e47f7bbc29117ebbf3a7a7c8
+SIZE (xorg/font/font-bh-ttf-1.0.1.tar.bz2) = 453024
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
index 8091ad02bcea..9ad92348063c 100644
--- a/x11-fonts/font-bh-type1/Makefile
+++ b/x11-fonts/font-bh-type1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bh-type1
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-type1/distinfo b/x11-fonts/font-bh-type1/distinfo
index 22e198f32d09..9c6ab5dd8346 100644
--- a/x11-fonts/font-bh-type1/distinfo
+++ b/x11-fonts/font-bh-type1/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bh-type1-1.0.0.tar.bz2) = 46588b22678e440741d6220bc3945cbf
-SHA256 (xorg/font/font-bh-type1-1.0.0.tar.bz2) = 5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b
-SIZE (xorg/font/font-bh-type1-1.0.0.tar.bz2) = 575775
+MD5 (xorg/font/font-bh-type1-1.0.1.tar.bz2) = 374d954c61363206c93d1ce7e9445c31
+SHA256 (xorg/font/font-bh-type1-1.0.1.tar.bz2) = da3b5f26c6cde0baf3831f50c79a7a107806f885e0205073855bfbc5a357bb45
+SIZE (xorg/font/font-bh-type1-1.0.1.tar.bz2) = 634075
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
index 58a122b78c3a..93b1ef4a038d 100644
--- a/x11-fonts/font-bitstream-100dpi/Makefile
+++ b/x11-fonts/font-bitstream-100dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bitstream-100dpi
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-100dpi/distinfo b/x11-fonts/font-bitstream-100dpi/distinfo
index adc61059c060..bb704d31bdfb 100644
--- a/x11-fonts/font-bitstream-100dpi/distinfo
+++ b/x11-fonts/font-bitstream-100dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bitstream-100dpi-1.0.0.tar.bz2) = 173352ddec3d26e2b91df1edcf1ae85b
-SHA256 (xorg/font/font-bitstream-100dpi-1.0.0.tar.bz2) = 0c705a74d7b52e41a1f1aa6732f0200877ba2d4303b79513a524e7cc1b30e2d2
-SIZE (xorg/font/font-bitstream-100dpi-1.0.0.tar.bz2) = 135530
+MD5 (xorg/font/font-bitstream-100dpi-1.0.1.tar.bz2) = 3b8748f8029c53595e4a4a1b23fa790a
+SHA256 (xorg/font/font-bitstream-100dpi-1.0.1.tar.bz2) = 3e05c9b74d0dc00e6e46ec758888e66514ab24fc75930877d4ba6db7d49f0347
+SIZE (xorg/font/font-bitstream-100dpi-1.0.1.tar.bz2) = 191682
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
index 9eff6eca1c32..9f0996b1476f 100644
--- a/x11-fonts/font-bitstream-75dpi/Makefile
+++ b/x11-fonts/font-bitstream-75dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bitstream-75dpi
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-75dpi/distinfo b/x11-fonts/font-bitstream-75dpi/distinfo
index 08a6ead3b7b4..176f4445f5ae 100644
--- a/x11-fonts/font-bitstream-75dpi/distinfo
+++ b/x11-fonts/font-bitstream-75dpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bitstream-75dpi-1.0.0.tar.bz2) = beb476657d50d07d17eef7c325a5ed08
-SHA256 (xorg/font/font-bitstream-75dpi-1.0.0.tar.bz2) = 2ddfeaccca97524e1b0f4fb37b2fd0f1338698e35f8b05b22b594fe29e201bfb
-SIZE (xorg/font/font-bitstream-75dpi-1.0.0.tar.bz2) = 103852
+MD5 (xorg/font/font-bitstream-75dpi-1.0.1.tar.bz2) = aed54fb53d2d24aff10c92985286d1e5
+SHA256 (xorg/font/font-bitstream-75dpi-1.0.1.tar.bz2) = cf9e1cb1c21517a566e5678791778d40c7c915d792bd29d319928f4e4234662b
+SIZE (xorg/font/font-bitstream-75dpi-1.0.1.tar.bz2) = 165702
diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile
index 84a96fd758c1..f3a09bf4a518 100644
--- a/x11-fonts/font-bitstream-speedo/Makefile
+++ b/x11-fonts/font-bitstream-speedo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bitstream-speedo
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-speedo/distinfo b/x11-fonts/font-bitstream-speedo/distinfo
index 898e0853c491..5709280f88d9 100644
--- a/x11-fonts/font-bitstream-speedo/distinfo
+++ b/x11-fonts/font-bitstream-speedo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bitstream-speedo-1.0.0.tar.bz2) = 1399dc18aeb9571b0951d9570ea1059d
-SHA256 (xorg/font/font-bitstream-speedo-1.0.0.tar.bz2) = 99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6
-SIZE (xorg/font/font-bitstream-speedo-1.0.0.tar.bz2) = 337282
+MD5 (xorg/font/font-bitstream-speedo-1.0.1.tar.bz2) = 5b1856a24b1b46414950febc63880307
+SHA256 (xorg/font/font-bitstream-speedo-1.0.1.tar.bz2) = 3d231566856c754f48f568f41c15376730d45d9c3ffd37e1d2476097519f22b8
+SIZE (xorg/font/font-bitstream-speedo-1.0.1.tar.bz2) = 391739
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
index dd7d9b783b79..374fcf8e4fa7 100644
--- a/x11-fonts/font-bitstream-type1/Makefile
+++ b/x11-fonts/font-bitstream-type1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-bitstream-type1
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-type1/distinfo b/x11-fonts/font-bitstream-type1/distinfo
index 2feed35a3787..b9129237da13 100644
--- a/x11-fonts/font-bitstream-type1/distinfo
+++ b/x11-fonts/font-bitstream-type1/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-bitstream-type1-1.0.0.tar.bz2) = 6610475e2e231242f8f2122a709c3695
-SHA256 (xorg/font/font-bitstream-type1-1.0.0.tar.bz2) = 4fce492dcf168837342ea1787ac35b53e4d30361239cba207c9520c42454d903
-SIZE (xorg/font/font-bitstream-type1-1.0.0.tar.bz2) = 351885
+MD5 (xorg/font/font-bitstream-type1-1.0.1.tar.bz2) = a4e8e229a051c0ede9eb525e4006d93a
+SHA256 (xorg/font/font-bitstream-type1-1.0.1.tar.bz2) = 51027cc1d49140153620c1a2b653f1773fe92cb694b221396d68265343e113ab
+SIZE (xorg/font/font-bitstream-type1-1.0.1.tar.bz2) = 407819
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
index 1373db71b863..acf8da5fd839 100644
--- a/x11-fonts/font-cronyx-cyrillic/Makefile
+++ b/x11-fonts/font-cronyx-cyrillic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-cronyx-cyrillic
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cronyx-cyrillic/distinfo b/x11-fonts/font-cronyx-cyrillic/distinfo
index e107954ab52b..c331402b0063 100644
--- a/x11-fonts/font-cronyx-cyrillic/distinfo
+++ b/x11-fonts/font-cronyx-cyrillic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-cronyx-cyrillic-1.0.0.tar.bz2) = 22b451e7230b8c003cfc496ee2d360cc
-SHA256 (xorg/font/font-cronyx-cyrillic-1.0.0.tar.bz2) = 06c94e7033f5cae77b9ba27b84af7c1d3e7f73a7239346aabf98eda6c7f484ee
-SIZE (xorg/font/font-cronyx-cyrillic-1.0.0.tar.bz2) = 196033
+MD5 (xorg/font/font-cronyx-cyrillic-1.0.1.tar.bz2) = 15f86f5e572df21218617982eb4b3bfc
+SHA256 (xorg/font/font-cronyx-cyrillic-1.0.1.tar.bz2) = f7b43a428afe3111513e8ff0ebccc00fbddf2b57cec261ad9017d582fc9a3422
+SIZE (xorg/font/font-cronyx-cyrillic-1.0.1.tar.bz2) = 257247
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
index 57976c33f25e..e3dee7a50121 100644
--- a/x11-fonts/font-cursor-misc/Makefile
+++ b/x11-fonts/font-cursor-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-cursor-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cursor-misc/distinfo b/x11-fonts/font-cursor-misc/distinfo
index bd084b95b3e9..e4096bd0467f 100644
--- a/x11-fonts/font-cursor-misc/distinfo
+++ b/x11-fonts/font-cursor-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-cursor-misc-1.0.0.tar.bz2) = 305fa22cdfefb8f80babd711051a534b
-SHA256 (xorg/font/font-cursor-misc-1.0.0.tar.bz2) = 955de27117581ba501d7c2abae7f38b0a65662e4ab2e2b54b9eb2dc07aa5f3c5
-SIZE (xorg/font/font-cursor-misc-1.0.0.tar.bz2) = 42656
+MD5 (xorg/font/font-cursor-misc-1.0.1.tar.bz2) = 13c21c4d74155c662152a1a74f249d96
+SHA256 (xorg/font/font-cursor-misc-1.0.1.tar.bz2) = deee02861beaa335448e9aba4320c88c30a174bc3dcfb05a434b4ddb137dc1b3
+SIZE (xorg/font/font-cursor-misc-1.0.1.tar.bz2) = 92547
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
index 6705546aa0de..e04062620186 100644
--- a/x11-fonts/font-daewoo-misc/Makefile
+++ b/x11-fonts/font-daewoo-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-daewoo-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-daewoo-misc/distinfo b/x11-fonts/font-daewoo-misc/distinfo
index 78c20271c81a..65514499c5f0 100644
--- a/x11-fonts/font-daewoo-misc/distinfo
+++ b/x11-fonts/font-daewoo-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-daewoo-misc-1.0.0.tar.bz2) = 61f9eab48c619af5494d3e384d8d7d79
-SHA256 (xorg/font/font-daewoo-misc-1.0.0.tar.bz2) = f198eac92e343a38b1e23288880bac91c439bdc90c61a79a7cb0718e9a468926
-SIZE (xorg/font/font-daewoo-misc-1.0.0.tar.bz2) = 682909
+MD5 (xorg/font/font-daewoo-misc-1.0.1.tar.bz2) = 05597e2b193a7b7de2ca525468276b1d
+SHA256 (xorg/font/font-daewoo-misc-1.0.1.tar.bz2) = e2283e4280c66fec7c986f0b4a476811f3419b9517280cd8b59a01563de6e491
+SIZE (xorg/font/font-daewoo-misc-1.0.1.tar.bz2) = 735182
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
index e0c7b8e18250..9619c825983c 100644
--- a/x11-fonts/font-dec-misc/Makefile
+++ b/x11-fonts/font-dec-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-dec-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-dec-misc/distinfo b/x11-fonts/font-dec-misc/distinfo
index e2bce8b1c147..918fd573475f 100644
--- a/x11-fonts/font-dec-misc/distinfo
+++ b/x11-fonts/font-dec-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-dec-misc-1.0.0.tar.bz2) = 284e554db1c64fb7580a06df01444a2b
-SHA256 (xorg/font/font-dec-misc-1.0.0.tar.bz2) = 83386d1225dab1ebc58e7d197acc4c310ed4e29840abf291b1fa2ffac1b68bb9
-SIZE (xorg/font/font-dec-misc-1.0.0.tar.bz2) = 40715
+MD5 (xorg/font/font-dec-misc-1.0.1.tar.bz2) = 05714516824c680ce747c6ef9d2fbbdd
+SHA256 (xorg/font/font-dec-misc-1.0.1.tar.bz2) = fb20da4afddc07e236e830939de0fdfc9a93c5c1c7048fafe669fac19b496552
+SIZE (xorg/font/font-dec-misc-1.0.1.tar.bz2) = 90258
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
index 0f4b26c48e74..ebe9e11c33a4 100644
--- a/x11-fonts/font-ibm-type1/Makefile
+++ b/x11-fonts/font-ibm-type1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-ibm-type1
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-ibm-type1/distinfo b/x11-fonts/font-ibm-type1/distinfo
index 116fe03f0b97..2724fac75ba1 100644
--- a/x11-fonts/font-ibm-type1/distinfo
+++ b/x11-fonts/font-ibm-type1/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-ibm-type1-1.0.0.tar.bz2) = 8e8733051371e2b51123376b49f5d3ea
-SHA256 (xorg/font/font-ibm-type1-1.0.0.tar.bz2) = 30d091c2e3506943f8a6e152c4be973c462ba19293a864bbb48b82c6cf9c461e
-SIZE (xorg/font/font-ibm-type1-1.0.0.tar.bz2) = 315324
+MD5 (xorg/font/font-ibm-type1-1.0.1.tar.bz2) = 1646179ff224b3e2c9b1e7f59042897f
+SHA256 (xorg/font/font-ibm-type1-1.0.1.tar.bz2) = 887ea895cc0fdd5c50d4960aee7cb6ed813cf90f53b53ce0e0e068dd606cc919
+SIZE (xorg/font/font-ibm-type1-1.0.1.tar.bz2) = 375779
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
index b7cce42aaba0..4f8c008cb2e3 100644
--- a/x11-fonts/font-isas-misc/Makefile
+++ b/x11-fonts/font-isas-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-isas-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-isas-misc/distinfo b/x11-fonts/font-isas-misc/distinfo
index d1709ee0133b..803a55baa0c5 100644
--- a/x11-fonts/font-isas-misc/distinfo
+++ b/x11-fonts/font-isas-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-isas-misc-1.0.0.tar.bz2) = ec709a96b64b497a5cb5658c93bd38dc
-SHA256 (xorg/font/font-isas-misc-1.0.0.tar.bz2) = 97e61313ce0bf229da5d489fc5a05562fdca14f9acc17c40d0b272a345ba4ea2
-SIZE (xorg/font/font-isas-misc-1.0.0.tar.bz2) = 776580
+MD5 (xorg/font/font-isas-misc-1.0.1.tar.bz2) = 88b5b32c5a27576e9d00675bcc966806
+SHA256 (xorg/font/font-isas-misc-1.0.1.tar.bz2) = 52fe0469eb91e94dc7a0e8164e947fee439f398b0eb63c210f682524f12cea7b
+SIZE (xorg/font/font-isas-misc-1.0.1.tar.bz2) = 842788
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
index 12a2d7a72da9..753ed565186a 100644
--- a/x11-fonts/font-jis-misc/Makefile
+++ b/x11-fonts/font-jis-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-jis-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-jis-misc/distinfo b/x11-fonts/font-jis-misc/distinfo
index f4a40cd979da..6fa3468c4295 100644
--- a/x11-fonts/font-jis-misc/distinfo
+++ b/x11-fonts/font-jis-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-jis-misc-1.0.0.tar.bz2) = 61febb49a71065723a1fba17cbf23c67
-SHA256 (xorg/font/font-jis-misc-1.0.0.tar.bz2) = 3721eefd4ffc47c6948065f7acf9d5c731c4e8e54105d096735876d3712dc7ba
-SIZE (xorg/font/font-jis-misc-1.0.0.tar.bz2) = 564585
+MD5 (xorg/font/font-jis-misc-1.0.1.tar.bz2) = 5835c99d056f4a29d7d6a5ae873cf00e
+SHA256 (xorg/font/font-jis-misc-1.0.1.tar.bz2) = a63b98c204395b61949214db199c38094489336731d4a4179eb053a5bb54e8cf
+SIZE (xorg/font/font-jis-misc-1.0.1.tar.bz2) = 625454
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
index 8221efc0b6f2..70a979ccbad3 100644
--- a/x11-fonts/font-micro-misc/Makefile
+++ b/x11-fonts/font-micro-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-micro-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-micro-misc/distinfo b/x11-fonts/font-micro-misc/distinfo
index 03c85a549645..644e3eee1dc0 100644
--- a/x11-fonts/font-micro-misc/distinfo
+++ b/x11-fonts/font-micro-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-micro-misc-1.0.0.tar.bz2) = 8c8bffd7540f05caa0dbb4e6e1d6c58e
-SHA256 (xorg/font/font-micro-misc-1.0.0.tar.bz2) = 16b17b5939e12e9381c8096c1f77f064ee0073fa9cb09297dec278bade17a572
-SIZE (xorg/font/font-micro-misc-1.0.0.tar.bz2) = 38895
+MD5 (xorg/font/font-micro-misc-1.0.1.tar.bz2) = 6350117efebe340f33e818f4a33e4e4b
+SHA256 (xorg/font/font-micro-misc-1.0.1.tar.bz2) = a5b987ea38bf53f63968a6cad1c052ca6d0fc678d9409c1953701f0159e4972b
+SIZE (xorg/font/font-micro-misc-1.0.1.tar.bz2) = 88847
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
index 665dd7f4ea36..252c6e0c7f57 100644
--- a/x11-fonts/font-misc-cyrillic/Makefile
+++ b/x11-fonts/font-misc-cyrillic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-misc-cyrillic
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-cyrillic/distinfo b/x11-fonts/font-misc-cyrillic/distinfo
index 61487016e3cf..5838e746e371 100644
--- a/x11-fonts/font-misc-cyrillic/distinfo
+++ b/x11-fonts/font-misc-cyrillic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-misc-cyrillic-1.0.0.tar.bz2) = 3596907d7a2a99c81d8de99bc4552b6a
-SHA256 (xorg/font/font-misc-cyrillic-1.0.0.tar.bz2) = 7c0bac1302129d3bf40ec7d9830e728b0251dc20dda8c8979227b478663290ff
-SIZE (xorg/font/font-misc-cyrillic-1.0.0.tar.bz2) = 65561
+MD5 (xorg/font/font-misc-cyrillic-1.0.1.tar.bz2) = c79d7921d95b2c4f10fad464bb121090
+SHA256 (xorg/font/font-misc-cyrillic-1.0.1.tar.bz2) = dafafbfd93d95820449972fd86ec312266eb73e5297966ee6e0163d294d8af75
+SIZE (xorg/font/font-misc-cyrillic-1.0.1.tar.bz2) = 116626
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
index edc2a243ca2a..8fdb031cb4cf 100644
--- a/x11-fonts/font-misc-ethiopic/Makefile
+++ b/x11-fonts/font-misc-ethiopic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-misc-ethiopic
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-ethiopic/distinfo b/x11-fonts/font-misc-ethiopic/distinfo
index e562f22d93aa..9944f8a9ad77 100644
--- a/x11-fonts/font-misc-ethiopic/distinfo
+++ b/x11-fonts/font-misc-ethiopic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-misc-ethiopic-1.0.0.tar.bz2) = 0b271fc617087d77560bdca20c0cdbb0
-SHA256 (xorg/font/font-misc-ethiopic-1.0.0.tar.bz2) = 58d2868801ca063797fa88fb4aea59f7c550473be4e9a4f96d84fe39b967d141
-SIZE (xorg/font/font-misc-ethiopic-1.0.0.tar.bz2) = 184348
+MD5 (xorg/font/font-misc-ethiopic-1.0.1.tar.bz2) = 4c88c79b8e5d47af90b21e948d42755f
+SHA256 (xorg/font/font-misc-ethiopic-1.0.1.tar.bz2) = bf3b3a994b6c4047b2d79f590e7113ed429b8b7a83992cb753a83e6e8bd3d948
+SIZE (xorg/font/font-misc-ethiopic-1.0.1.tar.bz2) = 235856
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
index ba60b6161436..6c8f2355c00e 100644
--- a/x11-fonts/font-misc-meltho/Makefile
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= font-misc-meltho
-PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-meltho/distinfo b/x11-fonts/font-misc-meltho/distinfo
index be2fdb0d7b0b..babebc04b005 100644
--- a/x11-fonts/font-misc-meltho/distinfo
+++ b/x11-fonts/font-misc-meltho/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-misc-meltho-1.0.0.tar.bz2) = ccb212a7badf7aefdc9f9a92af428d32
-SHA256 (xorg/font/font-misc-meltho-1.0.0.tar.bz2) = c7e12b9926b6053f3567eae548840f0b3d283ce34f842b06309a81c1d98d3924
-SIZE (xorg/font/font-misc-meltho-1.0.0.tar.bz2) = 1491421
+MD5 (xorg/font/font-misc-meltho-1.0.1.tar.bz2) = 345f1a78312e30cd2c41d24ea3f3276f
+SHA256 (xorg/font/font-misc-meltho-1.0.1.tar.bz2) = 5366d7a0f38a189e504676a9cddd8430113f9957919f0a3dc181bcaaaed92618
+SIZE (xorg/font/font-misc-meltho-1.0.1.tar.bz2) = 1547638
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
index bc704e67249f..31842e7a7de6 100644
--- a/x11-fonts/font-misc-misc/Makefile
+++ b/x11-fonts/font-misc-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-misc-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.1.0
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-misc/distinfo b/x11-fonts/font-misc-misc/distinfo
index 188b26851423..13e5d1dbd238 100644
--- a/x11-fonts/font-misc-misc/distinfo
+++ b/x11-fonts/font-misc-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-misc-misc-1.0.0.tar.bz2) = 2a57f6188c41d4bc1b88ca3d08ad011d
-SHA256 (xorg/font/font-misc-misc-1.0.0.tar.bz2) = 26a02560ad1f1648e7c36be6daf42910762131d3974422d1b306e6cae13f17db
-SIZE (xorg/font/font-misc-misc-1.0.0.tar.bz2) = 1856323
+MD5 (xorg/font/font-misc-misc-1.1.0.tar.bz2) = 878bfd4e9f14c1279cea3a8392e0dbdd
+SHA256 (xorg/font/font-misc-misc-1.1.0.tar.bz2) = 50f7528ab94f319a11efcd555dd5a7120191a42cf892c87cd6bdea8b908d497b
+SIZE (xorg/font/font-misc-misc-1.1.0.tar.bz2) = 1929783
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
index 8d13ca3ceb47..8a63778a1b86 100644
--- a/x11-fonts/font-mutt-misc/Makefile
+++ b/x11-fonts/font-mutt-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-mutt-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-mutt-misc/distinfo b/x11-fonts/font-mutt-misc/distinfo
index 662032b8efbf..22e83ea78f1c 100644
--- a/x11-fonts/font-mutt-misc/distinfo
+++ b/x11-fonts/font-mutt-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-mutt-misc-1.0.0.tar.bz2) = 648b409b7eb78ad1cd5f6d7fac3eef88
-SHA256 (xorg/font/font-mutt-misc-1.0.0.tar.bz2) = f219183bd0f2b8ceca42a8a345c921f2a8ee19f4d86fef11c4ce8918d41aedff
-SIZE (xorg/font/font-mutt-misc-1.0.0.tar.bz2) = 203608
+MD5 (xorg/font/font-mutt-misc-1.0.1.tar.bz2) = aab7ac62b960e77aa11d032bafe1d460
+SHA256 (xorg/font/font-mutt-misc-1.0.1.tar.bz2) = 77bf33cbf5d1849bef4e516698eb45b7d16263a84dcc2299fd61383501906e25
+SIZE (xorg/font/font-mutt-misc-1.0.1.tar.bz2) = 256990
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
index 9f82a1434b73..8c8677f9c15f 100644
--- a/x11-fonts/font-schumacher-misc/Makefile
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= font-schumacher-misc
-PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-schumacher-misc/distinfo b/x11-fonts/font-schumacher-misc/distinfo
index 34f3244949cb..dc611a8eb722 100644
--- a/x11-fonts/font-schumacher-misc/distinfo
+++ b/x11-fonts/font-schumacher-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-schumacher-misc-1.0.0.tar.bz2) = f1c6063d2fadc57e696a0aab69afd6e0
-SHA256 (xorg/font/font-schumacher-misc-1.0.0.tar.bz2) = 454e6cf885a4475569ce24ad3d4a82cb331d74e1a25f0747694a71098b56ef7a
-SIZE (xorg/font/font-schumacher-misc-1.0.0.tar.bz2) = 78084
+MD5 (xorg/font/font-schumacher-misc-1.1.0.tar.bz2) = 86f4b7d8b11a2e6da70884c59b5866a3
+SHA256 (xorg/font/font-schumacher-misc-1.1.0.tar.bz2) = 3003915fb53930fee5e6086ee7546ea0857ef0fc2311aaf84ed937b1b4de1b4d
+SIZE (xorg/font/font-schumacher-misc-1.1.0.tar.bz2) = 136883
diff --git a/x11-fonts/font-schumacher-misc/files/patch-clR6x12.bdf b/x11-fonts/font-schumacher-misc/files/patch-clR6x12.bdf
deleted file mode 100644
index 6e52631b67e6..000000000000
--- a/x11-fonts/font-schumacher-misc/files/patch-clR6x12.bdf
+++ /dev/null
@@ -1,94 +0,0 @@
---- clR6x12.bdf.orig 2003-11-15 01:48:41.000000000 +0900
-+++ clR6x12.bdf 2008-12-28 16:10:08.000000000 +0900
-@@ -46,7 +46,7 @@
- CAP_HEIGHT 8
- X_HEIGHT 5
- ENDPROPERTIES
--CHARS 1197
-+CHARS 1193
- STARTCHAR char0
- ENCODING 0
- SWIDTH 480 0
-@@ -22657,82 +22657,6 @@
- 08
- 00
- ENDCHAR
--STARTCHAR uni30D0
--ENCODING 12496
--SWIDTH 480 0
--DWIDTH 6 0
--BBX 6 12 0 -3
--BITMAP
--40
--F8
--00
--00
--00
--00
--00
--00
--00
--00
--00
--00
--ENDCHAR
--STARTCHAR uni30D1
--ENCODING 12497
--SWIDTH 480 0
--DWIDTH 6 0
--BBX 6 12 0 -3
--BITMAP
--10
--F8
--00
--00
--00
--00
--00
--00
--00
--00
--00
--00
--ENDCHAR
--STARTCHAR uni30D2
--ENCODING 12498
--SWIDTH 480 0
--DWIDTH 6 0
--BBX 6 12 0 -3
--BITMAP
--20
--20
--20
--20
--20
--20
--20
--20
--20
--20
--20
--20
--ENDCHAR
--STARTCHAR uni30D3
--ENCODING 12499
--SWIDTH 480 0
--DWIDTH 6 0
--BBX 6 12 0 -3
--BITMAP
--00
--00
--20
--20
--20
--20
--20
--20
--20
--20
--00
--00
--ENDCHAR
- STARTCHAR fi
- ENCODING 64257
- SWIDTH 480 0
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
index 1a76d5c7dd1c..9ac5026edf21 100644
--- a/x11-fonts/font-screen-cyrillic/Makefile
+++ b/x11-fonts/font-screen-cyrillic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-screen-cyrillic
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-screen-cyrillic/distinfo b/x11-fonts/font-screen-cyrillic/distinfo
index bd2108898056..56d5656efa13 100644
--- a/x11-fonts/font-screen-cyrillic/distinfo
+++ b/x11-fonts/font-screen-cyrillic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-screen-cyrillic-1.0.1.tar.bz2) = c8d5aef01c906c7aaea329702a8b1b63
-SHA256 (xorg/font/font-screen-cyrillic-1.0.1.tar.bz2) = d9575f0f302a183590d2bad82a8f260aed06fd93695a1faf79f1842a6a16c51f
-SIZE (xorg/font/font-screen-cyrillic-1.0.1.tar.bz2) = 45471
+MD5 (xorg/font/font-screen-cyrillic-1.0.2.tar.bz2) = c912a976b66073acd80c9d5c624f3aae
+SHA256 (xorg/font/font-screen-cyrillic-1.0.2.tar.bz2) = c5dd881fb13ff16d358acb27f99f6c281415d3824beb342f3a02603f0efebe11
+SIZE (xorg/font/font-screen-cyrillic-1.0.2.tar.bz2) = 93560
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
index 8fe780cec367..8c50f1e1ed3d 100644
--- a/x11-fonts/font-sony-misc/Makefile
+++ b/x11-fonts/font-sony-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-sony-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sony-misc/distinfo b/x11-fonts/font-sony-misc/distinfo
index 5fa44e80d90b..da955e6ac1fc 100644
--- a/x11-fonts/font-sony-misc/distinfo
+++ b/x11-fonts/font-sony-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-sony-misc-1.0.0.tar.bz2) = 0dfddd1a946e4497f009094c0ae1bdd5
-SHA256 (xorg/font/font-sony-misc-1.0.0.tar.bz2) = 1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23
-SIZE (xorg/font/font-sony-misc-1.0.0.tar.bz2) = 48480
+MD5 (xorg/font/font-sony-misc-1.0.1.tar.bz2) = 7b6f5117814599b86ed3470de6c62aa3
+SHA256 (xorg/font/font-sony-misc-1.0.1.tar.bz2) = da9526844c74ce395d3912d3d8f538cd57102d6bcd9f73fd0a5dccf53bfc56ca
+SIZE (xorg/font/font-sony-misc-1.0.1.tar.bz2) = 98394
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
index 3496789e44cb..f84b31df9969 100644
--- a/x11-fonts/font-sun-misc/Makefile
+++ b/x11-fonts/font-sun-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-sun-misc
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sun-misc/distinfo b/x11-fonts/font-sun-misc/distinfo
index 108fbfcd55da..3aec39ed3329 100644
--- a/x11-fonts/font-sun-misc/distinfo
+++ b/x11-fonts/font-sun-misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-sun-misc-1.0.0.tar.bz2) = e17d43a7c6c0d862cfba0908ff132ffa
-SHA256 (xorg/font/font-sun-misc-1.0.0.tar.bz2) = 03c12d8f4d8e7f0178f501ea3ee0709ee3a1deda733afecd631807e6ba5729e5
-SIZE (xorg/font/font-sun-misc-1.0.0.tar.bz2) = 56416
+MD5 (xorg/font/font-sun-misc-1.0.1.tar.bz2) = 5a185c5549a650bf062d343e128682ca
+SHA256 (xorg/font/font-sun-misc-1.0.1.tar.bz2) = 411522f5ea8f951a7432ab946a92f524493e3a1a6e1ca3c48f09c46cb5ae9d09
+SIZE (xorg/font/font-sun-misc-1.0.1.tar.bz2) = 106838
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
index 07412d0a02f1..62b0cc3dd5d2 100644
--- a/x11-fonts/font-util/Makefile
+++ b/x11-fonts/font-util/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-util
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-util/distinfo b/x11-fonts/font-util/distinfo
index 59266e2714c4..0503bc8358e7 100644
--- a/x11-fonts/font-util/distinfo
+++ b/x11-fonts/font-util/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-util-1.0.1.tar.bz2) = b81535f78fe05732931f02841e5ca37b
-SHA256 (xorg/font/font-util-1.0.1.tar.bz2) = 048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612
-SIZE (xorg/font/font-util-1.0.1.tar.bz2) = 98637
+MD5 (xorg/font/font-util-1.0.2.tar.bz2) = fe5a7df765d297623663477edce70b7c
+SHA256 (xorg/font/font-util-1.0.2.tar.bz2) = 42133b8b73abfac38fd75a9ecabbd576973ef538c7a8afee63e778c9b2727b5a
+SIZE (xorg/font/font-util-1.0.2.tar.bz2) = 115070
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
index 6e61ec8e0b30..4ecce6279570 100644
--- a/x11-fonts/font-winitzki-cyrillic/Makefile
+++ b/x11-fonts/font-winitzki-cyrillic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-winitzki-cyrillic
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-winitzki-cyrillic/distinfo b/x11-fonts/font-winitzki-cyrillic/distinfo
index 88f48cff1a9b..f49e8cda7126 100644
--- a/x11-fonts/font-winitzki-cyrillic/distinfo
+++ b/x11-fonts/font-winitzki-cyrillic/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-winitzki-cyrillic-1.0.0.tar.bz2) = b99b02aff36a88ca3379715423c60303
-SHA256 (xorg/font/font-winitzki-cyrillic-1.0.0.tar.bz2) = 478a7f6881fce6a335b409e1326449af4162a147d268f1978b8dd81c834beee3
-SIZE (xorg/font/font-winitzki-cyrillic-1.0.0.tar.bz2) = 41050
+MD5 (xorg/font/font-winitzki-cyrillic-1.0.1.tar.bz2) = 92bf4ecb373faac545cef2dcbe40be35
+SHA256 (xorg/font/font-winitzki-cyrillic-1.0.1.tar.bz2) = 7c57c29f70db18e543a3eb8f785b6b5d1372b78eee27707dbb10359d8ddb1446
+SIZE (xorg/font/font-winitzki-cyrillic-1.0.1.tar.bz2) = 91022
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index 0afa526c7828..4ad35ed0b7c5 100644
--- a/x11-fonts/font-xfree86-type1/Makefile
+++ b/x11-fonts/font-xfree86-type1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-xfree86-type1
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-xfree86-type1/distinfo b/x11-fonts/font-xfree86-type1/distinfo
index ce450b89f0cd..c1c0e2b585f2 100644
--- a/x11-fonts/font-xfree86-type1/distinfo
+++ b/x11-fonts/font-xfree86-type1/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = d7e965776c7f0c30b0f09742176fb77a
-SHA256 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341
-SIZE (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 71607
+MD5 (xorg/font/font-xfree86-type1-1.0.2.tar.bz2) = a966f5a8aade9e63af86d8a6bf3e8586
+SHA256 (xorg/font/font-xfree86-type1-1.0.2.tar.bz2) = 7a026aeaafe5a619b2c1b35cd361125b169b2212eaf0f2f5ce796038b1cf06cd
+SIZE (xorg/font/font-xfree86-type1-1.0.2.tar.bz2) = 117361
diff --git a/x11-fonts/fontcacheproto/Makefile b/x11-fonts/fontcacheproto/Makefile
index 94e87d0b2101..1e49db118561 100644
--- a/x11-fonts/fontcacheproto/Makefile
+++ b/x11-fonts/fontcacheproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fontcacheproto
-PORTVERSION= 0.1.2
+PORTVERSION= 0.1.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/fontcacheproto/distinfo b/x11-fonts/fontcacheproto/distinfo
index af64df8b5eb5..fb34d90a3a0f 100644
--- a/x11-fonts/fontcacheproto/distinfo
+++ b/x11-fonts/fontcacheproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/fontcacheproto-0.1.2.tar.bz2) = 60df6b625074a9790e28543dcea71651
-SHA256 (xorg/proto/fontcacheproto-0.1.2.tar.bz2) = 48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9
-SIZE (xorg/proto/fontcacheproto-0.1.2.tar.bz2) = 38233
+MD5 (xorg/proto/fontcacheproto-0.1.3.tar.bz2) = a8a50e5e995bfacb0359575faf7f6906
+SHA256 (xorg/proto/fontcacheproto-0.1.3.tar.bz2) = 1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb
+SIZE (xorg/proto/fontcacheproto-0.1.3.tar.bz2) = 84470
diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile
index 590ccf8570e1..b0d6f0f87dc6 100644
--- a/x11-fonts/fontsproto/Makefile
+++ b/x11-fonts/fontsproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fontsproto
-PORTVERSION= 2.0.2
+PORTVERSION= 2.1.0
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/fontsproto/distinfo b/x11-fonts/fontsproto/distinfo
index 08c1bf729b99..48a25bd30b40 100644
--- a/x11-fonts/fontsproto/distinfo
+++ b/x11-fonts/fontsproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/fontsproto-2.0.2.tar.bz2) = c946f166107b016a21cc7a02e1132724
-SHA256 (xorg/proto/fontsproto-2.0.2.tar.bz2) = 83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b
-SIZE (xorg/proto/fontsproto-2.0.2.tar.bz2) = 45202
+MD5 (xorg/proto/fontsproto-2.1.0.tar.bz2) = f3a857deadca3144fba041af1dbf7603
+SHA256 (xorg/proto/fontsproto-2.1.0.tar.bz2) = 5a9af61dc9142488c9ba6e4ae30a9d970ea0f889a1ab7f59de1c1898c83aeb35
+SIZE (xorg/proto/fontsproto-2.1.0.tar.bz2) = 56776
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
index 469dee8ad3b1..1c9241f71392 100644
--- a/x11-fonts/fonttosfnt/Makefile
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fonttosfnt
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/fonttosfnt/distinfo b/x11-fonts/fonttosfnt/distinfo
index 354f468ff005..962aadd48c71 100644
--- a/x11-fonts/fonttosfnt/distinfo
+++ b/x11-fonts/fonttosfnt/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/fonttosfnt-1.0.3.tar.bz2) = b0ebd86029571239b9d7b0c61191b591
-SHA256 (xorg/app/fonttosfnt-1.0.3.tar.bz2) = 9d2b0149ea49a097ab6c563801c06af9975e98f9fa4c8af1a8ac3238e4fd5243
-SIZE (xorg/app/fonttosfnt-1.0.3.tar.bz2) = 102008
+MD5 (xorg/app/fonttosfnt-1.0.4.tar.bz2) = 07607b26fce3bdc2b204ff3bc43d3ac3
+SHA256 (xorg/app/fonttosfnt-1.0.4.tar.bz2) = 3feaaab499b3f9c7e9b8bdc725dd40fde65b2fbb73794845d7f682746470f594
+SIZE (xorg/app/fonttosfnt-1.0.4.tar.bz2) = 106121
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 265ddc723c25..adde49b5c123 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libFS
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo
index e8a9b43f9a97..82243cfb1a18 100644
--- a/x11-fonts/libFS/distinfo
+++ b/x11-fonts/libFS/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libFS-1.0.1.tar.bz2) = 81521249353fa33be7a4bb0062c2fbb9
-SHA256 (xorg/lib/libFS-1.0.1.tar.bz2) = 9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5
-SIZE (xorg/lib/libFS-1.0.1.tar.bz2) = 239934
+MD5 (xorg/lib/libFS-1.0.2.tar.bz2) = ecf2d6a27da053500283e803efa2a808
+SHA256 (xorg/lib/libFS-1.0.2.tar.bz2) = af2a5fe5eaa2b026e10bddb4e3f39976dc13deb5dbdc714abe1f016435ce3049
+SIZE (xorg/lib/libFS-1.0.2.tar.bz2) = 261401
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index 89e6afb89459..dbb38a4a94ad 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXfont
-PORTVERSION= 1.3.4
+PORTVERSION= 1.4.0
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo
index a7cd75698b08..3faadb31c844 100644
--- a/x11-fonts/libXfont/distinfo
+++ b/x11-fonts/libXfont/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXfont-1.3.4.tar.bz2) = 788371ee566ef97ed4ca0794873b38cf
-SHA256 (xorg/lib/libXfont-1.3.4.tar.bz2) = b09f23f1fd758fe25336d084455229e6847fab9dcaec839846431f0f4fe7d9f0
-SIZE (xorg/lib/libXfont-1.3.4.tar.bz2) = 571087
+MD5 (xorg/lib/libXfont-1.4.0.tar.bz2) = 3a8e06b25912ef339d70a8ba003da9b5
+SHA256 (xorg/lib/libXfont-1.4.0.tar.bz2) = eafff0157f2c7172214449d4b6b0c72328cad7026ecace226189b511791c5f75
+SIZE (xorg/lib/libXfont-1.4.0.tar.bz2) = 410560
diff --git a/x11-fonts/libXfont/pkg-plist b/x11-fonts/libXfont/pkg-plist
index 4522d0f02a09..213eebd3d9e4 100644
--- a/x11-fonts/libXfont/pkg-plist
+++ b/x11-fonts/libXfont/pkg-plist
@@ -7,7 +7,6 @@ include/X11/fonts/fntfilst.h
include/X11/fonts/fontconf.h
include/X11/fonts/fontencc.h
include/X11/fonts/fontmisc.h
-include/X11/fonts/fontmod.h
include/X11/fonts/fontshow.h
include/X11/fonts/fontutil.h
include/X11/fonts/fontxlfd.h
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index cdef90c54031..19974c04aa83 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXfontcache
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libXfontcache/distinfo b/x11-fonts/libXfontcache/distinfo
index df320f2b7ac4..980c192efc94 100644
--- a/x11-fonts/libXfontcache/distinfo
+++ b/x11-fonts/libXfontcache/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXfontcache-1.0.4.tar.bz2) = 1adca018aa7bf2d215f20a69c10828ad
-SHA256 (xorg/lib/libXfontcache-1.0.4.tar.bz2) = ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c
-SIZE (xorg/lib/libXfontcache-1.0.4.tar.bz2) = 214869
+MD5 (xorg/lib/libXfontcache-1.0.5.tar.bz2) = bbd37768c87f63cf2eb845b2c0f56515
+SHA256 (xorg/lib/libXfontcache-1.0.5.tar.bz2) = 0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce
+SIZE (xorg/lib/libXfontcache-1.0.5.tar.bz2) = 240293
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index fc44a4f5327a..d83eacdffb8d 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libfontenc
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libfontenc/distinfo b/x11-fonts/libfontenc/distinfo
index aa73b0a491e3..716a6fb7a21b 100644
--- a/x11-fonts/libfontenc/distinfo
+++ b/x11-fonts/libfontenc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libfontenc-1.0.4.tar.bz2) = 5cd16a2e51ca7b96a3081c7486ff98b9
-SHA256 (xorg/lib/libfontenc-1.0.4.tar.bz2) = b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8
-SIZE (xorg/lib/libfontenc-1.0.4.tar.bz2) = 224063
+MD5 (xorg/lib/libfontenc-1.0.5.tar.bz2) = 4f0d8191819be9f2bdf9dad49a65e43b
+SHA256 (xorg/lib/libfontenc-1.0.5.tar.bz2) = 7f3cde0331e9ad3da720b1a8255e121673701199df0802b62380436e74222700
+SIZE (xorg/lib/libfontenc-1.0.5.tar.bz2) = 250146
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
index 8ec6333babaf..fa78b360adaf 100644
--- a/x11-fonts/mkfontdir/Makefile
+++ b/x11-fonts/mkfontdir/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mkfontdir
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/mkfontdir/distinfo b/x11-fonts/mkfontdir/distinfo
index a9ac5fe880fc..00ed49c21978 100644
--- a/x11-fonts/mkfontdir/distinfo
+++ b/x11-fonts/mkfontdir/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 35394bf3f746a57fba624dba52fdbba3
-SHA256 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3
-SIZE (xorg/app/mkfontdir-1.0.4.tar.bz2) = 70506
+MD5 (xorg/app/mkfontdir-1.0.5.tar.bz2) = 9365ac66d19186eaf030482d312fca06
+SHA256 (xorg/app/mkfontdir-1.0.5.tar.bz2) = a534650cff503619f9101577d816cde283da993bc039273477bd8dfbd01a2d0b
+SIZE (xorg/app/mkfontdir-1.0.5.tar.bz2) = 87198
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index f893dc8386fc..c274cef3e744 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mkfontscale
-PORTVERSION= 1.0.6
+PORTVERSION= 1.0.7
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -17,6 +17,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
XORG_CAT= app
USE_XORG= xproto fontenc
+PLIST_FILES= bin/mkfontscale
MAN1= mkfontscale.1
.include <bsd.port.mk>
diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo
index f557bbb00a0b..be9401510978 100644
--- a/x11-fonts/mkfontscale/distinfo
+++ b/x11-fonts/mkfontscale/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/mkfontscale-1.0.6.tar.bz2) = 0d0752af232054b720febcc1b2fd6c57
-SHA256 (xorg/app/mkfontscale-1.0.6.tar.bz2) = 273512f86fdc46689e9295409982dff0fb5b2ab0cac1690c0d973907bb7b6776
-SIZE (xorg/app/mkfontscale-1.0.6.tar.bz2) = 105475
+MD5 (xorg/app/mkfontscale-1.0.7.tar.bz2) = 96ca346f185c0ab48e42bf5bb0375da5
+SHA256 (xorg/app/mkfontscale-1.0.7.tar.bz2) = 8306b229cca233216a6582cb1ff60af78e37c47d6412ac823d7d41c3d7de7127
+SIZE (xorg/app/mkfontscale-1.0.7.tar.bz2) = 110945
diff --git a/x11-fonts/mkfontscale/pkg-plist b/x11-fonts/mkfontscale/pkg-plist
deleted file mode 100644
index ecb923a695aa..000000000000
--- a/x11-fonts/mkfontscale/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/mkfontscale
diff --git a/x11-fonts/xf86bigfontproto/Makefile b/x11-fonts/xf86bigfontproto/Makefile
index dbf8ea0d558a..8ff6b00520d5 100644
--- a/x11-fonts/xf86bigfontproto/Makefile
+++ b/x11-fonts/xf86bigfontproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86bigfontproto
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2.0
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/xf86bigfontproto/distinfo b/x11-fonts/xf86bigfontproto/distinfo
index b80a3c01a5a8..b40b503a8a06 100644
--- a/x11-fonts/xf86bigfontproto/distinfo
+++ b/x11-fonts/xf86bigfontproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86bigfontproto-1.1.2.tar.bz2) = a318c1e86123832d7b0c95fc7d47ef35
-SHA256 (xorg/proto/xf86bigfontproto-1.1.2.tar.bz2) = 01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124
-SIZE (xorg/proto/xf86bigfontproto-1.1.2.tar.bz2) = 37450
+MD5 (xorg/proto/xf86bigfontproto-1.2.0.tar.bz2) = 120e226ede5a4687b25dd357cc9b8efe
+SHA256 (xorg/proto/xf86bigfontproto-1.2.0.tar.bz2) = ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648
+SIZE (xorg/proto/xf86bigfontproto-1.2.0.tar.bz2) = 49191
diff --git a/x11-fonts/xf86bigfontproto/pkg-plist b/x11-fonts/xf86bigfontproto/pkg-plist
index 16a3b7e8ef26..9345b799a26b 100644
--- a/x11-fonts/xf86bigfontproto/pkg-plist
+++ b/x11-fonts/xf86bigfontproto/pkg-plist
@@ -1,4 +1,5 @@
include/X11/extensions/xf86bigfont.h
+include/X11/extensions/xf86bigfproto.h
include/X11/extensions/xf86bigfstr.h
libdata/pkgconfig/xf86bigfontproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 13e8d2dd3aed..223f6070cb66 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfs
-PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTVERSION= 1.1.0
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index 3484d5eac284..b5471014360c 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xfs-1.0.8.tar.bz2) = f10717e45535b64eb45226aac571dac2
-SHA256 (xorg/app/xfs-1.0.8.tar.bz2) = 34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482
-SIZE (xorg/app/xfs-1.0.8.tar.bz2) = 161279
+MD5 (xorg/app/xfs-1.1.0.tar.bz2) = 5cfc06a320f74f07a0aa73da62307e9a
+SHA256 (xorg/app/xfs-1.1.0.tar.bz2) = 47bad4bbcd0488a8e573aa6efe3438076c4d27c498d6f642f3aa27262eb95f6d
+SIZE (xorg/app/xfs-1.1.0.tar.bz2) = 196532
diff --git a/x11-fonts/xfs/files/xfs.in b/x11-fonts/xfs/files/xfs.in
index 5db6d2f0f94e..1b3c4e24858d 100644
--- a/x11-fonts/xfs/files/xfs.in
+++ b/x11-fonts/xfs/files/xfs.in
@@ -16,7 +16,7 @@
#
# Please see xfs(1), rc.conf(5) and rc(8) for further details.
-. /etc/rc.subr
+. %%RC_SUBR%%
name="xfs"
rcvar=`set_rcvar`
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 3e74cb97fddc..3ba2af0a1f7e 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts-100dpi
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index e72bce6792dc..cfee557a8d2c 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts-75dpi
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 546547d44e21..1779af791f39 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts-cyrillic
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 3939118788be..655cf208ee3c 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts-miscbitmaps
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index b01829e8098d..e5c0156d507d 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts-truetype
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index 0648a55d79c9..f929a45f2ea1 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts-type1
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 7a8c707ef3fb..3bde21d5def7 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index a43a4ef7e05d..45e690159201 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xephyr
-PORTVERSION= 1.6.5
+PORTVERSION= 1.7.5
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
index 2fd20cdab2a0..d31dc3f6420d 100644
--- a/x11-servers/xephyr/distinfo
+++ b/x11-servers/xephyr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = eba3748a1f49cec25e058a139bd75a53
-SHA256 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-SIZE (xorg/xserver/xorg-server-1.6.5.tar.bz2) = 4678406
+MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
+SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
+SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 644977c52c49..6dc69f2e46bc 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-dmx
-PORTVERSION= 1.6.5
+PORTVERSION= 1.7.5
PORTEPOCH= 1
CATEGORIES= x11-servers
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 2fd20cdab2a0..d31dc3f6420d 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = eba3748a1f49cec25e058a139bd75a53
-SHA256 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-SIZE (xorg/xserver/xorg-server-1.6.5.tar.bz2) = 4678406
+MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
+SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
+SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 34a037567c6b..a5086aff15d2 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-nestserver
-PORTVERSION= 1.6.5
+PORTVERSION= 1.7.5
PORTEPOCH= 1
CATEGORIES= x11-servers
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index 2fd20cdab2a0..d31dc3f6420d 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = eba3748a1f49cec25e058a139bd75a53
-SHA256 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-SIZE (xorg/xserver/xorg-server-1.6.5.tar.bz2) = 4678406
+MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
+SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
+SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 91c273b73784..991654fd1df0 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-server
-PORTVERSION= 1.6.5
-PORTREVISION= 1
+PORTVERSION= 1.7.5
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
@@ -24,6 +23,7 @@ CONFLICTS= XFree86-Server-*
XORG_CAT= xserver
+USE_GMAKE= yes
USE_GL= gl
USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
xmu xt xpm xext randrproto renderproto fixesproto damageproto \
@@ -33,6 +33,7 @@ USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
videoproto compositeproto trapproto recordproto xineramaproto \
xinerama evieproto xfont fontenc xkbui pixman pciaccess
+MAKE_JOBS_UNSAFE= yes
USE_OPENSSL= yes
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xnest \
@@ -135,4 +136,8 @@ pre-everything::
@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
.endif
+.if ${OSVERSION} < 700000
+USE_GCC= 4.2+
+.endif
+
.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 2fd20cdab2a0..d31dc3f6420d 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = eba3748a1f49cec25e058a139bd75a53
-SHA256 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-SIZE (xorg/xserver/xorg-server-1.6.5.tar.bz2) = 4678406
+MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
+SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
+SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h
deleted file mode 100644
index 750ed01f1c59..000000000000
--- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- hw/xfree86/common/compiler.h.orig 2009-02-25 13:12:11.000000000 -0600
-+++ hw/xfree86/common/compiler.h 2009-03-21 02:08:22.000000000 -0500
-@@ -465,7 +465,7 @@
- extern unsigned int inw(unsigned long port);
- extern unsigned int inl(unsigned long port);
-
--# elif defined(linux) && defined(__amd64__)
-+# elif defined(linux) || defined(__FreeBSD__) && defined(__amd64__)
-
- # include <inttypes.h>
-
diff --git a/x11-servers/xorg-server/files/patch-render.c b/x11-servers/xorg-server/files/patch-render.c
deleted file mode 100644
index 17f8b144b1a7..000000000000
--- a/x11-servers/xorg-server/files/patch-render.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- render/render.c.orig Mon May 29 09:43:15 2006
-+++ render/render.c Mon May 29 09:45:02 2006
-@@ -1340,7 +1340,7 @@
- {
- if (buffer + sizeof (GlyphSet) < end)
- {
-- memcpy(&gs, buffer, sizeof(GlyphSet));
-+ gs = *(CARD32 *) buffer;
- glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
- gs,
- GlyphSetType,
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index a3c972d26027..bfce700b066b 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -15,6 +15,7 @@ include/xorg/closure.h
include/xorg/colormap.h
include/xorg/colormapst.h
include/xorg/compiler.h
+include/xorg/compositeext.h
include/xorg/cursor.h
include/xorg/cursorstr.h
include/xorg/damage.h
@@ -33,6 +34,7 @@ include/xorg/dri2.h
include/xorg/dristruct.h
include/xorg/edid.h
include/xorg/exa.h
+include/xorg/events.h
include/xorg/exevents.h
include/xorg/extension.h
include/xorg/extinit.h
@@ -42,6 +44,7 @@ include/xorg/fbdevhw.h
include/xorg/fboverlay.h
include/xorg/fbrop.h
include/xorg/fi1236.h
+include/xorg/fbpict.h
include/xorg/fourcc.h
include/xorg/gc.h
include/xorg/gcstruct.h
@@ -71,9 +74,12 @@ include/xorg/mispans.h
include/xorg/mistruct.h
include/xorg/miwideline.h
include/xorg/mizerarc.h
+include/xorg/mioverlay.h
include/xorg/msp3430.h
include/xorg/opaque.h
include/xorg/os.h
+include/xorg/panoramiXsrv.h
+include/xorg/panoramiX.h
include/xorg/picture.h
include/xorg/picturestr.h
include/xorg/pixmap.h
@@ -109,6 +115,7 @@ include/xorg/validate.h
include/xorg/vbe.h
include/xorg/vbeModes.h
include/xorg/vgaHW.h
+include/xorg/vidmodeproc.h
include/xorg/wfbrename.h
include/xorg/window.h
include/xorg/windowstr.h
@@ -116,6 +123,8 @@ include/xorg/xaa.h
include/xorg/xaaWrapper.h
include/xorg/xaalocal.h
include/xorg/xaarop.h
+include/xorg/xace.h
+include/xorg/xacestr.h
include/xorg/xf86.h
include/xorg/xf86Crtc.h
include/xorg/xf86Cursor.h
@@ -129,15 +138,14 @@ include/xorg/xf86Pci.h
include/xorg/xf86PciInfo.h
include/xorg/xf86Priv.h
include/xorg/xf86Privstr.h
-include/xorg/xf86RAC.h
include/xorg/xf86RandR12.h
include/xorg/xf86RamDac.h
include/xorg/xf86Rename.h
-include/xorg/xf86Resources.h
%%SPARC64%%include/xorg/xf86Sbus.h
include/xorg/xf86Xinput.h
include/xorg/xf86_OSlib.h
include/xorg/xf86_OSproc.h
+include/xorg/xf86VGAarbiter.h
include/xorg/xf86cmap.h
include/xorg/xf86fbman.h
include/xorg/xf86i2c.h
@@ -147,6 +155,7 @@ include/xorg/xf86str.h
include/xorg/xf86xv.h
include/xorg/xf86xvmc.h
include/xorg/xf86xvpriv.h
+include/xorg/xfixes.h
include/xorg/xisb.h
include/xorg/xkbfile.h
include/xorg/xkbrules.h
@@ -157,7 +166,6 @@ include/xorg/xorgVersion.h
include/xorg/xserver-properties.h
include/xorg/xvdix.h
include/xorg/xvmcext.h
-lib/X11/Options
lib/xorg/modules/extensions/libdbe.la
lib/xorg/modules/extensions/libdbe.so
lib/xorg/modules/extensions/libdri.la
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 0668e5a8c599..c413c9758a8e 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-vfbserver
-PORTVERSION= 1.6.5
+PORTVERSION= 1.7.5
PORTEPOCH= 1
CATEGORIES= x11-servers
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index 2fd20cdab2a0..d31dc3f6420d 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = eba3748a1f49cec25e058a139bd75a53
-SHA256 (xorg/xserver/xorg-server-1.6.5.tar.bz2) = f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-SIZE (xorg/xserver/xorg-server-1.6.5.tar.bz2) = 4678406
+MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
+SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
+SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile
index 7faadd106eeb..956ba588fc1c 100644
--- a/x11-themes/xcursor-themes/Makefile
+++ b/x11-themes/xcursor-themes/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xcursor-themes
-PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTVERSION= 1.0.2
CATEGORIES= x11-themes
MAINTAINER= x11@FreeBSD.org
@@ -15,6 +14,8 @@ COMMENT= X.org cursors themes
BUILD_DEPENDS= xcursorgen:${PORTSDIR}/x11/xcursorgen
+USE_XORG= xextproto
+
XORG_CAT= data
.include <bsd.port.mk>
diff --git a/x11-themes/xcursor-themes/distinfo b/x11-themes/xcursor-themes/distinfo
index 2b1db89d316f..8b8c4679c477 100644
--- a/x11-themes/xcursor-themes/distinfo
+++ b/x11-themes/xcursor-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/data/xcursor-themes-1.0.1.tar.bz2) = 014bad415e64c49994679cdb71a97e37
-SHA256 (xorg/data/xcursor-themes-1.0.1.tar.bz2) = 4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0
-SIZE (xorg/data/xcursor-themes-1.0.1.tar.bz2) = 2257899
+MD5 (xorg/data/xcursor-themes-1.0.2.tar.bz2) = e8929a1bb4d98d1a3991fd340d0b5f09
+SHA256 (xorg/data/xcursor-themes-1.0.2.tar.bz2) = 5f798c2f1d2794c09fa0a40700c40359b725107608012866828015dca47514d6
+SIZE (xorg/data/xcursor-themes-1.0.2.tar.bz2) = 2276676
diff --git a/x11-themes/xcursor-themes/pkg-plist b/x11-themes/xcursor-themes/pkg-plist
index 262e31583f29..7b65ac99fe3b 100644
--- a/x11-themes/xcursor-themes/pkg-plist
+++ b/x11-themes/xcursor-themes/pkg-plist
@@ -71,6 +71,7 @@ lib/X11/icons/redglass/cursors/top_right_corner
lib/X11/icons/redglass/cursors/top_side
lib/X11/icons/redglass/cursors/top_tee
lib/X11/icons/redglass/cursors/xterm
+lib/X11/icons/redglass/cursors/watch
lib/X11/icons/whiteglass/cursors/X_cursor
lib/X11/icons/whiteglass/cursors/base_arrow_down
lib/X11/icons/whiteglass/cursors/base_arrow_up
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index b4f75c2ea341..463a8aa9f709 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXaw
-PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.0.7
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index 2c2e16094895..206a0c30b022 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXaw-1.0.5.tar.bz2) = 64e7782db4653cb57c7f7e660b2431c3
-SHA256 (xorg/lib/libXaw-1.0.5.tar.bz2) = 2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d
-SIZE (xorg/lib/libXaw-1.0.5.tar.bz2) = 513408
+MD5 (xorg/lib/libXaw-1.0.7.tar.bz2) = 815e74de989ccda684e2baf8d12cf519
+SHA256 (xorg/lib/libXaw-1.0.7.tar.bz2) = 740aaee9b09586b1c80f80890381c5ee70ea11efa4b6159f707c0f3684c6f328
+SIZE (xorg/lib/libXaw-1.0.7.tar.bz2) = 598661
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index ae9f9425ed95..76dc96bad22d 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -82,4 +82,9 @@ lib/libXaw7.so
lib/libXaw7.so.7
libdata/pkgconfig/xaw6.pc
libdata/pkgconfig/xaw7.pc
-@dirrm include/X11/Xaw
+%%DOCSDIR%%/widgets.html
+%%DOCSDIR%%/widgets.index.ps
+%%DOCSDIR%%/widgets.ps
+%%DOCSDIR%%/widgets.txt
+@dirrmtry %%DOCSDIR%%
+@dirrmtry include/X11/Xaw
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index ae15ab4c5dd2..720c0d2594a5 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXmu
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo
index 98c90347ba31..098b6813f66c 100644
--- a/x11-toolkits/libXmu/distinfo
+++ b/x11-toolkits/libXmu/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXmu-1.0.4.tar.bz2) = fb372a5f3ab42b5ba16d7af4d833a0cb
-SHA256 (xorg/lib/libXmu-1.0.4.tar.bz2) = f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0
-SIZE (xorg/lib/libXmu-1.0.4.tar.bz2) = 305347
+MD5 (xorg/lib/libXmu-1.0.5.tar.bz2) = fc4d66be7a1a1eb474954728415e46d6
+SHA256 (xorg/lib/libXmu-1.0.5.tar.bz2) = 0692b6b0ec1019cfaa8418020b1127bfb0975f5a579a0b1f9eb7fd8f2f7126d7
+SIZE (xorg/lib/libXmu-1.0.5.tar.bz2) = 323286
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index d45808b3863a..de8746588cb3 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXt
-PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.0.7
CATEGORIES= x11-toolkits
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo
index 5f2badbfbee2..fe2a7b4fa91e 100644
--- a/x11-toolkits/libXt/distinfo
+++ b/x11-toolkits/libXt/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXt-1.0.5.tar.bz2) = f3bdd67785ace8cd0b23249e9d8c9975
-SHA256 (xorg/lib/libXt-1.0.5.tar.bz2) = 43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4
-SIZE (xorg/lib/libXt-1.0.5.tar.bz2) = 500502
+MD5 (xorg/lib/libXt-1.0.7.tar.bz2) = 96f3c93434a93186d178b60d4a262496
+SHA256 (xorg/lib/libXt-1.0.7.tar.bz2) = 706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec
+SIZE (xorg/lib/libXt-1.0.7.tar.bz2) = 559875
diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile
index 31edb1f89cc6..63d5858c2a83 100644
--- a/x11-wm/xcompmgr/Makefile
+++ b/x11-wm/xcompmgr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcompmgr
-PORTVERSION= 1.1.4
+PORTVERSION= 1.1.5
CATEGORIES= x11-wm
MAINTAINER= x11@FreeBSD.org
@@ -15,6 +15,8 @@ COMMENT= A sample X compositing manager
XORG_CAT= app
USE_XORG= x11 xcomposite xfixes xdamage xrender
+PLIST_FILES= bin/${PORTNAME}
+
MAN1= xcompmgr.1
.include <bsd.port.mk>
diff --git a/x11-wm/xcompmgr/distinfo b/x11-wm/xcompmgr/distinfo
index f372f9b427ad..f75b0f2b3042 100644
--- a/x11-wm/xcompmgr/distinfo
+++ b/x11-wm/xcompmgr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xcompmgr-1.1.4.tar.bz2) = 3eb1c2b7a6ceaec4ee872cb06d202d91
-SHA256 (xorg/app/xcompmgr-1.1.4.tar.bz2) = 4bf647745b4de940ef75796fc8ad4e1f83c276e474f7b6779f317fcd070de884
-SIZE (xorg/app/xcompmgr-1.1.4.tar.bz2) = 78389
+MD5 (xorg/app/xcompmgr-1.1.5.tar.bz2) = bf8faa8c540bfdcd0252801d8f16d868
+SHA256 (xorg/app/xcompmgr-1.1.5.tar.bz2) = bb20737a6f9e0cdf5cfbd5288b6a9a4b16ca18d2be19444549c1d6be2a90b571
+SIZE (xorg/app/xcompmgr-1.1.5.tar.bz2) = 111538
diff --git a/x11-wm/xcompmgr/pkg-plist b/x11-wm/xcompmgr/pkg-plist
deleted file mode 100644
index 1ee17203bbf1..000000000000
--- a/x11-wm/xcompmgr/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/xcompmgr
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
index bc9a32721fdb..858078de1123 100644
--- a/x11/appres/Makefile
+++ b/x11/appres/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= appres
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/appres/distinfo b/x11/appres/distinfo
index fef58715f111..ba6193bd920d 100644
--- a/x11/appres/distinfo
+++ b/x11/appres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/appres-1.0.1.tar.bz2) = 420e6cdf38bb771ec8b00228bf09e8ff
-SHA256 (xorg/app/appres-1.0.1.tar.bz2) = 15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962
-SIZE (xorg/app/appres-1.0.1.tar.bz2) = 85320
+MD5 (xorg/app/appres-1.0.2.tar.bz2) = 6f2f5d9f41669d498b56d73dc3206951
+SHA256 (xorg/app/appres-1.0.2.tar.bz2) = 37d0fbb16c553fa09878d107f29f26c2ca4206c98dd23c44a0cb670ace531e36
+SIZE (xorg/app/appres-1.0.2.tar.bz2) = 95494
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
index b1d7036899f8..587c2e9eece7 100644
--- a/x11/bigreqsproto/Makefile
+++ b/x11/bigreqsproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bigreqsproto
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo
index b1c8a2736651..f339e050ddf1 100644
--- a/x11/bigreqsproto/distinfo
+++ b/x11/bigreqsproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 95c29d9d10bf2868996c0c47a3b9a8dc
-SHA256 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
-SIZE (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 36676
+MD5 (xorg/proto/bigreqsproto-1.1.0.tar.bz2) = d30c5dbf19ca6dffcd9788227ecff8c5
+SHA256 (xorg/proto/bigreqsproto-1.1.0.tar.bz2) = 4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
+SIZE (xorg/proto/bigreqsproto-1.1.0.tar.bz2) = 48575
diff --git a/x11/bigreqsproto/pkg-plist b/x11/bigreqsproto/pkg-plist
index 1a1af677b0cd..8244fb5a8137 100644
--- a/x11/bigreqsproto/pkg-plist
+++ b/x11/bigreqsproto/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/bigreqsproto.h
include/X11/extensions/bigreqstr.h
libdata/pkgconfig/bigreqsproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index e88e35318ec6..558a99c8bc15 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= bitmap
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bitmap/distinfo b/x11/bitmap/distinfo
index f6dee763e9f8..b8a5dbb0b638 100644
--- a/x11/bitmap/distinfo
+++ b/x11/bitmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/bitmap-1.0.3.tar.bz2) = 98200c358e5401d648b980564d9ae39d
-SHA256 (xorg/app/bitmap-1.0.3.tar.bz2) = 863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
-SIZE (xorg/app/bitmap-1.0.3.tar.bz2) = 129364
+MD5 (xorg/app/bitmap-1.0.4.tar.bz2) = 7d0c1ac193be2491c72a91ccf37ef18e
+SHA256 (xorg/app/bitmap-1.0.4.tar.bz2) = 2517aaa015795a348435e4e83bafe7642d4b2fe1976ee982a5d652cf417f79d8
+SIZE (xorg/app/bitmap-1.0.4.tar.bz2) = 140565
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index d91e3c61957e..495fb0b93553 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= compositeproto
-PORTVERSION= 0.4
+PORTVERSION= 0.4.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
index 163eaf2e50dc..716ffd452d31 100644
--- a/x11/compositeproto/distinfo
+++ b/x11/compositeproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/compositeproto-0.4.tar.bz2) = 6281344d656d4e0c8e9db4918efe3d1d
-SHA256 (xorg/proto/compositeproto-0.4.tar.bz2) = 6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003
-SIZE (xorg/proto/compositeproto-0.4.tar.bz2) = 45390
+MD5 (xorg/proto/compositeproto-0.4.1.tar.bz2) = 3692f3f8b2ea10dff3d2cede8dc65e79
+SHA256 (xorg/proto/compositeproto-0.4.1.tar.bz2) = e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984
+SIZE (xorg/proto/compositeproto-0.4.1.tar.bz2) = 90083
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
index 13fbd41b7039..779e955b278f 100644
--- a/x11/damageproto/Makefile
+++ b/x11/damageproto/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= damageproto
-PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo
index 94794a9b8037..03253db8dc6e 100644
--- a/x11/damageproto/distinfo
+++ b/x11/damageproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/damageproto-1.1.0.tar.bz2) = 33ee591e0b1ca5ad7902934541db7d24
-SHA256 (xorg/proto/damageproto-1.1.0.tar.bz2) = 9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d
-SIZE (xorg/proto/damageproto-1.1.0.tar.bz2) = 41449
+MD5 (xorg/proto/damageproto-1.2.0.tar.bz2) = 434b931b02bd83ed9fc44951df81cdac
+SHA256 (xorg/proto/damageproto-1.2.0.tar.bz2) = a50250770a2eead9d6fd56577e3328d0a6a1c4d425b58faa0f5ca7683169ee8f
+SIZE (xorg/proto/damageproto-1.2.0.tar.bz2) = 53133
diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
index a568291d4cf1..15c4f51a2d55 100644
--- a/x11/dmxproto/Makefile
+++ b/x11/dmxproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= dmxproto
-PORTVERSION= 2.2.2
+PORTVERSION= 2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo
index 9c74d443d02e..368a78d3dce9 100644
--- a/x11/dmxproto/distinfo
+++ b/x11/dmxproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/dmxproto-2.2.2.tar.bz2) = d80acad88411e7944b9b085463d53302
-SHA256 (xorg/proto/dmxproto-2.2.2.tar.bz2) = aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
-SIZE (xorg/proto/dmxproto-2.2.2.tar.bz2) = 39380
+MD5 (xorg/proto/dmxproto-2.3.tar.bz2) = 880a41720b2937e2660dcdc0d34a8791
+SHA256 (xorg/proto/dmxproto-2.3.tar.bz2) = 3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
+SIZE (xorg/proto/dmxproto-2.3.tar.bz2) = 83906
diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist
index 6a6ab38e4e10..98accdce0c96 100644
--- a/x11/dmxproto/pkg-plist
+++ b/x11/dmxproto/pkg-plist
@@ -1,4 +1,4 @@
-include/X11/extensions/dmxext.h
+include/X11/extensions/dmx.h
include/X11/extensions/dmxproto.h
libdata/pkgconfig/dmxproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 53bb0cfcc37f..638ff0f2f76d 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= dri2proto
-PORTVERSION= 2.1
+PORTVERSION= 2.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
index 9cd2c8eb8189..71dc2fb3621b 100644
--- a/x11/dri2proto/distinfo
+++ b/x11/dri2proto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/dri2proto-2.1.tar.bz2) = 5cb7987d29db068153bdc8f23c767c43
-SHA256 (xorg/proto/dri2proto-2.1.tar.bz2) = 2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
-SIZE (xorg/proto/dri2proto-2.1.tar.bz2) = 51362
+MD5 (xorg/proto/dri2proto-2.2.tar.bz2) = 3ca8ddb42cd4ee31b8690031303221af
+SHA256 (xorg/proto/dri2proto-2.2.tar.bz2) = f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1
+SIZE (xorg/proto/dri2proto-2.2.tar.bz2) = 94772
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 389b9c9f9b74..245843f9092c 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= editres
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/editres/distinfo b/x11/editres/distinfo
index 7c38b72c4e1e..a5b442702ae9 100644
--- a/x11/editres/distinfo
+++ b/x11/editres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/editres-1.0.3.tar.bz2) = a25f931cc6c8d03daaed434f5db5df2d
-SHA256 (xorg/app/editres-1.0.3.tar.bz2) = a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae
-SIZE (xorg/app/editres-1.0.3.tar.bz2) = 127231
+MD5 (xorg/app/editres-1.0.4.tar.bz2) = 1800dda934ebb7c588ea686278a10e9f
+SHA256 (xorg/app/editres-1.0.4.tar.bz2) = d7ce4c0bb214e055cb7680d8b88b9f551610fc40c28269cb51649133862f3302
+SIZE (xorg/app/editres-1.0.4.tar.bz2) = 136331
diff --git a/x11/editres/pkg-plist b/x11/editres/pkg-plist
index 1474c4d5fc82..c447ad5d18af 100644
--- a/x11/editres/pkg-plist
+++ b/x11/editres/pkg-plist
@@ -1,5 +1,5 @@
bin/editres
-share/X11/app-defaults/Editres-color
share/X11/app-defaults/Editres
+share/X11/app-defaults/Editres-color
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile
index ef8cde3d8614..f014fc23efd5 100644
--- a/x11/evieext/Makefile
+++ b/x11/evieext/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= evieext
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/evieext/distinfo b/x11/evieext/distinfo
index 6e3bafd63156..01647643b3cb 100644
--- a/x11/evieext/distinfo
+++ b/x11/evieext/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/evieext-1.0.2.tar.bz2) = 2507b5d0f4b2848147fbddd155aa6cfe
-SHA256 (xorg/proto/evieext-1.0.2.tar.bz2) = 0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
-SIZE (xorg/proto/evieext-1.0.2.tar.bz2) = 37534
+MD5 (xorg/proto/evieext-1.1.0.tar.bz2) = 5c74f61d6f77b2e6a083b2b31000be42
+SHA256 (xorg/proto/evieext-1.1.0.tar.bz2) = 47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885
+SIZE (xorg/proto/evieext-1.1.0.tar.bz2) = 48997
diff --git a/x11/evieext/pkg-plist b/x11/evieext/pkg-plist
index b10aee8e8811..203a5e91426e 100644
--- a/x11/evieext/pkg-plist
+++ b/x11/evieext/pkg-plist
@@ -1,3 +1,4 @@
include/X11/extensions/Xeviestr.h
+include/X11/extensions/evieproto.h
libdata/pkgconfig/evieproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
index 3ea2a4e24ebf..45350f54ecab 100644
--- a/x11/fixesproto/Makefile
+++ b/x11/fixesproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fixesproto
-PORTVERSION= 4.0
+PORTVERSION= 4.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo
index 9bca631147e5..fa215cec2baf 100644
--- a/x11/fixesproto/distinfo
+++ b/x11/fixesproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/fixesproto-4.0.tar.bz2) = 8b298cc3424597f8138c7faf7763dce9
-SHA256 (xorg/proto/fixesproto-4.0.tar.bz2) = b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f
-SIZE (xorg/proto/fixesproto-4.0.tar.bz2) = 38550
+MD5 (xorg/proto/fixesproto-4.1.1.tar.bz2) = 4c1cb4f2ed9f34de59f2f04783ca9483
+SHA256 (xorg/proto/fixesproto-4.1.1.tar.bz2) = e72a32916ad4bbd03847f8945c55582bdbafc039d286ded7365d402a7ff164ef
+SIZE (xorg/proto/fixesproto-4.1.1.tar.bz2) = 91338
diff --git a/x11/fixesproto/pkg-plist b/x11/fixesproto/pkg-plist
index f1bec6c8e826..be82504b2f31 100644
--- a/x11/fixesproto/pkg-plist
+++ b/x11/fixesproto/pkg-plist
@@ -1,4 +1,7 @@
include/X11/extensions/xfixesproto.h
include/X11/extensions/xfixeswire.h
libdata/pkgconfig/fixesproto.pc
+%%DOCSDIR%%/fixesproto.txt
+@dirrm %%DOCSDIR%%
@dirrmtry include/X11/extensions
+
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 293db6c256eb..5b82b42dd78b 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glproto
-PORTVERSION= 1.4.10
+PORTVERSION= 1.4.11
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index 7adcc681ec3f..a4adc7a86fff 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/glproto-1.4.10.tar.bz2) = c9f8cebfba72bfab674bc0170551fb8d
-SHA256 (xorg/proto/glproto-1.4.10.tar.bz2) = 7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf
-SIZE (xorg/proto/glproto-1.4.10.tar.bz2) = 67332
+MD5 (xorg/proto/glproto-1.4.11.tar.bz2) = 78e7c4dc7dcb74b1869fee7897e00f59
+SHA256 (xorg/proto/glproto-1.4.11.tar.bz2) = fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451
+SIZE (xorg/proto/glproto-1.4.11.tar.bz2) = 108416
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 5cd0b59d5d8b..4699ed3e42cf 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= iceauth
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo
index 7f8e6e961ded..201ac6b8f701 100644
--- a/x11/iceauth/distinfo
+++ b/x11/iceauth/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/iceauth-1.0.2.tar.bz2) = 7ab8b64edf0212a9d9a3c8129901a450
-SHA256 (xorg/app/iceauth-1.0.2.tar.bz2) = 06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb
-SIZE (xorg/app/iceauth-1.0.2.tar.bz2) = 97052
+MD5 (xorg/app/iceauth-1.0.3.tar.bz2) = 975ade3f238c1eb10705da0a91e6e8e7
+SHA256 (xorg/app/iceauth-1.0.3.tar.bz2) = abca3ff6c9f2da2600a474f0e92ae5e62c43914f7bd3d948b91b0a7f9117d81e
+SIZE (xorg/app/iceauth-1.0.3.tar.bz2) = 106197
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index 4f9336765ec2..d64ee328b583 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= inputproto
-PORTVERSION= 1.5.0
+PORTVERSION= 2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
index 2488042f8d40..3ca4f2ab2ddd 100644
--- a/x11/inputproto/distinfo
+++ b/x11/inputproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/inputproto-1.5.0.tar.bz2) = dcc36554aea1338b3813943daf1e9988
-SHA256 (xorg/proto/inputproto-1.5.0.tar.bz2) = ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
-SIZE (xorg/proto/inputproto-1.5.0.tar.bz2) = 57358
+MD5 (xorg/proto/inputproto-2.0.tar.bz2) = 0f7acbc14a082f9ae03744396527d23d
+SHA256 (xorg/proto/inputproto-2.0.tar.bz2) = 472f57f7928ab20a1303a25982c4091db9674c2729bbd692c9a7204e23ea1af4
+SIZE (xorg/proto/inputproto-2.0.tar.bz2) = 140071
diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist
index 7f234dc66b02..8ed21c47ef29 100644
--- a/x11/inputproto/pkg-plist
+++ b/x11/inputproto/pkg-plist
@@ -1,5 +1,6 @@
include/X11/extensions/XI.h
-include/X11/extensions/XInput.h
+include/X11/extensions/XI2.h
+include/X11/extensions/XI2proto.h
include/X11/extensions/XIproto.h
libdata/pkgconfig/inputproto.pc
-@dirrmtry include/X11/extensions
+@dirrmtry include/X11/extensions \ No newline at end of file
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
index ba1da4fb0d31..c9bbfc0d25f9 100644
--- a/x11/kbproto/Makefile
+++ b/x11/kbproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kbproto
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo
index 8d4d2db92fc7..30c2135b94e9 100644
--- a/x11/kbproto/distinfo
+++ b/x11/kbproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/kbproto-1.0.3.tar.bz2) = 6092cdb0a1225f95356ddbe6c2abaad5
-SHA256 (xorg/proto/kbproto-1.0.3.tar.bz2) = 7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df
-SIZE (xorg/proto/kbproto-1.0.3.tar.bz2) = 57440
+MD5 (xorg/proto/kbproto-1.0.4.tar.bz2) = 7f439166a9b2bf81471a33951883019f
+SHA256 (xorg/proto/kbproto-1.0.4.tar.bz2) = 1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c
+SIZE (xorg/proto/kbproto-1.0.4.tar.bz2) = 104959
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index b186082dccb1..d2051d568cb0 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libICE
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.6
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo
index a4f6ed9128ca..a83bf7400aeb 100644
--- a/x11/libICE/distinfo
+++ b/x11/libICE/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libICE-1.0.4.tar.bz2) = 4ab4e67e0b8845aa201e984153087f4a
-SHA256 (xorg/lib/libICE-1.0.4.tar.bz2) = 13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04
-SIZE (xorg/lib/libICE-1.0.4.tar.bz2) = 252304
+MD5 (xorg/lib/libICE-1.0.6.tar.bz2) = 2d39bc924af24325dae589e9a849180c
+SHA256 (xorg/lib/libICE-1.0.6.tar.bz2) = a8346859505d2aa27ecc4531f1c86d72801936d96c31c5beaeff4587441b568b
+SIZE (xorg/lib/libICE-1.0.6.tar.bz2) = 279257
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 36215b86fdc1..758d90f25dbe 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libSM
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo
index fdaef1635659..424f4737bdf0 100644
--- a/x11/libSM/distinfo
+++ b/x11/libSM/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libSM-1.1.0.tar.bz2) = 05a04c2b6382fb0054f6c70494e22733
-SHA256 (xorg/lib/libSM-1.1.0.tar.bz2) = 7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
-SIZE (xorg/lib/libSM-1.1.0.tar.bz2) = 252599
+MD5 (xorg/lib/libSM-1.1.1.tar.bz2) = 6889a455496aaaa65b1fa05fc518d179
+SHA256 (xorg/lib/libSM-1.1.1.tar.bz2) = f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0
+SIZE (xorg/lib/libSM-1.1.1.tar.bz2) = 262305
diff --git a/x11/libSM/files/patch-configure.ac b/x11/libSM/files/patch-configure.ac
deleted file mode 100644
index 2fe7d332d26a..000000000000
--- a/x11/libSM/files/patch-configure.ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.ac.orig 2008-07-02 21:58:05.000000000 +0400
-+++ configure.ac 2009-02-23 18:50:18.000000000 +0300
-@@ -35,10 +35,13 @@
- # Needed to check for TCP & IPv6 support and set flags appropriately
- XTRANS_CONNECTION_FLAGS
-
-+AC_ARG_WITH(stduuid, AC_HELP_STRING([--with-stduuid], [Build with DCE 1.1 uuid support for client IDs]))
-+AM_CONDITIONAL(WITH_STDUUID, test x"$with_stduuid" != "xno")
-+
- AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs]))
--AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" != xno)
-+AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno")
-
--if test x"$with_libuuid" != xno; then
-+if test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno"; then
- PKG_CHECK_MODULES(LIBUUID, uuid)
- fi
-
diff --git a/x11/libSM/files/patch-src_Makefile.am b/x11/libSM/files/patch-src_Makefile.am
deleted file mode 100644
index 7a855fab2e0d..000000000000
--- a/x11/libSM/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.am.orig 2008-06-24 21:09:29.000000000 +0400
-+++ src/Makefile.am 2009-02-23 18:48:20.000000000 +0300
-@@ -2,6 +2,10 @@
-
- AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS)
-
-+if WITH_STDUUID
-+AM_CFLAGS += -DHAVE_STDUUID
-+endif
-+
- if WITH_LIBUUID
- AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
- endif
diff --git a/x11/libSM/files/patch-src_sm_genid.c b/x11/libSM/files/patch-src_sm_genid.c
deleted file mode 100644
index 2d685115acdb..000000000000
--- a/x11/libSM/files/patch-src_sm_genid.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/sm_genid.c.orig 2008-06-24 21:11:27.000000000 +0400
-+++ src/sm_genid.c 2009-02-23 18:51:22.000000000 +0300
-@@ -76,7 +76,9 @@
- #define TCPCONN
- #endif
-
--#if defined(HAVE_LIBUUID)
-+#if defined(HAVE_STDUUID)
-+#include <uuid.h>
-+#elif defined(HAVE_LIBUUID)
- #include <uuid/uuid.h>
- #endif
-
-@@ -85,7 +87,28 @@
- SmsGenerateClientID (smsConn)
- SmsConn smsConn;
- {
--#if defined(HAVE_LIBUUID)
-+#if defined(HAVE_STDUUID)
-+ char *id;
-+ char *str;
-+ uuid_t uuid;
-+ uint32_t status;
-+
-+ uuid_create(&uuid, &status);
-+ if (status != uuid_s_ok)
-+ return NULL;
-+
-+ uuid_to_string(&uuid, &str, &status);
-+ if (status != uuid_s_ok)
-+ return NULL;
-+
-+ if ((id = malloc (strlen (str) + 2)) != NULL) {
-+ id[0] = '2';
-+ strcpy(&id[1], str);
-+ }
-+ free(str);
-+
-+ return id;
-+#elif defined(HAVE_LIBUUID)
- char *id;
- char temp[256];
- uuid_t uuid;
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d0bcf1ca34bf..fcd11438971f 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libX11
-PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.3.3
PORTEPOCH= 1
CATEGORIES= x11
@@ -26,6 +25,7 @@ ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
--with-xcb=yes
+CONFIGURE_ENV+= ac_cv_path_PS2PDF=""
.include "${.CURDIR}/manpages"
.include <bsd.port.mk>
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 7f8cc3e502e3..f45af2697f1e 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libX11-1.2.1.tar.bz2) = 2f2beb98e71f397e1209beaca4e97cb1
-SHA256 (xorg/lib/libX11-1.2.1.tar.bz2) = d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
-SIZE (xorg/lib/libX11-1.2.1.tar.bz2) = 1798407
+MD5 (xorg/lib/libX11-1.3.3.tar.bz2) = 5d74971360f194ce33d2bd2e4d9b066c
+SHA256 (xorg/lib/libX11-1.3.3.tar.bz2) = 8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac
+SIZE (xorg/lib/libX11-1.3.3.tar.bz2) = 2166076
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
index fce86a29b4d6..57f14cdff6e6 100644
--- a/x11/libX11/manpages
+++ b/x11/libX11/manpages
@@ -207,6 +207,7 @@ XFree.3 \
XFreeColormap.3 \
XFreeColors.3 \
XFreeCursor.3 \
+XFreeEventData.3 \
XFreeExtensionList.3 \
XFreeFont.3 \
XFreeFontInfo.3 \
@@ -219,10 +220,12 @@ XFreePixmap.3 \
XFreeStringList.3 \
XGCValues.3 \
XGContextFromGC.3 \
+XGenericEventCookie.3 \
XGetAtomName.3 \
XGetAtomNames.3 \
XGetClassHint.3 \
XGetCommand.3 \
+XGetEventData.3 \
XGetErrorDatabaseText.3 \
XGetErrorText.3 \
XGetFontPath.3 \
@@ -812,3 +815,5 @@ XwcTextExtents.3 \
XwcTextListToTextProperty.3 \
XwcTextPerCharExtents.3 \
XwcTextPropertyToTextList.3
+MAN5= \
+Compose.5 \
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index 37e21cee9093..d304d0ab3c7c 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -1,3 +1,18 @@
+%%DOCSDIR%%/libX11.txt
+%%DOCSDIR%%/libX11.ps
+%%DOCSDIR%%/libX11.html
+%%DOCSDIR%%/Framework.txt
+%%DOCSDIR%%/LocaleDB.txt
+%%DOCSDIR%%/Trans.txt
+%%DOCSDIR%%/Framework.ps
+%%DOCSDIR%%/LocaleDB.ps
+%%DOCSDIR%%/Trans.ps
+%%DOCSDIR%%/Framework.html
+%%DOCSDIR%%/LocaleDB.html
+%%DOCSDIR%%/Trans.html
+%%DOCSDIR%%/xim.txt
+%%DOCSDIR%%/xim.ps
+%%DOCSDIR%%/xim.html
include/X11/ImUtil.h
include/X11/XKBlib.h
include/X11/Xcms.h
@@ -206,6 +221,7 @@ lib/X11/locale/zh_TW.UTF-8/Compose
lib/X11/locale/locale.alias
lib/X11/locale/locale.dir
lib/X11/locale/compose.dir
+@dirrmtry %%DOCSDIR%%
@dirrm lib/X11/locale/zh_TW.UTF-8
@dirrm lib/X11/locale/zh_TW.big5
@dirrm lib/X11/locale/zh_HK.UTF-8
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 4a8704ce1f86..028d7174a5ad 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXScrnSaver
-PORTVERSION= 1.1.3
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
index 401b30f193b1..63ce298845b5 100644
--- a/x11/libXScrnSaver/distinfo
+++ b/x11/libXScrnSaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 93f84b6797f2f29cae1ce23b0355d00d
-SHA256 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988
-SIZE (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 219568
+MD5 (xorg/lib/libXScrnSaver-1.2.0.tar.bz2) = 33e54f64b55f22d8bbe822a5b62568cb
+SHA256 (xorg/lib/libXScrnSaver-1.2.0.tar.bz2) = 5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85
+SIZE (xorg/lib/libXScrnSaver-1.2.0.tar.bz2) = 248744
diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist
index 508ec72f3e26..98c944fc81fe 100644
--- a/x11/libXScrnSaver/pkg-plist
+++ b/x11/libXScrnSaver/pkg-plist
@@ -1,5 +1,8 @@
+include/X11/extensions/scrnsaver.h
lib/libXss.so.1
lib/libXss.so
lib/libXss.la
lib/libXss.a
libdata/pkgconfig/xscrnsaver.pc
+@dirrmtry include/X11/extensions
+
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index f7494c8bd50f..40543be06354 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXau
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index 9f908d675730..9befc51bb79e 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXau-1.0.4.tar.bz2) = 0f2b88d857e0a3f5898e4759c541af46
-SHA256 (xorg/lib/libXau-1.0.4.tar.bz2) = 10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c
-SIZE (xorg/lib/libXau-1.0.4.tar.bz2) = 227753
+MD5 (xorg/lib/libXau-1.0.5.tar.bz2) = 993b3185c629e4b89401fca072dcb663
+SHA256 (xorg/lib/libXau-1.0.5.tar.bz2) = a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
+SIZE (xorg/lib/libXau-1.0.5.tar.bz2) = 249998
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index eb8ab75eaa6c..0fa753492499 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXcomposite
-PORTVERSION= 0.4.0
+PORTVERSION= 0.4.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index 7f7a424888e1..6285cb28bddd 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 7e95395dea89be21bae929b9b7f16641
-SHA256 (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510
-SIZE (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 217145
+MD5 (xorg/lib/libXcomposite-0.4.1.tar.bz2) = 0f1367f57fdf5df17a8dd71d0fa68248
+SHA256 (xorg/lib/libXcomposite-0.4.1.tar.bz2) = 3715a25565222d8eb0468805db1113b514128ee5e9bc6908400f189f680d7a13
+SIZE (xorg/lib/libXcomposite-0.4.1.tar.bz2) = 249284
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 0c031f6e7a33..4101cf19b9eb 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME= libXcursor
-PORTVERSION= 1.1.9
-PORTREVISION= 1
+PORTVERSION= 1.1.10
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X client-side cursor loading library
XORG_CAT= lib
-USE_XORG= xrender x11 xfixes fixesproto xproto:both
+USE_XORG= xrender x11 xfixes fixesproto xproto:both \
+ xextproto
CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons
diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo
index 459db7d00f82..b2154aac90d6 100644
--- a/x11/libXcursor/distinfo
+++ b/x11/libXcursor/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXcursor-1.1.9.tar.bz2) = 99b7554037a92b260891091e81815a0a
-SHA256 (xorg/lib/libXcursor-1.1.9.tar.bz2) = 1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4
-SIZE (xorg/lib/libXcursor-1.1.9.tar.bz2) = 234749
+MD5 (xorg/lib/libXcursor-1.1.10.tar.bz2) = 7dcdad1c10daea872cb3355af414b2ca
+SHA256 (xorg/lib/libXcursor-1.1.10.tar.bz2) = b9446df62203f2c3204b6bcc0057dc909d0dc792f0dd97bc491581b08be36cbd
+SIZE (xorg/lib/libXcursor-1.1.10.tar.bz2) = 264543
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 9b11eb0ff0de..0b3799832d35 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXdamage
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index de3ea7517055..b36c4fc3495f 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXdamage-1.1.1.tar.bz2) = ac0ce6b0063a9858c8f24ddb4c60487d
-SHA256 (xorg/lib/libXdamage-1.1.1.tar.bz2) = 0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e
-SIZE (xorg/lib/libXdamage-1.1.1.tar.bz2) = 201096
+MD5 (xorg/lib/libXdamage-1.1.2.tar.bz2) = b42780bce703ec202a33e5693991c09d
+SHA256 (xorg/lib/libXdamage-1.1.2.tar.bz2) = a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a
+SIZE (xorg/lib/libXdamage-1.1.2.tar.bz2) = 238443
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index d69f768f7755..04edd136738d 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXdmcp
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index 65cc796890cf..40306e8c49d3 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 10facf2bc7cbd5e5c1a698b8a210a582
-SHA256 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8
-SIZE (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 220946
+MD5 (xorg/lib/libXdmcp-1.0.3.tar.bz2) = d60941d471800f41a3f19b24bea855a7
+SHA256 (xorg/lib/libXdmcp-1.0.3.tar.bz2) = d8033a2fae20fed6de4f16b73ad69ca1c511e7da31c88e9bc6e75976187378cb
+SIZE (xorg/lib/libXdmcp-1.0.3.tar.bz2) = 256963
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 272d3c45139b..afed4dc10da7 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXext
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 3b67bac63dcc..2c515cd352d8 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXext-1.0.5.tar.bz2) = aa11d859cc8e9a0bad3bb55e1666547b
-SHA256 (xorg/lib/libXext-1.0.5.tar.bz2) = 1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
-SIZE (xorg/lib/libXext-1.0.5.tar.bz2) = 271301
+MD5 (xorg/lib/libXext-1.1.1.tar.bz2) = c417c0e8df39a067f90a2a2e7133637d
+SHA256 (xorg/lib/libXext-1.1.1.tar.bz2) = 110ce3bc7fb3a86659556994d0801c74bedcbd8ba8d1f90ee33d4c47a91e9bb3
+SIZE (xorg/lib/libXext-1.1.1.tar.bz2) = 318737
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index 4e47d7451237..d25c0db798c7 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -2,4 +2,24 @@ lib/libXext.a
lib/libXext.la
lib/libXext.so
lib/libXext.so.6
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xext.h
+include/X11/extensions/Xge.h
+include/X11/extensions/dpms.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/security.h
+include/X11/extensions/shape.h
+include/X11/extensions/sync.h
+include/X11/extensions/xtestext1.h
libdata/pkgconfig/xext.pc
+@dirrmtry include/X11/extensions \ No newline at end of file
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index ac3d0cc4ba1b..832b47796c86 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXfixes
-PORTVERSION= 4.0.3
-PORTREVISION= 1
+PORTVERSION= 4.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXfixes/distinfo b/x11/libXfixes/distinfo
index 7c852b9d00ab..59c648beff39 100644
--- a/x11/libXfixes/distinfo
+++ b/x11/libXfixes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 1990d19725a3c7f32290037f02d3737f
-SHA256 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd
-SIZE (xorg/lib/libXfixes-4.0.3.tar.bz2) = 214287
+MD5 (xorg/lib/libXfixes-4.0.4.tar.bz2) = 7f2c40852eb337b237ad944ca5c30d49
+SHA256 (xorg/lib/libXfixes-4.0.4.tar.bz2) = ba31d7e5c5c1907c30cba50bfd669aa7fe860555287c29f6e786612e4be33b48
+SIZE (xorg/lib/libXfixes-4.0.4.tar.bz2) = 246305
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index bb301a30f0a2..9b81e4cd7ea4 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXi
-PORTVERSION= 1.2.1
+PORTVERSION= 1.3
PORTEPOCH= 1
CATEGORIES= x11
@@ -16,46 +16,4 @@ COMMENT= X Input extension library
XORG_CAT= lib
USE_XORG= xproto x11 xext xextproto inputproto:both
-MAN3= XAllowDeviceEvents.3 \
- XChangeDeviceControl.3 \
- XChangeDeviceDontPropagateList.3 \
- XChangeDeviceKeyMapping.3 \
- XChangeDeviceProperty.3 \
- XChangeFeedbackControl.3 \
- XChangeKeyboardDevice.3 \
- XChangePointerDevice.3 \
- XCloseDevice.3 \
- XDeleteDeviceProperty.3 \
- XDeviceBell.3 \
- XDeviceTimeCoord.3 \
- XFreeDeviceList.3 \
- XGetDeviceControl.3 \
- XGetDeviceKeyMapping.3 \
- XGetDeviceModifierMapping.3 \
- XGetDeviceMotionEvents.3 \
- XGetDeviceProperty.3 \
- XGetExtensionVersion.3 \
- XGetFeedbackControl.3 \
- XGetDeviceButtonMapping.3 \
- XGetDeviceDontPropagateList.3 \
- XGetDeviceFocus.3 \
- XGetSelectedExtensionEvents.3 \
- XGrabDevice.3 \
- XGrabDeviceButton.3 \
- XGrabDeviceKey.3 \
- XListDeviceProperties.3 \
- XListInputDevices.3 \
- XOpenDevice.3 \
- XQueryDeviceState.3 \
- XSelectExtensionEvent.3 \
- XSendExtensionEvent.3 \
- XSetDeviceButtonMapping.3 \
- XSetDeviceFocus.3 \
- XSetDeviceMode.3 \
- XSetDeviceModifierMapping.3 \
- XSetDeviceValuators.3 \
- XUngrabDeviceButton.3 \
- XUngrabDeviceKey.3 \
- XUngrabDevice.3 \
-
.include <bsd.port.mk>
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 7f2988b0b8cc..02a33ca8c6ae 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXi-1.2.1.tar.bz2) = cfb36307e8e7ffafe40848dba24e0b11
-SHA256 (xorg/lib/libXi-1.2.1.tar.bz2) = a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
-SIZE (xorg/lib/libXi-1.2.1.tar.bz2) = 279752
+MD5 (xorg/lib/libXi-1.3.tar.bz2) = 8df4ece9bd1efb02c28acb2b6f485e09
+SHA256 (xorg/lib/libXi-1.3.tar.bz2) = 362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b
+SIZE (xorg/lib/libXi-1.3.tar.bz2) = 350827
diff --git a/x11/libXi/pkg-plist b/x11/libXi/pkg-plist
index e1cbeac40e06..0f704e228faf 100644
--- a/x11/libXi/pkg-plist
+++ b/x11/libXi/pkg-plist
@@ -1,5 +1,8 @@
+include/X11/extensions/XInput.h
+include/X11/extensions/XInput2.h
lib/libXi.a
lib/libXi.la
lib/libXi.so
lib/libXi.so.6
libdata/pkgconfig/xi.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 70b0496790c4..a38a7dab2b11 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXinerama
-PORTVERSION= 1.0.3
+PORTVERSION= 1.1
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo
index 0955c5e2ae1c..6bd493ea9385 100644
--- a/x11/libXinerama/distinfo
+++ b/x11/libXinerama/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXinerama-1.0.3.tar.bz2) = cd9f7c46439ac40e0517a302d2434d2c
-SHA256 (xorg/lib/libXinerama-1.0.3.tar.bz2) = 07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
-SIZE (xorg/lib/libXinerama-1.0.3.tar.bz2) = 236386
+MD5 (xorg/lib/libXinerama-1.1.tar.bz2) = a2ac01fc0426cdbb713c5d59cf9955ed
+SHA256 (xorg/lib/libXinerama-1.1.tar.bz2) = e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34
+SIZE (xorg/lib/libXinerama-1.1.tar.bz2) = 245133
diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist
index 9915dec27089..ff8b840ac2d8 100644
--- a/x11/libXinerama/pkg-plist
+++ b/x11/libXinerama/pkg-plist
@@ -1,5 +1,8 @@
+include/X11/extensions/Xinerama.h
+include/X11/extensions/panoramiXext.h
lib/libXinerama.a
lib/libXinerama.la
lib/libXinerama.so
lib/libXinerama.so.1
libdata/pkgconfig/xinerama.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 553f8ff678d6..b8c6871d7660 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXrender
-PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTVERSION= 0.9.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo
index 61d5242d086b..50d7466ca8e4 100644
--- a/x11/libXrender/distinfo
+++ b/x11/libXrender/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXrender-0.9.4.tar.bz2) = dc266e850c51368f964e0d67bf5fb5e6
-SHA256 (xorg/lib/libXrender-0.9.4.tar.bz2) = 5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec
-SIZE (xorg/lib/libXrender-0.9.4.tar.bz2) = 226512
+MD5 (xorg/lib/libXrender-0.9.5.tar.bz2) = 276dd9e85daf0680616cd9f132b354c9
+SHA256 (xorg/lib/libXrender-0.9.5.tar.bz2) = bc0590438a4be2b674cbac6f4ad46e5a89acd02aa94817da0fa8eb3ef05ed5d5
+SIZE (xorg/lib/libXrender-0.9.5.tar.bz2) = 261483
diff --git a/x11/libXrender/pkg-plist b/x11/libXrender/pkg-plist
index 08f3673bf8de..ea82f6f49779 100644
--- a/x11/libXrender/pkg-plist
+++ b/x11/libXrender/pkg-plist
@@ -4,3 +4,6 @@ lib/libXrender.la
lib/libXrender.so
lib/libXrender.so.1
libdata/pkgconfig/xrender.pc
+%%DOCSDIR%%/libXrender.txt
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/extensions
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 6174f57faa5a..e67698bb6b59 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXres
-PORTVERSION= 1.0.3
-PORTREVISION= 3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXres/distinfo b/x11/libXres/distinfo
index 71c6e58e9d51..f9d2f9871b22 100644
--- a/x11/libXres/distinfo
+++ b/x11/libXres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXres-1.0.3.tar.bz2) = de66ffb657aba64c9d6dbdeabb757f3e
-SHA256 (xorg/lib/libXres-1.0.3.tar.bz2) = a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230
-SIZE (xorg/lib/libXres-1.0.3.tar.bz2) = 218203
+MD5 (xorg/lib/libXres-1.0.4.tar.bz2) = 4daf91f93d924e693f6f6ed276791be2
+SHA256 (xorg/lib/libXres-1.0.4.tar.bz2) = 457f567a70ef8798cfb32f897ffa52c3f010923b07414b3a42277f56877572df
+SIZE (xorg/lib/libXres-1.0.4.tar.bz2) = 249779
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 98d0dda564d7..6400ec95a453 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -6,27 +6,15 @@
#
PORTNAME= libXtst
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X Test extension
XORG_CAT= lib
-USE_XORG= x11 xext recordproto:both xextproto inputproto:both
+USE_XORG= x11 xext recordproto:both xextproto inputproto:both \
+ xi
USE_AUTOTOOLS= libtool:22
-MAN3= XTestQueryExtension.3 \
- XTestCompareCursorWithWindow.3 \
- XTestCompareCurrentCursorWithWindow.3 \
- XTestFakeKeyEvent.3 \
- XTestFakeButtonEvent.3 \
- XTestFakeMotionEvent.3 \
- XTestFakeRelativeMotionEvent.3 \
- XTestGrabControl.3 \
- XTestSetGContextOfGC.3 \
- XTestSetVisualIDOfVisual.3 \
- XTestDiscard.3
-
.include <bsd.port.mk>
diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo
index 1bbf04582e3a..cb8096294360 100644
--- a/x11/libXtst/distinfo
+++ b/x11/libXtst/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXtst-1.0.3.tar.bz2) = 090c1ad04e34982eada5cf3b1a0792fd
-SHA256 (xorg/lib/libXtst-1.0.3.tar.bz2) = b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905
-SIZE (xorg/lib/libXtst-1.0.3.tar.bz2) = 224637
+MD5 (xorg/lib/libXtst-1.1.0.tar.bz2) = dd6f3e20b87310187121539f9605d977
+SHA256 (xorg/lib/libXtst-1.1.0.tar.bz2) = bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26
+SIZE (xorg/lib/libXtst-1.1.0.tar.bz2) = 256889
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
index 03c03012321d..9c3e055d2f42 100644
--- a/x11/libXtst/pkg-plist
+++ b/x11/libXtst/pkg-plist
@@ -1,6 +1,9 @@
+include/X11/extensions/XTest.h
+include/X11/extensions/record.h
lib/libXtst.a
lib/libXtst.la
lib/libXtst.so
lib/libXtst.so.6
libdata/pkgconfig/xtst.pc
@dirrmtry include/X11/extensions
+
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 6924e39ca93d..149117f450de 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXv
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
PORTEPOCH= 1
CATEGORIES= x11
@@ -19,10 +19,13 @@ USE_XORG= x11 xext xextproto videoproto:both xproto:both
MAN3= Xv.3 \
XvFreeAdaptorInfo.3 \
XvFreeEncodingInfo.3 \
+ XvCreateImage.3 \
XvGetPortAttribute.3 \
XvGetStill.3 \
XvGetVideo.3 \
XvGrabPort.3 \
+ XvListImageFormats.3 \
+ XvPutImage.3 \
XvPortNotify.3 \
XvPutStill.3 \
XvPutVideo.3 \
@@ -30,9 +33,12 @@ MAN3= Xv.3 \
XvQueryBestSize.3 \
XvQueryEncodings.3 \
XvQueryExtension.3 \
+ XvQueryPortAttributes.3 \
XvSelectPortNotify.3 \
XvSelectVideoNotify.3 \
XvSetPortAttribute.3 \
+ XvShmCreateImage.3 \
+ XvShmPutImage.3 \
XvStopVideo.3 \
XvUngrabPort.3 \
XvVideoNotify.3
diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo
index 839e7857cf8b..cfe86c732ed8 100644
--- a/x11/libXv/distinfo
+++ b/x11/libXv/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXv-1.0.4.tar.bz2) = 723a0275227165383e967a1ca8899b52
-SHA256 (xorg/lib/libXv-1.0.4.tar.bz2) = 4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8
-SIZE (xorg/lib/libXv-1.0.4.tar.bz2) = 229227
+MD5 (xorg/lib/libXv-1.0.5.tar.bz2) = 1d97798b1d8bbf8d9085e1b223a0738f
+SHA256 (xorg/lib/libXv-1.0.5.tar.bz2) = d549afdf22feefb97cca85dee12242af9f08c4d2435255dc7c30bd17d1d96010
+SIZE (xorg/lib/libXv-1.0.5.tar.bz2) = 267466
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index d5c4d3a38ac0..fdbeac00c3b5 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXvMC
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo
index d29fc2e6aff9..770100ceb6ba 100644
--- a/x11/libXvMC/distinfo
+++ b/x11/libXvMC/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXvMC-1.0.4.tar.bz2) = b54600573daf9d1a29b952e8d35b389e
-SHA256 (xorg/lib/libXvMC-1.0.4.tar.bz2) = 1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
-SIZE (xorg/lib/libXvMC-1.0.4.tar.bz2) = 225137
+MD5 (xorg/lib/libXvMC-1.0.5.tar.bz2) = 16c3a11add14979beb7510e44623cac6
+SHA256 (xorg/lib/libXvMC-1.0.5.tar.bz2) = 0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f
+SIZE (xorg/lib/libXvMC-1.0.5.tar.bz2) = 256570
diff --git a/x11/libXvMC/pkg-plist b/x11/libXvMC/pkg-plist
index 83c0a166cc5d..b22d278a2167 100644
--- a/x11/libXvMC/pkg-plist
+++ b/x11/libXvMC/pkg-plist
@@ -8,3 +8,6 @@ lib/libXvMCW.la
lib/libXvMCW.so
lib/libXvMCW.so.1
libdata/pkgconfig/xvmc.pc
+%%DOCSDIR%%/XvMC_API.txt
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/extensions
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index c81cd3802e59..74d1d56312e5 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXxf86dga
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo
index 26caf50e6b9c..89cde8234c9b 100644
--- a/x11/libXxf86dga/distinfo
+++ b/x11/libXxf86dga/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 6f5f621804ee652b6cc6f2025c517c78
-SHA256 (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25
-SIZE (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 217092
+MD5 (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 368837d3d7a4d3b4f70be48383e3544e
+SHA256 (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616
+SIZE (xorg/lib/libXxf86dga-1.1.1.tar.bz2) = 254317
diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist
index 6c9724d75e96..77c173b86ef7 100644
--- a/x11/libXxf86dga/pkg-plist
+++ b/x11/libXxf86dga/pkg-plist
@@ -1,3 +1,5 @@
+include/X11/extensions/Xxf86dga.h
+include/X11/extensions/xf86dga1.h
lib/libXxf86dga.a
lib/libXxf86dga.la
lib/libXxf86dga.so
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index 2476778b3bea..59881e413b6b 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXxf86misc
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86misc/distinfo b/x11/libXxf86misc/distinfo
index 91cdedeaf6ab..5aee8054c5a6 100644
--- a/x11/libXxf86misc/distinfo
+++ b/x11/libXxf86misc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 7cee0df63903cef7f7a3fb68cdd99eef
-SHA256 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
-SIZE (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 222736
+MD5 (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 51fed53e8de067d4b8666f75a0212400
+SHA256 (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 8e64b6b1bf34fcd112b1fd866d77e110b47794e825a996e4492c0ee408957cb3
+SIZE (xorg/lib/libXxf86misc-1.0.2.tar.bz2) = 246038
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index f164840f92e2..1eed4e6f34b3 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXxf86vm
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
index 5f6d92ebe9ea..020d4acf10c9 100644
--- a/x11/libXxf86vm/distinfo
+++ b/x11/libXxf86vm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 304d37bd0a10d9b58aa9b64469ad73e5
-SHA256 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
-SIZE (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 240637
+MD5 (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = b431ad7084e1055fef99a9115237edd8
+SHA256 (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = 7cc5e577b337c5267f4e65741f27229111ada8cb833e24b47713a683e8838de8
+SIZE (xorg/lib/libXxf86vm-1.1.0.tar.bz2) = 248769
diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist
index ae0c9e9b2ed5..17f8d37f31b7 100644
--- a/x11/libXxf86vm/pkg-plist
+++ b/x11/libXxf86vm/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/xf86vmode.h
lib/libXxf86vm.a
lib/libXxf86vm.la
lib/libXxf86vm.so
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 31f854975596..8870929611ef 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libdmx
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo
index 8131963fa474..bbe5bd0072b1 100644
--- a/x11/libdmx/distinfo
+++ b/x11/libdmx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libdmx-1.0.2.tar.bz2) = 4d866967210d06098fc9f302ed4c79b1
-SHA256 (xorg/lib/libdmx-1.0.2.tar.bz2) = fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
-SIZE (xorg/lib/libdmx-1.0.2.tar.bz2) = 231083
+MD5 (xorg/lib/libdmx-1.1.0.tar.bz2) = a2fcf0382837888d3781b714489a8999
+SHA256 (xorg/lib/libdmx-1.1.0.tar.bz2) = 1904a8f848cc5d76105cb07707890aca095540a37fb0a63d359f71da51d3e2d5
+SIZE (xorg/lib/libdmx-1.1.0.tar.bz2) = 252069
diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist
index 1d6c42c745e2..933f89e9c78f 100644
--- a/x11/libdmx/pkg-plist
+++ b/x11/libdmx/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/dmxext.h
lib/libdmx.a
lib/libdmx.la
lib/libdmx.so
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index a51273a6dfc8..e98cafed69bf 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxkbfile
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo
index 106e9f45c522..5d203d729b48 100644
--- a/x11/libxkbfile/distinfo
+++ b/x11/libxkbfile/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0726a845fe5a56551de2718c9f6b0e35
-SHA256 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f
-SIZE (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 259790
+MD5 (xorg/lib/libxkbfile-1.0.6.tar.bz2) = b01156e263eca8177e6b7f10441951c4
+SHA256 (xorg/lib/libxkbfile-1.0.6.tar.bz2) = 2ca43c1f6b2782994167a328471aa859d366cd7303c6dcbc8bda951a84a06039
+SIZE (xorg/lib/libxkbfile-1.0.6.tar.bz2) = 285307
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index a2722836ff4f..8dd7ae4457ac 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= listres
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/listres/distinfo b/x11/listres/distinfo
index 0670e158e3e4..df102269bd44 100644
--- a/x11/listres/distinfo
+++ b/x11/listres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/listres-1.0.1.tar.bz2) = 827a1ac5adf9aadd0c13b54a897e297b
-SHA256 (xorg/app/listres-1.0.1.tar.bz2) = 7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3
-SIZE (xorg/app/listres-1.0.1.tar.bz2) = 76709
+MD5 (xorg/app/listres-1.0.2.tar.bz2) = 3c0d5d8d6abaf411cd0647bc7073ac38
+SHA256 (xorg/app/listres-1.0.2.tar.bz2) = 4d9e24b95619bc961936d241106ffcc483995de55629567113ad78ba0b37ffb7
+SIZE (xorg/app/listres-1.0.2.tar.bz2) = 101937
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
index 16fca9ba908e..01cc31db8bc1 100644
--- a/x11/luit/Makefile
+++ b/x11/luit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= luit
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/luit/distinfo b/x11/luit/distinfo
index 054a7b31af39..20e4d0103f53 100644
--- a/x11/luit/distinfo
+++ b/x11/luit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/luit-1.0.3.tar.bz2) = b01e4f71c20fc1c79ed727759c1df40c
-SHA256 (xorg/app/luit-1.0.3.tar.bz2) = 2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
-SIZE (xorg/app/luit-1.0.3.tar.bz2) = 104642
+MD5 (xorg/app/luit-1.0.5.tar.bz2) = fd8579a993c4480978e3504a4c53c189
+SHA256 (xorg/app/luit-1.0.5.tar.bz2) = 8eeb1cf7809acc17cf6cecfdc899613854560052229b21e6115b03a088cd059b
+SIZE (xorg/app/luit-1.0.5.tar.bz2) = 122192
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
index 357153c18c84..14e4ee241684 100644
--- a/x11/mkcomposecache/Makefile
+++ b/x11/mkcomposecache/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mkcomposecache
-PORTVERSION= 1.2
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/mkcomposecache/distinfo b/x11/mkcomposecache/distinfo
index 3d45d86ba287..97d756dae4e0 100644
--- a/x11/mkcomposecache/distinfo
+++ b/x11/mkcomposecache/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/mkcomposecache-1.2.tar.bz2) = c8237b4aea1ae0c15441deab6b12c5c0
-SHA256 (xorg/app/mkcomposecache-1.2.tar.bz2) = 8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb
-SIZE (xorg/app/mkcomposecache-1.2.tar.bz2) = 65262
+MD5 (xorg/app/mkcomposecache-1.2.1.tar.bz2) = 25b774e1b64833d0cdc00663931efc73
+SHA256 (xorg/app/mkcomposecache-1.2.1.tar.bz2) = c9ee54d18cb9a8a0c5fcd8d2dd08ed8ed869f3a538af46caff08ca9bc9cf2caf
+SIZE (xorg/app/mkcomposecache-1.2.1.tar.bz2) = 97359
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index e2c6c57b8b04..19af07408460 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= randrproto
-PORTVERSION= 1.3.0
+PORTVERSION= 1.3.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
index 47c563878673..66c3ba96f463 100644
--- a/x11/randrproto/distinfo
+++ b/x11/randrproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/randrproto-1.3.0.tar.bz2) = a49416013fff33c853efb32f1926551e
-SHA256 (xorg/proto/randrproto-1.3.0.tar.bz2) = cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d
-SIZE (xorg/proto/randrproto-1.3.0.tar.bz2) = 74817
+MD5 (xorg/proto/randrproto-1.3.1.tar.bz2) = a5c244c36382b0de39b2828cea4b651d
+SHA256 (xorg/proto/randrproto-1.3.1.tar.bz2) = d93ca3c0ae710a45da6a27e1eeadfb3c9d4aee47f23657c996e1124c0d9985ca
+SIZE (xorg/proto/randrproto-1.3.1.tar.bz2) = 110435
diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile
index 208c23a5f52d..eeed45e081c3 100644
--- a/x11/recordproto/Makefile
+++ b/x11/recordproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= recordproto
-PORTVERSION= 1.13.2
+PORTVERSION= 1.14
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo
index ea16d442c939..02d5a1166ee4 100644
--- a/x11/recordproto/distinfo
+++ b/x11/recordproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/recordproto-1.13.2.tar.bz2) = 0ed4706564a34fc2aff724aa16d3ff00
-SHA256 (xorg/proto/recordproto-1.13.2.tar.bz2) = 04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9
-SIZE (xorg/proto/recordproto-1.13.2.tar.bz2) = 39340
+MD5 (xorg/proto/recordproto-1.14.tar.bz2) = 70f5998c673aa510e2acd6d8fb3799de
+SHA256 (xorg/proto/recordproto-1.14.tar.bz2) = 1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067
+SIZE (xorg/proto/recordproto-1.14.tar.bz2) = 84439
diff --git a/x11/recordproto/pkg-plist b/x11/recordproto/pkg-plist
index 7b90206b4504..51be84759ad1 100644
--- a/x11/recordproto/pkg-plist
+++ b/x11/recordproto/pkg-plist
@@ -1,4 +1,5 @@
-include/X11/extensions/record.h
+include/X11/extensions/recordconst.h
+include/X11/extensions/recordproto.h
include/X11/extensions/recordstr.h
libdata/pkgconfig/recordproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile
index 04f97b98ae7f..7cb5ce399434 100644
--- a/x11/renderproto/Makefile
+++ b/x11/renderproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= renderproto
-PORTVERSION= 0.9.3
+PORTVERSION= 0.11
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/renderproto/distinfo b/x11/renderproto/distinfo
index db7ada8b4864..39841cac17eb 100644
--- a/x11/renderproto/distinfo
+++ b/x11/renderproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/renderproto-0.9.3.tar.bz2) = 598bc9a493deee2e48e4434e94467189
-SHA256 (xorg/proto/renderproto-0.9.3.tar.bz2) = c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b
-SIZE (xorg/proto/renderproto-0.9.3.tar.bz2) = 54128
+MD5 (xorg/proto/renderproto-0.11.tar.bz2) = b160a9733fe91b666e74fca284333148
+SHA256 (xorg/proto/renderproto-0.11.tar.bz2) = c4d1d6d9b0b6ed9a328a94890c171d534f62708f0982d071ccd443322bedffc2
+SIZE (xorg/proto/renderproto-0.11.tar.bz2) = 66112
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
index 3f6c75193467..a0ffa9062a10 100644
--- a/x11/rgb/Makefile
+++ b/x11/rgb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rgb
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/rgb/distinfo b/x11/rgb/distinfo
index 43941f4519aa..aa594a1f8330 100644
--- a/x11/rgb/distinfo
+++ b/x11/rgb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/rgb-1.0.1.tar.bz2) = 255222b3ab3af671289a6b4844e9f393
-SHA256 (xorg/app/rgb-1.0.1.tar.bz2) = f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad
-SIZE (xorg/app/rgb-1.0.1.tar.bz2) = 91473
+MD5 (xorg/app/rgb-1.0.3.tar.bz2) = 44ea16cc3104de6401bc74035f642357
+SHA256 (xorg/app/rgb-1.0.3.tar.bz2) = 162111c0192c8f78e99a6ee9a3df5eb149251c5800896c993399da005ec7fe95
+SIZE (xorg/app/rgb-1.0.3.tar.bz2) = 103803
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
index 258bc19dda44..645aa6bc5f90 100644
--- a/x11/rstart/Makefile
+++ b/x11/rstart/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rstart
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/rstart/distinfo b/x11/rstart/distinfo
index f648424763a9..3e18d4fd086a 100644
--- a/x11/rstart/distinfo
+++ b/x11/rstart/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/rstart-1.0.2.tar.bz2) = 99aea04a27197056368a4431f30f9cdb
-SHA256 (xorg/app/rstart-1.0.2.tar.bz2) = 02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596
-SIZE (xorg/app/rstart-1.0.2.tar.bz2) = 92924
+MD5 (xorg/app/rstart-1.0.3.tar.bz2) = e09c14cf1ac78260f95a9aa45bccab4c
+SHA256 (xorg/app/rstart-1.0.3.tar.bz2) = d6ee7becf9ece2fcc30ce50f7e9be31f231cce0cb3a8ba09d1697ac2822c3fcc
+SIZE (xorg/app/rstart-1.0.3.tar.bz2) = 106171
diff --git a/x11/rstart/pkg-plist b/x11/rstart/pkg-plist
index 39e8858e79fb..53445f8d1135 100644
--- a/x11/rstart/pkg-plist
+++ b/x11/rstart/pkg-plist
@@ -1,16 +1,20 @@
bin/rstart
bin/rstartd
-lib/X11/rstart/config
-lib/X11/rstart/rstartd.real
-lib/X11/rstart/commands/x11r6/@List
-lib/X11/rstart/commands/x11r6/Terminal
-lib/X11/rstart/commands/x11r6/LoadMonitor
-lib/X11/rstart/commands/ListGenericCommands
lib/X11/rstart/commands/@List
lib/X11/rstart/commands/ListContexts
+lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/x
+lib/X11/rstart/commands/x11
+lib/X11/rstart/commands/x11r6/@List
+lib/X11/rstart/commands/x11r6/LoadMonitor
+lib/X11/rstart/commands/x11r6/Terminal
+lib/X11/rstart/config
+lib/X11/rstart/contexts/@List
lib/X11/rstart/contexts/default
+lib/X11/rstart/contexts/x
+lib/X11/rstart/contexts/x11
lib/X11/rstart/contexts/x11r6
-lib/X11/rstart/contexts/@List
+lib/X11/rstart/rstartd.real
@dirrm lib/X11/rstart/contexts
@dirrm lib/X11/rstart/commands/x11r6
@dirrm lib/X11/rstart/commands
diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile
index c622be384be5..f3d215b63fa7 100644
--- a/x11/scrnsaverproto/Makefile
+++ b/x11/scrnsaverproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= scrnsaverproto
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo
index fa64dda6cb0a..8296c0695691 100644
--- a/x11/scrnsaverproto/distinfo
+++ b/x11/scrnsaverproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 5d551850e6f4acdf49a13f4eb3a5bbfa
-SHA256 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f
-SIZE (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 38066
+MD5 (xorg/proto/scrnsaverproto-1.2.0.tar.bz2) = 9040c991a56ee9b5976936f8c65d5c8a
+SHA256 (xorg/proto/scrnsaverproto-1.2.0.tar.bz2) = deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99
+SIZE (xorg/proto/scrnsaverproto-1.2.0.tar.bz2) = 49623
diff --git a/x11/scrnsaverproto/pkg-plist b/x11/scrnsaverproto/pkg-plist
index 61b64df0f8b2..40ab10e2ac40 100644
--- a/x11/scrnsaverproto/pkg-plist
+++ b/x11/scrnsaverproto/pkg-plist
@@ -1,5 +1,4 @@
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/scrnsaver.h
-libdata/pkgconfig/scrnsaverproto.pc
+include/X11/extensions/saver.h
+include/X11/extensions/saverproto.h
+libdata/pkgconfig/scrnsaverproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index 03de0618f141..b7f12836029b 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= sessreg
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
index d300de9c3d59..226ac2586014 100644
--- a/x11/sessreg/distinfo
+++ b/x11/sessreg/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/sessreg-1.0.4.tar.bz2) = 839e968d7197b9563f0fd8a5a3aac2e3
-SHA256 (xorg/app/sessreg-1.0.4.tar.bz2) = 23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802
-SIZE (xorg/app/sessreg-1.0.4.tar.bz2) = 96209
+MD5 (xorg/app/sessreg-1.0.5.tar.bz2) = 00e834c3cbfd990e9d7d5ddc834242df
+SHA256 (xorg/app/sessreg-1.0.5.tar.bz2) = 3308fbd0018d53bb818fee9de1cde484965b740073d5d240efa4cfc881c9d1a9
+SIZE (xorg/app/sessreg-1.0.5.tar.bz2) = 103142
diff --git a/x11/sessreg/files/patch-utmpx b/x11/sessreg/files/patch-utmpx
index 67fdf2974975..7ae4da842dbd 100644
--- a/x11/sessreg/files/patch-utmpx
+++ b/x11/sessreg/files/patch-utmpx
@@ -1,6 +1,6 @@
---- configure.ac
-+++ configure.ac
-@@ -39,13 +39,14 @@ AC_PROG_INSTALL
+--- configure.ac.orig 2009-10-12 13:10:57.000000000 -0500
++++ configure.ac 2010-03-27 08:12:08.000000000 -0500
+@@ -39,13 +39,14 @@
XORG_DEFAULT_OPTIONS
@@ -16,9 +16,9 @@
AC_SYS_LARGEFILE
---- sessreg.c
-+++ sessreg.c
-@@ -80,7 +80,6 @@
+--- sessreg.c.orig 2009-10-12 12:52:12.000000000 -0500
++++ sessreg.c 2010-03-27 08:13:46.000000000 -0500
+@@ -81,7 +81,6 @@
# include <X11/Xfuncs.h>
# include <stdio.h>
# include <stdlib.h>
@@ -26,7 +26,7 @@
#if defined(__SVR4) || defined(SVR4) || defined(linux) || defined(__GLIBC__)
# define SYSV
-@@ -89,7 +88,10 @@
+@@ -90,7 +89,10 @@
#include <time.h>
#define Time_t time_t
@@ -38,9 +38,9 @@
#ifdef USE_UTMPX
static void set_utmpx (struct utmpx *u, const char *line, const char *user,
-@@ -99,7 +101,12 @@
- int wflag, uflag, lflag;
- char *wtmp_file, *utmp_file, *line;
+@@ -100,7 +102,12 @@
+ static int wflag, uflag, lflag;
+ static char *wtmp_file, *utmp_file, *line;
#ifdef USE_UTMPX
-static char *wtmpx_file = NULL, *utmpx_file = NULL;
+#ifdef HAVE_UPDWTMPX
@@ -50,19 +50,19 @@
+static char *utmpx_file = NULL;
+#endif
#endif
- int utmp_none, wtmp_none;
+ static int utmp_none, wtmp_none;
/*
-@@ -108,7 +115,9 @@
+@@ -109,7 +116,9 @@
*/
- int hflag, sflag, xflag, tflag;
- char *host_name = NULL;
+ static int hflag, sflag, xflag, tflag;
+ static char *host_name = NULL;
+#ifdef USE_UTMP
- int slot_number;
+ static int slot_number;
+#endif
- char *xservers_file, *ttys_file;
- char *user_name;
- int aflag, dflag;
-@@ -180,7 +189,7 @@
+ static char *xservers_file, *ttys_file;
+ static char *user_name;
+ static int aflag, dflag;
+@@ -181,7 +190,7 @@
int
main (int argc, char **argv)
{
@@ -71,7 +71,7 @@
int utmp;
#endif
char *line_tmp;
-@@ -188,7 +197,9 @@
+@@ -189,7 +198,9 @@
int wtmp;
#endif
Time_t current_time;
@@ -81,7 +81,7 @@
#ifdef USE_UTMPX
struct utmpx utmpx_entry;
#endif
-@@ -223,7 +234,9 @@
+@@ -224,7 +235,9 @@
host_name = getstring (&argv, &hflag);
break;
case 's':
@@ -91,7 +91,7 @@
break;
case 'x':
xservers_file = getstring (&argv, &xflag);
-@@ -249,14 +262,14 @@
+@@ -250,14 +263,14 @@
/* set up default file names */
if (!wflag) {
wtmp_file = WTMP_FILE;
@@ -108,7 +108,7 @@
utmpx_file = UTMPX_FILE;
#endif
}
-@@ -267,7 +280,7 @@
+@@ -268,7 +281,7 @@
if (!Lflag)
llog_file = LLOG_FILE;
#endif
@@ -117,7 +117,7 @@
if (!tflag)
ttys_file = TTYS_FILE;
if (!sflag && !utmp_none) {
-@@ -286,34 +299,42 @@
+@@ -287,34 +300,42 @@
line = line_tmp;
}
time (&current_time);
@@ -163,7 +163,7 @@
utmp = open (utmp_file, O_RDWR);
if (utmp != -1) {
syserr ((int) lseek (utmp, (long) slot_number * sizeof (struct utmp), 0), "lseek");
-@@ -321,13 +342,16 @@
+@@ -322,13 +343,16 @@
== sizeof (utmp_entry), "write utmp entry");
close (utmp);
}
@@ -181,7 +181,7 @@
#else
wtmp = open (wtmp_file, O_WRONLY|O_APPEND);
if (wtmp != -1) {
-@@ -370,6 +394,7 @@
+@@ -371,6 +395,7 @@
* fill in the appropriate records of the utmp entry
*/
@@ -189,7 +189,7 @@
static void
set_utmp (struct utmp *u, char *line, char *user, char *host, Time_t date, int addp)
{
-@@ -416,6 +441,7 @@
+@@ -417,6 +442,7 @@
#endif
u->ut_time = date;
}
@@ -197,7 +197,7 @@
#ifdef USE_UTMPX
static int
-@@ -423,6 +449,8 @@
+@@ -424,6 +450,8 @@
{
struct utmpx *u; /* pointer to entry in utmp file */
int status = 1; /* return code */
@@ -206,7 +206,7 @@
while ( (u = getutxent()) != NULL ) {
-@@ -434,7 +462,7 @@
+@@ -435,7 +463,7 @@
}
}
@@ -215,7 +215,7 @@
return (status);
}
-@@ -453,14 +481,16 @@
+@@ -454,14 +482,16 @@
(void) strncpy (u->ut_line, line, sizeof (u->ut_line));
strncpy(u->ut_host, line, sizeof(u->ut_host));
@@ -234,7 +234,7 @@
if (line) {
int i;
-@@ -519,7 +549,7 @@
+@@ -520,7 +550,7 @@
}
#endif /* USE_UTMPX */
@@ -243,9 +243,9 @@
/*
* compute the slot-number for an X display. This is computed
* by counting the lines in /etc/ttys and adding the line-number
---- sessreg.h
-+++ sessreg.h
-@@ -51,13 +51,15 @@
+--- sessreg.h.orig 2008-06-11 16:30:54.000000000 -0500
++++ sessreg.h 2010-03-27 08:12:08.000000000 -0500
+@@ -57,13 +57,15 @@
#include <sys/types.h>
#include <time.h>
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index 1a4548f9df77..c45ae6aa94a4 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= setxkbmap
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/setxkbmap/distinfo b/x11/setxkbmap/distinfo
index ce37b1be9094..a3456a7036f7 100644
--- a/x11/setxkbmap/distinfo
+++ b/x11/setxkbmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/setxkbmap-1.0.4.tar.bz2) = 6fab3bb176be9e510c5613d054ef1ca4
-SHA256 (xorg/app/setxkbmap-1.0.4.tar.bz2) = 9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac
-SIZE (xorg/app/setxkbmap-1.0.4.tar.bz2) = 92758
+MD5 (xorg/app/setxkbmap-1.1.0.tar.bz2) = 2f902e0a89aaf2b19e06e7f26c6efb3a
+SHA256 (xorg/app/setxkbmap-1.1.0.tar.bz2) = 932f2b314a4bf6dfccd16d63c633073abf650d8e136f481904e972ef3d4faf64
+SIZE (xorg/app/setxkbmap-1.1.0.tar.bz2) = 99040
diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile
index 33b7cf2ac697..71aaa5ff9ade 100644
--- a/x11/smproxy/Makefile
+++ b/x11/smproxy/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= smproxy
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/smproxy/distinfo b/x11/smproxy/distinfo
index 77a9c7b77116..4a6db83686d0 100644
--- a/x11/smproxy/distinfo
+++ b/x11/smproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/smproxy-1.0.2.tar.bz2) = 31da204a0255ba8c6a65386e65dc1c90
-SHA256 (xorg/app/smproxy-1.0.2.tar.bz2) = 76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
-SIZE (xorg/app/smproxy-1.0.2.tar.bz2) = 87139
+MD5 (xorg/app/smproxy-1.0.3.tar.bz2) = ba7dbde81be24fc1bd4156b360e5f8cf
+SHA256 (xorg/app/smproxy-1.0.3.tar.bz2) = 1b8dd25483280fc2a4a7d977b4a43dc4228b9c65e904c3d4ee68245705d4ae35
+SIZE (xorg/app/smproxy-1.0.3.tar.bz2) = 103272
diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile
index fef7e25c2993..dee630301077 100644
--- a/x11/videoproto/Makefile
+++ b/x11/videoproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= videoproto
-PORTVERSION= 2.2.2
+PORTVERSION= 2.3.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/videoproto/distinfo b/x11/videoproto/distinfo
index a38e0b813efb..7c878ad85faa 100644
--- a/x11/videoproto/distinfo
+++ b/x11/videoproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/videoproto-2.2.2.tar.bz2) = 44292d74a9a3c94b1ecb9d77a0da83e8
-SHA256 (xorg/proto/videoproto-2.2.2.tar.bz2) = ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c
-SIZE (xorg/proto/videoproto-2.2.2.tar.bz2) = 42744
+MD5 (xorg/proto/videoproto-2.3.0.tar.bz2) = fb762146a18207a1e8bc9f299dfc7ac0
+SHA256 (xorg/proto/videoproto-2.3.0.tar.bz2) = 4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f
+SIZE (xorg/proto/videoproto-2.3.0.tar.bz2) = 54499
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
index abcd108d8eab..189f665d423d 100644
--- a/x11/viewres/Makefile
+++ b/x11/viewres/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= viewres
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -18,4 +17,10 @@ USE_XORG= xt xaw
MAN1= viewres.1
+PLIST_FILES+= bin/viewres \
+ share/X11/app-defaults/Viewres \
+ share/X11/app-defaults/Viewres-color
+PLIST_DIRS+= share/X11/app-defaults \
+ share/X11
+
.include <bsd.port.mk>
diff --git a/x11/viewres/distinfo b/x11/viewres/distinfo
index 82ff7aa8c86c..fd19e0a18cdd 100644
--- a/x11/viewres/distinfo
+++ b/x11/viewres/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/viewres-1.0.1.tar.bz2) = cdbed540daf7975b56000420c9aa5bf9
-SHA256 (xorg/app/viewres-1.0.1.tar.bz2) = bf49cd45ffb197a6992b3b7c99c94161eaf7cf6a2b661d3905ac382bedce34b8
-SIZE (xorg/app/viewres-1.0.1.tar.bz2) = 84802
+MD5 (xorg/app/viewres-1.0.2.tar.bz2) = f35c4ad7e1aa1ee2b25373dcdc34345b
+SHA256 (xorg/app/viewres-1.0.2.tar.bz2) = 85c7207f89bfb13cc9f3c3c9d9a785094e7576e5e3e7ef0450544c4cd6bbbf3b
+SIZE (xorg/app/viewres-1.0.2.tar.bz2) = 111217
diff --git a/x11/viewres/pkg-plist b/x11/viewres/pkg-plist
deleted file mode 100644
index 3c7cd4718db5..000000000000
--- a/x11/viewres/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/viewres
-share/X11/app-defaults/Viewres
-@dirrmtry share/X11/app-defaults
-@dirrmtry share/X11
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index 3137317a9e43..f77321245bf2 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x11perf
-PORTVERSION= 1.5
+PORTVERSION= 1.5.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo
index 2ad476a138e3..6563d4ec7c86 100644
--- a/x11/x11perf/distinfo
+++ b/x11/x11perf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/x11perf-1.5.tar.bz2) = 31283bfc3c78718ac1bd71e510d4e774
-SHA256 (xorg/app/x11perf-1.5.tar.bz2) = 4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233
-SIZE (xorg/app/x11perf-1.5.tar.bz2) = 142378
+MD5 (xorg/app/x11perf-1.5.1.tar.bz2) = 66e4aa4645f83809071eb69553ed0222
+SHA256 (xorg/app/x11perf-1.5.1.tar.bz2) = ab4c6a579f93fa9485ef5be8760a3da0d22acfa743f2114057c5262b77ff7056
+SIZE (xorg/app/x11perf-1.5.1.tar.bz2) = 151356
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 29702575169f..802701e66748 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xauth
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo
index 14a99ab151a0..015228ddeacb 100644
--- a/x11/xauth/distinfo
+++ b/x11/xauth/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xauth-1.0.3.tar.bz2) = e91e10ace1df0d5f2cbc74ead256407a
-SHA256 (xorg/app/xauth-1.0.3.tar.bz2) = 1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c
-SIZE (xorg/app/xauth-1.0.3.tar.bz2) = 112331
+MD5 (xorg/app/xauth-1.0.4.tar.bz2) = fa00078c414c4a57cab7a6d89a0c8734
+SHA256 (xorg/app/xauth-1.0.4.tar.bz2) = f91190c8b8bb18270b86b00f30da5684bb5e5bd1ed0ccf352322f8145e076a59
+SIZE (xorg/app/xauth-1.0.4.tar.bz2) = 119274
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index 2130579ee442..091ee5794a6d 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xbacklight
-PORTVERSION= 1.1
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbacklight/distinfo b/x11/xbacklight/distinfo
index 6049f5e5478c..ef5f6b8ca255 100644
--- a/x11/xbacklight/distinfo
+++ b/x11/xbacklight/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xbacklight-1.1.tar.bz2) = 51b4a1c0ae2b3bd77417306fd78a3e94
-SHA256 (xorg/app/xbacklight-1.1.tar.bz2) = c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
-SIZE (xorg/app/xbacklight-1.1.tar.bz2) = 79964
+MD5 (xorg/app/xbacklight-1.1.1.tar.bz2) = 3e39eec6d0fd5c587ca6d55aa7bb8fe1
+SHA256 (xorg/app/xbacklight-1.1.1.tar.bz2) = 5d32d891c83b9c0089231f4f1c424ab02301b627ce26e5c2e6e397b8ea606fb2
+SIZE (xorg/app/xbacklight-1.1.1.tar.bz2) = 93639
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
index 463d3b17e0df..3b9f4d1c56d3 100644
--- a/x11/xbiff/Makefile
+++ b/x11/xbiff/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xbiff
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbiff/distinfo b/x11/xbiff/distinfo
index fdbf55355a2c..5e3c46290e31 100644
--- a/x11/xbiff/distinfo
+++ b/x11/xbiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xbiff-1.0.1.tar.bz2) = 404f5add4537d22dd109c33e518a5190
-SHA256 (xorg/app/xbiff-1.0.1.tar.bz2) = 9845b1fa8a1cfd408f01fd69b66808068e847cdc925d114c7723c17934a96503
-SIZE (xorg/app/xbiff-1.0.1.tar.bz2) = 83634
+MD5 (xorg/app/xbiff-1.0.2.tar.bz2) = 1d4ad06725f9dc4b877ecd210b7b1607
+SHA256 (xorg/app/xbiff-1.0.2.tar.bz2) = 7c21763a90599ad627739804ba76dd33516b76cce440294e1154bf680eca60f7
+SIZE (xorg/app/xbiff-1.0.2.tar.bz2) = 107832
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index debaed25a78d..af33e577e0af 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xbitmaps
-PORTVERSION= 1.0.1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbitmaps/distinfo b/x11/xbitmaps/distinfo
index a53229f90ba2..1937ca1ff1f1 100644
--- a/x11/xbitmaps/distinfo
+++ b/x11/xbitmaps/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/data/xbitmaps-1.0.1.tar.bz2) = b28a9840cde3c38d7c09716372fea257
-SHA256 (xorg/data/xbitmaps-1.0.1.tar.bz2) = 5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
-SIZE (xorg/data/xbitmaps-1.0.1.tar.bz2) = 55570
+MD5 (xorg/data/xbitmaps-1.1.0.tar.bz2) = f9ddd4e70a5375508b3acaf17be0d0ab
+SHA256 (xorg/data/xbitmaps-1.1.0.tar.bz2) = c9a2059c8b0636b7ee1169647bb22f6eb4a0589e36fdb98936002e2569ad8761
+SIZE (xorg/data/xbitmaps-1.1.0.tar.bz2) = 101645
diff --git a/x11/xbitmaps/pkg-plist b/x11/xbitmaps/pkg-plist
index a2c9f61cc2d6..d19e6f2dc13b 100644
--- a/x11/xbitmaps/pkg-plist
+++ b/x11/xbitmaps/pkg-plist
@@ -1,6 +1,8 @@
include/X11/bitmaps/1x1
include/X11/bitmaps/2x2
include/X11/bitmaps/black
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
include/X11/bitmaps/boxes
include/X11/bitmaps/calculator
include/X11/bitmaps/cntr_ptr
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index b55debe03f1c..c8c770ae7117 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xcalc
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcalc/distinfo b/x11/xcalc/distinfo
index de9a191412ee..7103d0cdb4a5 100644
--- a/x11/xcalc/distinfo
+++ b/x11/xcalc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xcalc-1.0.2.tar.bz2) = d31a99795b9668f047aa11bf36df6df0
-SHA256 (xorg/app/xcalc-1.0.2.tar.bz2) = 96375e2d212e7249d14d0beac73c1a6d89252b5fcf571bd9f5c7303a14bb4a32
-SIZE (xorg/app/xcalc-1.0.2.tar.bz2) = 106117
+MD5 (xorg/app/xcalc-1.0.3.tar.bz2) = 0b981e360b54584fcb6dc2ec4658c406
+SHA256 (xorg/app/xcalc-1.0.3.tar.bz2) = 96c413998c664a8397313d749b20e18308bcd82187a89446a64b3557b089b42f
+SIZE (xorg/app/xcalc-1.0.3.tar.bz2) = 120230
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index 809edc066678..ee8713558239 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xclipboard
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xclipboard/distinfo b/x11/xclipboard/distinfo
index eee5df66f41c..68435f6d4653 100644
--- a/x11/xclipboard/distinfo
+++ b/x11/xclipboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xclipboard-1.0.1.tar.bz2) = 2c6ecedb10dc51adbb64c95f22fd99c2
-SHA256 (xorg/app/xclipboard-1.0.1.tar.bz2) = 3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
-SIZE (xorg/app/xclipboard-1.0.1.tar.bz2) = 83681
+MD5 (xorg/app/xclipboard-1.1.0.tar.bz2) = 113eccea3ee73a1ef7b43d2291ca1e09
+SHA256 (xorg/app/xclipboard-1.1.0.tar.bz2) = de0f37c7bf69c3aac3362bc0cbe470a622c2a85b62c5483c113ea88512232710
+SIZE (xorg/app/xclipboard-1.1.0.tar.bz2) = 105762
diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile
index 481facc39c45..f93d0087da8c 100644
--- a/x11/xcmiscproto/Makefile
+++ b/x11/xcmiscproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcmiscproto
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo
index 44a00f483a14..04935e35b1c2 100644
--- a/x11/xcmiscproto/distinfo
+++ b/x11/xcmiscproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = fde0b050901f024b19159cdacdcfbd20
-SHA256 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
-SIZE (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = 36750
+MD5 (xorg/proto/xcmiscproto-1.2.0.tar.bz2) = 7b83e4a7e9f4edc9c6cfb0500f4a7196
+SHA256 (xorg/proto/xcmiscproto-1.2.0.tar.bz2) = de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e
+SIZE (xorg/proto/xcmiscproto-1.2.0.tar.bz2) = 48697
diff --git a/x11/xcmiscproto/pkg-plist b/x11/xcmiscproto/pkg-plist
index 384401d8ac76..3ab2c9cd539a 100644
--- a/x11/xcmiscproto/pkg-plist
+++ b/x11/xcmiscproto/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/xcmiscproto.h
include/X11/extensions/xcmiscstr.h
libdata/pkgconfig/xcmiscproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile
index fd4c90e38ca6..c52af7a34ce8 100644
--- a/x11/xcmsdb/Makefile
+++ b/x11/xcmsdb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcmsdb
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcmsdb/distinfo b/x11/xcmsdb/distinfo
index 95d33176320c..74744beede8f 100644
--- a/x11/xcmsdb/distinfo
+++ b/x11/xcmsdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xcmsdb-1.0.1.tar.bz2) = 8579d5f50ba7f0c4a5bf16b9670fea01
-SHA256 (xorg/app/xcmsdb-1.0.1.tar.bz2) = e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e
-SIZE (xorg/app/xcmsdb-1.0.1.tar.bz2) = 96423
+MD5 (xorg/app/xcmsdb-1.0.2.tar.bz2) = 7f2bed9f4dd3301d18d83eb296c3be0d
+SHA256 (xorg/app/xcmsdb-1.0.2.tar.bz2) = bfcac66634ea4d4a1607f1c8a4170e6089db13355357fc143281a6fc0216face
+SIZE (xorg/app/xcmsdb-1.0.2.tar.bz2) = 117482
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 8edee29df014..2e40f105421d 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xcursorgen
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -16,7 +15,7 @@ COMMENT= Create an X cursor file from a collection of PNG images
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
XORG_CAT= app
-USE_XORG= x11 xcursor
+USE_XORG= x11 xcursor xextproto
PLIST_FILES= bin/xcursorgen
diff --git a/x11/xcursorgen/distinfo b/x11/xcursorgen/distinfo
index ed02e837bff5..45b489637b2c 100644
--- a/x11/xcursorgen/distinfo
+++ b/x11/xcursorgen/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xcursorgen-1.0.2.tar.bz2) = 6fc90896b8c786cb1a2100b4167f7874
-SHA256 (xorg/app/xcursorgen-1.0.2.tar.bz2) = e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e
-SIZE (xorg/app/xcursorgen-1.0.2.tar.bz2) = 89978
+MD5 (xorg/app/xcursorgen-1.0.3.tar.bz2) = 69df079b3950a0db4e5f4e6f0e00ddee
+SHA256 (xorg/app/xcursorgen-1.0.3.tar.bz2) = ed5f3ffe881c21ffca85406e5a5f553ed4985cc5e9acdb535f682c33bebac254
+SIZE (xorg/app/xcursorgen-1.0.3.tar.bz2) = 99262
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index b01fd1ad6821..93397e8716c3 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xdpyinfo
-PORTVERSION= 1.0.3
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
index 53dd02d960b2..965ced3182fc 100644
--- a/x11/xdpyinfo/distinfo
+++ b/x11/xdpyinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = b7cbab6cbcd12bf7ad65dbc12d86e104
-SHA256 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962
-SIZE (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 103116
+MD5 (xorg/app/xdpyinfo-1.1.0.tar.bz2) = d1d516610316138105cd07064b257c5c
+SHA256 (xorg/app/xdpyinfo-1.1.0.tar.bz2) = 780d8dfe65653f42ee26d35928ab7f72f5f27ab08eda692fe4baad05126a0631
+SIZE (xorg/app/xdpyinfo-1.1.0.tar.bz2) = 116427
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
index b3bf781c5fdc..0d92920b8663 100644
--- a/x11/xdriinfo/Makefile
+++ b/x11/xdriinfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xdriinfo
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo
index ea842f032185..f7d17e7c8eb9 100644
--- a/x11/xdriinfo/distinfo
+++ b/x11/xdriinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xdriinfo-1.0.2.tar.bz2) = a5ec51ed9f0a55dc3462d90d52ff899c
-SHA256 (xorg/app/xdriinfo-1.0.2.tar.bz2) = 7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265
-SIZE (xorg/app/xdriinfo-1.0.2.tar.bz2) = 88240
+MD5 (xorg/app/xdriinfo-1.0.3.tar.bz2) = cb304d1ce562ac48b68eedeba38c662f
+SHA256 (xorg/app/xdriinfo-1.0.3.tar.bz2) = 2b762afd08c798d79fd6dacfd6280da39105927fa2bd91e3b1ba75b8cddc259c
+SIZE (xorg/app/xdriinfo-1.0.3.tar.bz2) = 97688
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index 09bb49017558..256d130881f4 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xev
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xev/distinfo b/x11/xev/distinfo
index bd2ca1d458f3..97da9d85d17b 100644
--- a/x11/xev/distinfo
+++ b/x11/xev/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xev-1.0.3.tar.bz2) = a9532c3d1683c99bb5df1895cb3a60b1
-SHA256 (xorg/app/xev-1.0.3.tar.bz2) = d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a
-SIZE (xorg/app/xev-1.0.3.tar.bz2) = 92292
+MD5 (xorg/app/xev-1.0.4.tar.bz2) = 5f98c0a2725a33d60ef4956befe078fb
+SHA256 (xorg/app/xev-1.0.4.tar.bz2) = 7fad9c9755a624e677f44633dee218e9c22b4ba9a83e6709a6cbf8c1a501fde8
+SIZE (xorg/app/xev-1.0.4.tar.bz2) = 101286
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index c89b1ea31266..461732f15381 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xextproto
-PORTVERSION= 7.0.5
+PORTVERSION= 7.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
index ee9680b76e43..af249729fc93 100644
--- a/x11/xextproto/distinfo
+++ b/x11/xextproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xextproto-7.0.5.tar.bz2) = e6841018a7c64983b0954aa2c564d115
-SHA256 (xorg/proto/xextproto-7.0.5.tar.bz2) = d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
-SIZE (xorg/proto/xextproto-7.0.5.tar.bz2) = 80831
+MD5 (xorg/proto/xextproto-7.1.1.tar.bz2) = fb6ccaae76db7a35e49b12aea60ca6ff
+SHA256 (xorg/proto/xextproto-7.1.1.tar.bz2) = 6d0abd31ddd57c2cb24cecf5fd90b4c29a276e20e3e03ca3c2c57d074f964d99
+SIZE (xorg/proto/xextproto-7.1.1.tar.bz2) = 71234
diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist
index 30e106267b84..04d24a194218 100644
--- a/x11/xextproto/pkg-plist
+++ b/x11/xextproto/pkg-plist
@@ -1,40 +1,32 @@
-include/X11/extensions/MITMisc.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xge.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
+include/X11/extensions/EVI.h
+include/X11/extensions/EVIproto.h
+include/X11/extensions/ag.h
+include/X11/extensions/agproto.h
+include/X11/extensions/cup.h
+include/X11/extensions/cupproto.h
+include/X11/extensions/dbe.h
+include/X11/extensions/dbeproto.h
+include/X11/extensions/dpmsconst.h
+include/X11/extensions/dpmsproto.h
include/X11/extensions/ge.h
include/X11/extensions/geproto.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
+include/X11/extensions/lbx.h
+include/X11/extensions/lbxproto.h
+include/X11/extensions/mitmiscconst.h
+include/X11/extensions/mitmiscproto.h
+include/X11/extensions/multibufconst.h
+include/X11/extensions/multibufproto.h
+include/X11/extensions/secur.h
+include/X11/extensions/securproto.h
+include/X11/extensions/shapeconst.h
+include/X11/extensions/shapeproto.h
+include/X11/extensions/shm.h
+include/X11/extensions/shmproto.h
+include/X11/extensions/syncconst.h
+include/X11/extensions/syncproto.h
+include/X11/extensions/xtestconst.h
+include/X11/extensions/xtestext1const.h
+include/X11/extensions/xtestext1proto.h
+include/X11/extensions/xtestproto.h
libdata/pkgconfig/xextproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index e398a8780fcd..3ec4359bd1e5 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= xeyes
-PORTVERSION= 1.0.1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= A follow the mouse X demo
XORG_CAT= app
-USE_XORG= x11 xt xext xmu
+USE_XORG= x11 xt xext xmu xrender
PLIST_FILES= bin/xeyes
diff --git a/x11/xeyes/distinfo b/x11/xeyes/distinfo
index bd62c4efe34d..e27d47e38cc2 100644
--- a/x11/xeyes/distinfo
+++ b/x11/xeyes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xeyes-1.0.1.tar.bz2) = 033f14f7c4e30d1f4edbb22d5ef86883
-SHA256 (xorg/app/xeyes-1.0.1.tar.bz2) = 530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
-SIZE (xorg/app/xeyes-1.0.1.tar.bz2) = 81097
+MD5 (xorg/app/xeyes-1.1.0.tar.bz2) = 933f6d2b132d14f707f1f3c87b39ebe2
+SHA256 (xorg/app/xeyes-1.1.0.tar.bz2) = 996b9641fea06e2f0dde9cbf5fb31b5cd139376198057a88ca59820fdb94d507
+SIZE (xorg/app/xeyes-1.1.0.tar.bz2) = 106292
diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile
index be4d701a3bc1..f264ab50f3c6 100644
--- a/x11/xf86dgaproto/Makefile
+++ b/x11/xf86dgaproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86dgaproto
-PORTVERSION= 2.0.3
+PORTVERSION= 2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86dgaproto/distinfo b/x11/xf86dgaproto/distinfo
index 5ffd2751e13a..da5a1a0816fe 100644
--- a/x11/xf86dgaproto/distinfo
+++ b/x11/xf86dgaproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 42fdcebc66efac02ab4beec2b1b0ad6e
-SHA256 (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002
-SIZE (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 43191
+MD5 (xorg/proto/xf86dgaproto-2.1.tar.bz2) = a036dc2fcbf052ec10621fd48b68dbb1
+SHA256 (xorg/proto/xf86dgaproto-2.1.tar.bz2) = ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050
+SIZE (xorg/proto/xf86dgaproto-2.1.tar.bz2) = 85934
diff --git a/x11/xf86dgaproto/pkg-plist b/x11/xf86dgaproto/pkg-plist
index 6ffd6b28b310..0ed8d3ba7d21 100644
--- a/x11/xf86dgaproto/pkg-plist
+++ b/x11/xf86dgaproto/pkg-plist
@@ -1,6 +1,9 @@
include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
+include/X11/extensions/xf86dga1const.h
+include/X11/extensions/xf86dga1proto.h
include/X11/extensions/xf86dga1str.h
+include/X11/extensions/xf86dgaconst.h
+include/X11/extensions/xf86dgaproto.h
include/X11/extensions/xf86dgastr.h
libdata/pkgconfig/xf86dgaproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
index 1104a6b57f89..c81475908ec6 100644
--- a/x11/xf86driproto/Makefile
+++ b/x11/xf86driproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86driproto
-PORTVERSION= 2.0.4
+PORTVERSION= 2.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo
index e32be9fa367d..b74423df1b10 100644
--- a/x11/xf86driproto/distinfo
+++ b/x11/xf86driproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 01470d088da3a8a3deefa8e1f45d69cb
-SHA256 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da
-SIZE (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 43814
+MD5 (xorg/proto/xf86driproto-2.1.0.tar.bz2) = 309d552732666c3333d7dc63e80d042f
+SHA256 (xorg/proto/xf86driproto-2.1.0.tar.bz2) = d23f12deffd03e582e897ed6a7df3ea7f66ee8577f0f61374dcdf2ebffdce1be
+SIZE (xorg/proto/xf86driproto-2.1.0.tar.bz2) = 50111
diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist
index 93dac2da7258..0b747176c520 100644
--- a/x11/xf86driproto/pkg-plist
+++ b/x11/xf86driproto/pkg-plist
@@ -1,6 +1,5 @@
include/X11/dri/xf86dri.h
+include/X11/dri/xf86driproto.h
include/X11/dri/xf86dristr.h
libdata/pkgconfig/xf86driproto.pc
-@dirrm include/X11/dri
-@dirrmtry include/GL/internal
-@dirrmtry include/GL
+@dirrmtry include/X11/dri
diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile
index 3b6abc2c0808..db9b6a257ff9 100644
--- a/x11/xf86miscproto/Makefile
+++ b/x11/xf86miscproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86miscproto
-PORTVERSION= 0.9.2
+PORTVERSION= 0.9.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86miscproto/distinfo b/x11/xf86miscproto/distinfo
index 8a92b725454e..8b9b9e2197f6 100644
--- a/x11/xf86miscproto/distinfo
+++ b/x11/xf86miscproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = acae8edeb05a406f7f60bcbb218a8f1d
-SHA256 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6
-SIZE (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = 38464
+MD5 (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = ca63bbb31cf5b7f37b2237e923ff257a
+SHA256 (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = 45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095
+SIZE (xorg/proto/xf86miscproto-0.9.3.tar.bz2) = 84950
diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile
index 8c081362db1a..8ac6eb8436a4 100644
--- a/x11/xf86vidmodeproto/Makefile
+++ b/x11/xf86vidmodeproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86vidmodeproto
-PORTVERSION= 2.2.2
+PORTVERSION= 2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86vidmodeproto/distinfo b/x11/xf86vidmodeproto/distinfo
index 81b04a7cf261..c5a1eb9f2f9c 100644
--- a/x11/xf86vidmodeproto/distinfo
+++ b/x11/xf86vidmodeproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = f00844a63d6e76b69eb0eb5e41eed843
-SHA256 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e
-SIZE (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 39615
+MD5 (xorg/proto/xf86vidmodeproto-2.3.tar.bz2) = 4434894fc7d4eeb4a22e6b876d56fdaa
+SHA256 (xorg/proto/xf86vidmodeproto-2.3.tar.bz2) = 8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
+SIZE (xorg/proto/xf86vidmodeproto-2.3.tar.bz2) = 84476
diff --git a/x11/xf86vidmodeproto/pkg-plist b/x11/xf86vidmodeproto/pkg-plist
index 410f26100f65..06c19ee57605 100644
--- a/x11/xf86vidmodeproto/pkg-plist
+++ b/x11/xf86vidmodeproto/pkg-plist
@@ -1,4 +1,5 @@
-include/X11/extensions/xf86vmode.h
+include/X11/extensions/xf86vm.h
+include/X11/extensions/xf86vmproto.h
include/X11/extensions/xf86vmstr.h
libdata/pkgconfig/xf86vidmodeproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index 950bb7012809..4a4d44108d33 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xgamma
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xgamma/distinfo b/x11/xgamma/distinfo
index d7029e635d49..8b728ea30b72 100644
--- a/x11/xgamma/distinfo
+++ b/x11/xgamma/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xgamma-1.0.2.tar.bz2) = f13ddedaa63a608d3b025d326f4f5b5d
-SHA256 (xorg/app/xgamma-1.0.2.tar.bz2) = 5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e
-SIZE (xorg/app/xgamma-1.0.2.tar.bz2) = 86528
+MD5 (xorg/app/xgamma-1.0.3.tar.bz2) = e8a88bf1a18f35b724619849dca97f4f
+SHA256 (xorg/app/xgamma-1.0.3.tar.bz2) = e5eb2588fbbdc5c2db5571b304204487a9c22eed15ac6cb816f605ec403e6e1a
+SIZE (xorg/app/xgamma-1.0.3.tar.bz2) = 95767
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
index b4dec16e2638..caf249287d4f 100644
--- a/x11/xgc/Makefile
+++ b/x11/xgc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xgc
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xgc/distinfo b/x11/xgc/distinfo
index 6e43f4e242db..27b7d4c659e9 100644
--- a/x11/xgc/distinfo
+++ b/x11/xgc/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xgc-1.0.1.tar.bz2) = 72fc8dd68f585000c0a542eba0264571
-SHA256 (xorg/app/xgc-1.0.1.tar.bz2) = 7caddfc6c34f62a4ab2dba2ba34085f6b2343b36ec1bec3b522a2188170e1093
-SIZE (xorg/app/xgc-1.0.1.tar.bz2) = 128931
+MD5 (xorg/app/xgc-1.0.2.tar.bz2) = fec79887ca14575bef4c757b4e95a693
+SHA256 (xorg/app/xgc-1.0.2.tar.bz2) = fed1be13409b6963d88ee668da4670cd6da5bd9aff95576234df8849e2084002
+SIZE (xorg/app/xgc-1.0.2.tar.bz2) = 157260
diff --git a/x11/xgc/pkg-plist b/x11/xgc/pkg-plist
index 2ac82d6ce291..3dce453f0156 100644
--- a/x11/xgc/pkg-plist
+++ b/x11/xgc/pkg-plist
@@ -1,4 +1,5 @@
bin/xgc
share/X11/app-defaults/Xgc
+share/X11/app-defaults/Xgc-color
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index 86ee9ee304b4..ce9c24e93e4d 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xhost
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xhost/distinfo b/x11/xhost/distinfo
index 4759e957cd94..ee8a79ac98df 100644
--- a/x11/xhost/distinfo
+++ b/x11/xhost/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xhost-1.0.2.tar.bz2) = f746aba36f075ae4cae313d849a94f4e
-SHA256 (xorg/app/xhost-1.0.2.tar.bz2) = edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6
-SIZE (xorg/app/xhost-1.0.2.tar.bz2) = 98006
+MD5 (xorg/app/xhost-1.0.3.tar.bz2) = c7f91b4a750d297f269c2a0a3206a1b2
+SHA256 (xorg/app/xhost-1.0.3.tar.bz2) = 2d63007c65e89fe273a43f3e45b3c0133acbc3ceeda6bfc9671388409134ad17
+SIZE (xorg/app/xhost-1.0.3.tar.bz2) = 104910
diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile
index 54c0efcae56e..f2a15f362bbd 100644
--- a/x11/xineramaproto/Makefile
+++ b/x11/xineramaproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xineramaproto
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xineramaproto/distinfo b/x11/xineramaproto/distinfo
index bab5c1b43688..73fe25761403 100644
--- a/x11/xineramaproto/distinfo
+++ b/x11/xineramaproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 1cc292c562962ad0ad3a253cae68c632
-SHA256 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910
-SIZE (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 38413
+MD5 (xorg/proto/xineramaproto-1.2.tar.bz2) = a8aadcb281b9c11a91303e24cdea45f5
+SHA256 (xorg/proto/xineramaproto-1.2.tar.bz2) = 58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64
+SIZE (xorg/proto/xineramaproto-1.2.tar.bz2) = 83852
diff --git a/x11/xineramaproto/pkg-plist b/x11/xineramaproto/pkg-plist
index 10905a2ac56d..37747a1cf0d4 100644
--- a/x11/xineramaproto/pkg-plist
+++ b/x11/xineramaproto/pkg-plist
@@ -1,5 +1,3 @@
-include/X11/extensions/Xinerama.h
-include/X11/extensions/panoramiXext.h
include/X11/extensions/panoramiXproto.h
libdata/pkgconfig/xineramaproto.pc
@dirrmtry include/X11/extensions
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index c586a951d8f7..035cea72c22a 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xinit
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 1d65aebe28e7..789e677aa6d2 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xinit-1.1.1.tar.bz2) = 93c73705ed9eb1e1a6b6938405672f2b
-SHA256 (xorg/app/xinit-1.1.1.tar.bz2) = b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785
-SIZE (xorg/app/xinit-1.1.1.tar.bz2) = 129365
+MD5 (xorg/app/xinit-1.2.0.tar.bz2) = fe1696cab2fbed6fa059d0cd1c53ac13
+SHA256 (xorg/app/xinit-1.2.0.tar.bz2) = ab61663a4421753132d4aac97a873ed20697c4761cb434640f48f350fb65087f
+SIZE (xorg/app/xinit-1.2.0.tar.bz2) = 136781
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 2518eb7df5ea..37386c365a1f 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xinput
-PORTVERSION= 1.4.2
+PORTVERSION= 1.5.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo
index bdf7924e64ed..9dcf0b7a37ef 100644
--- a/x11/xinput/distinfo
+++ b/x11/xinput/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xinput-1.4.2.tar.bz2) = 58e619576cbf4b6057eebb7a97fe2ddf
-SHA256 (xorg/app/xinput-1.4.2.tar.bz2) = 3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b
-SIZE (xorg/app/xinput-1.4.2.tar.bz2) = 108003
+MD5 (xorg/app/xinput-1.5.0.tar.bz2) = 3e8a5f1faccc8ab00c6190e5a34e0a45
+SHA256 (xorg/app/xinput-1.5.0.tar.bz2) = a84728e34bb5edd36ecc1b5489f48ad1467ad5aab1f74f1b7789f826a1ffcaf9
+SIZE (xorg/app/xinput-1.5.0.tar.bz2) = 121172
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 58ce09c89e75..22576101585d 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkbcomp
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
index db401baa9923..0052c928714d 100644
--- a/x11/xkbcomp/distinfo
+++ b/x11/xkbcomp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 6cc96c3e4ed5d9802fe717beac008f19
-SHA256 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1
-SIZE (xorg/app/xkbcomp-1.0.5.tar.bz2) = 201382
+MD5 (xorg/app/xkbcomp-1.1.0.tar.bz2) = 362380be3b3bed56c9ce45622eafc2c9
+SHA256 (xorg/app/xkbcomp-1.1.0.tar.bz2) = cc6714454b88b3dd8086f99b42bbca77cd76bbeaef17a81070f22a21d75a168e
+SIZE (xorg/app/xkbcomp-1.1.0.tar.bz2) = 218419
diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile
index d807980d4f91..071ceaf27301 100644
--- a/x11/xkbevd/Makefile
+++ b/x11/xkbevd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkbevd
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkbevd/distinfo b/x11/xkbevd/distinfo
index 7f1a7af88f21..0e69e244bac5 100644
--- a/x11/xkbevd/distinfo
+++ b/x11/xkbevd/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xkbevd-1.0.2.tar.bz2) = 68f2a143716c23b566f8509d9498f516
-SHA256 (xorg/app/xkbevd-1.0.2.tar.bz2) = 4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b
-SIZE (xorg/app/xkbevd-1.0.2.tar.bz2) = 107794
+MD5 (xorg/app/xkbevd-1.1.0.tar.bz2) = 8d3c1485c2dd62ea7395a37377958a39
+SHA256 (xorg/app/xkbevd-1.1.0.tar.bz2) = 46037add20321ff13954ad91aa5f5f5ec52d78006f9d7c52aa6167622b34a2df
+SIZE (xorg/app/xkbevd-1.1.0.tar.bz2) = 126967
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index c9415530ea77..6110eb29baa2 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xkeyboard-config
-PORTVERSION= 1.6
-PORTREVISION= 1
+PORTVERSION= 1.8
CATEGORIES= x11
MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/
DISTNAME= xkeyboard-config-${PORTVERSION}
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index b71e49607959..dd69262f5a56 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,3 +1,3 @@
-MD5 (xkeyboard-config-1.6.tar.bz2) = 5ae575a9073af12cd71773e065b38b3a
-SHA256 (xkeyboard-config-1.6.tar.bz2) = 50784b02a434887c5abd1b7e73986eb6cad8a7efa79248bfc192f1f1769a3f9a
-SIZE (xkeyboard-config-1.6.tar.bz2) = 631474
+MD5 (xkeyboard-config-1.8.tar.bz2) = 37ae41628cd2ce35d202d30b1820c8ba
+SHA256 (xkeyboard-config-1.8.tar.bz2) = 7dc3e6ca00adb105f46e40f8382e83d50b3fcd626bc8654293dae8b1e80506ce
+SIZE (xkeyboard-config-1.8.tar.bz2) = 650683
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index a26c18c6bed2..21c744ac3924 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -1,4 +1,5 @@
share/X11/xkb/compat.dir
+share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
share/X11/xkb/compat/basic
share/X11/xkb/compat/complete
@@ -18,18 +19,16 @@ share/X11/xkb/compat/pc
share/X11/xkb/compat/pc98
share/X11/xkb/compat/xfree86
share/X11/xkb/compat/xtest
-share/X11/xkb/compat/README
share/X11/xkb/compiled
-share/X11/xkb/geometry/digital_vndr/lk
-share/X11/xkb/geometry/digital_vndr/pc
-share/X11/xkb/geometry/digital_vndr/unix
-share/X11/xkb/geometry/sgi_vndr/indigo
-share/X11/xkb/geometry/sgi_vndr/indy
-share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry.dir
+share/X11/xkb/geometry/README
share/X11/xkb/geometry/amiga
share/X11/xkb/geometry/ataritt
share/X11/xkb/geometry/chicony
share/X11/xkb/geometry/dell
+share/X11/xkb/geometry/digital_vndr/lk
+share/X11/xkb/geometry/digital_vndr/pc
+share/X11/xkb/geometry/digital_vndr/unix
share/X11/xkb/geometry/everex
share/X11/xkb/geometry/fujitsu
share/X11/xkb/geometry/hhk
@@ -39,34 +38,42 @@ share/X11/xkb/geometry/kinesis
share/X11/xkb/geometry/macintosh
share/X11/xkb/geometry/microsoft
share/X11/xkb/geometry/nec
+share/X11/xkb/geometry/nokia
share/X11/xkb/geometry/northgate
share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry/sgi_vndr/indigo
+share/X11/xkb/geometry/sgi_vndr/indy
share/X11/xkb/geometry/sony
share/X11/xkb/geometry/sun
share/X11/xkb/geometry/thinkpad
+share/X11/xkb/geometry/typematrix
share/X11/xkb/geometry/winbook
-share/X11/xkb/geometry/README
-share/X11/xkb/geometry.dir
-share/X11/xkb/keycodes/digital_vndr/lk
-share/X11/xkb/keycodes/digital_vndr/pc
-share/X11/xkb/keycodes/sgi_vndr/indigo
-share/X11/xkb/keycodes/sgi_vndr/indy
-share/X11/xkb/keycodes/sgi_vndr/iris
+share/X11/xkb/keycodes.dir
+share/X11/xkb/keycodes/README
share/X11/xkb/keycodes/aliases
share/X11/xkb/keycodes/amiga
share/X11/xkb/keycodes/ataritt
+share/X11/xkb/keycodes/digital_vndr/lk
+share/X11/xkb/keycodes/digital_vndr/pc
share/X11/xkb/keycodes/evdev
share/X11/xkb/keycodes/fujitsu
share/X11/xkb/keycodes/hp
share/X11/xkb/keycodes/ibm
share/X11/xkb/keycodes/macintosh
+share/X11/xkb/keycodes/sgi_vndr/indigo
+share/X11/xkb/keycodes/sgi_vndr/indy
+share/X11/xkb/keycodes/sgi_vndr/iris
share/X11/xkb/keycodes/sony
share/X11/xkb/keycodes/sun
share/X11/xkb/keycodes/xfree86
share/X11/xkb/keycodes/xfree98
-share/X11/xkb/keycodes/README
-share/X11/xkb/keycodes.dir
+share/X11/xkb/keymap.dir
+share/X11/xkb/keymap/README
+share/X11/xkb/keymap/amiga
+share/X11/xkb/keymap/ataritt
share/X11/xkb/keymap/digital_vndr/us
+share/X11/xkb/keymap/macintosh
share/X11/xkb/keymap/sgi_vndr/be
share/X11/xkb/keymap/sgi_vndr/bg
share/X11/xkb/keymap/sgi_vndr/ca
@@ -90,6 +97,7 @@ share/X11/xkb/keymap/sgi_vndr/se
share/X11/xkb/keymap/sgi_vndr/sk
share/X11/xkb/keymap/sgi_vndr/th
share/X11/xkb/keymap/sgi_vndr/us
+share/X11/xkb/keymap/sony
share/X11/xkb/keymap/sun_vndr/all
share/X11/xkb/keymap/sun_vndr/de
share/X11/xkb/keymap/sun_vndr/es
@@ -101,18 +109,15 @@ share/X11/xkb/keymap/sun_vndr/ru
share/X11/xkb/keymap/sun_vndr/se
share/X11/xkb/keymap/sun_vndr/uk
share/X11/xkb/keymap/sun_vndr/us
-share/X11/xkb/keymap/amiga
-share/X11/xkb/keymap/ataritt
-share/X11/xkb/keymap/macintosh
-share/X11/xkb/keymap/sony
share/X11/xkb/keymap/xfree86
share/X11/xkb/keymap/xfree98
-share/X11/xkb/keymap/README
-share/X11/xkb/keymap.dir
+share/X11/xkb/rules/README
share/X11/xkb/rules/base
+share/X11/xkb/rules/base.extras.xml
share/X11/xkb/rules/base.lst
share/X11/xkb/rules/base.xml
share/X11/xkb/rules/evdev
+share/X11/xkb/rules/evdev.extras.xml
share/X11/xkb/rules/evdev.lst
share/X11/xkb/rules/evdev.xml
share/X11/xkb/rules/xfree98
@@ -120,124 +125,102 @@ share/X11/xkb/rules/xkb.dtd
share/X11/xkb/rules/xorg
share/X11/xkb/rules/xorg.lst
share/X11/xkb/rules/xorg.xml
-share/X11/xkb/rules/README
share/X11/xkb/semantics.dir
share/X11/xkb/semantics/basic
share/X11/xkb/semantics/complete
share/X11/xkb/semantics/default
share/X11/xkb/semantics/xtest
-share/X11/xkb/symbols/digital_vndr/lk
-share/X11/xkb/symbols/digital_vndr/pc
-share/X11/xkb/symbols/digital_vndr/us
-share/X11/xkb/symbols/digital_vndr/vt
-share/X11/xkb/symbols/fujitsu_vndr/jp
-share/X11/xkb/symbols/fujitsu_vndr/us
-share/X11/xkb/symbols/hp_vndr/us
-share/X11/xkb/symbols/kpdl
-share/X11/xkb/symbols/macintosh_vndr/apple
-share/X11/xkb/symbols/macintosh_vndr/ch
-share/X11/xkb/symbols/macintosh_vndr/de
-share/X11/xkb/symbols/macintosh_vndr/dk
-share/X11/xkb/symbols/macintosh_vndr/es
-share/X11/xkb/symbols/macintosh_vndr/fi
-share/X11/xkb/symbols/macintosh_vndr/fr
-share/X11/xkb/symbols/macintosh_vndr/gb
-share/X11/xkb/symbols/macintosh_vndr/is
-share/X11/xkb/symbols/macintosh_vndr/it
-share/X11/xkb/symbols/macintosh_vndr/latam
-share/X11/xkb/symbols/macintosh_vndr/nl
-share/X11/xkb/symbols/macintosh_vndr/no
-share/X11/xkb/symbols/macintosh_vndr/pt
-share/X11/xkb/symbols/macintosh_vndr/se
-share/X11/xkb/symbols/macintosh_vndr/us
-share/X11/xkb/symbols/nec_vndr/jp
-share/X11/xkb/symbols/olpc
-share/X11/xkb/symbols/sgi_vndr/jp
-share/X11/xkb/symbols/shift
-share/X11/xkb/symbols/sony_vndr/us
-share/X11/xkb/symbols/sun_vndr/cs
-share/X11/xkb/symbols/sun_vndr/cz
-share/X11/xkb/symbols/sun_vndr/de
-share/X11/xkb/symbols/sun_vndr/dk
-share/X11/xkb/symbols/sun_vndr/es
-share/X11/xkb/symbols/sun_vndr/fi
-share/X11/xkb/symbols/sun_vndr/fr
-share/X11/xkb/symbols/sun_vndr/gb
-share/X11/xkb/symbols/sun_vndr/gr
-share/X11/xkb/symbols/sun_vndr/hu
-share/X11/xkb/symbols/sun_vndr/it
-share/X11/xkb/symbols/sun_vndr/jp
-share/X11/xkb/symbols/sun_vndr/ko
-share/X11/xkb/symbols/sun_vndr/lt
-share/X11/xkb/symbols/sun_vndr/lv
-share/X11/xkb/symbols/sun_vndr/nl
-share/X11/xkb/symbols/sun_vndr/no
-share/X11/xkb/symbols/sun_vndr/pl
-share/X11/xkb/symbols/sun_vndr/pt
-share/X11/xkb/symbols/sun_vndr/ru
-share/X11/xkb/symbols/sun_vndr/se
-share/X11/xkb/symbols/sun_vndr/solaris
-share/X11/xkb/symbols/sun_vndr/sw
-share/X11/xkb/symbols/sun_vndr/tr
-share/X11/xkb/symbols/sun_vndr/tuv
-share/X11/xkb/symbols/sun_vndr/tw
-share/X11/xkb/symbols/sun_vndr/us
-share/X11/xkb/symbols/sun_vndr/usb
-share/X11/xkb/symbols/xfree68_vndr/amiga
-share/X11/xkb/symbols/xfree68_vndr/ataritt
+share/X11/xkb/symbols.dir
share/X11/xkb/symbols/ad
share/X11/xkb/symbols/af
share/X11/xkb/symbols/al
+share/X11/xkb/symbols/altwin
share/X11/xkb/symbols/am
share/X11/xkb/symbols/ara
share/X11/xkb/symbols/az
-share/X11/xkb/symbols/be
+share/X11/xkb/symbols/ba
share/X11/xkb/symbols/bd
+share/X11/xkb/symbols/be
share/X11/xkb/symbols/bg
share/X11/xkb/symbols/br
-share/X11/xkb/symbols/ba
+share/X11/xkb/symbols/brai
share/X11/xkb/symbols/bt
share/X11/xkb/symbols/by
share/X11/xkb/symbols/ca
+share/X11/xkb/symbols/capslock
share/X11/xkb/symbols/cd
share/X11/xkb/symbols/ch
share/X11/xkb/symbols/cn
+share/X11/xkb/symbols/compose
+share/X11/xkb/symbols/ctrl
share/X11/xkb/symbols/cz
share/X11/xkb/symbols/de
+share/X11/xkb/symbols/digital_vndr/lk
+share/X11/xkb/symbols/digital_vndr/pc
+share/X11/xkb/symbols/digital_vndr/us
+share/X11/xkb/symbols/digital_vndr/vt
share/X11/xkb/symbols/dk
share/X11/xkb/symbols/ee
share/X11/xkb/symbols/epo
share/X11/xkb/symbols/es
share/X11/xkb/symbols/et
+share/X11/xkb/symbols/eurosign
+share/X11/xkb/symbols/extras/apl
+share/X11/xkb/symbols/extras/rs
+share/X11/xkb/symbols/extras/us
share/X11/xkb/symbols/fi
share/X11/xkb/symbols/fo
share/X11/xkb/symbols/fr
+share/X11/xkb/symbols/fujitsu_vndr/jp
+share/X11/xkb/symbols/fujitsu_vndr/us
share/X11/xkb/symbols/gb
share/X11/xkb/symbols/ge
share/X11/xkb/symbols/gh
share/X11/xkb/symbols/gn
share/X11/xkb/symbols/gr
+share/X11/xkb/symbols/group
+share/X11/xkb/symbols/hp_vndr/us
share/X11/xkb/symbols/hr
share/X11/xkb/symbols/hu
share/X11/xkb/symbols/ie
share/X11/xkb/symbols/il
share/X11/xkb/symbols/in
+share/X11/xkb/symbols/inet
share/X11/xkb/symbols/iq
share/X11/xkb/symbols/ir
share/X11/xkb/symbols/is
share/X11/xkb/symbols/it
share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/keypad
share/X11/xkb/symbols/kg
share/X11/xkb/symbols/kh
+share/X11/xkb/symbols/kpdl
share/X11/xkb/symbols/kr
share/X11/xkb/symbols/kz
share/X11/xkb/symbols/la
share/X11/xkb/symbols/latam
share/X11/xkb/symbols/latin
+share/X11/xkb/symbols/level3
+share/X11/xkb/symbols/level5
share/X11/xkb/symbols/lk
share/X11/xkb/symbols/lt
share/X11/xkb/symbols/lv
share/X11/xkb/symbols/ma
+share/X11/xkb/symbols/macintosh_vndr/apple
+share/X11/xkb/symbols/macintosh_vndr/ch
+share/X11/xkb/symbols/macintosh_vndr/de
+share/X11/xkb/symbols/macintosh_vndr/dk
+share/X11/xkb/symbols/macintosh_vndr/fi
+share/X11/xkb/symbols/macintosh_vndr/fr
+share/X11/xkb/symbols/macintosh_vndr/gb
+share/X11/xkb/symbols/macintosh_vndr/is
+share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/latam
+share/X11/xkb/symbols/macintosh_vndr/nl
+share/X11/xkb/symbols/macintosh_vndr/no
+share/X11/xkb/symbols/macintosh_vndr/pt
+share/X11/xkb/symbols/macintosh_vndr/se
+share/X11/xkb/symbols/macintosh_vndr/us
share/X11/xkb/symbols/mao
share/X11/xkb/symbols/me
share/X11/xkb/symbols/mk
@@ -246,10 +229,15 @@ share/X11/xkb/symbols/mn
share/X11/xkb/symbols/mt
share/X11/xkb/symbols/mv
share/X11/xkb/symbols/nbsp
+share/X11/xkb/symbols/nec_vndr/jp
share/X11/xkb/symbols/ng
share/X11/xkb/symbols/nl
share/X11/xkb/symbols/no
+share/X11/xkb/symbols/nokia_vndr/rx-44
+share/X11/xkb/symbols/nokia_vndr/rx-51
+share/X11/xkb/symbols/nokia_vndr/su-8w
share/X11/xkb/symbols/np
+share/X11/xkb/symbols/olpc
share/X11/xkb/symbols/pc
share/X11/xkb/symbols/pk
share/X11/xkb/symbols/pl
@@ -258,35 +246,57 @@ share/X11/xkb/symbols/ro
share/X11/xkb/symbols/rs
share/X11/xkb/symbols/ru
share/X11/xkb/symbols/se
+share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/shift
share/X11/xkb/symbols/si
share/X11/xkb/symbols/sk
share/X11/xkb/symbols/sn
+share/X11/xkb/symbols/sony_vndr/us
+share/X11/xkb/symbols/srvr_ctrl
+share/X11/xkb/symbols/sun_vndr/cs
+share/X11/xkb/symbols/sun_vndr/cz
+share/X11/xkb/symbols/sun_vndr/de
+share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/es
+share/X11/xkb/symbols/sun_vndr/fi
+share/X11/xkb/symbols/sun_vndr/fr
+share/X11/xkb/symbols/sun_vndr/gb
+share/X11/xkb/symbols/sun_vndr/gr
+share/X11/xkb/symbols/sun_vndr/hu
+share/X11/xkb/symbols/sun_vndr/it
+share/X11/xkb/symbols/sun_vndr/jp
+share/X11/xkb/symbols/sun_vndr/ko
+share/X11/xkb/symbols/sun_vndr/lt
+share/X11/xkb/symbols/sun_vndr/lv
+share/X11/xkb/symbols/sun_vndr/nl
+share/X11/xkb/symbols/sun_vndr/no
+share/X11/xkb/symbols/sun_vndr/pl
+share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ru
+share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/solaris
+share/X11/xkb/symbols/sun_vndr/sw
+share/X11/xkb/symbols/sun_vndr/tr
+share/X11/xkb/symbols/sun_vndr/tuv
+share/X11/xkb/symbols/sun_vndr/tw
+share/X11/xkb/symbols/sun_vndr/us
+share/X11/xkb/symbols/sun_vndr/usb
share/X11/xkb/symbols/sy
+share/X11/xkb/symbols/terminate
share/X11/xkb/symbols/th
share/X11/xkb/symbols/tj
share/X11/xkb/symbols/tm
share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/typo
share/X11/xkb/symbols/ua
share/X11/xkb/symbols/us
share/X11/xkb/symbols/uz
share/X11/xkb/symbols/vn
+share/X11/xkb/symbols/xfree68_vndr/amiga
+share/X11/xkb/symbols/xfree68_vndr/ataritt
share/X11/xkb/symbols/za
-share/X11/xkb/symbols/altwin
-share/X11/xkb/symbols/brai
-share/X11/xkb/symbols/capslock
-share/X11/xkb/symbols/compose
-share/X11/xkb/symbols/ctrl
-share/X11/xkb/symbols/group
-share/X11/xkb/symbols/inet
-share/X11/xkb/symbols/keypad
-share/X11/xkb/symbols/level3
-share/X11/xkb/symbols/level5
-share/X11/xkb/symbols/srvr_ctrl
-share/X11/xkb/symbols/terminate
-share/X11/xkb/symbols/typo
-share/X11/xkb/symbols/eurosign
-share/X11/xkb/symbols.dir
share/X11/xkb/types.dir
+share/X11/xkb/types/README
share/X11/xkb/types/basic
share/X11/xkb/types/cancel
share/X11/xkb/types/caps
@@ -296,9 +306,9 @@ share/X11/xkb/types/extra
share/X11/xkb/types/iso9995
share/X11/xkb/types/level5
share/X11/xkb/types/mousekeys
+share/X11/xkb/types/nokia
share/X11/xkb/types/numpad
share/X11/xkb/types/pc
-share/X11/xkb/types/README
share/X11/xkb/xkbcomp
%%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo
@@ -335,37 +345,39 @@ share/X11/xkb/xkbcomp
%%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw
+%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ky
+%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
@exec mkdir -p /var/lib/xkb
-@dirrm share/X11/xkb/compat
-@dirrm share/X11/xkb/geometry/digital_vndr
-@dirrm share/X11/xkb/geometry/sgi_vndr
-@dirrm share/X11/xkb/geometry
-@dirrm share/X11/xkb/keycodes/digital_vndr
-@dirrm share/X11/xkb/keycodes/sgi_vndr
-@dirrm share/X11/xkb/keycodes
-@dirrm share/X11/xkb/keymap/digital_vndr
-@dirrm share/X11/xkb/keymap/sgi_vndr
-@dirrm share/X11/xkb/keymap/sun_vndr
-@dirrm share/X11/xkb/keymap
-@dirrm share/X11/xkb/rules
-@dirrm share/X11/xkb/semantics
-@dirrm share/X11/xkb/symbols/digital_vndr
-@dirrm share/X11/xkb/symbols/fujitsu_vndr
-@dirrm share/X11/xkb/symbols/hp_vndr
-@dirrm share/X11/xkb/symbols/macintosh_vndr
-@dirrm share/X11/xkb/symbols/nec_vndr
-@dirrm share/X11/xkb/symbols/sgi_vndr
-@dirrm share/X11/xkb/symbols/sony_vndr
-@dirrm share/X11/xkb/symbols/sun_vndr
+@dirrmtry share/locale/crh
+@dirrm share/X11/xkb/types
@dirrm share/X11/xkb/symbols/xfree68_vndr
+@dirrm share/X11/xkb/symbols/sun_vndr
+@dirrm share/X11/xkb/symbols/sony_vndr
+@dirrm share/X11/xkb/symbols/sgi_vndr
+@dirrm share/X11/xkb/symbols/nokia_vndr
+@dirrm share/X11/xkb/symbols/nec_vndr
+@dirrm share/X11/xkb/symbols/macintosh_vndr
+@dirrm share/X11/xkb/symbols/hp_vndr
+@dirrm share/X11/xkb/symbols/fujitsu_vndr
+@dirrm share/X11/xkb/symbols/extras
+@dirrm share/X11/xkb/symbols/digital_vndr
@dirrm share/X11/xkb/symbols
-@dirrm share/X11/xkb/types
+@dirrm share/X11/xkb/semantics
+@dirrm share/X11/xkb/rules
+@dirrm share/X11/xkb/keymap/sun_vndr
+@dirrm share/X11/xkb/keymap/sgi_vndr
+@dirrm share/X11/xkb/keymap/digital_vndr
+@dirrm share/X11/xkb/keymap
+@dirrm share/X11/xkb/keycodes/sgi_vndr
+@dirrm share/X11/xkb/keycodes/digital_vndr
+@dirrm share/X11/xkb/keycodes
+@dirrm share/X11/xkb/geometry/sgi_vndr
+@dirrm share/X11/xkb/geometry/digital_vndr
+@dirrm share/X11/xkb/geometry
+@dirrm share/X11/xkb/compat
@dirrm share/X11/xkb
-@dirrmtry share/X11
-@dirrmtry /var/lib/xkb
-%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/crh
-%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ky
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
+@dirrm share/X11
+@dirrmtry var/lib/xkb
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index 2abf419eb3d9..758b6f66fe91 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkill
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkill/distinfo b/x11/xkill/distinfo
index 31c0d15973af..65e83cbf40ad 100644
--- a/x11/xkill/distinfo
+++ b/x11/xkill/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xkill-1.0.1.tar.bz2) = f66d76abb0f75514ca32272e23cca757
-SHA256 (xorg/app/xkill-1.0.1.tar.bz2) = 77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de
-SIZE (xorg/app/xkill-1.0.1.tar.bz2) = 77172
+MD5 (xorg/app/xkill-1.0.2.tar.bz2) = dca031355b4afcf8517a8258eeb730c3
+SHA256 (xorg/app/xkill-1.0.2.tar.bz2) = 532df0398d3f4eab1cba8d0367c02a293ca74f2d89a27ef014854a2bde9a5a27
+SIZE (xorg/app/xkill-1.0.2.tar.bz2) = 98306
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 0704a6d8a089..709b9611d54d 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xlogo
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlogo/distinfo b/x11/xlogo/distinfo
index a1d249922a91..6bb9bc6f82ba 100644
--- a/x11/xlogo/distinfo
+++ b/x11/xlogo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xlogo-1.0.1.tar.bz2) = 4c5482552f38a7d42398a694cc9b2ee6
-SHA256 (xorg/app/xlogo-1.0.1.tar.bz2) = de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2
-SIZE (xorg/app/xlogo-1.0.1.tar.bz2) = 87107
+MD5 (xorg/app/xlogo-1.0.2.tar.bz2) = 7365c0852750134119734bc1879f60ca
+SHA256 (xorg/app/xlogo-1.0.2.tar.bz2) = 47a8aa4e8190772e24dd58266fdd4ba2723b5d7a23365a3e4c07c1263ffb3130
+SIZE (xorg/app/xlogo-1.0.2.tar.bz2) = 111909
diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile
index 1ba6c2505936..1cfb69187258 100644
--- a/x11/xlsatoms/Makefile
+++ b/x11/xlsatoms/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xlsatoms
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlsatoms/distinfo b/x11/xlsatoms/distinfo
index 34c95c27736d..3e895af5774c 100644
--- a/x11/xlsatoms/distinfo
+++ b/x11/xlsatoms/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 69adcda848479acc3b82b3928812d191
-SHA256 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a
-SIZE (xorg/app/xlsatoms-1.0.1.tar.bz2) = 74852
+MD5 (xorg/app/xlsatoms-1.0.2.tar.bz2) = dc8b420bbfa35091ea30edf57c952ec2
+SHA256 (xorg/app/xlsatoms-1.0.2.tar.bz2) = d66cd7682e5ea2a52e8da8a75ea6154f40a3a69938c6c2cf5d5c1e012f5c121b
+SIZE (xorg/app/xlsatoms-1.0.2.tar.bz2) = 95320
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
index 4d87441eaf3c..834799f92e42 100644
--- a/x11/xlsclients/Makefile
+++ b/x11/xlsclients/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xlsclients
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlsclients/distinfo b/x11/xlsclients/distinfo
index baa6753a1493..7ce3a981ed23 100644
--- a/x11/xlsclients/distinfo
+++ b/x11/xlsclients/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xlsclients-1.0.1.tar.bz2) = 44473b880d26bfbe8b3d4d72b183cba7
-SHA256 (xorg/app/xlsclients-1.0.1.tar.bz2) = 988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698
-SIZE (xorg/app/xlsclients-1.0.1.tar.bz2) = 75484
+MD5 (xorg/app/xlsclients-1.0.2.tar.bz2) = df270f7dd5528ae1b7d80c47585d8278
+SHA256 (xorg/app/xlsclients-1.0.2.tar.bz2) = 8527cdd29d4fcc67df014bc8b371be98901c9082b8de81ea2302bf705c887698
+SIZE (xorg/app/xlsclients-1.0.2.tar.bz2) = 96011
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index b6fa26726734..0a0536b60086 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmag
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmag/distinfo b/x11/xmag/distinfo
index 771733429c19..58a5600dc7e6 100644
--- a/x11/xmag/distinfo
+++ b/x11/xmag/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xmag-1.0.2.tar.bz2) = 7c6a783e42c88360ac31d259a864a19d
-SHA256 (xorg/app/xmag-1.0.2.tar.bz2) = 51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43
-SIZE (xorg/app/xmag-1.0.2.tar.bz2) = 106793
+MD5 (xorg/app/xmag-1.0.3.tar.bz2) = 32f7ed4c089365cadb9382f6fbd750a9
+SHA256 (xorg/app/xmag-1.0.3.tar.bz2) = 0368268a352d302d0b84229a71e3ea0e8d1c44019b1f06b6301ad7a106418553
+SIZE (xorg/app/xmag-1.0.3.tar.bz2) = 111523
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index b44407a9b1d1..37a00785927b 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xman
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xman/distinfo b/x11/xman/distinfo
index 773d58a7ace0..3caa172c85c8 100644
--- a/x11/xman/distinfo
+++ b/x11/xman/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xman-1.0.3.tar.bz2) = 3d3a4b310a65ccce82472ef83acbbf97
-SHA256 (xorg/app/xman-1.0.3.tar.bz2) = 38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a
-SIZE (xorg/app/xman-1.0.3.tar.bz2) = 142846
+MD5 (xorg/app/xman-1.1.0.tar.bz2) = 5e5b3351bac26cc1f8490faf1c1402bb
+SHA256 (xorg/app/xman-1.1.0.tar.bz2) = 9d617ed760fe2147baae5ad9cbbdd85f1bb7534acfc3327bb51dad42e8bcc8b0
+SIZE (xorg/app/xman-1.1.0.tar.bz2) = 152855
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index d31818d631e2..f48aedf9137f 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmessage
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmessage/distinfo b/x11/xmessage/distinfo
index 1d795d74c182..58c0d9d60c9f 100644
--- a/x11/xmessage/distinfo
+++ b/x11/xmessage/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xmessage-1.0.2.tar.bz2) = b4b561ef11fd184989a6062962e86748
-SHA256 (xorg/app/xmessage-1.0.2.tar.bz2) = 02b4016e93acab94105fa61f6dbe13082669276ab4650b871835fb7884b0c3c3
-SIZE (xorg/app/xmessage-1.0.2.tar.bz2) = 94805
+MD5 (xorg/app/xmessage-1.0.3.tar.bz2) = 76ac52710234ebb9d0e2762bb5d11ea1
+SHA256 (xorg/app/xmessage-1.0.3.tar.bz2) = cfa35d3ad4ad1306e49878163982e9d54872a20a497e77ab0a8d5de05c8b3d5b
+SIZE (xorg/app/xmessage-1.0.3.tar.bz2) = 110604
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
index c252f7b22bf1..a3012cfc6114 100644
--- a/x11/xmodmap/Makefile
+++ b/x11/xmodmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xmodmap
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmodmap/distinfo b/x11/xmodmap/distinfo
index 1fbcd64f9b46..ed3663a4e914 100644
--- a/x11/xmodmap/distinfo
+++ b/x11/xmodmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xmodmap-1.0.3.tar.bz2) = 626731003ec22a74ecf9e44ed098bbdf
-SHA256 (xorg/app/xmodmap-1.0.3.tar.bz2) = c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f
-SIZE (xorg/app/xmodmap-1.0.3.tar.bz2) = 102730
+MD5 (xorg/app/xmodmap-1.0.4.tar.bz2) = bbe021f812e0014a8ee3692317788119
+SHA256 (xorg/app/xmodmap-1.0.4.tar.bz2) = 805a63525d99f59d60a11aa89121fb9cdb001c8d542237ac4deafbadc7bd0bed
+SIZE (xorg/app/xmodmap-1.0.4.tar.bz2) = 115513
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index aa1d21abbd06..21ae19683dac 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-apps
-PORTVERSION= 7.4
-PORTREVISION= 2
+PORTVERSION= 7.5
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 27d30b73587a..935167635034 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-cf-files
-PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index 06ed7fc59d3d..7d5c563f6dd7 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 5f62dd5545b782c74f6e4e70d0e6552c
-SHA256 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = e34613aec2d3d56e1917bd8469f228b9654558f41e335d7e8e49020779fa9597
-SIZE (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 264638
+MD5 (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = 10546b5ddda3cdda7950bb56bf98e0ea
+SHA256 (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = bc32ded8fb8dacdbbe44012ff51e3b797da1f1199cc673bddc3028bec4e1e20b
+SIZE (xorg/util/xorg-cf-files-1.0.3.tar.bz2) = 342708
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 1bf7d561b2a4..05c3301dbb56 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-libraries
-PORTVERSION= 7.4
+PORTVERSION= 7.5
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 9bfe85af33af..ef934294dbea 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg
-PORTVERSION= 7.4
-PORTREVISION= 4
+PORTVERSION= 7.5
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile
index 2ffa20de640e..e3402695b346 100644
--- a/x11/xpr/Makefile
+++ b/x11/xpr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xpr
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xpr/distinfo b/x11/xpr/distinfo
index f058ba16c643..a41fbb2a165e 100644
--- a/x11/xpr/distinfo
+++ b/x11/xpr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xpr-1.0.2.tar.bz2) = 6b3a6896081f628bf5a2c9129417c86f
-SHA256 (xorg/app/xpr-1.0.2.tar.bz2) = c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf
-SIZE (xorg/app/xpr-1.0.2.tar.bz2) = 117849
+MD5 (xorg/app/xpr-1.0.3.tar.bz2) = 1c2c540d240def3ea65ff2030f059f8a
+SHA256 (xorg/app/xpr-1.0.3.tar.bz2) = 2878d6b04ef81ec415fa81313565bee521bf94132127615b9d717d5a489b937d
+SIZE (xorg/app/xpr-1.0.3.tar.bz2) = 128135
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
index ce521badd5c9..be7851470943 100644
--- a/x11/xprop/Makefile
+++ b/x11/xprop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xprop
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo
index 4db994cbd5ee..517fcf3e8dbd 100644
--- a/x11/xprop/distinfo
+++ b/x11/xprop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xprop-1.0.4.tar.bz2) = 48aa8fd78802f477dcbf9ef0dfd9f783
-SHA256 (xorg/app/xprop-1.0.4.tar.bz2) = daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772
-SIZE (xorg/app/xprop-1.0.4.tar.bz2) = 109102
+MD5 (xorg/app/xprop-1.1.0.tar.bz2) = f0bacbd30f0dd1c1e9ccafe97687b7a4
+SHA256 (xorg/app/xprop-1.1.0.tar.bz2) = cc8e07901574895f113baffda19272c54545879e02012314527ebbf2dcc66226
+SIZE (xorg/app/xprop-1.1.0.tar.bz2) = 117342
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index c6a6196d29e9..8a1d46593c42 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xproto
-PORTVERSION= 7.0.15
+PORTVERSION= 7.0.16
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 1609395879e3..fbd196082d2f 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xproto-7.0.15.tar.bz2) = 1a2b31430d04340be2e49e8b6445e076
-SHA256 (xorg/proto/xproto-7.0.15.tar.bz2) = fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee
-SIZE (xorg/proto/xproto-7.0.15.tar.bz2) = 159189
+MD5 (xorg/proto/xproto-7.0.16.tar.bz2) = 75c9edff1f3823e5ab6bb9e66821a901
+SHA256 (xorg/proto/xproto-7.0.16.tar.bz2) = 8224da1ce19c0ded4e07a325f3ed62bb4453782db97fd175cb3ffd1acaeb9672
+SIZE (xorg/proto/xproto-7.0.16.tar.bz2) = 159876
diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile
index 06c625b5eeb6..56ba5be03c57 100644
--- a/x11/xproxymanagementprotocol/Makefile
+++ b/x11/xproxymanagementprotocol/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xproxymanagementprotocol
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xproxymanagementprotocol/distinfo b/x11/xproxymanagementprotocol/distinfo
index f7807bd4334d..27690f37a8ef 100644
--- a/x11/xproxymanagementprotocol/distinfo
+++ b/x11/xproxymanagementprotocol/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = d28007a50976204960fc1fc07b4ca093
-SHA256 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc
-SIZE (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = 37007
+MD5 (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 9de22ca1522008c28fb03dfc41ba2d30
+SHA256 (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2
+SIZE (xorg/proto/xproxymanagementprotocol-1.0.3.tar.bz2) = 84154
diff --git a/x11/xproxymanagementprotocol/pkg-plist b/x11/xproxymanagementprotocol/pkg-plist
index 19895969c0e2..38f8435bcd44 100644
--- a/x11/xproxymanagementprotocol/pkg-plist
+++ b/x11/xproxymanagementprotocol/pkg-plist
@@ -1,4 +1,6 @@
include/X11/PM/PM.h
include/X11/PM/PMproto.h
libdata/pkgconfig/xproxymngproto.pc
-@dirrm include/X11/PM
+%%DOCSDIR%%/PM_spec
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/PM
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 9626ee6d3ca5..50fa56d2d19d 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrandr
-PORTVERSION= 1.3.0
+PORTVERSION= 1.3.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index ae0d200b9566..be89f342d3a4 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrandr-1.3.0.tar.bz2) = 616612a15711a4422e71be6acc42ca3c
-SHA256 (xorg/app/xrandr-1.3.0.tar.bz2) = 24c93868edd34519df76c736e20b39653a31eb2609bea61e538e45dc340556f0
-SIZE (xorg/app/xrandr-1.3.0.tar.bz2) = 128126
+MD5 (xorg/app/xrandr-1.3.2.tar.bz2) = 2cb19bb1c19ccf77c40032b03dbe06f0
+SHA256 (xorg/app/xrandr-1.3.2.tar.bz2) = 34d4334644a6494573141bb8647feb8f91c0ce8c8d3b6883b4861e038e912249
+SIZE (xorg/app/xrandr-1.3.2.tar.bz2) = 129645
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index bbd25bc386fd..7f30c744adc6 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrdb
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo
index a0467d148b27..6b92f9a72978 100644
--- a/x11/xrdb/distinfo
+++ b/x11/xrdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrdb-1.0.5.tar.bz2) = 9c30b8e1709d5367beb7706146640c07
-SHA256 (xorg/app/xrdb-1.0.5.tar.bz2) = c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa
-SIZE (xorg/app/xrdb-1.0.5.tar.bz2) = 101484
+MD5 (xorg/app/xrdb-1.0.6.tar.bz2) = 8dd881cd5a7dcb6e456549817f0fb475
+SHA256 (xorg/app/xrdb-1.0.6.tar.bz2) = 8d062a3764665fcf22b14df4a5aca6af1e6d7d613296875b31b68e74ef66fc99
+SIZE (xorg/app/xrdb-1.0.6.tar.bz2) = 108542
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
index 2214a510b18c..23e68fed7d12 100644
--- a/x11/xrefresh/Makefile
+++ b/x11/xrefresh/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrefresh
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrefresh/distinfo b/x11/xrefresh/distinfo
index c17a1d26377c..a2af461f1a62 100644
--- a/x11/xrefresh/distinfo
+++ b/x11/xrefresh/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrefresh-1.0.2.tar.bz2) = 1228f890f86148e4e6ae22aa73118cbb
-SHA256 (xorg/app/xrefresh-1.0.2.tar.bz2) = 522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5
-SIZE (xorg/app/xrefresh-1.0.2.tar.bz2) = 80590
+MD5 (xorg/app/xrefresh-1.0.3.tar.bz2) = 8f4fafcfb77b3c6972cc44bb3f1c899c
+SHA256 (xorg/app/xrefresh-1.0.3.tar.bz2) = 3ee0a5f7aeb14bbffbcafcff8e7806c9a59f08e1a58322a50f5fca023a7d7ed9
+SIZE (xorg/app/xrefresh-1.0.3.tar.bz2) = 96931
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index d3f92e777c91..0aeb45597f8e 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xrx
-PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrx/distinfo b/x11/xrx/distinfo
index 86280543a985..93aa10ae1b59 100644
--- a/x11/xrx/distinfo
+++ b/x11/xrx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrx-1.0.1.tar.bz2) = 5f65e24f8a225e255beb2059e33d6b37
-SHA256 (xorg/app/xrx-1.0.1.tar.bz2) = a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4
-SIZE (xorg/app/xrx-1.0.1.tar.bz2) = 265332
+MD5 (xorg/app/xrx-1.0.3.tar.bz2) = c121945afcfc84e99af17158fda68be9
+SHA256 (xorg/app/xrx-1.0.3.tar.bz2) = 9cb0fc67153ce935550d61dfd3d021cb3e6833274453538885b7cddff9fe8abe
+SIZE (xorg/app/xrx-1.0.3.tar.bz2) = 323776
diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist
index 7fa9e3aa3093..db6dd2cfe397 100644
--- a/x11/xrx/pkg-plist
+++ b/x11/xrx/pkg-plist
@@ -1,9 +1,8 @@
bin/xrx
-lib/libxrx.so.0
-lib/libxrx.so
-lib/libxrx.la
lib/libxrx.a
-lib/libxrxnest.so.0
-lib/libxrxnest.so
-lib/libxrxnest.la
+lib/libxrx.la
+lib/libxrx.so
lib/libxrxnest.a
+lib/libxrxnest.la
+lib/libxrxnest.so
+@dirrmtry include/X11/extensions \ No newline at end of file
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index b0f144e6ac24..df112ad4c363 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xset
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xset/distinfo b/x11/xset/distinfo
index 0202548cfcb1..ed7e109af19a 100644
--- a/x11/xset/distinfo
+++ b/x11/xset/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xset-1.0.4.tar.bz2) = 2f41fd983ba4d89419204854936025e2
-SHA256 (xorg/app/xset-1.0.4.tar.bz2) = 6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad
-SIZE (xorg/app/xset-1.0.4.tar.bz2) = 103613
+MD5 (xorg/app/xset-1.1.0.tar.bz2) = eeb0d02f69c76bd40470dede99b4bd49
+SHA256 (xorg/app/xset-1.1.0.tar.bz2) = 72c859c6030890a25cf828d0b2743454e50eadab30f6be8c17172fe97a554643
+SIZE (xorg/app/xset-1.1.0.tar.bz2) = 113643
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
index 796333308f54..816b59954fb2 100644
--- a/x11/xsetroot/Makefile
+++ b/x11/xsetroot/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xsetroot
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xsetroot/distinfo b/x11/xsetroot/distinfo
index f5f9b99aae52..c4f81ff1434d 100644
--- a/x11/xsetroot/distinfo
+++ b/x11/xsetroot/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xsetroot-1.0.2.tar.bz2) = 9af7db9f3052aef0b11636720b3101dd
-SHA256 (xorg/app/xsetroot-1.0.2.tar.bz2) = 4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d
-SIZE (xorg/app/xsetroot-1.0.2.tar.bz2) = 88136
+MD5 (xorg/app/xsetroot-1.0.3.tar.bz2) = cbda9b9b8da5af4614110883d5a276b8
+SHA256 (xorg/app/xsetroot-1.0.3.tar.bz2) = d7e512cc686de3ab5fcd3c9f9e605d7cae68a4b50f2c0786f0f09ce08c728f48
+SIZE (xorg/app/xsetroot-1.0.3.tar.bz2) = 101384
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 598e49e6ffe4..20e6269b27dd 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xtrans
-PORTVERSION= 1.2.3
+PORTVERSION= 1.2.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index 4a936d325253..2ef62bf41c7a 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/xtrans-1.2.3.tar.bz2) = f9cf791dfad59cf044e276aab3a71e1d
-SHA256 (xorg/lib/xtrans-1.2.3.tar.bz2) = a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
-SIZE (xorg/lib/xtrans-1.2.3.tar.bz2) = 104280
+MD5 (xorg/lib/xtrans-1.2.5.tar.bz2) = 2d1e57e82acc5f21797e92341415af2f
+SHA256 (xorg/lib/xtrans-1.2.5.tar.bz2) = cc71a391f4da8176e5daeeac1ddf5137ba5e8d2263cb93a49f9e2a9976b90899
+SIZE (xorg/lib/xtrans-1.2.5.tar.bz2) = 141859
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
index e0184a46f275..d14b3a3c5aa6 100644
--- a/x11/xtrans/pkg-plist
+++ b/x11/xtrans/pkg-plist
@@ -8,4 +8,5 @@ include/X11/Xtrans/Xtransutil.c
include/X11/Xtrans/transport.c
libdata/pkgconfig/xtrans.pc
share/aclocal/xtrans.m4
+@dirrmtry %%DOCSDIR%%
@dirrm include/X11/Xtrans
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
index 776e444287eb..e7e9cc266e6e 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xvidtune
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xvidtune/distinfo b/x11/xvidtune/distinfo
index b04774c7a092..1ec0c6cb543f 100644
--- a/x11/xvidtune/distinfo
+++ b/x11/xvidtune/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xvidtune-1.0.1.tar.bz2) = e0744594f4e5969b20df28d897781318
-SHA256 (xorg/app/xvidtune-1.0.1.tar.bz2) = 6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
-SIZE (xorg/app/xvidtune-1.0.1.tar.bz2) = 87986
+MD5 (xorg/app/xvidtune-1.0.2.tar.bz2) = e40eeb4454f2a7cdde3a14f5dfd3aadd
+SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
+SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
index 80dfc8a71a86..66a860921028 100644
--- a/x11/xvinfo/Makefile
+++ b/x11/xvinfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xvinfo
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xvinfo/distinfo b/x11/xvinfo/distinfo
index 139b7efd11d7..de5aea0c8429 100644
--- a/x11/xvinfo/distinfo
+++ b/x11/xvinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xvinfo-1.0.2.tar.bz2) = e1e318436f49e2f0f3764593dadd9ad2
-SHA256 (xorg/app/xvinfo-1.0.2.tar.bz2) = 126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150
-SIZE (xorg/app/xvinfo-1.0.2.tar.bz2) = 86657
+MD5 (xorg/app/xvinfo-1.1.0.tar.bz2) = 8cc299b2cb636b5f7fe672610789d3d4
+SHA256 (xorg/app/xvinfo-1.1.0.tar.bz2) = 0a318f6ca0d92bd5cc2ab9d2690f6120b3e1537b7902ce110469864869e86efb
+SIZE (xorg/app/xvinfo-1.1.0.tar.bz2) = 96282
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
index b909d9460c29..5ab0a8bfac1e 100644
--- a/x11/xwd/Makefile
+++ b/x11/xwd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwd
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwd/distinfo b/x11/xwd/distinfo
index 0ba03d387318..ba238e0eeb58 100644
--- a/x11/xwd/distinfo
+++ b/x11/xwd/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwd-1.0.2.tar.bz2) = 0a6ef08a2ac08ad5c4dd1522eb3788a3
-SHA256 (xorg/app/xwd-1.0.2.tar.bz2) = ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61
-SIZE (xorg/app/xwd-1.0.2.tar.bz2) = 111673
+MD5 (xorg/app/xwd-1.0.3.tar.bz2) = 007cea1f389abde5c93162dcd5541351
+SHA256 (xorg/app/xwd-1.0.3.tar.bz2) = fff2dbea086c554463d4309209ee05e026b7f19900598f55e0a24a6d7a7ee3fd
+SIZE (xorg/app/xwd-1.0.3.tar.bz2) = 117735
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index 0ac45befdcd4..a841100d3242 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwininfo
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo
index ddf5cfda9e93..5e54d3094b81 100644
--- a/x11/xwininfo/distinfo
+++ b/x11/xwininfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwininfo-1.0.4.tar.bz2) = e2a9bf5ab7f2a0866700a3b49dd8c6bf
-SHA256 (xorg/app/xwininfo-1.0.4.tar.bz2) = df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4
-SIZE (xorg/app/xwininfo-1.0.4.tar.bz2) = 101541
+MD5 (xorg/app/xwininfo-1.0.5.tar.bz2) = 908f8bc3255f639effa9780fb1c19ea4
+SHA256 (xorg/app/xwininfo-1.0.5.tar.bz2) = 8db6b81a7b0bc4e7acce6c6d41df9747b0b19e12c21c5a70b51bbc63a42cdcd9
+SIZE (xorg/app/xwininfo-1.0.5.tar.bz2) = 109834
diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile
index 34e7c66542dc..24efdfee5372 100644
--- a/x11/xwud/Makefile
+++ b/x11/xwud/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwud
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwud/distinfo b/x11/xwud/distinfo
index 540f453341e1..21242b38a184 100644
--- a/x11/xwud/distinfo
+++ b/x11/xwud/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwud-1.0.1.tar.bz2) = 6e3c5d0297d88e890b6f5df31f73dd60
-SHA256 (xorg/app/xwud-1.0.1.tar.bz2) = d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c
-SIZE (xorg/app/xwud-1.0.1.tar.bz2) = 83104
+MD5 (xorg/app/xwud-1.0.2.tar.bz2) = 20bc5d85634964d4ceee77cdfcd131ed
+SHA256 (xorg/app/xwud-1.0.2.tar.bz2) = 84345dfbff0dc411689639aada2407758640af71eb61a1be332bfa24d8b90ac1
+SIZE (xorg/app/xwud-1.0.2.tar.bz2) = 103954