Index: sysutils/polkit/Makefile
===================================================================
--- sysutils/polkit/Makefile (revision 470563)
+++ sysutils/polkit/Makefile (working copy)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= polkit
-PORTVERSION= 0.113
-PORTREVISION= 5
+PORTVERSION= 0.114
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/
@@ -14,7 +13,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:textproc/expat2 \
- libmozjs-17.0.so:lang/spidermonkey170
+ libmozjs-52.so:lang/spidermonkey52
RUN_DEPENDS= dbus-launch:devel/dbus
USERS= polkitd
@@ -21,7 +20,7 @@
GROUPS= polkitd
USE_GNOME= glib20 intlhack introspection:build
-USES= gettext gmake libtool pathfix pkgconfig shebangfix
+USES= gettext gmake libtool localbase pathfix pkgconfig shebangfix
SHEBANG_FILES= ${WRKSRC}/src/polkitbackend/toarray.pl
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -33,14 +32,12 @@
--with-polkitd-user=${USERS} \
--disable-static \
--disable-examples \
- --with-mozjs=mozjs-17.0 \
--disable-libsystemd-login \
+ --disable-libelogind \
--disable-test \
--enable-introspection=yes \
--localstatedir=/var
#MAKE_JOBS_UNSAFE=yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= MANPAGES
@@ -56,7 +53,7 @@
@${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|/usr/local|${PREFIX}|g' \
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
${WRKSRC}/docs/man/polkit.xml
post-install:
Index: sysutils/polkit/distinfo
===================================================================
--- sysutils/polkit/distinfo (revision 470563)
+++ sysutils/polkit/distinfo (working copy)
@@ -1,2 +1,3 @@
-SHA256 (polkit-0.113.tar.gz) = e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81
-SIZE (polkit-0.113.tar.gz) = 1448865
+TIMESTAMP = 1525103481
+SHA256 (polkit-0.114.tar.gz) = bdf4007367d758fd794de2495975c115984d206267e52d1e6ac5ceea77e8ede6
+SIZE (polkit-0.114.tar.gz) = 1557340
Index: sysutils/polkit/files/patch-Makefile.in
===================================================================
--- sysutils/polkit/files/patch-Makefile.in (revision 470563)
+++ sysutils/polkit/files/patch-Makefile.in (nonexistent)
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2015-06-19 20:31:12 UTC
-+++ Makefile.in
-@@ -157,7 +157,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = actions data src docs po test
-+DIST_SUBDIRS = actions data src docs po
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
- COPYING ChangeLog INSTALL NEWS README compile config.guess \
- config.sub depcomp install-sh ltmain.sh missing
Property changes on: sysutils/polkit/files/patch-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: sysutils/polkit/files/patch-docs_man_polkit.xml
===================================================================
--- sysutils/polkit/files/patch-docs_man_polkit.xml (revision 470563)
+++ sysutils/polkit/files/patch-docs_man_polkit.xml (working copy)
@@ -1,57 +1,45 @@
---- docs/man/polkit.xml.orig 2013-05-06 18:28:21 UTC
+--- docs/man/polkit.xml.orig 2018-01-20 14:00:19 UTC
+++ docs/man/polkit.xml
-@@ -100,17 +100,17 @@ System Context |
- | polkitd(8) |
- +------------------+
- | org.freedesktop. |
--| PolicyKit1 |<---------+
--+------------------+ |
-- ^ |
-- | +--------------------------------------+
+@@ -104,12 +104,12 @@ System Context | |
+ +------------------+ |
+ ^ |
+ | +--------------------------------------+
- | | /usr/share/polkit-1/actions/*.policy |
-- | +--------------------------------------+
-+| PolicyKit1 |<------+
-++------------------+ |
-+ ^ |
-+ | +--------------------------------------------+
-+ | | /usr/local/share/polkit-1/actions/*.policy |
-+ | +--------------------------------------------+
++ | | %%LOCALBASE%%/share/polkit-1/actions/*.policy |
+ | +--------------------------------------+
|
-- +--------------------------------------+
+ +--------------------------------------+
- | /etc/polkit-1/rules.d/*.rules |
- | /usr/share/polkit-1/rules.d/*.rules |
-- +--------------------------------------+
-+ +------------------------------------------------+
-+ | /usr/local/etc/polkit-1/rules.d/*.rules |
-+ | /usr/local/share/polkit-1/rules.d/*.rules |
-+ +------------------------------------------------+
++ | %%LOCALBASE%%/etc/polkit-1/rules.d/*.rules |
++ | %%LOCALBASE%%/share/polkit-1/rules.d/*.rules |
+ +--------------------------------------+
]]>
-
-@@ -217,7 +217,7 @@ System Context |
+@@ -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 /usr/share/polkit-1/actions
-+ class='directory'>/usr/local/share/polkit-1/actions
++ class='directory'>%%LOCALBASE%%/share/polkit-1/actions
directory.
-@@ -473,21 +473,21 @@ System Context |
+@@ -473,21 +473,21 @@ System Context | |
polkitd reads
.rules files from the
- /etc/polkit-1/rules.d and
- /usr/share/polkit-1/rules.d
-+ /usr/local/etc/polkit-1/rules.d and
-+ /usr/local/share/polkit-1/rules.d
++ %%LOCALBASE%%/etc/polkit-1/rules.d and
++ %%LOCALBASE%%/share/polkit-1/rules.d
directories by sorting the files in lexical order based on the
basename on each file (if there's a tie, files in
- /etc
-+ /usr/local/etc
++ %%LOCALBASE%%/etc
are processed before files in
- /usr).
-+ /usr/local/share).
++ %%LOCALBASE/share).
For example, for the following four
files, the order is
@@ -60,25 +48,34 @@
- /usr/share/polkit-1/rules.d/10-auth.rules
- /etc/polkit-1/rules.d/15-auth.rules
- /usr/share/polkit-1/rules.d/20-auth.rules
-+ /usr/local/etc/polkit-1/rules.d/10-auth.rules
-+ /usr/local/share/polkit-1/rules.d/10-auth.rules
-+ /usr/local/etc/polkit-1/rules.d/15-auth.rules
-+ /usr/local/share/polkit-1/rules.d/20-auth.rules
++ %%LOCALBASE%%/etc/polkit-1/rules.d/10-auth.rules
++ %%LOCALBASE%%/share/polkit-1/rules.d/10-auth.rules
++ %%LOCALBASE%%/etc/polkit-1/rules.d/15-auth.rules
++ %%LOCALBASE%%/share/polkit-1/rules.d/20-auth.rules
Both directories are monitored so if a rules file is changed,
-@@ -683,8 +683,8 @@ polkit.addRule(function(action, subject)
+@@ -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
+- /etc/polkit-1/rules.d
++ %%LOCALBASE%%/etc/polkit-1/rules.d
+ with a name that sorts before other rules files, for example
+ 00-early-checks.rules. Each function should
+ return a value from polkit.Result
+@@ -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:
-@@ -916,7 +916,7 @@ polkit.addRule(function(action, subject)
+@@ -916,7 +916,7 @@ polkit.addRule(function(action, subject) {