diff options
Diffstat (limited to 'x11/xkeyboard-config')
| -rw-r--r-- | x11/xkeyboard-config/Makefile | 30 | ||||
| -rw-r--r-- | x11/xkeyboard-config/PLIST | 5 | ||||
| -rw-r--r-- | x11/xkeyboard-config/distinfo | 8 |
3 files changed, 23 insertions, 20 deletions
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 74dbffe5d1b..32068faf3a5 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2008/06/03 06:10:16 bjs Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/15 08:52:42 bjs Exp $ # -DISTNAME= xkeyboard-config-1.3 +DISTNAME= xkeyboard-config-1.4 CATEGORIES= x11 -MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/ +MASTER_SITES= ${MASTER_SITE_XORG:=data/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= bjs@NetBSD.org @@ -12,41 +12,41 @@ COMMENT= X Keyboard Configuration Database PKG_DESTDIR_SUPPORT= user-destdir +BUILD_DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp + CONFLICTS+= xkbdata-[0-9]* +MAKE_JOBS_SAFE= no + GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= gmake intltool perl:build -USE_TOOLS+= msgfmt xgettext +USE_TOOLS+= gmake intltool msgfmt + +BUILD_DEFS+= VARBASE +BUILD_DEFS+= XKBCOMPDIR CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg CONFIGURE_ARGS+= --with-xkb-base=${XKBBASE:Q} - ### In pkgsrc, we do this with INSTALL/DEINSTALL scripts. ### CONFIGURE_ARGS+= --disable-xkbcomp-symlink - -BUILD_DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp -MAKE_JOBS_SAFE= no +### REPLACE_SH= rules/merge.sh - +### ### Keymaps, rules, etc. are installed here. ### XKBBASE= ${PREFIX}/share/X11/xkb - +### ### The server puts compiled keymaps in the directory below. ### XKBCOMPDIR?= ${VARBASE}/db/xkb - +### ### The package must symlink ${XKBCOMPDIR} into ${XKBBASE}. ${XKBCOMP} is ### is the path to the xkbcomp binary we wish to use. ### XKBCOMPDIR_SYMLINK= ${XKBBASE}/compiled XKBCOMP= ${PREFIX}/bin/xkbcomp -BUILD_DEFS+= VARBASE -BUILD_DEFS+= XKBCOMPDIR - FILES_SUBST+= XKBBASE=${XKBBASE:Q} FILES_SUBST+= XKBCOMP=${XKBCOMP:Q} FILES_SUBST+= XKBCOMP_SYMLINK=${${XKBBASE}/xkbcomp:L:Q} diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST index 0dc05b7d12e..84e87464ee4 100644 --- a/x11/xkeyboard-config/PLIST +++ b/x11/xkeyboard-config/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2008/06/03 06:10:16 bjs Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/10/15 08:52:42 bjs Exp $ share/X11/xkb/compat.dir share/X11/xkb/compat/README share/X11/xkb/compat/accessx @@ -113,6 +113,9 @@ share/X11/xkb/rules/README share/X11/xkb/rules/base share/X11/xkb/rules/base.lst share/X11/xkb/rules/base.xml +share/X11/xkb/rules/evdev +share/X11/xkb/rules/evdev.lst +share/X11/xkb/rules/evdev.xml share/X11/xkb/rules/xfree86 share/X11/xkb/rules/xfree86.lst share/X11/xkb/rules/xfree86.xml diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index 1d124181526..7c68a385892 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2008/06/03 06:10:16 bjs Exp $ +$NetBSD: distinfo,v 1.5 2008/10/15 08:52:42 bjs Exp $ -SHA1 (xkeyboard-config-1.3.tar.bz2) = 1bc9bb0eeb9ffe6d044cc2c7b5853b5f4d9a5277 -RMD160 (xkeyboard-config-1.3.tar.bz2) = e496233ba058125a46d585cd262df95eaa4a1e7c -Size (xkeyboard-config-1.3.tar.bz2) = 592158 bytes +SHA1 (xkeyboard-config-1.4.tar.bz2) = 7ad0ff286233b3569ea38ab951f61efb2e4745b9 +RMD160 (xkeyboard-config-1.4.tar.bz2) = c6c655c58b25ff81df48064eb29d2e7142b2556d +Size (xkeyboard-config-1.4.tar.bz2) = 559151 bytes SHA1 (patch-aa) = 1f6ec615b0915c5d08ac7ddbf2d35948b8859d85 SHA1 (patch-ab) = c8225979ce3b0e06b02ee71d6675588844ca3e81 SHA1 (patch-ac) = 1adb014877c3cef1138a57915b5779eca683365f |