From nobody Wed Apr 20 21:27:05 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1637C11C8B4C; Wed, 20 Apr 2022 21:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KkDJn3tYhz3NfL; Wed, 20 Apr 2022 21:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650490025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qszNjx8fgZGRWagdxDPqarrhV2SENSCdvz22EZOBVQ=; b=rNvf9ndrUJF0PYalfEpVqAxVhczmh5xfKhKs3iNHcWE2yhyg76SrowmDMDUfhRVAYW3fc4 CAjfPuijF7ifnPdh9grRObfnzlTjQqOJq/c2IED+Po+lCppn+c3NTcWFF3B0G8/N/dvNfC V2rZYh5HNcrWjPNA8tkVKK7K7Xay1Pw5LyOqPHJnT0N+hSaasWr5mbcs6wz5qu8ZJpuJRH S2BVu0JV2W5fQ/RH6pSXQjEJ7Dcss1d6Wow90SHBAbsJmRFlzuxapDgbt/GNiIHYMCvuMB G9itUMw1qByWwZBscCKcx+XYhZZVQi8ZrupoUiCWc0PcDbwR6UnEXhY633i7/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A3F41B9A7; Wed, 20 Apr 2022 21:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23KLR5DC079379; Wed, 20 Apr 2022 21:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23KLR5ZR079378; Wed, 20 Apr 2022 21:27:05 GMT (envelope-from git) Date: Wed, 20 Apr 2022 21:27:05 GMT Message-Id: <202204202127.23KLR5ZR079378@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: eb0c36ff34ed - main - sysutils/keyd: update to 2.4.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb0c36ff34ed16cad1f7d78bbcb4787e4a634e19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650490025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qszNjx8fgZGRWagdxDPqarrhV2SENSCdvz22EZOBVQ=; b=hNKiOkFJaoZgOTIloZNW0c9vNGRBTNQdoVTwDQ3/otardiPjf4j9NCoNuIAw5piTv0K/dk gcgFnbGCvdn1jD5vVGeQ41EV9Kakrp15Lrsn9XuQTv9EKfP+N0KKAvYRa5t3QTNJjRljaC uuIaxpRuhkSBcsTbqRGyWLPjurAVpUuWdZn6UOq/QWLlZlLRvrh3rYptv2GHRno1znQdoH PyZcBaqb4skh4AI9Ilj+D5+lj9iV2f7YISdf75M/LTuZNbE0deBMV+MGEdQETWJgI9JCud BtC2gyiTPZLerbYsLOHus8CU/y/f8Hhy+AeZHp4nUEoZZi7dQMVKKWkvoOQFUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650490025; a=rsa-sha256; cv=none; b=TEIQhWNaHyct2CnrQ0CN1Fn0oYJ72pzN5hd05WslLh50TD2d3KMskYC/koM8crTRTiscrP aoLT5FQ+a5TOmJZqvQPzYfymbib8kZYHrQZwMlCkzC8rfaqsyDt20UFqw/6jNSv30dk+kU 4l4PbzIUpsnej8c7yjzCY0rQngJcaEScCT5DqKLyMI0Hgi03c043lbFTNuo9PTIDdsovSr pLIpEnFqj6Hqwh9iueHdiYkJwsFTfO89hrjLRxaShvuLjKoYoIj5nmVcqb+ZmkAg7cMhvL RZLPzVMj6p/+2g9kl6/X2PFFORTdchk9dgncVOdTxIM/T9LcJyVbRMvx+/J/eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb0c36ff34ed16cad1f7d78bbcb4787e4a634e19 commit eb0c36ff34ed16cad1f7d78bbcb4787e4a634e19 Author: Jan Beich AuthorDate: 2022-04-20 01:41:49 +0000 Commit: Jan Beich CommitDate: 2022-04-20 21:25:59 +0000 sysutils/keyd: update to 2.4.0 Changes: https://github.com/rvaiya/keyd/compare/v1.3.0...v2.4.0 Reported by: portscout --- GIDs | 2 +- UIDs | 1 + sysutils/keyd/Makefile | 40 +++++++++++++++++++++++++++------------- sysutils/keyd/distinfo | 6 +++--- sysutils/keyd/pkg-descr | 18 +++++++++++------- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/GIDs b/GIDs index 120c8a098fe0..08f4ad6ecfb9 100644 --- a/GIDs +++ b/GIDs @@ -810,7 +810,7 @@ opensearch:*:855: # free: 866 # free: 867 # free: 868 -# free: 869 +keyd:*:869: buildbot:*:870: # free: 871 bitmark:*:872: diff --git a/UIDs b/UIDs index e6fe80da3c93..e4bb254b6450 100644 --- a/UIDs +++ b/UIDs @@ -816,6 +816,7 @@ opensearch:*:855:855::0:0:opensearch user:/nonexistent:/usr/sbin/nologin # free: 867 # free: 868 # free: 869 +keyd:*:869:869::0:0:Key remapping daemon for evdev:/nonexistent:/usr/sbin/nologin buildbot:*:870:870::0:0:Buildbot user:/var/db/buildbot:/usr/sbin/nologin archiva:*:871:871::0:0:Apache Archiva Daemon:/nonexistent:/usr/sbin/nologin bitmark:*:872:872::0:0:Bitmark Property System:/var/lib/bitmarkd:/usr/sbin/nologin diff --git a/sysutils/keyd/Makefile b/sysutils/keyd/Makefile index 1c3aec41664b..bbbcd170530d 100644 --- a/sysutils/keyd/Makefile +++ b/sysutils/keyd/Makefile @@ -1,40 +1,54 @@ PORTNAME= keyd DISTVERSIONPREFIX= v -DISTVERSION= 1.3.0 +DISTVERSION= 2.4.0 CATEGORIES= sysutils MAINTAINER= jbeich@FreeBSD.org COMMENT= Key remapping daemon for evdev BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto -LIB_DEPENDS= libudev.so:devel/libudev-devd +LIB_DEPENDS= libinotify.so:devel/libinotify LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +USES= gmake python:env shebangfix USE_GITHUB= yes USE_RC_SUBR= ${PORTNAME} GH_ACCOUNT= rvaiya +SHEBANG_FILES= scripts/* MAKE_ARGS= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" \ GIT_HASH="${DISTVERSIONFULL}" PLIST_FILES= bin/${PORTNAME} \ - share/man/man1/${PORTNAME}.1.gz \ - "@dir ${ETCDIR}" + bin/${PORTNAME}-application-mapper \ + ${ETCDIR}/${PORTNAME}.compose +PORTDOCS= * +PORTEXAMPLES= * + +USERS= ${PORTNAME} +GROUPS= ${PORTNAME} + +OPTIONS_DEFINE= DOCS EXAMPLES MANPAGES +OPTIONS_DEFAULT=MANPAGES + +MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc +MANPAGES_ALL_TARGET= all man +MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \ + share/man/man1/${PORTNAME}-application-mapper.1.gz \ post-patch: - @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ - -e 's,/var/lock,/var/run,' \ + @${REINPLACE_CMD} -e 's,/etc,$$(PREFIX)&,' \ -e 's,/usr/local,${LOCALBASE},' \ - -e '/systemd/d' \ - -e '/^CFLAGS/s/=/+=/' \ - -e '/-l/s/$$/ $$(LDFLAGS)/' \ + -e 's,${DOCSDIR_REL}/examples,${EXAMPLESDIR_REL},' \ -e 's/ -O3//' \ ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's,/usr,${PREFIX}&,' \ + -e 's,/etc,${PREFIX}&,' \ + ${WRKSRC}/docs/*.scdoc \ + ${WRKSRC}/examples/*.conf \ + ${WRKSRC}/src/${PORTNAME}.c # https://lists.freebsd.org/pipermail/freebsd-x11/2019-March/023097.html @${REINPLACE_CMD} -e 's,__FreeBSD,&_disabled,' \ - ${WRKSRC}/src/config.h \ - ${WRKSRC}/src/keys.h \ - ${WRKSRC}/src/main.c \ - ${NULL} + ${WRKSRC}/src/vkbd/uinput.c .include diff --git a/sysutils/keyd/distinfo b/sysutils/keyd/distinfo index 4bb954607d58..eeb188bc1ef3 100644 --- a/sysutils/keyd/distinfo +++ b/sysutils/keyd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637913336 -SHA256 (rvaiya-keyd-v1.3.0_GH0.tar.gz) = 9b2195e69f407f08b9aa377d0bca2cd877c5aa9d67a606b81194941ff4ee8b11 -SIZE (rvaiya-keyd-v1.3.0_GH0.tar.gz) = 30789 +TIMESTAMP = 1650418909 +SHA256 (rvaiya-keyd-v2.4.0_GH0.tar.gz) = 100007894ac4fa6e95f5de5c2fe992c8b00e68d9df76c4bcdd8402a29d7b4058 +SIZE (rvaiya-keyd-v2.4.0_GH0.tar.gz) = 625319 diff --git a/sysutils/keyd/pkg-descr b/sysutils/keyd/pkg-descr index 76437d427072..e40a8e68675f 100644 --- a/sysutils/keyd/pkg-descr +++ b/sysutils/keyd/pkg-descr @@ -1,12 +1,16 @@ keyd has several unique features many of which are traditionally only -found in custom keyboard firmware like QMK. Some of the more -interesting ones include: +found in custom keyboard firmware like QMK as well as some which are +unique to keyd. Some of the more interesting ones include: -- Layers. +- Layers (with support for hybrid modifiers). - Key overloading (different behaviour on tap/hold). -- Per keyboard configuration. -- Instantaneous remapping (no flashing required). -- A simple and intuitive config format. -- Being display server agnostic (works on wayland and virtual console alike). +- Keyboard specific configuration. +- Instantaneous remapping (no more flashing :)). +- A client-server model that facilitates scripting and display server + agnostic application remapping. (Currently ships with support for X, + sway, and gnome). +- System wide config (works in a VT). +- First class support for modifier overloading. +- Unicode support. WWW: https://github.com/rvaiya/keyd