diff options
| -rw-r--r-- | x11/libxklavier/Makefile | 4 | ||||
| -rw-r--r-- | x11/libxklavier/PLIST | 4 | ||||
| -rw-r--r-- | x11/libxklavier/distinfo | 12 | ||||
| -rw-r--r-- | x11/libxklavier/patches/patch-aa | 16 | ||||
| -rw-r--r-- | x11/libxklavier/patches/patch-ab | 10 |
5 files changed, 25 insertions, 21 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 32e469abc1d..f4c7209e9ce 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2007/04/19 21:39:17 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2008/04/16 16:41:37 drochner Exp $ # -DISTNAME= libxklavier-3.2 +DISTNAME= libxklavier-3.5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gswitchit/} diff --git a/x11/libxklavier/PLIST b/x11/libxklavier/PLIST index ec82bb4119b..12456444742 100644 --- a/x11/libxklavier/PLIST +++ b/x11/libxklavier/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/09/15 15:11:52 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/16 16:41:37 drochner Exp $ include/libxklavier/xkl_config_item.h include/libxklavier/xkl_config_rec.h include/libxklavier/xkl_config_registry.h @@ -23,7 +23,5 @@ share/gtk-doc/html/libxklavier/libxklavier.devhelp2 share/gtk-doc/html/libxklavier/right.png share/gtk-doc/html/libxklavier/style.css share/gtk-doc/html/libxklavier/up.png -share/libxklavier/xfree86.xml -@dirrm share/libxklavier @dirrm share/gtk-doc/html/libxklavier @dirrm include/libxklavier diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 486246b384a..c94635a61d3 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.15 2007/04/19 21:39:17 wiz Exp $ +$NetBSD: distinfo,v 1.16 2008/04/16 16:41:37 drochner 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 (patch-ab) = 651f8a6616e8771bf64272ae5d09812c8396b6a2 +SHA1 (libxklavier-3.5.tar.gz) = c9e318f31c5ac5895aae01069c53c7f7ab554b13 +RMD160 (libxklavier-3.5.tar.gz) = b1b9fc5f700f356ad4f369411cee9fa6d64e5528 +Size (libxklavier-3.5.tar.gz) = 448663 bytes +SHA1 (patch-aa) = 855dd7bf3927926971997a3415800684a538ec0c +SHA1 (patch-ab) = dfdbadd45de1521ad5bc03a23c9bd0ae7f9b5626 SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa index 035379a4c62..5ae82c49c2a 100644 --- a/x11/libxklavier/patches/patch-aa +++ b/x11/libxklavier/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2007/04/19 21:39:17 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2008/04/16 16:41:38 drochner Exp $ ---- configure.orig 2007-03-22 21:46:19.000000000 +0000 +--- configure.orig 2007-09-04 22:21:30.000000000 +0200 +++ 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,7 @@ $NetBSD: patch-aa,v 1.6 2007/04/19 21:39:17 wiz Exp $ { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else -@@ -23995,8 +23995,8 @@ fi +@@ -24256,8 +24258,8 @@ fi echo '**********************************************************' echo ' Libxklavier is configured with the following backends:' @@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.6 2007/04/19 21:39:17 wiz Exp $ 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 +35,9 @@ $NetBSD: patch-aa,v 1.6 2007/04/19 21:39:17 wiz Exp $ 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" diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab index e4998a0fcdd..b86057677df 100644 --- a/x11/libxklavier/patches/patch-ab +++ b/x11/libxklavier/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.5 2007/04/19 21:39:17 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2008/04/16 16:41:38 drochner Exp $ ---- Makefile.in.orig 2007-03-22 21:46:18.000000000 +0000 +--- Makefile.in.orig 2008-02-28 15:49:53.000000000 +0100 +++ Makefile.in -@@ -217,7 +217,7 @@ sbindir = @sbindir@ +@@ -219,7 +219,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = libxklavier doc tests +SUBDIRS = libxklavier doc - config_xml_DATA = xfree86.xml - config_xmldir = $(datadir)/$(PACKAGE) EXTRA_DIST = libxklavier.spec libxklavier.spec.in \ + autogen.sh \ + CREDITS libxklavier.pc.in gtk-doc.make \ |