From 486f5ca8e886b88af11b5ae4cf2a449273a995f2 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 12 Jul 2011 07:35:54 +0000 Subject: [PATCH] Remove (gnome)-system-tools. Most of it is broken on OpenBSD and there is no point in fixing it since most features have been superseded by accountsservice and gnome-cc (GNOME3). ok jasper@ --- sysutils/Makefile | 3 +- sysutils/system-tools-backends/Makefile | 43 -- sysutils/system-tools-backends/distinfo | 5 - .../patches/patch-Init_ServicesList_pm | 70 --- .../patches/patch-Init_Services_pm | 95 --- .../patches/patch-Network_Hosts_pm | 11 - .../patches/patch-Network_Ifaces_pm | 46 -- .../patches/patch-Shares_SMB_pm | 19 - .../patches/patch-Time_NTP_pm | 19 - .../patches/patch-Time_TimeDate_pm | 58 -- .../patches/patch-Users_Users_pm | 180 ------ .../patches/patch-Utils_Platform_pm | 52 -- sysutils/system-tools-backends/pkg/DESCR | 9 - sysutils/system-tools-backends/pkg/PLIST | 146 ----- x11/gnome/Makefile | 3 +- x11/gnome/system-tools/Makefile | 50 -- x11/gnome/system-tools/distinfo | 5 - .../system-tools/patches/patch-configure | 32 - .../patches/patch-interfaces_time_ui | 70 --- .../patch-src_common_gst-service-role_c | 61 -- .../patches/patch-src_shares_shares-tool_c | 30 - .../patches/patch-src_time_main_c | 15 - .../patches/patch-src_time_time-tool_c | 18 - .../patch-src_users_user-profiles_conf_in | 15 - .../patches/patch-src_users_user-settings_c | 12 - x11/gnome/system-tools/pkg/DESCR | 19 - x11/gnome/system-tools/pkg/PLIST | 580 ------------------ 27 files changed, 2 insertions(+), 1664 deletions(-) delete mode 100644 sysutils/system-tools-backends/Makefile delete mode 100644 sysutils/system-tools-backends/distinfo delete mode 100644 sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Init_Services_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Network_Hosts_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Network_Ifaces_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Shares_SMB_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Time_NTP_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Time_TimeDate_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Users_Users_pm delete mode 100644 sysutils/system-tools-backends/patches/patch-Utils_Platform_pm delete mode 100644 sysutils/system-tools-backends/pkg/DESCR delete mode 100644 sysutils/system-tools-backends/pkg/PLIST delete mode 100644 x11/gnome/system-tools/Makefile delete mode 100644 x11/gnome/system-tools/distinfo delete mode 100644 x11/gnome/system-tools/patches/patch-configure delete mode 100644 x11/gnome/system-tools/patches/patch-interfaces_time_ui delete mode 100644 x11/gnome/system-tools/patches/patch-src_common_gst-service-role_c delete mode 100644 x11/gnome/system-tools/patches/patch-src_shares_shares-tool_c delete mode 100644 x11/gnome/system-tools/patches/patch-src_time_main_c delete mode 100644 x11/gnome/system-tools/patches/patch-src_time_time-tool_c delete mode 100644 x11/gnome/system-tools/patches/patch-src_users_user-profiles_conf_in delete mode 100644 x11/gnome/system-tools/patches/patch-src_users_user-settings_c delete mode 100644 x11/gnome/system-tools/pkg/DESCR delete mode 100644 x11/gnome/system-tools/pkg/PLIST diff --git a/sysutils/Makefile b/sysutils/Makefile index aefc43d4d76..23f8c3721b2 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.243 2011/07/08 18:17:34 sthen Exp $ +# $OpenBSD: Makefile,v 1.244 2011/07/12 07:35:54 ajacoutot Exp $ # $FreeBSD: Makefile,v 1.26 1997/11/20 08:58:51 tg Exp $ SUBDIR = @@ -172,7 +172,6 @@ SUBDIR += symon SUBDIR += sysgen SUBDIR += syslog-ng - SUBDIR += system-tools-backends SUBDIR += tabled SUBDIR += tarsnap SUBDIR += tcplist diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile deleted file mode 100644 index 306b851cfef..00000000000 --- a/sysutils/system-tools-backends/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# $OpenBSD: Makefile,v 1.17 2011/07/08 02:14:59 ajacoutot Exp $ - -COMMENT= cross-platform configuration modules - -GNOME_VERSION= 2.10.2 -GNOME_PROJECT= system-tools-backends - -REVISION= 2 - -CATEGORIES= sysutils - -HOMEPAGE= http://system-tools-backends.freedesktop.org/ - -MAINTAINER= Antoine Jacoutot - -# GPLv2 -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB += c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gthread-2.0 pcre polkit-gobject-1 pthread z - -LIB_DEPENDS= sysutils/polkit \ - x11/dbus-glib -RUN_DEPENDS= net/p5-Net-DBus -BUILD_DEPENDS= ${RUN_DEPENDS} - -MODULES= devel/gettext \ - x11/gnome - -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --localstatedir=/var \ - --with-stb-group=wheel - -FAKE_FLAGS= systemddir=${PREFIX}/share/examples/system-tools-backends/dbus-1/system.d - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/Shares/SMB.pm - -.include diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo deleted file mode 100644 index 0827411f069..00000000000 --- a/sysutils/system-tools-backends/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (system-tools-backends-2.10.2.tar.bz2) = 7a4UizE0KuyuA1BRrccMdA== -RMD160 (system-tools-backends-2.10.2.tar.bz2) = zhO3WP3dAK2ynixX+Mm4uYTTju0= -SHA1 (system-tools-backends-2.10.2.tar.bz2) = UJuWRMENfCaLeTUodhLEYwq5tC0= -SHA256 (system-tools-backends-2.10.2.tar.bz2) = Hb5Rd99GqcclBzXgXncSn+fsBIQHcazPqHaQERyixnA= -SIZE (system-tools-backends-2.10.2.tar.bz2) = 448939 diff --git a/sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm b/sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm deleted file mode 100644 index b9eb1196dec..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Init_ServicesList_pm +++ /dev/null @@ -1,70 +0,0 @@ -$OpenBSD: patch-Init_ServicesList_pm,v 1.3 2011/04/03 17:25:33 ajacoutot Exp $ ---- Init/ServicesList.pm.orig Mon Dec 6 13:27:38 2010 -+++ Init/ServicesList.pm Sun Apr 3 19:23:22 2011 -@@ -177,6 +177,18 @@ sub is_forbidden - "ureadahead", - "wpa-ifupdown", - "x11-common", -+ # This was found in OpenBSD. Some scripts are blacklisted because -+ # they're supposed to be started by a master script, -+ # e.g. samba -> smbd+nmbd. -+ "rc.subr", -+ "nmbd", -+ "smbd", -+ "zarafa_gateway", -+ "zarafa_ical", -+ "zarafa_indexer", -+ "zarafa_monitor", -+ "zarafa_server", -+ "zarafa_spooler", - ]; - - foreach $i (@$service_forbidden_list) -@@ -225,6 +237,7 @@ sub get_role - "am-utils" => "AUTOMOUNTER", - "amavis" => "ANTIVIRUS", - "amavis-ng" => "ANTIVIRUS", -+ "amavisd" => "ANTIVIRUS", - "apache" => "WEB_SERVER", - "apache-perl" => "WEB_SERVER", - "apache-ssl" => "WEB_SERVER", -@@ -242,6 +255,7 @@ sub get_role - "chargen-udp" => "NETWORK", - "cherokee" => "WEB_SERVER", - "clamav-daemon" => "ANTIVIRUS", -+ "clamd" => "ANTIVIRUS", - "courier" => "MTA", - "courier-mta" => "MTA", - "cpufreqd" => "SYSTEM", -@@ -252,6 +266,7 @@ sub get_role - "daytime" => "NETWORK", - "daytime-udp" => "NETWORK", - "dbus-1" => "SYSTEM", -+ "dbus_daemon" => "SYSTEM", - "ddclient" => "DYNAMIC_DNS", - "dhis-client" => "DYNAMIC_DNS", - "dictd" => "DICT", -@@ -293,6 +308,7 @@ sub get_role - "modules" => "SYSTEM", - "module-init-tools" => "SYSTEM", - "mysql" => "DATABASE_SERVER", -+ "mysqld" => "DATABASE_SERVER", - "muddleftpd" => "FTP_SERVER", - "named" => "NETWORK", - "netfs" => "SYSTEM", -@@ -335,6 +351,7 @@ sub get_role - "services" => "NETWORK", - "setserial" => "SYSTEM", - "sgi_fam" => "SYSTEM", -+ "smartd" => "SYSTEM", - "smartmontools" => "SYSTEM", - "spamassassin" => "SYSTEM", - "snmpd" => "NETWORK", -@@ -352,6 +369,7 @@ sub get_role - "wdm" => "DISPLAY_MANAGER", - "webmin" => "SYSTEM", # FIXME as well - "winbind" => "NETWORK", -+ "winbindd" => "NETWORK", - "wine" => "SYSTEM", # FIXME like vmware - "wu-ftpd" => "FTP_SERVER", - "wzdftpd" => "FTP_SERVER", diff --git a/sysutils/system-tools-backends/patches/patch-Init_Services_pm b/sysutils/system-tools-backends/patches/patch-Init_Services_pm deleted file mode 100644 index d57979a9e86..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Init_Services_pm +++ /dev/null @@ -1,95 +0,0 @@ -$OpenBSD: patch-Init_Services_pm,v 1.5 2011/07/08 02:14:59 ajacoutot Exp $ ---- Init/Services.pm.orig Sat Mar 13 10:37:16 2010 -+++ Init/Services.pm Tue Jan 18 00:05:10 2011 -@@ -54,6 +54,7 @@ sub get_runlevels - "gentoo" => "gentoo", - "archlinux" => "freebsd-5", - "freebsd-5" => "freebsd-5", -+ "openbsd-4" => "openbsd-4", - "solaris-2.11" => "freebsd-5", - ); - -@@ -62,6 +63,7 @@ sub get_runlevels - "redhat-6.2" => [ "0", "1", "2", "3", "4", "5", "6" ], - "gentoo" => &get_gentoo_runlevels (), - "freebsd-5" => [ "default" ], -+ "openbsd-4" => [ "default" ], - ); - - $distro = $dist_map{$Utils::Backend::tool{"platform"}}; -@@ -1086,6 +1088,14 @@ sub get_rcng_status_by_service - { - return &Utils::File::exists ("/var/run/daemons/$service"); - } -+ elsif ($Utils::Backend::tool{"platform"} eq "openbsd-4") -+ { -+ if (!&Utils::File::run ("/etc/rc.d/$service", "check")) -+ { -+ $active = 1; -+ } -+ return $active; -+ } - else - { - $fd = &Utils::File::run_pipe_read ("/etc/rc.d/$service rcvar"); -@@ -1210,6 +1220,40 @@ sub set_rcng_service_status - } - } - -+sub set_openbsd_service_status -+{ -+ my ($script, $active) = @_; -+ my $rcconf = '/etc/rc.conf.local'; -+ my ($daemons); -+ -+ $daemons = &Utils::Parse::get_sh ($rcconf, "pkg_scripts"); -+ $daemons =~ s/[\"\"]//g; -+ -+ # escape these chars -+ $script =~ s/([\\\.\^\$\*\+\?\{\}\[\]\(\)\|])/\\\1/g; -+ $notscript = "-" . $script; -+ -+ if (($daemons =~ m/$notscript/) && $active) -+ { -+ # It was disabled, enable it -+ $daemons =~ s/$notscript/$script/g; -+ } -+ elsif (($daemons =~ m/$script/) && !$active) -+ { -+ # It was enabled, disable it -+ $daemons =~ s/$script/$notscript/g; -+ } -+ elsif (($daemons !~ m/$script/) && $active) -+ { -+ $daemons .= " ".$script; -+ } -+ -+ $daemons = "\"" . $daemons . "\""; -+ &Utils::Replace::set_sh ($rcconf, "pkg_scripts", $daemons, 1); -+ # XXX $script should be $service -+ &run_rcng_script ($script, ($active) ? "start" : "stop"); -+} -+ - sub set_archlinux_service_status - { - my ($script, $active) = @_; -@@ -1253,6 +1297,10 @@ sub set_rcng_service - { - $func = \&set_archlinux_service_status; - } -+ elsif ($Utils::Backend::tool{"platform"} eq "openbsd-4") -+ { -+ $func = \&set_openbsd_service_status; -+ } - else - { - $func = \&set_rcng_service_status; -@@ -1543,7 +1591,7 @@ sub get_init_type - { - return "bsd"; - } -- elsif (($gst_dist =~ /freebsd/) || ($gst_dist =~ /archlinux/)) -+ elsif (($gst_dist =~ /freebsd/) || ($gst_dist =~ /archlinux/) || ($gst_dist =~ /openbsd/)) - { - return "rcng"; - } diff --git a/sysutils/system-tools-backends/patches/patch-Network_Hosts_pm b/sysutils/system-tools-backends/patches/patch-Network_Hosts_pm deleted file mode 100644 index 7b4c05c466c..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Network_Hosts_pm +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-Network_Hosts_pm,v 1.1.1.1 2010/09/10 13:49:59 ajacoutot Exp $ ---- Network/Hosts.pm.orig Wed Sep 8 18:28:51 2010 -+++ Network/Hosts.pm Wed Sep 8 18:29:59 2010 -@@ -52,6 +52,7 @@ sub get_fqdn_dist - "slackware-9.1.0" => "suse-9.0", - "gentoo" => "gentoo", - "freebsd-5" => "freebsd-5", -+ "openbsd-4" => "freebsd-5", - "solaris-2.11" => "solaris-2.11", - ); - diff --git a/sysutils/system-tools-backends/patches/patch-Network_Ifaces_pm b/sysutils/system-tools-backends/patches/patch-Network_Ifaces_pm deleted file mode 100644 index 0179073053f..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Network_Ifaces_pm +++ /dev/null @@ -1,46 +0,0 @@ -$OpenBSD: patch-Network_Ifaces_pm,v 1.1.1.1 2010/09/10 13:49:59 ajacoutot Exp $ ---- Network/Ifaces.pm.orig Wed Sep 8 18:19:10 2010 -+++ Network/Ifaces.pm Wed Sep 8 18:26:31 2010 -@@ -171,6 +171,34 @@ sub get_freebsd_wireless_ifaces - return \@ifaces; - } - -+sub get_openbsd_wireless_ifaces -+{ -+ my ($fd, $line, $iface); -+ my (@ifaces, $command); -+ -+ $command = &Utils::File::get_cmd_path ("ifconfig"); -+ open $fd, "$command |"; -+ return @ifaces if $fd eq undef; -+ -+ while (<$fd>) -+ { -+ if (/^([a-zA-Z]+[0-9]+):/) -+ { -+ $iface = $1; -+ } -+ -+ if (/group:.*wlan.*/i) -+ { -+ push @ifaces, $iface; -+ } -+ } -+ -+ &Utils::File::close_file ($fd); -+ &Utils::Report::leave (); -+ -+ return \@ifaces; -+} -+ - # Returns an array with the wireless devices found - sub get_wireless_ifaces - { -@@ -178,6 +206,7 @@ sub get_wireless_ifaces - - return &get_linux_wireless_ifaces if ($plat eq "Linux"); - return &get_freebsd_wireless_ifaces if ($plat eq "FreeBSD"); -+ return &get_openbsd_wireless_ifaces if ($plat eq "OpenBSD"); - } - - # returns interface type depending on it's interface name diff --git a/sysutils/system-tools-backends/patches/patch-Shares_SMB_pm b/sysutils/system-tools-backends/patches/patch-Shares_SMB_pm deleted file mode 100644 index 43765a54db1..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Shares_SMB_pm +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-Shares_SMB_pm,v 1.1.1.1 2010/09/10 13:49:59 ajacoutot Exp $ ---- Shares/SMB.pm.orig Wed Sep 8 18:30:46 2010 -+++ Shares/SMB.pm Wed Sep 8 18:31:34 2010 -@@ -144,6 +144,7 @@ sub get_distro_smb_file - "pld-1.0" => "pld-1.0", - "vine-3.0" => "debian", - "freebsd-5" => "freebsd-5", -+ "openbsd-4" => "openbsd-4", - ); - - my %dist_tables = -@@ -152,6 +153,7 @@ sub get_distro_smb_file - "debian" => "/etc/samba/smb.conf", - "pld-1.0" => "/etc/smb/smb.conf", - "freebsd-5" => "/usr/local/etc/smb.conf", -+ "openbsd-4" => "${SYSCONFDIR}/samba/smb.conf", - ); - - my $dist = $dist_map {$Utils::Backend::tool{"platform"}}; diff --git a/sysutils/system-tools-backends/patches/patch-Time_NTP_pm b/sysutils/system-tools-backends/patches/patch-Time_NTP_pm deleted file mode 100644 index 26f2621b760..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Time_NTP_pm +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-Time_NTP_pm,v 1.1.1.1 2010/09/10 13:49:59 ajacoutot Exp $ ---- Time/NTP.pm.orig Tue Mar 9 19:02:45 2010 -+++ Time/NTP.pm Wed Sep 8 19:15:55 2010 -@@ -41,6 +41,7 @@ sub get_config_file () - "pld-1.0" => "pld-1.0", - "vine-3.0" => "redhat-6.2", - "freebsd-5" => "redhat-6.2", -+ "openbsd-4" => "openbsd-4", - "archlinux" => "redhat-6.2", - "solaris-2.11" => "solaris-2.11", - ); -@@ -50,6 +51,7 @@ sub get_config_file () - "redhat-6.2" => "/etc/ntp.conf", - "pld-1.0" => "/etc/ntp/ntp.conf", - "solaris-2.11" => "/etc/inet/ntp.conf", -+ "openbsd-4" => "/etc/ntpd.conf", - ); - - my $dist = $dist_map{$Utils::Backend::tool{"platform"}}; diff --git a/sysutils/system-tools-backends/patches/patch-Time_TimeDate_pm b/sysutils/system-tools-backends/patches/patch-Time_TimeDate_pm deleted file mode 100644 index be20fe319cd..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Time_TimeDate_pm +++ /dev/null @@ -1,58 +0,0 @@ -$OpenBSD: patch-Time_TimeDate_pm,v 1.1.1.1 2010/09/10 13:49:59 ajacoutot Exp $ ---- Time/TimeDate.pm.orig Tue Mar 9 19:02:45 2010 -+++ Time/TimeDate.pm Thu Sep 9 10:45:57 2010 -@@ -48,13 +48,24 @@ sub change_timedate - my $system_table = { - "Linux" => "date -u %02d%02d%02d%02d%04d.%02d", - "FreeBSD" => "date -u -f %%m%%d%%H%%M%%Y.%%S %02d%02d%02d%02d%04d.%02d", -+ "OpenBSD" => "date -u %04d%02d%02d%02d%02d.%02d", - "SunOS" => "date -u %02d%02d%02d%02d%04d.%02d", - }; - -- @command = split (/ /, sprintf ($$system_table {$Utils::Backend::tool{"system"}}, -- $$time{"month"} + 1, $$time{"monthday"}, -- $$time{"hour"}, $$time{"minute"}, -- $$time{"year"}, $$time{"second"})); -+ if ($Utils::Backend::tool{"system"} eq "OpenBSD") -+ { -+ @command = split (/ /, sprintf ($$system_table {$Utils::Backend::tool{"system"}}, -+ $$time{"year"}, $$time{"month"} + 1, -+ $$time{"monthday"}, $$time{"hour"}, -+ $$time{"minute"}, $$time{"second"})); -+ } -+ else -+ { -+ @command = split (/ /, sprintf ($$system_table {$Utils::Backend::tool{"system"}}, -+ $$time{"month"} + 1, $$time{"monthday"}, -+ $$time{"hour"}, $$time{"minute"}, -+ $$time{"year"}, $$time{"second"})); -+ } - - &Utils::Report::do_report ("time_localtime_set", @command); - return &Utils::File::run (@command); -@@ -144,7 +155,16 @@ sub set_timezone - unlink $localtime; # Important, since it might be a symlink. - - &Utils::Report::enter (); -- $res = copy ($tz, $localtime); -+ -+ if ($Utils::Backend::tool{"system"} eq "OpenBSD") -+ { -+ $res = symlink ("$tz","$localtime"); -+ } -+ else -+ { -+ $res = copy ($tz, $localtime); -+ } -+ - &Utils::Report::leave (); - return -1 unless $res; - return 0; -@@ -173,6 +193,7 @@ sub get_dist - "pld-1.0" => "redhat-6.2", - "vine-3.0" => "redhat-6.2", - "freebsd-5" => "redhat-6.2", -+ "openbsd-4" => "redhat-6.2", - "solaris-2.11" => "solaris-2.11", - ); - diff --git a/sysutils/system-tools-backends/patches/patch-Users_Users_pm b/sysutils/system-tools-backends/patches/patch-Users_Users_pm deleted file mode 100644 index 861adf8ce28..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Users_Users_pm +++ /dev/null @@ -1,180 +0,0 @@ -$OpenBSD: patch-Users_Users_pm,v 1.4 2011/01/18 13:07:21 ajacoutot Exp $ ---- Users/Users.pm.orig Sat Aug 21 15:18:12 2010 -+++ Users/Users.pm Tue Jan 18 13:48:11 2011 -@@ -58,7 +58,7 @@ use Utils::Replace; - # They are tried in array order. First found = used. - @passwd_names = ( "/etc/passwd" ); - @shadow_names = ( "/etc/shadow", "/etc/master.passwd" ); --@login_defs_names = ( "/etc/login.defs", "/etc/adduser.conf" ); -+@login_defs_names = ( "/etc/login.defs", ,"/etc/usermgmt.conf", "/etc/adduser.conf" ); - @shell_names = ( "/etc/shells" ); - @skel_dir = ( "/usr/share/skel", "/etc/skel" ); - -@@ -72,6 +72,7 @@ $cmd_deluser = &Utils::File::locate_tool ("deluser"); - - $cmd_chfn = &Utils::File::locate_tool ("chfn"); - $cmd_pw = &Utils::File::locate_tool ("pw"); -+$cmd_user = &Utils::File::locate_tool ("user"); - - $cmd_passwd = &Utils::File::locate_tool ("passwd"); - $cmd_chpasswd = &Utils::File::locate_tool ("chpasswd"); -@@ -236,6 +237,12 @@ my $freebsd_logindefs_defaults = { - 'skel_dir' => '/etc/skel/', - }; - -+my $openbsd_logindefs_defaults = { -+ 'shell' => '/bin/ksh', -+ 'group' => -1, -+ 'skel_dir' => '/etc/skel/', -+}; -+ - my $logindefs_dist_map = { - 'redhat-6.2' => $rh_logindefs_defaults, - 'redhat-7.0' => $rh_logindefs_defaults, -@@ -252,6 +259,7 @@ my $logindefs_dist_map = { - 'archlinux' => $gentoo_logindefs_defaults, - 'slackware-9.1.0' => $gentoo_logindefs_defaults, - 'freebsd-5' => $freebsd_logindefs_defaults, -+ 'openbsd-4' => $openbsd_logindefs_defaults, - 'suse-9.0' => $gentoo_logindefs_defaults, - 'solaris-2.11' => $gentoo_logindefs_defaults, - }; -@@ -384,9 +392,17 @@ sub get - # Detect lock status of password - # We run 'passwd' instead of reading /etc/shadow directly - # to avoid leaving sensitive data in memory (hard to clear in perl) -- $fd = &Utils::File::run_pipe_read ("passwd -S $login"); -- @passwd_status = split ' ', <$fd>; -- &Utils::File::close_file ($fd); -+ # On OpenBSD, the '-S' switch for passwd(1) does not exist -+ if ($Utils::Backend::tool{"system"} eq "OpenBSD") -+ { -+ @passwd_status = "P"; -+ } -+ else -+ { -+ $fd = &Utils::File::run_pipe_read ("passwd -S $login"); -+ @passwd_status = split ' ', <$fd>; -+ &Utils::File::close_file ($fd); -+ } - - if ($passwd_status[1] eq "P") - { -@@ -441,6 +457,17 @@ sub del_user - @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]); - } - } -+ elsif ($Utils::Backend::tool{"system"} eq "OpenBSD") -+ { -+ if ($remove_home) -+ { -+ @command = ($cmd_userdel, "-r", $$user[$LOGIN]); -+ } -+ else -+ { -+ @command = ($cmd_userdel, $$user[$LOGIN]); -+ } -+ } - elsif ($cmd_deluser) # use deluser (preferred method) - { - if ($remove_home) -@@ -497,11 +524,15 @@ sub set_passwd - my ($login, $password, $passwd_status) = @_; - my ($pwdpipe); - -- # handle empty password via passwd, as all tools don't support it -- if ($passwd_status & 1) -+ # OpenBSD passwd(1) has no '-d' switch -+ if ($Utils::Backend::tool{"system"} ne "OpenBSD") - { -- &Utils::File::run ("passwd", "-d", $login); -- return; -+ # handle empty password via passwd, as all tools don't support it -+ if ($passwd_status & 1) -+ { -+ &Utils::File::run ("passwd", "-d", $login); -+ return; -+ } - } - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") -@@ -520,7 +551,7 @@ sub set_passwd - print $pwdpipe $password; - &Utils::File::close_file ($pwdpipe); - } -- else -+ elsif ($Utils::Backend::tool{"system"} ne "OpenBSD") - { - $pwdpipe = &Utils::File::run_pipe_write ($cmd_chpasswd); - print $pwdpipe "$login:$password"; -@@ -534,14 +565,17 @@ sub set_lock - my ($login, $passwd_status) = @_; - my ($pwdpipe); - -- if ($passwd_status & (1 << 1)) -+ if ($Utils::Backend::tool{"system"} ne "OpenBSD") - { -- &Utils::File::run ("passwd", "-l", $login); -+ if ($passwd_status & (1 << 1)) -+ { -+ &Utils::File::run ("passwd", "-l", $login); -+ } -+ else -+ { -+ &Utils::File::run ("passwd", "-u", $login); -+ } - } -- else -- { -- &Utils::File::run ("passwd", "-u", $login); -- } - } - - # This function allows empty values to be passed, in which cas -@@ -620,7 +654,8 @@ sub add_user - $Utils::Backend::tool{"platform"} !~ /^slackware/ && - $Utils::Backend::tool{"platform"} !~ /^archlinux/ && - $Utils::Backend::tool{"platform"} !~ /^redhat/ && -- $Utils::Backend::tool{"platform"} !~ /^gentoo/) -+ $Utils::Backend::tool{"platform"} !~ /^gentoo/ && -+ $Utils::Backend::tool{"platform"} !~ /^openbsd/) - { - # use adduser if available and valid (slackware one is b0rk) - # set empty gecos fields and password, they will be filled out later -@@ -650,7 +685,16 @@ sub add_user - push (@command, ("-d", $$user[$HOME])) if ($$user[$HOME]); - push (@command, ("-s", $$user[$SHELL])) if ($$user[$SHELL]); - push (@command, ("-u", $$user[$UID])) if ($real_uid); -- push (@command, ("-g", $$user[$GID])) if ($real_gid); -+ -+ if ($Utils::Backend::tool{"platform"} =~ /^openbsd/) -+ { -+ push (@command, "-g", "=uid"); -+ } -+ else -+ { -+ push (@command, ("-g", $$user[$GID])) if ($real_gid); -+ } -+ - push (@command, $$user[$LOGIN]); - - &Utils::File::run (@command); -@@ -691,6 +735,18 @@ sub change_user - "-d", $$new_user[$HOME], - "-g", $$new_user[$GID], - "-s", $$new_user[$SHELL]); -+ -+ &Utils::File::run (@command); -+ } -+ elsif ($Utils::Backend::tool{"system"} eq "OpenBSD") -+ { -+ @command = ($cmd_usermod, "-o", -+ "-d", $$new_user[$HOME], -+ "-g", $$new_user[$GID], -+ "-l", $$new_user[$LOGIN], -+ "-s", $$new_user[$SHELL], -+ "-u", $$new_user[$UID], -+ $$old_user[$LOGIN]); - - &Utils::File::run (@command); - } diff --git a/sysutils/system-tools-backends/patches/patch-Utils_Platform_pm b/sysutils/system-tools-backends/patches/patch-Utils_Platform_pm deleted file mode 100644 index 7c65d04662e..00000000000 --- a/sysutils/system-tools-backends/patches/patch-Utils_Platform_pm +++ /dev/null @@ -1,52 +0,0 @@ -$OpenBSD: patch-Utils_Platform_pm,v 1.1.1.1 2010/09/10 13:49:59 ajacoutot Exp $ ---- Utils/Platform.pm.orig Wed Sep 8 17:56:15 2010 -+++ Utils/Platform.pm Wed Sep 8 18:09:26 2010 -@@ -73,6 +73,8 @@ my $PLATFORM_INFO = { - "freebsd-6" => [ "FreeBSD", "6", "" ], - "freebsd-7" => [ "FreeBSD", "7", "" ], - "freebsd-8" => [ "FreeBSD", "8", "" ], -+ "openbsd-4" => [ "OpenBSD", "4", "" ], -+ "openbsd-5" => [ "OpenBSD", "5", "" ], - "gentoo" => [ "Gentoo Linux", "", "" ], - "vlos-1.2" => [ "Vida Linux OS", "1.2" ], - "archlinux" => [ "Arch Linux", "", "" ], -@@ -126,6 +128,7 @@ sub ensure_distro_map - "freebsd-6" => "freebsd-5", - "freebsd-7" => "freebsd-5", - "freebsd-8" => "freebsd-5", -+ "openbsd-5" => "openbsd-4", - "openna-1.0" => "redhat-6.2", - "pld-1.1" => "pld-1.0", - "pld-1.99" => "pld-1.0", -@@ -254,6 +257,23 @@ sub check_freebsd - return -1; - } - -+sub check_openbsd -+{ -+ my ($sysctl_cmd, @output); -+ -+ $sysctl_cmd = &Utils::File::locate_tool ("sysctl"); -+ @output = (readpipe("$sysctl_cmd -n kern.version")); -+ foreach (@output) -+ { -+ chomp; -+ if (/^OpenBSD\s([0-9]+)\.\S+.*/) -+ { -+ return "openbsd-$1"; -+ } -+ } -+ return -1; -+} -+ - sub check_solaris - { - my ($fd, $dist); -@@ -377,6 +397,7 @@ sub guess - [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], - ], - "FreeBSD" => [[ \&check_freebsd ]], -+ "OpenBSD" => [[ \&check_openbsd ]], - "SunOS" => [[ \&check_solaris ]] - ); - diff --git a/sysutils/system-tools-backends/pkg/DESCR b/sysutils/system-tools-backends/pkg/DESCR deleted file mode 100644 index 5536c2a0db5..00000000000 --- a/sysutils/system-tools-backends/pkg/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -The System Tools Backends (s-t-b for short) are a set of cross-platform -modules for Unix systems. The backends provide a common DBus interface -to all platforms to modify or read the system configuration in a system -independent fashion. Historically, access to system configuration has -varied deeply across Unix flavours, and concreting a bit more, across -Unix systems, making it near impossible to write desktop tools that -could work flawlessly in a cross-platform way. System Tools Backends try -to fill this gap, offering a generic and easy way for desktop -applications to read and modify configuration details. diff --git a/sysutils/system-tools-backends/pkg/PLIST b/sysutils/system-tools-backends/pkg/PLIST deleted file mode 100644 index be202a3d73d..00000000000 --- a/sysutils/system-tools-backends/pkg/PLIST +++ /dev/null @@ -1,146 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/09/10 13:49:59 ajacoutot Exp $ -lib/pkgconfig/ -lib/pkgconfig/system-tools-backends-2.0.pc -@bin sbin/system-tools-backends -share/dbus-1/ -share/dbus-1/system-services/ -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupConfig2.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig2.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NFSConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NTPConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.Platform.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.SMBConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.SelfConfig2.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServiceConfig2.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServicesConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig2.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig2.service -share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service -share/examples/system-tools-backends/ -share/examples/system-tools-backends/dbus-1/ -share/examples/system-tools-backends/dbus-1/system.d/ -share/examples/system-tools-backends/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf -@sample ${SYSCONFDIR}/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf -share/locale/ar/ -share/locale/ar/LC_MESSAGES/ -share/locale/ar/LC_MESSAGES/system-tools-backends.mo -share/locale/bg/LC_MESSAGES/system-tools-backends.mo -share/locale/bn_IN/ -share/locale/bn_IN/LC_MESSAGES/ -share/locale/bn_IN/LC_MESSAGES/system-tools-backends.mo -share/locale/ca/LC_MESSAGES/system-tools-backends.mo -share/locale/cs/LC_MESSAGES/system-tools-backends.mo -share/locale/da/LC_MESSAGES/system-tools-backends.mo -share/locale/de/LC_MESSAGES/system-tools-backends.mo -share/locale/el/LC_MESSAGES/system-tools-backends.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ -share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo -share/locale/es/LC_MESSAGES/system-tools-backends.mo -share/locale/et/LC_MESSAGES/system-tools-backends.mo -share/locale/eu/LC_MESSAGES/system-tools-backends.mo -share/locale/fi/LC_MESSAGES/system-tools-backends.mo -share/locale/fr/LC_MESSAGES/system-tools-backends.mo -share/locale/gl/LC_MESSAGES/system-tools-backends.mo -share/locale/gu/ -share/locale/gu/LC_MESSAGES/ -share/locale/gu/LC_MESSAGES/system-tools-backends.mo -share/locale/he/LC_MESSAGES/system-tools-backends.mo -share/locale/hi/ -share/locale/hi/LC_MESSAGES/ -share/locale/hi/LC_MESSAGES/system-tools-backends.mo -share/locale/hu/LC_MESSAGES/system-tools-backends.mo -share/locale/it/LC_MESSAGES/system-tools-backends.mo -share/locale/ja/LC_MESSAGES/system-tools-backends.mo -share/locale/kn/ -share/locale/kn/LC_MESSAGES/ -share/locale/kn/LC_MESSAGES/system-tools-backends.mo -share/locale/nb/LC_MESSAGES/system-tools-backends.mo -share/locale/nds/ -share/locale/nds/LC_MESSAGES/ -share/locale/nds/LC_MESSAGES/system-tools-backends.mo -share/locale/or/ -share/locale/or/LC_MESSAGES/ -share/locale/or/LC_MESSAGES/system-tools-backends.mo -share/locale/pa/ -share/locale/pa/LC_MESSAGES/ -share/locale/pa/LC_MESSAGES/system-tools-backends.mo -share/locale/pl/LC_MESSAGES/system-tools-backends.mo -share/locale/pt/LC_MESSAGES/system-tools-backends.mo -share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo -share/locale/ro/LC_MESSAGES/system-tools-backends.mo -share/locale/sl/LC_MESSAGES/system-tools-backends.mo -share/locale/sr/LC_MESSAGES/system-tools-backends.mo -share/locale/sr@latin/ -share/locale/sr@latin/LC_MESSAGES/ -share/locale/sr@latin/LC_MESSAGES/system-tools-backends.mo -share/locale/sv/LC_MESSAGES/system-tools-backends.mo -share/locale/ta/ -share/locale/ta/LC_MESSAGES/ -share/locale/ta/LC_MESSAGES/system-tools-backends.mo -share/locale/te/ -share/locale/te/LC_MESSAGES/ -share/locale/te/LC_MESSAGES/system-tools-backends.mo -share/locale/th/ -share/locale/th/LC_MESSAGES/ -share/locale/th/LC_MESSAGES/system-tools-backends.mo -share/locale/tr/LC_MESSAGES/system-tools-backends.mo -share/locale/uk/LC_MESSAGES/system-tools-backends.mo -share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo -share/locale/zh_HK/LC_MESSAGES/system-tools-backends.mo -share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo -share/polkit-1/ -share/polkit-1/actions/ -share/polkit-1/actions/org.freedesktop.SystemToolsBackends.policy -share/system-tools-backends-2.0/ -share/system-tools-backends-2.0/files/ -share/system-tools-backends-2.0/files/general_gprs_chatscript -share/system-tools-backends-2.0/files/general_isdn_ppp_options -share/system-tools-backends-2.0/files/general_pppoe_ppp_options -share/system-tools-backends-2.0/scripts/ -share/system-tools-backends-2.0/scripts/GroupConfig.pm -share/system-tools-backends-2.0/scripts/GroupsConfig.pm -share/system-tools-backends-2.0/scripts/HostsConfig.pm -share/system-tools-backends-2.0/scripts/IfacesConfig.pm -share/system-tools-backends-2.0/scripts/Init/ -share/system-tools-backends-2.0/scripts/Init/Services.pm -share/system-tools-backends-2.0/scripts/Init/ServicesList.pm -share/system-tools-backends-2.0/scripts/NFSConfig.pm -share/system-tools-backends-2.0/scripts/NTPConfig.pm -share/system-tools-backends-2.0/scripts/Network/ -share/system-tools-backends-2.0/scripts/Network/Hosts.pm -share/system-tools-backends-2.0/scripts/Network/Ifaces.pm -share/system-tools-backends-2.0/scripts/Platform.pm -share/system-tools-backends-2.0/scripts/SMBConfig.pm -share/system-tools-backends-2.0/scripts/SelfConfig.pm -share/system-tools-backends-2.0/scripts/ServiceConfig.pm -share/system-tools-backends-2.0/scripts/ServicesConfig.pm -share/system-tools-backends-2.0/scripts/Shares/ -share/system-tools-backends-2.0/scripts/Shares/NFS.pm -share/system-tools-backends-2.0/scripts/Shares/SMB.pm -share/system-tools-backends-2.0/scripts/StbObject.pm -share/system-tools-backends-2.0/scripts/SystemToolsBackends.pl -share/system-tools-backends-2.0/scripts/Time/ -share/system-tools-backends-2.0/scripts/Time/NTP.pm -share/system-tools-backends-2.0/scripts/Time/TimeDate.pm -share/system-tools-backends-2.0/scripts/TimeConfig.pm -share/system-tools-backends-2.0/scripts/UserConfig.pm -share/system-tools-backends-2.0/scripts/Users/ -share/system-tools-backends-2.0/scripts/Users/Groups.pm -share/system-tools-backends-2.0/scripts/Users/Shells.pm -share/system-tools-backends-2.0/scripts/Users/Users.pm -share/system-tools-backends-2.0/scripts/UsersConfig.pm -share/system-tools-backends-2.0/scripts/Utils/ -share/system-tools-backends-2.0/scripts/Utils/Backend.pm -share/system-tools-backends-2.0/scripts/Utils/DBus.pm -share/system-tools-backends-2.0/scripts/Utils/File.pm -share/system-tools-backends-2.0/scripts/Utils/Monitor.pm -share/system-tools-backends-2.0/scripts/Utils/Parse.pm -share/system-tools-backends-2.0/scripts/Utils/Platform.pm -share/system-tools-backends-2.0/scripts/Utils/Replace.pm -share/system-tools-backends-2.0/scripts/Utils/Report.pm -share/system-tools-backends-2.0/scripts/Utils/Util.pm -share/system-tools-backends-2.0/scripts/Utils/XML.pm diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile index 49dc9de69ed..7dbdef63f6d 100644 --- a/x11/gnome/Makefile +++ b/x11/gnome/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.147 2011/07/04 10:01:10 jasper Exp $ +# $OpenBSD: Makefile,v 1.148 2011/07/12 07:35:54 ajacoutot Exp $ SUBDIR = SUBDIR += alacarte @@ -104,7 +104,6 @@ SUBDIR += speech SUBDIR += ssh-askpass SUBDIR += system-monitor - SUBDIR += system-tools SUBDIR += terminal SUBDIR += themes SUBDIR += themes-extras diff --git a/x11/gnome/system-tools/Makefile b/x11/gnome/system-tools/Makefile deleted file mode 100644 index b3737cdba31..00000000000 --- a/x11/gnome/system-tools/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# $OpenBSD: Makefile,v 1.18 2011/06/02 17:09:32 kili Exp $ - -SHARED_ONLY= Yes - -COMMENT= sytem configuration GUI for desktops - -GNOME_PROJECT= gnome-system-tools -GNOME_VERSION= 2.32.0 - -REVISION= 10 - -CATEGORIES= sysutils - -HOMEPAGE= http://projects.gnome.org/gst/ - -# GPLv2 -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo -WANTLIB += crypto dbus-1 dbus-glib-1 drm expat fontconfig freetype -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 -WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 m nautilus-extension -WANTLIB += oobs-1 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png polkit-gobject-1 polkit-gtk-1 pthread pthread-stubs -WANTLIB += xcb xcb-render xcb-shm z - -MODULES= devel/gettext \ - x11/gnome \ - devel/dconf - -LIB_DEPENDS= devel/liboobs \ - x11/polkit-gnome,gtk2 \ - x11/gnome/nautilus - -DESKTOP_FILES= Yes - -MODGNOME_HELP_FILES= Yes -MODGCONF2_SCHEMAS_DIR= gnome-system-tools - -CONFIGURE_ARGS= ${CONFIGURE_SHARED} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gnome-system-tools - -.include diff --git a/x11/gnome/system-tools/distinfo b/x11/gnome/system-tools/distinfo deleted file mode 100644 index a7c40cb0a24..00000000000 --- a/x11/gnome/system-tools/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -MD5 (gnome/gnome-system-tools-2.32.0.tar.bz2) = k+PSGwQcdx1KwSMH5O8zkg== -RMD160 (gnome/gnome-system-tools-2.32.0.tar.bz2) = nRclCgvAWfXLMZMBmRouqaFVGtk= -SHA1 (gnome/gnome-system-tools-2.32.0.tar.bz2) = t8r3KJk2pfoy8CcXTTm7OZp1i94= -SHA256 (gnome/gnome-system-tools-2.32.0.tar.bz2) = cdUmmMy2C8B9bk5EK3yxeOvxFSOWN5UA317GLaTE0Uo= -SIZE (gnome/gnome-system-tools-2.32.0.tar.bz2) = 5433090 diff --git a/x11/gnome/system-tools/patches/patch-configure b/x11/gnome/system-tools/patches/patch-configure deleted file mode 100644 index d5cfd418247..00000000000 --- a/x11/gnome/system-tools/patches/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2010/10/04 06:49:34 ajacoutot Exp $ - -Bug 627126 - gsettings schema files don't get installed on FreeBSD -glib commit 136e705e8383ff8848e425ac01278102d7badc52 - ---- configure.orig Mon Oct 4 08:42:05 2010 -+++ configure Mon Oct 4 08:42:58 2010 -@@ -13172,22 +13172,10 @@ install-data-am: install-gsettings-schemas - - .SECONDARY: $(gsettings_SCHEMAS) - --gsettings__base_list = \ -- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ -- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" -- --install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" -- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(gsettings__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \ -- done -+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)" - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - - uninstall-gsettings-schemas: diff --git a/x11/gnome/system-tools/patches/patch-interfaces_time_ui b/x11/gnome/system-tools/patches/patch-interfaces_time_ui deleted file mode 100644 index 1f5b4906ce1..00000000000 --- a/x11/gnome/system-tools/patches/patch-interfaces_time_ui +++ /dev/null @@ -1,70 +0,0 @@ -$OpenBSD: patch-interfaces_time_ui,v 1.3 2010/09/30 07:38:53 ajacoutot Exp $ - -XXX Do not display NTP configuration/synchronisation, it requires -"services" support. - ---- interfaces/time.ui.orig Thu Jul 1 12:29:55 2010 -+++ interfaces/time.ui Tue Sep 28 17:17:46 2010 -@@ -364,7 +364,7 @@ - - - -- True -+ False - 0 - _Configuration: - True -@@ -378,7 +378,7 @@ - - - -- True -+ False - - - 1 -@@ -589,44 +589,6 @@ - - - 4 -- -- -- -- -- True -- True -- False -- Synchronize now -- -- -- True -- 0 -- 0 -- -- -- True -- 2 -- -- -- True -- gtk-refresh -- 1 -- -- -- False -- False -- 0 -- -- -- -- -- -- -- -- -- False -- False -- 5 - - - diff --git a/x11/gnome/system-tools/patches/patch-src_common_gst-service-role_c b/x11/gnome/system-tools/patches/patch-src_common_gst-service-role_c deleted file mode 100644 index deac16fd603..00000000000 --- a/x11/gnome/system-tools/patches/patch-src_common_gst-service-role_c +++ /dev/null @@ -1,61 +0,0 @@ -$OpenBSD: patch-src_common_gst-service-role_c,v 1.1 2011/01/17 22:55:26 ajacoutot Exp $ ---- src/common/gst-service-role.c.orig Sun Mar 14 15:18:24 2010 -+++ src/common/gst-service-role.c Mon Jan 17 23:42:37 2011 -@@ -42,6 +42,7 @@ static ServiceRole services[] = { - { "am-utils", GST_ROLE_AUTOMOUNTER }, - { "amavis", GST_ROLE_ANTIVIRUS }, - { "amavis-ng", GST_ROLE_ANTIVIRUS }, -+ { "amavisd", GST_ROLE_ANTIVIRUS }, - { "anacron", GST_ROLE_COMMAND_SCHEDULER }, - { "apache", GST_ROLE_WEB_SERVER }, - { "apache-perl", GST_ROLE_WEB_SERVER }, -@@ -56,7 +57,9 @@ static ServiceRole services[] = { - { "aumix", GST_ROLE_AUDIO_MANAGEMENT }, - { "autofs", GST_ROLE_AUTOMOUNTER }, - { "avahi-daemon", GST_ROLE_RENDEZVOUS }, -+ { "avahi_daemon", GST_ROLE_RENDEZVOUS }, - { "avahi-dnsconfd", GST_ROLE_RENDEZVOUS }, -+ { "avahi_dnsconfd", GST_ROLE_RENDEZVOUS }, - { "backuppc", GST_ROLE_REMOTE_BACKUP }, - { "bind", GST_ROLE_DNS }, - { "bind9", GST_ROLE_DNS }, -@@ -72,6 +75,7 @@ static ServiceRole services[] = { - { "cman", GST_ROLE_CLUSTER_MANAGEMENT }, - { "courier", GST_ROLE_MTA }, - { "courier-authdaemon", GST_ROLE_MTA_AUTH }, -+ { "courier_authdaemon", GST_ROLE_MTA_AUTH }, - { "courier-mta", GST_ROLE_MTA }, - { "cron", GST_ROLE_COMMAND_SCHEDULER }, - { "crond", GST_ROLE_COMMAND_SCHEDULER }, -@@ -79,6 +83,7 @@ static ServiceRole services[] = { - { "cupsd", GST_ROLE_PRINTER_SERVICE }, - { "cupsys", GST_ROLE_PRINTER_SERVICE }, - { "dbus", GST_ROLE_DBUS }, -+ { "dbus_daemon", GST_ROLE_DBUS }, - { "ddclient", GST_ROLE_DYNAMIC_DNS_SERVICE }, - { "dhcdbd", GST_ROLE_NETWORK }, - { "dhcp3-server", GST_ROLE_DHCP_SERVER }, -@@ -139,6 +144,7 @@ static ServiceRole services[] = { - { "muddleftpd", GST_ROLE_FILE_SERVER_FTP }, - { "multipath-tools", GST_ROLE_LVM_MANAGEMENT }, - { "mysql", GST_ROLE_DATABASE_SERVER }, -+ { "mysqld", GST_ROLE_DATABASE_SERVER }, - { "mysql-ndb", GST_ROLE_DATABASE_SERVER }, - { "mysql-ndb-mgm", GST_ROLE_DATABASE_SERVER }, - { "nagios", GST_ROLE_SECURITY_AUDITING }, -@@ -203,6 +209,7 @@ static ServiceRole services[] = { - { "shorewall", GST_ROLE_FIREWALL_MANAGEMENT }, - { "slapd", GST_ROLE_LDAP_SERVER }, - { "slim", GST_ROLE_DISPLAY_MANAGER }, -+ { "smartd", GST_ROLE_HARDWARE_MONITORING }, - { "smartmontools", GST_ROLE_HARDWARE_MONITORING }, - { "smb", GST_ROLE_FILE_SERVER_SMB }, - { "snmpd", GST_ROLE_SNMP_SERVER }, -@@ -225,6 +232,7 @@ static ServiceRole services[] = { - { "wacom-tools", GST_ROLE_GRAPHIC_TABLETS_MANAGEMENT }, - { "wdm", GST_ROLE_DISPLAY_MANAGER }, - { "winbind", GST_ROLE_NSS }, -+ { "winbindd", GST_ROLE_NSS }, - { "wu-ftpd", GST_ROLE_FILE_SERVER_FTP }, - { "wzdftpd", GST_ROLE_FILE_SERVER_FTP }, - { "xdm", GST_ROLE_DISPLAY_MANAGER }, diff --git a/x11/gnome/system-tools/patches/patch-src_shares_shares-tool_c b/x11/gnome/system-tools/patches/patch-src_shares_shares-tool_c deleted file mode 100644 index ae8f223b4b3..00000000000 --- a/x11/gnome/system-tools/patches/patch-src_shares_shares-tool_c +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-src_shares_shares-tool_c,v 1.2 2011/01/17 17:51:25 ajacoutot Exp $ - -XXX We never display NFS even if it's part of OpenBSD base system -because the system-tools-backends use the Linux|SunOS exports format. - ---- src/shares/shares-tool.c.orig Mon Jan 17 17:30:37 2011 -+++ src/shares/shares-tool.c Mon Jan 17 17:32:58 2011 -@@ -151,7 +151,11 @@ check_servers (GstSharesTool *tool) - GTK_BUTTONS_CLOSE, - _("Sharing services are not installed")); - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), -+#ifndef __OpenBSD__ - _("You need to install at least either Samba or NFS " -+#else -+ _("You need to install Samba " -+#endif - "in order to share your folders.")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -@@ -221,8 +225,10 @@ gst_shares_tool_update_services_availability (GstShare - - if (role == GST_ROLE_FILE_SERVER_SMB) - tool->smb_available = TRUE; -+#ifndef __OpenBSD__ - else if (role == GST_ROLE_FILE_SERVER_NFS) - tool->nfs_available = TRUE; -+#endif - - g_object_unref (service); - valid = oobs_list_iter_next (services, &iter); diff --git a/x11/gnome/system-tools/patches/patch-src_time_main_c b/x11/gnome/system-tools/patches/patch-src_time_main_c deleted file mode 100644 index 78538af881e..00000000000 --- a/x11/gnome/system-tools/patches/patch-src_time_main_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_time_main_c,v 1.1 2010/09/10 14:48:55 ajacoutot Exp $ - -XXX Do not display NTP configuration/synchronisation, it requires -"services" support. - ---- src/time/main.c.orig Fri Sep 10 16:31:05 2010 -+++ src/time/main.c Fri Sep 10 16:31:12 2010 -@@ -49,7 +49,6 @@ static const gchar *policy_widgets [] = { - "minutes", - "seconds", - "calendar", -- "update_time", - NULL - }; - diff --git a/x11/gnome/system-tools/patches/patch-src_time_time-tool_c b/x11/gnome/system-tools/patches/patch-src_time_time-tool_c deleted file mode 100644 index 612ed5004bf..00000000000 --- a/x11/gnome/system-tools/patches/patch-src_time_time-tool_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_time_time-tool_c,v 1.2 2010/09/30 07:38:53 ajacoutot Exp $ - -XXX Do not display NTP configuration/synchronisation, it requires -"services" support. - ---- src/time/time-tool.c.orig Mon May 24 19:09:57 2010 -+++ src/time/time-tool.c Tue Sep 28 17:17:46 2010 -@@ -557,10 +557,6 @@ gst_time_tool_constructor (GType type - init_timezone (time_tool); - add_options_combo (time_tool); - -- time_tool->synchronize_now = gst_dialog_get_widget (GST_TOOL (time_tool)->main_dialog, "update_time"); -- g_signal_connect (G_OBJECT (time_tool->synchronize_now), "clicked", -- G_CALLBACK (on_synchronize_now_clicked), time_tool); -- - gtk_window_set_resizable (GTK_WINDOW (GST_TOOL (time_tool)->main_dialog), FALSE); - - return object; diff --git a/x11/gnome/system-tools/patches/patch-src_users_user-profiles_conf_in b/x11/gnome/system-tools/patches/patch-src_users_user-profiles_conf_in deleted file mode 100644 index 000f90611c1..00000000000 --- a/x11/gnome/system-tools/patches/patch-src_users_user-profiles_conf_in +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_users_user-profiles_conf_in,v 1.2 2010/09/10 14:48:55 ajacoutot Exp $ ---- src/users/user-profiles.conf.in.orig Fri Sep 10 08:12:48 2010 -+++ src/users/user-profiles.conf.in Fri Sep 10 08:13:34 2010 -@@ -2,9 +2,9 @@ - _Name=Desktop user - _Description=Can perform common tasks. Can't install software or change settings affecting all users. - Default=1 --Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,video -+Groups=users - - [Administrator] - _Name=Administrator - _Description=Can change anything on the system, including installing and upgrading software. --Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,admin,sambashare,lpadmin,video -+Groups=users,wheel diff --git a/x11/gnome/system-tools/patches/patch-src_users_user-settings_c b/x11/gnome/system-tools/patches/patch-src_users_user-settings_c deleted file mode 100644 index 1a21a9f3686..00000000000 --- a/x11/gnome/system-tools/patches/patch-src_users_user-settings_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_users_user-settings_c,v 1.1.1.1 2010/09/10 13:51:13 ajacoutot Exp $ ---- src/users/user-settings.c.orig Wed Sep 8 17:25:23 2010 -+++ src/users/user-settings.c Wed Sep 8 17:25:45 2010 -@@ -267,7 +267,7 @@ static void - set_login_length (GtkWidget *entry) - { - gint max_len; --#ifdef __FreeBSD__ -+#if defined __FreeBSD__ || defined __OpenBSD__ - max_len = UT_NAMESIZE; - #else - struct utmp ut; diff --git a/x11/gnome/system-tools/pkg/DESCR b/x11/gnome/system-tools/pkg/DESCR deleted file mode 100644 index 99d4094eda9..00000000000 --- a/x11/gnome/system-tools/pkg/DESCR +++ /dev/null @@ -1,19 +0,0 @@ -These tools are intended to simplify the tasks of configuring a Unix -system for workstations. They are not intended for configuring Unix -servers. - -Configuring different Unix systems is different; every Unix system has -different ways of being administrated. The GNOME System Tools aspire to -unify these systems. - -Each one of the GNOME System Tools is split in two parts: a backend -(which is typically written in Perl) and a user interface frontend -(which is typically written in C or Python). - -The backend probes your system and parses the existing system files. -When the user has finished editing the system settings, the -configuration is written back as patches to the system files. - -This means that the GNOME System Tools use whatever configuration files -are available on your system, and you can still edit those files by hand -or with other configuration tools without conflicts or data loss. diff --git a/x11/gnome/system-tools/pkg/PLIST b/x11/gnome/system-tools/pkg/PLIST deleted file mode 100644 index d6280c71fbe..00000000000 --- a/x11/gnome/system-tools/pkg/PLIST +++ /dev/null @@ -1,580 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.7 2011/05/28 08:15:53 ajacoutot Exp $ -@comment @bin bin/network-admin -@bin bin/services-admin -@bin bin/shares-admin -@bin bin/time-admin -@comment @bin bin/users-admin -lib/nautilus/ -lib/nautilus/extensions-2.0/ -@comment lib/nautilus/extensions-2.0/libnautilus-gst-shares.a -@comment lib/nautilus/extensions-2.0/libnautilus-gst-shares.la -lib/nautilus/extensions-2.0/libnautilus-gst-shares.so -lib/pkgconfig/gnome-system-tools.pc -@comment share/applications/network.desktop -share/applications/services.desktop -share/applications/shares.desktop -share/applications/time.desktop -@comment share/applications/users.desktop -share/examples/gnome-system-tools/ -share/examples/gnome-system-tools/gnome-system-tools/ -@sample ${SYSCONFDIR}/gnome-system-tools/ -share/examples/gnome-system-tools/gnome-system-tools/user-profiles.conf -@sample ${SYSCONFDIR}/gnome-system-tools/user-profiles.conf -share/glib-2.0/schemas/org.gnome.system-tools.gschema.xml -share/gnome-system-tools/ -share/gnome-system-tools/pixmaps/ -share/gnome-system-tools/pixmaps/world_map-960.png -share/gnome-system-tools/ui/ -share/gnome-system-tools/ui/common.ui -share/gnome-system-tools/ui/network.ui -share/gnome-system-tools/ui/services.ui -share/gnome-system-tools/ui/shares.ui -share/gnome-system-tools/ui/time.ui -share/gnome-system-tools/ui/users.ui -share/gnome/help/network-admin/ -share/gnome/help/network-admin/C/ -share/gnome/help/network-admin/C/figures/ -share/gnome/help/network-admin/C/figures/network-tool.png -share/gnome/help/network-admin/C/legal.xml -share/gnome/help/network-admin/C/network-admin.xml -share/gnome/help/network-admin/ca/ -share/gnome/help/network-admin/ca/figures/ -share/gnome/help/network-admin/ca/figures/network-tool.png -share/gnome/help/network-admin/ca/network-admin.xml -share/gnome/help/network-admin/cs/ -share/gnome/help/network-admin/cs/figures/ -share/gnome/help/network-admin/cs/figures/network-tool.png -share/gnome/help/network-admin/cs/network-admin.xml -share/gnome/help/network-admin/de/ -share/gnome/help/network-admin/de/figures/ -share/gnome/help/network-admin/de/figures/network-tool.png -share/gnome/help/network-admin/de/network-admin.xml -share/gnome/help/network-admin/el/ -share/gnome/help/network-admin/el/figures/ -share/gnome/help/network-admin/el/figures/network-tool.png -share/gnome/help/network-admin/el/network-admin.xml -share/gnome/help/network-admin/en_GB/ -share/gnome/help/network-admin/en_GB/figures/ -share/gnome/help/network-admin/en_GB/figures/network-tool.png -share/gnome/help/network-admin/en_GB/network-admin.xml -share/gnome/help/network-admin/es/ -share/gnome/help/network-admin/es/figures/ -share/gnome/help/network-admin/es/figures/network-tool.png -share/gnome/help/network-admin/es/network-admin.xml -share/gnome/help/network-admin/fr/ -share/gnome/help/network-admin/fr/figures/ -share/gnome/help/network-admin/fr/figures/network-tool.png -share/gnome/help/network-admin/fr/network-admin.xml -share/gnome/help/network-admin/it/ -share/gnome/help/network-admin/it/figures/ -share/gnome/help/network-admin/it/figures/network-tool.png -share/gnome/help/network-admin/it/network-admin.xml -share/gnome/help/network-admin/oc/ -share/gnome/help/network-admin/oc/figures/ -share/gnome/help/network-admin/oc/figures/network-tool.png -share/gnome/help/network-admin/oc/network-admin.xml -share/gnome/help/network-admin/sv/ -share/gnome/help/network-admin/sv/figures/ -share/gnome/help/network-admin/sv/figures/network-tool.png -share/gnome/help/network-admin/sv/network-admin.xml -share/gnome/help/network-admin/zh_CN/ -share/gnome/help/network-admin/zh_CN/figures/ -share/gnome/help/network-admin/zh_CN/figures/network-tool.png -share/gnome/help/network-admin/zh_CN/network-admin.xml -share/gnome/help/services-admin/ -share/gnome/help/services-admin/C/ -share/gnome/help/services-admin/C/figures/ -share/gnome/help/services-admin/C/figures/services-tool.png -share/gnome/help/services-admin/C/legal.xml -share/gnome/help/services-admin/C/services-admin.xml -share/gnome/help/services-admin/ca/ -share/gnome/help/services-admin/ca/figures/ -share/gnome/help/services-admin/ca/figures/services-tool.png -share/gnome/help/services-admin/ca/services-admin.xml -share/gnome/help/services-admin/cs/ -share/gnome/help/services-admin/cs/figures/ -share/gnome/help/services-admin/cs/figures/services-tool.png -share/gnome/help/services-admin/cs/services-admin.xml -share/gnome/help/services-admin/de/ -share/gnome/help/services-admin/de/figures/ -share/gnome/help/services-admin/de/figures/services-tool.png -share/gnome/help/services-admin/de/services-admin.xml -share/gnome/help/services-admin/el/ -share/gnome/help/services-admin/el/figures/ -share/gnome/help/services-admin/el/figures/services-tool.png -share/gnome/help/services-admin/el/services-admin.xml -share/gnome/help/services-admin/en_GB/ -share/gnome/help/services-admin/en_GB/figures/ -share/gnome/help/services-admin/en_GB/figures/services-tool.png -share/gnome/help/services-admin/en_GB/services-admin.xml -share/gnome/help/services-admin/es/ -share/gnome/help/services-admin/es/figures/ -share/gnome/help/services-admin/es/figures/services-tool.png -share/gnome/help/services-admin/es/services-admin.xml -share/gnome/help/services-admin/fr/ -share/gnome/help/services-admin/fr/figures/ -share/gnome/help/services-admin/fr/figures/services-tool.png -share/gnome/help/services-admin/fr/services-admin.xml -share/gnome/help/services-admin/gl/ -share/gnome/help/services-admin/gl/figures/ -share/gnome/help/services-admin/gl/figures/services-tool.png -share/gnome/help/services-admin/gl/services-admin.xml -share/gnome/help/services-admin/it/ -share/gnome/help/services-admin/it/figures/ -share/gnome/help/services-admin/it/figures/services-tool.png -share/gnome/help/services-admin/it/services-admin.xml -share/gnome/help/services-admin/nl/ -share/gnome/help/services-admin/nl/figures/ -share/gnome/help/services-admin/nl/figures/services-tool.png -share/gnome/help/services-admin/nl/legal.xml -share/gnome/help/services-admin/nl/services-admin.xml -share/gnome/help/services-admin/oc/ -share/gnome/help/services-admin/oc/figures/ -share/gnome/help/services-admin/oc/figures/services-tool.png -share/gnome/help/services-admin/oc/services-admin.xml -share/gnome/help/services-admin/pl/ -share/gnome/help/services-admin/pl/figures/ -share/gnome/help/services-admin/pl/figures/services-tool.png -share/gnome/help/services-admin/pl/services-admin.xml -share/gnome/help/services-admin/pt_BR/ -share/gnome/help/services-admin/pt_BR/figures/ -share/gnome/help/services-admin/pt_BR/figures/services-tool.png -share/gnome/help/services-admin/pt_BR/services-admin.xml -share/gnome/help/services-admin/sv/ -share/gnome/help/services-admin/sv/figures/ -share/gnome/help/services-admin/sv/figures/services-tool.png -share/gnome/help/services-admin/sv/services-admin.xml -share/gnome/help/services-admin/zh_CN/ -share/gnome/help/services-admin/zh_CN/figures/ -share/gnome/help/services-admin/zh_CN/figures/services-tool.png -share/gnome/help/services-admin/zh_CN/services-admin.xml -share/gnome/help/shares-admin/ -share/gnome/help/shares-admin/C/ -share/gnome/help/shares-admin/C/figures/ -share/gnome/help/shares-admin/C/figures/shares-tool.png -share/gnome/help/shares-admin/C/legal.xml -share/gnome/help/shares-admin/C/shares-admin.xml -share/gnome/help/shares-admin/ca/ -share/gnome/help/shares-admin/ca/figures/ -share/gnome/help/shares-admin/ca/figures/shares-tool.png -share/gnome/help/shares-admin/ca/shares-admin.xml -share/gnome/help/shares-admin/cs/ -share/gnome/help/shares-admin/cs/figures/ -share/gnome/help/shares-admin/cs/figures/shares-tool.png -share/gnome/help/shares-admin/cs/shares-admin.xml -share/gnome/help/shares-admin/de/ -share/gnome/help/shares-admin/de/figures/ -share/gnome/help/shares-admin/de/figures/shares-tool.png -share/gnome/help/shares-admin/de/shares-admin.xml -share/gnome/help/shares-admin/el/ -share/gnome/help/shares-admin/el/figures/ -share/gnome/help/shares-admin/el/figures/shares-tool.png -share/gnome/help/shares-admin/el/shares-admin.xml -share/gnome/help/shares-admin/en_GB/ -share/gnome/help/shares-admin/en_GB/figures/ -share/gnome/help/shares-admin/en_GB/figures/shares-tool.png -share/gnome/help/shares-admin/en_GB/shares-admin.xml -share/gnome/help/shares-admin/es/ -share/gnome/help/shares-admin/es/figures/ -share/gnome/help/shares-admin/es/figures/shares-tool.png -share/gnome/help/shares-admin/es/shares-admin.xml -share/gnome/help/shares-admin/fr/ -share/gnome/help/shares-admin/fr/figures/ -share/gnome/help/shares-admin/fr/figures/shares-tool.png -share/gnome/help/shares-admin/fr/shares-admin.xml -share/gnome/help/shares-admin/gl/ -share/gnome/help/shares-admin/gl/figures/ -share/gnome/help/shares-admin/gl/figures/shares-tool.png -share/gnome/help/shares-admin/gl/shares-admin.xml -share/gnome/help/shares-admin/it/ -share/gnome/help/shares-admin/it/figures/ -share/gnome/help/shares-admin/it/figures/shares-tool.png -share/gnome/help/shares-admin/it/shares-admin.xml -share/gnome/help/shares-admin/oc/ -share/gnome/help/shares-admin/oc/figures/ -share/gnome/help/shares-admin/oc/figures/shares-tool.png -share/gnome/help/shares-admin/oc/shares-admin.xml -share/gnome/help/shares-admin/pt_BR/ -share/gnome/help/shares-admin/pt_BR/figures/ -share/gnome/help/shares-admin/pt_BR/figures/shares-tool.png -share/gnome/help/shares-admin/pt_BR/shares-admin.xml -share/gnome/help/shares-admin/sv/ -share/gnome/help/shares-admin/sv/figures/ -share/gnome/help/shares-admin/sv/figures/shares-tool.png -share/gnome/help/shares-admin/sv/shares-admin.xml -share/gnome/help/shares-admin/zh_CN/ -share/gnome/help/shares-admin/zh_CN/figures/ -share/gnome/help/shares-admin/zh_CN/figures/shares-tool.png -share/gnome/help/shares-admin/zh_CN/shares-admin.xml -share/gnome/help/time-admin/ -share/gnome/help/time-admin/C/ -share/gnome/help/time-admin/C/figures/ -share/gnome/help/time-admin/C/figures/time-map.png -share/gnome/help/time-admin/C/figures/time-servers.png -share/gnome/help/time-admin/C/figures/time-tool-automatic.png -share/gnome/help/time-admin/C/figures/time-tool-manual.png -share/gnome/help/time-admin/C/legal.xml -share/gnome/help/time-admin/C/time-admin.xml -share/gnome/help/time-admin/ca/ -share/gnome/help/time-admin/ca/figures/ -share/gnome/help/time-admin/ca/figures/time-map.png -share/gnome/help/time-admin/ca/figures/time-servers.png -share/gnome/help/time-admin/ca/figures/time-tool-automatic.png -share/gnome/help/time-admin/ca/figures/time-tool-manual.png -share/gnome/help/time-admin/ca/time-admin.xml -share/gnome/help/time-admin/cs/ -share/gnome/help/time-admin/cs/figures/ -share/gnome/help/time-admin/cs/figures/time-map.png -share/gnome/help/time-admin/cs/figures/time-servers.png -share/gnome/help/time-admin/cs/figures/time-tool-automatic.png -share/gnome/help/time-admin/cs/figures/time-tool-manual.png -share/gnome/help/time-admin/cs/time-admin.xml -share/gnome/help/time-admin/de/ -share/gnome/help/time-admin/de/figures/ -share/gnome/help/time-admin/de/figures/time-map.png -share/gnome/help/time-admin/de/figures/time-servers.png -share/gnome/help/time-admin/de/figures/time-tool-automatic.png -share/gnome/help/time-admin/de/figures/time-tool-manual.png -share/gnome/help/time-admin/de/time-admin.xml -share/gnome/help/time-admin/el/ -share/gnome/help/time-admin/el/figures/ -share/gnome/help/time-admin/el/figures/time-map.png -share/gnome/help/time-admin/el/figures/time-servers.png -share/gnome/help/time-admin/el/figures/time-tool-automatic.png -share/gnome/help/time-admin/el/figures/time-tool-manual.png -share/gnome/help/time-admin/el/time-admin.xml -share/gnome/help/time-admin/en_GB/ -share/gnome/help/time-admin/en_GB/figures/ -share/gnome/help/time-admin/en_GB/figures/time-map.png -share/gnome/help/time-admin/en_GB/figures/time-servers.png -share/gnome/help/time-admin/en_GB/figures/time-tool-automatic.png -share/gnome/help/time-admin/en_GB/figures/time-tool-manual.png -share/gnome/help/time-admin/en_GB/time-admin.xml -share/gnome/help/time-admin/es/ -share/gnome/help/time-admin/es/figures/ -share/gnome/help/time-admin/es/figures/time-map.png -share/gnome/help/time-admin/es/figures/time-servers.png -share/gnome/help/time-admin/es/figures/time-tool-automatic.png -share/gnome/help/time-admin/es/figures/time-tool-manual.png -share/gnome/help/time-admin/es/time-admin.xml -share/gnome/help/time-admin/fr/ -share/gnome/help/time-admin/fr/figures/ -share/gnome/help/time-admin/fr/figures/time-map.png -share/gnome/help/time-admin/fr/figures/time-servers.png -share/gnome/help/time-admin/fr/figures/time-tool-automatic.png -share/gnome/help/time-admin/fr/figures/time-tool-manual.png -share/gnome/help/time-admin/fr/time-admin.xml -share/gnome/help/time-admin/gl/ -share/gnome/help/time-admin/gl/figures/ -share/gnome/help/time-admin/gl/figures/time-map.png -share/gnome/help/time-admin/gl/figures/time-servers.png -share/gnome/help/time-admin/gl/figures/time-tool-automatic.png -share/gnome/help/time-admin/gl/figures/time-tool-manual.png -share/gnome/help/time-admin/gl/time-admin.xml -share/gnome/help/time-admin/it/ -share/gnome/help/time-admin/it/figures/ -share/gnome/help/time-admin/it/figures/time-map.png -share/gnome/help/time-admin/it/figures/time-servers.png -share/gnome/help/time-admin/it/figures/time-tool-automatic.png -share/gnome/help/time-admin/it/figures/time-tool-manual.png -share/gnome/help/time-admin/it/time-admin.xml -share/gnome/help/time-admin/nl/ -share/gnome/help/time-admin/nl/figures/ -share/gnome/help/time-admin/nl/figures/time-map.png -share/gnome/help/time-admin/nl/figures/time-servers.png -share/gnome/help/time-admin/nl/figures/time-tool-manual.png -share/gnome/help/time-admin/nl/legal.xml -share/gnome/help/time-admin/nl/time-admin.xml -share/gnome/help/time-admin/oc/ -share/gnome/help/time-admin/oc/figures/ -share/gnome/help/time-admin/oc/figures/time-map.png -share/gnome/help/time-admin/oc/figures/time-servers.png -share/gnome/help/time-admin/oc/figures/time-tool-automatic.png -share/gnome/help/time-admin/oc/figures/time-tool-manual.png -share/gnome/help/time-admin/oc/time-admin.xml -share/gnome/help/time-admin/pt_BR/ -share/gnome/help/time-admin/pt_BR/figures/ -share/gnome/help/time-admin/pt_BR/figures/time-map.png -share/gnome/help/time-admin/pt_BR/figures/time-servers.png -share/gnome/help/time-admin/pt_BR/figures/time-tool-automatic.png -share/gnome/help/time-admin/pt_BR/figures/time-tool-manual.png -share/gnome/help/time-admin/pt_BR/time-admin.xml -share/gnome/help/time-admin/ru/ -share/gnome/help/time-admin/ru/figures/ -share/gnome/help/time-admin/ru/figures/time-map.png -share/gnome/help/time-admin/ru/figures/time-servers.png -share/gnome/help/time-admin/ru/figures/time-tool-automatic.png -share/gnome/help/time-admin/ru/figures/time-tool-manual.png -share/gnome/help/time-admin/ru/time-admin.xml -share/gnome/help/time-admin/sv/ -share/gnome/help/time-admin/sv/figures/ -share/gnome/help/time-admin/sv/figures/time-map.png -share/gnome/help/time-admin/sv/figures/time-servers.png -share/gnome/help/time-admin/sv/figures/time-tool-automatic.png -share/gnome/help/time-admin/sv/figures/time-tool-manual.png -share/gnome/help/time-admin/sv/time-admin.xml -share/gnome/help/time-admin/zh_CN/ -share/gnome/help/time-admin/zh_CN/figures/ -share/gnome/help/time-admin/zh_CN/figures/time-map.png -share/gnome/help/time-admin/zh_CN/figures/time-servers.png -share/gnome/help/time-admin/zh_CN/figures/time-tool-automatic.png -share/gnome/help/time-admin/zh_CN/figures/time-tool-manual.png -share/gnome/help/time-admin/zh_CN/time-admin.xml -share/gnome/help/users-admin/ -share/gnome/help/users-admin/C/ -share/gnome/help/users-admin/C/figures/ -share/gnome/help/users-admin/C/figures/groups.png -share/gnome/help/users-admin/C/figures/users-tool.png -share/gnome/help/users-admin/C/legal.xml -share/gnome/help/users-admin/C/users-admin.xml -share/gnome/help/users-admin/ca/ -share/gnome/help/users-admin/ca/figures/ -share/gnome/help/users-admin/ca/figures/groups.png -share/gnome/help/users-admin/ca/figures/users-tool.png -share/gnome/help/users-admin/ca/users-admin.xml -share/gnome/help/users-admin/cs/ -share/gnome/help/users-admin/cs/figures/ -share/gnome/help/users-admin/cs/figures/groups.png -share/gnome/help/users-admin/cs/figures/users-tool.png -share/gnome/help/users-admin/cs/users-admin.xml -share/gnome/help/users-admin/de/ -share/gnome/help/users-admin/de/figures/ -share/gnome/help/users-admin/de/figures/groups.png -share/gnome/help/users-admin/de/figures/users-tool.png -share/gnome/help/users-admin/de/users-admin.xml -share/gnome/help/users-admin/el/ -share/gnome/help/users-admin/el/figures/ -share/gnome/help/users-admin/el/figures/groups.png -share/gnome/help/users-admin/el/figures/users-tool.png -share/gnome/help/users-admin/el/users-admin.xml -share/gnome/help/users-admin/en_GB/ -share/gnome/help/users-admin/en_GB/figures/ -share/gnome/help/users-admin/en_GB/figures/groups.png -share/gnome/help/users-admin/en_GB/figures/users-tool.png -share/gnome/help/users-admin/en_GB/users-admin.xml -share/gnome/help/users-admin/es/ -share/gnome/help/users-admin/es/figures/ -share/gnome/help/users-admin/es/figures/groups.png -share/gnome/help/users-admin/es/figures/users-tool.png -share/gnome/help/users-admin/es/users-admin.xml -share/gnome/help/users-admin/fr/ -share/gnome/help/users-admin/fr/figures/ -share/gnome/help/users-admin/fr/figures/groups.png -share/gnome/help/users-admin/fr/figures/users-tool.png -share/gnome/help/users-admin/fr/users-admin.xml -share/gnome/help/users-admin/gl/ -share/gnome/help/users-admin/gl/figures/ -share/gnome/help/users-admin/gl/figures/groups.png -share/gnome/help/users-admin/gl/figures/users-tool.png -share/gnome/help/users-admin/gl/users-admin.xml -share/gnome/help/users-admin/it/ -share/gnome/help/users-admin/it/figures/ -share/gnome/help/users-admin/it/figures/groups.png -share/gnome/help/users-admin/it/figures/users-tool.png -share/gnome/help/users-admin/it/users-admin.xml -share/gnome/help/users-admin/oc/ -share/gnome/help/users-admin/oc/figures/ -share/gnome/help/users-admin/oc/figures/groups.png -share/gnome/help/users-admin/oc/figures/users-tool.png -share/gnome/help/users-admin/oc/users-admin.xml -share/gnome/help/users-admin/pt_BR/ -share/gnome/help/users-admin/pt_BR/figures/ -share/gnome/help/users-admin/pt_BR/figures/groups.png -share/gnome/help/users-admin/pt_BR/figures/users-tool.png -share/gnome/help/users-admin/pt_BR/users-admin.xml -share/gnome/help/users-admin/ru/ -share/gnome/help/users-admin/ru/figures/ -share/gnome/help/users-admin/ru/figures/groups.png -share/gnome/help/users-admin/ru/figures/users-tool.png -share/gnome/help/users-admin/ru/users-admin.xml -share/gnome/help/users-admin/sv/ -share/gnome/help/users-admin/sv/figures/ -share/gnome/help/users-admin/sv/figures/groups.png -share/gnome/help/users-admin/sv/figures/users-tool.png -share/gnome/help/users-admin/sv/users-admin.xml -share/gnome/help/users-admin/zh_CN/ -share/gnome/help/users-admin/zh_CN/figures/ -share/gnome/help/users-admin/zh_CN/figures/groups.png -share/gnome/help/users-admin/zh_CN/figures/users-tool.png -share/gnome/help/users-admin/zh_CN/users-admin.xml -share/icons/hicolor/16x16/apps/time-admin.png -share/icons/hicolor/22x22/apps/time-admin.png -share/icons/hicolor/24x24/apps/time-admin.png -share/icons/hicolor/32x32/apps/time-admin.png -share/icons/hicolor/48x48/apps/time-admin.png -share/icons/hicolor/48x48/devices/irda.png -share/icons/hicolor/48x48/devices/plip.png -share/icons/hicolor/scalable/apps/time-admin.svg -share/locale/af/LC_MESSAGES/gnome-system-tools.mo -share/locale/am/LC_MESSAGES/gnome-system-tools.mo -share/locale/ar/LC_MESSAGES/gnome-system-tools.mo -share/locale/as/LC_MESSAGES/gnome-system-tools.mo -share/locale/ast/LC_MESSAGES/gnome-system-tools.mo -share/locale/az/LC_MESSAGES/gnome-system-tools.mo -share/locale/be/LC_MESSAGES/gnome-system-tools.mo -share/locale/be@latin/LC_MESSAGES/gnome-system-tools.mo -share/locale/bg/LC_MESSAGES/gnome-system-tools.mo -share/locale/bn/LC_MESSAGES/gnome-system-tools.mo -share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo -share/locale/br/LC_MESSAGES/gnome-system-tools.mo -share/locale/ca/LC_MESSAGES/gnome-system-tools.mo -share/locale/ca@valencia/LC_MESSAGES/gnome-system-tools.mo -share/locale/cs/LC_MESSAGES/gnome-system-tools.mo -share/locale/cy/LC_MESSAGES/gnome-system-tools.mo -share/locale/da/LC_MESSAGES/gnome-system-tools.mo -share/locale/de/LC_MESSAGES/gnome-system-tools.mo -share/locale/dz/LC_MESSAGES/gnome-system-tools.mo -share/locale/el/LC_MESSAGES/gnome-system-tools.mo -share/locale/en@shaw/LC_MESSAGES/gnome-system-tools.mo -share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo -share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo -share/locale/eo/LC_MESSAGES/gnome-system-tools.mo -share/locale/es/LC_MESSAGES/gnome-system-tools.mo -share/locale/et/LC_MESSAGES/gnome-system-tools.mo -share/locale/eu/LC_MESSAGES/gnome-system-tools.mo -share/locale/fa/LC_MESSAGES/gnome-system-tools.mo -share/locale/fi/LC_MESSAGES/gnome-system-tools.mo -share/locale/fr/LC_MESSAGES/gnome-system-tools.mo -share/locale/ga/LC_MESSAGES/gnome-system-tools.mo -share/locale/gl/LC_MESSAGES/gnome-system-tools.mo -share/locale/gu/LC_MESSAGES/gnome-system-tools.mo -share/locale/he/LC_MESSAGES/gnome-system-tools.mo -share/locale/hi/LC_MESSAGES/gnome-system-tools.mo -share/locale/hr/LC_MESSAGES/gnome-system-tools.mo -share/locale/hu/LC_MESSAGES/gnome-system-tools.mo -share/locale/id/LC_MESSAGES/gnome-system-tools.mo -share/locale/is/LC_MESSAGES/gnome-system-tools.mo -share/locale/it/LC_MESSAGES/gnome-system-tools.mo -share/locale/ja/LC_MESSAGES/gnome-system-tools.mo -share/locale/ka/LC_MESSAGES/gnome-system-tools.mo -share/locale/kn/LC_MESSAGES/gnome-system-tools.mo -share/locale/ko/LC_MESSAGES/gnome-system-tools.mo -share/locale/ku/LC_MESSAGES/gnome-system-tools.mo -share/locale/lt/LC_MESSAGES/gnome-system-tools.mo -share/locale/lv/LC_MESSAGES/gnome-system-tools.mo -share/locale/mai/LC_MESSAGES/gnome-system-tools.mo -share/locale/mg/LC_MESSAGES/gnome-system-tools.mo -share/locale/mk/LC_MESSAGES/gnome-system-tools.mo -share/locale/ml/LC_MESSAGES/gnome-system-tools.mo -share/locale/mn/LC_MESSAGES/gnome-system-tools.mo -share/locale/mr/LC_MESSAGES/gnome-system-tools.mo -share/locale/ms/LC_MESSAGES/gnome-system-tools.mo -share/locale/nb/LC_MESSAGES/gnome-system-tools.mo -share/locale/nds/LC_MESSAGES/gnome-system-tools.mo -share/locale/ne/LC_MESSAGES/gnome-system-tools.mo -share/locale/nl/LC_MESSAGES/gnome-system-tools.mo -share/locale/nn/LC_MESSAGES/gnome-system-tools.mo -share/locale/oc/LC_MESSAGES/gnome-system-tools.mo -share/locale/or/LC_MESSAGES/gnome-system-tools.mo -share/locale/pa/LC_MESSAGES/gnome-system-tools.mo -share/locale/pl/LC_MESSAGES/gnome-system-tools.mo -share/locale/ps/LC_MESSAGES/gnome-system-tools.mo -share/locale/pt/LC_MESSAGES/gnome-system-tools.mo -share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo -share/locale/ro/LC_MESSAGES/gnome-system-tools.mo -share/locale/ru/LC_MESSAGES/gnome-system-tools.mo -share/locale/rw/LC_MESSAGES/gnome-system-tools.mo -share/locale/si/LC_MESSAGES/gnome-system-tools.mo -share/locale/sk/LC_MESSAGES/gnome-system-tools.mo -share/locale/sl/LC_MESSAGES/gnome-system-tools.mo -share/locale/sq/LC_MESSAGES/gnome-system-tools.mo -share/locale/sr/LC_MESSAGES/gnome-system-tools.mo -share/locale/sr@latin/LC_MESSAGES/gnome-system-tools.mo -share/locale/sv/LC_MESSAGES/gnome-system-tools.mo -share/locale/ta/LC_MESSAGES/gnome-system-tools.mo -share/locale/te/LC_MESSAGES/gnome-system-tools.mo -share/locale/th/LC_MESSAGES/gnome-system-tools.mo -share/locale/tr/LC_MESSAGES/gnome-system-tools.mo -share/locale/ug/LC_MESSAGES/gnome-system-tools.mo -share/locale/uk/LC_MESSAGES/gnome-system-tools.mo -share/locale/vi/LC_MESSAGES/gnome-system-tools.mo -share/locale/wa/LC_MESSAGES/gnome-system-tools.mo -share/locale/xh/LC_MESSAGES/gnome-system-tools.mo -share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo -share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo -share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo -share/omf/gnome-system-tools/ -share/omf/gnome-system-tools/services-admin-nl.omf -share/omf/gnome-system-tools/time-admin-nl.omf -share/omf/network-admin/ -share/omf/network-admin/network-admin-C.omf -share/omf/network-admin/network-admin-ca.omf -share/omf/network-admin/network-admin-cs.omf -share/omf/network-admin/network-admin-de.omf -share/omf/network-admin/network-admin-el.omf -share/omf/network-admin/network-admin-en_GB.omf -share/omf/network-admin/network-admin-es.omf -share/omf/network-admin/network-admin-fr.omf -share/omf/network-admin/network-admin-it.omf -share/omf/network-admin/network-admin-oc.omf -share/omf/network-admin/network-admin-sv.omf -share/omf/network-admin/network-admin-zh_CN.omf -share/omf/services-admin/ -share/omf/services-admin/services-admin-C.omf -share/omf/services-admin/services-admin-ca.omf -share/omf/services-admin/services-admin-cs.omf -share/omf/services-admin/services-admin-de.omf -share/omf/services-admin/services-admin-el.omf -share/omf/services-admin/services-admin-en_GB.omf -share/omf/services-admin/services-admin-es.omf -share/omf/services-admin/services-admin-fr.omf -share/omf/services-admin/services-admin-gl.omf -share/omf/services-admin/services-admin-it.omf -share/omf/services-admin/services-admin-oc.omf -share/omf/services-admin/services-admin-pl.omf -share/omf/services-admin/services-admin-pt_BR.omf -share/omf/services-admin/services-admin-sv.omf -share/omf/services-admin/services-admin-zh_CN.omf -share/omf/shares-admin/ -share/omf/shares-admin/shares-admin-C.omf -share/omf/shares-admin/shares-admin-ca.omf -share/omf/shares-admin/shares-admin-cs.omf -share/omf/shares-admin/shares-admin-de.omf -share/omf/shares-admin/shares-admin-el.omf -share/omf/shares-admin/shares-admin-en_GB.omf -share/omf/shares-admin/shares-admin-es.omf -share/omf/shares-admin/shares-admin-fr.omf -share/omf/shares-admin/shares-admin-gl.omf -share/omf/shares-admin/shares-admin-it.omf -share/omf/shares-admin/shares-admin-oc.omf -share/omf/shares-admin/shares-admin-pt_BR.omf -share/omf/shares-admin/shares-admin-sv.omf -share/omf/shares-admin/shares-admin-zh_CN.omf -share/omf/time-admin/ -share/omf/time-admin/time-admin-C.omf -share/omf/time-admin/time-admin-ca.omf -share/omf/time-admin/time-admin-cs.omf -share/omf/time-admin/time-admin-de.omf -share/omf/time-admin/time-admin-el.omf -share/omf/time-admin/time-admin-en_GB.omf -share/omf/time-admin/time-admin-es.omf -share/omf/time-admin/time-admin-fr.omf -share/omf/time-admin/time-admin-gl.omf -share/omf/time-admin/time-admin-it.omf -share/omf/time-admin/time-admin-oc.omf -share/omf/time-admin/time-admin-pt_BR.omf -share/omf/time-admin/time-admin-ru.omf -share/omf/time-admin/time-admin-sv.omf -share/omf/time-admin/time-admin-zh_CN.omf -share/omf/users-admin/ -share/omf/users-admin/users-admin-C.omf -share/omf/users-admin/users-admin-ca.omf -share/omf/users-admin/users-admin-cs.omf -share/omf/users-admin/users-admin-de.omf -share/omf/users-admin/users-admin-el.omf -share/omf/users-admin/users-admin-en_GB.omf -share/omf/users-admin/users-admin-es.omf -share/omf/users-admin/users-admin-fr.omf -share/omf/users-admin/users-admin-gl.omf -share/omf/users-admin/users-admin-it.omf -share/omf/users-admin/users-admin-oc.omf -share/omf/users-admin/users-admin-pt_BR.omf -share/omf/users-admin/users-admin-ru.omf -share/omf/users-admin/users-admin-sv.omf -share/omf/users-admin/users-admin-zh_CN.omf -@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true -@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true -@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null -@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null -@exec %D/bin/update-desktop-database -@unexec-delete %D/bin/update-desktop-database