summaryrefslogtreecommitdiff
path: root/x11/libxklavier/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'x11/libxklavier/patches/patch-aa')
-rw-r--r--x11/libxklavier/patches/patch-aa36
1 files changed, 19 insertions, 17 deletions
diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa
index 84b7d5e94ac..be0fae7b446 100644
--- a/x11/libxklavier/patches/patch-aa
+++ b/x11/libxklavier/patches/patch-aa
@@ -1,35 +1,37 @@
-$NetBSD: patch-aa,v 1.4 2005/03/24 09:34:24 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2006/09/15 15:11:53 jmmv Exp $
---- configure.orig 2005-02-26 00:02:18.000000000 +0100
+--- configure.orig 2006-08-30 15:57:39.000000000 +0200
+++ configure
-@@ -20135,9 +20135,9 @@ fi
+@@ -21651,9 +21651,9 @@ fi
echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6
-if test \( "$enable_xkb_support" == "yes" -a \
-- "$xkb_headers_present" == "yes" \) -o \
-- "$enable_xmm_support" == "yes" ; then
+- "$libxkbfile_present" == "yes" \) -o \
+- "$enable_xmodmap_support" == "yes" ; then
+if test \( "$enable_xkb_support" = "yes" -a \
-+ "$xkb_headers_present" = "yes" \) -o \
-+ "$enable_xmm_support" = "yes" ; then
++ "$libxkbfile_present" = "yes" \) -o \
++ "$enable_xmodmap_support" = "yes" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
-@@ -21744,14 +21744,14 @@ fi
+@@ -23531,8 +23531,8 @@ fi
echo '**********************************************************'
echo ' Libxklavier is configured with the following backends:'
-if test "$enable_xkb_support" == "yes" ; then
-- if test "$xkb_headers_present" == "yes" ; then
+- if test "$libxkbfile_present" == "yes" ; then
+if test "$enable_xkb_support" = "yes" ; then
-+ if test "$xkb_headers_present" = "yes" ; then
- echo ' XKB (libxkbfile headers are present)'
- else
- echo ' XKB (but libxkbfile headers are NOT present)'
++ if test "$libxkbfile_present" = "yes" ; then
+ echo " XKB, libxkbfile is present"
+ echo " default ruleset: $xkb_default_ruleset"
+ echo " base: $xkb_base"
+@@ -23540,7 +23540,7 @@ if test "$enable_xkb_support" == "yes" ;
+ echo " XKB, libxkbfile is NOT present"
fi
fi
--if test "$enable_xmm_support" == "yes" ; then
-+if test "$enable_xmm_support" = "yes" ; then
- echo ' xmodmap'
+-if test "$enable_xmodmap_support" == "yes" ; then
++if test "$enable_xmodmap_support" = "yes" ; then
+ echo " xmodmap, default ruleset: $xmodmap_default_ruleset"
+ echo " base: $xmodmap_base"
fi
- echo '**********************************************************'