Index: head/x11/xbindkeys/Makefile
===================================================================
--- head/x11/xbindkeys/Makefile	(revision 97999)
+++ head/x11/xbindkeys/Makefile	(revision 98000)
@@ -1,58 +1,60 @@
 # ex:ts=8
 # New ports collection makefile for:	xbindkeys
 # Date created:			Dec 29, 2001
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xbindkeys
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 CATEGORIES=	x11
 MASTER_SITES=	http://hocwp.free.fr/xbindkeys/
 
 MAINTAINER=	ports@FreeBSD.org
 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)
+.if defined(WITH_GUILE)
+LIB_DEPENDS+=	guile.15:${PORTSDIR}/lang/guile
+.else
+CONFIGURE_ARGS+=	--disable-guile
+.endif
+
+.if defined(WITH_TCLTK)
 RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 MAN1+=		xbindkeys_show.1
-PLIST_SUB+=	WITH_GUI=""
+PLIST_SUB+=	TCLTK=""
 .else
 CONFIGURE_ARGS+=	--disable-tk
-PLIST_SUB+=	WITH_GUI="@comment "
+PLIST_SUB+=	TCLTK="@comment "
 .endif
 
-.if defined(WITH_GUILE)
-LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
-CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-.else
-CONFIGURE_ARGS+=	--disable-guile
-.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:
 	@${REINPLACE_CMD} -e 's| wish | ${WISH} |g' ${WRKSRC}/xbindkeys_show
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/xbindkeysrc ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/x11/xbindkeys/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/x11/xbindkeys/distinfo
===================================================================
--- head/x11/xbindkeys/distinfo	(revision 97999)
+++ head/x11/xbindkeys/distinfo	(revision 98000)
@@ -1 +1 @@
-MD5 (xbindkeys-1.7.0.tar.gz) = 7aed65b0565851cf63c3b325993ee353
+MD5 (xbindkeys-1.7.1.tar.gz) = 9176ee5d331160dc3dfafc41e8ec6925

Property changes on: head/x11/xbindkeys/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/x11/xbindkeys/pkg-plist
===================================================================
--- head/x11/xbindkeys/pkg-plist	(revision 97999)
+++ head/x11/xbindkeys/pkg-plist	(revision 98000)
@@ -1,4 +1,4 @@
 bin/xbindkeys
-%%WITH_GUI%%bin/xbindkeys_show
+%%TCLTK%%bin/xbindkeys_show
 %%PORTDOCS%%%%EXAMPLESDIR%%/xbindkeysrc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%

Property changes on: head/x11/xbindkeys/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property