svn commit: r324146 - in head/sysutils/usbhotkey: . files

[Alexey Dokuchaev]

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 at ceid.upatras.gr
+# Created by: Nikos Ntarmos <ntarmos at ceid.upatras.gr>
 # $FreeBSD$
 
-PORTNAME=		usbhotkey
-PORTVERSION=		0.4
-CATEGORIES=		sysutils
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/
-
-MAINTAINER=		ntarmos at 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 <bsd.port.options.mk>
+PORTNAME=	usbhotkey
+PORTVERSION=	0.4
+CATEGORIES=	sysutils
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
+
+MAINTAINER=	ntarmos at 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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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/