aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts
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 /x11-fonts
parent0c4a162c976c91f8789cd750fa2dd434fa12864d (diff)
downloadports-d594ccc94ffa1006a70e7762de037c800e827b24.tar.gz
ports-d594ccc94ffa1006a70e7762de037c800e827b24.zip
- 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
Diffstat (limited to 'x11-fonts')
-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
175 files changed, 231 insertions, 350 deletions
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