- updated evieext to 1.1.1

- updated libSM to 1.2.0,1
- updated libX11 to 1.4.4,1
- updated libXevie to 1.0.3
- updated libXext to 1.3.0_1,1
- updated libXfixes to 4.0.4
- updated libXi to 1.4.3,1
- updated libXinerama to 1.1.1,1
- updated libXp to 1.0.1,1
- updated libXpm to 3.5.9
- updated libXrandr to 1.3.2
- updated libXrender to 0.9.6
- updated libXres to 1.0.5
- updated libXtst to 1.2.0
- updated libXv to 1.0.6,1
- updated libXxf86dga to 1.1.2
- updated libXxf86misc to 1.0.3
- updated libXxf86vm to 1.1.1
- updated xdbedizzy to 1.1.0
- updated xdm to 1.1.10
- updated xf86dga to 1.0.3
- updated xf86driproto to 2.1.1
- updated xfd to 1.1.0
- updated xfindproxy to 1.0.2
- updated xfwp to 1.0.2
- updated xinit to 1.3.1
- updated xkbcomp to 1.2.3
- updated xkeyboard to config-2.1
- updated xlsatoms to 1.1.0
- updated xmag to 1.0.4
- updated xman to 1.1.2
- updated xorg to cf-files-1.0.4
- updated xrefresh to 1.0.4
- updated xrx to 1.0.4
- updated xsm to 1.0.2
- updated xwud to 1.0.3
- fix final line in pkg-descr
- add license where appropriate
- remove two patches in libX11 which are no longer required

Reviewed by:	kwm
Approved by:	bapt (mentor)
Obtained from:	xorg-devel repo

3 files changed, 38 insertions, 14 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 33cb565e20ba..bc18185b84ca 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	1.8
-PORTREVISION=	2
+PORTVERSION=	2.1
 CATEGORIES=	x11
-MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
-DISTNAME=	xkeyboard-config-${PORTVERSION}
+MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
+LICENSE=	MIT
+
 BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
+XORG_CAT=	data
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intlhack
+USE_GNOME=	intlhack gnomehack
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
@@ -28,7 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls --with-included-gettext
+CONFIGURE_ARGS+=	--disable-nls
 CONFIGURE_ENV+=	MSGFMT="/bin/echo '(GNU '" \
 		XGETTEXT="/bin/echo '(GNU '" \
 		MSGMERGE="/bin/echo '(GNU '"
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index eb774b6e3cd2..7ee61f2538dd 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xkeyboard-config-1.8.tar.bz2) = 7dc3e6ca00adb105f46e40f8382e83d50b3fcd626bc8654293dae8b1e80506ce
-SIZE (xkeyboard-config-1.8.tar.bz2) = 650683
+SHA256 (xorg/data/xkeyboard-config-2.1.tar.bz2) = f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
+SIZE (xorg/data/xkeyboard-config-2.1.tar.bz2) = 699368
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index a8647d1bd3d8..565c5ad4a06b 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -1,7 +1,9 @@
+libdata/pkgconfig/xkeyboard-config.pc
 share/X11/xkb/compat.dir
 share/X11/xkb/compat/README
 share/X11/xkb/compat/accessx
 share/X11/xkb/compat/basic
+share/X11/xkb/compat/caps
 share/X11/xkb/compat/complete
 share/X11/xkb/compat/default
 share/X11/xkb/compat/iso9995
@@ -41,6 +43,7 @@ share/X11/xkb/geometry/nec
 share/X11/xkb/geometry/nokia
 share/X11/xkb/geometry/northgate
 share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sanwa
 share/X11/xkb/geometry/sgi_vndr/O2
 share/X11/xkb/geometry/sgi_vndr/indigo
 share/X11/xkb/geometry/sgi_vndr/indy
@@ -56,6 +59,7 @@ share/X11/xkb/keycodes/amiga
 share/X11/xkb/keycodes/ataritt
 share/X11/xkb/keycodes/digital_vndr/lk
 share/X11/xkb/keycodes/digital_vndr/pc
+share/X11/xkb/keycodes/empty
 share/X11/xkb/keycodes/evdev
 share/X11/xkb/keycodes/fujitsu
 share/X11/xkb/keycodes/hp
@@ -137,6 +141,7 @@ share/X11/xkb/symbols/al
 share/X11/xkb/symbols/altwin
 share/X11/xkb/symbols/am
 share/X11/xkb/symbols/ara
+share/X11/xkb/symbols/at
 share/X11/xkb/symbols/az
 share/X11/xkb/symbols/ba
 share/X11/xkb/symbols/bd
@@ -145,6 +150,7 @@ share/X11/xkb/symbols/bg
 share/X11/xkb/symbols/br
 share/X11/xkb/symbols/brai
 share/X11/xkb/symbols/bt
+share/X11/xkb/symbols/bw
 share/X11/xkb/symbols/by
 share/X11/xkb/symbols/ca
 share/X11/xkb/symbols/capslock
@@ -161,12 +167,15 @@ share/X11/xkb/symbols/digital_vndr/us
 share/X11/xkb/symbols/digital_vndr/vt
 share/X11/xkb/symbols/dk
 share/X11/xkb/symbols/ee
+share/X11/xkb/symbols/empty
 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
@@ -191,6 +200,7 @@ share/X11/xkb/symbols/ir
 share/X11/xkb/symbols/is
 share/X11/xkb/symbols/it
 share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/ke
 share/X11/xkb/symbols/keypad
 share/X11/xkb/symbols/kg
 share/X11/xkb/symbols/kh
@@ -215,6 +225,7 @@ share/X11/xkb/symbols/macintosh_vndr/fr
 share/X11/xkb/symbols/macintosh_vndr/gb
 share/X11/xkb/symbols/macintosh_vndr/is
 share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/jp
 share/X11/xkb/symbols/macintosh_vndr/latam
 share/X11/xkb/symbols/macintosh_vndr/nl
 share/X11/xkb/symbols/macintosh_vndr/no
@@ -224,6 +235,7 @@ share/X11/xkb/symbols/macintosh_vndr/us
 share/X11/xkb/symbols/mao
 share/X11/xkb/symbols/me
 share/X11/xkb/symbols/mk
+share/X11/xkb/symbols/ml
 share/X11/xkb/symbols/mm
 share/X11/xkb/symbols/mn
 share/X11/xkb/symbols/mt
@@ -239,12 +251,14 @@ share/X11/xkb/symbols/nokia_vndr/su-8w
 share/X11/xkb/symbols/np
 share/X11/xkb/symbols/olpc
 share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/ph
 share/X11/xkb/symbols/pk
 share/X11/xkb/symbols/pl
 share/X11/xkb/symbols/pt
 share/X11/xkb/symbols/ro
 share/X11/xkb/symbols/rs
 share/X11/xkb/symbols/ru
+share/X11/xkb/symbols/rupeesign
 share/X11/xkb/symbols/se
 share/X11/xkb/symbols/sgi_vndr/jp
 share/X11/xkb/symbols/shift
@@ -253,34 +267,39 @@ share/X11/xkb/symbols/sk
 share/X11/xkb/symbols/sn
 share/X11/xkb/symbols/sony_vndr/us
 share/X11/xkb/symbols/srvr_ctrl
-share/X11/xkb/symbols/sun_vndr/cs
+share/X11/xkb/symbols/sun_vndr/ara
+share/X11/xkb/symbols/sun_vndr/be
+share/X11/xkb/symbols/sun_vndr/br
+share/X11/xkb/symbols/sun_vndr/ca
+share/X11/xkb/symbols/sun_vndr/ch
 share/X11/xkb/symbols/sun_vndr/cz
 share/X11/xkb/symbols/sun_vndr/de
 share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/ee
 share/X11/xkb/symbols/sun_vndr/es
 share/X11/xkb/symbols/sun_vndr/fi
 share/X11/xkb/symbols/sun_vndr/fr
 share/X11/xkb/symbols/sun_vndr/gb
 share/X11/xkb/symbols/sun_vndr/gr
-share/X11/xkb/symbols/sun_vndr/hu
 share/X11/xkb/symbols/sun_vndr/it
 share/X11/xkb/symbols/sun_vndr/jp
-share/X11/xkb/symbols/sun_vndr/ko
+share/X11/xkb/symbols/sun_vndr/kr
 share/X11/xkb/symbols/sun_vndr/lt
 share/X11/xkb/symbols/sun_vndr/lv
 share/X11/xkb/symbols/sun_vndr/nl
 share/X11/xkb/symbols/sun_vndr/no
 share/X11/xkb/symbols/sun_vndr/pl
 share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ro
 share/X11/xkb/symbols/sun_vndr/ru
 share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/sk
 share/X11/xkb/symbols/sun_vndr/solaris
-share/X11/xkb/symbols/sun_vndr/sw
 share/X11/xkb/symbols/sun_vndr/tr
 share/X11/xkb/symbols/sun_vndr/tuv
 share/X11/xkb/symbols/sun_vndr/tw
+share/X11/xkb/symbols/sun_vndr/ua
 share/X11/xkb/symbols/sun_vndr/us
-share/X11/xkb/symbols/sun_vndr/usb
 share/X11/xkb/symbols/sy
 share/X11/xkb/symbols/terminate
 share/X11/xkb/symbols/th
@@ -288,6 +307,7 @@ share/X11/xkb/symbols/tj
 share/X11/xkb/symbols/tm
 share/X11/xkb/symbols/tr
 share/X11/xkb/symbols/typo
+share/X11/xkb/symbols/tz
 share/X11/xkb/symbols/ua
 share/X11/xkb/symbols/us
 share/X11/xkb/symbols/uz
@@ -309,7 +329,6 @@ share/X11/xkb/types/mousekeys
 share/X11/xkb/types/nokia
 share/X11/xkb/types/numpad
 share/X11/xkb/types/pc
-share/X11/xkb/xkbcomp
 %%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
@@ -324,6 +343,7 @@ share/X11/xkb/xkbcomp
 %%NLS%%share/locale/es/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo
 %%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
@@ -333,6 +353,8 @@ share/X11/xkb/xkbcomp
 %%NLS%%share/locale/lt/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xkeyboard-config.mo