pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xkeyboard-config Fix this so that it works with th...
details: https://anonhg.NetBSD.org/pkgsrc/rev/52d213c7e027
branches: trunk
changeset: 536652:52d213c7e027
user: bjs <bjs%pkgsrc.org@localhost>
date: Wed Dec 19 04:10:43 2007 +0000
description:
Fix this so that it works with the snapshot I provided. Bump rev.
Tested by me with xorg-server-1.4.0.90.
diffstat:
x11/xkeyboard-config/DEINSTALL | 2 +-
x11/xkeyboard-config/INSTALL | 2 +-
x11/xkeyboard-config/Makefile | 13 ++++++----
x11/xkeyboard-config/PLIST | 35 ++++++++++++++++++++++++++++-
x11/xkeyboard-config/distinfo | 15 ++----------
x11/xkeyboard-config/patches/patch-aa | 23 ++++++++++---------
x11/xkeyboard-config/patches/patch-ab | 41 ++++++++++------------------------
7 files changed, 70 insertions(+), 61 deletions(-)
diffs (243 lines):
diff -r 0b88cb1fcbad -r 52d213c7e027 x11/xkeyboard-config/DEINSTALL
--- a/x11/xkeyboard-config/DEINSTALL Wed Dec 19 03:41:59 2007 +0000
+++ b/x11/xkeyboard-config/DEINSTALL Wed Dec 19 04:10:43 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+# $NetBSD: DEINSTALL,v 1.2 2007/12/19 04:10:43 bjs Exp $
XKBCOMP_SYMLINK="@XKBCOMP_SYMLINK@"
XKBCOMPDIR="@XKBCOMPDIR@"
diff -r 0b88cb1fcbad -r 52d213c7e027 x11/xkeyboard-config/INSTALL
--- a/x11/xkeyboard-config/INSTALL Wed Dec 19 03:41:59 2007 +0000
+++ b/x11/xkeyboard-config/INSTALL Wed Dec 19 04:10:43 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+# $NetBSD: INSTALL,v 1.2 2007/12/19 04:10:43 bjs Exp $
XKBBASE="@XKBBASE@"
XKBCOMP="@XKBCOMP@"
diff -r 0b88cb1fcbad -r 52d213c7e027 x11/xkeyboard-config/Makefile
--- a/x11/xkeyboard-config/Makefile Wed Dec 19 03:41:59 2007 +0000
+++ b/x11/xkeyboard-config/Makefile Wed Dec 19 04:10:43 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2007/12/19 04:10:43 bjs Exp $
#
DISTNAME= xkeyboard-config-20071217
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +17,8 @@
GNU_CONFIGURE= yes
USE_LANGUAGES= # none
-USE_TOOLS+= gmake intltool perl:build
+USE_TOOLS+=
+USE_TOOLS+= gmake intltool perl:build automake
USE_TOOLS+= msgfmt msgmerge xgettext
CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg
@@ -36,7 +38,7 @@
### The server puts compiled keymaps in the directory below.
###
-XKBCOMPDIR?= ${VARBASE}/db/xkb
+XKBCOMPDIR?= ${VARBASE}/db/xkb
### The package must symlink ${XKBCOMPDIR} into ${XKBBASE}. ${XKBCOMP} is
### is the path to the xkbcomp binary we wish to use.
@@ -44,7 +46,7 @@
XKBCOMPDIR_SYMLINK= ${XKBBASE}/compiled
XKBCOMP= ${LOCALBASE}/bin/xkbcomp
-BUILD_DEFS+= VARBASE
+BUILD_DEFS+= VARBASE
BUILD_DEFS+= XKBCOMPDIR
FILES_SUBST+= XKBBASE=${XKBBASE:Q}
@@ -55,6 +57,7 @@
OWN_DIRS+= ${XKBCOMPDIR}
-.include "../../converters/libiconv/buildlink3.mk"
+pre-configure:
+ ${RUN} cd ${WRKSRC}; intltoolize --copy && autoreconf -i
.include "../../mk/bsd.pkg.mk"
diff -r 0b88cb1fcbad -r 52d213c7e027 x11/xkeyboard-config/PLIST
--- a/x11/xkeyboard-config/PLIST Wed Dec 19 03:41:59 2007 +0000
+++ b/x11/xkeyboard-config/PLIST Wed Dec 19 04:10:43 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/12/19 04:10:43 bjs Exp $
share/X11/xkb/compat.dir
share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
@@ -151,7 +151,6 @@
share/X11/xkb/symbols/ch
share/X11/xkb/symbols/cn
share/X11/xkb/symbols/compose
-share/X11/xkb/symbols/cs
share/X11/xkb/symbols/ctrl
share/X11/xkb/symbols/cz
share/X11/xkb/symbols/de
@@ -220,6 +219,7 @@
share/X11/xkb/symbols/macintosh_vndr/se
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/mm
share/X11/xkb/symbols/mn
@@ -231,14 +231,17 @@
share/X11/xkb/symbols/nl
share/X11/xkb/symbols/no
share/X11/xkb/symbols/np
+share/X11/xkb/symbols/olpc
share/X11/xkb/symbols/pc
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/se
share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/shift
share/X11/xkb/symbols/si
share/X11/xkb/symbols/sk
share/X11/xkb/symbols/sony_vndr/us
@@ -295,6 +298,34 @@
share/X11/xkb/types/mousekeys
share/X11/xkb/types/numpad
share/X11/xkb/types/pc
+share/locale/af/LC_MESSAGES/xkeyboard-config.mo
+share/locale/az/LC_MESSAGES/xkeyboard-config.mo
+share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
+share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
+share/locale/da/LC_MESSAGES/xkeyboard-config.mo
+share/locale/el/LC_MESSAGES/xkeyboard-config.mo
+share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
+share/locale/es/LC_MESSAGES/xkeyboard-config.mo
+share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
+share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
+share/locale/it/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
+share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
+share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sr@Latn/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
+share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
+share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
+share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
+share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
@dirrm share/X11/xkb/types
@dirrm share/X11/xkb/symbols/xfree68_vndr
@dirrm share/X11/xkb/symbols/sun_vndr
diff -r 0b88cb1fcbad -r 52d213c7e027 x11/xkeyboard-config/distinfo
--- a/x11/xkeyboard-config/distinfo Wed Dec 19 03:41:59 2007 +0000
+++ b/x11/xkeyboard-config/distinfo Wed Dec 19 04:10:43 2007 +0000
@@ -1,16 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+$NetBSD: distinfo,v 1.2 2007/12/19 04:10:43 bjs Exp $
SHA1 (xkeyboard-config-20071217.tar.bz2) = ea42385301c510e0f81c1e7c8d1873f34d3dca13
RMD160 (xkeyboard-config-20071217.tar.bz2) = 12bfdcd9033b36912a8f698eba7f2ec7b1861079
Size (xkeyboard-config-20071217.tar.bz2) = 435349 bytes
-SHA1 (patch-aa) = ac43d33901b10e7369bbcb478eaba07c6f792be8
-SHA1 (patch-ab) = 209d4b90ea95403f0bdee0007cd782ff16e64635
-SHA1 (patch-ac) = 66896134f0eea92d8fb9c69d596aeb13d640710d
-SHA1 (patch-ad) = 0184973c9dff5dc186a9bbe132539ddd70e25944
-SHA1 (patch-ae) = da99bb8b22299e50de5f79aed07556397b9e800e
-SHA1 (patch-af) = 27276cf3dec47f9997d750e6d56c6bc8f0f49222
-SHA1 (patch-ag) = 09df52807bd4b0a24b15236f7813c0b7c99697b1
-SHA1 (patch-ah) = 2786c64778643e3880de2fddccc20873f07765a9
-SHA1 (patch-ai) = 9ca96076a2785749a060b6625d72f57ac32bfaff
-SHA1 (patch-aj) = b0624e86a4dba582738dcef71fc97494f96a6874
-SHA1 (patch-ak) = 0fbfe2ba1fda1f522875b222bff19e302456329f
+SHA1 (patch-aa) = 1f6ec615b0915c5d08ac7ddbf2d35948b8859d85
+SHA1 (patch-ab) = c8225979ce3b0e06b02ee71d6675588844ca3e81
diff -r 0b88cb1fcbad -r 52d213c7e027 x11/xkeyboard-config/patches/patch-aa
--- a/x11/xkeyboard-config/patches/patch-aa Wed Dec 19 03:41:59 2007 +0000
+++ b/x11/xkeyboard-config/patches/patch-aa Wed Dec 19 04:10:43 2007 +0000
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2007/12/19 04:10:44 bjs Exp $
---- rules/base.o_s.part.orig 2007-07-16 04:24:28.000000000 -0400
-+++ rules/base.o_s.part
-@@ -64,6 +64,7 @@
- keypad:legacy_wang = +keypad(legacy_wang)
- keypad:oss_wang = +keypad(oss_wang)
- keypad:future_wang = +keypad(future_wang)
-+ keypad:comma = +keypad(comma)
- nbsp:none = +nbsp(none)
- nbsp:level2 = +nbsp(level2)
- nbsp:level3 = +nbsp(level3)
+--- rules/merge.sh.orig 2007-12-18 18:04:26.000000000 -0500
++++ rules/merge.sh
+@@ -11,7 +11,7 @@ basename=`basename $0`
+ echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
+
+ for i in $*; do
+- if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then
++ if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
+ echo >> $DEST;
+ read hdr
+ echo "$hdr" >> $DEST
diff -r 0b88cb1fcbad -r 52d213c7e027 x11/xkeyboard-config/patches/patch-ab
--- a/x11/xkeyboard-config/patches/patch-ab Wed Dec 19 03:41:59 2007 +0000
+++ b/x11/xkeyboard-config/patches/patch-ab Wed Dec 19 04:10:43 2007 +0000
@@ -1,30 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/12/18 00:28:14 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2007/12/19 04:10:44 bjs Exp $
---- rules/base.xml.in.orig 2007-09-26 07:56:42.000000000 -0400
-+++ rules/base.xml.in
-@@ -213,6 +213,12 @@
- </model>
- <model>
- <configItem>
-+ <name>btc9116u</name>
-+ <_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
-+ </configItem>
-+ </model>
-+ <model>
-+ <configItem>
- <name>cherryblue</name>
- <_description>Cherry Blue Line CyBo@rd</_description>
- </configItem>
-@@ -3606,6 +3612,12 @@
- </option>
- <option>
- <configItem>
-+ <name>keypad:comma</name>
-+ <_description>Force standard comma keypad</_description>
-+ </configItem>
-+ </option>
-+ <option>
-+ <configItem>
- <name>keypad:oss</name>
- <_description>Keypad with unicode additions (arrows and math operators)</_description>
- </configItem>
+--- configure.in.orig 2007-10-02 17:51:04.000000000 -0400
++++ configure.in
+@@ -91,7 +91,7 @@ else
+ echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink"
+ fi
+
+-if test "$enable_compat_rules" == "yes" ; then
++if test "$enable_compat_rules" = "yes" ; then
+ echo " Compatibility rules are included"
+ else
+ echo " Compatibility rules are not included"
Home |
Main Index |
Thread Index |
Old Index