user/[GTK apps, mostly XFCE]: fix locale dir

42 files changed, 119 insertions, 282 deletions

diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD
index 8311d25a1..4f39d20a1 100644
--- a/user/exo/APKBUILD
+++ b/user/exo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=exo
 pkgver=0.12.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Support library for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="LGPL-2.0+ AND GPL-2.0+"
 makedepends="intltool glib-dev gtk+2.0-dev gtk+3.0-dev libxfce4util-dev
 	libxfce4ui-dev libice-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/exo/0.12/exo-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/exo/0.12/exo-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD
index 953bb230e..81886c47e 100644
--- a/user/garcon/APKBUILD
+++ b/user/garcon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=garcon
 pkgver=0.6.2
-pkgrel=0
+pkgrel=1
 pkgdesc="freedesktop.org menu library for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="LGPL-2.0+"
 makedepends="intltool glib-dev libxfce4util-dev gtk+3.0-dev libxfce4util-dev
 	libxfce4ui-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/garcon/0.6/garcon-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/garcon/0.6/garcon-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/gconf/APKBUILD b/user/gconf/APKBUILD
index 1e9b30856..ce91ec018 100644
--- a/user/gconf/APKBUILD
+++ b/user/gconf/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=gconf
 pkgver=3.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc="GNOME configuration system"
 url="http://projects.gnome.org/gconf"
 arch="all"
@@ -12,14 +12,11 @@ depends_dev="gtk+3.0-dev libxml2-dev polkit-dev"
 makedepends="$depends_dev dbus-glib-dev glib-dev gobject-introspection-dev
 	intltool orbit2-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="https://download.gnome.org/sources/GConf/${pkgver%.*}/GConf-${pkgver}.tar.xz"
-
 builddir="$srcdir"/GConf-"$pkgver"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -28,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD
index 253b9d86e..283227674 100644
--- a/user/gnumeric/APKBUILD
+++ b/user/gnumeric/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gnumeric
 pkgver=1.12.45
-pkgrel=0
+pkgrel=1
 pkgdesc="GNOME spreadsheet software"
 url="http://www.gnumeric.org/"
 arch="all"
@@ -14,13 +14,12 @@ depends=""
 makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool
 	itstool libgda-dev libxml2-utils perl-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz
 	cs.patch
 	"
 
 build() {
-	YACC=yacc ./configure \
+	LIBS="-lintl" YACC=yacc ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
diff --git a/user/gtkspell/APKBUILD b/user/gtkspell/APKBUILD
index cd7b8f100..e76b7f813 100644
--- a/user/gtkspell/APKBUILD
+++ b/user/gtkspell/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: 
 pkgname=gtkspell
 pkgver=2.0.16
-pkgrel=10
+pkgrel=11
 pkgdesc="Highlighting and replacement of misspelled words in Gtk software"
 url="http://gtkspell.sourceforge.net/"
 arch="all"
 license="GPL-2.0-only"
 makedepends="gtk+2.0-dev enchant-dev intltool"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz
 	enchant-2.patch
 	"
@@ -19,7 +18,7 @@ prepare() {
 }
 
 build() {
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr
diff --git a/user/gxmessage/APKBUILD b/user/gxmessage/APKBUILD
index 70d3a9573..249864821 100644
--- a/user/gxmessage/APKBUILD
+++ b/user/gxmessage/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gxmessage
 pkgver=3.4.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Display simple messages using GTK+"
 url=" "
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-3.0+"
 depends=""
 makedepends="gtk+3.0-dev intltool"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="https://downloads.sourceforge.net/gxmessage/gxmessage-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD
index c8dccafca..172a0003d 100644
--- a/user/libpeas/APKBUILD
+++ b/user/libpeas/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=libpeas
 pkgver=1.22.0
-pkgrel=0
+pkgrel=1
 pkgdesc="GObject-based plugin framework"
 url="https://gnome.org"
 arch="all"
@@ -11,12 +11,10 @@ depends=""
 makedepends="intltool glib-dev gobject-introspection-dev gtk+3.0-dev
 	py3-pygobject py3-pygobject-dev python3-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="https://download.gnome.org/sources/libpeas/${pkgver%.*}/libpeas-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -27,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	DISPLAY= make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD
index f1eddca71..3e99f60f2 100644
--- a/user/libxfce4ui/APKBUILD
+++ b/user/libxfce4ui/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=libxfce4ui
 pkgver=4.13.5
-pkgrel=0
+pkgrel=1
 pkgdesc="UI library for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="LGPL-2.0+ AND GPL-2.0+"
 makedepends="intltool gtk+3.0-dev gobject-introspection-dev vala-dev
 	libxfce4util-dev xfconf-dev startup-notification-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="http://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -27,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD
index deb744a29..5ddc923d3 100644
--- a/user/libxfce4util/APKBUILD
+++ b/user/libxfce4util/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=libxfce4util
 pkgver=4.13.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Utility library for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="LGPL-2.0+ GPL-2.0+"
 makedepends="intltool glib-dev gobject-introspection-dev vala"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD
index 7b848ad28..5ac314a65 100644
--- a/user/mousepad/APKBUILD
+++ b/user/mousepad/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=mousepad
 pkgver=0.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple text editor for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool glib-dev gtk+3.0-dev gtksourceview-3.0-dev dbus-glib-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/mousepad/0.4/mousepad-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD
index 4cb9121e2..c64f3c18b 100644
--- a/user/orage/APKBUILD
+++ b/user/orage/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=orage
 pkgver=4.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Calendaring software for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,14 +10,12 @@ license="GPL-2.0+ AND BSD-3-Clause AND (LGPL-2.1-only OR MPL-1.0) AND (GPL-2.0+
 makedepends="intltool gtk+2.0-dev dbus-glib-dev libnotify-dev popt-dev
 	xfce4-panel-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/orage/4.12/orage-$pkgver.tar.bz2
+source="https://archive.xfce.org/src/apps/orage/4.12/orage-$pkgver.tar.bz2
 	libical-3.patch
 	"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -28,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD
index 496594ae1..bbd53dfad 100644
--- a/user/parole/APKBUILD
+++ b/user/parole/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=parole
 pkgver=1.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="GStreamer-based media player for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+ AND LGPL-2.1+"
 makedepends="intltool gtk+3.0-dev dbus-glib-dev libxfce4ui-dev gstreamer-dev
 	gst-plugins-base-dev libnotify-dev libice-dev"
 subpackages="$pkgname-dev $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/parole/1.0/parole-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/parole/1.0/parole-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	LIBS="-lX11" ./configure \
+	LIBS="-lintl -lX11" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD
index 1970f15af..965fde75b 100644
--- a/user/ristretto/APKBUILD
+++ b/user/ristretto/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=ristretto
 pkgver=0.8.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Image viewer for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+ AND LGPL-2.0+"
 makedepends="intltool libexif-dev gtk+2.0-dev libxfce4util-dev libxfce4ui-dev
 	libmagic"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/ristretto/0.8/ristretto-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/ristretto/0.8/ristretto-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD
index b2f0fa449..c11154579 100644
--- a/user/thunar-volman/APKBUILD
+++ b/user/thunar-volman/APKBUILD
@@ -2,19 +2,18 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=thunar-volman
 pkgver=0.9.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Volume manager for Thunar"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
-makedepends="intltool libxfce4ui-dev thunar-dev exo-dev libgudev-dev libnotify-dev"
+makedepends="exo-dev intltool libgudev-dev libnotify-dev libxfce4ui-dev
+	thunar-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD
index 0f92f1070..7e7210458 100644
--- a/user/thunar/APKBUILD
+++ b/user/thunar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=thunar
 pkgver=1.8.6
-pkgrel=0
+pkgrel=1
 pkgdesc="File manager for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -11,13 +11,11 @@ makedepends="intltool gtk+3.0-dev exo-dev libxfce4ui-dev vala-dev
 	gobject-introspection-dev libsm-dev libgudev-dev libnotify-dev
 	libexif-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/thunar/1.8/Thunar-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-$pkgver.tar.bz2"
 builddir="$srcdir/Thunar-$pkgver"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -28,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD
index 2f5685df1..27f7ee2b2 100644
--- a/user/tumbler/APKBUILD
+++ b/user/tumbler/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=tumbler
 pkgver=0.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Thumbnail generation service for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -12,12 +12,10 @@ makedepends="intltool dbus-glib-dev gdk-pixbuf-dev curl-dev freetype-dev
 	libjpeg-turbo-dev libgsf-dev poppler-dev ffmpegthumbnailer-dev
 	libopenraw-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -28,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD
index e9e904448..ee024e92d 100644
--- a/user/xfburn/APKBUILD
+++ b/user/xfburn/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfburn
 pkgver=0.5.5
-pkgrel=0
+pkgrel=1
 pkgdesc="CD burning utility for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+"
 makedepends="intltool libburn-dev libisofs-dev gtk+3.0-dev gtk+2.0-dev
 	libxfce4ui-dev exo-dev libgudev-dev gstreamer-dev gst-plugins-base-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/xfburn/0.5/xfburn-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD
index 92a917018..a38613cc7 100644
--- a/user/xfce4-appfinder/APKBUILD
+++ b/user/xfce4-appfinder/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-appfinder
 pkgver=4.13.3
-pkgrel=0
+pkgrel=1
 pkgdesc="An application finder for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev garcon-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.13/xfce4-appfinder-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/xfce4-appfinder/4.13/xfce4-appfinder-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD
index 9cb4c146c..b99788836 100644
--- a/user/xfce4-battery-plugin/APKBUILD
+++ b/user/xfce4-battery-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-battery-plugin
 pkgver=1.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Battery monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+ AND LGPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD
index e96f04999..2ca1be37e 100644
--- a/user/xfce4-clipman-plugin/APKBUILD
+++ b/user/xfce4-clipman-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-clipman-plugin
 pkgver=1.4.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Clipboard management plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev libqrencode-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD
index 3aef0d879..3c8e305a9 100644
--- a/user/xfce4-cpugraph-plugin/APKBUILD
+++ b/user/xfce4-cpugraph-plugin/APKBUILD
@@ -2,26 +2,23 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-cpugraph-plugin
 pkgver=1.0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Graphical CPU monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	chmod a+w config.sub
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -32,12 +29,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 a1bac7cb1..3fdc09ddf 100644
--- a/user/xfce4-diskperf-plugin/APKBUILD
+++ b/user/xfce4-diskperf-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-diskperf-plugin
 pkgver=2.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Disk performance monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="BSD-2-Clause AND GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD
index db59691a5..c0d02810f 100644
--- a/user/xfce4-indicator-plugin/APKBUILD
+++ b/user/xfce4-indicator-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-indicator-plugin
 pkgver=2.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Application information plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev libindicator-dev ido-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD
index 139ec29b5..2b72c4f2c 100644
--- a/user/xfce4-netload-plugin/APKBUILD
+++ b/user/xfce4-netload-plugin/APKBUILD
@@ -2,20 +2,18 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-netload-plugin
 pkgver=1.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Network monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2
+source="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2
 	no-sysctl.patch"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD
index 29a9bcee3..5bc42afc4 100644
--- a/user/xfce4-notifyd/APKBUILD
+++ b/user/xfce4-notifyd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-notifyd
 pkgver=0.4.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Notification service for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0-only AND GPL-2.0+"
 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"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	LIBS="-lX11" ./configure \
+	LIBS="-lintl -lX11" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD
index 9594fc9a8..9c844b5ca 100644
--- a/user/xfce4-panel/APKBUILD
+++ b/user/xfce4-panel/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-panel
 pkgver=4.13.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Panel for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="LGPL-2.1+ AND GPL-2.0+"
 makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev garcon-dev exo-dev
 	libwnck-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD
index dd6dab858..9fac4619b 100644
--- a/user/xfce4-power-manager/APKBUILD
+++ b/user/xfce4-power-manager/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-power-manager
 pkgver=1.6.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Power management support for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+"
 makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev
 	upower-dev xfce4-panel-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD
index 8a1e6cb34..6d7f04117 100644
--- a/user/xfce4-pulseaudio-plugin/APKBUILD
+++ b/user/xfce4-pulseaudio-plugin/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-pulseaudio-plugin
 pkgver=0.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Pulseaudio plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev
 	keybinder-3.0-dev libnotify-dev dbus-glib-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,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 376b6786d..8682bc2c6 100644
--- a/user/xfce4-sensors-plugin/APKBUILD
+++ b/user/xfce4-sensors-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-sensors-plugin
 pkgver=1.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Hardware sensor monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD
index 5b431f963..45984c85d 100644
--- a/user/xfce4-session/APKBUILD
+++ b/user/xfce4-session/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-session
 pkgver=4.13.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Session management for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -11,12 +11,10 @@ depends="iceauth cmd:which xdg-user-dirs"
 makedepends="intltool gtk+3.0-dev libice-dev libsm-dev libxfce4util-dev
 	libxfce4ui-dev libwnck-dev iceauth dbus-glib-dev polkit-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -27,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD
index 7fc818d88..70798f6ce 100644
--- a/user/xfce4-settings/APKBUILD
+++ b/user/xfce4-settings/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-settings
 pkgver=4.13.6
-pkgrel=0
+pkgrel=1
 pkgdesc="GUI settings application for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+ AND MIT AND LGPL-2.0+"
 makedepends="intltool exo-dev garcon-dev libnotify-dev upower-dev
 	libxklavier-dev xf86-input-libinput-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
 source="http://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -28,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD
index 7545e3a0a..c29c895c9 100644
--- a/user/xfce4-systemload-plugin/APKBUILD
+++ b/user/xfce4-systemload-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-systemload-plugin
 pkgver=1.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="System load monitor plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="BSD-2-Clause"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD
index eca6f23c5..4ab646532 100644
--- a/user/xfce4-terminal/APKBUILD
+++ b/user/xfce4-terminal/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-terminal
 pkgver=0.8.7.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Terminal for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool gtk+3.0-dev vte-dev libxfce4ui-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 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 910bd6425..9a910af8d 100644
--- a/user/xfce4-time-out-plugin/APKBUILD
+++ b/user/xfce4-time-out-plugin/APKBUILD
@@ -2,26 +2,23 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-time-out-plugin
 pkgver=1.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Forced computer break plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	chmod a+w config.sub
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -32,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD
index 6e76d0772..b59b00931 100644
--- a/user/xfce4-timer-plugin/APKBUILD
+++ b/user/xfce4-timer-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-timer-plugin
 pkgver=1.7.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Timer plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD
index b4b386853..935a39a5f 100644
--- a/user/xfce4-verve-plugin/APKBUILD
+++ b/user/xfce4-verve-plugin/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfce4-verve-plugin
 pkgver=2.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Command-line plugin for the XFCE panel"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
 makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD
index 74dd12c7d..5486de7dd 100644
--- a/user/xfconf/APKBUILD
+++ b/user/xfconf/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfconf
 pkgver=4.13.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Configuration framework for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -11,12 +11,10 @@ license="LGPL-2.1+ AND GPL-2.0+"
 depends="dbus"
 makedepends="intltool gtk+3.0-dev libxfce4util-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -27,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD
index b192385d0..af4013ff8 100644
--- a/user/xfdashboard/APKBUILD
+++ b/user/xfdashboard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfdashboard
 pkgver=0.7.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Gnome dashboard clone for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+"
 makedepends="intltool gtk+3.0-dev libwnck-dev libice-dev garcon-dev
 	libxfce4ui-dev clutter-dev"
 subpackages="$pkgname-dev $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD
index 920f041d3..d4e435c18 100644
--- a/user/xfdesktop/APKBUILD
+++ b/user/xfdesktop/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfdesktop
 pkgver=4.13.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Desktop manager for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+"
 makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev
 	exo-dev garcon-dev libnotify-dev thunar-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD
index 3484444cd..dc889ea14 100644
--- a/user/xfmpc/APKBUILD
+++ b/user/xfmpc/APKBUILD
@@ -2,19 +2,17 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfmpc
 pkgver=0.3.0
-pkgrel=0
+pkgrel=1
 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+"
 makedepends="intltool gtk+2.0-dev libxfce4ui-dev libmpd-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -25,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD
index 130fc60d9..040bf7520 100644
--- a/user/xfwm4/APKBUILD
+++ b/user/xfwm4/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=xfwm4
 pkgver=4.13.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Window manager for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL-2.0+"
 makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev
 	gobject-introspection-dev vala-dev"
 subpackages="$pkgname-lang"
-langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xsane/APKBUILD b/user/xsane/APKBUILD
index 05cf220e4..3c17b6f6d 100644
--- a/user/xsane/APKBUILD
+++ b/user/xsane/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xsane
 pkgver=0.999
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphical scanning software"
 url=" "
 arch="all"
@@ -12,15 +12,13 @@ depends=""
 makedepends="gtk+2.0-dev lcms2-dev libjpeg-turbo-dev libpng-dev sane-dev
 	tiff-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-langdir="/usr/lib/locale"
 source="http://distfiles.gentoo.org/distfiles/xsane-$pkgver.tar.gz
 	xsane-0.999-lcms2.patch
 	xsane-0.999-libpng16.patch
 	"
 
 build() {
-	cd "$builddir"
-	./configure \
+	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -31,7 +29,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }