ports/61251: Update port: x11/xbindkeys to 1.7.1

[KATO Tsuguru]

>Number:         61251
>Category:       ports
>Synopsis:       Update port: x11/xbindkeys to 1.7.1
>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:   Mon Jan 12 05:10:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 1.7.1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/xbindkeys/Makefile x11/xbindkeys/Makefile
--- /usr/ports/x11/xbindkeys/Makefile	Mon Jan  5 12:53:20 2004
+++ x11/xbindkeys/Makefile	Sat Jan 10 14:34:19 2004
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xbindkeys
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 CATEGORIES=	x11
 MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
 
@@ -15,35 +15,37 @@
 COMMENT=	Allows you to launch shell commands under X with your keyboard
 
 USE_XLIB=	yes
-USE_REINPLACE=	yes
 USE_GNOME=	gnometarget
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=	xbindkeys.1
+MAN1=		xbindkeys.1
 
 WISH=		${LOCALBASE}/bin/wish8.4
 
-.if defined(WITH_GUI)
-RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-MAN1+=		xbindkeys_show.1
-PLIST_SUB+=	WITH_GUI=""
+.if defined(WITH_GUILE)
+LIB_DEPENDS+=	guile.15:${PORTSDIR}/lang/guile
 .else
-CONFIGURE_ARGS+=	--disable-tk
-PLIST_SUB+=	WITH_GUI="@comment "
+CONFIGURE_ARGS+=	--disable-guile
 .endif
 
-.if defined(WITH_GUILE)
-LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
-CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+.if defined(WITH_TCLTK)
+RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+MAN1+=		xbindkeys_show.1
+PLIST_SUB+=	TCLTK=""
 .else
-CONFIGURE_ARGS+=	--disable-guile
+CONFIGURE_ARGS+=	--disable-tk
+PLIST_SUB+=	TCLTK="@comment "
 .endif
 
 pre-everything::
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "	Define WITH_GUI to install xbindkeys_show (requires Tk)"
-	@${ECHO_MSG} "	Define WITH_GUILE to allow guile configuration file style"
+	@${ECHO_MSG} "XbindKeys has the following tunable options:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	WITH_GUILE=yes			Turns on Guile support"
+	@${ECHO_MSG} "	WITH_TCLTK=yes			Turns on Tcl/Tk support"
 	@${ECHO_MSG} ""
 
 post-patch:
diff -urN /usr/ports/x11/xbindkeys/distinfo x11/xbindkeys/distinfo
--- /usr/ports/x11/xbindkeys/distinfo	Mon Jan  5 12:53:20 2004
+++ x11/xbindkeys/distinfo	Sat Jan 10 14:32:19 2004
@@ -1 +1 @@
-MD5 (xbindkeys-1.7.0.tar.gz) = 7aed65b0565851cf63c3b325993ee353
+MD5 (xbindkeys-1.7.1.tar.gz) = 9176ee5d331160dc3dfafc41e8ec6925
diff -urN /usr/ports/x11/xbindkeys/pkg-plist x11/xbindkeys/pkg-plist
--- /usr/ports/x11/xbindkeys/pkg-plist	Sat Apr 12 23:32:41 2003
+++ x11/xbindkeys/pkg-plist	Mon Jan  5 11:54:50 2004
@@ -1,4 +1,4 @@
 bin/xbindkeys
-%%WITH_GUI%%bin/xbindkeys_show
+%%TCLTK%%bin/xbindkeys_show
 %%PORTDOCS%%%%EXAMPLESDIR%%/xbindkeysrc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: