Update to 1.5

svn path=/head/; revision=231851

x11/xkeyboard-config/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
 DISTNAME=	xkeyboard-config-${PORTVERSION}
@@ -38,6 +38,10 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
+		${WRKSRC}/rules/merge.sh
+
 post-install:
 	${MKDIR} /var/lib/xkb
 	${LN} -sf /var/lib/xkb ${PREFIX}/share/X11/xkb/compiled

x11/xkeyboard-config/distinfo

@@ -1,3 +1,3 @@
-MD5 (xkeyboard-config-1.4.tar.bz2) = a9fe7efbc67a6966c4d4501f0cf88073
-SHA256 (xkeyboard-config-1.4.tar.bz2) = 921a857dcf90a59df7feb26da5aabcf0bbfb749c46e2a46c3bc7a0280b83b0e1
-SIZE (xkeyboard-config-1.4.tar.bz2) = 559151
+MD5 (xkeyboard-config-1.5.tar.bz2) = 43c74312d303863b1b929554fa9ed9b3
+SHA256 (xkeyboard-config-1.5.tar.bz2) = ce15ff22ad6bc0ff7ae735d5ec65dd6dfd736d7eef0cf5ff394f823e663447e4
+SIZE (xkeyboard-config-1.5.tar.bz2) = 571579

x11/xkeyboard-config/files/patch-keycodes_xfree98

@@ -1,11 +0,0 @@
---- keycodes/xfree98.orig	2007-12-12 12:52:10.000000000 +0000
-+++ keycodes/xfree98	2007-12-12 12:52:21.000000000 +0000
-@@ -29,7 +29,7 @@
- default xkb_keycodes "pc98" {
- 
-     minimum= 8;
--    maximum= 134;
-+    maximum= 255;
- 
-     <ESC>  =   8;
-     <AE01> =   9;

x11/xkeyboard-config/pkg-plist

@@ -280,6 +280,7 @@ share/X11/xkb/symbols/keypad
 share/X11/xkb/symbols/level3
 share/X11/xkb/symbols/level5
 share/X11/xkb/symbols/srvr_ctrl
+share/X11/xkb/symbols/typo
 share/X11/xkb/symbols/eurosign
 share/X11/xkb/symbols.dir
 share/X11/xkb/types.dir