aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--UPDATING7
-rw-r--r--x11-toolkits/wlroots/Makefile7
-rw-r--r--x11-toolkits/wlroots/distinfo8
-rw-r--r--x11-toolkits/wlroots/pkg-plist7
-rw-r--r--x11-wm/sway/Makefile10
-rw-r--r--x11-wm/sway/distinfo8
-rw-r--r--x11-wm/sway/pkg-plist11
-rw-r--r--x11/Makefile2
-rw-r--r--x11/swayidle/Makefile33
-rw-r--r--x11/swayidle/distinfo3
-rw-r--r--x11/swayidle/pkg-descr4
-rw-r--r--x11/swaylock/Makefile38
-rw-r--r--x11/swaylock/distinfo3
-rw-r--r--x11/swaylock/pkg-descr9
14 files changed, 120 insertions, 30 deletions
diff --git a/UPDATING b/UPDATING
index d3fd6ae5296d..43a832ab42ac 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20190114:
+ AFFECTS: x11-wm/sway
+ AUTHOR: jbeich@FreeBSD.org
+
+ swayidle and swaylock split out into x11/swayidle and x11/swaylock.
+ Check your sway config and install those if required.
+
20190113:
AFFECTS: users of net/GeoIP
AUTHOR: adamw@FreeBSD.org
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index 68bbda559cdd..3ce17294ce9e 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,13 +1,10 @@
# $FreeBSD$
PORTNAME= wlroots
-DISTVERSION= 0.2
-PORTREVISION= 2
+DISTVERSION= 0.2-123
+DISTVERSIONSUFFIX= -g10a2c4ed
CATEGORIES= x11-toolkits
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES= 92e39b586c0e.patch:-p1
-
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Modular Wayland compositor library
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index c5e331a75543..e021cdb1bd6e 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1543408964
-SHA256 (swaywm-wlroots-0.2_GH0.tar.gz) = 0b690c5db5a1f11051a28f0349655322fe54d92f7c2dc8d3c6e5559b1098bfd8
-SIZE (swaywm-wlroots-0.2_GH0.tar.gz) = 437638
-SHA256 (92e39b586c0e.patch) = 82b0982fb734fbc28be5a41d84d4652a172711ca10872b7f4b9139f13b2747d0
-SIZE (92e39b586c0e.patch) = 535
+TIMESTAMP = 1547412308
+SHA256 (swaywm-wlroots-0.2-123-g10a2c4ed_GH0.tar.gz) = a723c595aeb2a3a13914454c72abe18577720a2077926f1c6e9781a5ec64f8d4
+SIZE (swaywm-wlroots-0.2-123-g10a2c4ed_GH0.tar.gz) = 469696
diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots/pkg-plist
index e8070c402253..f4a05366f198 100644
--- a/x11-toolkits/wlroots/pkg-plist
+++ b/x11-toolkits/wlroots/pkg-plist
@@ -13,6 +13,7 @@ include/wlr/interfaces/wlr_input_device.h
include/wlr/interfaces/wlr_keyboard.h
include/wlr/interfaces/wlr_output.h
include/wlr/interfaces/wlr_pointer.h
+include/wlr/interfaces/wlr_switch.h
include/wlr/interfaces/wlr_tablet_pad.h
include/wlr/interfaces/wlr_tablet_tool.h
include/wlr/interfaces/wlr_touch.h
@@ -26,8 +27,10 @@ include/wlr/types/wlr_box.h
include/wlr/types/wlr_buffer.h
include/wlr/types/wlr_compositor.h
include/wlr/types/wlr_cursor.h
+include/wlr/types/wlr_data_control_v1.h
include/wlr/types/wlr_data_device.h
include/wlr/types/wlr_export_dmabuf_v1.h
+include/wlr/types/wlr_foreign_toplevel_management_v1.h
include/wlr/types/wlr_gamma_control.h
include/wlr/types/wlr_gamma_control_v1.h
include/wlr/types/wlr_gtk_primary_selection.h
@@ -45,13 +48,17 @@ include/wlr/types/wlr_output.h
include/wlr/types/wlr_output_damage.h
include/wlr/types/wlr_output_layout.h
include/wlr/types/wlr_pointer.h
+include/wlr/types/wlr_pointer_constraints_v1.h
include/wlr/types/wlr_presentation_time.h
+include/wlr/types/wlr_primary_selection.h
include/wlr/types/wlr_region.h
+include/wlr/types/wlr_relative_pointer_v1.h
include/wlr/types/wlr_screencopy_v1.h
include/wlr/types/wlr_screenshooter.h
include/wlr/types/wlr_seat.h
include/wlr/types/wlr_server_decoration.h
include/wlr/types/wlr_surface.h
+include/wlr/types/wlr_switch.h
include/wlr/types/wlr_tablet_pad.h
include/wlr/types/wlr_tablet_tool.h
include/wlr/types/wlr_tablet_v2.h
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 0a357b25ee71..a726ffaa55b2 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,12 +1,10 @@
# $FreeBSD$
PORTNAME= sway
-DISTVERSION= 1.0-beta.2
+DISTVERSION= 1.0-beta.2-189
+DISTVERSIONSUFFIX= -g2573606b
CATEGORIES= x11-wm
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES= 4a11d0e470bc.patch:-p1
-
MAINTAINER= jbeich@FreeBSD.org
COMMENT= i3-compatible Wayland compositor
@@ -14,8 +12,10 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
- wayland-protocols>=1.14:graphics/wayland-protocols
+ wayland-protocols>=1.14:graphics/wayland-protocols \
+ wlroots>=0.2.65:x11-toolkits/wlroots
LIB_DEPENDS= libjson-c.so:devel/json-c \
+ libevdev.so:devel/libevdev \
libpcre.so:devel/pcre \
libwayland-egl.so:graphics/wayland \
libwlroots.so:x11-toolkits/wlroots \
diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
index 1bee3e09b67d..2cc68dab5ae8 100644
--- a/x11-wm/sway/distinfo
+++ b/x11-wm/sway/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1543479000
-SHA256 (swaywm-sway-1.0-beta.2_GH0.tar.gz) = a0e93b8ac51fa2edbf8fbe007f716ac934efa77c35b1a76f400819500fdf20c1
-SIZE (swaywm-sway-1.0-beta.2_GH0.tar.gz) = 5454362
-SHA256 (4a11d0e470bc.patch) = 28717caa49c53130d995ae8e81bc958a5e4d7afc6b836986776519a5e94693cc
-SIZE (4a11d0e470bc.patch) = 2950
+TIMESTAMP = 1547493323
+SHA256 (swaywm-sway-1.0-beta.2-189-g2573606b_GH0.tar.gz) = 5b6992dbd07383e75d1abc3eaf3b346a80ddeeec11a9f564311200535f45f7b3
+SIZE (swaywm-sway-1.0-beta.2-189-g2573606b_GH0.tar.gz) = 5456271
diff --git a/x11-wm/sway/pkg-plist b/x11-wm/sway/pkg-plist
index 2135416378db..6c05cb981dc8 100644
--- a/x11-wm/sway/pkg-plist
+++ b/x11-wm/sway/pkg-plist
@@ -1,16 +1,11 @@
%%MAYBE_SUID%%bin/sway
bin/swaybar
bin/swaybg
-bin/swayidle
-bin/swaylock
bin/swaymsg
bin/swaynag
-etc/pam.d/swaylock
@sample %%ETCDIR%%/config.sample
%%ETCDIR%%/security.d/10-freebsd
%%MANPAGES%%man/man1/sway.1.gz
-%%MANPAGES%%man/man1/swayidle.1.gz
-%%MANPAGES%%man/man1/swaylock.1.gz
%%MANPAGES%%man/man1/swaymsg.1.gz
%%MANPAGES%%man/man1/swaynag.1.gz
%%MANPAGES%%man/man5/sway-bar.5.gz
@@ -27,15 +22,11 @@ share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536_Portrait.png
share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024.png
share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024_Portrait.png
share/bash-completion/completions/sway
-share/bash-completion/completions/swayidle
-share/bash-completion/completions/swaylock
+share/bash-completion/completions/swaybar
share/bash-completion/completions/swaymsg
share/fish/completions/sway.fish
-share/fish/completions/swayidle.fish
-share/fish/completions/swaylock.fish
share/fish/completions/swaymsg.fish
share/fish/completions/swaynag.fish
share/wayland-sessions/sway.desktop
share/zsh/site-functions/_sway
-share/zsh/site-functions/_swaylock
share/zsh/site-functions/_swaymsg
diff --git a/x11/Makefile b/x11/Makefile
index 3dcc46cc5d16..b869a9628d22 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -312,6 +312,8 @@
SUBDIR += sterm
SUBDIR += stjerm
SUBDIR += swarp
+ SUBDIR += swayidle
+ SUBDIR += swaylock
SUBDIR += sxhkd
SUBDIR += sxpc
SUBDIR += tabbed
diff --git a/x11/swayidle/Makefile b/x11/swayidle/Makefile
new file mode 100644
index 000000000000..6450db16d60c
--- /dev/null
+++ b/x11/swayidle/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+PORTNAME= swayidle
+DISTVERSION= 1.1
+CATEGORIES= x11
+
+MAINTAINER= jbeich@FreeBSD.org
+COMMENT= Sway's idle management daemon #'
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols
+LIB_DEPENDS= libwayland-client.so:graphics/wayland
+
+USES= compiler:c11 meson pkgconfig
+USE_GITHUB= yes
+GH_ACCOUNT= swaywm
+PLIST_FILES= bin/${PORTNAME} \
+ share/bash-completion/completions/${PORTNAME} \
+ share/fish/completions/${PORTNAME}.fish \
+ share/zsh/site-functions/_${PORTNAME}
+
+OPTIONS_DEFINE= MANPAGES
+OPTIONS_DEFAULT=MANPAGES
+
+MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc
+MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz
+
+post-patch-MANPAGES-off:
+ @${REINPLACE_CMD} -i '' "s/'scdoc/&-disabled/" ${WRKSRC}/meson.build
+
+.include <bsd.port.mk>
diff --git a/x11/swayidle/distinfo b/x11/swayidle/distinfo
new file mode 100644
index 000000000000..50dcebe2fc3c
--- /dev/null
+++ b/x11/swayidle/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1547463557
+SHA256 (swaywm-swayidle-1.1_GH0.tar.gz) = f7b108404892029c736a0b37b43e9c94feede355aea3e4932dd5e36d56fab246
+SIZE (swaywm-swayidle-1.1_GH0.tar.gz) = 8866
diff --git a/x11/swayidle/pkg-descr b/x11/swayidle/pkg-descr
new file mode 100644
index 000000000000..66abb071b6df
--- /dev/null
+++ b/x11/swayidle/pkg-descr
@@ -0,0 +1,4 @@
+swayidle is an idle management daemon, compatible with any Wayland
+compositor which implements the KDE idle protocol.
+
+WWW: https://github.com/swaywm/swayidle
diff --git a/x11/swaylock/Makefile b/x11/swaylock/Makefile
new file mode 100644
index 000000000000..5e89e018c45f
--- /dev/null
+++ b/x11/swaylock/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+PORTNAME= swaylock
+DISTVERSION= 1.2
+CATEGORIES= x11
+
+MAINTAINER= jbeich@FreeBSD.org
+COMMENT= Screen locker for Wayland
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols
+LIB_DEPENDS= libwayland-client.so:graphics/wayland \
+ libwlroots.so:x11-toolkits/wlroots \
+ libxkbcommon.so:x11/libxkbcommon
+
+USES= compiler:c11 meson pkgconfig
+USE_GITHUB= yes
+GH_ACCOUNT= swaywm
+USE_GNOME= cairo gdkpixbuf2 pango
+MESON_ARGS= -Dsway-version="${DISTVERSIONFULL}"
+PLIST_FILES= bin/${PORTNAME} \
+ etc/pam.d/${PORTNAME} \
+ share/bash-completion/completions/${PORTNAME} \
+ share/fish/completions/${PORTNAME}.fish \
+ share/zsh/site-functions/_${PORTNAME}
+
+OPTIONS_DEFINE= MANPAGES
+OPTIONS_DEFAULT=MANPAGES
+
+MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc
+MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz
+
+post-patch-MANPAGES-off:
+ @${REINPLACE_CMD} -i '' "s/'scdoc/&-disabled/" ${WRKSRC}/meson.build
+
+.include <bsd.port.mk>
diff --git a/x11/swaylock/distinfo b/x11/swaylock/distinfo
new file mode 100644
index 000000000000..566a5122a8a4
--- /dev/null
+++ b/x11/swaylock/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1547513311
+SHA256 (swaywm-swaylock-1.2_GH0.tar.gz) = 211c77a40ff464651522c751838b04b4703b02c191e388d83d147a960e45c0c1
+SIZE (swaywm-swaylock-1.2_GH0.tar.gz) = 32594
diff --git a/x11/swaylock/pkg-descr b/x11/swaylock/pkg-descr
new file mode 100644
index 000000000000..892e256bfa6d
--- /dev/null
+++ b/x11/swaylock/pkg-descr
@@ -0,0 +1,9 @@
+swaylock is a screen locking utility for Wayland compositors. It is compatible
+with any Wayland compositor which implements the following Wayland protocols:
+
+- wlr-layer-shell
+- wlr-input-inhibitor
+- xdg-output
+- xdg-shell
+
+WWW: https://github.com/swaywm/swaylock
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 05:28:18 +0000