diff options
| author | jmcneill <jmcneill> | 2008-12-20 23:31:54 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2008-12-20 23:31:54 +0000 |
| commit | 2b6549cc052e03e05c81c01de2c1f947d2792fa1 (patch) | |
| tree | 78526d29deb0223b8339907aafd5a0b7d7089885 /x11 | |
| parent | 8b347526e6646245189e04d6be7ca817333cad55 (diff) | |
| download | pkgsrc-2b6549cc052e03e05c81c01de2c1f947d2792fa1.tar.gz | |
Pass proper path for xkb and xmodmap rules so you can select a non-US
keyboard again. Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libxklavier/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 56d3c3cc728..9dd88abdf6a 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2008/11/24 14:14:52 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2008/12/20 23:31:54 jmcneill Exp $ # DISTNAME= libxklavier-3.8 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gswitchit/} EXTRACT_SUFX= .tar.bz2 @@ -20,6 +21,14 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libxklavier.pc.in CONFIGURE_ARGS+= --enable-xkb-support +CONFIGURE_ARGS+= --with-xmodmap-base=${PREFIX}/share/xmodmap + +.include "../../mk/bsd.prefs.mk" +.if exists(${X11BASE}/share/X11/xkb/rules/xorg.xml) +CONFIGURE_ARGS+= --with-xkb-base=${X11BASE}/share/X11/xkb +.else +CONFIGURE_ARGS+= --with-xkb-base=${X11BASE}/lib/X11/xkb +.endif BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 |