user/*: Modernise / fix syntax / deps / metadata / lang subpackages

24 files changed, 33 insertions, 15 deletions

diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD
index 5e5fc3f30..187e18781 100644
--- a/user/xfce4-appfinder/APKBUILD
+++ b/user/xfce4-appfinder/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="An application finder for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev garcon-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/xfce/xfce4-appfinder/4.14/xfce4-appfinder-$pkgver.tar.bz2"
diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD
index 87d4be1ab..90aea20eb 100644
--- a/user/xfce4-battery-plugin/APKBUILD
+++ b/user/xfce4-battery-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Battery monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+ AND LGPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD
index dfa5c7cef..1e1e5649d 100644
--- a/user/xfce4-clipman-plugin/APKBUILD
+++ b/user/xfce4-clipman-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Clipboard management plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev libqrencode-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD
index c3646f5d3..5a235a42e 100644
--- a/user/xfce4-cpugraph-plugin/APKBUILD
+++ b/user/xfce4-cpugraph-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Graphical CPU monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.1/xfce4-cpugraph-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD
index 1185b416b..cb9291532 100644
--- a/user/xfce4-dict/APKBUILD
+++ b/user/xfce4-dict/APKBUILD
@@ -7,12 +7,12 @@ pkgdesc="Dictionary application for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool glib-dev gtk+3.0-dev libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-doc"
 source="http://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD
index 0d6c2021b..cc66c040c 100644
--- a/user/xfce4-diskperf-plugin/APKBUILD
+++ b/user/xfce4-diskperf-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Disk performance monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="BSD-2-Clause AND GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD
index a72fedae8..2101b528a 100644
--- a/user/xfce4-netload-plugin/APKBUILD
+++ b/user/xfce4-netload-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Network monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD
index c6d9edbd8..0aa0fdd1f 100644
--- a/user/xfce4-notifyd/APKBUILD
+++ b/user/xfce4-notifyd/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Notification service for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0-only AND GPL-2.0+"
+depends=""
 makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev
 	xfce4-panel-dev libnotify-dev dbus-glib-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD
index 859e8b065..043044ffe 100644
--- a/user/xfce4-panel/APKBUILD
+++ b/user/xfce4-panel/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Panel for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="LGPL-2.1+ AND GPL-2.0+"
+depends=""
 makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev garcon-dev exo-dev
 	libwnck-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD
index 0af1ac10f..ab652e8c1 100644
--- a/user/xfce4-power-manager/APKBUILD
+++ b/user/xfce4-power-manager/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Power management support for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev
 	upower-dev xfce4-panel-dev"
 subpackages="$pkgname-doc $pkgname-lang"
diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD
index 71a3dcb4f..96588826c 100644
--- a/user/xfce4-pulseaudio-plugin/APKBUILD
+++ b/user/xfce4-pulseaudio-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Pulseaudio plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev
 	keybinder-3.0-dev libnotify-dev dbus-glib-dev"
 subpackages="$pkgname-lang"
diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD
index 146d3d85c..e3ad324dd 100644
--- a/user/xfce4-screenshooter/APKBUILD
+++ b/user/xfce4-screenshooter/APKBUILD
@@ -7,12 +7,12 @@ pkgdesc="Screenshot tool for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev libsoup-dev exo-dev"
 subpackages="$pkgname-doc"
-source="http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD
index 15b39e6ea..eef3b208f 100644
--- a/user/xfce4-sensors-plugin/APKBUILD
+++ b/user/xfce4-sensors-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Hardware sensor monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD
index f6cef7748..2ac50d1a7 100644
--- a/user/xfce4-settings/APKBUILD
+++ b/user/xfce4-settings/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="GUI settings application for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+ AND MIT AND LGPL-2.0+"
+depends=""
 makedepends="intltool exo-dev garcon-dev libnotify-dev upower-dev
 	libxklavier-dev xf86-input-libinput-dev"
 subpackages="$pkgname-lang"
diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD
index 5f20a001c..7600d411e 100644
--- a/user/xfce4-systemload-plugin/APKBUILD
+++ b/user/xfce4-systemload-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="System load monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="BSD-2-Clause"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD
index 16cf945b1..ef98510e3 100644
--- a/user/xfce4-taskmanager/APKBUILD
+++ b/user/xfce4-taskmanager/APKBUILD
@@ -7,29 +7,29 @@ pkgdesc="Process manager for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool gtk+3.0-dev gtk+2.0-dev libxmu-dev libwnck-dev"
-source="http://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-$pkgver.tar.bz2"
+subpackages="$pkgname-lang"
+source="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
+		--with-locales-dir=/usr/share/locale \
 		--localstatedir=/var \
 		--enable-gtk3
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD
index 0b34b3d77..607bdf263 100644
--- a/user/xfce4-time-out-plugin/APKBUILD
+++ b/user/xfce4-time-out-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Forced computer break plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/${pkgver%.*}/xfce4-time-out-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD
index e17181b87..eb420718a 100644
--- a/user/xfce4-timer-plugin/APKBUILD
+++ b/user/xfce4-timer-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Timer plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD
index b90957cd6..432c5cff9 100644
--- a/user/xfce4-verve-plugin/APKBUILD
+++ b/user/xfce4-verve-plugin/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Command-line plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD
index 070e189e0..55a0ff0d3 100644
--- a/user/xfce4-volumed-pulse/APKBUILD
+++ b/user/xfce4-volumed-pulse/APKBUILD
@@ -7,7 +7,9 @@ pkgdesc="Pulseaudio volume manager for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-3.0+"
-makedepends="gtk+3.0-dev libxfce4ui-dev pulseaudio-dev keybinder-3.0-dev libnotify-dev"
+depends=""
+makedepends="gtk+3.0-dev libxfce4ui-dev pulseaudio-dev keybinder-3.0-dev
+	libnotify-dev"
 source="https://archive.xfce.org/src/apps/xfce4-volumed-pulse/0.2/xfce4-volumed-pulse-$pkgver.tar.bz2"
 
 build() {
diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD
index f9d1dfeef..c09d74cc3 100644
--- a/user/xfce4-whiskermenu-plugin/APKBUILD
+++ b/user/xfce4-whiskermenu-plugin/APKBUILD
@@ -7,9 +7,10 @@ pkgrel=0
 pkgdesc="Whisker menu plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
-options="!check" # no tests
+options="!check"  # No test suite.
 license="GPL-2.0+"
-makedepends="gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev"
+depends=""
+makedepends="cmake gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/$_pkgmaj/xfce4-whiskermenu-plugin-$pkgver.tar.bz2"
 
@@ -24,7 +25,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD
index bbf373200..fd6f315b3 100644
--- a/user/xfdashboard/APKBUILD
+++ b/user/xfdashboard/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Gnome dashboard clone for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool gtk+3.0-dev libwnck-dev libice-dev garcon-dev
 	libxfce4ui-dev clutter-dev"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD
index 96e346059..c6f9975a0 100644
--- a/user/xfmpc/APKBUILD
+++ b/user/xfmpc/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Graphical music player daemon client for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+ AND LGPL-2.0+"
+depends=""
 makedepends="intltool gtk+2.0-dev libxfce4ui-dev libmpd-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2"
diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD
index b74170b6d..b6c907d50 100644
--- a/user/xfwm4/APKBUILD
+++ b/user/xfwm4/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Window manager for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev
 	gobject-introspection-dev vala-dev"
 subpackages="$pkgname-lang"