polkit: enable build_pie/relro; update options to the new world order.

srcpkgs/polkit/template

@@ -1,9 +1,12 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.112
-revision=8
+revision=9
+build_pie=yes
 build_style=gnu-configure
-configure_args="--disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-17.0"
+configure_args="$(vopt_enable gir introspection)
+ $(vopt_enable systemd) $(vopt_enable systemd libsystemd-login)
+ --disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-17.0"
 short_desc="Authorization Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/polkit"
@@ -11,8 +14,10 @@ license="GPL-2"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz"
 checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6
 
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
-makedepends="libglib-devel expat-devel pam-devel mozjs17-devel"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel
+ $(vopt_if gir gobject-introspection)"
+makedepends="libglib-devel expat-devel pam-devel mozjs17-devel
+ $(vopt_if systemd systemd-devel)"
 system_accounts="polkitd"
 make_dirs="
  /etc/polkit-1/rules.d 0700 polkitd polkitd
@@ -27,20 +32,6 @@ else
 	build_options_default+=" gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	hostmakedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd --enable-libsystemd-login --with-systemdsystemunitdir=/usr/lib/systemd/system"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd --disable-libsystemd-login"
-fi
-
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		autoreconf -fi