network-manager-sstp: address review comments from Duncaen

- Remove unnecessary --prefix/--libdir
- Proper indentation in configure_args
- Combine .la/.a deletion in single find
- Add gtk4-devel to hostmakedepends for cross-build
- Remove empty lines between variables

sstp-client: move dependency variables before short_desc

Author: kalelidev

srcpkgs/network-manager-sstp/template

@@ -3,21 +3,14 @@ pkgname=network-manager-sstp
 version=1.3.2
 revision=1
 build_style=gnu-configure
-
-configure_args="--prefix=/usr
-	--libdir=/usr/lib
-	--with-pppd-plugin-dir=/usr/lib/pppd/2.5.0
-	--with-gnome
-	--with-gtk4
-	--disable-gtk-doc
-	--disable-static"
-
-hostmakedepends="pkg-config intltool autoconf automake libtool gettext-devel-tools glib-devel"
-
+configure_args="--with-pppd-plugin-dir=/usr/lib/pppd/2.5.0
+ --with-gnome
+ --with-gtk4
+ --disable-gtk-doc
+ --disable-static"
+hostmakedepends="pkg-config intltool autoconf automake libtool gettext-devel-tools glib-devel gtk4-devel"
 makedepends="NetworkManager-devel glib-devel gnutls-devel gtk+3-devel gtk4-devel libnma-devel libsecret-devel ppp-devel sstp-client-devel"
-
 depends="NetworkManager sstp-client"
-
 short_desc="NetworkManager VPN plugin for SSTP"
 maintainer="kalelidev <gxiime@gmail.com>"
 license="GPL-2.0-or-later"
@@ -31,8 +24,7 @@ pre_configure() {
 
 do_install() {
 	make DESTDIR="${DESTDIR}" install
-	find "${DESTDIR}" -name '*.la' -delete
-	find "${DESTDIR}" -name '*.a' -delete
+	find "${DESTDIR}" \( -name '*.la' -o -name '*.a' \) -delete
 }
 
 network-manager-sstp-gnome_package() {

srcpkgs/sstp-client/template

@@ -3,22 +3,17 @@ pkgname=sstp-client
 version=1.0.20
 revision=1
 build_style=gnu-configure
+configure_args="--with-runtime-dir=/var/run/sstpc
+ --with-pppd-plugin-dir=/usr/lib/pppd/2.5.0"
+hostmakedepends="pkg-config libtool"
+makedepends="ppp-devel libevent-devel openssl-devel"
+depends="ppp ca-certificates"
 short_desc="Secure Socket Tunneling Protocol (SSTP) client"
 maintainer="kalelidev <gxiime@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.com/sstp-project/sstp-client"
 distfiles="https://gitlab.com/sstp-project/sstp-client/-/releases/${version}/downloads/dist-gzip/sstp-client-${version}.tar.gz"
 checksum="6c84b6cdcc21ebea6daeb8c5356dcdfd8681f4981a734f8485ed0b31fc30aadd"
-
-_pppver=2.5.0
-
-configure_args="--prefix=/usr
-	--with-runtime-dir=/var/run/sstpc
-	--with-pppd-plugin-dir=/usr/lib/pppd/${_pppver}"
-
-hostmakedepends="pkg-config libtool"
-makedepends="ppp-devel libevent-devel openssl-devel"
-depends="ppp ca-certificates"
 make_dirs="/var/run/sstpc 0755 root root"
 # No useful testsuite upstream
 make_check="no"
@@ -31,6 +26,6 @@ sstp-client-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/libsstp_api.so
 		vmove "usr/lib/*.a" 2>/dev/null || :
-		vmove "usr/lib/pppd/${_pppver}/*.a"
+		vmove "usr/lib/pppd/2.5.0/*.a"
 	}
 }