Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Oct 2003 23:45:17 +0900
From:      KATO Tsuguru <tkato@prontomail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/58383: Update port: x11/xbindkeys to 1.6.5
Message-ID:  <20031022234517.48689028.tkato@prontomail.com>
Resent-Message-ID: <200310221450.h9MEoIH5011621@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         58383
>Category:       ports
>Synopsis:       Update port: x11/xbindkeys to 1.6.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 22 07:50:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
>Environment:
>Description:
- Update to version 1.6.5

Remove file:
scripts/post-install

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/xbindkeys/Makefile x11/xbindkeys/Makefile
--- /usr/ports/x11/xbindkeys/Makefile	Sat Apr 12 23:32:41 2003
+++ x11/xbindkeys/Makefile	Mon Oct 20 11:43:31 2003
@@ -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 @@
 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 @@
 	@${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 -urN /usr/ports/x11/xbindkeys/distinfo x11/xbindkeys/distinfo
--- /usr/ports/x11/xbindkeys/distinfo	Sat Apr 12 23:32:41 2003
+++ x11/xbindkeys/distinfo	Mon Oct 20 11:14:14 2003
@@ -1 +1 @@
-MD5 (xbindkeys-1.6.4.tar.gz) = d76243078c629e8093b81b4066de53f5
+MD5 (xbindkeys-1.6.5.tar.gz) = 8fd208abf218a8edf642beb4afb9657b
diff -urN /usr/ports/x11/xbindkeys/scripts/post-install x11/xbindkeys/scripts/post-install
--- /usr/ports/x11/xbindkeys/scripts/post-install	Wed Mar 27 23:06:50 2002
+++ x11/xbindkeys/scripts/post-install	Thu Jan  1 09:00:00 1970
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031022234517.48689028.tkato>