- Please welcome Xorg 7.5.2

       The Xorg Team is pleased to announce the next round of Xorg updates.
       The team created a new flag called WITH_NEW_XORG that users can include
       in /etc/make.conf. This was created for the intel KMS work being done
       althouthough It probably works for other chips. Unfortunately, the intel
       KMS driver will only work on FreeBSD 9(RELENG|STABLE) or 10/HEAD users.
       Older version of FreeBSD will not be supported. Intel users will need
       to patch their source manually with Konstantin?s KMS kernel patch to get
       the newer chips to work. Please carefully read UPDATING entry.

Changes:

        - libdrm 2.4.31 (including KMS support)
        - mesa 7.11.2
        - xorg-server 1.10.6
        - a lot of new Graphic Drivers.

    I would like to thank:

         Koop Mast
         Eitan Adler
         Niclas Zeising
         and all helpers and testers from x11@.

3 files changed, 12 insertions, 16 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index c699bd4f5cda..d23fcabca085 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.1
+PORTVERSION=	2.5.1
 CATEGORIES=	x11
-MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
-
+BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
+		xsltproc:${PORTSDIR}/textproc/libxslt
 XORG_CAT=	data
 
 USE_BZIP2=	yes
@@ -29,6 +28,8 @@ CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+MAN7=		xkeyboard-config.7
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
@@ -42,9 +43,6 @@ PLIST_SUB+=	NLS=""
 .endif
 
 post-patch:
-.if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} '/^SUBDIR/s/ po//' ${WRKSRC}/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
 		${WRKSRC}/rules/merge.sh
 
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 7ee61f2538dd..a1b76612dc5c 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.1.tar.bz2) = f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
-SIZE (xorg/data/xkeyboard-config-2.1.tar.bz2) = 699368
+SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
+SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index e9824e6bd004..1292125f7d22 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -140,6 +140,7 @@ share/X11/xkb/symbols/af
 share/X11/xkb/symbols/al
 share/X11/xkb/symbols/altwin
 share/X11/xkb/symbols/am
+share/X11/xkb/symbols/apl
 share/X11/xkb/symbols/ara
 share/X11/xkb/symbols/at
 share/X11/xkb/symbols/az
@@ -156,6 +157,7 @@ share/X11/xkb/symbols/ca
 share/X11/xkb/symbols/capslock
 share/X11/xkb/symbols/cd
 share/X11/xkb/symbols/ch
+share/X11/xkb/symbols/cm
 share/X11/xkb/symbols/cn
 share/X11/xkb/symbols/compose
 share/X11/xkb/symbols/ctrl
@@ -172,11 +174,6 @@ share/X11/xkb/symbols/epo
 share/X11/xkb/symbols/es
 share/X11/xkb/symbols/et
 share/X11/xkb/symbols/eurosign
-share/X11/xkb/symbols/extras/apl
-share/X11/xkb/symbols/extras/ir
-share/X11/xkb/symbols/extras/rs
-share/X11/xkb/symbols/extras/ru
-share/X11/xkb/symbols/extras/us
 share/X11/xkb/symbols/fi
 share/X11/xkb/symbols/fo
 share/X11/xkb/symbols/fr
@@ -306,6 +303,7 @@ share/X11/xkb/symbols/th
 share/X11/xkb/symbols/tj
 share/X11/xkb/symbols/tm
 share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/tw
 share/X11/xkb/symbols/typo
 share/X11/xkb/symbols/tz
 share/X11/xkb/symbols/ua
@@ -347,6 +345,7 @@ share/X11/xkb/types/pc
 %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ky/LC_MESSAGES/xkeyboard-config.mo
@@ -372,8 +371,8 @@ share/X11/xkb/types/pc
 %%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ky
 %%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/crh
 @exec mkdir -p /var/lib/xkb
+@dirrmtry share/locale/crh
 @dirrm share/X11/xkb/types
 @dirrm share/X11/xkb/symbols/xfree68_vndr
 @dirrm share/X11/xkb/symbols/sun_vndr
@@ -384,7 +383,6 @@ share/X11/xkb/types/pc
 @dirrm share/X11/xkb/symbols/macintosh_vndr
 @dirrm share/X11/xkb/symbols/hp_vndr
 @dirrm share/X11/xkb/symbols/fujitsu_vndr
-@dirrm share/X11/xkb/symbols/extras
 @dirrm share/X11/xkb/symbols/digital_vndr
 @dirrm share/X11/xkb/symbols
 @dirrm share/X11/xkb/semantics