diff --git a/MOVED b/MOVED index 1e64b6cab9bec..b5fbe6f08a895 100644 --- a/MOVED +++ b/MOVED @@ -17480,3 +17480,7 @@ deskutils/bitcollider||2022-06-30|Has expired: bitzi.com is no longer available, converters/htx||2022-06-30|Has expired: XHTML is considered obsolete in favor of HTML5 www/getleft||2022-06-30|Has expired: Abandonware last updated on 2008 ftp/wxdfast||2022-06-30|Has expired: Last release in 2009, doesn't support https, depends on deprecated wxgtk28 and dead upstream. Please consider using net/uget +x11/dmenu-wayland||2022-07-01|move desktop utility to its right category +x11/i3lock||2022-07-01|move desktop utility to its right category +x11/i3status||2022-07-01|move desktop utility to its right category +x11/xcbautolock||2022-07-01|move desktop utility to its right category diff --git a/deskutils/Makefile b/deskutils/Makefile index 6075352451ac2..8ff65e0c7d861 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -42,6 +42,7 @@ SUBDIR += dailystrips SUBDIR += deforaos-todo SUBDIR += dfshow + SUBDIR += dmenu-wayland SUBDIR += docear SUBDIR += dosage SUBDIR += dstask @@ -121,6 +122,8 @@ SUBDIR += hot-babe SUBDIR += howm SUBDIR += hs-arbtt + SUBDIR += i3lock + SUBDIR += i3status SUBDIR += ical SUBDIR += itinerary SUBDIR += jjclient diff --git a/x11/dmenu-wayland/Makefile b/deskutils/dmenu-wayland/Makefile similarity index 95% rename from x11/dmenu-wayland/Makefile rename to deskutils/dmenu-wayland/Makefile index df066dea5111d..392c33e0cb712 100644 --- a/x11/dmenu-wayland/Makefile +++ b/deskutils/dmenu-wayland/Makefile @@ -1,7 +1,7 @@ PORTNAME= dmenu-wayland PORTVERSION= 0.1 DISTVERSIONPREFIX= v -CATEGORIES= x11 wayland +CATEGORIES= deskutils wayland PATCH_SITES= https://github.com/nyyManni/dmenu-wayland/commit/ PATCHFILES= b646f4d14c627d9a4300d9d015fb8e9b5cb2abef.patch:-p1 diff --git a/x11/dmenu-wayland/distinfo b/deskutils/dmenu-wayland/distinfo similarity index 100% rename from x11/dmenu-wayland/distinfo rename to deskutils/dmenu-wayland/distinfo diff --git a/x11/dmenu-wayland/pkg-descr b/deskutils/dmenu-wayland/pkg-descr similarity index 100% rename from x11/dmenu-wayland/pkg-descr rename to deskutils/dmenu-wayland/pkg-descr diff --git a/x11/i3lock/Makefile b/deskutils/i3lock/Makefile similarity index 98% rename from x11/i3lock/Makefile rename to deskutils/i3lock/Makefile index 6d56abea2cde0..7012f7ed20810 100644 --- a/x11/i3lock/Makefile +++ b/deskutils/i3lock/Makefile @@ -2,7 +2,7 @@ PORTNAME= i3lock PORTVERSION= 2.13 -CATEGORIES= x11 +CATEGORIES= deskutils x11 MASTER_SITES= http://i3wm.org/${PORTNAME}/ MAINTAINER= bapt@FreeBSD.org diff --git a/x11/i3lock/distinfo b/deskutils/i3lock/distinfo similarity index 100% rename from x11/i3lock/distinfo rename to deskutils/i3lock/distinfo diff --git a/x11/i3lock/pkg-descr b/deskutils/i3lock/pkg-descr similarity index 100% rename from x11/i3lock/pkg-descr rename to deskutils/i3lock/pkg-descr diff --git a/x11/i3status/Makefile b/deskutils/i3status/Makefile similarity index 96% rename from x11/i3status/Makefile rename to deskutils/i3status/Makefile index 7245ec74328df..b67848bc4bf8e 100644 --- a/x11/i3status/Makefile +++ b/deskutils/i3status/Makefile @@ -1,6 +1,6 @@ PORTNAME= i3status PORTVERSION= 2.14 -CATEGORIES= x11 +CATEGORIES= deskutils MASTER_SITES= http://i3wm.org/i3status/ MAINTAINER= bapt@FreeBSD.org diff --git a/x11/i3status/distinfo b/deskutils/i3status/distinfo similarity index 100% rename from x11/i3status/distinfo rename to deskutils/i3status/distinfo diff --git a/x11/i3status/files/patch-meson.build b/deskutils/i3status/files/patch-meson.build similarity index 100% rename from x11/i3status/files/patch-meson.build rename to deskutils/i3status/files/patch-meson.build diff --git a/x11/i3status/files/patch-src_print__battery__info.c b/deskutils/i3status/files/patch-src_print__battery__info.c similarity index 100% rename from x11/i3status/files/patch-src_print__battery__info.c rename to deskutils/i3status/files/patch-src_print__battery__info.c diff --git a/x11/i3status/files/patch-src_print__disk__info.c b/deskutils/i3status/files/patch-src_print__disk__info.c similarity index 100% rename from x11/i3status/files/patch-src_print__disk__info.c rename to deskutils/i3status/files/patch-src_print__disk__info.c diff --git a/x11/i3status/files/patch-src_print__volume.c b/deskutils/i3status/files/patch-src_print__volume.c similarity index 100% rename from x11/i3status/files/patch-src_print__volume.c rename to deskutils/i3status/files/patch-src_print__volume.c diff --git a/x11/i3status/pkg-descr b/deskutils/i3status/pkg-descr similarity index 100% rename from x11/i3status/pkg-descr rename to deskutils/i3status/pkg-descr diff --git a/x11/i3status/pkg-plist b/deskutils/i3status/pkg-plist similarity index 100% rename from x11/i3status/pkg-plist rename to deskutils/i3status/pkg-plist diff --git a/x11/xcbautolock/Makefile b/deskutils/xcbautolock/Makefile similarity index 92% rename from x11/xcbautolock/Makefile rename to deskutils/xcbautolock/Makefile index ab75d5f5cb3fd..9afcdaa8271f5 100644 --- a/x11/xcbautolock/Makefile +++ b/deskutils/xcbautolock/Makefile @@ -1,6 +1,6 @@ PORTNAME= xcbautolock PORTVERSION= 0.2.2 -CATEGORIES= x11 +CATEGORIES= deskutils x11 MAINTAINER= bapt@FreeBSD.org COMMENT= XCB base autolocker diff --git a/x11/xcbautolock/distinfo b/deskutils/xcbautolock/distinfo similarity index 100% rename from x11/xcbautolock/distinfo rename to deskutils/xcbautolock/distinfo diff --git a/x11/xcbautolock/pkg-descr b/deskutils/xcbautolock/pkg-descr similarity index 100% rename from x11/xcbautolock/pkg-descr rename to deskutils/xcbautolock/pkg-descr diff --git a/x11/Makefile b/x11/Makefile index 3bc7adcfde604..3d5b01f822b63 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -51,7 +51,6 @@ SUBDIR += deskmenu SUBDIR += disman SUBDIR += dmenu - SUBDIR += dmenu-wayland SUBDIR += docker-tray SUBDIR += dsbautostart SUBDIR += dsbxinput @@ -110,9 +109,7 @@ SUBDIR += hs-xmobar SUBDIR += hsetroot SUBDIR += i3blocks - SUBDIR += i3lock SUBDIR += i3lock-color - SUBDIR += i3status SUBDIR += iceauth SUBDIR += ico SUBDIR += idesk @@ -447,7 +444,6 @@ SUBDIR += xcb-util-renderutil SUBDIR += xcb-util-wm SUBDIR += xcb-util-xrm - SUBDIR += xcbautolock SUBDIR += xclickroot SUBDIR += xclip SUBDIR += xclipboard