diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 3e30a556f942..83bfeead5f38 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	polkit
 DISTVERSION=	124
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Framework for controlling access to system-wide components
 WWW=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libdbus-1.so:devel/dbus
 
 USERS=		polkitd
 GROUPS=		polkitd
 
 USES=		compiler:c++17-lang cpe gettext gnome libtool localbase meson \
 		pathfix pkgconfig shebangfix tar:bz2
 USE_GNOME=	glib20 intltool introspection:build
 SHEBANG_FILES=	${WRKSRC}/src/polkitbackend/toarray.pl
 USE_LDCONFIG=	yes
 CPE_VENDOR=	polkit_project
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	polkit-org
 
 MESON_ARGS=	-Dpam_include=system \
 		-Dpam_prefix='etc/pam.d' \
 		-Dpolkitd_user=${USERS} \
 		-Dexamples=false \
 		-Dsession_tracking=ConsoleKit \
 		-Dtests=false \
 		-Dintrospection=true \
 		-Dlocalstatedir=/var \
 		-Dgtk_doc=false
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	DUKTAPE
 
 OPTIONS_SINGLE=		JS
 OPTIONS_SINGLE_JS=	DUKTAPE SPIDERMONKEY
 
 JS_DESC=		JavaScript engines
 DUKTAPE_DESC=		Duktape JavaScript backend
 SPIDERMONKEY_DESC=	SpiderMonkey JavaScript backend
 
 DUKTAPE_LIB_DEPENDS=	libduktape.so:lang/duktape-lib
 DUKTAPE_MESON_ON=	-Djs_engine='duktape'
 
 SPIDERMONKEY_LIB_DEPENDS=	libmozjs-102.so:lang/spidermonkey102
 SPIDERMONKEY_MESON_ON=		-Djs_engine='mozjs'
 
 MANPAGES_BUILD_DEPENDS=	docbook-sgml>0:textproc/docbook-sgml \
 			docbook-xsl>0:textproc/docbook-xsl
 MANPAGES_USE=		gnome=libxslt:build
 MANPAGES_MESON_TRUE=	man
 
 OPTIONS_SUB=		yes
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \
 		${WRKSRC}/docs/man/pkexec.xml \
 		${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
 		${WRKSRC}/docs/man/polkit.xml
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/lib/polkit-1 \
 		  ${STAGEDIR}${PREFIX}/share/polkit-1/rules.d
 .for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/polkit-1/localauthority/${i}
 	${MKDIR} ${STAGEDIR}/var/lib/polkit-1/localauthority/${i}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/polkit/files/patch-docs_man_polkit.xml b/sysutils/polkit/files/patch-docs_man_polkit.xml
index 0a880b1764f0..674c65c30674 100644
--- a/sysutils/polkit/files/patch-docs_man_polkit.xml
+++ b/sysutils/polkit/files/patch-docs_man_polkit.xml
@@ -1,86 +1,86 @@
 --- docs/man/polkit.xml.orig	2018-01-20 14:00:19 UTC
 +++ docs/man/polkit.xml
 @@ -104,12 +104,12 @@ System Context         |                        |
  +------------------+          |
            ^                   |
            |            +--------------------------------------+
 -          |            | /usr/share/polkit-1/actions/*.policy |
 +          |            | %%LOCALBASE%%/share/polkit-1/actions/*.policy |
            |            +--------------------------------------+
            |
     +--------------------------------------+
 -   | /etc/polkit-1/rules.d/*.rules        |
 -   | /usr/share/polkit-1/rules.d/*.rules  |
 +   | %%LOCALBASE%%/etc/polkit-1/rules.d/*.rules        |
 +   | %%LOCALBASE%%/share/polkit-1/rules.d/*.rules  |
     +--------------------------------------+
  ]]></programlisting>
        </textobject>
 @@ -217,7 +217,7 @@ System Context         |                        |
        order to use polkit. Actions correspond to operations that
        clients can request the mechanism to carry out and are defined
        in XML files that the mechanism installs into the <filename
 -      class='directory'>/usr/share/polkit-1/actions</filename>
 +      class='directory'>%%LOCALBASE%%/share/polkit-1/actions</filename>
        directory.
      </para>
  
 @@ -473,21 +473,21 @@ System Context         |                        |
      <para>
        <command>polkitd</command> reads
        <filename class='extension'>.rules</filename> files from the
 -      <filename class='directory'>/etc/polkit-1/rules.d</filename> and
 -      <filename class='directory'>/usr/share/polkit-1/rules.d</filename>
 +      <filename class='directory'>%%LOCALBASE%%/etc/polkit-1/rules.d</filename> and
 +      <filename class='directory'>%%LOCALBASE%%/share/polkit-1/rules.d</filename>
        directories by sorting the files in lexical order based on the
        basename on each file (if there's a tie, files in
 -      <filename class='directory'>/etc</filename>
 +      <filename class='directory'>%%LOCALBASE%%/etc</filename>
        are processed before files in
 -      <filename class='directory'>/usr</filename>).
-+      <filename class='directory'>%%LOCALBASE/share</filename>).
++      <filename class='directory'>%%LOCALBASE%%/share</filename>).
        For example, for the following four
        files, the order is
      </para>
      <itemizedlist mark='opencircle' spacing='compact'>
 -      <listitem><para><filename>/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
 -      <listitem><para><filename>/usr/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
 -      <listitem><para><filename>/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
 -      <listitem><para><filename>/usr/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem>
 +      <listitem><para><filename>%%LOCALBASE%%/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
 +      <listitem><para><filename>%%LOCALBASE%%/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem>
 +      <listitem><para><filename>%%LOCALBASE%%/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem>
 +      <listitem><para><filename>%%LOCALBASE%%/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem>
      </itemizedlist>
      <para>
        Both directories are monitored so if a rules file is changed,
 @@ -567,7 +567,7 @@ System Context         |                        |
          called in the order they have been added until one of the
          functions returns a value. Hence, to add an authorization rule
          that is processed before other rules, put it in a file in
 -        <filename class='directory'>/etc/polkit-1/rules.d</filename>
 +        <filename class='directory'>%%LOCALBASE%%/etc/polkit-1/rules.d</filename>
          with a name that sorts before other rules files, for example
          <filename>00-early-checks.rules</filename>. Each function should
          return a value from <literal>polkit.Result</literal>
 @@ -683,8 +683,8 @@ polkit.addRule(function(action, subject) {
          will produce the following when the user runs 'pkexec -u bateman bash -i' from a shell:
        </para>
        <programlisting><![CDATA[
 -May 24 14:28:50 thinkpad polkitd[32217]: /etc/polkit-1/rules.d/10-test.rules:3: action=[Action id='org.freedesktop.policykit.exec' command_line='/usr/bin/bash -i' program='/usr/bin/bash' user='bateman' user.gecos='Patrick Bateman' user.display='Patrick Bateman (bateman)']
 -May 24 14:28:50 thinkpad polkitd[32217]: /etc/polkit-1/rules.d/10-test.rules:4: subject=[Subject pid=1352 user='davidz' groups=davidz,wheel, seat='seat0' session='1' local=true active=true]
 +May 24 14:28:50 thinkpad polkitd[32217]: %%LOCALBASE%%/etc/polkit-1/rules.d/10-test.rules:3: action=[Action id='org.freedesktop.policykit.exec' command_line='/usr/bin/bash -i' program='/usr/bin/bash' user='bateman' user.gecos='Patrick Bateman' user.display='Patrick Bateman (bateman)']
 +May 24 14:28:50 thinkpad polkitd[32217]: %%LOCALBASE%%/etc/polkit-1/rules.d/10-test.rules:4: subject=[Subject pid=1352 user='davidz' groups=davidz,wheel, seat='seat0' session='1' local=true active=true]
  ]]></programlisting>
  
      </refsect2>
 @@ -916,7 +916,7 @@ polkit.addRule(function(action, subject) {
        <programlisting><![CDATA[
  polkit.addRule(function(action, subject) {
      if (action.id == "org.freedesktop.policykit.exec" &&
 -        action.lookup("program") == "/usr/bin/cat") {
 +        action.lookup("program") == "/bin/cat") {
          return polkit.Result.AUTH_ADMIN;
      }
  });