git: e404b1965fdf - main - x11/wayout-sxmo: rename to x11/sxmo-wayout
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Apr 2023 03:41:13 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e404b1965fdfebc5da46fb72c0e6645f42bbdb32
commit e404b1965fdfebc5da46fb72c0e6645f42bbdb32
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-04-06 02:40:59 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
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 <bsd.port.mk>
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