From d9e0cd8801df5ee331801dda9e57c7683ac260dc Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Wed, 3 Dec 2003 12:52:59 +0000
Subject: Update xbindkeys{,-tk} to 1.6.5:

1.6.5: Add a --disable-tk option to prevent xbindkeys_show install. So no
tcl/tk dependency is needed.
Add a NOTE in xbindkeys man page to say that xbindkeys can reread its config
file with a -HUP signal (killall -HUP xbindkeys).
Add two verbose tests (forgotten in other versions).

1.6.4: Add an option at compile time to launch programs with a system call
instead of a fork+exec call (see ./configure --help).
Remove an umask(022) in the daemonize function which cause troubles.

1.6.3: Change to switch to autoconf2.5X and automake >= 1.6.
Xbindkeys doesn't move anymore to /tmp after the daemonize function.

1.6.2: Minor change in the configure.in to prevent rebuild of Makefile when
doing a make.

1.6.1: Minor bugfix: use strtol instead of atoi for hexadecimal modifier.

1.6.0: Add a 'Release' modifier to catch release events of keys or mouse
buttons instead of press events.
Xbindkeys doesn't use pthreads+system any more to start commands, it use
fork+exec instead.
Some modifications to make the code 'cleaner'.
---
 x11/xbindkeys/Makefile         |  4 ++--
 x11/xbindkeys/Makefile.common  |  4 ++--
 x11/xbindkeys/distinfo         |  8 +++-----
 x11/xbindkeys/patches/patch-aa | 20 --------------------
 x11/xbindkeys/patches/patch-ab | 13 -------------
 5 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 x11/xbindkeys/patches/patch-aa
 delete mode 100644 x11/xbindkeys/patches/patch-ab

(limited to 'x11/xbindkeys')

diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index b7b28514270..2e59fb24728 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/10/13 11:39:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/03 12:52:59 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	2
+CONFIGURE_ARGS+=	--disable-tk
 
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xbindkeys/Makefile.common b/x11/xbindkeys/Makefile.common
index 69349939e46..729ead1b843 100644
--- a/x11/xbindkeys/Makefile.common
+++ b/x11/xbindkeys/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2003/09/25 21:24:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/12/03 12:52:59 jmmv Exp $
 #
 
-DISTNAME=	xbindkeys-1.5.5
+DISTNAME=	xbindkeys-1.6.5
 CATEGORIES=	x11
 MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
 
diff --git a/x11/xbindkeys/distinfo b/x11/xbindkeys/distinfo
index 8d9c928256c..4e9b3184780 100644
--- a/x11/xbindkeys/distinfo
+++ b/x11/xbindkeys/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/10/13 11:39:46 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/12/03 12:52:59 jmmv Exp $
 
-SHA1 (xbindkeys-1.5.5.tar.gz) = f568d80c40f7163be21d7e02fb1c50ed1a4d28d5
-Size (xbindkeys-1.5.5.tar.gz) = 85470 bytes
-SHA1 (patch-aa) = 4343ab36cc1727dc0cf21be810c8c3decf0f5704
-SHA1 (patch-ab) = 2873d0b02dd4791102f106c369f02d9bf99902f9
+SHA1 (xbindkeys-1.6.5.tar.gz) = 06bffe8c509fda4498e542edabc1d52d537579c1
+Size (xbindkeys-1.6.5.tar.gz) = 110393 bytes
diff --git a/x11/xbindkeys/patches/patch-aa b/x11/xbindkeys/patches/patch-aa
deleted file mode 100644
index cebf89028c0..00000000000
--- a/x11/xbindkeys/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/09/17 15:08:37 jmmv Exp $
-
---- Makefile.in.orig	2002-10-05 12:18:52.000000000 +0200
-+++ Makefile.in
-@@ -89,13 +89,13 @@ xbindkeys_LDADD = @X_LIBS@
- 
- xbindkeys_DEPENDENCIES = xbindkeys.o keys.o options.o get_key.o grab_key.o
- 
--man_MANS = xbindkeys.1 xbindkeys_show.1
-+man_MANS = xbindkeys.1
- 
- EXTRA_DIST = BUGS xbindkeys.1 xbindkeys_show.1 \
- 	TODO xbindkeysrc xbindkeys_show
- 
- 
--bin_SCRIPTS = xbindkeys_show
-+bin_SCRIPTS =
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/xbindkeys/patches/patch-ab b/x11/xbindkeys/patches/patch-ab
deleted file mode 100644
index 8398918f4f1..00000000000
--- a/x11/xbindkeys/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/10/13 11:39:46 jmmv Exp $
-
---- configure.orig	2002-10-05 12:17:31.000000000 +0200
-+++ configure
-@@ -1577,7 +1577,7 @@ else
-   enable_pthread=yes
- fi
- 
--if test x$enable_pthread == xyes; then
-+if test x$enable_pthread = xyes; then
-    for ac_hdr in pthread.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-- 
cgit v1.2.3