Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -13079,3 +13079,4 @@
 x11-toolkits/gai||2019-10-10|Abandonware since 2005
 palm/synce-libsynce||2019-10-14|Has expired: obsolete technology
 french/py-grammalecte|french/py-grammalecte-fr|2019-10-14|Port was incorrectly named different to upstream
+x11-wm/plank|x11/plank|2019-10-14|Port incorrectly labeled as Windows Manager, is an independent dock application.
Index: x11-wm/Makefile
===================================================================
--- x11-wm/Makefile
+++ x11-wm/Makefile
@@ -99,7 +99,6 @@
     SUBDIR += pekwm
     SUBDIR += phluid
     SUBDIR += piewm
-    SUBDIR += plank
     SUBDIR += plasma5-kdecoration
     SUBDIR += plasma5-kwin
     SUBDIR += plwm
Index: x11-wm/plank/Makefile
===================================================================
--- x11-wm/plank/Makefile
+++ x11-wm/plank/Makefile
@@ -1,50 +0,0 @@
-# Created by: Olivier Duchateau
-# $FreeBSD$
-
-PORTNAME=	plank
-PORTVERSION=	0.11.4
-CATEGORIES=	x11-wm
-MASTER_SITES=	https://launchpadlibrarian.net/296808043/ \
-	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Elegant, simple, and clean dock
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BUILD_DEPENDS=	vapigen:lang/vala
-LIB_DEPENDS=	libbamf3.so:sysutils/bamf \
-		libgee-0.8.so:devel/libgee
-
-USES=		gmake libtool localbase pathfix pkgconfig tar:xz
-GNU_CONFIGURE=	yes
-CFLAGS+=	-Wno-return-type
-USE_GNOME=	glib20 gtk30 gdkpixbuf2 cairo intlhack libxml2 libwnck3 dconf
-USE_XORG=	x11 xfixes xi
-INSTALLS_ICONS=	yes
-INSTALL_TARGET=	install-strip
-
-GLIB_SCHEMAS=	net.launchpad.plank.gschema.xml
-
-OPTIONS_SUB=	yes
-
-OPTIONS_DEFINE=	NLS DBUSMENU
-DBUSMENU_DESC=	DBusMenu protocol
-
-CONFIGURE_ARGS=	--disable-benchmark \
-	--disable-headless-tests \
-	--disable-apport
-
-NLS_USES=		gettext
-NLS_USES_OFF=		gettext-tools
-NLS_CONFIGURE_ENABLE=	nls
-
-DBUSMENU_LIB_DEPENDS=		libdbusmenu-gtk3.so:devel/libdbusmenu
-DBUSMENU_CONFIGURE_ENABLE=	dbusmenu
-
-post-patch:
-	${REINPLACE_CMD} -e 's|CPUMonitor||' \
-		${WRKSRC}/docklets/Makefile.in
-
-.include <bsd.port.mk>
Index: x11-wm/plank/distinfo
===================================================================
--- x11-wm/plank/distinfo
+++ x11-wm/plank/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1514473912
-SHA256 (plank-0.11.4.tar.xz) = 88b5cd6a84e67395df5e7cc1869521126830be0e8a509b28ee12e2db0b8981b8
-SIZE (plank-0.11.4.tar.xz) = 1022640
Index: x11-wm/plank/files/patch-lib_Items_PlankDockItem.vala
===================================================================
--- x11-wm/plank/files/patch-lib_Items_PlankDockItem.vala
+++ x11-wm/plank/files/patch-lib_Items_PlankDockItem.vala
@@ -1,16 +0,0 @@
---- lib/Items/PlankDockItem.vala.orig	2015-10-07 12:34:54 UTC
-+++ lib/Items/PlankDockItem.vala
-@@ -74,11 +74,11 @@ namespace Plank.Items
- 		{
- 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
- 			
--			var item = create_menu_item (_("Get _Help Online..."), "help");
-+			var item = create_menu_item (_("Get _Help Online..."), "help-browser");
- 			item.activate.connect (() => Application.get_default ().activate_action ("help", null));
- 			items.add (item);
- 			
--			item = create_menu_item (_("_Translate This Application..."), "locale");
-+			item = create_menu_item (_("_Translate This Application..."), "preferences-desktop-locale");
- 			item.activate.connect (() => Application.get_default ().activate_action ("translate", null));
- 			items.add (item);
- 			
Index: x11-wm/plank/files/patch-lib__Makefile.in
===================================================================
--- x11-wm/plank/files/patch-lib__Makefile.in
+++ x11-wm/plank/files/patch-lib__Makefile.in
@@ -1,10 +0,0 @@
---- lib/Makefile.in.orig	2017-03-27 19:50:52 UTC
-+++ lib/Makefile.in
-@@ -767,7 +767,6 @@ noinst_LTLIBRARIES = libplank-internal.la
- libplank_internal_la_CFLAGS = \
- 	$(AM_CFLAGS) \
- 	-fPIC \
--	-fvisibility=internal \
- 	$(NULL)
- 
- libplank_internal_la_LDFLAGS = \
Index: x11-wm/plank/pkg-descr
===================================================================
--- x11-wm/plank/pkg-descr
+++ x11-wm/plank/pkg-descr
@@ -1,3 +0,0 @@
-Plank is an elegant, simple and clean dock.
-
-WWW: http://launchpad.net/plank/
Index: x11-wm/plank/pkg-plist
===================================================================
--- x11-wm/plank/pkg-plist
+++ x11-wm/plank/pkg-plist
@@ -1,82 +0,0 @@
-bin/plank
-include/plank/plank.h
-lib/libplank.so
-lib/libplank.so.1
-lib/libplank.so.1.0.0
-lib/plank/docklets/libdocklet-clippy.so
-lib/plank/docklets/libdocklet-clock.so
-lib/plank/docklets/libdocklet-desktop.so
-lib/plank/docklets/libdocklet-trash.so
-libdata/pkgconfig/plank.pc
-man/man1/plank.1.gz
-share/appdata/plank.appdata.xml
-share/applications/plank.desktop
-share/icons/hicolor/128x128/apps/plank.svg
-share/icons/hicolor/16x16/apps/plank.svg
-share/icons/hicolor/22x22/apps/plank.svg
-share/icons/hicolor/24x24/apps/plank.svg
-share/icons/hicolor/32x32/apps/plank.svg
-share/icons/hicolor/48x48/apps/plank.svg
-share/icons/hicolor/64x64/apps/plank.svg
-%%NLS%%share/locale/am/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/el/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/en_AU/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/en_CA/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/et/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/gd/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/he/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/id/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ml/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ne/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/sma/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/sr@latin/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/te/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/th/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/uz/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plank.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/plank.mo
-%%DATADIR%%/themes/Default/dock.theme
-%%DATADIR%%/themes/Matte/dock.theme
-%%DATADIR%%/themes/Transparent/dock.theme
-share/vala/vapi/plank.deps
-share/vala/vapi/plank.vapi
Index: x11/Makefile
===================================================================
--- x11/Makefile
+++ x11/Makefile
@@ -251,6 +251,7 @@
     SUBDIR += perwindowlayoutd
     SUBDIR += pipeglade
     SUBDIR += pixman
+    SUBDIR += plank
     SUBDIR += plasma5-kactivitymanagerd
     SUBDIR += plasma5-kgamma5
     SUBDIR += plasma5-kscreen
Index: x11/plank/Makefile
===================================================================
--- /dev/null
+++ x11/plank/Makefile
@@ -0,0 +1,51 @@
+# Created by: Olivier Duchateau
+# $FreeBSD$
+
+PORTNAME=	plank
+PORTVERSION=	0.11.89
+CATEGORIES=	x11
+MASTER_SITES=	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
+
+MAINTAINER=	daniel@shafer.cc
+COMMENT=	Elegant, simple, and clean dock
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libbamf3.so:sysutils/bamf \
+		libgee-0.8.so:devel/libgee \
+		libgnome-menu-3.so:x11/gnome-menus
+
+USES=		gmake gnome libtool localbase pathfix pkgconfig tar:xz xorg
+USE_GNOME=	glib20 gtk30 gdkpixbuf2 cairo intlhack libxml2 libwnck3 dconf
+USE_XORG=	x11 xfixes xi
+
+CFLAGS+=	-Wno-return-type
+GNU_CONFIGURE=	yes
+GLIB_SCHEMAS=	net.launchpad.plank.gschema.xml
+
+OPTIONS_SUB=	yes
+
+OPTIONS_DEFINE=	NLS DBUSMENU
+DBUSMENU_DESC=	DBusMenu protocol
+
+CONFIGURE_ARGS=	--disable-benchmark \
+	--disable-headless-tests \
+	--disable-apport
+
+NLS_USES=		gettext
+NLS_USES_OFF=		gettext-tools
+NLS_CONFIGURE_ENABLE=	nls
+
+DBUSMENU_LIB_DEPENDS=			libdbusmenu-gtk3.so:devel/libdbusmenu
+DBUSMENU_CONFIGURE_ENABLE=		dbusmenu
+
+INSTALLS_ICONS= yes
+INSTALL_TARGET= install-strip
+
+post-patch:
+	${REINPLACE_CMD} -e 's|CPUMonitor||' \
+		${WRKSRC}/docklets/Makefile.in
+
+.include <bsd.port.mk>
Index: x11/plank/distinfo
===================================================================
--- /dev/null
+++ x11/plank/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1570000003
+SHA256 (plank-0.11.89.tar.xz) = a662a46eaeffbd40661d1f36abd2589f7a98baef4b918876b872047b7ca59d9d
+SIZE (plank-0.11.89.tar.xz) = 593940
Index: x11/plank/files/patch-lib_Items_PlankDockItem.vala
===================================================================
--- /dev/null
+++ x11/plank/files/patch-lib_Items_PlankDockItem.vala
@@ -0,0 +1,16 @@
+--- lib/Items/PlankDockItem.vala.orig	2015-10-07 12:34:54 UTC
++++ lib/Items/PlankDockItem.vala
+@@ -74,11 +74,11 @@ namespace Plank.Items
+ 		{
+ 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
+ 			
+-			var item = create_menu_item (_("Get _Help Online..."), "help");
++			var item = create_menu_item (_("Get _Help Online..."), "help-browser");
+ 			item.activate.connect (() => Application.get_default ().activate_action ("help", null));
+ 			items.add (item);
+ 			
+-			item = create_menu_item (_("_Translate This Application..."), "locale");
++			item = create_menu_item (_("_Translate This Application..."), "preferences-desktop-locale");
+ 			item.activate.connect (() => Application.get_default ().activate_action ("translate", null));
+ 			items.add (item);
+ 			
Index: x11/plank/files/patch-lib__Makefile.in
===================================================================
--- /dev/null
+++ x11/plank/files/patch-lib__Makefile.in
@@ -0,0 +1,10 @@
+--- lib/Makefile.in.orig	2017-03-27 19:50:52 UTC
++++ lib/Makefile.in
+@@ -767,7 +767,6 @@ noinst_LTLIBRARIES = libplank-internal.la
+ libplank_internal_la_CFLAGS = \
+ 	$(AM_CFLAGS) \
+ 	-fPIC \
+-	-fvisibility=internal \
+ 	$(NULL)
+ 
+ libplank_internal_la_LDFLAGS = \
Index: x11/plank/pkg-descr
===================================================================
--- /dev/null
+++ x11/plank/pkg-descr
@@ -0,0 +1,3 @@
+Plank is an elegant, simple and clean dock.
+
+WWW: http://launchpad.net/plank/
Index: x11/plank/pkg-plist
===================================================================
--- /dev/null
+++ x11/plank/pkg-plist
@@ -0,0 +1,85 @@
+bin/plank
+include/plank/plank.h
+lib/libplank.so
+lib/libplank.so.1
+lib/libplank.so.1.0.0
+lib/plank/docklets/libdocklet-applications.so
+lib/plank/docklets/libdocklet-battery.so
+lib/plank/docklets/libdocklet-clippy.so
+lib/plank/docklets/libdocklet-clock.so
+lib/plank/docklets/libdocklet-desktop.so
+lib/plank/docklets/libdocklet-trash.so
+libdata/pkgconfig/plank.pc
+man/man1/plank.1.gz
+share/metainfo/plank.appdata.xml
+share/applications/plank.desktop
+share/icons/hicolor/128x128/apps/plank.svg
+share/icons/hicolor/16x16/apps/plank.svg
+share/icons/hicolor/22x22/apps/plank.svg
+share/icons/hicolor/24x24/apps/plank.svg
+share/icons/hicolor/32x32/apps/plank.svg
+share/icons/hicolor/48x48/apps/plank.svg
+share/icons/hicolor/64x64/apps/plank.svg
+%%NLS%%share/locale/am/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/el/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/et/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/gd/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/he/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/id/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ml/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/sma/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/te/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/th/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plank.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/plank.mo
+%%DATADIR%%/themes/Default/dock.theme
+%%DATADIR%%/themes/Matte/dock.theme
+%%DATADIR%%/themes/Transparent/dock.theme
+share/vala/vapi/plank.deps
+share/vala/vapi/plank.vapi
+