sysutils/policykit: remove

Gnome2 component, no consumers left in the ports tree

17 files changed, 1 insertions, 509 deletions

diff --git a/MOVED b/MOVED
index 6e7c481c6e40..ff8fb539d161 100644
--- a/MOVED
+++ b/MOVED
@@ -16326,3 +16326,4 @@ devel/gnome-vfs||2021-05-01|Dead upstream, no consumers left in the ports tree
 devel/libbonobo||2021-05-01|Dead upstream, no consumers left in the ports tree
 x11-toolkits/p5-Gtk2-Unique||2021-05-01|Dead upstream, no consumers left in the ports tree
 sysutils/policykit-gnome||2021-05-01|Gnome2 component, no consumers left in the ports tree
+sysutils/policykit|sysutils/polkit|2021-05-01|Gnome2 component, no consumers left in the ports tree
diff --git a/sysutils/Makefile b/sysutils/Makefile
index e8c786d269aa..09d8933c5171 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -956,7 +956,6 @@
     SUBDIR += plconfig
     SUBDIR += pmt
     SUBDIR += pnscan
-    SUBDIR += policykit
     SUBDIR += polkit
     SUBDIR += polkit-gnome
     SUBDIR += polkit-qt
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
deleted file mode 100644
index 09beee41d8cb..000000000000
--- a/sysutils/policykit/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-#   $MCom: ports/sysutils/policykit/Makefile,v 1.22 2008/08/21 21:53:00 mezz Exp $
-
-PORTNAME=	policykit
-PORTVERSION=	0.9
-PORTREVISION=	10
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://hal.freedesktop.org/releases/
-DISTNAME=	PolicyKit-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Framework for controlling access to system-wide components
-
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
-		libexpat.so:textproc/expat2
-
-USERS=		polkit
-GROUPS=		polkit
-
-USES=		gettext gmake gnome libtool:keepla pathfix pkgconfig
-USE_GNOME=	glib20 intlhack
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-pam-include=system \
-		--with-os-type=freebsd \
-		--localstatedir=/var \
-		--with-polkit-user=polkit \
-		--with-polkit-group=polkit
-CONFIGURE_ENV=	GTKDOC="false"
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-OPTIONS_DEFINE=	MANPAGES
-OPTIONS_DEFAULT=MANPAGES
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS=	docbook-sgml>0:textproc/docbook-sgml \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
-USE_GNOME+=	libxslt:build
-
-PLIST_SUB+=	MANPAGES=""
-.else
-CONFIGURE_ARGS+=--disable-man-pages
-PLIST_SUB+=	MANPAGES="@comment "
-.endif
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/PolicyKit
-	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
-		${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf.sample
-	# this file is used for reloading rules, handle it in the plist.
-	@${RM} ${STAGEDIR}/var/lib/misc/PolicyKit.reload
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
-
-.include <bsd.port.mk>
diff --git a/sysutils/policykit/distinfo b/sysutils/policykit/distinfo
deleted file mode 100644
index f7e4259863bf..000000000000
--- a/sysutils/policykit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (PolicyKit-0.9.tar.gz) = f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7
-SIZE (PolicyKit-0.9.tar.gz) = 1254318
diff --git a/sysutils/policykit/files/patch-Makefile.in b/sysutils/policykit/files/patch-Makefile.in
deleted file mode 100644
index 29a907e4414a..000000000000
--- a/sysutils/policykit/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2007-12-22 19:11:03.000000000 -0500
-+++ Makefile.in	2007-12-22 19:11:13.000000000 -0500
-@@ -246,7 +246,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = data src polkitd doc tools policy po test
-+SUBDIRS = data src polkitd doc tools policy po
- EXTRA_DIST = \
- 	HACKING 		\
- 	mkinstalldirs 		\
diff --git a/sysutils/policykit/files/patch-consolekit03 b/sysutils/policykit/files/patch-consolekit03
deleted file mode 100644
index 21ce5e7b8bbd..000000000000
--- a/sysutils/policykit/files/patch-consolekit03
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/src/polkit-dbus/polkit-dbus.c b/src/polkit-dbus/polkit-dbus.c
-index f7be03f..cad4a76 100644
---- a/src/polkit-dbus/polkit-dbus.c
-+++ src/polkit-dbus/polkit-dbus.c
-@@ -214,11 +214,17 @@ polkit_session_new_from_objpath (DBusConnection *con, const char *objpath, uid_t
-                                 dbus_message_unref (reply);
-                         goto out;
-                 }
-+                /* GetUnixUser API Changed in CK 0.3.0 */
-                 if (!dbus_message_get_args (reply, NULL,
--                                            DBUS_TYPE_INT32, &uid,
-+                                            DBUS_TYPE_UINT32, &uid,
-                                             DBUS_TYPE_INVALID)) {
--                        kit_warning ("Invalid GetUnixUser reply from CK");
--                        goto out;
-+                        /* try the older API */
-+                        if (!dbus_message_get_args (reply, NULL,
-+                                                    DBUS_TYPE_INT32, &uid,
-+                                                    DBUS_TYPE_INVALID)) {
-+                                kit_warning ("Invalid GetUnixUser reply from CK");
-+                                goto out;
-+                        }
-                 }
-                 dbus_message_unref (message);
-                 dbus_message_unref (reply);
-@@ -1326,16 +1332,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message)
- 
-                 dbus_error_init (&error);
-                 seat_objpath = dbus_message_get_path (message);
--                if (!dbus_message_get_args (message, &error, 
--                                            DBUS_TYPE_STRING, &session_objpath, 
-+                /* API fixed in CK 0.3 to match spec */
-+                if (!dbus_message_get_args (message, &error,
-+                                            DBUS_TYPE_OBJECT_PATH, &session_objpath,
-                                             DBUS_TYPE_INVALID)) {
-+                        if (!dbus_message_get_args (message, &error,
-+                                                    DBUS_TYPE_STRING, &session_objpath,
-+                                                    DBUS_TYPE_INVALID)) {
- 
--                        /* TODO: should be _pk_critical */
--                        kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat "
--                                   "interface for object %s has the wrong signature! "
--                                   "Your system is misconfigured.", seat_objpath);
-+                                /* TODO: should be _pk_critical */
-+                                kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat "
-+                                             "interface for object %s has the wrong signature! "
-+                                             "Your system is misconfigured.", seat_objpath);
- 
--                        goto out;
-+                                goto out;
-+                        }
-                 }
- 
-                 /* TODO: add to sessions - see polkit_tracker_is_authorization_relevant() */
-@@ -1353,16 +1364,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message)
- 
-                 dbus_error_init (&error);
-                 seat_objpath = dbus_message_get_path (message);
--                if (!dbus_message_get_args (message, &error, 
--                                            DBUS_TYPE_STRING, &session_objpath, 
-+                /* API fixed in CK 0.3 to match spec */
-+                if (!dbus_message_get_args (message, &error,
-+                                            DBUS_TYPE_OBJECT_PATH, &session_objpath,
-                                             DBUS_TYPE_INVALID)) {
-+                        if (!dbus_message_get_args (message, &error,
-+                                                    DBUS_TYPE_STRING, &session_objpath,
-+                                                    DBUS_TYPE_INVALID)) {
- 
--                        /* TODO: should be _pk_critical */
--                        kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat "
--                                   "interface for object %s has the wrong signature! "
--                                   "Your system is misconfigured.", seat_objpath);
-+                                /* TODO: should be _pk_critical */
-+                                kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat "
-+                                             "interface for object %s has the wrong signature! "
-+                                             "Your system is misconfigured.", seat_objpath);
- 
--                        goto out;
-+                                goto out;
-+                        }
-                 }
- 
-                 _remove_caller_by_session (pk_tracker, session_objpath);
diff --git a/sysutils/policykit/files/patch-data_Makefile.in b/sysutils/policykit/files/patch-data_Makefile.in
deleted file mode 100644
index f32ab19c0983..000000000000
--- a/sysutils/policykit/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/Makefile.in.orig	2008-01-07 23:51:57.000000000 -0500
-+++ data/Makefile.in	2008-01-07 23:52:15.000000000 -0500
-@@ -305,14 +305,14 @@ mostlyclean-libtool:
- clean-libtool:
- 	-rm -rf .libs _libs
- install-confDATA: $(conf_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
--	@list='$(conf_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
--	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
--	done
-+#	@$(NORMAL_INSTALL)
-+#	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-+#	@list='$(conf_DATA)'; for p in $$list; do \
-+#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+#	  f=$(am__strip_dir) \
-+#	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
-+#	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
-+#	done
- 
- uninstall-confDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/policykit/files/patch-data_PolicyKit.conf.in b/sysutils/policykit/files/patch-data_PolicyKit.conf.in
deleted file mode 100644
index 8f0410475d80..000000000000
--- a/sysutils/policykit/files/patch-data_PolicyKit.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/PolicyKit.conf.in.orig	2008-03-29 12:05:27.000000000 -0400
-+++ data/PolicyKit.conf.in	2008-03-29 12:06:48.000000000 -0400
-@@ -6,4 +6,8 @@
- <!-- See the manual page PolicyKit.conf(5) for file format -->
- 
- <config version="0.1">
-+    <match user="root">
-+	<return result="yes"/>
-+    </match>
-+    <define_admin_auth group="wheel"/>
- </config>
diff --git a/sysutils/policykit/files/patch-polkitd_Makefile.in b/sysutils/policykit/files/patch-polkitd_Makefile.in
deleted file mode 100644
index 250158b1df5f..000000000000
--- a/sysutils/policykit/files/patch-polkitd_Makefile.in
+++ /dev/null
@@ -1,140 +0,0 @@
---- polkitd/Makefile.in.orig	2010-01-22 17:42:42.000000000 -0500
-+++ polkitd/Makefile.in	2010-01-22 17:44:59.000000000 -0500
-@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = polkitd$(EXEEXT)
-+libexec_PROGRAMS = polkitd-old$(EXEEXT)
- subdir = polkitd
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -49,11 +49,11 @@ am__installdirs = "$(DESTDIR)$(libexecdi
- libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(libexec_PROGRAMS)
- am__objects_1 =
--am_polkitd_OBJECTS = polkitd-polkit-daemon.$(OBJEXT) \
--	polkitd-main.$(OBJEXT) $(am__objects_1)
--polkitd_OBJECTS = $(am_polkitd_OBJECTS)
-+am_polkitd_old_OBJECTS = polkitd_old-polkit-daemon.$(OBJEXT) \
-+	polkitd_old-main.$(OBJEXT) $(am__objects_1)
-+polkitd_old_OBJECTS = $(am_polkitd_old_OBJECTS)
- am__DEPENDENCIES_1 =
--polkitd_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+polkitd_old_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(top_builddir)/src/polkit/libpolkit.la \
- 	$(top_builddir)/src/polkit-dbus/libpolkit-dbus.la \
- 	$(top_builddir)/src/polkit-grant/libpolkit-grant.la
-@@ -69,8 +69,8 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--SOURCES = $(polkitd_SOURCES)
--DIST_SOURCES = $(polkitd_SOURCES)
-+SOURCES = $(polkitd_old_SOURCES)
-+DIST_SOURCES = $(polkitd_old_SOURCES)
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -279,12 +279,12 @@ INCLUDES = \
- BUILT_SOURCES = \
- 	polkit-daemon-glue.h
- 
--polkitd_SOURCES = \
-+polkitd_old_SOURCES = \
- 	polkit-daemon.h		polkit-daemon.c		\
- 	main.c						\
- 	$(BUILT_SOURCES)
- 
--polkitd_CPPFLAGS = \
-+polkitd_old_CPPFLAGS = \
- 	-I$(top_srcdir)/src				\
- 	-DG_LOG_DOMAIN=\"polkitd\"			\
- 	-DDATADIR=\""$(pkgdatadir)"\"			\
-@@ -292,7 +292,7 @@ polkitd_CPPFLAGS = \
- 	$(DISABLE_DEPRECATED)				\
- 	$(AM_CPPFLAGS)
- 
--polkitd_LDADD = \
-+polkitd_old_LDADD = \
- 	$(DBUS_GLIB_LIBS) $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la $(top_builddir)/src/polkit-grant/libpolkit-grant.la
- 
- servicedir = $(datadir)/dbus-1/system-services
-@@ -365,9 +365,9 @@ clean-libexecPROGRAMS:
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
--polkitd$(EXEEXT): $(polkitd_OBJECTS) $(polkitd_DEPENDENCIES) 
--	@rm -f polkitd$(EXEEXT)
--	$(LINK) $(polkitd_OBJECTS) $(polkitd_LDADD) $(LIBS)
-+polkitd-old$(EXEEXT): $(polkitd_old_OBJECTS) $(polkitd_old_DEPENDENCIES) 
-+	@rm -f polkitd-old$(EXEEXT)
-+	$(LINK) $(polkitd_old_OBJECTS) $(polkitd_old_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -375,8 +375,8 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polkitd-main.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polkitd-polkit-daemon.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polkitd_old-main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polkitd_old-polkit-daemon.Po@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -399,33 +399,33 @@ distclean-compile:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
--polkitd-polkit-daemon.o: polkit-daemon.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd-polkit-daemon.o -MD -MP -MF $(DEPDIR)/polkitd-polkit-daemon.Tpo -c -o polkitd-polkit-daemon.o `test -f 'polkit-daemon.c' || echo '$(srcdir)/'`polkit-daemon.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd-polkit-daemon.Tpo $(DEPDIR)/polkitd-polkit-daemon.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='polkit-daemon.c' object='polkitd-polkit-daemon.o' libtool=no @AMDEPBACKSLASH@
-+polkitd_old-polkit-daemon.o: polkit-daemon.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd_old-polkit-daemon.o -MD -MP -MF $(DEPDIR)/polkitd_old-polkit-daemon.Tpo -c -o polkitd_old-polkit-daemon.o `test -f 'polkit-daemon.c' || echo '$(srcdir)/'`polkit-daemon.c
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd_old-polkit-daemon.Tpo $(DEPDIR)/polkitd_old-polkit-daemon.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='polkit-daemon.c' object='polkitd_old-polkit-daemon.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd-polkit-daemon.o `test -f 'polkit-daemon.c' || echo '$(srcdir)/'`polkit-daemon.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd_old-polkit-daemon.o `test -f 'polkit-daemon.c' || echo '$(srcdir)/'`polkit-daemon.c
- 
--polkitd-polkit-daemon.obj: polkit-daemon.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd-polkit-daemon.obj -MD -MP -MF $(DEPDIR)/polkitd-polkit-daemon.Tpo -c -o polkitd-polkit-daemon.obj `if test -f 'polkit-daemon.c'; then $(CYGPATH_W) 'polkit-daemon.c'; else $(CYGPATH_W) '$(srcdir)/polkit-daemon.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd-polkit-daemon.Tpo $(DEPDIR)/polkitd-polkit-daemon.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='polkit-daemon.c' object='polkitd-polkit-daemon.obj' libtool=no @AMDEPBACKSLASH@
-+polkitd_old-polkit-daemon.obj: polkit-daemon.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd_old-polkit-daemon.obj -MD -MP -MF $(DEPDIR)/polkitd_old-polkit-daemon.Tpo -c -o polkitd_old-polkit-daemon.obj `if test -f 'polkit-daemon.c'; then $(CYGPATH_W) 'polkit-daemon.c'; else $(CYGPATH_W) '$(srcdir)/polkit-daemon.c'; fi`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd_old-polkit-daemon.Tpo $(DEPDIR)/polkitd_old-polkit-daemon.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='polkit-daemon.c' object='polkitd_old-polkit-daemon.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd-polkit-daemon.obj `if test -f 'polkit-daemon.c'; then $(CYGPATH_W) 'polkit-daemon.c'; else $(CYGPATH_W) '$(srcdir)/polkit-daemon.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd_old-polkit-daemon.obj `if test -f 'polkit-daemon.c'; then $(CYGPATH_W) 'polkit-daemon.c'; else $(CYGPATH_W) '$(srcdir)/polkit-daemon.c'; fi`
- 
--polkitd-main.o: main.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd-main.o -MD -MP -MF $(DEPDIR)/polkitd-main.Tpo -c -o polkitd-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd-main.Tpo $(DEPDIR)/polkitd-main.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='polkitd-main.o' libtool=no @AMDEPBACKSLASH@
-+polkitd_old-main.o: main.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd_old-main.o -MD -MP -MF $(DEPDIR)/polkitd_old-main.Tpo -c -o polkitd_old-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd_old-main.Tpo $(DEPDIR)/polkitd_old-main.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='polkitd_old-main.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd_old-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
- 
--polkitd-main.obj: main.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd-main.obj -MD -MP -MF $(DEPDIR)/polkitd-main.Tpo -c -o polkitd-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd-main.Tpo $(DEPDIR)/polkitd-main.Po
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='polkitd-main.obj' libtool=no @AMDEPBACKSLASH@
-+polkitd_old-main.obj: main.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT polkitd_old-main.obj -MD -MP -MF $(DEPDIR)/polkitd_old-main.Tpo -c -o polkitd_old-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/polkitd_old-main.Tpo $(DEPDIR)/polkitd_old-main.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='polkitd_old-main.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(polkitd_old_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o polkitd_old-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
diff --git a/sysutils/policykit/files/patch-polkitd_org.freedesktop.PolicyKit.service.in b/sysutils/policykit/files/patch-polkitd_org.freedesktop.PolicyKit.service.in
deleted file mode 100644
index 3a76f7336622..000000000000
--- a/sysutils/policykit/files/patch-polkitd_org.freedesktop.PolicyKit.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- polkitd/org.freedesktop.PolicyKit.service.in.orig	2010-01-22 17:45:50.000000000 -0500
-+++ polkitd/org.freedesktop.PolicyKit.service.in	2010-01-22 17:45:55.000000000 -0500
-@@ -1,6 +1,6 @@
- [D-BUS Service]
- Name=org.freedesktop.PolicyKit
--Exec=@libexecdir@/polkitd
-+Exec=@libexecdir@/polkitd-old
- User=root
- 
- # Hmm when using User=@polkituser@ I get this: 
diff --git a/sysutils/policykit/files/patch-src_kit_kit-spawn.c b/sysutils/policykit/files/patch-src_kit_kit-spawn.c
deleted file mode 100644
index 1521a6a99f8a..000000000000
--- a/sysutils/policykit/files/patch-src_kit_kit-spawn.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/kit/kit-spawn.c.orig	2009-03-29 20:11:24.000000000 -0400
-+++ src/kit/kit-spawn.c	2009-03-29 20:11:43.000000000 -0400
-@@ -396,7 +396,10 @@ kit_spawn_sync (const char     *working_
-                         }
-                 }
- 
-+again:
-                 if (waitpid (pid, out_exit_status, 0) == -1) {
-+			if (errno == EINTR)
-+				goto again;
-                         goto out;
-                 }
-                 pid = -1;
diff --git a/sysutils/policykit/files/patch-src_kit_kit-string.c b/sysutils/policykit/files/patch-src_kit_kit-string.c
deleted file mode 100644
index eff7cb997c58..000000000000
--- a/sysutils/policykit/files/patch-src_kit_kit-string.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/kit/kit-string.c.orig	2008-05-30 17:24:44.000000000 -0400
-+++ src/kit/kit-string.c	2008-07-24 01:21:34.000000000 -0400
-@@ -123,13 +123,18 @@ static char
-         if ( !s )
-                 return NULL;
- 
--        if ( strlen(s) > n )
--                nAvail = n + 1;
--        else
--                nAvail = strlen(s) + 1;
--        p = malloc ( nAvail );
-+        if (memchr(s, '\0', n) != NULL) {
-+                nAvail = strlen(s);
-+                if ( nAvail > n )
-+                        nAvail = n;
-+        } else {
-+                nAvail = n;
-+        }
-+        p = malloc ( nAvail + 1 );
-+        if (p == NULL)
-+                return NULL;
-         memcpy ( p, s, nAvail );
--        p[nAvail - 1] = '\0';
-+        p[nAvail] = '\0';
- 
-         return p;
- }
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c
deleted file mode 100644
index 7c22acea573a..000000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/polkit-grant/polkit-grant.c.orig	2009-03-29 20:12:16.000000000 -0400
-+++ src/polkit-grant/polkit-grant.c	2009-03-29 20:13:15.000000000 -0400
-@@ -303,7 +303,7 @@ polkit_grant_io_func (PolKitGrant *polki
-         g_return_if_fail (polkit_grant != NULL);
-         g_return_if_fail (polkit_grant->helper_is_running);
- 
--        while (kit_getline (&line, &line_len, polkit_grant->child_stdout_f) != -1) {
-+        while (kit_getline (&line, &line_len, polkit_grant->child_stdout_f) != -1 && !feof (polkit_grant->child_stdout_f)) {
-                 if (strlen (line) > 0 &&
-                     line[strlen (line) - 1] == '\n')
-                         line[strlen (line) - 1] = '\0';
diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-context.c b/sysutils/policykit/files/patch-src_polkit_polkit-context.c
deleted file mode 100644
index 4d763448e299..000000000000
--- a/sysutils/policykit/files/patch-src_polkit_polkit-context.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/polkit/polkit-context.c.orig	2012-03-04 18:35:51.000000000 -0500
-+++ src/polkit/polkit-context.c	2012-03-04 18:38:35.000000000 -0500
-@@ -45,7 +45,8 @@
- #else
- #ifdef HAVE_INOTIFY
- #include <sys/inotify.h>
--#elif HAVE_KQUEUE
-+#endif
-+#ifdef HAVE_KQUEUE
- #include <sys/event.h>
- #include <sys/time.h>
- #include <fcntl.h>
-@@ -123,7 +124,8 @@ struct _PolKitContext
-         int inotify_config_wd;
-         int inotify_policy_wd;
-         int inotify_grant_perm_wd;
--#elif HAVE_KQUEUE
-+#endif
-+#ifdef HAVE_KQUEUE
- 	int kqueue_fd;
- 	int kqueue_fd_watch_id;
- 	int kqueue_config_fd;
diff --git a/sysutils/policykit/pkg-descr b/sysutils/policykit/pkg-descr
deleted file mode 100644
index 3b2da1f550a0..000000000000
--- a/sysutils/policykit/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-PolicyKit is a framework for defining policy for system-wide components and
-for desktop pieces to configure it. It is used by HAL.
-
-WWW: https://www.freedesktop.org/wiki/Software/polkit/
diff --git a/sysutils/policykit/pkg-install b/sysutils/policykit/pkg-install
deleted file mode 100644
index 3fbb00c5f1fb..000000000000
--- a/sysutils/policykit/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=polkit
-	GROUP=${USER}
-
-	/usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/run/PolicyKit
-	/usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/lib/PolicyKit
-	/usr/bin/install -d -o ${USER} -m 0755 -g wheel /var/lib/PolicyKit-public
-	/bin/mkdir -p /var/lib/misc
-	/usr/bin/touch -f /var/lib/misc/PolicyKit.reload
-	/usr/sbin/chown ${USER}:${GROUP} /var/lib/misc/PolicyKit.reload
-	/bin/chmod 0664 /var/lib/misc/PolicyKit.reload
-	for i in ${PKG_PREFIX}/libexec/polkit-read-auth-helper ${PKG_PREFIX}/libexec/polkit-set-default-helper ${PKG_PREFIX}/libexec/polkit-grant-helper ${PKG_PREFIX}/libexec/polkit-grant-helper-pam ${PKG_PREFIX}/libexec/polkit-explicit-grant-helper ${PKG_PREFIX}/libexec/polkit-revoke-helper /var/lib/misc/PolicyKit.reload; do
-	    /usr/bin/chgrp ${GROUP} ${i}
-	done
-	exit 0
-	;;
-esac
diff --git a/sysutils/policykit/pkg-plist b/sysutils/policykit/pkg-plist
deleted file mode 100644
index 4f20443c77e1..000000000000
--- a/sysutils/policykit/pkg-plist
+++ /dev/null
@@ -1,71 +0,0 @@
-bin/polkit-action
-bin/polkit-auth
-bin/polkit-config-file-validate
-bin/polkit-policy-file-validate
-@sample etc/PolicyKit/PolicyKit.conf.sample
-etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf
-etc/pam.d/polkit
-etc/profile.d/polkit-bash-completion.sh
-include/PolicyKit/polkit-dbus/polkit-dbus.h
-include/PolicyKit/polkit-dbus/polkit-simple.h
-include/PolicyKit/polkit-grant/polkit-grant.h
-include/PolicyKit/polkit/polkit-action.h
-include/PolicyKit/polkit/polkit-authorization-constraint.h
-include/PolicyKit/polkit/polkit-authorization-db.h
-include/PolicyKit/polkit/polkit-authorization.h
-include/PolicyKit/polkit/polkit-caller.h
-include/PolicyKit/polkit/polkit-config.h
-include/PolicyKit/polkit/polkit-context.h
-include/PolicyKit/polkit/polkit-error.h
-include/PolicyKit/polkit/polkit-policy-cache.h
-include/PolicyKit/polkit/polkit-policy-default.h
-include/PolicyKit/polkit/polkit-policy-file-entry.h
-include/PolicyKit/polkit/polkit-policy-file.h
-include/PolicyKit/polkit/polkit-result.h
-include/PolicyKit/polkit/polkit-seat.h
-include/PolicyKit/polkit/polkit-session.h
-include/PolicyKit/polkit/polkit-sysdeps.h
-include/PolicyKit/polkit/polkit-types.h
-include/PolicyKit/polkit/polkit.h
-lib/libpolkit-dbus.a
-lib/libpolkit-dbus.la
-lib/libpolkit-dbus.so
-lib/libpolkit-dbus.so.2
-lib/libpolkit-dbus.so.2.0.0
-lib/libpolkit-grant.a
-lib/libpolkit-grant.la
-lib/libpolkit-grant.so
-lib/libpolkit-grant.so.2
-lib/libpolkit-grant.so.2.0.0
-lib/libpolkit.a
-lib/libpolkit.la
-lib/libpolkit.so
-lib/libpolkit.so.2
-lib/libpolkit.so.2.0.0
-libdata/pkgconfig/polkit-dbus.pc
-libdata/pkgconfig/polkit-grant.pc
-libdata/pkgconfig/polkit.pc
-libexec/polkit-explicit-grant-helper
-libexec/polkit-grant-helper
-libexec/polkit-grant-helper-pam
-libexec/polkit-read-auth-helper
-libexec/polkit-resolve-exe-helper
-libexec/polkit-revoke-helper
-libexec/polkit-set-default-helper
-libexec/polkitd-old
-%%MANPAGES%%man/man1/polkit-action.1.gz
-%%MANPAGES%%man/man1/polkit-auth.1.gz
-%%MANPAGES%%man/man1/polkit-config-file-validate.1.gz
-%%MANPAGES%%man/man1/polkit-policy-file-validate.1.gz
-%%MANPAGES%%man/man5/PolicyKit.conf.5.gz
-%%MANPAGES%%man/man8/PolicyKit.8.gz
-share/PolicyKit/config.dtd
-share/PolicyKit/policy/org.freedesktop.policykit.policy
-share/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml
-share/dbus-1/system-services/org.freedesktop.PolicyKit.service
-@rmtry /var/lib/misc/PolicyKit.reload
-@dir /var/run/PolicyKit
-@dir /var/lib/PolicyKit
-@dir /var/lib/PolicyKit-public
-@dir /var/lib/misc
-@dir /var/lib