From nobody Thu Apr 06 03:41:13 2023 X-Original-To: dev-commits-ports-main@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 4PsS2z0GMdz43NQ1; Thu, 6 Apr 2023 03:41:15 +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 4PsS2y25fCz3PT5; Thu, 6 Apr 2023 03:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680752474; 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=UdpGWkaLJpivDO7AATgPbOD3W4YJLRZ57pCLXzeVLa8=; b=tGZDR5QZFi5gJTPAD86vBCwmbagg6PgXX0YF905rB6lGgB5Xm135HI9TTHgdqYrqICRbev BbfYhL0dEDfeNUo2778EPERXFhDhpSr+Vihik1RvMW77FUNUDipQ5McL9px22SbY9C9dyt P7CIw7ba83aXuQSxEQF+2L5H1HzqoNvkI8V1kF/mAN+IKCyC+r5mK6Pn+y9hxyHJRcciYV RdLCX9AhI+k9qUFzEvBukeu++JXUVkJozZKkjd5DfKOxGVI3pSMKty0TbZYYpCUy7xN9x1 nRZfHfQzpjU2KXspROeT1MkIYzADOLltu6AdfspJ8UzXby7H59NOdM04Lj7WTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680752474; 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=UdpGWkaLJpivDO7AATgPbOD3W4YJLRZ57pCLXzeVLa8=; b=WVMqEpo3BXC4Dhv054BDjv+xBuRam7Zk5JXJqZ2aRyA6Q0zT1I+8Ds5YVAoI9HT31axutp HEBo3ppVkszAQepXE3zoCfPWEgCNBhlWt2yhhuaWThy3ZSDB2mvWyHk97qtnG7VhzIwL7i 8gmq69suUaFMLYrt8STFw11K28WdcdUAp86bOpj0Dz6+MYmO3FjKtmtHZUPXKcCZl2w49n kCKgrAZ/H0F/u8Yq1BfETKa6CwDK78Yywf2rr8IEnxVMsGX2ySh6SRv35tYnbG6DaFnZu1 iVOUe6Mse00/eJY17N2X+21XqukdfsQf8F6LOP5X+V4gGYUU/lUonrUpFBvITw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680752474; a=rsa-sha256; cv=none; b=dGkDIKEZ0m47rKYXTMmxfwChMmca+sAcGG5rAcIzTo/w2GvlS024xK35cYKh8Sk0g1wDqQ aKpD/ADDi35u6PTVV2UWsZiIyODgDrimZOcPSk1oTa1P9CH4TmWPwypdXRYCKvYVdC1OqF qaQkRbOwyibbc5pKRkzUoQ68tnTHHJ5Ic8hmqs47OSMAZAET8qWLdRiO+WvVnthFot1sOI iRNu/PtK0ch6KQmzXjsxPmodHNz/ivvGn0E5/4UEafigWbtKh9Jqftetekjb+1p59t7LpQ oYVHkEN94nNvIbmELSyOOmOyBmC5/17v+FTKvElf9ZvDLILgdI7Uqa0QqYzmRA== 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 4PsS2y0VvlzpCF; Thu, 6 Apr 2023 03:41:14 +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 3363fDL7093428; Thu, 6 Apr 2023 03:41:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3363fDTu093427; Thu, 6 Apr 2023 03:41:13 GMT (envelope-from git) Date: Thu, 6 Apr 2023 03:41:13 GMT Message-Id: <202304060341.3363fDTu093427@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: e404b1965fdf - main - x11/wayout-sxmo: rename to x11/sxmo-wayout List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: e404b1965fdfebc5da46fb72c0e6645f42bbdb32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e404b1965fdfebc5da46fb72c0e6645f42bbdb32 commit e404b1965fdfebc5da46fb72c0e6645f42bbdb32 Author: Jan Beich AuthorDate: 2023-04-06 02:40:59 +0000 Commit: Jan Beich CommitDate: 2023-04-06 03:41:07 +0000 x11/wayout-sxmo: rename to x11/sxmo-wayout --- x11/Makefile | 2 +- x11/{wayout => sxmo-wayout}/Makefile | 8 +++++++- x11/{wayout => sxmo-wayout}/distinfo | 0 x11/{wayout => sxmo-wayout}/pkg-descr | 0 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/x11/Makefile b/x11/Makefile index 38aa9339ea0b..c5b8aef50b75 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -384,6 +384,7 @@ SUBDIR += swayrbar SUBDIR += swaysettings SUBDIR += sxhkd + SUBDIR += sxmo-wayout SUBDIR += sxpc SUBDIR += tabbed SUBDIR += taiga @@ -412,7 +413,6 @@ SUBDIR += waybar SUBDIR += wayland-logout SUBDIR += waylock - SUBDIR += wayout SUBDIR += wbar SUBDIR += wcm SUBDIR += wdisplays diff --git a/x11/wayout/Makefile b/x11/sxmo-wayout/Makefile similarity index 83% rename from x11/wayout/Makefile rename to x11/sxmo-wayout/Makefile index 00c1e4dc2474..103d4b125b8e 100644 --- a/x11/wayout/Makefile +++ b/x11/sxmo-wayout/Makefile @@ -2,6 +2,7 @@ PORTNAME= wayout DISTVERSION= 0.1.4 CATEGORIES= x11 wayland MASTER_SITES= https://git.sr.ht/~proycon/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ +PKGNAMEPREFIX= sxmo- MAINTAINER= jbeich@FreeBSD.org COMMENT= Output simple text to a Wayland desktop widget @@ -16,7 +17,7 @@ LIB_DEPENDS= libwayland-client.so:graphics/wayland USES= compiler:c11 gnome meson pkgconfig USE_GNOME= cairo pango CFLAGS+= -Wno-error=strict-prototypes # Clang 15, similar to wlclock -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PKGBASE} OPTIONS_DEFINE= EPOLL MANPAGES OPTIONS_DEFAULT=EPOLL MANPAGES @@ -29,4 +30,9 @@ MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz +post-install: +# Rename to avoid conflict with x11/wayout + ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin/${PKGBASE} + .include diff --git a/x11/wayout/distinfo b/x11/sxmo-wayout/distinfo similarity index 100% rename from x11/wayout/distinfo rename to x11/sxmo-wayout/distinfo diff --git a/x11/wayout/pkg-descr b/x11/sxmo-wayout/pkg-descr similarity index 100% rename from x11/wayout/pkg-descr rename to x11/sxmo-wayout/pkg-descr