aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-toolkits/wlroots/Makefile4
-rw-r--r--x11-toolkits/wlroots/distinfo6
-rw-r--r--x11-wm/sway/Makefile24
-rw-r--r--x11-wm/sway/distinfo6
-rw-r--r--x11/swayidle/Makefile3
-rw-r--r--x11/swayidle/distinfo6
-rw-r--r--x11/swaylock/Makefile6
-rw-r--r--x11/swaylock/distinfo6
8 files changed, 33 insertions, 28 deletions
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index 6037c1e29326..7ecae431e45f 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= wlroots
-DISTVERSION= 0.2-128
-DISTVERSIONSUFFIX= -g10b1de6e
+DISTVERSION= 0.2-136
+DISTVERSIONSUFFIX= -g5dde2e79
CATEGORIES= x11-toolkits
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index 038b07f8af66..f2fea8b37bce 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547653486
-SHA256 (swaywm-wlroots-0.2-128-g10b1de6e_GH0.tar.gz) = 99a0d867a5b3c621a5cc5dd4cd1e1752cdcaa5ad0f20a9bf97cc23742d4d42b2
-SIZE (swaywm-wlroots-0.2-128-g10b1de6e_GH0.tar.gz) = 469744
+TIMESTAMP = 1547848358
+SHA256 (swaywm-wlroots-0.2-136-g5dde2e79_GH0.tar.gz) = 5c4c96d39130dd19fde17bc1861a6c4458de182d67d5744f7367b04f9122109b
+SIZE (swaywm-wlroots-0.2-136-g5dde2e79_GH0.tar.gz) = 470918
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index b9d0d0911542..375e7bd40c3a 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= sway
-DISTVERSION= 1.0-beta.2-204
-DISTVERSIONSUFFIX= -g70637b40
+DISTVERSION= 1.0-beta.2-226
+DISTVERSIONSUFFIX= -g1cce14e7
CATEGORIES= x11-wm
MAINTAINER= jbeich@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.14:graphics/wayland-protocols \
- wlroots>=0.2.65:x11-toolkits/wlroots
+ wlroots>=0.2.126:x11-toolkits/wlroots
LIB_DEPENDS= libjson-c.so:devel/json-c \
libevdev.so:devel/libevdev \
libpcre.so:devel/pcre \
@@ -24,23 +24,30 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \
USES= compiler:c11 gnome meson pkgconfig
USE_GITHUB= yes
-USE_GNOME= cairo gdkpixbuf2 pango
+USE_GNOME= cairo pango
USE_XORG= pixman
GH_ACCOUNT= swaywm
MESON_ARGS= -Dsway-version="${DISTVERSIONFULL}"
-OPTIONS_DEFINE= MANPAGES SUID X11
-OPTIONS_DEFAULT=MANPAGES SUID X11
+OPTIONS_DEFINE= MANPAGES PIXBUF SUID X11
+OPTIONS_DEFAULT=MANPAGES PIXBUF SUID X11
OPTIONS_SUB= yes
MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc
+MANPAGES_MESON_ON= -Dman-pages=enabled
+MANPAGES_MESON_OFF= -Dman-pages=disabled
+
+PIXBUF_USE= GNOME=gdkpixbuf2
+PIXBUF_MESON_ON= -Dgdk-pixbuf=enabled
+PIXBUF_MESON_OFF= -Dgdk-pixbuf=disabled
SUID_DESC= setuid bit on "sway" binary (required for DRM session)
SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) "
SUID_PLIST_SUB_OFF= MAYBE_SUID=""
X11_USE= XORG=xcb
-X11_MESON_TRUE= enable-xwayland
+X11_MESON_ON= -Dxwayland=enabled
+X11_MESON_OFF= -Dxwayland=disabled
post-patch:
# Let @sample handle default files under etc/
@@ -50,9 +57,6 @@ post-patch:
@${REINPLACE_CMD} -e 's/urxvt/swayterm/' \
${WRKSRC}/config.in
-post-patch-MANPAGES-off:
- @${REINPLACE_CMD} -i '' "s/'scdoc/&-disabled/" ${WRKSRC}/meson.build
-
post-install:
${INSTALL_SCRIPT} ${FILESDIR}/swayterm ${STAGEDIR}${PREFIX}/bin
${MKDIR} ${STAGEDIR}${ETCDIR}/config.d
diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
index 8b9914b8dd82..6d3bab6bc1d3 100644
--- a/x11-wm/sway/distinfo
+++ b/x11-wm/sway/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547640146
-SHA256 (swaywm-sway-1.0-beta.2-204-g70637b40_GH0.tar.gz) = 8d069860d3d9d9201f9b332ec4675e771d80e5fcc233c945bf8b2e81a239edf0
-SIZE (swaywm-sway-1.0-beta.2-204-g70637b40_GH0.tar.gz) = 5456976
+TIMESTAMP = 1547854213
+SHA256 (swaywm-sway-1.0-beta.2-226-g1cce14e7_GH0.tar.gz) = 80903dff11d2e35763df15da645439f8431ac38f6f3a665a292372bffae5807d
+SIZE (swaywm-sway-1.0-beta.2-226-g1cce14e7_GH0.tar.gz) = 5455991
diff --git a/x11/swayidle/Makefile b/x11/swayidle/Makefile
index a6d165a6ae71..e52d41b19af5 100644
--- a/x11/swayidle/Makefile
+++ b/x11/swayidle/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= swayidle
-DISTVERSION= 1.1
+DISTVERSION= 1.1-12
+DISTVERSIONSUFFIX= -gc94949d
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11/swayidle/distinfo b/x11/swayidle/distinfo
index 50dcebe2fc3c..142e1994b03b 100644
--- a/x11/swayidle/distinfo
+++ b/x11/swayidle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547463557
-SHA256 (swaywm-swayidle-1.1_GH0.tar.gz) = f7b108404892029c736a0b37b43e9c94feede355aea3e4932dd5e36d56fab246
-SIZE (swaywm-swayidle-1.1_GH0.tar.gz) = 8866
+TIMESTAMP = 1547844952
+SHA256 (swaywm-swayidle-1.1-12-gc94949d_GH0.tar.gz) = d10f54fd8dc81569f988b05e72a2f7217fdd3604d5999e29869138c44aab567a
+SIZE (swaywm-swayidle-1.1-12-gc94949d_GH0.tar.gz) = 9011
diff --git a/x11/swaylock/Makefile b/x11/swaylock/Makefile
index 5e89e018c45f..d351c392dd64 100644
--- a/x11/swaylock/Makefile
+++ b/x11/swaylock/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= swaylock
-DISTVERSION= 1.2
+DISTVERSION= 1.2-28
+DISTVERSIONSUFFIX= -g52eeb9f
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
@@ -12,14 +13,13 @@ 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}"
+MESON_ARGS= -Dswaylock-version="${DISTVERSIONFULL}"
PLIST_FILES= bin/${PORTNAME} \
etc/pam.d/${PORTNAME} \
share/bash-completion/completions/${PORTNAME} \
diff --git a/x11/swaylock/distinfo b/x11/swaylock/distinfo
index 566a5122a8a4..082681079bf4 100644
--- a/x11/swaylock/distinfo
+++ b/x11/swaylock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547513311
-SHA256 (swaywm-swaylock-1.2_GH0.tar.gz) = 211c77a40ff464651522c751838b04b4703b02c191e388d83d147a960e45c0c1
-SIZE (swaywm-swaylock-1.2_GH0.tar.gz) = 32594
+TIMESTAMP = 1547820437
+SHA256 (swaywm-swaylock-1.2-28-g52eeb9f_GH0.tar.gz) = 6e55949eeb16a7d645dd711c1948178baceaa7c1d236cee21018032e1a2ac2ae
+SIZE (swaywm-swaylock-1.2-28-g52eeb9f_GH0.tar.gz) = 33991