Date: Wed, 27 Mar 2002 11:40:53 +0100 (CET) From: Oliver Braun <obraun@informatik.unibw-muenchen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36366: [Maintainer Update] x11/xbindkeys, fixed problems with wish Message-ID: <20020327104053.994515A545@nemesis.informatik.unibw-muenchen.de>
next in thread | raw e-mail | index | archive | help
>Number: 36366
>Category: ports
>Synopsis: [Maintainer Update] x11/xbindkeys, fixed problems with wish
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 27 02:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Oliver Braun
>Release: FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD nemesis.informatik.unibw-muenchen.de 4.5-STABLE FreeBSD 4.5-STABLE #0: Thu Mar 21 12:00:59 CET 2002 root@nemesis.informatik.unibw-muenchen.de:/usr/obj/usr/src/sys/NEMESIS_OB i386
>Description:
short version:
* added knob WITH_GUI
* added scripts/post-install
* bumped PORTREVISION, because xbindkeys_show does not work prior to
these changes
long version:
xbindkeys port includes a script xbindkeys_show, which executes wish.
This does not work on FreeBSD, since only wish+versionnumber is
available. Furthermore, xbindkeys depends on Tk.
Since xbindkeys_show shows only the key bindings in a tk window, I have
choosen not to install xbindkeys_show by default.
I have added a knob WITH_GUI for installing with xbindkeys_show. If wish
is not found x11-toolkits/tk83 will be installed.
To change wish to wish+versionnumber I have added a post-install script.
Regards,
Olli
>How-To-Repeat:
>Fix:
diff -ruN xbindkeys.bak/Makefile xbindkeys/Makefile
--- xbindkeys.bak/Makefile Wed Mar 27 01:27:49 2002
+++ xbindkeys/Makefile Wed Mar 27 11:25:03 2002
@@ -8,16 +8,33 @@
PORTNAME= xbindkeys
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://hocwp.free.fr/xbindkeys/
MAINTAINER= obraun@informatik.unibw-muenchen.de
+INSTALL_TARGET= install-binPROGRAMS install-man
+
+.if defined(WITH_GUI)
+RUN_DEPENDS= wish:${PORTSDIR}/x11-toolkits/tk83
+PLIST_SUB+= WITH_GUI=""
+.else
+PLIST_SUB+= WITH_GUI="@comment "
+.endif
+
USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${X11BASE}/include"
MAN1= xbindkeys.1 xbindkeys_show.1
+
+pre-fetch:
+.if !defined(WITH_GUI)
+ @${ECHO} ""
+ @${ECHO} " Define WITH_GUI to install xbindkeys_show (requires Tk)"
+ @${ECHO} ""
+.endif
.if !defined(NOPORTDOCS)
post-install:
diff -ruN xbindkeys.bak/pkg-plist xbindkeys/pkg-plist
--- xbindkeys.bak/pkg-plist Sat Dec 29 16:04:03 2001
+++ xbindkeys/pkg-plist Wed Mar 27 11:18:12 2002
@@ -1,4 +1,4 @@
bin/xbindkeys
-bin/xbindkeys_show
+%%WITH_GUI%%bin/xbindkeys_show
%%PORTDOCS%%share/examples/xbindkeys/xbindkeysrc
%%PORTDOCS%%@dirrm share/examples/xbindkeys
diff -ruN xbindkeys.bak/scripts/post-install xbindkeys/scripts/post-install
--- xbindkeys.bak/scripts/post-install Thu Jan 1 01:00:00 1970
+++ xbindkeys/scripts/post-install Wed Mar 27 11:23:29 2002
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ ${WITH_GUI} ]
+then
+ WISHPROGNAME=`ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^wish(step)?(x|([0-9]+\.[0-9]+))([a-z][a-z])?$' | head -1`
+ sed -e "s/wish/${WISHPROGNAME}/" < ${WRKSRC}/xbindkeys_show > ${WRKSRC}/xbindkeys_show.fix
+ chmod a+x ${WRKSRC}/xbindkeys_show.fix
+ cp -p ${WRKSRC}/xbindkeys_show.fix ${PREFIX}/bin/xbindkeys_show
+fi
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020327104053.994515A545>