summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2011-02-25 16:52:50 +0000
committerMartin Wilke <miwi@FreeBSD.org>2011-02-25 16:52:50 +0000
commitd594ccc94ffa1006a70e7762de037c800e827b24 (patch)
treeacb2244a21cfbea5c6e08351de94411bf3cb322a
parent- Force commit (diff)
- Please welcome Xorg 7.5.1
The X-Server has been patched to the latest 1.7.X series, drivers and fonts have been updated to the latest versions. This update includes some components from Xorg 7.6 with a lot of improvements, and it seems that the performance is much better than the old version. Also this Update fix build issues with clang and binutils 2.17.50 in current, remove 6.X gruft and de-author pkg-descr. I would like to thank: Beat Gaetzi Dima Panov Koop Mast Eitan Adler and all Testers. PR: ports/147646 ports/148035 ports/148744 ports/150223 ports/152889 ports/154457
Notes
Notes: svn path=/head/; revision=269720
-rw-r--r--Mk/bsd.port.mk5
-rw-r--r--Mk/bsd.xorg.mk5
-rw-r--r--devel/imake/Makefile2
-rw-r--r--devel/imake/distinfo5
-rw-r--r--devel/imake/files/patch-xmkmf.cpp26
-rw-r--r--devel/imake/pkg-descr3
-rw-r--r--devel/libpciaccess/Makefile4
-rw-r--r--devel/libpciaccess/distinfo5
-rw-r--r--devel/libpciaccess/pkg-descr3
-rw-r--r--devel/makedepend/Makefile2
-rw-r--r--devel/makedepend/distinfo5
-rw-r--r--devel/makedepend/pkg-descr2
-rw-r--r--devel/xorg-macros/Makefile2
-rw-r--r--devel/xorg-macros/distinfo5
-rw-r--r--devel/xorg-macros/pkg-descr3
-rw-r--r--graphics/dri/Makefile6
-rw-r--r--graphics/dri/distinfo2
-rw-r--r--graphics/dri/files/mesalib74-configure11
-rw-r--r--graphics/dri/pkg-descr3
-rw-r--r--graphics/libGL/Makefile4
-rw-r--r--graphics/libGL/bsd.mesalib.mk3
-rw-r--r--graphics/libGL/files/patch-src__mesa__x86-64__glapi_x86-64.S12
-rw-r--r--graphics/libGL/files/patch-src__mesa__x86-64__xform4.S65
-rw-r--r--graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S11
-rw-r--r--graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S11
-rw-r--r--graphics/libGL/pkg-descr3
-rw-r--r--graphics/libGLU/Makefile4
-rw-r--r--graphics/libGLU/files/mesalib74-configure11
-rw-r--r--graphics/libGLU/pkg-descr3
-rw-r--r--graphics/libGLw/Makefile4
-rw-r--r--graphics/libGLw/files/mesalib74-configure11
-rw-r--r--graphics/libGLw/pkg-descr3
-rw-r--r--graphics/libglut/Makefile4
-rw-r--r--graphics/libglut/files/mesalib74-configure11
-rw-r--r--graphics/mesa-demos/Makefile4
-rw-r--r--graphics/mesa-demos/files/mesalib74-configure11
-rw-r--r--x11-clocks/xclock/pkg-descr3
-rw-r--r--x11-drivers/input-wacom/Makefile37
-rw-r--r--x11-drivers/input-wacom/files/patch-linuxwacom-run_configure16
-rw-r--r--x11-drivers/input-wacom/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile9
-rw-r--r--x11-drivers/xf86-input-acecad/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-citron/Makefile12
-rw-r--r--x11-drivers/xf86-input-citron/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile13
-rw-r--r--x11-drivers/xf86-input-elographics/distinfo5
-rw-r--r--x11-drivers/xf86-input-elographics/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-fpit/Makefile12
-rw-r--r--x11-drivers/xf86-input-fpit/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile11
-rw-r--r--x11-drivers/xf86-input-hyperpen/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile11
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile10
-rw-r--r--x11-drivers/xf86-input-keyboard/distinfo5
-rw-r--r--x11-drivers/xf86-input-keyboard/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile2
-rw-r--r--x11-drivers/xf86-input-magictouch/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile10
-rw-r--r--x11-drivers/xf86-input-mouse/distinfo5
-rw-r--r--x11-drivers/xf86-input-mouse/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile10
-rw-r--r--x11-drivers/xf86-input-mutouch/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile9
-rw-r--r--x11-drivers/xf86-input-synaptics/distinfo1
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-descr3
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile9
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-descr2
-rw-r--r--x11-drivers/xf86-input-void/Makefile10
-rw-r--r--x11-drivers/xf86-input-void/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-apm/Makefile10
-rw-r--r--x11-drivers/xf86-video-apm/distinfo5
-rw-r--r--x11-drivers/xf86-video-apm/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-ark/Makefile10
-rw-r--r--x11-drivers/xf86-video-ark/distinfo5
-rw-r--r--x11-drivers/xf86-video-ark/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-ati/Makefile10
-rw-r--r--x11-drivers/xf86-video-ati/distinfo5
-rw-r--r--x11-drivers/xf86-video-ati/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-ati613/Makefile10
-rw-r--r--x11-drivers/xf86-video-chips/Makefile10
-rw-r--r--x11-drivers/xf86-video-chips/distinfo5
-rw-r--r--x11-drivers/xf86-video-chips/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile9
-rw-r--r--x11-drivers/xf86-video-cirrus/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile2
-rw-r--r--x11-drivers/xf86-video-cyrix/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile10
-rw-r--r--x11-drivers/xf86-video-dummy/distinfo5
-rw-r--r--x11-drivers/xf86-video-dummy/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile10
-rw-r--r--x11-drivers/xf86-video-fbdev/distinfo5
-rw-r--r--x11-drivers/xf86-video-fbdev/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-glint/Makefile10
-rw-r--r--x11-drivers/xf86-video-glint/distinfo5
-rw-r--r--x11-drivers/xf86-video-glint/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-i128/Makefile10
-rw-r--r--x11-drivers/xf86-video-i128/distinfo5
-rw-r--r--x11-drivers/xf86-video-i128/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-i740/Makefile9
-rw-r--r--x11-drivers/xf86-video-i740/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-imstt/Makefile2
-rw-r--r--x11-drivers/xf86-video-imstt/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-intel/Makefile10
-rw-r--r--x11-drivers/xf86-video-intel29/Makefile2
-rw-r--r--x11-drivers/xf86-video-intel29/pkg-descr2
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile9
-rw-r--r--x11-drivers/xf86-video-mach64/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-mga/Makefile9
-rw-r--r--x11-drivers/xf86-video-mga/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile10
-rw-r--r--x11-drivers/xf86-video-neomagic/distinfo5
-rw-r--r--x11-drivers/xf86-video-neomagic/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-newport/Makefile9
-rw-r--r--x11-drivers/xf86-video-newport/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-nouveau/Makefile10
-rw-r--r--x11-drivers/xf86-video-nv/Makefile10
-rw-r--r--x11-drivers/xf86-video-nv/distinfo5
-rw-r--r--x11-drivers/xf86-video-nv/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-openchrome/Makefile10
-rw-r--r--x11-drivers/xf86-video-openchrome/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-r128/Makefile9
-rw-r--r--x11-drivers/xf86-video-r128/pkg-descr2
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/Makefile10
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/pkg-descr2
-rw-r--r--x11-drivers/xf86-video-radeonhd/Makefile6
-rw-r--r--x11-drivers/xf86-video-radeonhd/pkg-descr2
-rw-r--r--x11-drivers/xf86-video-rdc/Makefile6
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile10
-rw-r--r--x11-drivers/xf86-video-rendition/distinfo5
-rw-r--r--x11-drivers/xf86-video-rendition/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-s3/Makefile9
-rw-r--r--x11-drivers/xf86-video-s3/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile9
-rw-r--r--x11-drivers/xf86-video-s3virge/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-savage/Makefile10
-rw-r--r--x11-drivers/xf86-video-savage/distinfo5
-rw-r--r--x11-drivers/xf86-video-savage/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile8
-rw-r--r--x11-drivers/xf86-video-siliconmotion/distinfo1
-rw-r--r--x11-drivers/xf86-video-siliconmotion/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-sis-intel/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-sis/Makefile10
-rw-r--r--x11-drivers/xf86-video-sis/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile1
-rw-r--r--x11-drivers/xf86-video-sunffb/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile9
-rw-r--r--x11-drivers/xf86-video-tdfx/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-tga/Makefile9
-rw-r--r--x11-drivers/xf86-video-tga/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-trident/Makefile10
-rw-r--r--x11-drivers/xf86-video-trident/distinfo5
-rw-r--r--x11-drivers/xf86-video-trident/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile10
-rw-r--r--x11-drivers/xf86-video-tseng/distinfo5
-rw-r--r--x11-drivers/xf86-video-tseng/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile9
-rw-r--r--x11-drivers/xf86-video-vesa/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-via/Makefile2
-rw-r--r--x11-drivers/xf86-video-via/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile9
-rw-r--r--x11-drivers/xf86-video-vmware/pkg-descr3
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile10
-rw-r--r--x11-drivers/xf86-video-voodoo/distinfo5
-rw-r--r--x11-drivers/xf86-video-voodoo/pkg-descr3
-rw-r--r--x11-drivers/xorg-drivers/Makefile8
-rw-r--r--x11-drivers/xorg-drivers/pkg-descr3
-rw-r--r--x11-fonts/bdftopcf/Makefile2
-rw-r--r--x11-fonts/bdftopcf/distinfo5
-rw-r--r--x11-fonts/bdftopcf/pkg-descr3
-rw-r--r--x11-fonts/encodings/Makefile2
-rw-r--r--x11-fonts/encodings/distinfo5
-rw-r--r--x11-fonts/encodings/pkg-descr3
-rw-r--r--x11-fonts/font-adobe-100dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-100dpi/distinfo5
-rw-r--r--x11-fonts/font-adobe-100dpi/pkg-descr3
-rw-r--r--x11-fonts/font-adobe-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-75dpi/distinfo5
-rw-r--r--x11-fonts/font-adobe-75dpi/pkg-descr3
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/distinfo5
-rw-r--r--x11-fonts/font-adobe-utopia-100dpi/pkg-descr3
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/distinfo5
-rw-r--r--x11-fonts/font-adobe-utopia-75dpi/pkg-descr3
-rw-r--r--x11-fonts/font-adobe-utopia-type1/Makefile2
-rw-r--r--x11-fonts/font-adobe-utopia-type1/distinfo5
-rw-r--r--x11-fonts/font-adobe-utopia-type1/pkg-descr3
-rw-r--r--x11-fonts/font-alias/Makefile2
-rw-r--r--x11-fonts/font-alias/distinfo5
-rw-r--r--x11-fonts/font-alias/pkg-descr3
-rw-r--r--x11-fonts/font-arabic-misc/Makefile2
-rw-r--r--x11-fonts/font-arabic-misc/distinfo5
-rw-r--r--x11-fonts/font-arabic-misc/pkg-descr3
-rw-r--r--x11-fonts/font-bh-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-100dpi/distinfo5
-rw-r--r--x11-fonts/font-bh-100dpi/pkg-descr3
-rw-r--r--x11-fonts/font-bh-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-75dpi/distinfo5
-rw-r--r--x11-fonts/font-bh-75dpi/pkg-descr3
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo5
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr3
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo5
-rw-r--r--x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr3
-rw-r--r--x11-fonts/font-bh-ttf/Makefile2
-rw-r--r--x11-fonts/font-bh-ttf/distinfo5
-rw-r--r--x11-fonts/font-bh-ttf/pkg-descr3
-rw-r--r--x11-fonts/font-bh-ttf/pkg-plist5
-rw-r--r--x11-fonts/font-bh-type1/Makefile2
-rw-r--r--x11-fonts/font-bh-type1/distinfo5
-rw-r--r--x11-fonts/font-bh-type1/pkg-descr3
-rw-r--r--x11-fonts/font-bitstream-100dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-100dpi/distinfo5
-rw-r--r--x11-fonts/font-bitstream-100dpi/pkg-descr3
-rw-r--r--x11-fonts/font-bitstream-75dpi/Makefile2
-rw-r--r--x11-fonts/font-bitstream-75dpi/distinfo5
-rw-r--r--x11-fonts/font-bitstream-75dpi/pkg-descr3
-rw-r--r--x11-fonts/font-bitstream-speedo/Makefile2
-rw-r--r--x11-fonts/font-bitstream-speedo/distinfo5
-rw-r--r--x11-fonts/font-bitstream-speedo/pkg-descr3
-rw-r--r--x11-fonts/font-bitstream-type1/Makefile2
-rw-r--r--x11-fonts/font-bitstream-type1/distinfo5
-rw-r--r--x11-fonts/font-bitstream-type1/pkg-descr3
-rw-r--r--x11-fonts/font-cronyx-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-cronyx-cyrillic/distinfo5
-rw-r--r--x11-fonts/font-cronyx-cyrillic/pkg-descr3
-rw-r--r--x11-fonts/font-cursor-misc/Makefile2
-rw-r--r--x11-fonts/font-cursor-misc/distinfo5
-rw-r--r--x11-fonts/font-cursor-misc/pkg-descr3
-rw-r--r--x11-fonts/font-daewoo-misc/Makefile2
-rw-r--r--x11-fonts/font-daewoo-misc/distinfo5
-rw-r--r--x11-fonts/font-daewoo-misc/pkg-descr3
-rw-r--r--x11-fonts/font-dec-misc/Makefile2
-rw-r--r--x11-fonts/font-dec-misc/distinfo5
-rw-r--r--x11-fonts/font-dec-misc/pkg-descr3
-rw-r--r--x11-fonts/font-ibm-type1/Makefile2
-rw-r--r--x11-fonts/font-ibm-type1/distinfo5
-rw-r--r--x11-fonts/font-ibm-type1/pkg-descr3
-rw-r--r--x11-fonts/font-isas-misc/Makefile2
-rw-r--r--x11-fonts/font-isas-misc/distinfo5
-rw-r--r--x11-fonts/font-isas-misc/pkg-descr3
-rw-r--r--x11-fonts/font-jis-misc/Makefile2
-rw-r--r--x11-fonts/font-jis-misc/distinfo5
-rw-r--r--x11-fonts/font-jis-misc/pkg-descr3
-rw-r--r--x11-fonts/font-micro-misc/Makefile2
-rw-r--r--x11-fonts/font-micro-misc/distinfo5
-rw-r--r--x11-fonts/font-micro-misc/pkg-descr3
-rw-r--r--x11-fonts/font-misc-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-misc-cyrillic/distinfo5
-rw-r--r--x11-fonts/font-misc-cyrillic/pkg-descr3
-rw-r--r--x11-fonts/font-misc-ethiopic/Makefile2
-rw-r--r--x11-fonts/font-misc-ethiopic/distinfo5
-rw-r--r--x11-fonts/font-misc-ethiopic/pkg-descr3
-rw-r--r--x11-fonts/font-misc-meltho/Makefile2
-rw-r--r--x11-fonts/font-misc-meltho/distinfo5
-rw-r--r--x11-fonts/font-misc-meltho/pkg-descr3
-rw-r--r--x11-fonts/font-misc-misc/Makefile2
-rw-r--r--x11-fonts/font-misc-misc/distinfo5
-rw-r--r--x11-fonts/font-misc-misc/pkg-descr3
-rw-r--r--x11-fonts/font-mutt-misc/Makefile2
-rw-r--r--x11-fonts/font-mutt-misc/distinfo5
-rw-r--r--x11-fonts/font-mutt-misc/pkg-descr3
-rw-r--r--x11-fonts/font-schumacher-misc/Makefile2
-rw-r--r--x11-fonts/font-schumacher-misc/distinfo5
-rw-r--r--x11-fonts/font-schumacher-misc/pkg-descr3
-rw-r--r--x11-fonts/font-screen-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-screen-cyrillic/distinfo5
-rw-r--r--x11-fonts/font-screen-cyrillic/pkg-descr3
-rw-r--r--x11-fonts/font-sony-misc/Makefile2
-rw-r--r--x11-fonts/font-sony-misc/distinfo5
-rw-r--r--x11-fonts/font-sony-misc/pkg-descr3
-rw-r--r--x11-fonts/font-sun-misc/Makefile2
-rw-r--r--x11-fonts/font-sun-misc/distinfo5
-rw-r--r--x11-fonts/font-sun-misc/pkg-descr3
-rw-r--r--x11-fonts/font-util/Makefile2
-rw-r--r--x11-fonts/font-util/distinfo5
-rw-r--r--x11-fonts/font-util/pkg-descr3
-rw-r--r--x11-fonts/font-winitzki-cyrillic/Makefile2
-rw-r--r--x11-fonts/font-winitzki-cyrillic/distinfo5
-rw-r--r--x11-fonts/font-winitzki-cyrillic/pkg-descr3
-rw-r--r--x11-fonts/font-xfree86-type1/Makefile2
-rw-r--r--x11-fonts/font-xfree86-type1/distinfo5
-rw-r--r--x11-fonts/font-xfree86-type1/pkg-descr3
-rw-r--r--x11-fonts/fontcacheproto/pkg-descr3
-rw-r--r--x11-fonts/fontsproto/Makefile2
-rw-r--r--x11-fonts/fontsproto/distinfo5
-rw-r--r--x11-fonts/fontsproto/pkg-descr3
-rw-r--r--x11-fonts/fontsproto/pkg-plist2
-rw-r--r--x11-fonts/fonttosfnt/pkg-descr3
-rw-r--r--x11-fonts/fslsfonts/Makefile2
-rw-r--r--x11-fonts/fslsfonts/distinfo5
-rw-r--r--x11-fonts/fslsfonts/pkg-descr3
-rw-r--r--x11-fonts/libFS/Makefile2
-rw-r--r--x11-fonts/libFS/distinfo5
-rw-r--r--x11-fonts/libFS/pkg-descr3
-rw-r--r--x11-fonts/libFS/pkg-plist2
-rw-r--r--x11-fonts/libXfont/Makefile2
-rw-r--r--x11-fonts/libXfont/distinfo5
-rw-r--r--x11-fonts/libXfont/pkg-descr3
-rw-r--r--x11-fonts/libXfontcache/pkg-descr3
-rw-r--r--x11-fonts/libfontenc/Makefile2
-rw-r--r--x11-fonts/libfontenc/distinfo5
-rw-r--r--x11-fonts/libfontenc/pkg-descr3
-rw-r--r--x11-fonts/mkfontdir/Makefile2
-rw-r--r--x11-fonts/mkfontdir/distinfo5
-rw-r--r--x11-fonts/mkfontdir/pkg-descr3
-rw-r--r--x11-fonts/mkfontscale/Makefile2
-rw-r--r--x11-fonts/mkfontscale/distinfo5
-rw-r--r--x11-fonts/mkfontscale/pkg-descr3
-rw-r--r--x11-fonts/showfont/Makefile2
-rw-r--r--x11-fonts/showfont/distinfo5
-rw-r--r--x11-fonts/showfont/pkg-descr3
-rw-r--r--x11-fonts/xf86bigfontproto/pkg-descr3
-rw-r--r--x11-fonts/xfontsel/Makefile3
-rw-r--r--x11-fonts/xfontsel/distinfo5
-rw-r--r--x11-fonts/xfontsel/pkg-descr3
-rw-r--r--x11-fonts/xfs/Makefile14
-rw-r--r--x11-fonts/xfs/distinfo5
-rw-r--r--x11-fonts/xfs/pkg-descr3
-rw-r--r--x11-fonts/xfs/pkg-install2
-rw-r--r--x11-fonts/xfsinfo/Makefile2
-rw-r--r--x11-fonts/xfsinfo/distinfo5
-rw-r--r--x11-fonts/xfsinfo/pkg-descr3
-rw-r--r--x11-fonts/xlsfonts/Makefile2
-rw-r--r--x11-fonts/xlsfonts/distinfo5
-rw-r--r--x11-fonts/xlsfonts/pkg-descr3
-rw-r--r--x11-fonts/xorg-fonts-100dpi/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-100dpi/pkg-descr3
-rw-r--r--x11-fonts/xorg-fonts-75dpi/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-75dpi/pkg-descr3
-rw-r--r--x11-fonts/xorg-fonts-cyrillic/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-cyrillic/pkg-descr3
-rw-r--r--x11-fonts/xorg-fonts-miscbitmaps/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-miscbitmaps/pkg-descr3
-rw-r--r--x11-fonts/xorg-fonts-truetype/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-truetype/pkg-descr3
-rw-r--r--x11-fonts/xorg-fonts-type1/Makefile2
-rw-r--r--x11-fonts/xorg-fonts-type1/pkg-descr3
-rw-r--r--x11-fonts/xorg-fonts/Makefile2
-rw-r--r--x11-fonts/xorg-fonts/pkg-descr3
-rw-r--r--x11-servers/xephyr/Makefile2
-rw-r--r--x11-servers/xephyr/distinfo5
-rw-r--r--x11-servers/xorg-dmx/Makefile4
-rw-r--r--x11-servers/xorg-dmx/distinfo5
-rw-r--r--x11-servers/xorg-nestserver/Makefile4
-rw-r--r--x11-servers/xorg-nestserver/distinfo5
-rw-r--r--x11-servers/xorg-nestserver/pkg-descr3
-rw-r--r--x11-servers/xorg-server/Makefile8
-rw-r--r--x11-servers/xorg-server/distinfo5
-rw-r--r--x11-servers/xorg-server/pkg-descr3
-rw-r--r--x11-servers/xorg-vfbserver/Makefile4
-rw-r--r--x11-servers/xorg-vfbserver/distinfo5
-rw-r--r--x11-servers/xorg-vfbserver/pkg-descr3
-rw-r--r--x11-toolkits/libXaw/Makefile3
-rw-r--r--x11-toolkits/libXaw/distinfo5
-rw-r--r--x11-toolkits/libXaw/pkg-descr3
-rw-r--r--x11-toolkits/libXaw/pkg-plist50
-rw-r--r--x11-toolkits/libXmu/Makefile2
-rw-r--r--x11-toolkits/libXmu/distinfo5
-rw-r--r--x11-toolkits/libXmu/pkg-descr3
-rw-r--r--x11-toolkits/libXmu/pkg-plist6
-rw-r--r--x11-toolkits/libXt/Makefile537
-rw-r--r--x11-toolkits/libXt/distinfo5
-rw-r--r--x11-toolkits/libXt/pkg-descr3
-rw-r--r--x11-toolkits/libXt/pkg-plist35
-rw-r--r--x11-wm/twm/Makefile2
-rw-r--r--x11-wm/twm/distinfo5
-rw-r--r--x11-wm/twm/pkg-descr2
-rw-r--r--x11/appres/Makefile2
-rw-r--r--x11/appres/distinfo5
-rw-r--r--x11/beforelight/Makefile3
-rw-r--r--x11/beforelight/distinfo5
-rw-r--r--x11/beforelight/pkg-descr3
-rw-r--r--x11/bigreqsproto/Makefile2
-rw-r--r--x11/bigreqsproto/distinfo5
-rw-r--r--x11/bigreqsproto/pkg-descr3
-rw-r--r--x11/bigreqsproto/pkg-plist2
-rw-r--r--x11/bitmap/Makefile2
-rw-r--r--x11/bitmap/distinfo5
-rw-r--r--x11/bitmap/pkg-descr3
-rw-r--r--x11/compositeproto/Makefile2
-rw-r--r--x11/compositeproto/distinfo5
-rw-r--r--x11/compositeproto/pkg-descr3
-rw-r--r--x11/damageproto/Makefile2
-rw-r--r--x11/damageproto/distinfo5
-rw-r--r--x11/damageproto/pkg-descr3
-rw-r--r--x11/dmxproto/pkg-descr3
-rw-r--r--x11/dmxproto/pkg-plist2
-rw-r--r--x11/dri2proto/Makefile2
-rw-r--r--x11/dri2proto/distinfo5
-rw-r--r--x11/dri2proto/pkg-descr3
-rw-r--r--x11/editres/Makefile2
-rw-r--r--x11/editres/distinfo5
-rw-r--r--x11/editres/pkg-descr3
-rw-r--r--x11/evieext/pkg-descr3
-rw-r--r--x11/fixesproto/Makefile2
-rw-r--r--x11/fixesproto/distinfo5
-rw-r--r--x11/fixesproto/pkg-descr3
-rw-r--r--x11/fstobdf/Makefile2
-rw-r--r--x11/fstobdf/distinfo5
-rw-r--r--x11/fstobdf/pkg-descr3
-rw-r--r--x11/glproto/Makefile2
-rw-r--r--x11/glproto/distinfo5
-rw-r--r--x11/glproto/pkg-descr3
-rw-r--r--x11/iceauth/Makefile2
-rw-r--r--x11/iceauth/distinfo5
-rw-r--r--x11/iceauth/pkg-descr3
-rw-r--r--x11/ico/Makefile2
-rw-r--r--x11/ico/distinfo5
-rw-r--r--x11/ico/pkg-descr3
-rw-r--r--x11/inputproto/Makefile2
-rw-r--r--x11/inputproto/distinfo5
-rw-r--r--x11/inputproto/pkg-descr3
-rw-r--r--x11/inputproto/pkg-plist5
-rw-r--r--x11/kbproto/Makefile2
-rw-r--r--x11/kbproto/distinfo5
-rw-r--r--x11/kbproto/pkg-descr3
-rw-r--r--x11/libICE/Makefile2
-rw-r--r--x11/libICE/distinfo5
-rw-r--r--x11/libICE/pkg-descr3
-rw-r--r--x11/libICE/pkg-plist3
-rw-r--r--x11/libSM/pkg-descr3
-rw-r--r--x11/libX11/Makefile9
-rw-r--r--x11/libX11/distinfo5
-rw-r--r--x11/libX11/manpages5
-rw-r--r--x11/libX11/pkg-descr3
-rw-r--r--x11/libX11/pkg-plist221
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXScrnSaver/distinfo5
-rw-r--r--x11/libXScrnSaver/pkg-descr3
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXau/distinfo5
-rw-r--r--x11/libXau/pkg-descr3
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcomposite/distinfo5
-rw-r--r--x11/libXcomposite/pkg-descr3
-rw-r--r--x11/libXcursor/Makefile2
-rw-r--r--x11/libXcursor/distinfo5
-rw-r--r--x11/libXcursor/pkg-descr3
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdamage/distinfo5
-rw-r--r--x11/libXdamage/pkg-descr3
-rw-r--r--x11/libXdmcp/pkg-descr3
-rw-r--r--x11/libXevie/pkg-descr3
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXext/distinfo5
-rw-r--r--x11/libXext/pkg-descr4
-rw-r--r--x11/libXext/pkg-plist3
-rw-r--r--x11/libXfixes/pkg-descr3
-rw-r--r--x11/libXi/Makefile72
-rw-r--r--x11/libXi/distinfo5
-rw-r--r--x11/libXi/pkg-descr3
-rw-r--r--x11/libXinerama/pkg-descr3
-rw-r--r--x11/libXprintAppUtil/pkg-descr3
-rw-r--r--x11/libXprintUtil/pkg-descr3
-rw-r--r--x11/libXrandr/pkg-descr3
-rw-r--r--x11/libXres/pkg-descr3
-rw-r--r--x11/libXtrans/pkg-descr3
-rw-r--r--x11/libXtst/pkg-descr3
-rw-r--r--x11/libXv/pkg-descr3
-rw-r--r--x11/libXvMC/pkg-descr3
-rw-r--r--x11/libXxf86dga/pkg-descr3
-rw-r--r--x11/libXxf86misc/pkg-descr3
-rw-r--r--x11/libXxf86vm/pkg-descr3
-rw-r--r--x11/libdmx/Makefile2
-rw-r--r--x11/libdmx/distinfo5
-rw-r--r--x11/libdmx/pkg-descr3
-rw-r--r--x11/liboldX/pkg-descr3
-rw-r--r--x11/libxkbfile/pkg-descr3
-rw-r--r--x11/libxkbui/pkg-descr3
-rw-r--r--x11/listres/pkg-descr3
-rw-r--r--x11/luit/pkg-descr3
-rw-r--r--x11/pixman/Makefile2
-rw-r--r--x11/pixman/distinfo5
-rw-r--r--x11/pixman/pkg-descr3
-rw-r--r--x11/printproto/pkg-descr3
-rw-r--r--x11/randrproto/Makefile2
-rw-r--r--x11/randrproto/distinfo5
-rw-r--r--x11/randrproto/pkg-descr3
-rw-r--r--x11/recordproto/pkg-descr3
-rw-r--r--x11/renderproto/pkg-descr3
-rw-r--r--x11/rgb/Makefile2
-rw-r--r--x11/rgb/distinfo5
-rw-r--r--x11/rgb/pkg-descr3
-rw-r--r--x11/rstart/pkg-descr3
-rw-r--r--x11/scrnsaverproto/pkg-descr3
-rw-r--r--x11/sessreg/Makefile3
-rw-r--r--x11/sessreg/distinfo5
-rw-r--r--x11/sessreg/pkg-descr3
-rw-r--r--x11/setxkbmap/Makefile2
-rw-r--r--x11/setxkbmap/distinfo5
-rw-r--r--x11/setxkbmap/pkg-descr3
-rw-r--r--x11/smproxy/pkg-descr3
-rw-r--r--x11/videoproto/pkg-descr3
-rw-r--r--x11/viewres/pkg-descr3
-rw-r--r--x11/wrapper/pkg-descr2
-rw-r--r--x11/x11perf/Makefile2
-rw-r--r--x11/x11perf/distinfo5
-rw-r--r--x11/x11perf/pkg-descr3
-rw-r--r--x11/xauth/Makefile2
-rw-r--r--x11/xauth/distinfo5
-rw-r--r--x11/xauth/pkg-descr3
-rw-r--r--x11/xbiff/Makefile2
-rw-r--r--x11/xbiff/distinfo5
-rw-r--r--x11/xbiff/pkg-descr3
-rw-r--r--x11/xcalc/Makefile2
-rw-r--r--x11/xcalc/distinfo5
-rw-r--r--x11/xcalc/pkg-descr3
-rw-r--r--x11/xclipboard/pkg-descr3
-rw-r--r--x11/xcmiscproto/pkg-descr3
-rw-r--r--x11/xcmsdb/pkg-descr3
-rw-r--r--x11/xconsole/Makefile3
-rw-r--r--x11/xconsole/distinfo5
-rw-r--r--x11/xconsole/pkg-descr3
-rw-r--r--x11/xcursorgen/pkg-descr3
-rw-r--r--x11/xdbedizzy/pkg-descr3
-rw-r--r--x11/xditview/pkg-descr3
-rw-r--r--x11/xdm/Makefile4
-rw-r--r--x11/xdm/pkg-plist6
-rw-r--r--x11/xdpyinfo/pkg-descr3
-rw-r--r--x11/xdriinfo/pkg-descr3
-rw-r--r--x11/xedit/Makefile2
-rw-r--r--x11/xedit/distinfo5
-rw-r--r--x11/xedit/pkg-descr2
-rw-r--r--x11/xev/Makefile2
-rw-r--r--x11/xev/distinfo5
-rw-r--r--x11/xev/pkg-descr3
-rw-r--r--x11/xextproto/pkg-descr3
-rw-r--r--x11/xeyes/Makefile2
-rw-r--r--x11/xeyes/distinfo5
-rw-r--r--x11/xeyes/pkg-descr3
-rw-r--r--x11/xf86dga/pkg-descr3
-rw-r--r--x11/xf86dgaproto/pkg-descr3
-rw-r--r--x11/xf86driproto/pkg-descr3
-rw-r--r--x11/xf86miscproto/pkg-descr3
-rw-r--r--x11/xf86rushproto/pkg-descr3
-rw-r--r--x11/xf86vidmodeproto/pkg-descr3
-rw-r--r--x11/xfd/pkg-descr3
-rw-r--r--x11/xfindproxy/pkg-descr3
-rw-r--r--x11/xfwp/pkg-descr3
-rw-r--r--x11/xgamma/Makefile2
-rw-r--r--x11/xgamma/distinfo5
-rw-r--r--x11/xgamma/pkg-descr3
-rw-r--r--x11/xgc/pkg-descr3
-rw-r--r--x11/xhost/Makefile2
-rw-r--r--x11/xhost/distinfo5
-rw-r--r--x11/xhost/pkg-descr3
-rw-r--r--x11/xineramaproto/pkg-descr3
-rw-r--r--x11/xinit/pkg-descr3
-rw-r--r--x11/xinput/Makefile2
-rw-r--r--x11/xinput/distinfo5
-rw-r--r--x11/xkbcomp/pkg-descr3
-rw-r--r--x11/xkbevd/pkg-descr3
-rw-r--r--x11/xkbprint/pkg-descr3
-rw-r--r--x11/xkeyboard-config/pkg-descr3
-rw-r--r--x11/xkill/Makefile2
-rw-r--r--x11/xkill/distinfo5
-rw-r--r--x11/xkill/pkg-descr3
-rw-r--r--x11/xload/pkg-descr3
-rw-r--r--x11/xlogo/pkg-descr3
-rw-r--r--x11/xlsatoms/pkg-descr3
-rw-r--r--x11/xlsclients/pkg-descr3
-rw-r--r--x11/xmag/pkg-descr3
-rw-r--r--x11/xman/pkg-descr3
-rw-r--r--x11/xmessage/pkg-descr3
-rw-r--r--x11/xmh/pkg-descr3
-rw-r--r--x11/xmodmap/pkg-descr3
-rw-r--r--x11/xmore/Makefile3
-rw-r--r--x11/xmore/distinfo5
-rw-r--r--x11/xmore/pkg-descr3
-rw-r--r--x11/xorg-apps/Makefile5
-rw-r--r--x11/xorg-apps/pkg-descr3
-rw-r--r--x11/xorg-libraries/Makefile2
-rw-r--r--x11/xorg-libraries/pkg-descr3
-rw-r--r--x11/xorg/Makefile2
-rw-r--r--x11/xorg/pkg-descr3
-rw-r--r--x11/xplsprinters/pkg-descr3
-rw-r--r--x11/xpr/pkg-descr3
-rw-r--r--x11/xprehashprinterlist/pkg-descr3
-rw-r--r--x11/xprop/pkg-descr3
-rw-r--r--x11/xproto/pkg-descr3
-rw-r--r--x11/xproxymanagementprotocol/pkg-descr3
-rw-r--r--x11/xrandr/Makefile2
-rw-r--r--x11/xrandr/distinfo5
-rw-r--r--x11/xrandr/pkg-descr3
-rw-r--r--x11/xrdb/pkg-descr3
-rw-r--r--x11/xrefresh/pkg-descr3
-rw-r--r--x11/xrx/pkg-descr3
-rw-r--r--x11/xset/Makefile2
-rw-r--r--x11/xset/distinfo5
-rw-r--r--x11/xset/pkg-descr2
-rw-r--r--x11/xsetmode/pkg-descr3
-rw-r--r--x11/xsetpointer/pkg-descr3
-rw-r--r--x11/xsetroot/pkg-descr3
-rw-r--r--x11/xsm/pkg-descr3
-rw-r--r--x11/xstdcmap/pkg-descr3
-rw-r--r--x11/xtrans/pkg-descr3
-rw-r--r--x11/xtrap/pkg-descr3
-rw-r--r--x11/xvinfo/pkg-descr3
-rw-r--r--x11/xwd/pkg-descr3
-rw-r--r--x11/xwininfo/pkg-descr3
-rw-r--r--x11/xwud/pkg-descr3
604 files changed, 1312 insertions, 2100 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 36fb761b516e..cd6322830b1e 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1995,7 +1995,10 @@ X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1
X_FONTS_ALIAS_PORT= ${PORTSDIR}/x11-fonts/font-alias
.if defined(USE_IMAKE)
-BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
+CONFIGURE_ENV+= IMAKECPP="${CPP}"
+MAKE_ENV+= IMAKECPP="${CPP}"
+MAKE_FLAGS?= CC="${CC}" CXX="${CXX}"
+BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
.endif
.if defined(USE_DISPLAY) && !defined(DISPLAY)
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 648dfca84e32..0cf4a2be23d3 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_ARGS+= --with-fontrootdir=${PREFIX}/lib/X11/fonts
CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/lib/X11/fonts
NEED_MKFONTFOO= yes
@@ -101,8 +102,8 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
post-install:
. if ${INSTALLS_TTF} == "yes"
. for _fontdir in ${FONTDIR}
- @${ECHO_CMD} "@exec fc-cache -v %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
- @${ECHO_CMD} "@unexec fc-cache -v %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+ @${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
+ @${ECHO_CMD} "@unexec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
. endfor
. endif
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index b2aba137837e..fa9ac23f4f43 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= imake
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
index 393b5982e730..1e2fe2cdcd7d 100644
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe
+SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773
diff --git a/devel/imake/files/patch-xmkmf.cpp b/devel/imake/files/patch-xmkmf.cpp
new file mode 100644
index 000000000000..a08866e3855f
--- /dev/null
+++ b/devel/imake/files/patch-xmkmf.cpp
@@ -0,0 +1,26 @@
+--- work/imake-1.0.2/xmkmf.cpp 2004-04-23 18:42:00.000000000 +0000
++++ xmkmf.cpp 2009-12-14 20:51:01.695597560 +0000
+@@ -53,6 +53,10 @@
+ args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
+ fi
+
++if [ -n "$CPP" -a -z "$IMAKECPP" ];then
++ export IMAKECPP=$CPP
++fi
++
+ echo imake $imake_defines $args
+ case "$do_all" in
+ yes)
+@@ -68,3 +72,12 @@
+ imake $imake_defines $args
+ ;;
+ esac
++
++if [ -f "Makefile" ];then
++ if [ -n "$CC" ];then
++ sed -i "" -e "s| CC = cc| CC = $CC|" Makefile
++ fi
++ if [ -n "$CXX" ];then
++ sed -i "" -e "s| CXX = c++| CXX = $CXX|" Makefile
++ fi
++fi
diff --git a/devel/imake/pkg-descr b/devel/imake/pkg-descr
index aa426ccf2e28..18425ed4eb59 100644
--- a/devel/imake/pkg-descr
+++ b/devel/imake/pkg-descr
@@ -2,6 +2,3 @@ This package contains X.Org's imake, imake config files, and other build-related
tools.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index e8f5676a5494..3954d510716c 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libpciaccess
-PORTVERSION= 0.12.0
+PORTVERSION= 0.12.1
CATEGORIES= devel
MAINTAINER= x11@FreeBSD.org
@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
# XXX - Is it a runtime dep too?
RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
-CONFIGURE_ARGS= --with-pciids-path=${LOCALBASE}/share/pciids
+CONFIGURE_ARGS+= --with-pciids-path=${LOCALBASE}/share/pciids
XORG_CAT= lib
diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo
index 985e1c1e94ff..dd572d7b7e77 100644
--- a/devel/libpciaccess/distinfo
+++ b/devel/libpciaccess/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/lib/libpciaccess-0.12.0.tar.bz2) = 285e07976274572e1f1e68edee09b70a
-SHA256 (xorg/lib/libpciaccess-0.12.0.tar.bz2) = f6b3c00e1c0aab0729563115d3d798e14c9210b4e10fccb484efe1c5eae85657
-SIZE (xorg/lib/libpciaccess-0.12.0.tar.bz2) = 294535
+SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
+SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217
diff --git a/devel/libpciaccess/pkg-descr b/devel/libpciaccess/pkg-descr
index 77dbb5584df9..a095db27f052 100644
--- a/devel/libpciaccess/pkg-descr
+++ b/devel/libpciaccess/pkg-descr
@@ -1,6 +1,3 @@
This package contains the pciaccess library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index e2a161be0bf3..4f6e0f8b2762 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= makedepend
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/makedepend/distinfo b/devel/makedepend/distinfo
index 874d304632a6..5fce726c8432 100644
--- a/devel/makedepend/distinfo
+++ b/devel/makedepend/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
+SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703
diff --git a/devel/makedepend/pkg-descr b/devel/makedepend/pkg-descr
index 09295054d53b..5470aec145e4 100644
--- a/devel/makedepend/pkg-descr
+++ b/devel/makedepend/pkg-descr
@@ -12,3 +12,5 @@ Every file that a sourcefile includes, directly or indirectly, is what
makedepend calls a "dependency". These dependencies are then written to a
makefile in such a way that make will know which object files must be
recompiled when a dependency has changed.
+
+WWW: http://www.x.org/archive/X11R7.5/doc/man/man1/makedepend.1.html \ No newline at end of file
diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile
index 46c3489bf171..94ffab8e6333 100644
--- a/devel/xorg-macros/Makefile
+++ b/devel/xorg-macros/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-macros
-PORTVERSION= 1.6.0
+PORTVERSION= 1.11.0
CATEGORIES= devel x11
DISTNAME= util-macros-$(PORTVERSION)
diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo
index b1741d48bc33..d417cd364311 100644
--- a/devel/xorg-macros/distinfo
+++ b/devel/xorg-macros/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/util/util-macros-1.11.0.tar.bz2) = e8534d56a4f8475acecee1c9faf5193340a80785f2c80858fd233595cb3fcacf
+SIZE (xorg/util/util-macros-1.11.0.tar.bz2) = 67786
diff --git a/devel/xorg-macros/pkg-descr b/devel/xorg-macros/pkg-descr
index bddd7c8c689e..1a4b4bbe8b01 100644
--- a/devel/xorg-macros/pkg-descr
+++ b/devel/xorg-macros/pkg-descr
@@ -1,5 +1,4 @@
This package contains the aclocal macros needed for building xorg modules
from upstream source.
-- Eric Anholt
-anholt@FreeBSD.org
+WWW: http://cgit.freedesktop.org/xorg/util/macros/
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 5be5e9fb08f0..6678c0ab875d 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -21,9 +21,9 @@ MAKE_JOBS_UNSAFE= yes
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
-.ifndef WITHOUT_NOUVEAU
-EXTRA_PATCHES+= ${FILESDIR}/mesalib74-configure
-.endif
+EXTRA_PATCHES+= ${FILESDIR}/patch-mach64_context.h \
+ ${FILESDIR}/patch-sis_context.h
+
do-install:
cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index b44fb336d3ad..18c51665b5c4 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,6 +1,4 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
diff --git a/graphics/dri/files/mesalib74-configure b/graphics/dri/files/mesalib74-configure
deleted file mode 100644
index af45b71f21c3..000000000000
--- a/graphics/dri/files/mesalib74-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2009-03-28 00:59:46.000000000 +0000
-+++ configure 2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
- ;;
- *freebsd* | dragonfly*)
- case "$host_cpu" in
-- i*86|x86_64) default_driver="dri";;
-+ i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
- esac
- ;;
- esac
diff --git a/graphics/dri/pkg-descr b/graphics/dri/pkg-descr
index e35a1d1a5036..776a52aaf110 100644
--- a/graphics/dri/pkg-descr
+++ b/graphics/dri/pkg-descr
@@ -3,6 +3,3 @@ DRI. With an X Server configured for the DRI they allow direct rendering of
hardware-accelerated OpenGL.
WWW: http://dri.sourceforge.net/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index d9f8fd1274d3..02c3a88ee543 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -17,10 +17,6 @@ LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
-.ifndef WITHOUT_NOUVEAU
-EXTRA_PATCHES+= ${FILESDIR}/mesalib74-configure
-.endif
-
do-install:
${RM} -f ${WRKSRC}/include/GL/glu*.h
cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index acf8594290e9..5de7c9fc36e9 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -29,6 +29,7 @@ PLIST_SUB+= MESALIB76= MESALIB74="@comment "
MESABASEVERSION= 7.4.4
MESASUBVERSION=
PLIST_SUB+= MESALIB74= MESALIB76="@comment "
+EXTRA_PATCHES+= ${PATCHDIR}/mesalib74-configure
.endif
MASTER_SITES?= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut,demos
@@ -51,7 +52,7 @@ ALL_TARGET= default
#MAKE_ARGS= SHELL=${SH}
#CFLAGS+= -DUSE_XSHM -DHZ=100
-#FILESDIR= ${.CURDIR}/../../graphics/libGL/files
+PATCHDIR= ${.CURDIR}/../../graphics/libGL/files
WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}
.if !defined(ARCH)
diff --git a/graphics/libGL/files/patch-src__mesa__x86-64__glapi_x86-64.S b/graphics/libGL/files/patch-src__mesa__x86-64__glapi_x86-64.S
new file mode 100644
index 000000000000..908a6fe300aa
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mesa__x86-64__glapi_x86-64.S
@@ -0,0 +1,12 @@
+--- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100
+@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
+
+ .p2align 4,,15
+ _x86_64_get_dispatch:
+- movq _gl_DispatchTSD(%rip), %rdi
++ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax
++ movl (%rax), %edi
+ jmp pthread_getspecific@PLT
+
+ #elif defined(THREADS)
diff --git a/graphics/libGL/files/patch-src__mesa__x86-64__xform4.S b/graphics/libGL/files/patch-src__mesa__x86-64__xform4.S
new file mode 100644
index 000000000000..9735b1fd786d
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mesa__x86-64__xform4.S
@@ -0,0 +1,65 @@
+--- ./src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100
++++ ./src/mesa/x86-64/xform4.S 2011-01-28 18:09:55.000000000 +0100
+@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
+ * rdx = source
+ */
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
+ movaps 16(%rax), %xmm10
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -195,7 +195,7 @@ p4_3d_done:
+ _mesa_x86_64_transform_points4_identity:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -223,7 +223,7 @@ p4_identity_done:
+ _mesa_3dnow_transform_points4_3d_no_rot:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -287,7 +287,7 @@ p4_3d_no_rot_done:
+ _mesa_3dnow_transform_points4_perspective:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -353,7 +353,7 @@ p4_perspective_done:
+ _mesa_3dnow_transform_points4_2d_no_rot:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
+@@ -408,7 +408,7 @@ p4_2d_no_rot_done:
+ _mesa_3dnow_transform_points4_2d:
+
+ movl V4F_COUNT(%rdx), %ecx /* count */
+- movzx V4F_STRIDE(%rdx), %eax /* stride */
++ movzbl V4F_STRIDE(%rdx), %eax /* stride */
+
+ movl %ecx, V4F_COUNT(%rdi) /* set dest count */
+ movl $4, V4F_SIZE(%rdi) /* set dest size */
diff --git a/graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S b/graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S
new file mode 100644
index 000000000000..71da78c83ffd
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100
+@@ -47,7 +47,7 @@
+ #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
+
+ #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
+-#define GLOBL_FN(x) GLOBL x ; .type x, function
++#define GLOBL_FN(x) GLOBL x ; .type x, @function
+ #else
+ #define GLOBL_FN(x) GLOBL x
+ #endif
diff --git a/graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S b/graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S
new file mode 100644
index 000000000000..37b08d1cda3c
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200
++++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100
+@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
+ testl $0x01, %ecx
+ je .L01
+
+- movzxw (%eax), %ecx
++ movzwl (%eax), %ecx
+ movd %ecx, %mm4
+
+ pshufw $0x00, %mm4, %mm0
diff --git a/graphics/libGL/pkg-descr b/graphics/libGL/pkg-descr
index b312015a381f..eeba29334de5 100644
--- a/graphics/libGL/pkg-descr
+++ b/graphics/libGL/pkg-descr
@@ -2,6 +2,3 @@ This package contains the OpenGL library, which can perform rendering over GLX
or using the Direct Rendering Infrastructure.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 40dc3770c58c..b39ab7574fe5 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -14,10 +14,6 @@ COMMENT= OpenGL utility library
USE_GL= gl
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
-.ifndef WITHOUT_NOUVEAU
-EXTRA_PATCHES+= ${FILESDIR}/mesalib74-configure
-.endif
-
do-install:
cd ${WRKSRC}/src/glu; ${GMAKE} install
${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
diff --git a/graphics/libGLU/files/mesalib74-configure b/graphics/libGLU/files/mesalib74-configure
deleted file mode 100644
index af45b71f21c3..000000000000
--- a/graphics/libGLU/files/mesalib74-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2009-03-28 00:59:46.000000000 +0000
-+++ configure 2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
- ;;
- *freebsd* | dragonfly*)
- case "$host_cpu" in
-- i*86|x86_64) default_driver="dri";;
-+ i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
- esac
- ;;
- esac
diff --git a/graphics/libGLU/pkg-descr b/graphics/libGLU/pkg-descr
index 1f5d7835c14f..3a7d2e784f7d 100644
--- a/graphics/libGLU/pkg-descr
+++ b/graphics/libGLU/pkg-descr
@@ -1,6 +1,3 @@
This package contains the OpenGL utility library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index 84a2a30d0715..fa52387467da 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -17,10 +17,6 @@ LIB_DEPENDS+= Xm.3:${PORTSDIR}/x11-toolkits/open-motif
USE_GL= gl
USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
-.ifndef WITHOUT_NOUVEAU
-EXTRA_PATCHES+= ${FILESDIR}/mesalib74-configure
-.endif
-
do-install:
cd ${WRKSRC}/src/glw; ${GMAKE} install
diff --git a/graphics/libGLw/files/mesalib74-configure b/graphics/libGLw/files/mesalib74-configure
deleted file mode 100644
index af45b71f21c3..000000000000
--- a/graphics/libGLw/files/mesalib74-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2009-03-28 00:59:46.000000000 +0000
-+++ configure 2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
- ;;
- *freebsd* | dragonfly*)
- case "$host_cpu" in
-- i*86|x86_64) default_driver="dri";;
-+ i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
- esac
- ;;
- esac
diff --git a/graphics/libGLw/pkg-descr b/graphics/libGLw/pkg-descr
index b6ec770ff87d..d3a7ea710d92 100644
--- a/graphics/libGLw/pkg-descr
+++ b/graphics/libGLw/pkg-descr
@@ -1,6 +1,3 @@
This package contains the OpenGL widgets library.
WWW: http://www.mesa3d.org/
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
index 033d82c9aa72..1b8ea547cf55 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -15,10 +15,6 @@ COMMENT= OpenGL utility toolkit
USE_GL= glu
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
-.ifndef WITHOUT_NOUVEAU
-EXTRA_PATCHES+= ${FILESDIR}/mesalib74-configure
-.endif
-
do-install:
cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/graphics/libglut/files/mesalib74-configure b/graphics/libglut/files/mesalib74-configure
deleted file mode 100644
index af45b71f21c3..000000000000
--- a/graphics/libglut/files/mesalib74-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2009-03-28 00:59:46.000000000 +0000
-+++ configure 2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
- ;;
- *freebsd* | dragonfly*)
- case "$host_cpu" in
-- i*86|x86_64) default_driver="dri";;
-+ i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
- esac
- ;;
- esac
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 861d75504a71..ecb98c811692 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -21,6 +21,10 @@ DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS= NVIDIA_GL "Use NVIDIA's libraries" off
+EXTRA_PATCHES+= ${FILESDIR}/patch-progs-xdemos-glxpixmap.c \
+ ${FILESDIR}/patch-progs-xdemos-yuvrect_client.c
+
+
do-install:
@for i in demos xdemos; do \
cd ${WRKSRC}/progs/$$i; \
diff --git a/graphics/mesa-demos/files/mesalib74-configure b/graphics/mesa-demos/files/mesalib74-configure
deleted file mode 100644
index af45b71f21c3..000000000000
--- a/graphics/mesa-demos/files/mesalib74-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2009-03-28 00:59:46.000000000 +0000
-+++ configure 2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
- ;;
- *freebsd* | dragonfly*)
- case "$host_cpu" in
-- i*86|x86_64) default_driver="dri";;
-+ i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
- esac
- ;;
- esac
diff --git a/x11-clocks/xclock/pkg-descr b/x11-clocks/xclock/pkg-descr
index c8261821a87a..629b180cb03e 100644
--- a/x11-clocks/xclock/pkg-descr
+++ b/x11-clocks/xclock/pkg-descr
@@ -1,5 +1,4 @@
This package contains xclock, a program for the X Window System that display
the time in analog or digital form.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/Software/xapps
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index 7af3852fd706..37b71cf507e3 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
SF/linuxwacom/linuxwacom/${WACOM_VERSION}:linuxwacom
DISTFILES= ${BSDWACOM}.tbz:bsdwacom \
${LINUXWACOM}.tar.bz2:linuxwacom
+EXTRACT_ONLY= ${BSDWACOM}.tbz
MAINTAINER= kamikaze@bsdforen.de
COMMENT= X.Org Wacom tablet driver and kernel module
@@ -22,7 +23,6 @@ MANCOMPRESSED= yes
USE_GMAKE= yes
USE_RC_SUBR= wacom
-USE_LDCONFIG= no
KMODDIR?= /boot/modules
XINPUTMODDIR= lib/xorg/modules/input
@@ -44,18 +44,20 @@ BSDWACOM= bsdwacom-${KLD_VERSION}
WACOM_VERSION= 0.8.2-2
KLD_VERSION= 40
-OPTIONS= UWACOMKLD "Install USB kernel module (ignored on 8.x)" ${KMOD_SUPPORTED}
-
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 800064
-KMOD_SUPPORTED= Off
-.undef WITH_UWACOMKLD
+OPTIONS= UWACOMKLD "Install USB kernel module (not supported on 8.x)" Off
.else
-KMOD_SUPPORTED= On
+OPTIONS= UWACOMKLD "Install USB kernel module (not supported on 8.x)" On
.endif
+.include <bsd.port.options.mk>
+
.if defined(WITH_UWACOMKLD)
+.if ${OSVERSION} >= 800064
+BROKEN= does not build with USB support
+.endif
PLIST_SUB+= UWACOMKLD="uwacom.ko"
PORTTYPE= usb
.else
@@ -63,22 +65,17 @@ PLIST_SUB+= UWACOMKLD="@noinst UWACOMKLD uwacom.ko"
PORTTYPE= serial
.endif
-.if ${OSVERSION} < 700000
-BROKEN= does not compile on 6.X
-.endif
-
-post-patch:
- @${LN} -s ../${LINUXWACOM} ${WRKDIR}/linuxwacom/
-
do-configure:
- @cd ${WRKDIR}/linuxwacom && ${SETENV} ${MAKE_ENV} ./run_configure
+ @cd ${WRKDIR}/linuxwacom \
+ && ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${LINUXWACOM}.tar.bz2 \
+ && ${SETENV} ${MAKE_ENV} ./run_configure
do-build:
.if defined(WITH_UWACOMKLD)
@cd ${WRKDIR}/uwacom \
&& ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
.endif
- @cd ${WRKDIR}/${LINUXWACOM} \
+ @cd ${WRKDIR}/linuxwacom/${LINUXWACOM} \
&& ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS}
do-install:
@@ -88,7 +85,7 @@ do-install:
.endif
@${MKDIR} ${PREFIX}/${XINPUTMODDIR} ${PREFIX}/${MAN4DIR}
@cd ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/util/ \
- && ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
+ && ${SETENV} ${MAKE_ENV} ${GMAKE} install
@${INSTALL} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/xdrv/wacom_drv.so \
${PREFIX}/${XINPUTMODDIR}/
@${INSTALL_MAN} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/wacom.4x.gz \
@@ -101,8 +98,8 @@ plist: clean configure
@cd ${WRKDIR}/linuxwacom \
&& ${SETENV} ${MAKE_ENV} PREFIX=${WRKDIR}/plist ./run_configure
@${MKDIR} ${WRKDIR}/plist
- @cd ${WRKDIR}/${LINUXWACOM}/src/util \
- && ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
+ @cd ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/util \
+ && ${SETENV} ${MAKE_ENV} ${GMAKE} install
@cd ${WRKDIR}/linuxwacom \
&& ${SETENV} ${MAKE_ENV} ./run_configure
@${FIND} ${WRKDIR}/plist/ -not -type d \
@@ -120,4 +117,4 @@ post-install:
@${ECHO} "===> Displaying pkg-message."
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure b/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
index ed6a08602df8..2f4dccc9f09e 100644
--- a/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
+++ b/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
@@ -1,21 +1,17 @@
---- linuxwacom/run_configure.orig 2008-12-26 02:09:57.000000000 +0100
-+++ linuxwacom/run_configure 2010-05-13 22:44:05.000000000 +0200
-@@ -1,10 +1,8 @@
+--- linuxwacom/run_configure.orig 2009-01-21 11:26:52.000000000 +0100
++++ linuxwacom/run_configure 2009-01-21 11:27:00.000000000 +0100
+@@ -1,7 +1,7 @@
#!/bin/sh
# $Id: run_configure 40 2008-12-26 01:08:35Z undo $
-LINUXWACOM=0.8.2
+LINUXWACOM=0.8.2-2
--rm -rf linuxwacom-${LINUXWACOM}
--tar xf linuxwacom-${LINUXWACOM}.tar.bz2
- mkdir linuxwacom-${LINUXWACOM}/src/util/asm
- mkdir linuxwacom-${LINUXWACOM}/src/util/linux
- mkdir linuxwacom-${LINUXWACOM}/src/xdrv/asm
-@@ -14,5 +12,5 @@
+ rm -rf linuxwacom-${LINUXWACOM}
+ tar xf linuxwacom-${LINUXWACOM}.tar.bz2
+@@ -14,5 +14,5 @@
cp files/types.h linuxwacom-${LINUXWACOM}/src/xdrv/asm
cp files/input.h linuxwacom-${LINUXWACOM}/src/xdrv/linux
cd linuxwacom-${LINUXWACOM}
-./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 --prefix=${PREFIX} --enable-dlloader CFLAGS="-I/usr/local/include"
+./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 --prefix=${PREFIX} --enable-dlloader CFLAGS="-I/usr/local/include -DWCM_XORG_XSERVER_1_6=true"
-
diff --git a/x11-drivers/input-wacom/pkg-descr b/x11-drivers/input-wacom/pkg-descr
index 9d5c1d0ab7f1..228b6cf6f412 100644
--- a/x11-drivers/input-wacom/pkg-descr
+++ b/x11-drivers/input-wacom/pkg-descr
@@ -12,6 +12,3 @@ supports the following devices:
* not tested
WWW: http://linuxwacom.sourceforge.net/
-
-- Kamikaze
-kamikaze@bsdforen.de
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index 318080e1887f..6282853bd8e8 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-input-acecad
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,10 +16,4 @@ COMMENT= X.Org acecad input driver
XORG_CAT= driver
MAN4= acecad.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-acecad/pkg-descr b/x11-drivers/xf86-input-acecad/pkg-descr
index d20ae8373e09..ceb61611f6f0 100644
--- a/x11-drivers/xf86-input-acecad/pkg-descr
+++ b/x11-drivers/xf86-input-acecad/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-acecad driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-citron/Makefile b/x11-drivers/xf86-input-citron/Makefile
index 8a84469bb5cf..be7a6306e93d 100644
--- a/x11-drivers/xf86-input-citron/Makefile
+++ b/x11-drivers/xf86-input-citron/Makefile
@@ -7,21 +7,13 @@
PORTNAME= xf86-input-citron
PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org citron input driver
-BROKEN= does not compile
-
XORG_CAT= driver
MAN4= citron.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-citron/pkg-descr b/x11-drivers/xf86-input-citron/pkg-descr
index 1213821d5f70..f6f6d69260b1 100644
--- a/x11-drivers/xf86-input-citron/pkg-descr
+++ b/x11-drivers/xf86-input-citron/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-citron driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index b8ecd497e17c..48901c312f8c 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -6,22 +6,13 @@
#
PORTNAME= xf86-input-elographics
-PORTVERSION= 1.2.3
-PORTREVISION= 3
+PORTVERSION= 1.2.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org elographics input driver
-BROKEN= does not compile
-
XORG_CAT= driver
MAN4= elographics.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo
index 9d554d838b7e..8de17ce8f444 100644
--- a/x11-drivers/xf86-input-elographics/distinfo
+++ b/x11-drivers/xf86-input-elographics/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = cc2923460c8eff9652b01889a063058d
-SHA256 (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = 67550c8f4a85a8029f08880adf487e2efd4585e7adbe8da357fbd49750b08d8f
-SIZE (xorg/driver/xf86-input-elographics-1.2.3.tar.bz2) = 251743
+SHA256 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b
+SIZE (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 259101
diff --git a/x11-drivers/xf86-input-elographics/pkg-descr b/x11-drivers/xf86-input-elographics/pkg-descr
index aed30dc012b2..c941465feff3 100644
--- a/x11-drivers/xf86-input-elographics/pkg-descr
+++ b/x11-drivers/xf86-input-elographics/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-elographics driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index 68164527d150..6f8106411880 100644
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -7,23 +7,15 @@
PORTNAME= xf86-input-fpit
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org fpit input driver
-BROKEN= does not compile
-
XORG_CAT= driver
USE_XORG= xrandr
MAN4= fpit.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-fpit/pkg-descr b/x11-drivers/xf86-input-fpit/pkg-descr
index 9ebd6609662a..28985efe820a 100644
--- a/x11-drivers/xf86-input-fpit/pkg-descr
+++ b/x11-drivers/xf86-input-fpit/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-fpit driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index aca1b54e0a10..5a13b5284dc8 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= 4
+PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,11 +15,4 @@ COMMENT= X.Org hyperpen input driver
XORG_CAT= driver
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
-
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-descr b/x11-drivers/xf86-input-hyperpen/pkg-descr
index a45a59abed70..30e7b366eeac 100644
--- a/x11-drivers/xf86-input-hyperpen/pkg-descr
+++ b/x11-drivers/xf86-input-hyperpen/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-hyperpen driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 2118f973e9a7..1017689b2550 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-input-joystick
PORTVERSION= 1.5.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -20,12 +21,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/Makefile.in
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
-
-
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/pkg-descr b/x11-drivers/xf86-input-joystick/pkg-descr
index 14f2aaafa43e..cfcfc76e1c29 100644
--- a/x11-drivers/xf86-input-joystick/pkg-descr
+++ b/x11-drivers/xf86-input-joystick/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-joystick driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 2a8c6b6e1b4b..3a5205df7340 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-input-keyboard
-PORTVERSION= 1.4.0
+PORTVERSION= 1.5.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,11 +16,5 @@ XORG_CAT= driver
USE_XORG= kbproto
MAN4= kbd.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index bc439114f1df..b484e1cdc0d7 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0
+SIZE (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 301181
diff --git a/x11-drivers/xf86-input-keyboard/pkg-descr b/x11-drivers/xf86-input-keyboard/pkg-descr
index 032961e5144a..0ee3dcb7ac45 100644
--- a/x11-drivers/xf86-input-keyboard/pkg-descr
+++ b/x11-drivers/xf86-input-keyboard/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-keyboard driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 57b7e48875e3..29727d1ab69d 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= 6
+PORTREVISION= 7
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-magictouch/pkg-descr b/x11-drivers/xf86-input-magictouch/pkg-descr
index 685c1e00b41a..b3eb245f9619 100644
--- a/x11-drivers/xf86-input-magictouch/pkg-descr
+++ b/x11-drivers/xf86-input-magictouch/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-input-magictouch driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index a242f927a845..319e96c8dd86 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-input-mouse
-PORTVERSION= 1.5.0
+PORTVERSION= 1.6.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,10 +15,4 @@ COMMENT= X.Org mouse input driver
XORG_CAT= driver
MAN4= mousedrv.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index 017bdcb38fa3..d4f66bab3026 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb
+SIZE (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = 316953
diff --git a/x11-drivers/xf86-input-mouse/pkg-descr b/x11-drivers/xf86-input-mouse/pkg-descr
index 866b4d8ae7e3..c45fe40f5a69 100644
--- a/x11-drivers/xf86-input-mouse/pkg-descr
+++ b/x11-drivers/xf86-input-mouse/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-mouse driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index 26dff4584991..de568328ec74 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= 5
+PORTREVISION= 6
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ COMMENT= X.Org mutouch input driver
XORG_CAT= driver
MAN4= mutouch.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN= does not compile on 6.X
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mutouch/pkg-descr b/x11-drivers/xf86-input-mutouch/pkg-descr
index 881ac7c0e623..e3d06cc463ee 100644
--- a/x11-drivers/xf86-input-mutouch/pkg-descr
+++ b/x11-drivers/xf86-input-mutouch/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-mutouch driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 27c9090a1484..b251bd51b857 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-input-synaptics
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -27,10 +28,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
${PREFIX}/share/hal/fdi/policy/10osvendor/
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index c437e96a1aee..1024acd5d444 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,3 +1,2 @@
-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-synaptics/pkg-descr b/x11-drivers/xf86-input-synaptics/pkg-descr
index 2272145a738f..6d29e1bc0d3a 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-descr
+++ b/x11-drivers/xf86-input-synaptics/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-synaptics driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index ea0f08cca313..78cc5c02c74e 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-input-vmmouse
PORTVERSION= 12.6.9
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -22,10 +23,4 @@ MAN4= vmmouse.4x
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures.
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-descr b/x11-drivers/xf86-input-vmmouse/pkg-descr
index 061263d1ec45..266fa136961b 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-descr
+++ b/x11-drivers/xf86-input-vmmouse/pkg-descr
@@ -1 +1,3 @@
This package contains the X.Org xf86-input-vmmouse driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index 6f12e2a07625..530f563a8515 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-input-void
-PORTVERSION= 1.3.0
+PORTVERSION= 1.3.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,10 +15,4 @@ COMMENT= X.Org void input driver
XORG_CAT= driver
MAN4= void.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-void/pkg-descr b/x11-drivers/xf86-input-void/pkg-descr
index abb187620eb3..7aa7847d63bd 100644
--- a/x11-drivers/xf86-input-void/pkg-descr
+++ b/x11-drivers/xf86-input-void/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-input-void driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index 05896bb90461..5eaddccbec44 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-apm
-PORTVERSION= 1.2.2
+PORTVERSION= 1.2.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= apm.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
index 0d79c320a648..230f03ee84b4 100644
--- a/x11-drivers/xf86-video-apm/distinfo
+++ b/x11-drivers/xf86-video-apm/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
+SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
diff --git a/x11-drivers/xf86-video-apm/pkg-descr b/x11-drivers/xf86-video-apm/pkg-descr
index 5d3847a314c3..0ef8131f3e5c 100644
--- a/x11-drivers/xf86-video-apm/pkg-descr
+++ b/x11-drivers/xf86-video-apm/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-apm driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 66470ea99fa0..b3e381ae2169 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-ark
-PORTVERSION= 0.7.2
+PORTVERSION= 0.7.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,10 +15,4 @@ COMMENT= X.Org ark display driver
XORG_CAT= driver
USE_XORG= xextproto
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
index df4e7cd29569..d7e2a50fee90 100644
--- a/x11-drivers/xf86-video-ark/distinfo
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
+SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
diff --git a/x11-drivers/xf86-video-ark/pkg-descr b/x11-drivers/xf86-video-ark/pkg-descr
index 8de2e6e90406..46a0bec750e4 100644
--- a/x11-drivers/xf86-video-ark/pkg-descr
+++ b/x11-drivers/xf86-video-ark/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-ark driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index f6b735041c5c..d9eb94732432 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.13.2
+PORTVERSION= 6.14.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -18,10 +18,4 @@ XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
MAN4= ati.4x radeon.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index e9633aa3ab8d..1180e6585774 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = a8f92fe3c458e511f4e2ead7f92c02b0
-SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
-SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
+SHA256 (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
+SIZE (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 1054336
diff --git a/x11-drivers/xf86-video-ati/pkg-descr b/x11-drivers/xf86-video-ati/pkg-descr
index 16d71008faf7..fe1b01b2281a 100644
--- a/x11-drivers/xf86-video-ati/pkg-descr
+++ b/x11-drivers/xf86-video-ati/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-ati driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index f6b735041c5c..6281c7ec3743 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTNAME= xf86-video-ati
+PORTNAME= xf86-video-ati613
PORTVERSION= 6.13.2
CATEGORIES= x11-drivers
@@ -18,10 +18,4 @@ XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
MAN4= ati.4x radeon.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 15ef01c34bb6..2de3dc72e873 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-chips
-PORTVERSION= 1.2.2
+PORTVERSION= 1.2.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= chips.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index 5f2228bb0cca..8a19b72546b8 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 0561278e06f84d4ee20317b19831cc8d42c952a1577c7865163ad2d6d900cb1d
+SIZE (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 338968
diff --git a/x11-drivers/xf86-video-chips/pkg-descr b/x11-drivers/xf86-video-chips/pkg-descr
index 9983550b36ad..2145d88b7632 100644
--- a/x11-drivers/xf86-video-chips/pkg-descr
+++ b/x11-drivers/xf86-video-chips/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-chips driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 47ae0ce20f0f..1def9f85551a 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-cirrus
PORTVERSION= 1.3.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +17,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= cirrus.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cirrus/pkg-descr b/x11-drivers/xf86-video-cirrus/pkg-descr
index b1bbce565d6f..e6007b2c5b84 100644
--- a/x11-drivers/xf86-video-cirrus/pkg-descr
+++ b/x11-drivers/xf86-video-cirrus/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-cirrus driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index c6c36fbf03b9..39057d8ce40a 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= 6
+PORTREVISION= 7
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cyrix/pkg-descr b/x11-drivers/xf86-video-cyrix/pkg-descr
index 81d4933f7776..91f0ec52af30 100644
--- a/x11-drivers/xf86-video-cyrix/pkg-descr
+++ b/x11-drivers/xf86-video-cyrix/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-cyrix driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 786ab73d5576..9b0f1474aed2 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-dummy
-PORTVERSION= 0.3.3
+PORTVERSION= 0.3.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,10 +15,4 @@ COMMENT= X.Org dummy display driver
XORG_CAT= driver
USE_XORG= videoproto xf86dgaproto
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
index ffe3f1af2962..b8a7debbe393 100644
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
+SIZE (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 255658
diff --git a/x11-drivers/xf86-video-dummy/pkg-descr b/x11-drivers/xf86-video-dummy/pkg-descr
index b979373c5272..4aa6c28c8f25 100644
--- a/x11-drivers/xf86-video-dummy/pkg-descr
+++ b/x11-drivers/xf86-video-dummy/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-dummy driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 4d72da1707e0..5573b32c332f 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-fbdev
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto
MAN4= fbdev.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo
index 01f11b987388..9f19d13ecd7c 100644
--- a/x11-drivers/xf86-video-fbdev/distinfo
+++ b/x11-drivers/xf86-video-fbdev/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
+SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
diff --git a/x11-drivers/xf86-video-fbdev/pkg-descr b/x11-drivers/xf86-video-fbdev/pkg-descr
index 8488cf84f820..22797ee517dd 100644
--- a/x11-drivers/xf86-video-fbdev/pkg-descr
+++ b/x11-drivers/xf86-video-fbdev/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-fbdev driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 62cea86ea49b..fe6678ebc269 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-glint
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -18,10 +18,4 @@ XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto xf86dgaproto glproto
MAN4= glint.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 3816aab63197..91b9ad94aeb9 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b
+SIZE (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 394136
diff --git a/x11-drivers/xf86-video-glint/pkg-descr b/x11-drivers/xf86-video-glint/pkg-descr
index 9d7d17f48926..ef6b27229170 100644
--- a/x11-drivers/xf86-video-glint/pkg-descr
+++ b/x11-drivers/xf86-video-glint/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-glint driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index 4d87e6c992b7..3c61786b42b2 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-i128
-PORTVERSION= 1.3.3
+PORTVERSION= 1.3.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= i128.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
index a6f6bc7eccbc..1b2a870d5476 100644
--- a/x11-drivers/xf86-video-i128/distinfo
+++ b/x11-drivers/xf86-video-i128/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
+SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
diff --git a/x11-drivers/xf86-video-i128/pkg-descr b/x11-drivers/xf86-video-i128/pkg-descr
index 06b51e337361..9bea2a128537 100644
--- a/x11-drivers/xf86-video-i128/pkg-descr
+++ b/x11-drivers/xf86-video-i128/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-i128 driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index b320e95644d4..7320b92768e3 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-i740
PORTVERSION= 1.3.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +17,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= i740.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i740/pkg-descr b/x11-drivers/xf86-video-i740/pkg-descr
index 4504d5855cfc..d739909bf1d9 100644
--- a/x11-drivers/xf86-video-i740/pkg-descr
+++ b/x11-drivers/xf86-video-i740/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-i740 driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
index 0598e509f6e5..54147b76e1b9 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= 6
+PORTREVISION= 7
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-imstt/pkg-descr b/x11-drivers/xf86-video-imstt/pkg-descr
index 6a8354606a5f..8b3638e59098 100644
--- a/x11-drivers/xf86-video-imstt/pkg-descr
+++ b/x11-drivers/xf86-video-imstt/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-imstt driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 9d537bad6b5d..fbabd24c2808 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= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -22,10 +22,4 @@ XORG_CAT= driver
USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto
MAN4= intel.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile
index 30edcb182ff2..1adf954b1ae0 100644
--- a/x11-drivers/xf86-video-intel29/Makefile
+++ b/x11-drivers/xf86-video-intel29/Makefile
@@ -22,6 +22,4 @@ 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/pkg-descr b/x11-drivers/xf86-video-intel29/pkg-descr
index 6ace2532843a..69bd312494b6 100644
--- a/x11-drivers/xf86-video-intel29/pkg-descr
+++ b/x11-drivers/xf86-video-intel29/pkg-descr
@@ -1,3 +1,5 @@
Driver for Intel integrated graphics chipsets. It supports the i810,
i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM, 865G, 915G, 915GM,
945G, 945GM, 965G, 965Q, 946GZ and 965GM chipsets.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index f7d3973e59b6..d4ba10d89143 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-mach64
PORTVERSION= 6.8.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -17,10 +18,4 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mach64/pkg-descr b/x11-drivers/xf86-video-mach64/pkg-descr
index 5e9a1717b3e8..98066b11d3f3 100644
--- a/x11-drivers/xf86-video-mach64/pkg-descr
+++ b/x11-drivers/xf86-video-mach64/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-mach64 driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index b53fe7395e03..8ffe2ccff5f6 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -25,11 +25,4 @@ pre-patch:
-e 's|MAXSHORT|SHRT_MAX|g' \
${WRKSRC}/src/mga_arc.c
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
-
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mga/pkg-descr b/x11-drivers/xf86-video-mga/pkg-descr
index a5938e3982b6..6dbb594ffd61 100644
--- a/x11-drivers/xf86-video-mga/pkg-descr
+++ b/x11-drivers/xf86-video-mga/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-mga driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 8fef841fa9f5..17a2a42b3b79 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-neomagic
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto xf86dgaproto
MAN4= neomagic.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
index 6dbde59ce4c7..67022a742eae 100644
--- a/x11-drivers/xf86-video-neomagic/distinfo
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
+SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
diff --git a/x11-drivers/xf86-video-neomagic/pkg-descr b/x11-drivers/xf86-video-neomagic/pkg-descr
index 77a454efa172..8d41f9f4455f 100644
--- a/x11-drivers/xf86-video-neomagic/pkg-descr
+++ b/x11-drivers/xf86-video-neomagic/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-neomagic driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org \ No newline at end of file
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 340be9246ddc..7d8e3627dfd5 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-newport
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -21,10 +22,4 @@ post-patch:
-e 's|MAXSHORT|SHRT_MAX|g' \
${WRKSRC}/src/newport_accel.c
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-newport/pkg-descr b/x11-drivers/xf86-video-newport/pkg-descr
index f04af1ef2092..b85c38a4f97f 100644
--- a/x11-drivers/xf86-video-newport/pkg-descr
+++ b/x11-drivers/xf86-video-newport/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-newport driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 809500a8a311..0b4dac78c3d6 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= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/
@@ -58,10 +58,4 @@ maint-gen-distfile:
${RM} -rf ${GIT_WORK}
.include "Makefile.rev"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000 && ${ARCH} == "amd64"
-BROKEN= does not compile on 6.X
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 56eab3119c52..7a3dd9c60c3d 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-nv
-PORTVERSION= 2.1.17
+PORTVERSION= 2.1.18
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= nv.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo
index c76577a4f28d..efc4d2e0dcbd 100644
--- a/x11-drivers/xf86-video-nv/distinfo
+++ b/x11-drivers/xf86-video-nv/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/driver/xf86-video-nv-2.1.17.tar.bz2) = 4401c7b956e60a6d7de68ca6a8ec05d0
-SHA256 (xorg/driver/xf86-video-nv-2.1.17.tar.bz2) = 4286f8994d80a30c7b6b4fc9df6ea5d587f648adc23cb3f523f571738c6900f4
-SIZE (xorg/driver/xf86-video-nv-2.1.17.tar.bz2) = 396474
+SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
+SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
diff --git a/x11-drivers/xf86-video-nv/pkg-descr b/x11-drivers/xf86-video-nv/pkg-descr
index 615030068d6b..f7f0bab4ea4c 100644
--- a/x11-drivers/xf86-video-nv/pkg-descr
+++ b/x11-drivers/xf86-video-nv/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-nv driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 85695f8680fb..b3e4d076eeb5 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= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MASTER_SITES= http://www.openchrome.org/releases/
@@ -24,10 +24,4 @@ MAKE_ARGS+= drivermandir=${LOCALBASE}/man/man4
ONLY_FOR_ARCHS= amd64 i386 ia64
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk> \ No newline at end of file
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-openchrome/pkg-descr b/x11-drivers/xf86-video-openchrome/pkg-descr
index c0a747403333..2643b9a74f04 100644
--- a/x11-drivers/xf86-video-openchrome/pkg-descr
+++ b/x11-drivers/xf86-video-openchrome/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-openchrome driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 8cba4b04b7a6..e94bed1a4be2 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-r128
PORTVERSION= 6.8.1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -18,10 +19,4 @@ XORG_CAT= driver
USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
MAN4= r128.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-r128/pkg-descr b/x11-drivers/xf86-video-r128/pkg-descr
index 4c7c5e44140c..7fa7879e07a6 100644
--- a/x11-drivers/xf86-video-r128/pkg-descr
+++ b/x11-drivers/xf86-video-r128/pkg-descr
@@ -1,4 +1,2 @@
This package contains the X.Org xf86-video-r128 driver.
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index 19b49d2d3a90..296a5dfa3a15 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= 4
+PORTREVISION= 5
CATEGORIES= x11-drivers
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nork
@@ -37,10 +37,4 @@ post-install:
${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${PREFIX}/sbin
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-radeonhd-devel/pkg-descr b/x11-drivers/xf86-video-radeonhd-devel/pkg-descr
index 40d1aa910b51..f50f55677b0b 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/pkg-descr
+++ b/x11-drivers/xf86-video-radeonhd-devel/pkg-descr
@@ -1 +1,3 @@
This package contains the X.Org xf86-video-radeonhd driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
index c005f5907f55..03f06fe99a86 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= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -40,8 +40,4 @@ post-install:
${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${PREFIX}/sbin
.endif
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-radeonhd/pkg-descr b/x11-drivers/xf86-video-radeonhd/pkg-descr
index 40d1aa910b51..f50f55677b0b 100644
--- a/x11-drivers/xf86-video-radeonhd/pkg-descr
+++ b/x11-drivers/xf86-video-radeonhd/pkg-descr
@@ -1 +1,3 @@
This package contains the X.Org xf86-video-radeonhd driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index 44fe2f04f26c..651cf5228a43 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= xf86-video-rdc
-MASTER_SITES= http://www.SpringDaemons.com/stas/
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
+MASTER_SITES= http://www.SpringDaemons.com/stas/
MAINTAINER= stas@FreeBSD.org
COMMENT= X.Org RDC display driver
@@ -18,8 +18,6 @@ COMMENT= X.Org RDC display driver
XORG_CAT= driver
USE_XORG= xvmc xf86driproto xextproto x11 glproto
-BROKEN= does not compile
-
do-install:
${MKDIR} ${PREFIX}/lib/xorg/modules/drivers
${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/rdc_drv.so \
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 64a4b1489693..8fc96d2825b2 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-rendition
-PORTVERSION= 4.2.3
+PORTVERSION= 4.2.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= xextproto
MAN4= rendition.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
index fd5521f4fd54..2b683b7b5539 100644
--- a/x11-drivers/xf86-video-rendition/distinfo
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
+SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
diff --git a/x11-drivers/xf86-video-rendition/pkg-descr b/x11-drivers/xf86-video-rendition/pkg-descr
index 7ff79bc2df1e..151ab6ce22fc 100644
--- a/x11-drivers/xf86-video-rendition/pkg-descr
+++ b/x11-drivers/xf86-video-rendition/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-rendition driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 49b4bc669602..5397647eaeb4 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-s3
PORTVERSION= 0.6.3
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +17,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= s3.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/pkg-descr b/x11-drivers/xf86-video-s3/pkg-descr
index db7f321d3f8a..0f0e0ff4df4a 100644
--- a/x11-drivers/xf86-video-s3/pkg-descr
+++ b/x11-drivers/xf86-video-s3/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-s3 driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 57ec08c899a7..bd879ee46402 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-s3virge
PORTVERSION= 1.10.4
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +17,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= s3virge.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3virge/pkg-descr b/x11-drivers/xf86-video-s3virge/pkg-descr
index dc782f753950..305f6b3b6571 100644
--- a/x11-drivers/xf86-video-s3virge/pkg-descr
+++ b/x11-drivers/xf86-video-s3virge/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-s3virge driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index d81e3deba947..2cad8e1b3344 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-savage
-PORTVERSION= 2.3.1
+PORTVERSION= 2.3.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -18,10 +18,4 @@ XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto glproto
MAN4= savage.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index 126a6b6394dc..5c16f9c4c1ec 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 54bde0077a2369fbdd42b0b25803f3c7147a58792997b14e45ee0b856199ddf1
+SIZE (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 366731
diff --git a/x11-drivers/xf86-video-savage/pkg-descr b/x11-drivers/xf86-video-savage/pkg-descr
index 7d97ae643222..909ad78af79f 100644
--- a/x11-drivers/xf86-video-savage/pkg-descr
+++ b/x11-drivers/xf86-video-savage/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-savage driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 0d4939173c87..cfa486f576bd 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= siliconmotion.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index f2fea3b3cda5..5d477f0de57e 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,3 +1,2 @@
-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-siliconmotion/pkg-descr b/x11-drivers/xf86-video-siliconmotion/pkg-descr
index e98df3da9c1e..6816f930f1f9 100644
--- a/x11-drivers/xf86-video-siliconmotion/pkg-descr
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-siliconmotion driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-sis-intel/pkg-descr b/x11-drivers/xf86-video-sis-intel/pkg-descr
index 8b691f1c7aca..81e087ab71aa 100644
--- a/x11-drivers/xf86-video-sis-intel/pkg-descr
+++ b/x11-drivers/xf86-video-sis-intel/pkg-descr
@@ -1,5 +1,2 @@
This package contains the X.Org SiS driver provided by Intel for their
D201GLY/D201GLY2 motherboards
-
-- Alexey Illarionov
-littlesavage@orionet.ru
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index fd31059d891e..8140572d303b 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xf86-video-sis
PORTVERSION= 0.10.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -21,10 +21,4 @@ XORG_CAT= driver
USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
MAN4= sis.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/pkg-descr b/x11-drivers/xf86-video-sis/pkg-descr
index 18f08cfb9478..506af9c0decb 100644
--- a/x11-drivers/xf86-video-sis/pkg-descr
+++ b/x11-drivers/xf86-video-sis/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-sis driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index c4c2f8f99151..97c017d7aaef 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-sunffb
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/pkg-descr b/x11-drivers/xf86-video-sunffb/pkg-descr
index 8b5134cfd813..4d4bd0bdae89 100644
--- a/x11-drivers/xf86-video-sunffb/pkg-descr
+++ b/x11-drivers/xf86-video-sunffb/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-sunffb driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 070a516d622c..9e80c3b636ab 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-tdfx
PORTVERSION= 1.4.3
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -18,10 +19,4 @@ XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto glproto
MAN4= tdfx.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tdfx/pkg-descr b/x11-drivers/xf86-video-tdfx/pkg-descr
index 8bd624be0425..43f01e124d53 100644
--- a/x11-drivers/xf86-video-tdfx/pkg-descr
+++ b/x11-drivers/xf86-video-tdfx/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-tdfx driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 1a4babbe6489..5acd2d113ab1 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-tga
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -15,10 +16,4 @@ COMMENT= X.Org tga display driver
XORG_CAT= driver
USE_XORG= videoproto xextproto xf86dgaproto
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tga/pkg-descr b/x11-drivers/xf86-video-tga/pkg-descr
index 849be023fde4..4b6648aec77e 100644
--- a/x11-drivers/xf86-video-tga/pkg-descr
+++ b/x11-drivers/xf86-video-tga/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-tga driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index 58a47b23c0f4..f768d3c8b92d 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-trident
-PORTVERSION= 1.3.3
+PORTVERSION= 1.3.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto xf86dgaproto
MAN4= trident.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
index 2121775ed9ee..80d0901a5deb 100644
--- a/x11-drivers/xf86-video-trident/distinfo
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
+SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
diff --git a/x11-drivers/xf86-video-trident/pkg-descr b/x11-drivers/xf86-video-trident/pkg-descr
index a24c2cbdcd36..b8727f46a8a0 100644
--- a/x11-drivers/xf86-video-trident/pkg-descr
+++ b/x11-drivers/xf86-video-trident/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-trident driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index 6f693132343a..06ee4272b1ce 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-tseng
-PORTVERSION= 1.2.3
+PORTVERSION= 1.2.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= videoproto xextproto
MAN4= tseng.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo
index d2d3236add8e..475278a285da 100644
--- a/x11-drivers/xf86-video-tseng/distinfo
+++ b/x11-drivers/xf86-video-tseng/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
+SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
diff --git a/x11-drivers/xf86-video-tseng/pkg-descr b/x11-drivers/xf86-video-tseng/pkg-descr
index 947118f13261..295677053be0 100644
--- a/x11-drivers/xf86-video-tseng/pkg-descr
+++ b/x11-drivers/xf86-video-tseng/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-tseng driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 4ef5ad73d5dc..a2fccafde091 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-vesa
PORTVERSION= 2.3.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +17,4 @@ XORG_CAT= driver
USE_XORG= xextproto
MAN4= vesa.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vesa/pkg-descr b/x11-drivers/xf86-video-vesa/pkg-descr
index 1c5752ff4cff..5d851fea5e6d 100644
--- a/x11-drivers/xf86-video-vesa/pkg-descr
+++ b/x11-drivers/xf86-video-vesa/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-vesa driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
index 427d009c8fb2..c769d950997e 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= 7
+PORTREVISION= 8
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-via/pkg-descr b/x11-drivers/xf86-video-via/pkg-descr
index f8c4810d09da..bdff896f7edd 100644
--- a/x11-drivers/xf86-video-via/pkg-descr
+++ b/x11-drivers/xf86-video-via/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-via driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 0478cb7815f6..f3376257ef01 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86-video-vmware
PORTVERSION= 11.0.3
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -17,10 +18,4 @@ USE_XORG= xextproto xineramaproto videoproto
MAN4= vmware.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vmware/pkg-descr b/x11-drivers/xf86-video-vmware/pkg-descr
index 301ee7405158..c8d73176ca12 100644
--- a/x11-drivers/xf86-video-vmware/pkg-descr
+++ b/x11-drivers/xf86-video-vmware/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org xf86-video-vmware driver.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 35f0c105a1ec..86eef10a10d1 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-voodoo
-PORTVERSION= 1.2.3
+PORTVERSION= 1.2.4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -16,10 +16,4 @@ XORG_CAT= driver
USE_XORG= xf86dgaproto xextproto
MAN4= voodoo.4x
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC= 4.2+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
index 463af94c9189..20eff8e7f454 100644
--- a/x11-drivers/xf86-video-voodoo/distinfo
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
+SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
diff --git a/x11-drivers/xf86-video-voodoo/pkg-descr b/x11-drivers/xf86-video-voodoo/pkg-descr
index 47285cb240ab..49fc9d928aa3 100644
--- a/x11-drivers/xf86-video-voodoo/pkg-descr
+++ b/x11-drivers/xf86-video-voodoo/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org xf86-video-voodoo driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 338b26b579fe..702905ed7f82 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-drivers
-PORTVERSION= 7.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-drivers
MASTER_SITES= # none
DISTFILES= # none
@@ -33,7 +33,7 @@ VIDEO_ON= ati \
.if ${ARCH} == "sparc64"
VIDEO_ON+= sunffb
-.else
+.elif ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
VIDEO_ON+= openchrome
.endif
@@ -48,7 +48,7 @@ VIDEO_OFF= apm ark \
glint \
i128 i740 imstt \
mga \
- neomagic newport nsc \
+ neomagic newport \
rendition \
s3 s3virge savage siliconmotion sis \
tdfx tga trident tseng \
@@ -64,7 +64,7 @@ INPUT_OFF= acecad \
fpit \
hyperpen \
joystick \
- magictouch microtouch mutouch \
+ magictouch mutouch \
penmount \
synaptics \
vmmouse void
diff --git a/x11-drivers/xorg-drivers/pkg-descr b/x11-drivers/xorg-drivers/pkg-descr
index dcd8e1cf3595..0f06964c6ebe 100644
--- a/x11-drivers/xorg-drivers/pkg-descr
+++ b/x11-drivers/xorg-drivers/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org shared libraries, headers, and related files.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile
index c0f054adad00..4f6666731587 100644
--- a/x11-fonts/bdftopcf/Makefile
+++ b/x11-fonts/bdftopcf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bdftopcf
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/bdftopcf/distinfo b/x11-fonts/bdftopcf/distinfo
index f86a24df34c3..62b497402acf 100644
--- a/x11-fonts/bdftopcf/distinfo
+++ b/x11-fonts/bdftopcf/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/bdftopcf-1.0.3.tar.bz2) = 9c90b408b2fe079495697bfc8fb13da940b2b70f4907213bf5dcc9e3024a1d0a
+SIZE (xorg/app/bdftopcf-1.0.3.tar.bz2) = 104929
diff --git a/x11-fonts/bdftopcf/pkg-descr b/x11-fonts/bdftopcf/pkg-descr
index 13bd0efdf00a..dbdee2c471fc 100644
--- a/x11-fonts/bdftopcf/pkg-descr
+++ b/x11-fonts/bdftopcf/pkg-descr
@@ -1,5 +1,4 @@
This package contains bdftopcf, a font compiler for the X server and font
server.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/archive/X11R6.8.1/doc/bdftopcf.1.html \ No newline at end of file
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
index 3566a27d08a4..5433a32fcf42 100644
--- a/x11-fonts/encodings/Makefile
+++ b/x11-fonts/encodings/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= encodings
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/encodings/distinfo b/x11-fonts/encodings/distinfo
index dc0a6e05174c..ec8027edeeba 100644
--- a/x11-fonts/encodings/distinfo
+++ b/x11-fonts/encodings/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/encodings-1.0.4.tar.bz2) = ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539
+SIZE (xorg/font/encodings-1.0.4.tar.bz2) = 665087
diff --git a/x11-fonts/encodings/pkg-descr b/x11-fonts/encodings/pkg-descr
index 308c83e6a2e2..2c262778317e 100644
--- a/x11-fonts/encodings/pkg-descr
+++ b/x11-fonts/encodings/pkg-descr
@@ -1,4 +1,3 @@
This package contains encondings X.Org fonts.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile
index 4f229c6ad888..00642965804d 100644
--- a/x11-fonts/font-adobe-100dpi/Makefile
+++ b/x11-fonts/font-adobe-100dpi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-adobe-100dpi
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-100dpi/distinfo b/x11-fonts/font-adobe-100dpi/distinfo
index 150c514aab3b..8e3e0780e21d 100644
--- a/x11-fonts/font-adobe-100dpi/distinfo
+++ b/x11-fonts/font-adobe-100dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-adobe-100dpi-1.0.3.tar.bz2) = b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054
+SIZE (xorg/font/font-adobe-100dpi-1.0.3.tar.bz2) = 1113104
diff --git a/x11-fonts/font-adobe-100dpi/pkg-descr b/x11-fonts/font-adobe-100dpi/pkg-descr
index a2b4649a0ec8..a021aef3e403 100644
--- a/x11-fonts/font-adobe-100dpi/pkg-descr
+++ b/x11-fonts/font-adobe-100dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Adobe 100dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile
index 44c6f7a5082f..a25694b5817e 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-adobe-75dpi/distinfo b/x11-fonts/font-adobe-75dpi/distinfo
index 198dd3a64012..2ac856e1093a 100644
--- a/x11-fonts/font-adobe-75dpi/distinfo
+++ b/x11-fonts/font-adobe-75dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-adobe-75dpi-1.0.3.tar.bz2) = c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09
+SIZE (xorg/font/font-adobe-75dpi-1.0.3.tar.bz2) = 889542
diff --git a/x11-fonts/font-adobe-75dpi/pkg-descr b/x11-fonts/font-adobe-75dpi/pkg-descr
index cd48a40db782..d9a482f664dc 100644
--- a/x11-fonts/font-adobe-75dpi/pkg-descr
+++ b/x11-fonts/font-adobe-75dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Adobe 75dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile
index d559532a2e07..5c5b0d730b9a 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.2
+PORTVERSION= 1.0.4
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 ff9db5278c3e..7957439f4f09 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/distinfo
+++ b/x11-fonts/font-adobe-utopia-100dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2) = d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5
+SIZE (xorg/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2) = 353852
diff --git a/x11-fonts/font-adobe-utopia-100dpi/pkg-descr b/x11-fonts/font-adobe-utopia-100dpi/pkg-descr
index 3542947e44ea..488cfa350388 100644
--- a/x11-fonts/font-adobe-utopia-100dpi/pkg-descr
+++ b/x11-fonts/font-adobe-utopia-100dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Adobe Utopia 100dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile
index ddd1790e97ea..ec8617212bd8 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.2
+PORTVERSION= 1.0.4
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 ffb86ed1aa3e..21956d6af47e 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/distinfo
+++ b/x11-fonts/font-adobe-utopia-75dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2) = 8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94
+SIZE (xorg/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2) = 273484
diff --git a/x11-fonts/font-adobe-utopia-75dpi/pkg-descr b/x11-fonts/font-adobe-utopia-75dpi/pkg-descr
index e9fa541eeccb..1c2ed371a092 100644
--- a/x11-fonts/font-adobe-utopia-75dpi/pkg-descr
+++ b/x11-fonts/font-adobe-utopia-75dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Adobe Utopia 75dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile
index eb6b120a7298..41f2b8e479c1 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.2
+PORTVERSION= 1.0.4
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 a2fda48bfef9..4324904aa0c7 100644
--- a/x11-fonts/font-adobe-utopia-type1/distinfo
+++ b/x11-fonts/font-adobe-utopia-type1/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-adobe-utopia-type1-1.0.4.tar.bz2) = 979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077
+SIZE (xorg/font/font-adobe-utopia-type1-1.0.4.tar.bz2) = 269159
diff --git a/x11-fonts/font-adobe-utopia-type1/pkg-descr b/x11-fonts/font-adobe-utopia-type1/pkg-descr
index f2328e33c098..9e2987a535ca 100644
--- a/x11-fonts/font-adobe-utopia-type1/pkg-descr
+++ b/x11-fonts/font-adobe-utopia-type1/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Adobe Utopia Type1 font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/ \ No newline at end of file
diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile
index 8d98a9e7f0f3..d1a956f0fe94 100644
--- a/x11-fonts/font-alias/Makefile
+++ b/x11-fonts/font-alias/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-alias
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-alias/distinfo b/x11-fonts/font-alias/distinfo
index 06e4712e1cb2..ff640278ee95 100644
--- a/x11-fonts/font-alias/distinfo
+++ b/x11-fonts/font-alias/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-alias-1.0.3.tar.bz2) = 8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a
+SIZE (xorg/font/font-alias-1.0.3.tar.bz2) = 102537
diff --git a/x11-fonts/font-alias/pkg-descr b/x11-fonts/font-alias/pkg-descr
index dc26cae3d2be..448b621e1ac1 100644
--- a/x11-fonts/font-alias/pkg-descr
+++ b/x11-fonts/font-alias/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Font aliases.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile
index 53af69152e1c..ba5403247476 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-arabic-misc/distinfo b/x11-fonts/font-arabic-misc/distinfo
index 05928e182c27..33b0e988faf1 100644
--- a/x11-fonts/font-arabic-misc/distinfo
+++ b/x11-fonts/font-arabic-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-arabic-misc-1.0.3.tar.bz2) = 505d9b12a7093389e67a925dfda6346bde26d114c67f0cdca7aeda6e5d3344f4
+SIZE (xorg/font/font-arabic-misc-1.0.3.tar.bz2) = 112136
diff --git a/x11-fonts/font-arabic-misc/pkg-descr b/x11-fonts/font-arabic-misc/pkg-descr
index 794e2b03da30..d36bb391ba1a 100644
--- a/x11-fonts/font-arabic-misc/pkg-descr
+++ b/x11-fonts/font-arabic-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Arabic fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile
index a030575ead4e..d6d927c7caf4 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-100dpi/distinfo b/x11-fonts/font-bh-100dpi/distinfo
index be79f0f26725..601cbd877eaf 100644
--- a/x11-fonts/font-bh-100dpi/distinfo
+++ b/x11-fonts/font-bh-100dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bh-100dpi-1.0.3.tar.bz2) = 23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481
+SIZE (xorg/font/font-bh-100dpi-1.0.3.tar.bz2) = 713206
diff --git a/x11-fonts/font-bh-100dpi/pkg-descr b/x11-fonts/font-bh-100dpi/pkg-descr
index 3225ba430355..92e4fde93bf0 100644
--- a/x11-fonts/font-bh-100dpi/pkg-descr
+++ b/x11-fonts/font-bh-100dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bigelow Holmes 100dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile
index db0967f3611c..11f97744af53 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-75dpi/distinfo b/x11-fonts/font-bh-75dpi/distinfo
index 6cda8a1919df..da16e15cc29e 100644
--- a/x11-fonts/font-bh-75dpi/distinfo
+++ b/x11-fonts/font-bh-75dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bh-75dpi-1.0.3.tar.bz2) = 3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c
+SIZE (xorg/font/font-bh-75dpi-1.0.3.tar.bz2) = 553016
diff --git a/x11-fonts/font-bh-75dpi/pkg-descr b/x11-fonts/font-bh-75dpi/pkg-descr
index b53defe047bb..b44db9c5ef33 100644
--- a/x11-fonts/font-bh-75dpi/pkg-descr
+++ b/x11-fonts/font-bh-75dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bigelow Holmes 75dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
index 78fe6242d34f..ca44b27427ab 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.1
+PORTVERSION= 1.0.3
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 52b6aabbc4fc..b9c384a089f1 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2) = 62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb
+SIZE (xorg/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2) = 245807
diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr
index 3eba6ff3202b..474246f48909 100644
--- a/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr
+++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bigelow Holmes Lucida TypeWriter 100dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
index 098f5019e25e..8b3169d15ae1 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.1
+PORTVERSION= 1.0.3
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 af10b978e77b..74678145ad52 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2) = 4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31
+SIZE (xorg/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2) = 219511
diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr
index 54bc5cc797e2..fa4539e64fda 100644
--- a/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr
+++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bigelow Holmes Lucida TypeWriter 75dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile
index e172013db31f..6e4df07f0e3e 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-ttf/distinfo b/x11-fonts/font-bh-ttf/distinfo
index 70d266d45f9c..cccd5f5fda8a 100644
--- a/x11-fonts/font-bh-ttf/distinfo
+++ b/x11-fonts/font-bh-ttf/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bh-ttf-1.0.3.tar.bz2) = 1b4bea63271b4db0726b5b52c97994c3313b6023510349226908090501abd25f
+SIZE (xorg/font/font-bh-ttf-1.0.3.tar.bz2) = 465351
diff --git a/x11-fonts/font-bh-ttf/pkg-descr b/x11-fonts/font-bh-ttf/pkg-descr
index 4720034b4ea6..9c7c98264fd3 100644
--- a/x11-fonts/font-bh-ttf/pkg-descr
+++ b/x11-fonts/font-bh-ttf/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bigelow & Holmes TTF font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bh-ttf/pkg-plist b/x11-fonts/font-bh-ttf/pkg-plist
index 4b17598470b9..6b6b7da9ec0f 100644
--- a/x11-fonts/font-bh-ttf/pkg-plist
+++ b/x11-fonts/font-bh-ttf/pkg-plist
@@ -1,3 +1,5 @@
+etc/fonts/conf.avail/42-luxi-mono.conf
+etc/fonts/conf.d/42-luxi-mono.conf
lib/X11/fonts/TTF/luximb.ttf
lib/X11/fonts/TTF/luximbi.ttf
lib/X11/fonts/TTF/luximr.ttf
@@ -10,3 +12,6 @@ lib/X11/fonts/TTF/luxisb.ttf
lib/X11/fonts/TTF/luxisbi.ttf
lib/X11/fonts/TTF/luxisr.ttf
lib/X11/fonts/TTF/luxisri.ttf
+@dirrmtry etc/fonts/conf.d
+@dirrmtry etc/fonts/conf.avail
+@dirrmtry etc/fonts
diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile
index 9ad92348063c..f2972e460bae 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bh-type1/distinfo b/x11-fonts/font-bh-type1/distinfo
index 9c6ab5dd8346..cff938d54a48 100644
--- a/x11-fonts/font-bh-type1/distinfo
+++ b/x11-fonts/font-bh-type1/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bh-type1-1.0.3.tar.bz2) = 761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1
+SIZE (xorg/font/font-bh-type1-1.0.3.tar.bz2) = 637337
diff --git a/x11-fonts/font-bh-type1/pkg-descr b/x11-fonts/font-bh-type1/pkg-descr
index 832ce319aebd..6b5053547d15 100644
--- a/x11-fonts/font-bh-type1/pkg-descr
+++ b/x11-fonts/font-bh-type1/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bigelow Holmes Type1 font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile
index 93b1ef4a038d..b6bbad0c4e03 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-100dpi/distinfo b/x11-fonts/font-bitstream-100dpi/distinfo
index bb704d31bdfb..8debce529389 100644
--- a/x11-fonts/font-bitstream-100dpi/distinfo
+++ b/x11-fonts/font-bitstream-100dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bitstream-100dpi-1.0.3.tar.bz2) = ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce
+SIZE (xorg/font/font-bitstream-100dpi-1.0.3.tar.bz2) = 200276
diff --git a/x11-fonts/font-bitstream-100dpi/pkg-descr b/x11-fonts/font-bitstream-100dpi/pkg-descr
index 94f9f27d7c57..fe1a94dade76 100644
--- a/x11-fonts/font-bitstream-100dpi/pkg-descr
+++ b/x11-fonts/font-bitstream-100dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bitstream Vera 100dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile
index 9f0996b1476f..f7e40ef5860e 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-75dpi/distinfo b/x11-fonts/font-bitstream-75dpi/distinfo
index 176f4445f5ae..115b0a51c15c 100644
--- a/x11-fonts/font-bitstream-75dpi/distinfo
+++ b/x11-fonts/font-bitstream-75dpi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bitstream-75dpi-1.0.3.tar.bz2) = ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e
+SIZE (xorg/font/font-bitstream-75dpi-1.0.3.tar.bz2) = 174603
diff --git a/x11-fonts/font-bitstream-75dpi/pkg-descr b/x11-fonts/font-bitstream-75dpi/pkg-descr
index 56d509118538..f90c4f9e6f05 100644
--- a/x11-fonts/font-bitstream-75dpi/pkg-descr
+++ b/x11-fonts/font-bitstream-75dpi/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bitstream Vera 75dpi font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile
index f3a09bf4a518..87b08931ece5 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.1
+PORTVERSION= 1.0.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-speedo/distinfo b/x11-fonts/font-bitstream-speedo/distinfo
index 5709280f88d9..d5b4092a986f 100644
--- a/x11-fonts/font-bitstream-speedo/distinfo
+++ b/x11-fonts/font-bitstream-speedo/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bitstream-speedo-1.0.2.tar.bz2) = 0708fe0046947b88c082b55844af8a861741dcdf087f0624bdf23fb773d76763
+SIZE (xorg/font/font-bitstream-speedo-1.0.2.tar.bz2) = 415776
diff --git a/x11-fonts/font-bitstream-speedo/pkg-descr b/x11-fonts/font-bitstream-speedo/pkg-descr
index 96f5b11b6cbc..6951589235ca 100644
--- a/x11-fonts/font-bitstream-speedo/pkg-descr
+++ b/x11-fonts/font-bitstream-speedo/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bitstream Vera Speedo font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile
index 374fcf8e4fa7..030a966bc19a 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-bitstream-type1/distinfo b/x11-fonts/font-bitstream-type1/distinfo
index b9129237da13..9c51b2ae43ad 100644
--- a/x11-fonts/font-bitstream-type1/distinfo
+++ b/x11-fonts/font-bitstream-type1/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-bitstream-type1-1.0.3.tar.bz2) = c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688
+SIZE (xorg/font/font-bitstream-type1-1.0.3.tar.bz2) = 415980
diff --git a/x11-fonts/font-bitstream-type1/pkg-descr b/x11-fonts/font-bitstream-type1/pkg-descr
index 49b8a5a921ea..6e16d38be22c 100644
--- a/x11-fonts/font-bitstream-type1/pkg-descr
+++ b/x11-fonts/font-bitstream-type1/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Bitstream Vera Type1 font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile
index acf8da5fd839..d4608f4ab0b7 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cronyx-cyrillic/distinfo b/x11-fonts/font-cronyx-cyrillic/distinfo
index c331402b0063..55929257dc83 100644
--- a/x11-fonts/font-cronyx-cyrillic/distinfo
+++ b/x11-fonts/font-cronyx-cyrillic/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-cronyx-cyrillic-1.0.3.tar.bz2) = 6e8631936157677c77ba032b5c7b1fb3cb2ee872dbcea0444f12cd602cd9212a
+SIZE (xorg/font/font-cronyx-cyrillic-1.0.3.tar.bz2) = 262896
diff --git a/x11-fonts/font-cronyx-cyrillic/pkg-descr b/x11-fonts/font-cronyx-cyrillic/pkg-descr
index 5a978881cbac..cdf2afe62193 100644
--- a/x11-fonts/font-cronyx-cyrillic/pkg-descr
+++ b/x11-fonts/font-cronyx-cyrillic/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Cronyx Cyrillic font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org
diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile
index e3dee7a50121..3a860ff44a50 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-cursor-misc/distinfo b/x11-fonts/font-cursor-misc/distinfo
index e4096bd0467f..1195a15e738f 100644
--- a/x11-fonts/font-cursor-misc/distinfo
+++ b/x11-fonts/font-cursor-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-cursor-misc-1.0.3.tar.bz2) = 17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635
+SIZE (xorg/font/font-cursor-misc-1.0.3.tar.bz2) = 102041
diff --git a/x11-fonts/font-cursor-misc/pkg-descr b/x11-fonts/font-cursor-misc/pkg-descr
index 7bf45735a4c4..3e9b53c03b49 100644
--- a/x11-fonts/font-cursor-misc/pkg-descr
+++ b/x11-fonts/font-cursor-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Cursor fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile
index e04062620186..f3722913f9dc 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-daewoo-misc/distinfo b/x11-fonts/font-daewoo-misc/distinfo
index 65514499c5f0..8f9205852f67 100644
--- a/x11-fonts/font-daewoo-misc/distinfo
+++ b/x11-fonts/font-daewoo-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-daewoo-misc-1.0.3.tar.bz2) = bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8
+SIZE (xorg/font/font-daewoo-misc-1.0.3.tar.bz2) = 723414
diff --git a/x11-fonts/font-daewoo-misc/pkg-descr b/x11-fonts/font-daewoo-misc/pkg-descr
index fcf6ce89e836..68726a9d122c 100644
--- a/x11-fonts/font-daewoo-misc/pkg-descr
+++ b/x11-fonts/font-daewoo-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Daewoo fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile
index 9619c825983c..8d1f8b97811f 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-dec-misc/distinfo b/x11-fonts/font-dec-misc/distinfo
index 918fd573475f..38d58a356a33 100644
--- a/x11-fonts/font-dec-misc/distinfo
+++ b/x11-fonts/font-dec-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-dec-misc-1.0.3.tar.bz2) = e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b
+SIZE (xorg/font/font-dec-misc-1.0.3.tar.bz2) = 99832
diff --git a/x11-fonts/font-dec-misc/pkg-descr b/x11-fonts/font-dec-misc/pkg-descr
index 7f524348141b..dc558f0c1544 100644
--- a/x11-fonts/font-dec-misc/pkg-descr
+++ b/x11-fonts/font-dec-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Dec fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile
index ebe9e11c33a4..8746b3565d47 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-ibm-type1/distinfo b/x11-fonts/font-ibm-type1/distinfo
index 2724fac75ba1..651b39f16c4e 100644
--- a/x11-fonts/font-ibm-type1/distinfo
+++ b/x11-fonts/font-ibm-type1/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-ibm-type1-1.0.3.tar.bz2) = fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df
+SIZE (xorg/font/font-ibm-type1-1.0.3.tar.bz2) = 376985
diff --git a/x11-fonts/font-ibm-type1/pkg-descr b/x11-fonts/font-ibm-type1/pkg-descr
index 3d6f835fc549..1064a7885b17 100644
--- a/x11-fonts/font-ibm-type1/pkg-descr
+++ b/x11-fonts/font-ibm-type1/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org IBM Type1 font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile
index 4f8c008cb2e3..0f3b0ca6af92 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-isas-misc/distinfo b/x11-fonts/font-isas-misc/distinfo
index 803a55baa0c5..e1efe30b8254 100644
--- a/x11-fonts/font-isas-misc/distinfo
+++ b/x11-fonts/font-isas-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-isas-misc-1.0.3.tar.bz2) = 5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867
+SIZE (xorg/font/font-isas-misc-1.0.3.tar.bz2) = 845282
diff --git a/x11-fonts/font-isas-misc/pkg-descr b/x11-fonts/font-isas-misc/pkg-descr
index 171946ef4d28..91b69017ab55 100644
--- a/x11-fonts/font-isas-misc/pkg-descr
+++ b/x11-fonts/font-isas-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org ISAS fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile
index 753ed565186a..bae0599d1c7c 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-jis-misc/distinfo b/x11-fonts/font-jis-misc/distinfo
index 6fa3468c4295..c447464e8602 100644
--- a/x11-fonts/font-jis-misc/distinfo
+++ b/x11-fonts/font-jis-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-jis-misc-1.0.3.tar.bz2) = 2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65
+SIZE (xorg/font/font-jis-misc-1.0.3.tar.bz2) = 621946
diff --git a/x11-fonts/font-jis-misc/pkg-descr b/x11-fonts/font-jis-misc/pkg-descr
index 7f0339f5ec6f..3695ec0b9c54 100644
--- a/x11-fonts/font-jis-misc/pkg-descr
+++ b/x11-fonts/font-jis-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org JIS fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile
index 70a979ccbad3..e5844493f6e8 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-micro-misc/distinfo b/x11-fonts/font-micro-misc/distinfo
index 644e3eee1dc0..b1de4dd19edf 100644
--- a/x11-fonts/font-micro-misc/distinfo
+++ b/x11-fonts/font-micro-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-micro-misc-1.0.3.tar.bz2) = 9a3381c10f32d9511f0ad4179df395914c50779103c16cddf7017f5220ed8db6
+SIZE (xorg/font/font-micro-misc-1.0.3.tar.bz2) = 98366
diff --git a/x11-fonts/font-micro-misc/pkg-descr b/x11-fonts/font-micro-misc/pkg-descr
index 0e99cb0f138d..41a7ecee6007 100644
--- a/x11-fonts/font-micro-misc/pkg-descr
+++ b/x11-fonts/font-micro-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Micro fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile
index 252c6e0c7f57..8c88914dce75 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-cyrillic/distinfo b/x11-fonts/font-misc-cyrillic/distinfo
index 5838e746e371..ac233526b95b 100644
--- a/x11-fonts/font-misc-cyrillic/distinfo
+++ b/x11-fonts/font-misc-cyrillic/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-misc-cyrillic-1.0.3.tar.bz2) = e40fe3e3323c62b738550795457ad555c70c008aa91b5912dfd46f8e745f5e60
+SIZE (xorg/font/font-misc-cyrillic-1.0.3.tar.bz2) = 125971
diff --git a/x11-fonts/font-misc-cyrillic/pkg-descr b/x11-fonts/font-misc-cyrillic/pkg-descr
index 0aae99c139fe..2b52f863c8d5 100644
--- a/x11-fonts/font-misc-cyrillic/pkg-descr
+++ b/x11-fonts/font-misc-cyrillic/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Cyrillic fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile
index 8fdb031cb4cf..867740a13761 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-ethiopic/distinfo b/x11-fonts/font-misc-ethiopic/distinfo
index 9944f8a9ad77..a6b316ef7d48 100644
--- a/x11-fonts/font-misc-ethiopic/distinfo
+++ b/x11-fonts/font-misc-ethiopic/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-misc-ethiopic-1.0.3.tar.bz2) = 53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5
+SIZE (xorg/font/font-misc-ethiopic-1.0.3.tar.bz2) = 245606
diff --git a/x11-fonts/font-misc-ethiopic/pkg-descr b/x11-fonts/font-misc-ethiopic/pkg-descr
index 6e6a7e098de0..0ba733b436a5 100644
--- a/x11-fonts/font-misc-ethiopic/pkg-descr
+++ b/x11-fonts/font-misc-ethiopic/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Ethiopic fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile
index 6c8f2355c00e..53d159e69b5d 100644
--- a/x11-fonts/font-misc-meltho/Makefile
+++ b/x11-fonts/font-misc-meltho/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-misc-meltho
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-meltho/distinfo b/x11-fonts/font-misc-meltho/distinfo
index babebc04b005..a2d669cfb121 100644
--- a/x11-fonts/font-misc-meltho/distinfo
+++ b/x11-fonts/font-misc-meltho/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-misc-meltho-1.0.3.tar.bz2) = 3721323f13855cf7ca609115a1f7b182491e9b2b9c6e01eb1a2c7f8edd480791
+SIZE (xorg/font/font-misc-meltho-1.0.3.tar.bz2) = 1578992
diff --git a/x11-fonts/font-misc-meltho/pkg-descr b/x11-fonts/font-misc-meltho/pkg-descr
index cc90011dc9eb..d3ca52076f5e 100644
--- a/x11-fonts/font-misc-meltho/pkg-descr
+++ b/x11-fonts/font-misc-meltho/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Meltho fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile
index 31842e7a7de6..b10ab100c2d9 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.1.0
+PORTVERSION= 1.1.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-misc-misc/distinfo b/x11-fonts/font-misc-misc/distinfo
index 13e5d1dbd238..7a20265e448e 100644
--- a/x11-fonts/font-misc-misc/distinfo
+++ b/x11-fonts/font-misc-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-misc-misc-1.1.2.tar.bz2) = b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794
+SIZE (xorg/font/font-misc-misc-1.1.2.tar.bz2) = 1933789
diff --git a/x11-fonts/font-misc-misc/pkg-descr b/x11-fonts/font-misc-misc/pkg-descr
index 3bd55d294a46..4db19c6963fe 100644
--- a/x11-fonts/font-misc-misc/pkg-descr
+++ b/x11-fonts/font-misc-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/ \ No newline at end of file
diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile
index 8a63778a1b86..9bbf5c767031 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-mutt-misc/distinfo b/x11-fonts/font-mutt-misc/distinfo
index 22e83ea78f1c..c65e7e7c9185 100644
--- a/x11-fonts/font-mutt-misc/distinfo
+++ b/x11-fonts/font-mutt-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-mutt-misc-1.0.3.tar.bz2) = bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f
+SIZE (xorg/font/font-mutt-misc-1.0.3.tar.bz2) = 266510
diff --git a/x11-fonts/font-mutt-misc/pkg-descr b/x11-fonts/font-mutt-misc/pkg-descr
index 5d7af6352f8d..fcf6a3f805f1 100644
--- a/x11-fonts/font-mutt-misc/pkg-descr
+++ b/x11-fonts/font-mutt-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Mutt fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile
index 8c8677f9c15f..b62692bf0885 100644
--- a/x11-fonts/font-schumacher-misc/Makefile
+++ b/x11-fonts/font-schumacher-misc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-schumacher-misc
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-schumacher-misc/distinfo b/x11-fonts/font-schumacher-misc/distinfo
index dc611a8eb722..0d393931d1f5 100644
--- a/x11-fonts/font-schumacher-misc/distinfo
+++ b/x11-fonts/font-schumacher-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-schumacher-misc-1.1.2.tar.bz2) = e444028656e0767e2eddc6d9aca462b16a2be75a47244dbc199b2c44eca87e5a
+SIZE (xorg/font/font-schumacher-misc-1.1.2.tar.bz2) = 141170
diff --git a/x11-fonts/font-schumacher-misc/pkg-descr b/x11-fonts/font-schumacher-misc/pkg-descr
index ee01530fc07d..858a3f354b47 100644
--- a/x11-fonts/font-schumacher-misc/pkg-descr
+++ b/x11-fonts/font-schumacher-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Schumacher fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile
index 9ac5026edf21..0b016a6230e4 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.2
+PORTVERSION= 1.0.4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-screen-cyrillic/distinfo b/x11-fonts/font-screen-cyrillic/distinfo
index 56d5656efa13..074ea405044d 100644
--- a/x11-fonts/font-screen-cyrillic/distinfo
+++ b/x11-fonts/font-screen-cyrillic/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-screen-cyrillic-1.0.4.tar.bz2) = 824231e8dffe15299454e47259f29d98001c9cf8ad3d6b5171399e4d71705e79
+SIZE (xorg/font/font-screen-cyrillic-1.0.4.tar.bz2) = 103168
diff --git a/x11-fonts/font-screen-cyrillic/pkg-descr b/x11-fonts/font-screen-cyrillic/pkg-descr
index 35cbe41b7b61..c043b53c7550 100644
--- a/x11-fonts/font-screen-cyrillic/pkg-descr
+++ b/x11-fonts/font-screen-cyrillic/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Screen Cyrillic font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile
index 8c50f1e1ed3d..bc7d85ef8783 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sony-misc/distinfo b/x11-fonts/font-sony-misc/distinfo
index da955e6ac1fc..27fa64374127 100644
--- a/x11-fonts/font-sony-misc/distinfo
+++ b/x11-fonts/font-sony-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-sony-misc-1.0.3.tar.bz2) = 2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5
+SIZE (xorg/font/font-sony-misc-1.0.3.tar.bz2) = 108098
diff --git a/x11-fonts/font-sony-misc/pkg-descr b/x11-fonts/font-sony-misc/pkg-descr
index ec305d0cf55e..d43cbdaabd37 100644
--- a/x11-fonts/font-sony-misc/pkg-descr
+++ b/x11-fonts/font-sony-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Sony fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile
index f84b31df9969..9fefb6115368 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-sun-misc/distinfo b/x11-fonts/font-sun-misc/distinfo
index 3aec39ed3329..2c7a1154cda5 100644
--- a/x11-fonts/font-sun-misc/distinfo
+++ b/x11-fonts/font-sun-misc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-sun-misc-1.0.3.tar.bz2) = 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0
+SIZE (xorg/font/font-sun-misc-1.0.3.tar.bz2) = 116360
diff --git a/x11-fonts/font-sun-misc/pkg-descr b/x11-fonts/font-sun-misc/pkg-descr
index c7cd347df3cd..fd043ee0260e 100644
--- a/x11-fonts/font-sun-misc/pkg-descr
+++ b/x11-fonts/font-sun-misc/pkg-descr
@@ -1,4 +1,3 @@
This package contains miscellaneous X.Org Sun fonts.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile
index 62b0cc3dd5d2..2c72d165a41f 100644
--- a/x11-fonts/font-util/Makefile
+++ b/x11-fonts/font-util/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= font-util
-PORTVERSION= 1.0.2
+PORTVERSION= 1.2.0
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-util/distinfo b/x11-fonts/font-util/distinfo
index 0503bc8358e7..cc0c299bf09c 100644
--- a/x11-fonts/font-util/distinfo
+++ b/x11-fonts/font-util/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-util-1.2.0.tar.bz2) = dbbac617ae6cdf6f459e602361211d217f4bad5ad8bfb6adcede6196693f9712
+SIZE (xorg/font/font-util-1.2.0.tar.bz2) = 134588
diff --git a/x11-fonts/font-util/pkg-descr b/x11-fonts/font-util/pkg-descr
index aa29e6388755..d558ce14d31e 100644
--- a/x11-fonts/font-util/pkg-descr
+++ b/x11-fonts/font-util/pkg-descr
@@ -1,5 +1,4 @@
This package contains font-util, an application for creating an index of
X font files in a directory.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile
index 4ecce6279570..bcdbe43a0c10 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.1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-winitzki-cyrillic/distinfo b/x11-fonts/font-winitzki-cyrillic/distinfo
index f49e8cda7126..83a29cda6e61 100644
--- a/x11-fonts/font-winitzki-cyrillic/distinfo
+++ b/x11-fonts/font-winitzki-cyrillic/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-winitzki-cyrillic-1.0.3.tar.bz2) = abd13b63d02fcaec488686c23683e5cf640b43bd32f8ca22eeae6f84df0a36a0
+SIZE (xorg/font/font-winitzki-cyrillic-1.0.3.tar.bz2) = 100564
diff --git a/x11-fonts/font-winitzki-cyrillic/pkg-descr b/x11-fonts/font-winitzki-cyrillic/pkg-descr
index 2c895c518959..61fd126f0398 100644
--- a/x11-fonts/font-winitzki-cyrillic/pkg-descr
+++ b/x11-fonts/font-winitzki-cyrillic/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org Winitzki Cyrillic font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile
index 4ad35ed0b7c5..d38aad97e7d8 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.2
+PORTVERSION= 1.0.4
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/font-xfree86-type1/distinfo b/x11-fonts/font-xfree86-type1/distinfo
index c1c0e2b585f2..7e38de29ee2c 100644
--- a/x11-fonts/font-xfree86-type1/distinfo
+++ b/x11-fonts/font-xfree86-type1/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/font/font-xfree86-type1-1.0.4.tar.bz2) = caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a
+SIZE (xorg/font/font-xfree86-type1-1.0.4.tar.bz2) = 126641
diff --git a/x11-fonts/font-xfree86-type1/pkg-descr b/x11-fonts/font-xfree86-type1/pkg-descr
index 45bfca1dfc20..b63e8572c89f 100644
--- a/x11-fonts/font-xfree86-type1/pkg-descr
+++ b/x11-fonts/font-xfree86-type1/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org XFree86 Type1 font.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/fontcacheproto/pkg-descr b/x11-fonts/fontcacheproto/pkg-descr
index 2f58ddc8b094..dca0a39a8121 100644
--- a/x11-fonts/fontcacheproto/pkg-descr
+++ b/x11-fonts/fontcacheproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Fontcache extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile
index b0d6f0f87dc6..4ed4e6e81906 100644
--- a/x11-fonts/fontsproto/Makefile
+++ b/x11-fonts/fontsproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fontsproto
-PORTVERSION= 2.1.0
+PORTVERSION= 2.1.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/fontsproto/distinfo b/x11-fonts/fontsproto/distinfo
index 48a25bd30b40..8e940644168c 100644
--- a/x11-fonts/fontsproto/distinfo
+++ b/x11-fonts/fontsproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
+SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040
diff --git a/x11-fonts/fontsproto/pkg-descr b/x11-fonts/fontsproto/pkg-descr
index 746a138d7e87..f48b806ae042 100644
--- a/x11-fonts/fontsproto/pkg-descr
+++ b/x11-fonts/fontsproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org fontsproto protocol headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/fontsproto/pkg-plist b/x11-fonts/fontsproto/pkg-plist
index d3034e8617fa..061a2f81ae4f 100644
--- a/x11-fonts/fontsproto/pkg-plist
+++ b/x11-fonts/fontsproto/pkg-plist
@@ -1,3 +1,4 @@
+%%DOCSDIR%%/fsproto.xml
include/X11/fonts/FS.h
include/X11/fonts/FSproto.h
include/X11/fonts/font.h
@@ -6,3 +7,4 @@ include/X11/fonts/fontstruct.h
include/X11/fonts/fsmasks.h
libdata/pkgconfig/fontsproto.pc
@dirrmtry include/X11/fonts
+@dirrm %%DOCSDIR%%
diff --git a/x11-fonts/fonttosfnt/pkg-descr b/x11-fonts/fonttosfnt/pkg-descr
index 1f681661afd9..b49f0c1b8400 100644
--- a/x11-fonts/fonttosfnt/pkg-descr
+++ b/x11-fonts/fonttosfnt/pkg-descr
@@ -1,5 +1,4 @@
This package contains fonttosfnt, an application used for wrapping a bitmap
font in a sfnt (TrueType) wrapper.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile
index 5097104bf085..10a6479f581d 100644
--- a/x11-fonts/fslsfonts/Makefile
+++ b/x11-fonts/fslsfonts/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fslsfonts
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/fslsfonts/distinfo b/x11-fonts/fslsfonts/distinfo
index 8461314aa681..fc3be7e0418a 100644
--- a/x11-fonts/fslsfonts/distinfo
+++ b/x11-fonts/fslsfonts/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/fslsfonts-1.0.2.tar.bz2) = a61be25c87ee42169ee4dc8344acc9e2
-SHA256 (xorg/app/fslsfonts-1.0.2.tar.bz2) = 9c8e7d573284272c633b5cf18e3358830b27bde72f4bc1ae83a1ab337d463a92
-SIZE (xorg/app/fslsfonts-1.0.2.tar.bz2) = 88561
+SHA256 (xorg/app/fslsfonts-1.0.3.tar.bz2) = 9d5739a2649cbade55c9f5725a3a052253d748d868ddd03f2c036fef2ffe96bc
+SIZE (xorg/app/fslsfonts-1.0.3.tar.bz2) = 106816
diff --git a/x11-fonts/fslsfonts/pkg-descr b/x11-fonts/fslsfonts/pkg-descr
index b5f1c4682fee..1cf324f2df8f 100644
--- a/x11-fonts/fslsfonts/pkg-descr
+++ b/x11-fonts/fslsfonts/pkg-descr
@@ -1,5 +1,4 @@
This package contains fslsfonts, which lists fonts served by an X
font server.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 7545f51a2c27..ad9cbf69d41a 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libFS
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo
index 82243cfb1a18..56f1fd9480a8 100644
--- a/x11-fonts/libFS/distinfo
+++ b/x11-fonts/libFS/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419
+SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331
diff --git a/x11-fonts/libFS/pkg-descr b/x11-fonts/libFS/pkg-descr
index afa7d79ce21a..f92284c3af6b 100644
--- a/x11-fonts/libFS/pkg-descr
+++ b/x11-fonts/libFS/pkg-descr
@@ -1,4 +1,3 @@
This package contains libFS, the X Font Service client library.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/libFS/pkg-plist b/x11-fonts/libFS/pkg-plist
index 5af5ef33b189..56fe50731226 100644
--- a/x11-fonts/libFS/pkg-plist
+++ b/x11-fonts/libFS/pkg-plist
@@ -1,3 +1,4 @@
+%%DOCSDIR%%/FSlib.txt
include/X11/fonts/FSlib.h
lib/libFS.so.6
lib/libFS.so
@@ -5,3 +6,4 @@ lib/libFS.la
lib/libFS.a
libdata/pkgconfig/libfs.pc
@dirrmtry include/X11/fonts
+@dirrm %%DOCSDIR%%
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index dbb38a4a94ad..784067d08fc7 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXfont
-PORTVERSION= 1.4.0
+PORTVERSION= 1.4.3
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo
index 3faadb31c844..81a9f6120e2c 100644
--- a/x11-fonts/libXfont/distinfo
+++ b/x11-fonts/libXfont/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXfont-1.4.3.tar.bz2) = f79245652901d20092092e942155d32b8dde15527637db3c09a1adc83672e9cc
+SIZE (xorg/lib/libXfont-1.4.3.tar.bz2) = 438358
diff --git a/x11-fonts/libXfont/pkg-descr b/x11-fonts/libXfont/pkg-descr
index 9f3309dcd11a..8353c6742ad1 100644
--- a/x11-fonts/libXfont/pkg-descr
+++ b/x11-fonts/libXfont/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X font libary
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/libXfontcache/pkg-descr b/x11-fonts/libXfontcache/pkg-descr
index 5a2c8c9d5177..77b497b1ef22 100644
--- a/x11-fonts/libXfontcache/pkg-descr
+++ b/x11-fonts/libXfontcache/pkg-descr
@@ -1,4 +1,3 @@
This package contains libXfontcache, the X.Org Xfontcache library.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index d83eacdffb8d..41c3c2966460 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libfontenc
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.0
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libfontenc/distinfo b/x11-fonts/libfontenc/distinfo
index 716a6fb7a21b..ee6157e6b56c 100644
--- a/x11-fonts/libfontenc/distinfo
+++ b/x11-fonts/libfontenc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
+SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872
diff --git a/x11-fonts/libfontenc/pkg-descr b/x11-fonts/libfontenc/pkg-descr
index aa32dfd352dd..3b42f19cae6c 100644
--- a/x11-fonts/libfontenc/pkg-descr
+++ b/x11-fonts/libfontenc/pkg-descr
@@ -1,4 +1,3 @@
This package contains libfontenc, the X.Org fontenc library.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
index fa78b360adaf..00b024a289c1 100644
--- a/x11-fonts/mkfontdir/Makefile
+++ b/x11-fonts/mkfontdir/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mkfontdir
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/mkfontdir/distinfo b/x11-fonts/mkfontdir/distinfo
index 00ed49c21978..5013f4f4e6f9 100644
--- a/x11-fonts/mkfontdir/distinfo
+++ b/x11-fonts/mkfontdir/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/mkfontdir-1.0.6.tar.bz2) = 55d56c6310f8d2268cb8978e838d01d27c7d70e30282c373c5a935ab3fb8c859
+SIZE (xorg/app/mkfontdir-1.0.6.tar.bz2) = 97704
diff --git a/x11-fonts/mkfontdir/pkg-descr b/x11-fonts/mkfontdir/pkg-descr
index 6863f86cf59a..82d066ebe874 100644
--- a/x11-fonts/mkfontdir/pkg-descr
+++ b/x11-fonts/mkfontdir/pkg-descr
@@ -1,5 +1,4 @@
This package contains mkfontdir, used for creating an index of X font files
in a directory.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.xfree86.org/current/mkfontdir.1.html \ No newline at end of file
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index c274cef3e744..43c6237b9ace 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mkfontscale
-PORTVERSION= 1.0.7
+PORTVERSION= 1.0.8
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo
index be9401510978..290610655ec6 100644
--- a/x11-fonts/mkfontscale/distinfo
+++ b/x11-fonts/mkfontscale/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/mkfontscale-1.0.8.tar.bz2) = 6eb57786cd79eebfbaca386fe24dcfe50689dbf433d052e58291c2925f2050f9
+SIZE (xorg/app/mkfontscale-1.0.8.tar.bz2) = 120005
diff --git a/x11-fonts/mkfontscale/pkg-descr b/x11-fonts/mkfontscale/pkg-descr
index 827cdd35961c..40a33056fc3f 100644
--- a/x11-fonts/mkfontscale/pkg-descr
+++ b/x11-fonts/mkfontscale/pkg-descr
@@ -1,5 +1,4 @@
This package contains mkfontscale, an application for creating an index of
scalable font files for X.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.xfree86.org/4.3.0/mkfontscale.1.html
diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile
index b85dfe5db725..c2e37b580f2e 100644
--- a/x11-fonts/showfont/Makefile
+++ b/x11-fonts/showfont/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= showfont
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/showfont/distinfo b/x11-fonts/showfont/distinfo
index 7f6b846fc197..80ea5a24a7e4 100644
--- a/x11-fonts/showfont/distinfo
+++ b/x11-fonts/showfont/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/showfont-1.0.2.tar.bz2) = 8f83d774ed4cc2a6dca86edd856d820a
-SHA256 (xorg/app/showfont-1.0.2.tar.bz2) = 9bd0373659b2f24120dba887fd155f99aed02e4a7c2afae69e7db1c1fa05e88c
-SIZE (xorg/app/showfont-1.0.2.tar.bz2) = 90582
+SHA256 (xorg/app/showfont-1.0.3.tar.bz2) = 2a9db9b21be37653e534a6cc5facceacf7a1493d3278ef54817f23b070dc0c7e
+SIZE (xorg/app/showfont-1.0.3.tar.bz2) = 107283
diff --git a/x11-fonts/showfont/pkg-descr b/x11-fonts/showfont/pkg-descr
index fe5b702c638b..bbd41e686172 100644
--- a/x11-fonts/showfont/pkg-descr
+++ b/x11-fonts/showfont/pkg-descr
@@ -1,4 +1,3 @@
This package contains showfont, a font dumper for the X font server.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/xf86bigfontproto/pkg-descr b/x11-fonts/xf86bigfontproto/pkg-descr
index a7644ffe455b..39729a190855 100644
--- a/x11-fonts/xf86bigfontproto/pkg-descr
+++ b/x11-fonts/xf86bigfontproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XFree86-Bigfont extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile
index abb90afebec3..456718d046a6 100644
--- a/x11-fonts/xfontsel/Makefile
+++ b/x11-fonts/xfontsel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfontsel
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/xfontsel/distinfo b/x11-fonts/xfontsel/distinfo
index 84586d963ba5..3a1dc3957a10 100644
--- a/x11-fonts/xfontsel/distinfo
+++ b/x11-fonts/xfontsel/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xfontsel-1.0.2.tar.bz2) = 288fe4cf8a990e4e602aac16dd9109fb
-SHA256 (xorg/app/xfontsel-1.0.2.tar.bz2) = 7a66ba3910bd7e39d58f9d4a4a588f191a874b8607369fe2cc9203a7115006a9
-SIZE (xorg/app/xfontsel-1.0.2.tar.bz2) = 106540
+SHA256 (xorg/app/xfontsel-1.0.3.tar.bz2) = 95046ac274b5480ab57c8e04ca04f858957e139b1e8b6ddf5de869bbff7b9ee0
+SIZE (xorg/app/xfontsel-1.0.3.tar.bz2) = 125665
diff --git a/x11-fonts/xfontsel/pkg-descr b/x11-fonts/xfontsel/pkg-descr
index 97b563110b17..43e0e96b246a 100644
--- a/x11-fonts/xfontsel/pkg-descr
+++ b/x11-fonts/xfontsel/pkg-descr
@@ -1,5 +1,4 @@
This package contains xfontsel, an application which provides a simple way to
display fonts known to your X server.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 80dd5ab90255..f43c4ddf8b4f 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfs
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1
PORTEPOCH= 1
CATEGORIES= x11-fonts
@@ -15,23 +14,26 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org font server
XORG_CAT= app
+USE_GMAKE= yes
USE_XORG= libfs xfont xtrans
USE_RC_SUBR= xfs
-ALL_TARGET= all config
CONFIGURE_ENV+= ac_cv_path_XMLTO=""
MAN1= xfs.1
post-patch:
- ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/Makefile.in
+ ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in
.if defined(WITHOUT_XFS_CACHE)
${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp
.endif
+post-build:
+ @cd ${WRKSRC}/config/ && ${GMAKE} config
+
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config.default
+ ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config.default
@if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \
- ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config; \
+ ${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config; \
fi
.include <bsd.port.mk>
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index b5471014360c..b6e6da07048d 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb
+SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188
diff --git a/x11-fonts/xfs/pkg-descr b/x11-fonts/xfs/pkg-descr
index a3082dc9d0e9..81d8c54249ae 100644
--- a/x11-fonts/xfs/pkg-descr
+++ b/x11-fonts/xfs/pkg-descr
@@ -1,4 +1,3 @@
This package contains the X.Org font server.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/xfs/pkg-install b/x11-fonts/xfs/pkg-install
index 9979ff9a1e1a..237026033e3d 100644
--- a/x11-fonts/xfs/pkg-install
+++ b/x11-fonts/xfs/pkg-install
@@ -4,7 +4,7 @@ if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
-PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs
if [ ! -f ${XINITCONFDIR}/config ]; then
diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile
index d1456bab4220..302e458df882 100644
--- a/x11-fonts/xfsinfo/Makefile
+++ b/x11-fonts/xfsinfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfsinfo
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/xfsinfo/distinfo b/x11-fonts/xfsinfo/distinfo
index f95281dbdffd..7f83cccc23a0 100644
--- a/x11-fonts/xfsinfo/distinfo
+++ b/x11-fonts/xfsinfo/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xfsinfo-1.0.2.tar.bz2) = e6c0071f6d5436113982f4a575d3f94b
-SHA256 (xorg/app/xfsinfo-1.0.2.tar.bz2) = 95aaca84f948fc7e25d82c58d3fdbba44911b99f3e205378ce82a786c11bb96f
-SIZE (xorg/app/xfsinfo-1.0.2.tar.bz2) = 87787
+SHA256 (xorg/app/xfsinfo-1.0.3.tar.bz2) = 59774492e80525b9bd1adbee5324ae7cd117813063e620b4c2c5d8ada189874f
+SIZE (xorg/app/xfsinfo-1.0.3.tar.bz2) = 104823
diff --git a/x11-fonts/xfsinfo/pkg-descr b/x11-fonts/xfsinfo/pkg-descr
index 91451af9f60d..bbb1a2034435 100644
--- a/x11-fonts/xfsinfo/pkg-descr
+++ b/x11-fonts/xfsinfo/pkg-descr
@@ -1,4 +1,3 @@
This package contains xfsinfo, which is a X font server information utility.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile
index a1660b90a4db..a9f928cee041 100644
--- a/x11-fonts/xlsfonts/Makefile
+++ b/x11-fonts/xlsfonts/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xlsfonts
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/xlsfonts/distinfo b/x11-fonts/xlsfonts/distinfo
index d9c19f49680f..392de91531e9 100644
--- a/x11-fonts/xlsfonts/distinfo
+++ b/x11-fonts/xlsfonts/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xlsfonts-1.0.2.tar.bz2) = 28958248590ff60ecd70e8f590d977b7
-SHA256 (xorg/app/xlsfonts-1.0.2.tar.bz2) = cc6e519b783b082a2fe4cd06ea5b3693ee6bdb23f4b36e7a72753c524ef5111c
-SIZE (xorg/app/xlsfonts-1.0.2.tar.bz2) = 99216
+SHA256 (xorg/app/xlsfonts-1.0.3.tar.bz2) = b59358b664f8220e3856d01d6b3e60adcc70f04fc588d71e0f7d9fd35e0e67c2
+SIZE (xorg/app/xlsfonts-1.0.3.tar.bz2) = 112147
diff --git a/x11-fonts/xlsfonts/pkg-descr b/x11-fonts/xlsfonts/pkg-descr
index e21c4663296c..1375cc6e5a74 100644
--- a/x11-fonts/xlsfonts/pkg-descr
+++ b/x11-fonts/xlsfonts/pkg-descr
@@ -1,4 +1,3 @@
This package contains xlsfonts, a server font list displayer for X.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.x.org/
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 3ba2af0a1f7e..5c6d686abb45 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.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-100dpi/pkg-descr b/x11-fonts/xorg-fonts-100dpi/pkg-descr
index aaffb24f42b6..85eb17c65b8d 100644
--- a/x11-fonts/xorg-fonts-100dpi/pkg-descr
+++ b/x11-fonts/xorg-fonts-100dpi/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org 100 dpi bitmap fonts.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index cfee557a8d2c..47cb254dc1e2 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.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-75dpi/pkg-descr b/x11-fonts/xorg-fonts-75dpi/pkg-descr
index 97ca5c9b2793..755af6cad7e0 100644
--- a/x11-fonts/xorg-fonts-75dpi/pkg-descr
+++ b/x11-fonts/xorg-fonts-75dpi/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org 75 dpi bitmap fonts.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 1779af791f39..6e217a9f46a2 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.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-cyrillic/pkg-descr b/x11-fonts/xorg-fonts-cyrillic/pkg-descr
index 9bc272775d9f..8fb7ffb4b945 100644
--- a/x11-fonts/xorg-fonts-cyrillic/pkg-descr
+++ b/x11-fonts/xorg-fonts-cyrillic/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org Cyrillic bitmap fonts.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 655cf208ee3c..a614c97fb587 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.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/pkg-descr b/x11-fonts/xorg-fonts-miscbitmaps/pkg-descr
index 13e50bd320bc..950c26155201 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/pkg-descr
+++ b/x11-fonts/xorg-fonts-miscbitmaps/pkg-descr
@@ -2,6 +2,3 @@ This package contains fixed width, DECwindows cursor and session manager, Sun
Open Look, Kanji, and Kana bitmap fonts.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index e5c0156d507d..a8196261d34f 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.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-truetype/pkg-descr b/x11-fonts/xorg-fonts-truetype/pkg-descr
index b2050379f2a4..748cb79f1178 100644
--- a/x11-fonts/xorg-fonts-truetype/pkg-descr
+++ b/x11-fonts/xorg-fonts-truetype/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org TrueType fonts.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index f929a45f2ea1..3c4341923d0b 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.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts-type1/pkg-descr b/x11-fonts/xorg-fonts-type1/pkg-descr
index bb8131a45416..fc4259b67d04 100644
--- a/x11-fonts/xorg-fonts-type1/pkg-descr
+++ b/x11-fonts/xorg-fonts-type1/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org Type1 fonts.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 3bde21d5def7..87bf1820ba33 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fonts
-PORTVERSION= 7.5
+PORTVERSION= 7.5.1
CATEGORIES= x11-fonts
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11-fonts/xorg-fonts/pkg-descr b/x11-fonts/xorg-fonts/pkg-descr
index 9915d82699e5..b28e6e52dbc7 100644
--- a/x11-fonts/xorg-fonts/pkg-descr
+++ b/x11-fonts/xorg-fonts/pkg-descr
@@ -1,6 +1,3 @@
This meta-package installs all X.Org fonts and related programs.
WWW: http://www.x.org/
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index 45e690159201..1acc4d722b5e 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xephyr
-PORTVERSION= 1.7.5
+PORTVERSION= 1.7.7
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
index d31dc3f6420d..86aaea93dc0b 100644
--- a/x11-servers/xephyr/distinfo
+++ b/x11-servers/xephyr/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 6dc69f2e46bc..344cdffd2c9e 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,15 +6,13 @@
#
PORTNAME= xorg-dmx
-PORTVERSION= 1.7.5
+PORTVERSION= 1.7.7
PORTEPOCH= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
COMMENT= Distributed Multihead X from X.Org
-CONFLICTS= XFree86-dmx-[0-9]*
-
XORG_CAT= xserver
LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index d31dc3f6420d..86aaea93dc0b 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index a5086aff15d2..2ecfa9441535 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,15 +6,13 @@
#
PORTNAME= xorg-nestserver
-PORTVERSION= 1.7.5
+PORTVERSION= 1.7.7
PORTEPOCH= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
COMMENT= Nesting X server from X.Org
-CONFLICTS= XFree86-NestServer-*
-
XORG_CAT= xserver
LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index d31dc3f6420d..86aaea93dc0b 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-nestserver/pkg-descr b/x11-servers/xorg-nestserver/pkg-descr
index 94531329e911..2b9c485fc224 100644
--- a/x11-servers/xorg-nestserver/pkg-descr
+++ b/x11-servers/xorg-nestserver/pkg-descr
@@ -1,6 +1,3 @@
This package contains Xnest, a nesting X Server that displays on an X Server.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index b4f92d1232e9..a1012dd0a485 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-server
-PORTVERSION= 1.7.5
+PORTVERSION= 1.7.7
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
@@ -19,8 +19,6 @@ LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
-CONFLICTS= XFree86-Server-*
-
XORG_CAT= xserver
USE_GMAKE= yes
@@ -135,8 +133,4 @@ 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 d31dc3f6420d..86aaea93dc0b 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-server/pkg-descr b/x11-servers/xorg-server/pkg-descr
index f95969b8294d..74ce21cdb643 100644
--- a/x11-servers/xorg-server/pkg-descr
+++ b/x11-servers/xorg-server/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X.Org X server and some associated programs.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index c413c9758a8e..4f3a47280cd3 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,15 +6,13 @@
#
PORTNAME= xorg-vfbserver
-PORTVERSION= 1.7.5
+PORTVERSION= 1.7.7
PORTEPOCH= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
COMMENT= X virtual framebuffer server from X.Org
-CONFLICTS= XFree86-VirtualFramebufferServer-*
-
XORG_CAT= xserver
LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index d31dc3f6420d..86aaea93dc0b 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-vfbserver/pkg-descr b/x11-servers/xorg-vfbserver/pkg-descr
index c2efa65dc2f3..78ea1c54899c 100644
--- a/x11-servers/xorg-vfbserver/pkg-descr
+++ b/x11-servers/xorg-vfbserver/pkg-descr
@@ -1,6 +1,3 @@
This package contains Xvfb, a virtual framebuffer X server.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 463a8aa9f709..3dda64cc8efd 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXaw
-PORTVERSION= 1.0.7
+PORTVERSION= 1.0.8
PORTEPOCH= 1
CATEGORIES= x11-toolkits
@@ -15,6 +15,7 @@ COMMENT= X Athena Widgets library
XORG_CAT= lib
USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
+USE_GMAKE= yes
MAN3= Xaw.3
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index 206a0c30b022..c4aa13012bf2 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXaw-1.0.8.tar.bz2) = 3daeab01ee702cbc4ac91f11d553710ad31d4151510386093c186a94ccd4beba
+SIZE (xorg/lib/libXaw-1.0.8.tar.bz2) = 635256
diff --git a/x11-toolkits/libXaw/pkg-descr b/x11-toolkits/libXaw/pkg-descr
index 87f058e1fc7b..827c9afcb7b7 100644
--- a/x11-toolkits/libXaw/pkg-descr
+++ b/x11-toolkits/libXaw/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Athena Widgets library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist
index 76dc96bad22d..d8c4c79a0285 100644
--- a/x11-toolkits/libXaw/pkg-plist
+++ b/x11-toolkits/libXaw/pkg-plist
@@ -82,9 +82,51 @@ lib/libXaw7.so
lib/libXaw7.so.7
libdata/pkgconfig/xaw6.pc
libdata/pkgconfig/xaw7.pc
-%%DOCSDIR%%/widgets.html
-%%DOCSDIR%%/widgets.index.ps
-%%DOCSDIR%%/widgets.ps
-%%DOCSDIR%%/widgets.txt
+%%DOCSDIR%%/AsciiSink.xml
+%%DOCSDIR%%/AsciiSource.xml
+%%DOCSDIR%%/AsciiText.xml
+%%DOCSDIR%%/Box.xml
+%%DOCSDIR%%/CH1.xml
+%%DOCSDIR%%/CH2.xml
+%%DOCSDIR%%/CH3.xml
+%%DOCSDIR%%/CH4.xml
+%%DOCSDIR%%/CH5.xml
+%%DOCSDIR%%/CH6.xml
+%%DOCSDIR%%/CH7.xml
+%%DOCSDIR%%/Command.xml
+%%DOCSDIR%%/Dialog.xml
+%%DOCSDIR%%/Form.xml
+%%DOCSDIR%%/Grip.xml
+%%DOCSDIR%%/Label.xml
+%%DOCSDIR%%/List.xml
+%%DOCSDIR%%/MenuButton.xml
+%%DOCSDIR%%/Paned.xml
+%%DOCSDIR%%/Panner.xml
+%%DOCSDIR%%/Porthole.xml
+%%DOCSDIR%%/Repeater.xml
+%%DOCSDIR%%/Scrollbar.xml
+%%DOCSDIR%%/Simple.xml
+%%DOCSDIR%%/SimpleMenu.xml
+%%DOCSDIR%%/Sme.xml
+%%DOCSDIR%%/SmeBSB.xml
+%%DOCSDIR%%/SmeLine.xml
+%%DOCSDIR%%/StripChart.xml
+%%DOCSDIR%%/TPage_Credits.xml
+%%DOCSDIR%%/Template.xml
+%%DOCSDIR%%/Template_private_header_file.xml
+%%DOCSDIR%%/Template_public_header_file.xml
+%%DOCSDIR%%/Template_widget_source_file.xml
+%%DOCSDIR%%/Text.xml
+%%DOCSDIR%%/TextActions.xml
+%%DOCSDIR%%/TextActions_default_translation_bindings.xml
+%%DOCSDIR%%/TextActions_text_widget_actions.xml
+%%DOCSDIR%%/TextCustom.xml
+%%DOCSDIR%%/TextFuncs.xml
+%%DOCSDIR%%/TextSink.xml
+%%DOCSDIR%%/TextSource.xml
+%%DOCSDIR%%/Toggle.xml
+%%DOCSDIR%%/Tree.xml
+%%DOCSDIR%%/Viewport.xml
+%%DOCSDIR%%/libXaw.xml
@dirrmtry %%DOCSDIR%%
@dirrmtry include/X11/Xaw
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 720c0d2594a5..7d4ed1ccdaaf 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXmu
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.0
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo
index 098b6813f66c..45c279a93888 100644
--- a/x11-toolkits/libXmu/distinfo
+++ b/x11-toolkits/libXmu/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
+SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663
diff --git a/x11-toolkits/libXmu/pkg-descr b/x11-toolkits/libXmu/pkg-descr
index cbc65101bb48..7c29c5003c1e 100644
--- a/x11-toolkits/libXmu/pkg-descr
+++ b/x11-toolkits/libXmu/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Miscellaneous Utilities libraries.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-toolkits/libXmu/pkg-plist b/x11-toolkits/libXmu/pkg-plist
index 5b20f35ea4e4..a19fba0b3bc4 100644
--- a/x11-toolkits/libXmu/pkg-plist
+++ b/x11-toolkits/libXmu/pkg-plist
@@ -16,6 +16,7 @@ include/X11/Xmu/Misc.h
include/X11/Xmu/StdCmap.h
include/X11/Xmu/StdSel.h
include/X11/Xmu/SysUtil.h
+include/X11/Xmu/WhitePoint.h
include/X11/Xmu/WidgetNode.h
include/X11/Xmu/WinUtil.h
include/X11/Xmu/Xct.h
@@ -30,4 +31,7 @@ lib/libXmuu.so
lib/libXmuu.so.1
libdata/pkgconfig/xmu.pc
libdata/pkgconfig/xmuu.pc
-@dirrm include/X11/Xmu
+%%DOCSDIR%%/Xmu.xml
+%%DOCSDIR%%/xlogo.svg
+@dirrmtry %%DOCSDIR%%
+@dirrmtry include/X11/Xmu
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index de8746588cb3..e7bc81dea28b 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXt
-PORTVERSION= 1.0.7
+PORTVERSION= 1.0.9
CATEGORIES= x11-toolkits
MAINTAINER= x11@FreeBSD.org
@@ -15,273 +15,272 @@ COMMENT= X Toolkit library
XORG_CAT= lib
USE_XORG= x11 sm xproto:both kbproto
-MAN1= makestrs.1
-MAN3= XtNew.3 \
- XtAddGrab.3 \
- XtAppLock.3 \
- XtAddActions.3 \
- XtAddCallback.3 \
- XtAddEventHandler.3 \
- XtAddExposureToRegion.3 \
- XtAddInput.3 \
- XtAllocateGC.3 \
- XtAppAddActionHook.3 \
- XtAppAddActions.3 \
- XtAppAddBlockHook.3 \
- XtAppAddConverter.3 \
- XtAppAddInput.3 \
- XtAppAddSignal.3 \
- XtAppAddTimeOut.3 \
- XtAppAddWorkProc.3 \
- XtAppCreateShell.3 \
- XtAppError.3 \
- XtAppErrorMsg.3 \
- XtAppGetErrorDatabase.3 \
- XtAppGetSelectionTimeout.3 \
- XtAppInitialize.3 \
- XtAppNextEvent.3 \
- XtAppReleaseCacheRefs.3 \
- XtAppSetExitFlag.3 \
- XtAppSetFallbackResources.3 \
- XtAppSetTypeConverter.3 \
- XtBuildEventMask.3 \
- XtCallAcceptFocus.3 \
- XtCallActionProc.3 \
- XtCallCallbacks.3 \
- XtClass.3 \
- XtConfigureWidget.3 \
- XtConvert.3 \
- XtConvertAndStore.3 \
- XtCreateApplicationContext.3 \
- XtCreateApplicationShell.3 \
- XtCreatePopupShell.3 \
- XtCreateSelectionRequest.3 \
- XtCreateWidget.3 \
- XtCreateWindow.3 \
- XtDisplay.3 \
- XtDisplayInitialize.3 \
- XtDisplayStringConversionWarning.3 \
- XtDisplayToApplicationContext.3 \
- XtError.3 \
- XtErrorMsg.3 \
- XtFindFile.3 \
- XtGetActionKeysym.3 \
- XtGetActionList.3 \
- XtGetApplicationNameAndClass.3 \
- XtGetApplicationResources.3 \
- XtGetClassExtension.3 \
- XtGetDisplays.3 \
- XtGetGC.3 \
- XtGetErrorDatabase.3 \
- XtGetKeyboardFocusWidget.3 \
- XtGetKeysymTable.3 \
- XtGetResourceList.3 \
- XtGetSelectionParameters.3 \
- XtGetSelectionRequest.3 \
- XtGetSelectionTimeout.3 \
- XtGetSelectionValue.3 \
- XtGetSelectionValueIncremental.3 \
- XtGetSubresources.3 \
- XtGrabKey.3 \
- XtHooksOfDisplay.3 \
- XtInitialize.3 \
- XtInitializeWidgetClass.3 \
- XtInsertEventTypeHandler.3 \
- XtLastEventProcessed.3 \
- XtMakeGeometryRequest.3 \
- XtMalloc.3 \
- XtManageChildren.3 \
- XtMapWidget.3 \
- XtName.3 \
- XtNameToWidget.3 \
- XtNextEvent.3 \
- XtOffset.3 \
- XtOpenApplication.3 \
- XtOwnSelection.3 \
- XtParent.3 \
- XtParseAcceleratorTable.3 \
- XtParseTranslationTable.3 \
- XtPopdown.3 \
- XtPopup.3 \
- XtProcessLock.3 \
- XtQueryGeometry.3 \
- XtRealizeWidget.3 \
- XtRegisterDrawable.3 \
- XtRegisterGrabAction.3 \
- XtReservePropertyAtom.3 \
- XtResolvePathname.3 \
- XtSessionGetToken.3 \
- XtSetArg.3 \
- XtSetKeyTranslator.3 \
- XtSetKeyboardFocus.3 \
- XtSetLanguageProc.3 \
- XtSetMultiClickTime.3 \
- XtSetSelectionParameters.3 \
- XtSetSensitive.3 \
- XtSetValues.3 \
- XtSetWMColormapWindows.3 \
- XtStringConversionWarning.3 \
- XtToolkitThreadInitialize.3 \
- XtTranslateCoords.3 \
- XtRemoveGrab.3 \
- XtVaCreateArgsList.3 \
- XtAddCallbacks.3 \
- XtRemoveCallback.3 \
- XtRemoveCallbacks.3 \
- XtRemoveAllCallbacks.3 \
- XtAddRawEventHandler.3 \
- XtRemoveEventHandler.3 \
- XtRemoveRawEventHandler.3 \
- XtInsertEventHandler.3 \
- XtInsertRawEventHandler.3 \
- XtAddConverter.3 \
- XtRemoveInput.3 \
- XtRemoveTimeOut.3 \
- XtRemoveWorkProc.3 \
- XtVaAppCreateShell.3 \
- XtAppSetErrorHandler.3 \
- XtAppWarning.3 \
- XtAppSetWarningHandler.3 \
- XtAppSetErrorMsgHandler.3 \
- XtAppSetWarningMsgHandler.3 \
- XtAppWarningMsg.3 \
- XtAppGetErrorDatabaseText.3 \
- XtAppSetSelectionTimeout.3 \
- XtAppPending.3 \
- XtAppPeekEvent.3 \
- XtAppProcessEvent.3 \
- XtDispatchEvent.3 \
- XtAppMainLoop.3 \
- XtPending.3 \
- XtPeekEvent.3 \
- XtProcessEvent.3 \
- XtMainLoop.3 \
- XtCallCallbackList.3 \
- XtHasCallbacks.3 \
- XtSuperclass.3 \
- XtIsSubclass.3 \
- XtCheckSubclass.3 \
- XtIsObject.3 \
- XtIsRectObj.3 \
- XtIsWidget.3 \
- XtIsComposite.3 \
- XtIsConstraint.3 \
- XtIsShell.3 \
- XtIsOverrideShell.3 \
- XtIsWMShell.3 \
- XtIsVendorShell.3 \
- XtIsTransientShell.3 \
- XtIsTopLevelShell.3 \
- XtIsApplicationShell.3 \
- XtIsSessionShell.3 \
- XtMoveWidget.3 \
- XtResizeWidget.3 \
- XtDirectConvert.3 \
- XtCallConverter.3 \
- XtDestroyApplicationContext.3 \
- XtWidgetToApplicationContext.3 \
- XtToolkitInitialize.3 \
- XtVaCreatePopupShell.3 \
- XtVaCreateWidget.3 \
- XtCreateManagedWidget.3 \
- XtVaCreateManagedWidget.3 \
- XtDestroyWidget.3 \
- XtDisplayOfObject.3 \
- XtScreen.3 \
- XtScreenOfObject.3 \
- XtWindow.3 \
- XtWindowOfObject.3 \
- XtOpenDisplay.3 \
- XtCloseDisplay.3 \
- XtDatabase.3 \
- XtScreenDatabase.3 \
- XtReleaseGC.3 \
- XtGetConstraintResourceList.3 \
- XtGetSelectionValues.3 \
- XtVaGetSubresources.3 \
- XtVaGetApplicationResources.3 \
- XtMakeResizeRequest.3 \
- XtCalloc.3 \
- XtRealloc.3 \
- XtFree.3 \
- XtNewString.3 \
- XtManageChild.3 \
- XtUnmanageChildren.3 \
- XtUnmanageChild.3 \
- XtIsManaged.3 \
- XtChangeManagedSet.3 \
- XtSetMappedWhenManaged.3 \
- XtUnmapWidget.3 \
- XtWindowToWidget.3 \
- XtOffsetOf.3 \
- XtNumber.3 \
- XtOwnSelectionIncremental.3 \
- XtDisownSelection.3 \
- XtInstallAccelerators.3 \
- XtInstallAllAccelerators.3 \
- XtAugmentTranslations.3 \
- XtOverrideTranslations.3 \
- XtUninstallTranslations.3 \
- XtCallbackPopdown.3 \
- MenuPopdown.3 \
- XtPopupSpringLoaded.3 \
- XtCallbackNone.3 \
- XtCallbackNonexclusive.3 \
- XtCallbackExclusive.3 \
- MenuPopup.3 \
- XtIsRealized.3 \
- XtUnrealizeWidget.3 \
- XtMergeArgLists.3 \
- XtTranslateKeycode.3 \
- XtRegisterCaseConverter.3 \
- XtConvertCase.3 \
- XtIsSensitive.3 \
- XtVaSetValues.3 \
- XtSetSubvalues.3 \
- XtGetValues.3 \
- XtVaGetValues.3 \
- XtGetSubvalues.3 \
- XtVaGetSubvalues.3 \
- XtVaSetSubvalues.3 \
- XtKeysymToKeycodeList.3 \
- XtSetTypeConverter.3 \
- XtRemoveActionHook.3 \
- XtGetMultiClickTime.3 \
- XtRemoveEventTypeHandler.3 \
- XtRegisterExtensionSelector.3 \
- XtSetEventDispatcher.3 \
- XtDispatchEventToWidget.3 \
- XtLastTimestampProcessed.3 \
- XtNoticeSignal.3 \
- XtRemoveSignal.3 \
- XtAddTimeOut.3 \
- XtAddWorkProc.3 \
- XtRemoveBlockHook.3 \
- XtVaAppInitialize.3 \
- XtSessionReturnToken.3 \
- XtSetErrorMsgHandler.3 \
- XtSetWarningMsgHandler.3 \
- XtWarningMsg.3 \
- XtSetErrorHandler.3 \
- XtWarning.3 \
- XtSetWarningHandler.3 \
- XtGetErrorDatabaseText.3 \
- XtGetSelectionValuesIncremental.3 \
- XtSetSelectionTimeout.3 \
- XtSendSelectionRequest.3 \
- XtCancelSelectionRequest.3 \
- XtReleasePropertyAtom.3 \
- XtUngrabKey.3 \
- XtGrabKeyboard.3 \
- XtUngrabKeyboard.3 \
- XtGrabButton.3 \
- XtUngrabButton.3 \
- XtGrabPointer.3 \
- XtUngrabPointer.3 \
- XtUnregisterDrawable.3 \
- XtAppGetExitFlag.3 \
- XtAppUnlock.3 \
- XtProcessUnlock.3 \
- XtVaOpenApplication.3
+MAN3= MenuPopdown.3 \
+ MenuPopup.3 \
+ XtAddActions.3 \
+ XtAddCallback.3 \
+ XtAddCallbacks.3 \
+ XtAddConverter.3 \
+ XtAddEventHandler.3 \
+ XtAddExposureToRegion.3 \
+ XtAddGrab.3 \
+ XtAddInput.3 \
+ XtAddRawEventHandler.3 \
+ XtAddTimeOut.3 \
+ XtAddWorkProc.3 \
+ XtAllocateGC.3 \
+ XtAppAddActionHook.3 \
+ XtAppAddActions.3 \
+ XtAppAddBlockHook.3 \
+ XtAppAddConverter.3 \
+ XtAppAddInput.3 \
+ XtAppAddSignal.3 \
+ XtAppAddTimeOut.3 \
+ XtAppAddWorkProc.3 \
+ XtAppCreateShell.3 \
+ XtAppError.3 \
+ XtAppErrorMsg.3 \
+ XtAppGetErrorDatabase.3 \
+ XtAppGetErrorDatabaseText.3 \
+ XtAppGetExitFlag.3 \
+ XtAppGetSelectionTimeout.3 \
+ XtAppInitialize.3 \
+ XtAppLock.3 \
+ XtAppMainLoop.3 \
+ XtAppNextEvent.3 \
+ XtAppPeekEvent.3 \
+ XtAppPending.3 \
+ XtAppProcessEvent.3 \
+ XtAppReleaseCacheRefs.3 \
+ XtAppSetErrorHandler.3 \
+ XtAppSetErrorMsgHandler.3 \
+ XtAppSetExitFlag.3 \
+ XtAppSetFallbackResources.3 \
+ XtAppSetSelectionTimeout.3 \
+ XtAppSetTypeConverter.3 \
+ XtAppSetWarningHandler.3 \
+ XtAppSetWarningMsgHandler.3 \
+ XtAppUnlock.3 \
+ XtAppWarning.3 \
+ XtAppWarningMsg.3 \
+ XtAugmentTranslations.3 \
+ XtBuildEventMask.3 \
+ XtCallAcceptFocus.3\
+ XtCallActionProc.3 \
+ XtCallCallbackList.3 \
+ XtCallCallbacks.3 \
+ XtCallConverter.3 \
+ XtCallbackExclusive.3 \
+ XtCallbackNone.3 \
+ XtCallbackNonexclusive.3 \
+ XtCallbackPopdown.3 \
+ XtCalloc.3 \
+ XtCancelSelectionRequest.3 \
+ XtChangeManagedSet.3 \
+ XtCheckSubclass.3 \
+ XtClass.3\
+ XtCloseDisplay.3\
+ XtConfigureWidget.3\
+ XtConvert.3\
+ XtConvertAndStore.3\
+ XtConvertCase.3\
+ XtCreateApplicationContext.3\
+ XtCreateApplicationShell.3\
+ XtCreateManagedWidget.3\
+ XtCreatePopupShell.3\
+ XtCreateSelectionRequest.3\
+ XtCreateWidget.3\
+ XtCreateWindow.3\
+ XtDatabase.3\
+ XtDestroyApplicationContext.3\
+ XtDestroyWidget.3\
+ XtDirectConvert.3\
+ XtDisownSelection.3 \
+ XtDispatchEvent.3 \
+ XtDispatchEventToWidget.3\
+ XtDisplay.3\
+ XtDisplayInitialize.3\
+ XtDisplayOfObject.3\
+ XtDisplayStringConversionWarning.3\
+ XtDisplayToApplicationContext.3\
+ XtError.3\
+ XtErrorMsg.3\
+ XtFindFile.3\
+ XtFree.3\
+ XtGetActionKeysym.3\
+ XtGetActionList.3\
+ XtGetApplicationNameAndClass.3\
+ XtGetApplicationResources.3\
+ XtGetClassExtension.3\
+ XtGetConstraintResourceList.3\
+ XtGetDisplays.3\
+ XtGetErrorDatabase.3\
+ XtGetErrorDatabaseText.3\
+ XtGetGC.3\
+ XtGetKeyboardFocusWidget.3\
+ XtGetKeysymTable.3\
+ XtGetMultiClickTime.3 \
+ XtGetResourceList.3\
+ XtGetSelectionParameters.3\
+ XtGetSelectionRequest.3\
+ XtGetSelectionTimeout.3\
+ XtGetSelectionValue.3\
+ XtGetSelectionValueIncremental.3 \
+ XtGetSelectionValues.3\
+ XtGetSelectionValuesIncremental.3 \
+ XtGetSubresources.3 \
+ XtGetSubvalues.3 \
+ XtGetValues.3 \
+ XtGrabButton.3 \
+ XtGrabKey.3 \
+ XtGrabKeyboard.3 \
+ XtGrabPointer.3 \
+ XtHasCallbacks.3 \
+ XtHooksOfDisplay.3 \
+ XtInitialize.3 \
+ XtInitializeWidgetClass.3 \
+ XtInsertEventHandler.3 \
+ XtInsertEventTypeHandler.3 \
+ XtInsertRawEventHandler.3 \
+ XtInstallAccelerators.3\
+ XtInstallAllAccelerators.3\
+ XtIsApplicationShell.3\
+ XtIsComposite.3\
+ XtIsConstraint.3\
+ XtIsManaged.3\
+ XtIsObject.3\
+ XtIsOverrideShell.3\
+ XtIsRealized.3\
+ XtIsRectObj.3\
+ XtIsSensitive.3\
+ XtIsSessionShell.3\
+ XtIsShell.3\
+ XtIsSubclass.3\
+ XtIsTopLevelShell.3\
+ XtIsTransientShell.3\
+ XtIsVendorShell.3\
+ XtIsWMShell.3\
+ XtIsWidget.3\
+ XtKeysymToKeycodeList.3\
+ XtLastEventProcessed.3\
+ XtLastTimestampProcessed.3 \
+ XtMainLoop.3 \
+ XtMakeGeometryRequest.3 \
+ XtMakeResizeRequest.3 \
+ XtMalloc.3 \
+ XtManageChild.3 \
+ XtManageChildren.3 \
+ XtMapWidget.3 \
+ XtMergeArgLists.3 \
+ XtMoveWidget.3 \
+ XtName.3 \
+ XtNameToWidget.3 \
+ XtNew.3 \
+ XtNewString.3 \
+ XtNextEvent.3 \
+ XtNoticeSignal.3 \
+ XtNumber.3 \
+ XtOffset.3 \
+ XtOffsetOf.3 \
+ XtOpenApplication.3 \
+ XtOpenDisplay.3 \
+ XtOverrideTranslations.3 \
+ XtOwnSelection.3 \
+ XtOwnSelectionIncremental.3 \
+ XtParent.3 \
+ XtParseAcceleratorTable.3 \
+ XtParseTranslationTable.3 \
+ XtPeekEvent.3 \
+ XtPending.3 \
+ XtPopdown.3 \
+ XtPopup.3 \
+ XtPopupSpringLoaded.3 \
+ XtProcessEvent.3 \
+ XtProcessLock.3 \
+ XtProcessUnlock.3 \
+ XtQueryGeometry.3 \
+ XtRealizeWidget.3 \
+ XtRealloc.3 \
+ XtRegisterCaseConverter.3 \
+ XtRegisterDrawable.3 \
+ XtRegisterExtensionSelector.3 \
+ XtRegisterGrabAction.3 \
+ XtReleaseGC.3 \
+ XtReleasePropertyAtom.3 \
+ XtRemoveActionHook.3 \
+ XtRemoveAllCallbacks.3 \
+ XtRemoveBlockHook.3 \
+ XtRemoveCallback.3 \
+ XtRemoveCallbacks.3 \
+ XtRemoveEventHandler.3\
+ XtRemoveEventTypeHandler.3\
+ XtRemoveGrab.3\
+ XtRemoveInput.3\
+ XtRemoveRawEventHandler.3\
+ XtRemoveSignal.3\
+ XtRemoveTimeOut.3\
+ XtRemoveWorkProc.3\
+ XtReservePropertyAtom.3\
+ XtResizeWidget.3\
+ XtResolvePathname.3\
+ XtScreen.3\
+ XtScreenDatabase.3\
+ XtScreenOfObject.3\
+ XtSendSelectionRequest.3\
+ XtSessionGetToken.3\
+ XtSessionReturnToken.3\
+ XtSetArg.3\
+ XtSetErrorHandler.3\
+ XtSetErrorMsgHandler.3\
+ XtSetEventDispatcher.3\
+ XtSetKeyTranslator.3\
+ XtSetKeyboardFocus.3\
+ XtSetLanguageProc.3 \
+ XtSetMappedWhenManaged.3 \
+ XtSetMultiClickTime.3 \
+ XtSetSelectionParameters.3 \
+ XtSetSelectionTimeout.3 \
+ XtSetSensitive.3 \
+ XtSetSubvalues.3 \
+ XtSetTypeConverter.3 \
+ XtSetValues.3 \
+ XtSetWMColormapWindows.3 \
+ XtSetWarningHandler.3 \
+ XtSetWarningMsgHandler.3\
+ XtStringConversionWarning.3\
+ XtSuperclass.3\
+ XtToolkitInitialize.3\
+ XtToolkitThreadInitialize.3\
+ XtTranslateCoords.3 \
+ XtTranslateKeycode.3\
+ XtUngrabButton.3\
+ XtUngrabKey.3\
+ XtUngrabKeyboard.3\
+ XtUngrabPointer.3\
+ XtUninstallTranslations.3\
+ XtUnmanageChild.3\
+ XtUnmanageChildren.3\
+ XtUnmapWidget.3\
+ XtUnrealizeWidget.3\
+ XtUnregisterDrawable.3\
+ XtVaAppCreateShell.3\
+ XtVaAppInitialize.3\
+ XtVaCreateArgsList.3\
+ XtVaCreateManagedWidget.3\
+ XtVaCreatePopupShell.3\
+ XtVaCreateWidget.3\
+ XtVaGetApplicationResources.3\
+ XtVaGetSubresources.3\
+ XtVaGetSubvalues.3 \
+ XtVaGetValues.3 \
+ XtVaOpenApplication.3\
+ XtVaSetSubvalues.3\
+ XtVaSetValues.3\
+ XtWarning.3 \
+ XtWarningMsg.3\
+ XtWidgetToApplicationContext.3\
+ XtWindow.3 \
+ XtWindowOfObject.3 \
+ XtWindowToWidget.3
.include <bsd.port.mk>
diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo
index fe2a7b4fa91e..67f296198a07 100644
--- a/x11-toolkits/libXt/distinfo
+++ b/x11-toolkits/libXt/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXt-1.0.9.tar.bz2) = eab91b594b801f7f07a20f936dda70a629028858cbcf541becf94f2786ae6b01
+SIZE (xorg/lib/libXt-1.0.9.tar.bz2) = 685981
diff --git a/x11-toolkits/libXt/pkg-descr b/x11-toolkits/libXt/pkg-descr
index 36f0e095cbad..0369c4fec061 100644
--- a/x11-toolkits/libXt/pkg-descr
+++ b/x11-toolkits/libXt/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Toolkit library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist
index 0f587df53eee..2020099d260d 100644
--- a/x11-toolkits/libXt/pkg-plist
+++ b/x11-toolkits/libXt/pkg-plist
@@ -1,39 +1,38 @@
-bin/makestrs
-include/X11/StringDefs.h
-include/X11/Shell.h
+include/X11/CallbackI.h
include/X11/Composite.h
include/X11/CompositeP.h
include/X11/ConstrainP.h
include/X11/Constraint.h
+include/X11/ConvertI.h
include/X11/Core.h
include/X11/CoreP.h
-include/X11/Intrinsic.h
-include/X11/Object.h
-include/X11/IntrinsicP.h
-include/X11/ObjectP.h
-include/X11/RectObj.h
-include/X11/RectObjP.h
-include/X11/ResConfigP.h
-include/X11/ShellP.h
-include/X11/Vendor.h
-include/X11/VendorP.h
-include/X11/CallbackI.h
-include/X11/ConvertI.h
include/X11/CreateI.h
include/X11/EventI.h
include/X11/HookObjI.h
include/X11/InitialI.h
+include/X11/Intrinsic.h
include/X11/IntrinsicI.h
+include/X11/IntrinsicP.h
+include/X11/Object.h
+include/X11/ObjectP.h
include/X11/PassivGraI.h
+include/X11/RectObj.h
+include/X11/RectObjP.h
+include/X11/ResConfigP.h
include/X11/ResourceI.h
include/X11/SelectionI.h
+include/X11/Shell.h
include/X11/ShellI.h
+include/X11/ShellP.h
+include/X11/StringDefs.h
include/X11/ThreadsI.h
include/X11/TranslateI.h
include/X11/VarargsI.h
+include/X11/Vendor.h
+include/X11/VendorP.h
include/X11/Xtos.h
-lib/libXt.so.6
-lib/libXt.so
-lib/libXt.la
lib/libXt.a
+lib/libXt.la
+lib/libXt.so
+lib/libXt.so.6
libdata/pkgconfig/xt.pc
diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile
index 9993a54a9ca9..9bffd93f7478 100644
--- a/x11-wm/twm/Makefile
+++ b/x11-wm/twm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= twm
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.6
CATEGORIES= x11-wm
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-wm/twm/distinfo b/x11-wm/twm/distinfo
index 5fad235d6cd3..cf4a7e1dd8e4 100644
--- a/x11-wm/twm/distinfo
+++ b/x11-wm/twm/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/twm-1.0.4.tar.bz2) = 0865e14c73c08fa8c501ae877298ee9f
-SHA256 (xorg/app/twm-1.0.4.tar.bz2) = daa088f9ae231508929b7bd4746e942212b53f2802ca4cee450139fabc8de1fa
-SIZE (xorg/app/twm-1.0.4.tar.bz2) = 241944
+SHA256 (xorg/app/twm-1.0.6.tar.bz2) = e7dccad7879a7570442f0cd9df0b9064e926466b5a52b710fca8cfb167f294e9
+SIZE (xorg/app/twm-1.0.6.tar.bz2) = 266272
diff --git a/x11-wm/twm/pkg-descr b/x11-wm/twm/pkg-descr
index 1d43548efaa1..e3ba6c360bd8 100644
--- a/x11-wm/twm/pkg-descr
+++ b/x11-wm/twm/pkg-descr
@@ -1,4 +1,2 @@
This package contains twm, a Window Manager for the X Window System.
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
index 858078de1123..382115f9b107 100644
--- a/x11/appres/Makefile
+++ b/x11/appres/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= appres
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/appres/distinfo b/x11/appres/distinfo
index ba6193bd920d..8759c7eb608f 100644
--- a/x11/appres/distinfo
+++ b/x11/appres/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/appres-1.0.3.tar.bz2) = 93f475046a8c5055131c5551d5a36ff62aa138a7b2f17ac1bf6393cde8dc640a
+SIZE (xorg/app/appres-1.0.3.tar.bz2) = 104807
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index 67e9593b9548..0ce0d9312286 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= beforelight
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/beforelight/distinfo b/x11/beforelight/distinfo
index 358c03298561..a01024dc6ffa 100644
--- a/x11/beforelight/distinfo
+++ b/x11/beforelight/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/beforelight-1.0.3.tar.bz2) = d55b0e7196dafcfeb4db3886af2e1969
-SHA256 (xorg/app/beforelight-1.0.3.tar.bz2) = cae9427fa083a0ec3f2d1a3a6391508b31a2cf0220cb8d732c5d473a8c995c4e
-SIZE (xorg/app/beforelight-1.0.3.tar.bz2) = 85067
+SHA256 (xorg/app/beforelight-1.0.4.tar.bz2) = 38f1d5380704234a37306ee13ea53be6eed4a1c6eb2c8ebdacca181465da56bb
+SIZE (xorg/app/beforelight-1.0.4.tar.bz2) = 108254
diff --git a/x11/beforelight/pkg-descr b/x11/beforelight/pkg-descr
index 75c2de6b27ab..e57387823539 100644
--- a/x11/beforelight/pkg-descr
+++ b/x11/beforelight/pkg-descr
@@ -1,5 +1,2 @@
This package contains a sample screen saver for the X Window System called
"beforelight".
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
index 587c2e9eece7..011b51c5ddb9 100644
--- a/x11/bigreqsproto/Makefile
+++ b/x11/bigreqsproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bigreqsproto
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo
index f339e050ddf1..585c66bdae49 100644
--- a/x11/bigreqsproto/distinfo
+++ b/x11/bigreqsproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a
+SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069
diff --git a/x11/bigreqsproto/pkg-descr b/x11/bigreqsproto/pkg-descr
index 8d54a8f300f0..bf5a7b3c73fa 100644
--- a/x11/bigreqsproto/pkg-descr
+++ b/x11/bigreqsproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org BigReqs extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/bigreqsproto/pkg-plist b/x11/bigreqsproto/pkg-plist
index 8244fb5a8137..3d95422af10c 100644
--- a/x11/bigreqsproto/pkg-plist
+++ b/x11/bigreqsproto/pkg-plist
@@ -1,4 +1,6 @@
include/X11/extensions/bigreqsproto.h
include/X11/extensions/bigreqstr.h
libdata/pkgconfig/bigreqsproto.pc
+%%DOCSDIR%%/bigreq.xml
+@dirrm %%DOCSDIR%%
@dirrmtry include/X11/extensions
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 558a99c8bc15..93acca9fcc90 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bitmap
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bitmap/distinfo b/x11/bitmap/distinfo
index b8a5dbb0b638..bc3712be5268 100644
--- a/x11/bitmap/distinfo
+++ b/x11/bitmap/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/bitmap-1.0.5.tar.bz2) = aa51b522fb2579042b1a7f1a5cea8b5582f2f88ea19459469fc19d61714a031e
+SIZE (xorg/app/bitmap-1.0.5.tar.bz2) = 153430
diff --git a/x11/bitmap/pkg-descr b/x11/bitmap/pkg-descr
index fcb5245535ce..1650a445a600 100644
--- a/x11/bitmap/pkg-descr
+++ b/x11/bitmap/pkg-descr
@@ -1,5 +1,2 @@
This package contains bitmap, which is a tool for creating or editing
rectangual images made up of 1's and 0's.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
index 495fb0b93553..a5cd8627df29 100644
--- a/x11/compositeproto/Makefile
+++ b/x11/compositeproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= compositeproto
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
index 716ffd452d31..dc5679054c8d 100644
--- a/x11/compositeproto/distinfo
+++ b/x11/compositeproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/compositeproto-0.4.2.tar.bz2) = 049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc
+SIZE (xorg/proto/compositeproto-0.4.2.tar.bz2) = 101208
diff --git a/x11/compositeproto/pkg-descr b/x11/compositeproto/pkg-descr
index 9ce26903ea4d..db7f06d1c3d3 100644
--- a/x11/compositeproto/pkg-descr
+++ b/x11/compositeproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Composite extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
index 779e955b278f..6073e83bdacd 100644
--- a/x11/damageproto/Makefile
+++ b/x11/damageproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= damageproto
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo
index 03253db8dc6e..0cd77b87edb0 100644
--- a/x11/damageproto/distinfo
+++ b/x11/damageproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/damageproto-1.2.1.tar.bz2) = 5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b
+SIZE (xorg/proto/damageproto-1.2.1.tar.bz2) = 98392
diff --git a/x11/damageproto/pkg-descr b/x11/damageproto/pkg-descr
index 9ba4ce9c9d65..66bb20e11ea6 100644
--- a/x11/damageproto/pkg-descr
+++ b/x11/damageproto/pkg-descr
@@ -1,5 +1,2 @@
This package contains X.Org Damage extension protocol specification
and header files.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/dmxproto/pkg-descr b/x11/dmxproto/pkg-descr
index 32c1fea20bec..690700f953eb 100644
--- a/x11/dmxproto/pkg-descr
+++ b/x11/dmxproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org DMXProto protocol headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist
index 98accdce0c96..217d1f5f509f 100644
--- a/x11/dmxproto/pkg-plist
+++ b/x11/dmxproto/pkg-plist
@@ -1,4 +1,4 @@
include/X11/extensions/dmx.h
include/X11/extensions/dmxproto.h
libdata/pkgconfig/dmxproto.pc
-@dirrmtry include/X11/extensions
+@dirrm include/X11/extensions
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
index 638ff0f2f76d..5709b1c2ae1f 100644
--- a/x11/dri2proto/Makefile
+++ b/x11/dri2proto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= dri2proto
-PORTVERSION= 2.2
+PORTVERSION= 2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
index 71dc2fb3621b..eb210316420d 100644
--- a/x11/dri2proto/distinfo
+++ b/x11/dri2proto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/dri2proto-2.3.tar.bz2) = b2141892a0db35feffa5e952ff5e1d2727c4436b07d7e2e9dd2ed89c8bb3e677
+SIZE (xorg/proto/dri2proto-2.3.tar.bz2) = 95466
diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr
index 1e57ddbf8fb2..668bcfc97708 100644
--- a/x11/dri2proto/pkg-descr
+++ b/x11/dri2proto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org DRI2 prototype headers.
-- Florent Thoumie
-flz@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 245843f9092c..5e7ad5a6d849 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= editres
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/editres/distinfo b/x11/editres/distinfo
index a5b442702ae9..ff572e4b01f2 100644
--- a/x11/editres/distinfo
+++ b/x11/editres/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/editres-1.0.5.tar.bz2) = fd97a3522e97b8b7ead7b5cddeb79bfabe44769d144ac9ae5595c25c41afa33d
+SIZE (xorg/app/editres-1.0.5.tar.bz2) = 145578
diff --git a/x11/editres/pkg-descr b/x11/editres/pkg-descr
index 484a780e362f..dbea285b5c32 100644
--- a/x11/editres/pkg-descr
+++ b/x11/editres/pkg-descr
@@ -1,5 +1,2 @@
This package contains editres, a dynamic resource editor for X Toolkit
Applications.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/evieext/pkg-descr b/x11/evieext/pkg-descr
index 6ddfde63eccd..0521a1e729a8 100644
--- a/x11/evieext/pkg-descr
+++ b/x11/evieext/pkg-descr
@@ -1,4 +1,3 @@
This package contains evieext, a collection of XEVIE extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs \ No newline at end of file
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
index 45350f54ecab..ea13101353fc 100644
--- a/x11/fixesproto/Makefile
+++ b/x11/fixesproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fixesproto
-PORTVERSION= 4.1.1
+PORTVERSION= 4.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo
index fa215cec2baf..0bfc4ee598db 100644
--- a/x11/fixesproto/distinfo
+++ b/x11/fixesproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/fixesproto-4.1.2.tar.bz2) = de4cbfccb533c190073445eb2a891d997e89f6fb58204f68ae82871de044f857
+SIZE (xorg/proto/fixesproto-4.1.2.tar.bz2) = 103043
diff --git a/x11/fixesproto/pkg-descr b/x11/fixesproto/pkg-descr
index 5e2d9367eadd..306320b73cbd 100644
--- a/x11/fixesproto/pkg-descr
+++ b/x11/fixesproto/pkg-descr
@@ -1,5 +1,4 @@
This package contains X.Org Fixes extension protocol specification
and header files.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index a265ea6075ce..7fc569a44f96 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fstobdf
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo
index 9216579332e9..97b066dc8d1f 100644
--- a/x11/fstobdf/distinfo
+++ b/x11/fstobdf/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/fstobdf-1.0.3.tar.bz2) = 49a6225380f6c18fff664a043cd569b1
-SHA256 (xorg/app/fstobdf-1.0.3.tar.bz2) = f2242720045c69f69dc9e18320a1c6402e92234d40c237367560fae3d210f7b0
-SIZE (xorg/app/fstobdf-1.0.3.tar.bz2) = 90507
+SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b
+SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528
diff --git a/x11/fstobdf/pkg-descr b/x11/fstobdf/pkg-descr
index 5c95299bfed0..e5adf2a0fc75 100644
--- a/x11/fstobdf/pkg-descr
+++ b/x11/fstobdf/pkg-descr
@@ -1,5 +1,2 @@
This package contains fstobdf, a program for generating BDF fonts from
an X font server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 5b82b42dd78b..e7a1804122d4 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glproto
-PORTVERSION= 1.4.11
+PORTVERSION= 1.4.12
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index a4adc7a86fff..73bbc435bcb0 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/glproto-1.4.12.tar.bz2) = 48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de
+SIZE (xorg/proto/glproto-1.4.12.tar.bz2) = 106968
diff --git a/x11/glproto/pkg-descr b/x11/glproto/pkg-descr
index 489e9639f47e..07573ef97474 100644
--- a/x11/glproto/pkg-descr
+++ b/x11/glproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org GLX extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 4699ed3e42cf..afa9632f9978 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= iceauth
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo
index 201ac6b8f701..374adcd1cdad 100644
--- a/x11/iceauth/distinfo
+++ b/x11/iceauth/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/iceauth-1.0.4.tar.bz2) = 0ee6fd4554f0131b1ed526ee00b9cf643e7dc97eb70fb51448848ef2f349938d
+SIZE (xorg/app/iceauth-1.0.4.tar.bz2) = 115722
diff --git a/x11/iceauth/pkg-descr b/x11/iceauth/pkg-descr
index e412c393288f..ae475980c9f5 100644
--- a/x11/iceauth/pkg-descr
+++ b/x11/iceauth/pkg-descr
@@ -1,5 +1,2 @@
This package contains iceauth, an ICE authority file utility for the X
Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
index b612fb930351..6cb55d34efbf 100644
--- a/x11/ico/Makefile
+++ b/x11/ico/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ico
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/ico/distinfo b/x11/ico/distinfo
index 10a83d0d9913..25cc6a38a7f4 100644
--- a/x11/ico/distinfo
+++ b/x11/ico/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/ico-1.0.2.tar.bz2) = 5711827c5c2563620b56c33aababbc63
-SHA256 (xorg/app/ico-1.0.2.tar.bz2) = db2e96e18a2bcc29b91b9de7b758a7c67cebee27772fb540c44c7bc2c2218aa5
-SIZE (xorg/app/ico-1.0.2.tar.bz2) = 97445
+SHA256 (xorg/app/ico-1.0.3.tar.bz2) = db00f97a19e7ff87065f70df0a347a4924815cba7bceef801456d9180a3fd896
+SIZE (xorg/app/ico-1.0.3.tar.bz2) = 116202
diff --git a/x11/ico/pkg-descr b/x11/ico/pkg-descr
index cdef9f01c8d6..591943b22fd1 100644
--- a/x11/ico/pkg-descr
+++ b/x11/ico/pkg-descr
@@ -1,5 +1,2 @@
This package contains ico, an appliction used for displaying wire-framed
rotating polyhedrons.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index d64ee328b583..28959ee80de9 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= inputproto
-PORTVERSION= 2.0
+PORTVERSION= 2.0.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
index 3ca4f2ab2ddd..7b3f03bba653 100644
--- a/x11/inputproto/distinfo
+++ b/x11/inputproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/inputproto-2.0.1.tar.bz2) = 63663dd88df812738e0efdc52a18868c0756128f09748cbe89c8ec6d17124a44
+SIZE (xorg/proto/inputproto-2.0.1.tar.bz2) = 152547
diff --git a/x11/inputproto/pkg-descr b/x11/inputproto/pkg-descr
index 56ac85360439..d851f442f923 100644
--- a/x11/inputproto/pkg-descr
+++ b/x11/inputproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org Input extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist
index 8ed21c47ef29..a08637eae856 100644
--- a/x11/inputproto/pkg-plist
+++ b/x11/inputproto/pkg-plist
@@ -3,4 +3,7 @@ include/X11/extensions/XI2.h
include/X11/extensions/XI2proto.h
include/X11/extensions/XIproto.h
libdata/pkgconfig/inputproto.pc
-@dirrmtry include/X11/extensions \ No newline at end of file
+%%DOCSDIR%%/XI2proto.txt
+%%DOCSDIR%%/XIproto.txt
+@dirrm %%DOCSDIR%%
+@dirrmtry include/X11/extensions
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
index c9bbfc0d25f9..460e113a8f9c 100644
--- a/x11/kbproto/Makefile
+++ b/x11/kbproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kbproto
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo
index 30c2135b94e9..98d94c36c8f4 100644
--- a/x11/kbproto/distinfo
+++ b/x11/kbproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
+SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270
diff --git a/x11/kbproto/pkg-descr b/x11/kbproto/pkg-descr
index fe7caeb39b70..b8e64b19ba52 100644
--- a/x11/kbproto/pkg-descr
+++ b/x11/kbproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org KB extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index d2051d568cb0..ed3c6056c4dd 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libICE
-PORTVERSION= 1.0.6
+PORTVERSION= 1.0.7
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo
index a83bf7400aeb..efdbf210e5da 100644
--- a/x11/libICE/distinfo
+++ b/x11/libICE/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
+SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808
diff --git a/x11/libICE/pkg-descr b/x11/libICE/pkg-descr
index 8a75f1bb6efb..718008bed3b4 100644
--- a/x11/libICE/pkg-descr
+++ b/x11/libICE/pkg-descr
@@ -1,6 +1,3 @@
This package contains the Inter Client Exchange library for X11.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libICE/pkg-plist b/x11/libICE/pkg-plist
index 465b985306fb..4083e3aa8080 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -9,4 +9,7 @@ lib/libICE.la
lib/libICE.so
lib/libICE.so.6
libdata/pkgconfig/ice.pc
+%%DOCSDIR%%/ICElib.xml
+%%DOCSDIR%%/ice.xml
+@dirrm %%DOCSDIR%%
@dirrm include/X11/ICE
diff --git a/x11/libSM/pkg-descr b/x11/libSM/pkg-descr
index 104904279f9c..de641164288d 100644
--- a/x11/libSM/pkg-descr
+++ b/x11/libSM/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X11 Session Management library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index d49a86212a9c..323348967f89 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libX11
-PORTVERSION= 1.3.3
-PORTREVISION= 1
+PORTVERSION= 1.3.6
PORTEPOCH= 1
CATEGORIES= x11
@@ -21,11 +20,9 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
-USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
-ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
- --with-xcb=yes
+ --with-xcb=yes \
+ --disable-specs
CONFIGURE_ENV+= ac_cv_path_PS2PDF=""
.include "${.CURDIR}/manpages"
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index f45af2697f1e..318dab8004d5 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libX11-1.3.6.tar.bz2) = 599826765c59a98b1e58b4f6c4ad50dca69eeb0e7bd78aea736ca815f45bea40
+SIZE (xorg/lib/libX11-1.3.6.tar.bz2) = 2084047
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
index 57f14cdff6e6..ec4bab81931c 100644
--- a/x11/libX11/manpages
+++ b/x11/libX11/manpages
@@ -180,6 +180,8 @@ XDrawText16.3 \
XEmptyRegion.3 \
XEnableAccessControl.3 \
XEqualRegion.3 \
+XkbGetDetectableAutoRepeat.3 \
+XkbSetDetectableAutoRepeat.3 \
XErrorEvent.3 \
XEvent.3 \
XEventsQueued.3 \
@@ -634,7 +636,6 @@ XkbGetBounceKeysDelay.3 \
XkbGetCompatMap.3 \
XkbGetControlsChanges.3 \
XkbGetControls.3 \
-XkbGetDetectableAutorepeat.3 \
XkbGetDeviceButtonActions.3 \
XkbGetDeviceInfoChanges.3 \
XkbGetDeviceInfo.3 \
@@ -734,7 +735,6 @@ XkbSetBounceKeysDelay.3 \
XkbSetCompatMap.3 \
XkbSetControls.3 \
XkbSetDebuggingFlags.3 \
-XkbSetDetectableAutorepeat.3 \
XkbSetDeviceButtonActions.3 \
XkbSetDeviceInfo.3 \
XkbSetIgnoreLockMods.3 \
@@ -817,3 +817,4 @@ XwcTextPerCharExtents.3 \
XwcTextPropertyToTextList.3
MAN5= \
Compose.5 \
+XCompose.5 \ No newline at end of file
diff --git a/x11/libX11/pkg-descr b/x11/libX11/pkg-descr
index b79c61eb5c33..2cbd6519c263 100644
--- a/x11/libX11/pkg-descr
+++ b/x11/libX11/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X11 library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index d304d0ab3c7c..30a0fa6103b6 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -1,23 +1,8 @@
-%%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
-include/X11/Xlib.h
include/X11/Xlib-xcb.h
+include/X11/Xlib.h
include/X11/XlibConf.h
include/X11/Xlibint.h
include/X11/Xlocale.h
@@ -25,212 +10,210 @@ include/X11/Xregion.h
include/X11/Xresource.h
include/X11/Xutil.h
include/X11/cursorfont.h
-lib/X11/Xcms.txt
-lib/libX11.a
-lib/libX11.la
-lib/libX11.so
-lib/libX11.so.6
-lib/libX11-xcb.a
-lib/libX11-xcb.la
-lib/libX11-xcb.so
-lib/libX11-xcb.so.1
-libdata/pkgconfig/x11.pc
-libdata/pkgconfig/x11-xcb.pc
lib/X11/XErrorDB
-lib/X11/XKeysymDB
+lib/X11/Xcms.txt
+lib/X11/locale/C/Compose
+lib/X11/locale/C/XI18N_OBJS
+lib/X11/locale/C/XLC_LOCALE
+lib/X11/locale/am_ET.UTF-8/Compose
lib/X11/locale/am_ET.UTF-8/XI18N_OBJS
lib/X11/locale/am_ET.UTF-8/XLC_LOCALE
-lib/X11/locale/am_ET.UTF-8/Compose
+lib/X11/locale/armscii-8/Compose
lib/X11/locale/armscii-8/XI18N_OBJS
lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/armscii-8/Compose
-lib/X11/locale/C/XI18N_OBJS
-lib/X11/locale/C/XLC_LOCALE
-lib/X11/locale/C/Compose
+lib/X11/locale/compose.dir
+lib/X11/locale/el_GR.UTF-8/Compose
lib/X11/locale/el_GR.UTF-8/XI18N_OBJS
lib/X11/locale/el_GR.UTF-8/XLC_LOCALE
-lib/X11/locale/el_GR.UTF-8/Compose
+lib/X11/locale/en_US.UTF-8/Compose
lib/X11/locale/en_US.UTF-8/XI18N_OBJS
lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-lib/X11/locale/en_US.UTF-8/Compose
+lib/X11/locale/fi_FI.UTF-8/Compose
lib/X11/locale/fi_FI.UTF-8/XI18N_OBJS
lib/X11/locale/fi_FI.UTF-8/XLC_LOCALE
-lib/X11/locale/fi_FI.UTF-8/Compose
+lib/X11/locale/georgian-academy/Compose
lib/X11/locale/georgian-academy/XI18N_OBJS
lib/X11/locale/georgian-academy/XLC_LOCALE
-lib/X11/locale/georgian-academy/Compose
+lib/X11/locale/georgian-ps/Compose
lib/X11/locale/georgian-ps/XI18N_OBJS
lib/X11/locale/georgian-ps/XLC_LOCALE
-lib/X11/locale/georgian-ps/Compose
+lib/X11/locale/ibm-cp1133/Compose
lib/X11/locale/ibm-cp1133/XI18N_OBJS
lib/X11/locale/ibm-cp1133/XLC_LOCALE
-lib/X11/locale/ibm-cp1133/Compose
+lib/X11/locale/iscii-dev/Compose
lib/X11/locale/iscii-dev/XI18N_OBJS
lib/X11/locale/iscii-dev/XLC_LOCALE
-lib/X11/locale/iscii-dev/Compose
+lib/X11/locale/isiri-3342/Compose
lib/X11/locale/isiri-3342/XI18N_OBJS
lib/X11/locale/isiri-3342/XLC_LOCALE
-lib/X11/locale/isiri-3342/Compose
+lib/X11/locale/iso8859-1/Compose
lib/X11/locale/iso8859-1/XI18N_OBJS
lib/X11/locale/iso8859-1/XLC_LOCALE
-lib/X11/locale/iso8859-1/Compose
+lib/X11/locale/iso8859-10/Compose
lib/X11/locale/iso8859-10/XI18N_OBJS
lib/X11/locale/iso8859-10/XLC_LOCALE
-lib/X11/locale/iso8859-10/Compose
+lib/X11/locale/iso8859-11/Compose
lib/X11/locale/iso8859-11/XI18N_OBJS
lib/X11/locale/iso8859-11/XLC_LOCALE
-lib/X11/locale/iso8859-11/Compose
+lib/X11/locale/iso8859-13/Compose
lib/X11/locale/iso8859-13/XI18N_OBJS
lib/X11/locale/iso8859-13/XLC_LOCALE
-lib/X11/locale/iso8859-13/Compose
+lib/X11/locale/iso8859-14/Compose
lib/X11/locale/iso8859-14/XI18N_OBJS
lib/X11/locale/iso8859-14/XLC_LOCALE
-lib/X11/locale/iso8859-14/Compose
+lib/X11/locale/iso8859-15/Compose
lib/X11/locale/iso8859-15/XI18N_OBJS
lib/X11/locale/iso8859-15/XLC_LOCALE
-lib/X11/locale/iso8859-15/Compose
+lib/X11/locale/iso8859-2/Compose
lib/X11/locale/iso8859-2/XI18N_OBJS
lib/X11/locale/iso8859-2/XLC_LOCALE
-lib/X11/locale/iso8859-2/Compose
+lib/X11/locale/iso8859-3/Compose
lib/X11/locale/iso8859-3/XI18N_OBJS
lib/X11/locale/iso8859-3/XLC_LOCALE
-lib/X11/locale/iso8859-3/Compose
+lib/X11/locale/iso8859-4/Compose
lib/X11/locale/iso8859-4/XI18N_OBJS
lib/X11/locale/iso8859-4/XLC_LOCALE
-lib/X11/locale/iso8859-4/Compose
+lib/X11/locale/iso8859-5/Compose
lib/X11/locale/iso8859-5/XI18N_OBJS
lib/X11/locale/iso8859-5/XLC_LOCALE
-lib/X11/locale/iso8859-5/Compose
+lib/X11/locale/iso8859-6/Compose
lib/X11/locale/iso8859-6/XI18N_OBJS
lib/X11/locale/iso8859-6/XLC_LOCALE
-lib/X11/locale/iso8859-6/Compose
+lib/X11/locale/iso8859-7/Compose
lib/X11/locale/iso8859-7/XI18N_OBJS
lib/X11/locale/iso8859-7/XLC_LOCALE
-lib/X11/locale/iso8859-7/Compose
+lib/X11/locale/iso8859-8/Compose
lib/X11/locale/iso8859-8/XI18N_OBJS
lib/X11/locale/iso8859-8/XLC_LOCALE
-lib/X11/locale/iso8859-8/Compose
+lib/X11/locale/iso8859-9/Compose
lib/X11/locale/iso8859-9/XI18N_OBJS
lib/X11/locale/iso8859-9/XLC_LOCALE
-lib/X11/locale/iso8859-9/Compose
+lib/X11/locale/iso8859-9e/Compose
lib/X11/locale/iso8859-9e/XI18N_OBJS
lib/X11/locale/iso8859-9e/XLC_LOCALE
-lib/X11/locale/iso8859-9e/Compose
-lib/X11/locale/ja/XI18N_OBJS
-lib/X11/locale/ja/XLC_LOCALE
-lib/X11/locale/ja/Compose
+lib/X11/locale/ja.JIS/Compose
lib/X11/locale/ja.JIS/XI18N_OBJS
lib/X11/locale/ja.JIS/XLC_LOCALE
-lib/X11/locale/ja.JIS/Compose
-lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
-lib/X11/locale/ja_JP.UTF-8/Compose
+lib/X11/locale/ja.S90/Compose
lib/X11/locale/ja.S90/XI18N_OBJS
lib/X11/locale/ja.S90/XLC_LOCALE
-lib/X11/locale/ja.S90/Compose
+lib/X11/locale/ja.SJIS/Compose
lib/X11/locale/ja.SJIS/XI18N_OBJS
lib/X11/locale/ja.SJIS/XLC_LOCALE
-lib/X11/locale/ja.SJIS/Compose
+lib/X11/locale/ja.U90/Compose
lib/X11/locale/ja.U90/XI18N_OBJS
lib/X11/locale/ja.U90/XLC_LOCALE
-lib/X11/locale/ja.U90/Compose
+lib/X11/locale/ja/Compose
+lib/X11/locale/ja/XI18N_OBJS
+lib/X11/locale/ja/XLC_LOCALE
+lib/X11/locale/ja_JP.UTF-8/Compose
+lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+lib/X11/locale/ko/Compose
lib/X11/locale/ko/XI18N_OBJS
lib/X11/locale/ko/XLC_LOCALE
-lib/X11/locale/ko/Compose
+lib/X11/locale/ko_KR.UTF-8/Compose
+lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+lib/X11/locale/koi8-c/Compose
lib/X11/locale/koi8-c/XI18N_OBJS
lib/X11/locale/koi8-c/XLC_LOCALE
-lib/X11/locale/koi8-c/Compose
+lib/X11/locale/koi8-r/Compose
lib/X11/locale/koi8-r/XI18N_OBJS
lib/X11/locale/koi8-r/XLC_LOCALE
-lib/X11/locale/koi8-r/Compose
+lib/X11/locale/koi8-u/Compose
lib/X11/locale/koi8-u/XI18N_OBJS
lib/X11/locale/koi8-u/XLC_LOCALE
-lib/X11/locale/koi8-u/Compose
-lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
-lib/X11/locale/ko_KR.UTF-8/Compose
+lib/X11/locale/locale.alias
+lib/X11/locale/locale.dir
+lib/X11/locale/microsoft-cp1251/Compose
lib/X11/locale/microsoft-cp1251/XI18N_OBJS
lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-lib/X11/locale/microsoft-cp1251/Compose
+lib/X11/locale/microsoft-cp1255/Compose
lib/X11/locale/microsoft-cp1255/XI18N_OBJS
lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-lib/X11/locale/microsoft-cp1255/Compose
+lib/X11/locale/microsoft-cp1256/Compose
lib/X11/locale/microsoft-cp1256/XI18N_OBJS
lib/X11/locale/microsoft-cp1256/XLC_LOCALE
-lib/X11/locale/microsoft-cp1256/Compose
+lib/X11/locale/mulelao-1/Compose
lib/X11/locale/mulelao-1/XI18N_OBJS
lib/X11/locale/mulelao-1/XLC_LOCALE
-lib/X11/locale/mulelao-1/Compose
+lib/X11/locale/nokhchi-1/Compose
lib/X11/locale/nokhchi-1/XI18N_OBJS
lib/X11/locale/nokhchi-1/XLC_LOCALE
-lib/X11/locale/nokhchi-1/Compose
+lib/X11/locale/pt_BR.UTF-8/Compose
lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
-lib/X11/locale/pt_BR.UTF-8/Compose
+lib/X11/locale/ru_RU.UTF-8/Compose
lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
-lib/X11/locale/ru_RU.UTF-8/Compose
+lib/X11/locale/tatar-cyr/Compose
lib/X11/locale/tatar-cyr/XI18N_OBJS
lib/X11/locale/tatar-cyr/XLC_LOCALE
-lib/X11/locale/tatar-cyr/Compose
-lib/X11/locale/th_TH/XI18N_OBJS
-lib/X11/locale/th_TH/XLC_LOCALE
-lib/X11/locale/th_TH/Compose
+lib/X11/locale/th_TH.UTF-8/Compose
lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-lib/X11/locale/th_TH.UTF-8/Compose
+lib/X11/locale/th_TH/Compose
+lib/X11/locale/th_TH/XI18N_OBJS
+lib/X11/locale/th_TH/XLC_LOCALE
+lib/X11/locale/tscii-0/Compose
lib/X11/locale/tscii-0/XI18N_OBJS
lib/X11/locale/tscii-0/XLC_LOCALE
-lib/X11/locale/tscii-0/Compose
+lib/X11/locale/vi_VN.tcvn/Compose
lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-lib/X11/locale/vi_VN.tcvn/Compose
+lib/X11/locale/vi_VN.viscii/Compose
lib/X11/locale/vi_VN.viscii/XI18N_OBJS
lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/vi_VN.viscii/Compose
-lib/X11/locale/zh_CN/XI18N_OBJS
-lib/X11/locale/zh_CN/XLC_LOCALE
-lib/X11/locale/zh_CN/Compose
+lib/X11/locale/zh_CN.UTF-8/Compose
+lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+lib/X11/locale/zh_CN.gb18030/Compose
lib/X11/locale/zh_CN.gb18030/XI18N_OBJS
lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
-lib/X11/locale/zh_CN.gb18030/Compose
+lib/X11/locale/zh_CN.gbk/Compose
lib/X11/locale/zh_CN.gbk/XI18N_OBJS
lib/X11/locale/zh_CN.gbk/XLC_LOCALE
-lib/X11/locale/zh_CN.gbk/Compose
-lib/X11/locale/zh_TW/XI18N_OBJS
-lib/X11/locale/zh_TW/XLC_LOCALE
-lib/X11/locale/zh_TW/Compose
-lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_CN.UTF-8/Compose
+lib/X11/locale/zh_CN/Compose
+lib/X11/locale/zh_CN/XI18N_OBJS
+lib/X11/locale/zh_CN/XLC_LOCALE
+lib/X11/locale/zh_HK.UTF-8/Compose
+lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
+lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
+lib/X11/locale/zh_HK.big5/Compose
lib/X11/locale/zh_HK.big5/XI18N_OBJS
lib/X11/locale/zh_HK.big5/XLC_LOCALE
-lib/X11/locale/zh_HK.big5/Compose
+lib/X11/locale/zh_HK.big5hkscs/Compose
lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-lib/X11/locale/zh_HK.big5hkscs/Compose
-lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_HK.UTF-8/Compose
-lib/X11/locale/zh_TW.big5/XI18N_OBJS
-lib/X11/locale/zh_TW.big5/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.UTF-8/Compose
lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
-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
+lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.big5/XI18N_OBJS
+lib/X11/locale/zh_TW.big5/XLC_LOCALE
+lib/X11/locale/zh_TW/Compose
+lib/X11/locale/zh_TW/XI18N_OBJS
+lib/X11/locale/zh_TW/XLC_LOCALE
+lib/libX11-xcb.a
+lib/libX11-xcb.la
+lib/libX11-xcb.so
+lib/libX11-xcb.so.1
+lib/libX11.a
+lib/libX11.la
+lib/libX11.so
+lib/libX11.so.6
+libdata/pkgconfig/x11-xcb.pc
+libdata/pkgconfig/x11.pc
@dirrm lib/X11/locale/zh_TW.big5
-@dirrm lib/X11/locale/zh_HK.UTF-8
+@dirrm lib/X11/locale/zh_TW.UTF-8
+@dirrm lib/X11/locale/zh_TW
@dirrm lib/X11/locale/zh_HK.big5hkscs
@dirrm lib/X11/locale/zh_HK.big5
-@dirrm lib/X11/locale/zh_CN.UTF-8
-@dirrm lib/X11/locale/zh_TW
+@dirrm lib/X11/locale/zh_HK.UTF-8
@dirrm lib/X11/locale/zh_CN.gbk
@dirrm lib/X11/locale/zh_CN.gb18030
+@dirrm lib/X11/locale/zh_CN.UTF-8
@dirrm lib/X11/locale/zh_CN
@dirrm lib/X11/locale/vi_VN.viscii
@dirrm lib/X11/locale/vi_VN.tcvn
@@ -245,15 +228,15 @@ lib/X11/locale/compose.dir
@dirrm lib/X11/locale/microsoft-cp1256
@dirrm lib/X11/locale/microsoft-cp1255
@dirrm lib/X11/locale/microsoft-cp1251
-@dirrm lib/X11/locale/ko_KR.UTF-8
@dirrm lib/X11/locale/koi8-u
@dirrm lib/X11/locale/koi8-r
@dirrm lib/X11/locale/koi8-c
+@dirrm lib/X11/locale/ko_KR.UTF-8
@dirrm lib/X11/locale/ko
+@dirrm lib/X11/locale/ja_JP.UTF-8
@dirrm lib/X11/locale/ja.U90
@dirrm lib/X11/locale/ja.SJIS
@dirrm lib/X11/locale/ja.S90
-@dirrm lib/X11/locale/ja_JP.UTF-8
@dirrm lib/X11/locale/ja.JIS
@dirrm lib/X11/locale/ja
@dirrm lib/X11/locale/iso8859-9e
@@ -279,7 +262,7 @@ lib/X11/locale/compose.dir
@dirrm lib/X11/locale/fi_FI.UTF-8
@dirrm lib/X11/locale/en_US.UTF-8
@dirrm lib/X11/locale/el_GR.UTF-8
-@dirrm lib/X11/locale/C
@dirrm lib/X11/locale/armscii-8
@dirrm lib/X11/locale/am_ET.UTF-8
+@dirrm lib/X11/locale/C
@dirrm lib/X11/locale
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 028d7174a5ad..8a206ab25518 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXScrnSaver
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
index 63ce298845b5..5b98617f6ef9 100644
--- a/x11/libXScrnSaver/distinfo
+++ b/x11/libXScrnSaver/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
+SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322
diff --git a/x11/libXScrnSaver/pkg-descr b/x11/libXScrnSaver/pkg-descr
index 3e2398c91789..16760d1366d4 100644
--- a/x11/libXScrnSaver/pkg-descr
+++ b/x11/libXScrnSaver/pkg-descr
@@ -1,5 +1,4 @@
This package contains libXScrnSaver, the X11 Screen Saver extension
client library.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 40543be06354..73ddb55609bf 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXau
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index 9befc51bb79e..73f4bc42de9e 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
+SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501
diff --git a/x11/libXau/pkg-descr b/x11/libXau/pkg-descr
index 83a3d8fbfcb5..39775c09a06a 100644
--- a/x11/libXau/pkg-descr
+++ b/x11/libXau/pkg-descr
@@ -1,6 +1,3 @@
This package contains a library for the Authorization Protocol for X11.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 0fa753492499..effee3169f91 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXcomposite
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index 6285cb28bddd..48b4eb0d8986 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
+SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715
diff --git a/x11/libXcomposite/pkg-descr b/x11/libXcomposite/pkg-descr
index 312a9789080d..fd273ca8fe72 100644
--- a/x11/libXcomposite/pkg-descr
+++ b/x11/libXcomposite/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Composite extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 4101cf19b9eb..f43ef79f768a 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXcursor
-PORTVERSION= 1.1.10
+PORTVERSION= 1.1.11
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo
index b2154aac90d6..f01f8cc67b72 100644
--- a/x11/libXcursor/distinfo
+++ b/x11/libXcursor/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXcursor-1.1.11.tar.bz2) = a06ef74579e2c06f9490e682b8e7ac915cb5280ee47bb071a2b850637a2bf6fe
+SIZE (xorg/lib/libXcursor-1.1.11.tar.bz2) = 272680
diff --git a/x11/libXcursor/pkg-descr b/x11/libXcursor/pkg-descr
index b8a320199cc3..7d58ee4ec0fa 100644
--- a/x11/libXcursor/pkg-descr
+++ b/x11/libXcursor/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X client-side cursor loading library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 0b3799832d35..f27b13611b89 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXdamage
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index b36c4fc3495f..dfea034c4fcf 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
+SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029
diff --git a/x11/libXdamage/pkg-descr b/x11/libXdamage/pkg-descr
index 3fd9a91201af..b6ad8c195995 100644
--- a/x11/libXdamage/pkg-descr
+++ b/x11/libXdamage/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Damage extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXdmcp/pkg-descr b/x11/libXdmcp/pkg-descr
index cf8ee61e890f..aa366294c69e 100644
--- a/x11/libXdmcp/pkg-descr
+++ b/x11/libXdmcp/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Display Manager Control Protocol library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXevie/pkg-descr b/x11/libXevie/pkg-descr
index a43d9c9d6a03..3e93203c7e25 100644
--- a/x11/libXevie/pkg-descr
+++ b/x11/libXevie/pkg-descr
@@ -1,4 +1,3 @@
This package contains libXevie, the X.Org Xevie library.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index afed4dc10da7..a3a434bbcc6d 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXext
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 2c515cd352d8..cecc9d497106 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXext-1.1.2.tar.bz2) = ac6a0ff69c52c9b6e2096e5f74e22c8b5eef11ade4e30411cffeb7df32fe4f74
+SIZE (xorg/lib/libXext-1.1.2.tar.bz2) = 318937
diff --git a/x11/libXext/pkg-descr b/x11/libXext/pkg-descr
index 08abe8d424fe..a587eb8e51f1 100644
--- a/x11/libXext/pkg-descr
+++ b/x11/libXext/pkg-descr
@@ -1,6 +1,4 @@
+
This package contains the X Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index d25c0db798c7..2a164981cbe0 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -22,4 +22,5 @@ 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
+@dirrmtry include/X11/extensions
+
diff --git a/x11/libXfixes/pkg-descr b/x11/libXfixes/pkg-descr
index 3dbcfe29afb1..b6ab2203dca5 100644
--- a/x11/libXfixes/pkg-descr
+++ b/x11/libXfixes/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Fixes extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 9b81e4cd7ea4..763c84d64d2c 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXi
-PORTVERSION= 1.3
+PORTVERSION= 1.3.2
PORTEPOCH= 1
CATEGORIES= x11
@@ -16,4 +16,74 @@ 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\
+ XGetDeviceButtonMapping.3\
+ XGetDeviceControl.3\
+ XGetDeviceDontPropagateList.3\
+ XGetDeviceFocus.3\
+ XGetDeviceKeyMapping.3 \
+ XGetDeviceModifierMapping.3\
+ XGetDeviceMotionEvents.3\
+ XGetDeviceProperty.3\
+ XGetExtensionVersion.3\
+ XGetFeedbackControl.3\
+ XGetSelectedExtensionEvents.3\
+ XGrabDevice.3\
+ XGrabDeviceButton.3\
+ XGrabDeviceKey.3\
+ XIChangeHierarchy.3\
+ XIChangeProperty.3\
+ XIDefineCursor.3\
+ XIDeleteProperty.3\
+ XIFreeDeviceInfo.3\
+ XIGetClientPointer.3\
+ XIGetFocus.3\
+ XIGetProperty.3\
+ XIGetSelectedEvents.3\
+ XIGrabButton.3 \
+ XIGrabDevice.3\
+ XIGrabEnter.3\
+ XIGrabFocusIn.3\
+ XIGrabKeycode.3\
+ XIListProperties.3\
+ XIQueryDevice.3\
+ XIQueryPointer.3\
+ XIQueryVersion.3\
+ XISelectEvents.3\
+ XISetClientPointer.3\
+ XISetFocus.3\
+ XIUndefineCursor.3\
+ XIUngrabButton.3\
+ XIUngrabDevice.3 \
+ XIUngrabEnter.3 \
+ XIUngrabFocusIn.3 \
+ XIUngrabKeycode.3 \
+ XIWarpPointer.3 \
+ XListDeviceProperties.3 \
+ XListInputDevices.3 \
+ XOpenDevice.3 \
+ XQueryDeviceState.3 \
+ XSelectExtensionEvent.3\
+ XSendExtensionEvent.3\
+ XSetDeviceButtonMapping.3\
+ XSetDeviceFocus.3\
+ XSetDeviceMode.3\
+ XSetDeviceModifierMapping.3 \
+ XSetDeviceValuators.3 \
+ XUngrabDevice.3 \
+ XUngrabDeviceButton.3 \
+ XUngrabDeviceKey.3
+
.include <bsd.port.mk>
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 02a33ca8c6ae..b19bf15a8ed5 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libXi-1.3.2.tar.bz2) = a6034b57ab65fd89584d23403f613c1e1ad1679614fa8562b7438880596ddc3a
+SIZE (xorg/lib/libXi-1.3.2.tar.bz2) = 362340
diff --git a/x11/libXi/pkg-descr b/x11/libXi/pkg-descr
index 418974d6b783..99e89d8db0b2 100644
--- a/x11/libXi/pkg-descr
+++ b/x11/libXi/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Input extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXinerama/pkg-descr b/x11/libXinerama/pkg-descr
index 08abe8d424fe..b6967f6c07d8 100644
--- a/x11/libXinerama/pkg-descr
+++ b/x11/libXinerama/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXprintAppUtil/pkg-descr b/x11/libXprintAppUtil/pkg-descr
index 39649db329d0..15ffa49b4198 100644
--- a/x11/libXprintAppUtil/pkg-descr
+++ b/x11/libXprintAppUtil/pkg-descr
@@ -1,5 +1,2 @@
This package contains libXprintAppUtil, a group of Xprint application
utility routines for X.Org.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/libXprintUtil/pkg-descr b/x11/libXprintUtil/pkg-descr
index 0f4ee01be5e7..36c09eb2e4e7 100644
--- a/x11/libXprintUtil/pkg-descr
+++ b/x11/libXprintUtil/pkg-descr
@@ -1,5 +1,4 @@
This package contains libXprintUtil, a group of Xprint application utility
routines for X.Org.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/libXrandr/pkg-descr b/x11/libXrandr/pkg-descr
index a33730683f80..17b598b784a4 100644
--- a/x11/libXrandr/pkg-descr
+++ b/x11/libXrandr/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Resize and Rotate extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXres/pkg-descr b/x11/libXres/pkg-descr
index 69153de5975b..5d166772eb00 100644
--- a/x11/libXres/pkg-descr
+++ b/x11/libXres/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Resource usage library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXtrans/pkg-descr b/x11/libXtrans/pkg-descr
index 5c55568029db..2c579436443c 100644
--- a/x11/libXtrans/pkg-descr
+++ b/x11/libXtrans/pkg-descr
@@ -2,6 +2,3 @@ This package contains the code for a network API translation layer to insulate X
applications and libraries from OS network vagaries
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXtst/pkg-descr b/x11/libXtst/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXtst/pkg-descr
+++ b/x11/libXtst/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXv/pkg-descr b/x11/libXv/pkg-descr
index cbd30172204a..684ef90fbfad 100644
--- a/x11/libXv/pkg-descr
+++ b/x11/libXv/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Video Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXvMC/pkg-descr b/x11/libXvMC/pkg-descr
index cbd30172204a..684ef90fbfad 100644
--- a/x11/libXvMC/pkg-descr
+++ b/x11/libXvMC/pkg-descr
@@ -1,6 +1,3 @@
This package contains the X Video Extension library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXxf86dga/pkg-descr b/x11/libXxf86dga/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXxf86dga/pkg-descr
+++ b/x11/libXxf86dga/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXxf86misc/pkg-descr b/x11/libXxf86misc/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXxf86misc/pkg-descr
+++ b/x11/libXxf86misc/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libXxf86vm/pkg-descr b/x11/libXxf86vm/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libXxf86vm/pkg-descr
+++ b/x11/libXxf86vm/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 8870929611ef..5ec77e3ad23d 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libdmx
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo
index bbe5bd0072b1..2d59bf47f7b1 100644
--- a/x11/libdmx/distinfo
+++ b/x11/libdmx/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18
+SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460
diff --git a/x11/libdmx/pkg-descr b/x11/libdmx/pkg-descr
index 4859ea880b7c..8a6f1e8aafa7 100644
--- a/x11/libdmx/pkg-descr
+++ b/x11/libdmx/pkg-descr
@@ -1,6 +1,3 @@
This package contains Distributed Multihead X extension library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/liboldX/pkg-descr b/x11/liboldX/pkg-descr
index 76f5a9c988ea..5db771e85328 100644
--- a/x11/liboldX/pkg-descr
+++ b/x11/liboldX/pkg-descr
@@ -1,6 +1,3 @@
This package contains the old X library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/libxkbfile/pkg-descr b/x11/libxkbfile/pkg-descr
index f8549ce6ce20..f37b7e0d1c16 100644
--- a/x11/libxkbfile/pkg-descr
+++ b/x11/libxkbfile/pkg-descr
@@ -1,6 +1,3 @@
This package contains the XKB file library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/libxkbui/pkg-descr b/x11/libxkbui/pkg-descr
index bb040797feab..17905a8f40b7 100644
--- a/x11/libxkbui/pkg-descr
+++ b/x11/libxkbui/pkg-descr
@@ -1,6 +1,3 @@
This package contains the xkbui library.
WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/listres/pkg-descr b/x11/listres/pkg-descr
index 3a73d2ec5909..0333ad743df5 100644
--- a/x11/listres/pkg-descr
+++ b/x11/listres/pkg-descr
@@ -1,5 +1,2 @@
This package contains listres, a program that generates a list of a
widget's resource database.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/luit/pkg-descr b/x11/luit/pkg-descr
index 0bed19e2c820..c6c4c4cbc656 100644
--- a/x11/luit/pkg-descr
+++ b/x11/luit/pkg-descr
@@ -1,5 +1,2 @@
This package contains luit, a filter than can be run between an arbitrary
application and a UTF-8 terminal emulator.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index c3e8bf42b8ef..62d05747f7e7 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pixman
-PORTVERSION= 0.18.4
+PORTVERSION= 0.21.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index f655c448011e..938922784d3d 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/lib/pixman-0.18.4.tar.bz2) = c1d69aaddba8c1e046d26ac125da95bf
-SHA256 (xorg/lib/pixman-0.18.4.tar.bz2) = 399d2084f9f94cf51950a6a34edf8badd43f96f48039ff7a2e9193628eae30f1
-SIZE (xorg/lib/pixman-0.18.4.tar.bz2) = 421626
+SHA256 (xorg/lib/pixman-0.21.4.tar.bz2) = 7809f8aa7dcd99bc0e3a12eef65266d34e1f2988df4c814e5f747ddceed22ddf
+SIZE (xorg/lib/pixman-0.21.4.tar.bz2) = 453663
diff --git a/x11/pixman/pkg-descr b/x11/pixman/pkg-descr
index a2150dc2411f..20e94617b65d 100644
--- a/x11/pixman/pkg-descr
+++ b/x11/pixman/pkg-descr
@@ -1,6 +1,3 @@
This package contains the pixman library.
WWW: http://www.freedesktop.org/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/printproto/pkg-descr b/x11/printproto/pkg-descr
index c363d52f32fc..354acca045a8 100644
--- a/x11/printproto/pkg-descr
+++ b/x11/printproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Print extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
index 19af07408460..532c6da5e1ee 100644
--- a/x11/randrproto/Makefile
+++ b/x11/randrproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= randrproto
-PORTVERSION= 1.3.1
+PORTVERSION= 1.3.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
index 66c3ba96f463..52245621dee0 100644
--- a/x11/randrproto/distinfo
+++ b/x11/randrproto/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71
+SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915
diff --git a/x11/randrproto/pkg-descr b/x11/randrproto/pkg-descr
index 3b5914edab2a..84d2dc167f91 100644
--- a/x11/randrproto/pkg-descr
+++ b/x11/randrproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org Randr extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/recordproto/pkg-descr b/x11/recordproto/pkg-descr
index 129d2324260c..6687a1c2f1c0 100644
--- a/x11/recordproto/pkg-descr
+++ b/x11/recordproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org RECORD extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/renderproto/pkg-descr b/x11/renderproto/pkg-descr
index 813b21cb5def..d8c290078607 100644
--- a/x11/renderproto/pkg-descr
+++ b/x11/renderproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org RenderProto protocol headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
index a0ffa9062a10..fc1b1b080703 100644
--- a/x11/rgb/Makefile
+++ b/x11/rgb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= rgb
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/rgb/distinfo b/x11/rgb/distinfo
index aa594a1f8330..5a882ca16fcd 100644
--- a/x11/rgb/distinfo
+++ b/x11/rgb/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/rgb-1.0.4.tar.bz2) = 80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1
+SIZE (xorg/app/rgb-1.0.4.tar.bz2) = 121558
diff --git a/x11/rgb/pkg-descr b/x11/rgb/pkg-descr
index 949c3fd4e280..2692c544f6cd 100644
--- a/x11/rgb/pkg-descr
+++ b/x11/rgb/pkg-descr
@@ -1,6 +1,3 @@
This package contains showrgb, a program that reads an rgb color-name
database compiled for use with the dbm database routines and converts it
back to source form, printing the result to standard output.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/rstart/pkg-descr b/x11/rstart/pkg-descr
index 15df1d2064c3..169ca1986f38 100644
--- a/x11/rstart/pkg-descr
+++ b/x11/rstart/pkg-descr
@@ -1,5 +1,2 @@
This package contains rstart, a sample implementation of a Remote Start
client.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/scrnsaverproto/pkg-descr b/x11/scrnsaverproto/pkg-descr
index 1c4a92a44911..a5019d65d5f6 100644
--- a/x11/scrnsaverproto/pkg-descr
+++ b/x11/scrnsaverproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org ScrnSaver extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index cfef4d698b20..61fd06101552 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= sessreg
-PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.0.6
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
index 226ac2586014..a1ff089d362b 100644
--- a/x11/sessreg/distinfo
+++ b/x11/sessreg/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/sessreg-1.0.6.tar.bz2) = 73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190
+SIZE (xorg/app/sessreg-1.0.6.tar.bz2) = 113033
diff --git a/x11/sessreg/pkg-descr b/x11/sessreg/pkg-descr
index 64ada8d0511a..b61ec06c753a 100644
--- a/x11/sessreg/pkg-descr
+++ b/x11/sessreg/pkg-descr
@@ -1,5 +1,2 @@
This package contains sessreg, which is a simple program for managing
utmp/wtmp entries for xdm sessions.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index c45ae6aa94a4..a30a178e971a 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= setxkbmap
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/setxkbmap/distinfo b/x11/setxkbmap/distinfo
index a3456a7036f7..89801d49b7ec 100644
--- a/x11/setxkbmap/distinfo
+++ b/x11/setxkbmap/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/setxkbmap-1.2.0.tar.bz2) = 999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39
+SIZE (xorg/app/setxkbmap-1.2.0.tar.bz2) = 112465
diff --git a/x11/setxkbmap/pkg-descr b/x11/setxkbmap/pkg-descr
index b4016ffb56c1..ee02809c99e3 100644
--- a/x11/setxkbmap/pkg-descr
+++ b/x11/setxkbmap/pkg-descr
@@ -1,5 +1,2 @@
This package contains setxkbmp, a program for setting the keyboard using
the X Keyboard Extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/smproxy/pkg-descr b/x11/smproxy/pkg-descr
index 98f9ecdcda45..26f328c6b8d8 100644
--- a/x11/smproxy/pkg-descr
+++ b/x11/smproxy/pkg-descr
@@ -1,5 +1,2 @@
This package contains smproxy, a Session Manager Proxy for the X Window
System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/videoproto/pkg-descr b/x11/videoproto/pkg-descr
index 94edb581eb84..0e4175a2ef6a 100644
--- a/x11/videoproto/pkg-descr
+++ b/x11/videoproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org Video extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/viewres/pkg-descr b/x11/viewres/pkg-descr
index b447f4e61a28..d334bb9e5464 100644
--- a/x11/viewres/pkg-descr
+++ b/x11/viewres/pkg-descr
@@ -1,5 +1,2 @@
This package contains viewres, a graphical class browser that displays
a tree showing the widget class hierarchy of the Athena Widget Set.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/wrapper/pkg-descr b/x11/wrapper/pkg-descr
index fb36c27e2ecc..735a58d1b123 100644
--- a/x11/wrapper/pkg-descr
+++ b/x11/wrapper/pkg-descr
@@ -1,6 +1,6 @@
This program runs an X server after sanity-checking the environment
and any options passed to it. It is meant to enhance security on
-multi-user systems running XFree86 4 or the X11 server from X.Org,
+multi-user systems running XFree86 4 or the X11 server from x.org,
where the ability to use a startx script is needed. If you have
XFree86 3, do not install this: you do not need it and it will not
work. If you have no untrusted users or always run the X server
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index f77321245bf2..ccc60ea2f134 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x11perf
-PORTVERSION= 1.5.1
+PORTVERSION= 1.5.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo
index 6563d4ec7c86..19afb3e2534b 100644
--- a/x11/x11perf/distinfo
+++ b/x11/x11perf/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/x11perf-1.5.3.tar.bz2) = 394d7355afe7f3b054ce6f30db78794c6305c6593d48b7fb86a9c89d9d9e21bd
+SIZE (xorg/app/x11perf-1.5.3.tar.bz2) = 161309
diff --git a/x11/x11perf/pkg-descr b/x11/x11perf/pkg-descr
index af297f6ae226..9e994ca2dc03 100644
--- a/x11/x11perf/pkg-descr
+++ b/x11/x11perf/pkg-descr
@@ -1,4 +1 @@
This package contains x11perf, an X11 server performance test program.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 802701e66748..5d8cb777915d 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xauth
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo
index 015228ddeacb..719ce87477e9 100644
--- a/x11/xauth/distinfo
+++ b/x11/xauth/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xauth-1.0.5.tar.bz2) = 6d139500ff1daf806525adf071f8c1778ad138a0378c73ea831ad18847ad746c
+SIZE (xorg/app/xauth-1.0.5.tar.bz2) = 129568
diff --git a/x11/xauth/pkg-descr b/x11/xauth/pkg-descr
index 5d60b7db4126..9346a76dc0fe 100644
--- a/x11/xauth/pkg-descr
+++ b/x11/xauth/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org X authority file utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
index 3b9f4d1c56d3..b62dabda66b1 100644
--- a/x11/xbiff/Makefile
+++ b/x11/xbiff/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xbiff
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xbiff/distinfo b/x11/xbiff/distinfo
index 5e3c46290e31..c344463238e7 100644
--- a/x11/xbiff/distinfo
+++ b/x11/xbiff/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xbiff-1.0.3.tar.bz2) = aa1db4f31f7afcfe131bda7ff6e380ff7de41cf1a7009464783043c817c47ce8
+SIZE (xorg/app/xbiff-1.0.3.tar.bz2) = 116043
diff --git a/x11/xbiff/pkg-descr b/x11/xbiff/pkg-descr
index ad2c037510bc..917fe929b8ce 100644
--- a/x11/xbiff/pkg-descr
+++ b/x11/xbiff/pkg-descr
@@ -1,6 +1,3 @@
This package contains xbiff, which displays a little image of a mailbox in
the X Window System. The flag on the mailbox is down when there is no mail,
and the flag goes up when new mail arrives.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index c8c770ae7117..dc00dbc218d4 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcalc
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcalc/distinfo b/x11/xcalc/distinfo
index 7103d0cdb4a5..3205cea89ad8 100644
--- a/x11/xcalc/distinfo
+++ b/x11/xcalc/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xcalc-1.0.4.1.tar.bz2) = e21f3b09a5ffdaafced32fdccd94d48351c95e5f8a2d7cb036d61dd18f4e26b6
+SIZE (xorg/app/xcalc-1.0.4.1.tar.bz2) = 124184
diff --git a/x11/xcalc/pkg-descr b/x11/xcalc/pkg-descr
index 8183cbf9c0b9..0204b95ad523 100644
--- a/x11/xcalc/pkg-descr
+++ b/x11/xcalc/pkg-descr
@@ -1,5 +1,2 @@
This package contains xcalc, a scientific calculator desktop accessory
for the X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xclipboard/pkg-descr b/x11/xclipboard/pkg-descr
index 3dbd7590b489..58e411e2c0f6 100644
--- a/x11/xclipboard/pkg-descr
+++ b/x11/xclipboard/pkg-descr
@@ -1,4 +1 @@
This package contains xclipboard, an X clipboard client.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xcmiscproto/pkg-descr b/x11/xcmiscproto/pkg-descr
index 2eb54f046456..77202a272594 100644
--- a/x11/xcmiscproto/pkg-descr
+++ b/x11/xcmiscproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XCMisc extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xcmsdb/pkg-descr b/x11/xcmsdb/pkg-descr
index 4c1b31bb4e62..44cf0d1adbcf 100644
--- a/x11/xcmsdb/pkg-descr
+++ b/x11/xcmsdb/pkg-descr
@@ -1,5 +1,2 @@
This package contains xcmsdb, a Device Color Characterization utility
for the X Color Management System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index 9be64372edb3..55d3ccad6181 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xconsole
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xconsole/distinfo b/x11/xconsole/distinfo
index ee19b97a57da..451c17b472f2 100644
--- a/x11/xconsole/distinfo
+++ b/x11/xconsole/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xconsole-1.0.3.tar.bz2) = 0e1a3110bebabecc2897d67a973526b0
-SHA256 (xorg/app/xconsole-1.0.3.tar.bz2) = 1b1ec25fefad34f5c33c74474358c1f5a8702d8c04defc854826bccb7a46bc45
-SIZE (xorg/app/xconsole-1.0.3.tar.bz2) = 98733
+SHA256 (xorg/app/xconsole-1.0.4.tar.bz2) = 5643e90bf7bf77369e67f3a0a982a4809b5bd2d9a36f02a59c79de77c9d6648e
+SIZE (xorg/app/xconsole-1.0.4.tar.bz2) = 115082
diff --git a/x11/xconsole/pkg-descr b/x11/xconsole/pkg-descr
index 119267f85533..a4c5f6038fc0 100644
--- a/x11/xconsole/pkg-descr
+++ b/x11/xconsole/pkg-descr
@@ -1,5 +1,2 @@
This package contains xconsole, a utility for monitoring system console
messages with X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xcursorgen/pkg-descr b/x11/xcursorgen/pkg-descr
index 47fbf37de9a0..be67a1b6c50b 100644
--- a/x11/xcursorgen/pkg-descr
+++ b/x11/xcursorgen/pkg-descr
@@ -1,5 +1,2 @@
This package contains xcursorgen, a program for creating an X cursor file
from a collection of PNG images.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xdbedizzy/pkg-descr b/x11/xdbedizzy/pkg-descr
index 686fb0ee2f75..d930d33ae80f 100644
--- a/x11/xdbedizzy/pkg-descr
+++ b/x11/xdbedizzy/pkg-descr
@@ -1,5 +1,2 @@
This package contains xdbedizzy, a demo of DBE creating a double buffered
spinning scene.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xditview/pkg-descr b/x11/xditview/pkg-descr
index 325a228281ca..2048ef4f12bf 100644
--- a/x11/xditview/pkg-descr
+++ b/x11/xditview/pkg-descr
@@ -1,5 +1,2 @@
This package contains xditview, a program for displaying ditroff output
on an X display.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 091bba4eebf8..f6c623c39ed7 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -39,5 +39,7 @@ post-install:
.for f in ${CFFILES}
${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
.endfor
+ ${MKDIR} /var/lib/xdm/authdir
+ ${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
.include <bsd.port.mk>
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
index ba384c60115a..dcdc249da93b 100644
--- a/x11/xdm/pkg-plist
+++ b/x11/xdm/pkg-plist
@@ -1,5 +1,6 @@
bin/xdm
bin/xdmshell
+lib/X11/xdm/authdir
lib/X11/xdm/chooser
lib/X11/xdm/libXdmGreet.a
lib/X11/xdm/libXdmGreet.la
@@ -40,8 +41,13 @@ share/X11/app-defaults/Chooser
@exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
@exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
@exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
+@exec mkdir -p /var/lib/xdm/authdir
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
+@unexec rm -f /var/lib/xdm/authdir/authfiles/* 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir/authfiles 2>/dev/null || true
+@unexec rmdir /var/lib/xdm/authdir 2>/dev/null
+@unexec rmdir /var/lib/xdm 2>/dev/null
@dirrm lib/X11/xdm/pixmaps
@dirrm lib/X11/xdm
@dirrm %%EXAMPLESDIR%%
diff --git a/x11/xdpyinfo/pkg-descr b/x11/xdpyinfo/pkg-descr
index 6e6c88be7042..1ab1193022b3 100644
--- a/x11/xdpyinfo/pkg-descr
+++ b/x11/xdpyinfo/pkg-descr
@@ -1,5 +1,2 @@
This package contains xdpyinfo, which is a utility for displaying
information about an X server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xdriinfo/pkg-descr b/x11/xdriinfo/pkg-descr
index 933072d04bc2..2330f01cb6d0 100644
--- a/x11/xdriinfo/pkg-descr
+++ b/x11/xdriinfo/pkg-descr
@@ -1,5 +1,2 @@
This package contains xdriinfo, an utility that can be used to query
configuration information of direct rendering devices.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index 784daadd393a..d588e03f1458 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xedit
-PORTVERSION= 1.1.2
+PORTVERSION= 1.2.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo
index f73ad9bcdea3..49032ae2b25c 100644
--- a/x11/xedit/distinfo
+++ b/x11/xedit/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xedit-1.1.2.tar.bz2) = 67193be728414d45a1922911e6437991
-SHA256 (xorg/app/xedit-1.1.2.tar.bz2) = a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f
-SIZE (xorg/app/xedit-1.1.2.tar.bz2) = 484563
+SHA256 (xorg/app/xedit-1.2.0.tar.bz2) = 6cfe022c2ba42cd3f1acc64ead49f302f766b77f44a01ce3842ad25f62f65d8a
+SIZE (xorg/app/xedit-1.2.0.tar.bz2) = 498383
diff --git a/x11/xedit/pkg-descr b/x11/xedit/pkg-descr
index fb8c2034c470..2b8ff8f26ea6 100644
--- a/x11/xedit/pkg-descr
+++ b/x11/xedit/pkg-descr
@@ -1,4 +1,2 @@
This package contains xedit, a simple text editor for the X Window System.
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index 256d130881f4..6556622cce0f 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xev
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xev/distinfo b/x11/xev/distinfo
index 97da9d85d17b..99e8860a89ad 100644
--- a/x11/xev/distinfo
+++ b/x11/xev/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xev-1.1.0.tar.bz2) = 3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6
+SIZE (xorg/app/xev-1.1.0.tar.bz2) = 110850
diff --git a/x11/xev/pkg-descr b/x11/xev/pkg-descr
index eddd0caccffc..ab0c0cbe84f6 100644
--- a/x11/xev/pkg-descr
+++ b/x11/xev/pkg-descr
@@ -1,4 +1 @@
This package contains xev, which is a application that monitors X events.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xextproto/pkg-descr b/x11/xextproto/pkg-descr
index f9c9a9995397..237adba33dfd 100644
--- a/x11/xextproto/pkg-descr
+++ b/x11/xextproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XExt extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index 3ec4359bd1e5..2054a22b8386 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xeyes
-PORTVERSION= 1.1.0
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xeyes/distinfo b/x11/xeyes/distinfo
index e27d47e38cc2..cf1560098824 100644
--- a/x11/xeyes/distinfo
+++ b/x11/xeyes/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xeyes-1.1.1.tar.bz2) = 975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521
+SIZE (xorg/app/xeyes-1.1.1.tar.bz2) = 113757
diff --git a/x11/xeyes/pkg-descr b/x11/xeyes/pkg-descr
index e7d7d4fd56a4..093fcda4e6e5 100644
--- a/x11/xeyes/pkg-descr
+++ b/x11/xeyes/pkg-descr
@@ -1,4 +1 @@
This package contains xeyes, which is a "follow the mouse" X demo application.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86dga/pkg-descr b/x11/xf86dga/pkg-descr
index 2f3628cea264..0c4b098b7f26 100644
--- a/x11/xf86dga/pkg-descr
+++ b/x11/xf86dga/pkg-descr
@@ -1,5 +1,2 @@
This package contains dga, a simple test client for the XFree86-DGA
extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86dgaproto/pkg-descr b/x11/xf86dgaproto/pkg-descr
index 0d54abac204b..b7174fdf2905 100644
--- a/x11/xf86dgaproto/pkg-descr
+++ b/x11/xf86dgaproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XFree86-DGA extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xf86driproto/pkg-descr b/x11/xf86driproto/pkg-descr
index 8ccf4c7141ff..d8418631cb7c 100644
--- a/x11/xf86driproto/pkg-descr
+++ b/x11/xf86driproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XFree86-DRI extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xf86miscproto/pkg-descr b/x11/xf86miscproto/pkg-descr
index 59d4ff755432..ec2ddfeb1023 100644
--- a/x11/xf86miscproto/pkg-descr
+++ b/x11/xf86miscproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org XFree86-Misc extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86rushproto/pkg-descr b/x11/xf86rushproto/pkg-descr
index 4add51bc469c..802b9e51f153 100644
--- a/x11/xf86rushproto/pkg-descr
+++ b/x11/xf86rushproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org XFree86-Rush extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xf86vidmodeproto/pkg-descr b/x11/xf86vidmodeproto/pkg-descr
index 872e3328e990..27fc696e6120 100644
--- a/x11/xf86vidmodeproto/pkg-descr
+++ b/x11/xf86vidmodeproto/pkg-descr
@@ -1,4 +1,3 @@
This package contains X.Org XFree86-VidModeExtension extension headers.
-- Joel Dahl
-joel@FreeBSD.org
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/xfd/pkg-descr b/x11/xfd/pkg-descr
index 9c764d197c92..6d30b6ba8d4f 100644
--- a/x11/xfd/pkg-descr
+++ b/x11/xfd/pkg-descr
@@ -1,5 +1,2 @@
This package contains xfd, an applications used for displying all
characters in an X font.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xfindproxy/pkg-descr b/x11/xfindproxy/pkg-descr
index 63e6fd154be7..1108dff9ecf8 100644
--- a/x11/xfindproxy/pkg-descr
+++ b/x11/xfindproxy/pkg-descr
@@ -1,5 +1,2 @@
This package contains xfindproxy, a program for locating available
proxy services.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xfwp/pkg-descr b/x11/xfwp/pkg-descr
index e2cda8002b11..edbaf1a987f5 100644
--- a/x11/xfwp/pkg-descr
+++ b/x11/xfwp/pkg-descr
@@ -1,4 +1 @@
This package contains the X firewall proxy (xfwp).
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index 4a4d44108d33..c8233aba0309 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xgamma
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xgamma/distinfo b/x11/xgamma/distinfo
index 8b728ea30b72..2674a528fc94 100644
--- a/x11/xgamma/distinfo
+++ b/x11/xgamma/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xgamma-1.0.4.tar.bz2) = 7dc8334882a060bcc90042bceac5132dd87d5acc8d043b16311ef2134aea8e16
+SIZE (xorg/app/xgamma-1.0.4.tar.bz2) = 104836
diff --git a/x11/xgamma/pkg-descr b/x11/xgamma/pkg-descr
index 9f19276b41cc..d016cfc2f608 100644
--- a/x11/xgamma/pkg-descr
+++ b/x11/xgamma/pkg-descr
@@ -1,5 +1,2 @@
This package contains xgamma, a tool for altering the gamma correction
through the X server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xgc/pkg-descr b/x11/xgc/pkg-descr
index 9d294688031a..9a64a07f94aa 100644
--- a/x11/xgc/pkg-descr
+++ b/x11/xgc/pkg-descr
@@ -1,5 +1,2 @@
This package contains xgc, which is a program that demonstrates various
features of the X graphics primitives.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index ce9c24e93e4d..0f192b8b9bb6 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xhost
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xhost/distinfo b/x11/xhost/distinfo
index ee8a79ac98df..55e9b2c92393 100644
--- a/x11/xhost/distinfo
+++ b/x11/xhost/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xhost-1.0.4.tar.bz2) = 5e02c06caeb7a258f3621bf11459a7820cfeaf9bf269c1f8da86d7071346a594
+SIZE (xorg/app/xhost-1.0.4.tar.bz2) = 114826
diff --git a/x11/xhost/pkg-descr b/x11/xhost/pkg-descr
index 7ef86f82225d..4053e3e2f91a 100644
--- a/x11/xhost/pkg-descr
+++ b/x11/xhost/pkg-descr
@@ -1,5 +1,2 @@
This package contains xhost, a server access control program for the
X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xineramaproto/pkg-descr b/x11/xineramaproto/pkg-descr
index 2ef9ec7ac930..bbaba369a5e0 100644
--- a/x11/xineramaproto/pkg-descr
+++ b/x11/xineramaproto/pkg-descr
@@ -1,4 +1 @@
This package contains X.Org Xinerama extension headers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xinit/pkg-descr b/x11/xinit/pkg-descr
index 495f443cc3b3..2676f6a4a1fd 100644
--- a/x11/xinit/pkg-descr
+++ b/x11/xinit/pkg-descr
@@ -1,4 +1 @@
This package contains xinit, the X Window System initializer.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 37386c365a1f..99d36910096f 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xinput
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo
index 9dcf0b7a37ef..8a27efadce2a 100644
--- a/x11/xinput/distinfo
+++ b/x11/xinput/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xinput-1.5.3.tar.bz2) = 6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76
+SIZE (xorg/app/xinput-1.5.3.tar.bz2) = 131585
diff --git a/x11/xkbcomp/pkg-descr b/x11/xkbcomp/pkg-descr
index fce557314593..074524733411 100644
--- a/x11/xkbcomp/pkg-descr
+++ b/x11/xkbcomp/pkg-descr
@@ -1,4 +1 @@
This package contains xkbcomp, the X.Org keymap compiler.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xkbevd/pkg-descr b/x11/xkbevd/pkg-descr
index d93652d67c0f..70ed918dff06 100644
--- a/x11/xkbevd/pkg-descr
+++ b/x11/xkbevd/pkg-descr
@@ -1,4 +1 @@
This package contains xkbevd, the XKB event daemon.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xkbprint/pkg-descr b/x11/xkbprint/pkg-descr
index ce84f5663f3d..c4595ec511a1 100644
--- a/x11/xkbprint/pkg-descr
+++ b/x11/xkbprint/pkg-descr
@@ -1,5 +1,2 @@
This package contains xkbprint, an utility for printing an XKB keyboard
description.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xkeyboard-config/pkg-descr b/x11/xkeyboard-config/pkg-descr
index e1b900241aa0..ad19d12034ec 100644
--- a/x11/xkeyboard-config/pkg-descr
+++ b/x11/xkeyboard-config/pkg-descr
@@ -5,6 +5,3 @@ data for X Window System implementations (free, open source
and commercial). The project is targetted to XKB-based systems.
WWW: http://www.freedesktop.org/wiki/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index 758b6f66fe91..812062cc824b 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkill
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkill/distinfo b/x11/xkill/distinfo
index 65e83cbf40ad..12e544ce2075 100644
--- a/x11/xkill/distinfo
+++ b/x11/xkill/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xkill-1.0.3.tar.bz2) = bd8307272a648ca76a266e5c1111384c8ed9367c6a8f1a5be844a5b5300881a9
+SIZE (xorg/app/xkill-1.0.3.tar.bz2) = 107790
diff --git a/x11/xkill/pkg-descr b/x11/xkill/pkg-descr
index 38143a4052c7..ceee5338e887 100644
--- a/x11/xkill/pkg-descr
+++ b/x11/xkill/pkg-descr
@@ -1,5 +1,2 @@
This package contians xkill, which is a utility for forcing the X server
to close connections to clients.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xload/pkg-descr b/x11/xload/pkg-descr
index 800b8523dcf0..61da84f2a4f9 100644
--- a/x11/xload/pkg-descr
+++ b/x11/xload/pkg-descr
@@ -1,5 +1,2 @@
This pckage contains xload, the X Window System system load average
display application.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xlogo/pkg-descr b/x11/xlogo/pkg-descr
index c93a929dc517..dca5fe283b84 100644
--- a/x11/xlogo/pkg-descr
+++ b/x11/xlogo/pkg-descr
@@ -1,4 +1 @@
This package contains xlogo, which displays the X Window System logo.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xlsatoms/pkg-descr b/x11/xlsatoms/pkg-descr
index 7f7540df4f4d..7c0ba5fc62ff 100644
--- a/x11/xlsatoms/pkg-descr
+++ b/x11/xlsatoms/pkg-descr
@@ -1,5 +1,2 @@
This package contains xlsatoms, an application for listing interned
atoms defined on server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xlsclients/pkg-descr b/x11/xlsclients/pkg-descr
index ea77ec583455..4260e2348c1e 100644
--- a/x11/xlsclients/pkg-descr
+++ b/x11/xlsclients/pkg-descr
@@ -1,5 +1,2 @@
This package contains xlsclients, which is a utility for listing information
about the client applications running on a display.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmag/pkg-descr b/x11/xmag/pkg-descr
index 585549a3d1b2..ae86ccc48fe0 100644
--- a/x11/xmag/pkg-descr
+++ b/x11/xmag/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmag, a screen magnifying application for the
X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xman/pkg-descr b/x11/xman/pkg-descr
index ca408e1c319e..610bc23acda6 100644
--- a/x11/xman/pkg-descr
+++ b/x11/xman/pkg-descr
@@ -1,5 +1,2 @@
This package contains xman, a manual page display program for the X
Window System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmessage/pkg-descr b/x11/xmessage/pkg-descr
index 965f1f9264a3..e4651571fc37 100644
--- a/x11/xmessage/pkg-descr
+++ b/x11/xmessage/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmessage, an application for displaying messages
or queries in a X window.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmh/pkg-descr b/x11/xmh/pkg-descr
index a7c2f0ee184c..3b0d5f0390da 100644
--- a/x11/xmh/pkg-descr
+++ b/x11/xmh/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmh, a graphical user interface to the MH Message
Handling System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmodmap/pkg-descr b/x11/xmodmap/pkg-descr
index 45ddab88b0bd..b4ee30821975 100644
--- a/x11/xmodmap/pkg-descr
+++ b/x11/xmodmap/pkg-descr
@@ -1,5 +1,2 @@
This package contains xmodmap, which is a program for editing and displaying
the keyboard modifier map and keymap table in X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index 34199cc2900e..5b1a7c3cd96e 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmore
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmore/distinfo b/x11/xmore/distinfo
index eedec05a47fb..793dd72629c6 100644
--- a/x11/xmore/distinfo
+++ b/x11/xmore/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/app/xmore-1.0.1.tar.bz2) = d36e918dce779a9d207b7a266f4e87c8
-SHA256 (xorg/app/xmore-1.0.1.tar.bz2) = 653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527
-SIZE (xorg/app/xmore-1.0.1.tar.bz2) = 92060
+SHA256 (xorg/app/xmore-1.0.2.tar.bz2) = 2a13f97891a3fd497074acc8ac8069f8583add5db4d3bf34a5da6a92bd61b9e2
+SIZE (xorg/app/xmore-1.0.2.tar.bz2) = 107340
diff --git a/x11/xmore/pkg-descr b/x11/xmore/pkg-descr
index 6c19ace2cbb3..e4aef5933c86 100644
--- a/x11/xmore/pkg-descr
+++ b/x11/xmore/pkg-descr
@@ -1,5 +1,2 @@
This package contains the xmore plain text display program for the X Window
System.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index c9a62097a2ca..b54bfac28427 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-apps
-PORTVERSION= 7.5
-PORTREVISION= 1
+PORTVERSION= 7.5.1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -24,7 +23,7 @@ COMPONENTS= appres bitmap xf86dga:dga iceauth luit \
xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \
xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \
xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \
- xwud
+ xwud xmessage
# These three are added for convenience purposes only.
COMPONENTS+= x11-wm/twm:twm x11-clocks/xclock:xclock xinit xterm
diff --git a/x11/xorg-apps/pkg-descr b/x11/xorg-apps/pkg-descr
index bbe7fcfb5556..4026a75c33bc 100644
--- a/x11/xorg-apps/pkg-descr
+++ b/x11/xorg-apps/pkg-descr
@@ -1,6 +1,3 @@
This meta-package installs all X.Org applications.
WWW: http://www.x.org/
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 05c3301dbb56..ded7612f038f 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-libraries
-PORTVERSION= 7.5
+PORTVERSION= 7.5.1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg-libraries/pkg-descr b/x11/xorg-libraries/pkg-descr
index dcd8e1cf3595..0f06964c6ebe 100644
--- a/x11/xorg-libraries/pkg-descr
+++ b/x11/xorg-libraries/pkg-descr
@@ -1,6 +1,3 @@
This package contains X.Org shared libraries, headers, and related files.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index ef934294dbea..9e00d67ad043 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg
-PORTVERSION= 7.5
+PORTVERSION= 7.5.1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
diff --git a/x11/xorg/pkg-descr b/x11/xorg/pkg-descr
index 50409e3f70d5..03af7ed8e6ec 100644
--- a/x11/xorg/pkg-descr
+++ b/x11/xorg/pkg-descr
@@ -1,6 +1,3 @@
This is a metaport for all the X.Org packages available in the ports tree.
WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xplsprinters/pkg-descr b/x11/xplsprinters/pkg-descr
index f12de05c9af6..7df0d8fadfa8 100644
--- a/x11/xplsprinters/pkg-descr
+++ b/x11/xplsprinters/pkg-descr
@@ -1,5 +1,2 @@
This package contains xplsprinters, a program for showing a list of Xprint
printers and it's attributes.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xpr/pkg-descr b/x11/xpr/pkg-descr
index 759cb9d1eb9f..8b0ea4129fed 100644
--- a/x11/xpr/pkg-descr
+++ b/x11/xpr/pkg-descr
@@ -1,4 +1 @@
This package contains xpr, an utility for printing an X window dump.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xprehashprinterlist/pkg-descr b/x11/xprehashprinterlist/pkg-descr
index 02941e073eaf..698bed3b818f 100644
--- a/x11/xprehashprinterlist/pkg-descr
+++ b/x11/xprehashprinterlist/pkg-descr
@@ -1,5 +1,2 @@
This package contains xprehashprinterlist, a program that recomputes the
list of available printers.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xprop/pkg-descr b/x11/xprop/pkg-descr
index a8f57ccded0d..c5c0f971dac2 100644
--- a/x11/xprop/pkg-descr
+++ b/x11/xprop/pkg-descr
@@ -1,5 +1,2 @@
This package contains the xprop utility, which is for displaying window
and font properties in an X server.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xproto/pkg-descr b/x11/xproto/pkg-descr
index 421daff8585b..9889653a82e7 100644
--- a/x11/xproto/pkg-descr
+++ b/x11/xproto/pkg-descr
@@ -1,6 +1,3 @@
This package contains X protocol and ancillary headers.
WWW: http://www.freedesktop.org/wiki/Software/xlibs
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xproxymanagementprotocol/pkg-descr b/x11/xproxymanagementprotocol/pkg-descr
index 4a2f4dd1c837..3155c23dc099 100644
--- a/x11/xproxymanagementprotocol/pkg-descr
+++ b/x11/xproxymanagementprotocol/pkg-descr
@@ -1,6 +1,3 @@
This package contains X Proxy Management Protocol headers.
WWW: http://www.freedesktop.org/wiki/Software/xlibs
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 50fa56d2d19d..8a841f878397 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrandr
-PORTVERSION= 1.3.2
+PORTVERSION= 1.3.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index be89f342d3a4..464c369043f2 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xrandr-1.3.4.tar.bz2) = 5e4a2492e6cc51345aa571b95283c43c2771c4f444837dbce2699d62f76b4adb
+SIZE (xorg/app/xrandr-1.3.4.tar.bz2) = 146919
diff --git a/x11/xrandr/pkg-descr b/x11/xrandr/pkg-descr
index ef0f6e48a64e..25be87c3d20b 100644
--- a/x11/xrandr/pkg-descr
+++ b/x11/xrandr/pkg-descr
@@ -1,5 +1,2 @@
This package contains xrandr, a primitive command line interface to
the RandR extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xrdb/pkg-descr b/x11/xrdb/pkg-descr
index fadb6f4194a0..51829b16b5f7 100644
--- a/x11/xrdb/pkg-descr
+++ b/x11/xrdb/pkg-descr
@@ -1,4 +1 @@
This package contains xrdb, a X server resource database utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xrefresh/pkg-descr b/x11/xrefresh/pkg-descr
index da1d4e7969ed..b130b10abb36 100644
--- a/x11/xrefresh/pkg-descr
+++ b/x11/xrefresh/pkg-descr
@@ -1,5 +1,2 @@
This package contains xrefresh, which is a simple X program that causes
all or part of your screen to be repainted.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xrx/pkg-descr b/x11/xrx/pkg-descr
index d1065916a218..20fe836aa763 100644
--- a/x11/xrx/pkg-descr
+++ b/x11/xrx/pkg-descr
@@ -1,6 +1,3 @@
This package contains xrx, an RX helper program which can be used with
any web browser to interpret documents in the RX MIME type format and
start remote applications.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index df112ad4c363..1197835a18bf 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xset
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xset/distinfo b/x11/xset/distinfo
index ed7e109af19a..cdbf436b128d 100644
--- a/x11/xset/distinfo
+++ b/x11/xset/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xorg/app/xset-1.2.1.tar.bz2) = ec995f7d23109cfa6420ae87c38158f29a2a6f9d0b7df0a1be34e69e165292a1
+SIZE (xorg/app/xset-1.2.1.tar.bz2) = 124237
diff --git a/x11/xset/pkg-descr b/x11/xset/pkg-descr
index bdbb142c16df..87e3a4acb85d 100644
--- a/x11/xset/pkg-descr
+++ b/x11/xset/pkg-descr
@@ -1,5 +1,3 @@
This package contains xset, an application used to set various user preference
options related to the display in the X Window System.
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsetmode/pkg-descr b/x11/xsetmode/pkg-descr
index 83bdd9a4f63f..ae58f8837d0c 100644
--- a/x11/xsetmode/pkg-descr
+++ b/x11/xsetmode/pkg-descr
@@ -1,5 +1,2 @@
This package contains xsetmode, which is a program for setting the mode
of an X Input device to either absolute och relative.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsetpointer/pkg-descr b/x11/xsetpointer/pkg-descr
index e755bb22bf9c..ebcd3e9f3a1e 100644
--- a/x11/xsetpointer/pkg-descr
+++ b/x11/xsetpointer/pkg-descr
@@ -1,5 +1,2 @@
This package contains xsetpointer, which sets an X Input device
as the main pointer.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsetroot/pkg-descr b/x11/xsetroot/pkg-descr
index d09e4b06de32..95e81dd81d45 100644
--- a/x11/xsetroot/pkg-descr
+++ b/x11/xsetroot/pkg-descr
@@ -1,6 +1,3 @@
This package contains xsetroot, a root window paramteter setting utility
for the X Window System, which allows you to change the appearance of the
background ("root") window in X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xsm/pkg-descr b/x11/xsm/pkg-descr
index 9b70d0df901c..7934bf3047db 100644
--- a/x11/xsm/pkg-descr
+++ b/x11/xsm/pkg-descr
@@ -1,4 +1 @@
This package contains the X.Org X Session Manager (xsm).
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xstdcmap/pkg-descr b/x11/xstdcmap/pkg-descr
index 9383874205a6..8588fc68c96c 100644
--- a/x11/xstdcmap/pkg-descr
+++ b/x11/xstdcmap/pkg-descr
@@ -1,4 +1 @@
This package contains xstdcmap, an X standard colormap utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xtrans/pkg-descr b/x11/xtrans/pkg-descr
index 90b6ad875d03..8d57a05259f4 100644
--- a/x11/xtrans/pkg-descr
+++ b/x11/xtrans/pkg-descr
@@ -1,6 +1,3 @@
This package contains xtrans, a library of code that is shared among X
packages to handle network protocol transport in a modular fashion,
allowing a single place to add new transport types.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xtrap/pkg-descr b/x11/xtrap/pkg-descr
index fae5d2a9e846..d617a9b7f542 100644
--- a/x11/xtrap/pkg-descr
+++ b/x11/xtrap/pkg-descr
@@ -1,6 +1,3 @@
This package contains a set of XTrap sample clients. XTrap is an X Server
extension which facilitates the capturing of server protocol and
synthesizing core input events.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xvinfo/pkg-descr b/x11/xvinfo/pkg-descr
index cf1f2dd785d1..bc48f8c25001 100644
--- a/x11/xvinfo/pkg-descr
+++ b/x11/xvinfo/pkg-descr
@@ -1,6 +1,3 @@
This package contains xvinfo, an application for printing out the
capabilities of any video adaptors associated with the display that
are accessible through the X-Video extension.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xwd/pkg-descr b/x11/xwd/pkg-descr
index 235d83ffbc47..2741facba11b 100644
--- a/x11/xwd/pkg-descr
+++ b/x11/xwd/pkg-descr
@@ -1,4 +1 @@
This package contains xwd, which is an X Window System window dumping utility.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xwininfo/pkg-descr b/x11/xwininfo/pkg-descr
index ec1faf4f16d4..a3c96a30550d 100644
--- a/x11/xwininfo/pkg-descr
+++ b/x11/xwininfo/pkg-descr
@@ -1,5 +1,2 @@
This package contains xwininfo, which is a utility for displaying
information about windows in X.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xwud/pkg-descr b/x11/xwud/pkg-descr
index 61d21c52571c..544f59909884 100644
--- a/x11/xwud/pkg-descr
+++ b/x11/xwud/pkg-descr
@@ -1,4 +1 @@
This package contains xwud, an image displayer for the X Window System.
-
-- Joel Dahl
-joel@FreeBSD.org