Do not install the xbindkeys_show utility, which requires Tk, to keep this

package small.  Also, make this package install under PREFIX and not X11BASE.
Bump PKGREVISION to 1 because of these.

While here, split the Makefile in two parts to help in the creation of the
new xbindkeys-tk package.

5 files changed, 45 insertions, 15 deletions

diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 1aafda4c3fd..f688d12dfec 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -1,17 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:51 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/17 15:08:34 jmmv Exp $
 #
 
-DISTNAME=	xbindkeys-1.5.5
-CATEGORIES=	x11
-MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
+.include "Makefile.common"
 
-MAINTAINER=	jmmv@NetBSD.org
-HOMEPAGE=	http://hocwp.free.fr/xbindkeys/xbindkeys.html
-COMMENT=	Launches shell commands with your keyboard or your mouse
+PKGREVISION=	1
 
-USE_BUILDLINK2=	yes
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
-
-.include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xbindkeys/Makefile.common b/x11/xbindkeys/Makefile.common
new file mode 100644
index 00000000000..7736d9d0d15
--- /dev/null
+++ b/x11/xbindkeys/Makefile.common
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.common,v 1.1 2003/09/17 15:08:35 jmmv Exp $
+#
+
+DISTNAME=	xbindkeys-1.5.5
+CATEGORIES=	x11
+MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
+
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	http://hocwp.free.fr/xbindkeys/xbindkeys.html
+COMMENT=	Launches shell commands with your keyboard or your mouse
+
+DISTINFO_FILE=	${.CURDIR}/../../x11/xbindkeys/distinfo
+PATCH_DIR=	${.CURDIR}/../../x11/xbindkeys/patches
+
+USE_BUILDLINK2=	yes
+USE_X11=	yes
+GNU_CONFIGURE=	yes
diff --git a/x11/xbindkeys/PLIST b/x11/xbindkeys/PLIST
index f3a19528da2..1f8da1aca94 100644
--- a/x11/xbindkeys/PLIST
+++ b/x11/xbindkeys/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2002/07/11 14:23:37 tron Exp $
-bin/xbindkeys_config
+@comment $NetBSD: PLIST,v 1.2 2003/09/17 15:08:36 jmmv Exp $
+bin/xbindkeys
+man/man1/xbindkeys.1
diff --git a/x11/xbindkeys/distinfo b/x11/xbindkeys/distinfo
index 51371cd4ecd..f31145eb1eb 100644
--- a/x11/xbindkeys/distinfo
+++ b/x11/xbindkeys/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/12/15 11:59:22 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/09/17 15:08:36 jmmv Exp $
 
 SHA1 (xbindkeys-1.5.5.tar.gz) = f568d80c40f7163be21d7e02fb1c50ed1a4d28d5
 Size (xbindkeys-1.5.5.tar.gz) = 85470 bytes
+SHA1 (patch-aa) = 4343ab36cc1727dc0cf21be810c8c3decf0f5704
diff --git a/x11/xbindkeys/patches/patch-aa b/x11/xbindkeys/patches/patch-aa
new file mode 100644
index 00000000000..cebf89028c0
--- /dev/null
+++ b/x11/xbindkeys/patches/patch-aa
@@ -0,0 +1,20 @@
+$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