summaryrefslogtreecommitdiff
path: root/x11/xbindkeys
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@FreeBSD.org>2003-10-29 16:09:10 +0000
committerChristian Weisgerber <naddy@FreeBSD.org>2003-10-29 16:09:10 +0000
commit99a6666cfda57f7cab5bc0fc25ffd501ef77f1c6 (patch)
treeafe64c98e407b360f4fe21f6efe55e0059427357 /x11/xbindkeys
parentUpdate to 1.18, for both security reasons (a vulnerability discovered by (diff)
Update to version 1.6.5.
PR: 58383 Submitted by: Ports Fury
Notes
Notes: svn path=/head/; revision=92569
Diffstat (limited to 'x11/xbindkeys')
-rw-r--r--x11/xbindkeys/Makefile19
-rw-r--r--x11/xbindkeys/distinfo2
-rw-r--r--x11/xbindkeys/scripts/post-install9
3 files changed, 11 insertions, 19 deletions
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 98fc19d7bd02..310c8b3f7fc1 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= xbindkeys
-PORTVERSION= 1.6.4
-PORTREVISION= 0
+PORTVERSION= 1.6.5
CATEGORIES= x11
MASTER_SITES= http://hocwp.free.fr/xbindkeys/
@@ -16,17 +15,20 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Allows you to launch shell commands under X with your keyboard
USE_XLIB= yes
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
-INSTALL_TARGET= install-binPROGRAMS
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= xbindkeys.1
+WISH= ${LOCALBASE}/bin/wish8.4
+
.if defined(WITH_GUI)
-RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83
+RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
MAN1+= xbindkeys_show.1
PLIST_SUB+= WITH_GUI=""
-SCRIPTS_ENV+= WITH_GUI="YES"
.else
+CONFIGURE_ARGS+= --disable-tk
PLIST_SUB+= WITH_GUI="@comment "
.endif
@@ -37,11 +39,10 @@ pre-everything::
@${ECHO_MSG} ""
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's| wish | ${WISH} |g' ${WRKSRC}/xbindkeys_show
+
post-install:
- ${INSTALL_MAN} ${WRKSRC}/xbindkeys.1 ${MANPREFIX}/man/man1
-.if defined(WITH_GUI)
- ${INSTALL_MAN} ${WRKSRC}/xbindkeys_show.1 ${MANPREFIX}/man/man1
-.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/xbindkeysrc ${EXAMPLESDIR}
diff --git a/x11/xbindkeys/distinfo b/x11/xbindkeys/distinfo
index ce8212247684..254f47429a41 100644
--- a/x11/xbindkeys/distinfo
+++ b/x11/xbindkeys/distinfo
@@ -1 +1 @@
-MD5 (xbindkeys-1.6.4.tar.gz) = d76243078c629e8093b81b4066de53f5
+MD5 (xbindkeys-1.6.5.tar.gz) = 8fd208abf218a8edf642beb4afb9657b
diff --git a/x11/xbindkeys/scripts/post-install b/x11/xbindkeys/scripts/post-install
deleted file mode 100644
index 7b1650fba88a..000000000000
--- a/x11/xbindkeys/scripts/post-install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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