From 426e4a267f4a66ed9e9fae381ea0bb0539bd962a Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Thu, 24 Mar 2005 09:34:24 +0000
Subject: Disable build of tests, as they require an extra dependency
 (libgetopt) on Solaris 8.  Addresses part of PR pkg/26769 by Robert Lillack.

While here, remove some more test(1) == constructions from the configure
script (they were harmless).
---
 x11/libxklavier/distinfo         |  6 +++---
 x11/libxklavier/patches/patch-aa | 20 +++++++++++++++++++-
 x11/libxklavier/patches/patch-ab | 13 +++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 x11/libxklavier/patches/patch-ab

(limited to 'x11/libxklavier')

diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 5bba81e4e54..dd90da2f173 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/03/22 16:05:13 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2005/03/24 09:34:24 jmmv Exp $
 
 SHA1 (libxklavier-2.0.tar.gz) = 2eae2b8013be972172374fb5cc71a4f368c41d76
 RMD160 (libxklavier-2.0.tar.gz) = a8f219a61f47ed1bb0f801d0e78512b4275e0082
 Size (libxklavier-2.0.tar.gz) = 435898 bytes
-SHA1 (patch-aa) = c545095d06dbacf9452d138fdef6fcf485457d11
-SHA1 (patch-ab) = 0da271f9ee8a9b7bfeffa8f12b9d66cec5635e2c
+SHA1 (patch-aa) = bbb3a2d342e434eb06890ed5a3f26b3b753cc46b
+SHA1 (patch-ab) = e548e2117cad11e8171a0bd9c490d11a326e43a3
diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa
index 9da70efd86c..84b7d5e94ac 100644
--- a/x11/libxklavier/patches/patch-aa
+++ b/x11/libxklavier/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/03/22 16:05:13 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2005/03/24 09:34:24 jmmv Exp $
 
 --- configure.orig	2005-02-26 00:02:18.000000000 +0100
 +++ configure
@@ -15,3 +15,21 @@ $NetBSD: patch-aa,v 1.3 2005/03/22 16:05:13 jmmv Exp $
    echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  else
+@@ -21744,14 +21744,14 @@ 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 "$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)'
+   fi
+ fi
+-if test "$enable_xmm_support" == "yes" ; then
++if test "$enable_xmm_support" = "yes" ; then
+   echo '    xmodmap'
+ fi
+ echo '**********************************************************'
diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab
new file mode 100644
index 00000000000..c91e828babc
--- /dev/null
+++ b/x11/libxklavier/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2005/03/24 09:34:24 jmmv Exp $
+
+--- Makefile.in.orig	2005-02-26 00:02:55.000000000 +0100
++++ Makefile.in
+@@ -200,7 +200,7 @@ target_alias = @target_alias@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ xkbheaders_present = @xkbheaders_present@
+-SUBDIRS = libxklavier doc tests
++SUBDIRS = libxklavier doc
+ config_xml_DATA = xfree86.xml
+ config_xmldir = $(datadir)/$(PACKAGE)
+ EXTRA_DIST = libxklavier.spec libxklavier.spec.in \
-- 
cgit v1.2.3