From owner-svn-ports-all@FreeBSD.ORG Fri Aug 2 07:17:58 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C9B9B659; Fri, 2 Aug 2013 07:17:58 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A79DE2879; Fri, 2 Aug 2013 07:17:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r727HwQn027329; Fri, 2 Aug 2013 07:17:58 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r727HwoP027324; Fri, 2 Aug 2013 07:17:58 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308020717.r727HwoP027324@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 2 Aug 2013 07:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324146 - in head/sysutils/usbhotkey: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Aug 2013 07:17:59 -0000 Author: danfe Date: Fri Aug 2 07:17:57 2013 New Revision: 324146 URL: http://svnweb.freebsd.org/changeset/ports/324146 Log: - Unbreak the build by removing conflict patch; not needed as the code is compatible with Ruby versions 1.8 and 1.9 out of the box - Reindent Makefile, tidy up header and COMMENT, renew LIB_DEPENDS - Utilize those recently added helpers for OPTIONS - Define LICENSE (GPLv2), and improve port description slightly Deleted: head/sysutils/usbhotkey/files/extra-patch-main.c Modified: head/sysutils/usbhotkey/Makefile head/sysutils/usbhotkey/pkg-descr Modified: head/sysutils/usbhotkey/Makefile ============================================================================== --- head/sysutils/usbhotkey/Makefile Fri Aug 2 06:36:43 2013 (r324145) +++ head/sysutils/usbhotkey/Makefile Fri Aug 2 07:17:57 2013 (r324146) @@ -1,44 +1,33 @@ -# Created by: ntarmos@ceid.upatras.gr +# Created by: Nikos Ntarmos # $FreeBSD$ -PORTNAME= usbhotkey -PORTVERSION= 0.4 -CATEGORIES= sysutils -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ - -MAINTAINER= ntarmos@ceid.upatras.gr -COMMENT= A utility to remap USB keyboards under X11 - -LIB_DEPENDS= hid.0:${PORTSDIR}/devel/libhid \ - Xtst.6:${PORTSDIR}/x11/libXtst - -BROKEN= Does not patch - -OPTIONS_DEFINE= GUI -OPTIONS_DEFAULT= GUI -GUI_DESC= Enable GUI bits (Imlib dependency) - -USE_RUBY= yes -USE_GMAKE= yes -HAS_CONFIGURE= yes - -.include +PORTNAME= usbhotkey +PORTVERSION= 0.4 +CATEGORIES= sysutils +MASTER_SITES= SF/${PORTNAME}/${PORTNAME} + +MAINTAINER= ntarmos@ceid.upatras.gr +COMMENT= Utility to remap USB keyboards under X11 + +LICENSE= GPLv2 + +LIB_DEPENDS= libhid.so:${PORTSDIR}/devel/libhid \ + libXtst.so:${PORTSDIR}/x11/libXtst + +USES= gmake +USE_RUBY= yes +HAS_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/ruby-${RUBY_VER} \ -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} LDFLAGS+= -L${LOCALBASE}/lib -.if ${PORT_OPTIONS:MGUI} -LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib -.else -CONFIGURE_ARGS+= --without-Imlib -.endif - -.include - -.if ${RUBY_VER} == 1.9 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-main.c -.endif +OPTIONS_DEFINE= GUI +OPTIONS_DEFAULT= GUI +GUI_DESC= Enable GUI bits (via Imlib) + +GUI_LIB_DEPENDS= libImlib.so:${PORTSDIR}/graphics/imlib +GUI_CONFIGURE_OFF= --without-Imlib -.include +.include Modified: head/sysutils/usbhotkey/pkg-descr ============================================================================== --- head/sysutils/usbhotkey/pkg-descr Fri Aug 2 06:36:43 2013 (r324145) +++ head/sysutils/usbhotkey/pkg-descr Fri Aug 2 07:17:57 2013 (r324146) @@ -1,7 +1,7 @@ USBHotkey allows you to catch USB keyboard events (key press and release -events) and transform them into X11 keyboard events using a ruby script. -This provides a mechanism for creating keymaps that can be more -complicated than the standard table-based keymap approach of X11. +events) and transform them into X11 keyboard events using a Ruby script. +This provides mechanism for creating keymaps that can be more complicated +than the standard table-based keymap approach of X11. WWW: http://usbhotkey.sourceforge.net/