From 804b04753725ac670f681d54599f4e3fa4059e4a Mon Sep 17 00:00:00 2001 From: bjs Date: Thu, 7 Feb 2008 06:31:23 +0000 Subject: Update to version 1.2. Automake, autoconf, intltoolize, msgmerge no longer needed. Changes: 2008-01-29 Sergey Udaltsov * NEWS, configure.in: preparing release 1.2 2008-01-24 Sergey Udaltsov * symbols/af, symbols/ara, symbols/et, symbols/group, symbols/in, symbols/kz, symbols/np, symbols/pk, symbols/ru, symbols/th, symbols/us: separating group(olpc), closing http://bugs.freedesktop.org/show_bug.cgi?id=14225 2008-01-21 Sergey Udaltsov * symbols/gr: Polytonic Greek: Use new keysyms for dead psili and dasia, http://bugs.freedesktop.org/show_bug.cgi?id=13275 2008-01-11 Sergey Udaltsov * rules/base.lists.part, symbols/in: added in(olpc), by Bernardo Innocenti 2008-01-07 Sergey Udaltsov * geometry/thinkpad, keycodes/xfree86, rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part, rules/base.xml.in, symbols/inet: added thinkpad60 model (with geometry), https://bugs.freedesktop.org/show_bug.cgi?id=13954 2008-01-05 Sergey Udaltsov * symbols/us: add (left,right)singlequotemark to us(-altgr)-intl keymap, https://bugs.freedesktop.org/show_bug.cgi?id=13935 2008-01-04 Sergey Udaltsov * symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC 6301URF, https://bugs.freedesktop.org/show_bug.cgi?id=13913 * symbols/macintosh_vndr/fr: added nodeadkeys, https://bugs.freedesktop.org/show_bug.cgi?id=13934 2008-01-03 Sergey Udaltsov * symbols/pl, rules/base.xml.in: added pl(ru_phonetic_dvorak), https://bugs.freedesktop.org/show_bug.cgi?id=13900 2008-01-02 Sergey Udaltsov * symbols/ro, rules/base.xml.in: small fixes for Romanian visible strings from https://bugs.freedesktop.org/show_bug.cgi?id=13277 * rules/base.xml.in, rules/compat/variantRename.lst, symbols/fr, symbols/ge: moving ge(azerty_tscapo) to fr(geo), since that layout is only used in France, closing https://bugs.freedesktop.org/show_bug.cgi?id=13644 * symbols/ara: remove presentation forms from Arabic layout, https://bugs.freedesktop.org/show_bug.cgi?id=13894 2007-12-31 Sergey Udaltsov * symbols/ro, rules/base.xml.in, rules/compat/variantRename.lst: temporarily (partially) reverting https://bugs.freedesktop.org/show_bug.cgi?id=13277 2007-12-27 Sergey Udaltsov * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: adding xkb option caps:swapescape, https://bugs.freedesktop.org/show_bug.cgi?id=13824 2007-12-26 Sergey Udaltsov * symbols/ee, rules/base.xml.in: adding ee(us), polishing eurosign usage in ee, https://bugs.freedesktop.org/show_bug.cgi?id=13799 2007-12-25 Sergey Udaltsov * symbols/eurosign, rules/base.xml.in, rules/base.o_s.part: add eurosign(4) 2007-12-23 Sergey Udaltsov * symbols/inet, rules/base.xml.in: add logiultrax model, https://bugs.freedesktop.org/show_bug.cgi?id=13028 * symbols/me, rules/base.xml.in: use Latin as default Montenegro variant, https://bugs.freedesktop.org/show_bug.cgi?id=13777 * symbols/inet, keycodes/evdev: Kill off the I211 key in evdev --- x11/xkeyboard-config/Makefile | 18 +++++------------- x11/xkeyboard-config/distinfo | 9 +++++---- x11/xkeyboard-config/patches/patch-ac | 13 +++++++++++++ 3 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 x11/xkeyboard-config/patches/patch-ac (limited to 'x11/xkeyboard-config') diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index b1689e082a4..6b2434b7246 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2008/01/05 20:55:28 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2008/02/07 06:31:23 bjs Exp $ # -DISTNAME= xkeyboard-config-20071217 -PKGREVISION= 2 +DISTNAME= xkeyboard-config-1.2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= bjs@NetBSD.org @@ -18,8 +17,8 @@ CONFLICTS+= xkbdata-[0-9]* GNU_CONFIGURE= yes USE_LANGUAGES= # none USE_LIBTOOL= yes -USE_TOOLS+= gmake intltool perl:build automake -USE_TOOLS+= msgfmt msgmerge xgettext intltoolize autoreconf +USE_TOOLS+= gmake intltool perl:build +USE_TOOLS+= msgfmt xgettext CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg CONFIGURE_ARGS+= --with-xkb-base=${XKBBASE:Q} @@ -57,11 +56,4 @@ FILES_SUBST+= XKBCOMPDIR_SYMLINK=${XKBCOMPDIR_SYMLINK:Q} OWN_DIRS+= ${XKBCOMPDIR} -post-extract: - cp ${FILESDIR}/aclocal.m4 ${WRKSRC}/aclocal.m4 - -pre-configure: - ${RUN} cd ${WRKSRC}; intltoolize -c && autoreconf -i - - .include "../../mk/bsd.pkg.mk" diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index c6cb89a4377..538cdb4a026 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2007/12/19 04:10:43 bjs Exp $ +$NetBSD: distinfo,v 1.3 2008/02/07 06:31:25 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 (xkeyboard-config-1.2.tar.bz2) = d258d46dd2c5255aa60d489810ea246d5d224881 +RMD160 (xkeyboard-config-1.2.tar.bz2) = a42f603630dd6ef67fb281207a022e55b79f3007 +Size (xkeyboard-config-1.2.tar.bz2) = 586629 bytes SHA1 (patch-aa) = 1f6ec615b0915c5d08ac7ddbf2d35948b8859d85 SHA1 (patch-ab) = c8225979ce3b0e06b02ee71d6675588844ca3e81 +SHA1 (patch-ac) = 1adb014877c3cef1138a57915b5779eca683365f diff --git a/x11/xkeyboard-config/patches/patch-ac b/x11/xkeyboard-config/patches/patch-ac new file mode 100644 index 00000000000..5f847c426c0 --- /dev/null +++ b/x11/xkeyboard-config/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.3 2008/02/07 06:31:35 bjs Exp $ + +--- configure.orig 2008-02-07 01:24:54.000000000 -0500 ++++ configure +@@ -7458,7 +7460,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" -- cgit v1.2.3