pkg/38441: update of libxklavier to 3.3 needed for gnome-settings-daemon

[dieter.NetBSD%pandora.be@localhost]

>Number:         38441
>Category:       pkg
>Synopsis:       update of libxklavier to 3.3 needed for gnome-settings-daemon
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 16 13:40:00 +0000 2008
>Originator:     dieter roelants
>Release:        NetBSD 4.99.58
>Organization:
>Environment:
System: NetBSD simult.amelgem.be 4.99.58 NetBSD 4.99.58 (SIMULT) #62: Thu Apr 
10 06:47:43 CEST 2008 
dieter%simult.amelgem.be@localhost:/build/obj.i386.current/sys/arch/i386/compile/SIMULT
 i386
Architecture: i386
Machine: i386
>Description:
        sysutils/gnome-settings-daemon configure prints:

checking for LIBGNOMEKBD... configure: error: Package requirements (libgnomekbd 
>= 2.21.4 libxklavier >= 3.3) were not met:

Requested 'libxklavier >= 3.3' but version of libxklavier is 3.2


>How-To-Repeat:
        cd sysutils/gnome-settings-daemon && make
>Fix:

        (I think the buildlink3.mk also needs updating, but I'm
        not sure, so I didn't touch it.)

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxklavier/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile    19 Apr 2007 21:39:17 -0000      1.18
+++ Makefile    16 Apr 2008 13:19:41 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.18 2007/04/19 21:39:17 wiz Exp $
 #
 
-DISTNAME=      libxklavier-3.2
+DISTNAME=      libxklavier-3.3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxklavier/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo    19 Apr 2007 21:39:17 -0000      1.15
+++ distinfo    16 Apr 2008 13:19:41 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.15 2007/04/19 21:39:17 wiz Exp $
 
-SHA1 (libxklavier-3.2.tar.gz) = 4169a021201e8ccb9a771d1321a8d1e5bba1fd51
-RMD160 (libxklavier-3.2.tar.gz) = 4d4654b6fffe5cedd6c6f268ffe364b40417e881
-Size (libxklavier-3.2.tar.gz) = 466656 bytes
-SHA1 (patch-aa) = d01d9e9b7935202a67c0403dda4067c26bc9bb08
+SHA1 (libxklavier-3.3.tar.gz) = 19312997d5ec929f4057cb33c3806d494606c5cf
+RMD160 (libxklavier-3.3.tar.gz) = 70f38f3212a5c14f9894582ee41f65c72a917a82
+Size (libxklavier-3.3.tar.gz) = 475629 bytes
+SHA1 (patch-aa) = 9281c1644063a8de2faebe800749e44c41cbe59c
 SHA1 (patch-ab) = 651f8a6616e8771bf64272ae5d09812c8396b6a2
 SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxklavier/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patches/patch-aa    19 Apr 2007 21:39:17 -0000      1.6
+++ patches/patch-aa    16 Apr 2008 13:19:41 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/04/19 21:39:17 wiz Exp $
+$NetBSD$
 
---- configure.orig     2007-03-22 21:46:19.000000000 +0000
+--- configure.orig     2007-09-04 20:21:30.000000000 +0000
 +++ configure
-@@ -22143,9 +22143,9 @@ fi
+@@ -22403,9 +22403,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; }
@@ -15,7 +15,16 @@
    { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
  else
-@@ -23995,8 +23995,8 @@ fi
+@@ -23336,6 +23336,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++      : Avoid regenerating within pkgsrc
++      exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     echo "$ac_cs_version"; exit ;;
+@@ -24256,8 +24258,8 @@ fi
  
  echo '**********************************************************'
  echo '  Libxklavier is configured with the following backends:'
@@ -26,7 +35,7 @@
      echo "    XKB, libxkbfile is present"
      echo "         default ruleset: $xkb_default_ruleset"
      echo "         base: $xkb_base"
-@@ -24005,7 +24005,7 @@ if test "$enable_xkb_support" == "yes" ;
+@@ -24266,12 +24268,12 @@ if test "$enable_xkb_support" == "yes" ;
      echo "    XKB, libxkbfile is NOT present"
    fi
  fi
@@ -35,3 +44,9 @@
    echo "    xmodmap, default ruleset: $xmodmap_default_ruleset"
    echo "             base: $xmodmap_base"
  fi
+ 
+-if test "$enable_gtk_doc" == "yes" ; then
++if test "$enable_gtk_doc" = "yes" ; then
+   echo "  gtk-doc enabled"
+ else
+   echo "  gtk-doc disabled"