diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
| commit | 6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch) | |
| tree | 0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /sysutils | |
| parent | - Add USE_XORG= x11 (diff) | |
The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for
FreeBSD. The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media. Work
is also underway to tie webkit more closely into GNOME. As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.
This release would not have been possible without the contributions and
testing efforts of the following people:
Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon
Diffstat (limited to 'sysutils')
129 files changed, 4825 insertions, 1007 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index d6f8e61c7411..b1eaeb5feb99 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -264,10 +264,12 @@ SUBDIR += glload SUBDIR += gnome-control-center SUBDIR += gnome-control-center1 + SUBDIR += gnome-device-manager SUBDIR += gnome-mount SUBDIR += gnome-pkgview SUBDIR += gnome-power-manager SUBDIR += gnome-schedule + SUBDIR += gnome-settings-daemon SUBDIR += gnome-system-monitor SUBDIR += gnome-system-tools SUBDIR += gnome-volume-manager @@ -297,7 +299,7 @@ SUBDIR += hachoir-urwid SUBDIR += hachoir-wx SUBDIR += hal - SUBDIR += hal-device-manager + SUBDIR += hal-info SUBDIR += hammerhead SUBDIR += hdup SUBDIR += healthd @@ -536,6 +538,7 @@ SUBDIR += plod SUBDIR += pmap SUBDIR += policykit + SUBDIR += policykit-gnome SUBDIR += powerman SUBDIR += prips SUBDIR += procmap diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 6abd7c3a0e48..5b21bb054fdb 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.18 2007/10/21 02:19:44 mezz Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.23 2008/02/06 07:11:46 marcus Exp $ PORTNAME= brasero PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ - totem-plparser.7:${PORTSDIR}/multimedia/totem + totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser USE_GETTEXT= yes USE_BZIP2= yes diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index 2bd391fac21b..acbe2314bd1f 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -239,7 +239,7 @@ share/mime/packages/brasero.xml @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@dirrmtry share/locale/sr@Latn/LC_MESSAGES -@dirrmtry share/locale/sr@Latn @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index e5e11082ce5a..a46bd13ef669 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -3,24 +3,21 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/sysutils/consolekit/Makefile,v 1.12 2008/02/27 15:13:25 ahze Exp $ PORTNAME= consolekit -PORTVERSION= ${RELVERSION}.${SNAPSHOT} +PORTVERSION= 0.2.10 CATEGORIES= sysutils gnome -MASTER_SITES= http://people.freebsd.org/~flz/local/ +MASTER_SITES= http://people.freedesktop.org/~mccann/dist/ DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for defining and tracking users -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib - -RELVERSION= 0.2.2 -SNAPSHOT= 20070906 +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + polkit.2:${PORTSDIR}/sysutils/policykit -WRKSRC= ${WRKDIR}/ConsoleKit-${RELVERSION} -USE_BZIP2= yes +WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION} USE_XORG= x11 USE_GNOME= gnomehack gnometarget USE_GMAKE= yes @@ -28,9 +25,14 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid +CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid \ + --localstatedir=/var -USE_RC_SUBR= consolekit -USE_GNOME_SUBR= yes +post-install: + ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device \ + ${PREFIX}/libexec/ck-get-x11-display-device + ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid \ + ${PREFIX}/libexec/ck-get-x11-server-pid + ${MKDIR} /var/log/ConsoleKit .include <bsd.port.mk> diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo index 0d37700548c0..be86390034c1 100644 --- a/sysutils/consolekit/distinfo +++ b/sysutils/consolekit/distinfo @@ -1,3 +1,3 @@ -MD5 (ConsoleKit-0.2.2.20070906.tar.bz2) = 254370de2bcf0fe6dffecfe2eb33d0ec -SHA256 (ConsoleKit-0.2.2.20070906.tar.bz2) = fc8010e2068a7268ef6e414f404aa8237a21c9efc89aee9bfed8872936fa3be7 -SIZE (ConsoleKit-0.2.2.20070906.tar.bz2) = 309171 +MD5 (ConsoleKit-0.2.10.tar.gz) = b85c2333a8fe31c0d3f29caa14716634 +SHA256 (ConsoleKit-0.2.10.tar.gz) = 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb +SIZE (ConsoleKit-0.2.10.tar.gz) = 521473 diff --git a/sysutils/consolekit/files/ck-get-x11-display-device b/sysutils/consolekit/files/ck-get-x11-display-device new file mode 100644 index 000000000000..6fc508360b92 --- /dev/null +++ b/sysutils/consolekit/files/ck-get-x11-display-device @@ -0,0 +1,35 @@ +#!/bin/sh + +FSTAT="/usr/bin/fstat" +GREP="/usr/bin/grep" +AWK="/usr/bin/awk" +SED="/usr/bin/sed" +CAT="/bin/cat" +HEAD="/usr/bin/head" + +dispnum=0 +if [ x"$1" = x"--display" ]; then + if [ $# != 2 ]; then + echo "usage: $0 [--display DISPLAY]" + exit 1 + fi + DISPLAY=$2 +fi +if [ ! -z "${DISPLAY}" ]; then + dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|') +fi + +if [ ! -f "/tmp/.X${dispnum}-lock" ]; then + echo "ERROR: Failed to find X lock file for display ${dispnum}" + exit 1 +fi +pid=$(${CAT} "/tmp/.X${dispnum}-lock") + +device=$(${FSTAT} -p ${pid} | ${GREP} ttyv | ${HEAD} -1 | ${AWK} '{print $8}') + +if [ -z "${device}" ]; then + echo "ERROR: Failed to find TTY device for X server on display ${dispnum}" + exit 1 +fi + +echo "/dev/${device}" diff --git a/sysutils/consolekit/files/ck-get-x11-server-pid b/sysutils/consolekit/files/ck-get-x11-server-pid new file mode 100644 index 000000000000..05c433e0175e --- /dev/null +++ b/sysutils/consolekit/files/ck-get-x11-server-pid @@ -0,0 +1,17 @@ +#!/bin/sh + +SED="/usr/bin/sed" +CAT="/bin/cat" + +dispnum=0 +if [ ! -z "${DISPLAY}" ]; then + dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|') +fi + +if [ ! -f "/tmp/.X${dispnum}-lock" ]; then + echo "ERROR: Failed to find X lock file for display ${dispnum}" + exit 1 +fi +pid=$(${CAT} "/tmp/.X${dispnum}-lock") + +echo ${pid} diff --git a/sysutils/consolekit/files/consolekit.in b/sysutils/consolekit/files/consolekit.in deleted file mode 100644 index 7eada3e639c2..000000000000 --- a/sysutils/consolekit/files/consolekit.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: consolekit -# REQUIRE: DAEMON dbus -# -# Add the following line to /etc/rc.conf to enable the ConsoleKit daemon: -# -# consolekit_enable="YES" -# - -. %%RC_SUBR%% -. %%GNOME_SUBR%% - -consolekit_enable=${consolekit_enable-${gnome_enable}} - -name=consolekit -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/console-kit-daemon" -pidfile="/var/run/${name}.pid" - -start_precmd="consolekit_precmd" -stop_postcmd="consolekit_postcmd" - -local_force_depend() -{ - _depend="$1" - if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then - _depend="${_depend}.sh" - fi - - if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 && - ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then - return 1 - fi - return 0 -} - -consolekit_precmd() -{ - if ! checkyesno dbus_enable - then - local_force_depend dbus || return 1 - fi - - mkdir -p $(dirname $pidfile) -} - -consolekit_postcmd() -{ - rm -f $pidfile -} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c new file mode 100644 index 000000000000..5a0e1248b191 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c @@ -0,0 +1,142 @@ +--- src/ck-sysdeps-freebsd.c.orig 2008-01-23 09:30:44.000000000 -0500 ++++ src/ck-sysdeps-freebsd.c 2008-02-06 22:50:57.000000000 -0500 +@@ -27,6 +27,7 @@ + #include <unistd.h> + #include <string.h> + #include <errno.h> ++#include <glob.h> + #include <paths.h> + #include <ttyent.h> + #include <kvm.h> +@@ -202,7 +203,6 @@ ck_process_stat_new_for_unix_pid (pid_t + GError **error) + { + gboolean res; +- GError *local_error; + CkProcessStat *proc; + + g_return_val_if_fail (pid > 1, FALSE); +@@ -217,7 +217,6 @@ ck_process_stat_new_for_unix_pid (pid_t + if (res) { + *stat = proc; + } else { +- g_propagate_error (error, local_error); + *stat = NULL; + } + +@@ -318,38 +317,40 @@ gboolean + ck_get_max_num_consoles (guint *num) + { + int max_consoles; +- int res; +- gboolean ret; +- struct ttyent *t; ++ int i; ++ glob_t g; + +- ret = FALSE; + max_consoles = 0; + +- res = setttyent (); +- if (res == 0) { +- goto done; +- } +- +- while ((t = getttyent ()) != NULL) { +- if (t->ty_status & TTY_ON && strncmp (t->ty_name, "ttyv", 4) == 0) ++ g.gl_offs = 0; ++ glob ("/dev/ttyv*", GLOB_DOOFFS, NULL, &g); ++ for (i = 0; i < g.gl_pathc && g.gl_pathv[i] != NULL; i++) { ++ int fd; ++ char *cdev; ++ ++ cdev = g.gl_pathv[i]; ++ fd = open (cdev, O_RDONLY | O_NOCTTY); ++ if (fd > -1) { ++ close (fd); + max_consoles++; ++ } else { ++ break; ++ } + } + +- /* Increment one more so that all consoles are properly counted ++ globfree (&g); ++ ++ /* ++ * Increment one more so that all consoles are properly counted + * this is arguable a bug in vt_add_watches(). + */ + max_consoles++; + +- ret = TRUE; +- +- endttyent (); +- +-done: + if (num != NULL) { + *num = max_consoles; + } + +- return ret; ++ return TRUE; + } + + char * +@@ -360,7 +361,12 @@ ck_get_console_device_for_num (guint num + /* The device number is always one less than the VT number. */ + num--; + +- device = g_strdup_printf ("/dev/ttyv%u", num); ++ if (num < 10) ++ device = g_strdup_printf ("/dev/ttyv%i", num); ++ else if (num < 32) ++ device = g_strdup_printf ("/dev/ttyv%c", num - 10 + 'a'); ++ else ++ device = NULL; + + return device; + } +@@ -370,6 +376,7 @@ ck_get_console_num_from_device (const ch + guint *num) + { + guint n; ++ char c; + gboolean ret; + + n = 0; +@@ -379,7 +386,11 @@ ck_get_console_num_from_device (const ch + return FALSE; + } + +- if (sscanf (device, "/dev/ttyv%u", &n) == 1) { ++ if (sscanf (device, "/dev/ttyv%c", &c) == 1) { ++ if (c < 58) ++ n = c - 48; ++ else ++ n = c - 'a' + 10; + /* The VT number is always one more than the device number. */ + n++; + ret = TRUE; +@@ -399,6 +410,7 @@ ck_get_active_console_num (int consol + gboolean ret; + int res; + int active; ++ char ttyn; + + g_assert (console_fd != -1); + +@@ -411,7 +423,12 @@ ck_get_active_console_num (int consol + goto out; + } + +- g_debug ("Active VT is: %d (ttyv%d)", active, active - 1); ++ if (active - 1 < 10) ++ ttyn = active - 1 + '0'; ++ else ++ ttyn = active - 11 + 'a'; ++ ++ g_debug ("Active VT is: %d (ttyv%c)", active, ttyn); + ret = TRUE; + + out: diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c new file mode 100644 index 000000000000..e256e9f366f4 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c @@ -0,0 +1,18 @@ +--- src/ck-sysdeps-unix.c.orig 2008-02-06 22:59:55.000000000 -0500 ++++ src/ck-sysdeps-unix.c 2008-02-06 22:52:34.000000000 -0500 +@@ -172,6 +172,15 @@ ck_get_a_console_fd (void) + + fd = -1; + ++#ifdef __FreeBSD__ ++ /* On FreeBSD, try /dev/consolectl first as this will survive ++ * /etc/ttys initialization. */ ++ fd = open_a_console ("/dev/consolectl"); ++ if (fd >= 0) { ++ goto done; ++ } ++#endif ++ + #ifdef __sun + /* On Solaris, first try Sun VT device. */ + fd = open_a_console ("/dev/vt/active"); diff --git a/sysutils/consolekit/files/patch-src_main.c b/sysutils/consolekit/files/patch-src_main.c new file mode 100644 index 000000000000..a791db0f9149 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_main.c @@ -0,0 +1,33 @@ +--- src/main.c.orig 2007-11-08 15:05:55.000000000 -0500 ++++ src/main.c 2007-11-08 15:07:39.000000000 -0500 +@@ -226,6 +226,21 @@ sigusr1_handler (int sig) + } + + static void ++setup_termination_signals (void) ++{ ++ struct sigaction sa; ++ ++ sa.sa_handler = SIG_DFL; ++ sigemptyset (&sa.sa_mask); ++ sa.sa_flags = 0; ++ ++ sigaction (SIGTERM, &sa, NULL); ++ sigaction (SIGQUIT, &sa, NULL); ++ sigaction (SIGINT, &sa, NULL); ++ sigaction (SIGHUP, &sa, NULL); ++} ++ ++static void + setup_debug_log_signals (void) + { + struct sigaction sa; +@@ -300,6 +315,8 @@ main (int argc, + + setup_debug_log (debug); + ++ setup_termination_signals (); ++ + connection = get_system_bus (); + if (connection == NULL) { + goto out; diff --git a/sysutils/consolekit/files/patch-src_test-vt-monitor.c b/sysutils/consolekit/files/patch-src_test-vt-monitor.c new file mode 100644 index 000000000000..6fb9740f5295 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_test-vt-monitor.c @@ -0,0 +1,33 @@ +--- src/test-vt-monitor.c.orig 2007-08-17 13:08:55.000000000 -0400 ++++ src/test-vt-monitor.c 2007-11-08 15:11:37.000000000 -0500 +@@ -31,6 +31,7 @@ + #include <pwd.h> + #include <string.h> + #include <errno.h> ++#include <signal.h> + + #include <locale.h> + +@@ -55,12 +56,22 @@ main (int argc, char **argv) + GError *error; + guint num; + gboolean res; ++ struct sigaction sa; + + if (! g_thread_supported ()) { + g_thread_init (NULL); + } + g_type_init (); + ++ sa.sa_handler = SIG_DFL; ++ sigemptyset (&sa.sa_mask); ++ sa.sa_flags = 0; ++ ++ sigaction (SIGINT, &sa, NULL); ++ sigaction (SIGTERM, &sa, NULL); ++ sigaction (SIGQUIT, &sa, NULL); ++ sigaction (SIGHUP, &sa, NULL); ++ + if (! ck_is_root_user ()) { + g_warning ("Must be run as root"); + exit (1); diff --git a/sysutils/consolekit/files/patch-tools_Makefile.in b/sysutils/consolekit/files/patch-tools_Makefile.in new file mode 100644 index 000000000000..b818fd9319d0 --- /dev/null +++ b/sysutils/consolekit/files/patch-tools_Makefile.in @@ -0,0 +1,77 @@ +--- tools/Makefile.in.orig 2008-01-31 16:09:08.000000000 -0500 ++++ tools/Makefile.in 2008-01-31 16:10:21.000000000 -0500 +@@ -39,8 +39,7 @@ bin_PROGRAMS = ck-list-sessions$(EXEEXT) + $(am__EXEEXT_1) + sbin_PROGRAMS = ck-log-system-start$(EXEEXT) $(am__EXEEXT_1) + libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \ +- ck-get-x11-server-pid$(EXEEXT) \ +- ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1) ++ $(am__EXEEXT_1) + subdir = tools + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -66,17 +65,6 @@ ck_collect_session_info_OBJECTS = \ + am__DEPENDENCIES_1 = + ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1) +-am_ck_get_x11_display_device_OBJECTS = \ +- ck-get-x11-display-device.$(OBJEXT) $(am__objects_1) +-ck_get_x11_display_device_OBJECTS = \ +- $(am_ck_get_x11_display_device_OBJECTS) +-ck_get_x11_display_device_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1) +-am_ck_get_x11_server_pid_OBJECTS = ck-get-x11-server-pid.$(OBJEXT) \ +- $(am__objects_1) +-ck_get_x11_server_pid_OBJECTS = $(am_ck_get_x11_server_pid_OBJECTS) +-ck_get_x11_server_pid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1) + am_ck_history_OBJECTS = ck-history.$(OBJEXT) $(am__objects_1) + ck_history_OBJECTS = $(am_ck_history_OBJECTS) + ck_history_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -335,24 +323,6 @@ ck_collect_session_info_LDADD = \ + $(top_builddir)/src/libck.la \ + $(NULL) + +-ck_get_x11_server_pid_SOURCES = \ +- ck-get-x11-server-pid.c \ +- $(NULL) +- +-ck_get_x11_server_pid_LDADD = \ +- $(TOOLS_LIBS) \ +- $(top_builddir)/src/libck.la \ +- $(NULL) +- +-ck_get_x11_display_device_SOURCES = \ +- ck-get-x11-display-device.c \ +- $(NULL) +- +-ck_get_x11_display_device_LDADD = \ +- $(TOOLS_LIBS) \ +- $(top_builddir)/src/libck.la \ +- $(NULL) +- + EXTRA_DIST = \ + $(NULL) + +@@ -480,12 +450,6 @@ clean-sbinPROGRAMS: + ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES) + @rm -f ck-collect-session-info$(EXEEXT) + $(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS) +-ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES) +- @rm -f ck-get-x11-display-device$(EXEEXT) +- $(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS) +-ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES) +- @rm -f ck-get-x11-server-pid$(EXEEXT) +- $(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS) + ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES) + @rm -f ck-history$(EXEEXT) + $(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS) +@@ -503,8 +467,6 @@ distclean-compile: + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-collect-session-info.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-display-device.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-server-pid.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-history.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@ diff --git a/sysutils/consolekit/pkg-descr b/sysutils/consolekit/pkg-descr index 31ea86e35301..db13002ab4b7 100644 --- a/sysutils/consolekit/pkg-descr +++ b/sysutils/consolekit/pkg-descr @@ -3,4 +3,4 @@ sessions, and seats. The primary motivations for this framework are to facilitate fast-user-switching and multi-seat capabilities, and to enable more sophisticated policy decisions for desktop sessions. -WWW: http://www.freedesktop.org/Software/hal +WWW: http://www.freedesktop.org/wiki/Software/ConsoleKit diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist index eba97e96bcaf..4b75734214b4 100644 --- a/sysutils/consolekit/pkg-plist +++ b/sysutils/consolekit/pkg-plist @@ -1,7 +1,14 @@ +bin/ck-history +bin/ck-launch-session bin/ck-list-sessions +sbin/ck-log-system-restart +sbin/ck-log-system-start +sbin/ck-log-system-stop etc/ConsoleKit/seats.d/00-primary.seat etc/dbus-1/system.d/ConsoleKit.conf include/ConsoleKit/ck-connector/ck-connector.h +lib/ConsoleKit/scripts/ck-system-restart +lib/ConsoleKit/scripts/ck-system-stop lib/libck-connector.la lib/libck-connector.so lib/libck-connector.so.0 @@ -10,7 +17,20 @@ libexec/ck-collect-session-info libexec/ck-get-x11-display-device libexec/ck-get-x11-server-pid sbin/console-kit-daemon +share/PolicyKit/policy/ConsoleKit.policy +share/dbus-1/system-services/org.freedesktop.ConsoleKit.service +@exec %D/etc/ConsoleKit/run-session.d +@exec mkdir -p %D/lib/ConsoleKit/run-session.d +@dirrm lib/ConsoleKit/scripts +@dirrmtry lib/ConsoleKit/run-session.d +@dirrmtry lib/ConsoleKit @dirrm include/ConsoleKit/ck-connector @dirrm include/ConsoleKit @dirrm etc/ConsoleKit/seats.d +@dirrmtry etc/ConsoleKit/run-session.d @dirrm etc/ConsoleKit +@exec mkdir -p /var/run/ConsoleKit +@exec mkdir -p /var/log/ConsoleKit +@exec touch -f /var/log/ConsoleKit/history +@unexec rm -rf /var/run/ConsoleKit 2>/dev/null || true +@unexec rm -rf /var/log/ConsoleKit 2>/dev/null || true diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile index f580acfc4e59..4767249e1150 100644 --- a/sysutils/eiciel/Makefile +++ b/sysutils/eiciel/Makefile @@ -15,6 +15,8 @@ COMMENT= A GNOME-based ACL editor, with integration into Nautilus LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +BROKEN= Need to be update with new Nautilus 2.22 + USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 USE_GETTEXT= yes diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index aca189afa042..751d7117deb4 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.66 2007/09/18 01:30:46 ahze Exp $ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.68 2008/03/11 03:54:37 mezz Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 PORTEPOCH= 1 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index cbe4c5480452..45fda8d93de9 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconf-editor-2.20.0.tar.bz2) = b686677878b5754ffa8d0a2cc1129988 -SHA256 (gnome2/gconf-editor-2.20.0.tar.bz2) = 10b5043c4152cf5d33b138c516c10708005212ee150ea8dc6c7dc396ac27a79a -SIZE (gnome2/gconf-editor-2.20.0.tar.bz2) = 892603 +MD5 (gnome2/gconf-editor-2.22.0.tar.bz2) = 7ca99aec214dd855b5de7dacc8937055 +SHA256 (gnome2/gconf-editor-2.22.0.tar.bz2) = e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc +SIZE (gnome2/gconf-editor-2.22.0.tar.bz2) = 873868 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 6df1d36571f4..817b8e2afc39 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -17,22 +17,6 @@ share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/sv/gconf-editor.xml share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/uk/gconf-editor.xml -share/omf/gconf-editor/gconf-editor-C.omf -share/omf/gconf-editor/gconf-editor-de.omf -share/omf/gconf-editor/gconf-editor-es.omf -share/omf/gconf-editor/gconf-editor-fr.omf -share/omf/gconf-editor/gconf-editor-it.omf -share/omf/gconf-editor/gconf-editor-oc.omf -share/omf/gconf-editor/gconf-editor-sv.omf -share/omf/gconf-editor/gconf-editor-uk.omf -share/pixmaps/gconf-editor/entry-blank.png -share/pixmaps/gconf-editor/entry-bool.png -share/pixmaps/gconf-editor/entry-list.png -share/pixmaps/gconf-editor/entry-number.png -share/pixmaps/gconf-editor/entry-schema.png -share/pixmaps/gconf-editor/entry-string.png -share/pixmaps/gconf-editor/folder-closed.png -share/pixmaps/gconf-editor/folder-open.png share/icons/hicolor/48x48/apps/gconf-editor.png share/locale/am/LC_MESSAGES/gconf-editor.mo share/locale/ar/LC_MESSAGES/gconf-editor.mo @@ -86,6 +70,7 @@ share/locale/ms/LC_MESSAGES/gconf-editor.mo share/locale/nb/LC_MESSAGES/gconf-editor.mo share/locale/ne/LC_MESSAGES/gconf-editor.mo share/locale/nl/LC_MESSAGES/gconf-editor.mo +share/locale/nn/LC_MESSAGES/gconf-editor.mo share/locale/oc/LC_MESSAGES/gconf-editor.mo share/locale/or/LC_MESSAGES/gconf-editor.mo share/locale/pa/LC_MESSAGES/gconf-editor.mo @@ -113,6 +98,22 @@ share/locale/xh/LC_MESSAGES/gconf-editor.mo share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo +share/omf/gconf-editor/gconf-editor-C.omf +share/omf/gconf-editor/gconf-editor-de.omf +share/omf/gconf-editor/gconf-editor-es.omf +share/omf/gconf-editor/gconf-editor-fr.omf +share/omf/gconf-editor/gconf-editor-it.omf +share/omf/gconf-editor/gconf-editor-oc.omf +share/omf/gconf-editor/gconf-editor-sv.omf +share/omf/gconf-editor/gconf-editor-uk.omf +share/pixmaps/gconf-editor/entry-blank.png +share/pixmaps/gconf-editor/entry-bool.png +share/pixmaps/gconf-editor/entry-list.png +share/pixmaps/gconf-editor/entry-number.png +share/pixmaps/gconf-editor/entry-schema.png +share/pixmaps/gconf-editor/entry-string.png +share/pixmaps/gconf-editor/folder-closed.png +share/pixmaps/gconf-editor/folder-open.png @dirrm share/pixmaps/gconf-editor @dirrm share/omf/gconf-editor @dirrm share/gnome/help/gconf-editor/uk/figures @@ -132,6 +133,7 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo @dirrm share/gnome/help/gconf-editor/C/figures @dirrm share/gnome/help/gconf-editor/C @dirrm share/gnome/help/gconf-editor +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -160,4 +162,3 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 2dc0a9354a1a..7bf9d14fcc39 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,20 +3,22 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.157 2007/10/15 17:48:45 mezz Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.172 2008/03/10 21:50:24 mezz Exp $ # PORTNAME= gnome-control-center -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project -LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier +BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon +RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon USE_BZIP2= yes USE_GETTEXT= yes @@ -35,11 +37,7 @@ CONFIGURE_ARGS= --enable-gstreamer=0.10 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ - apps_gnome_settings_daemon_keybindings.schemas \ - apps_gnome_settings_daemon_screensaver.schemas \ - control-center.schemas \ - desktop_gnome_font_rendering.schemas \ +GCONF_SCHEMAS= control-center.schemas \ fontilus.schemas themus.schemas .if defined(PACKAGE_BUILDING) diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index ddca27e93d27..ee7861862154 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-control-center-2.20.3.tar.bz2) = cd44c6b870d09ea5a049aa11385c97a6 -SHA256 (gnome2/gnome-control-center-2.20.3.tar.bz2) = e3abed47de5f41511af95663d1adb3d35a575dc662b8611e959f2f5d205ab07f -SIZE (gnome2/gnome-control-center-2.20.3.tar.bz2) = 2259976 +MD5 (gnome2/gnome-control-center-2.22.0.tar.bz2) = e6730ac4ee8b14a577978dee6c1cb88f +SHA256 (gnome2/gnome-control-center-2.22.0.tar.bz2) = 13e5cc7181b4c380921984a327ec2f8a48077a4f15319bbe6cf6985f44ff3af0 +SIZE (gnome2/gnome-control-center-2.22.0.tar.bz2) = 2176730 diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c index 5f5eb4bc15a5..ac875d14d9b9 100644 --- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c +++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c @@ -1,15 +1,15 @@ ---- capplets/common/gnome-theme-info.c.orig 2007-08-27 04:09:06.000000000 -0400 -+++ capplets/common/gnome-theme-info.c 2007-09-20 15:24:56.000000000 -0400 -@@ -1845,7 +1845,7 @@ read_cursor_fonts (void) +--- capplets/common/gnome-theme-info.c.orig 2007-10-30 18:58:26.000000000 -0400 ++++ capplets/common/gnome-theme-info.c 2007-11-01 08:43:25.067405773 -0400 +@@ -661,7 +661,7 @@ theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- theme_info->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); +- theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); + theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL); - theme_info->path = g_strdup (theme_info->name); + theme_info->name = g_strdup (theme_info->path); if (!strcmp (theme_info->path, cursor_font)) -@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_ +@@ -1922,7 +1922,7 @@ gnome_vfs_uri_unref (top_theme_dir_uri); /* The weird /usr/share/icons */ @@ -17,4 +17,4 @@ + top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons"); if (!gnome_vfs_uri_exists (top_theme_dir_uri)) gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775); - result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); + add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c deleted file mode 100644 index 2664fcf8ee6b..000000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ /dev/null @@ -1,24 +0,0 @@ ---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig 2007-09-18 05:32:43.000000000 -0400 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c 2007-10-28 13:45:28.000000000 -0400 -@@ -610,8 +610,11 @@ - if ((command != NULL) && (strcmp (command, "") != 0)) - execute (acme, command, FALSE, FALSE); - else -+#if __FreeBSD__ -+ execute (acme, "cdcontrol eject", FALSE, FALSE); -+#else - execute (acme, "eject -T", FALSE, FALSE); -- -+#endif - g_free (command); - } - -@@ -708,7 +711,7 @@ - do_mail_action (acme); - break; - case SLEEP_KEY: -- do_sleep_action ("apm", "xset dpms force off"); -+ do_sleep_action ("zzz", "xset dpms force off"); - break; - case SCREENSAVER_KEY: - if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index f444122a9d09..94006da59a29 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -1,5 +1,4 @@ %%ABOUTME%%bin/gnome-about-me -bin/gnome-accessibility-keyboard-properties bin/gnome-appearance-properties bin/gnome-at-mobility bin/gnome-at-properties @@ -20,8 +19,8 @@ bin/gnome-window-properties bin/themus-theme-applier etc/gnome-vfs-2.0/modules/font-method.conf etc/gnome-vfs-2.0/modules/theme-method.conf +etc/xdg/autostart/gnome-at-session.desktop etc/xdg/menus/gnomecc.menu -include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h lib/gnome-vfs-2.0/modules/libfont-method.a @@ -34,20 +33,17 @@ lib/libgnome-window-settings.a lib/libgnome-window-settings.la lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 -lib/nautilus/extensions-1.0/libnautilus-fontilus.a -lib/nautilus/extensions-1.0/libnautilus-fontilus.la -lib/nautilus/extensions-1.0/libnautilus-fontilus.so -lib/nautilus/extensions-1.0/libnautilus-themus.a -lib/nautilus/extensions-1.0/libnautilus-themus.la -lib/nautilus/extensions-1.0/libnautilus-themus.so +lib/nautilus/extensions-2.0/libnautilus-fontilus.a +lib/nautilus/extensions-2.0/libnautilus-fontilus.la +lib/nautilus/extensions-2.0/libnautilus-fontilus.so +lib/nautilus/extensions-2.0/libnautilus-themus.a +lib/nautilus/extensions-2.0/libnautilus-themus.la +lib/nautilus/extensions-2.0/libnautilus-themus.so lib/window-manager-settings/libmetacity.a lib/window-manager-settings/libmetacity.la lib/window-manager-settings/libmetacity.so libdata/pkgconfig/gnome-keybindings.pc -libdata/pkgconfig/gnome-settings-daemon.pc libdata/pkgconfig/gnome-window-settings-2.0.pc -libexec/gnome-settings-daemon -share/applications/accessibility-keyboard.desktop share/applications/at-properties.desktop share/applications/default-applications.desktop share/applications/display-properties.desktop @@ -63,33 +59,23 @@ share/applications/keybinding.desktop share/applications/keyboard.desktop share/applications/themus-theme-applier.desktop share/applications/window-properties.desktop -share/dbus-1/services/org.gnome.SettingsDaemon.service share/desktop-directories/font-method.directory share/desktop-directories/gnomecc.directory share/desktop-directories/theme-method.directory -%%DATADIR%%/glade/acme.glade %%DATADIR%%/glade/appearance.glade %%DATADIR%%/glade/apply-font.glade %%DATADIR%%/glade/at-enable-dialog.glade %%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade -%%DATADIR%%/glade/gnome-accessibility-keyboard-properties.glade %%DATADIR%%/glade/gnome-default-applications-properties.glade %%DATADIR%%/glade/gnome-keybinding-properties.glade %%DATADIR%%/glade/gnome-keyboard-properties.glade %%DATADIR%%/glade/gnome-mouse-properties.glade %%DATADIR%%/glade/gnome-network-preferences.glade %%DATADIR%%/glade/gnome-window-properties.glade -%%DATADIR%%/glade/modmap-dialog.glade %%DATADIR%%/glade/sound-properties.glade %%DATADIR%%/gnome-default-applications.xml %%DATADIR%%/keybindings/00-multimedia-key.xml %%DATADIR%%/keybindings/01-desktop-key.xml -%%DATADIR%%/pixmaps/accessibility-keyboard-bouncekey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-mousekey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-slowkey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-stickykey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-togglekey.png -%%DATADIR%%/pixmaps/acme-eject.png %%DATADIR%%/pixmaps/at-startup.png %%DATADIR%%/pixmaps/at-support.png %%DATADIR%%/pixmaps/bar-disabled.png @@ -103,16 +89,10 @@ share/desktop-directories/theme-method.directory %%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png %%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png %%DATADIR%%/pixmaps/icon-theme-thumbnailing.png -%%DATADIR%%/pixmaps/keyboard-bell.png -%%DATADIR%%/pixmaps/keyboard-cursor.png -%%DATADIR%%/pixmaps/keyboard-repeat.png -%%DATADIR%%/pixmaps/keyboard-volume.png %%DATADIR%%/pixmaps/mouse-cursor-normal-large.png %%DATADIR%%/pixmaps/mouse-cursor-normal.png %%DATADIR%%/pixmaps/mouse-cursor-white-large.png %%DATADIR%%/pixmaps/mouse-cursor-white.png -%%DATADIR%%/pixmaps/mouse-left.png -%%DATADIR%%/pixmaps/mouse-right.png %%DATADIR%%/pixmaps/ocean-stripes.png %%DATADIR%%/pixmaps/stop.png %%DATADIR%%/pixmaps/subpixel-bgr.png @@ -122,13 +102,6 @@ share/desktop-directories/theme-method.directory %%DATADIR%%/pixmaps/theme-thumbnailing.png %%DATADIR%%/pixmaps/visual-bell.png %%DATADIR%%/pixmaps/window-theme-thumbnailing.png -%%DATADIR%%/xrdb/Editres.ad -%%DATADIR%%/xrdb/Emacs.ad -%%DATADIR%%/xrdb/General.ad -%%DATADIR%%/xrdb/Motif.ad -%%DATADIR%%/xrdb/Tk.ad -%%DATADIR%%/xrdb/Xaw.ad -share/gnome/autostart/gnome-at-session.desktop share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf @@ -151,9 +124,11 @@ share/gnome/help/control-center/ca/control-center.xml share/gnome/help/control-center/en_GB/control-center.xml share/gnome/help/control-center/es/control-center.xml share/gnome/help/control-center/fr/control-center.xml +share/gnome/help/control-center/it/control-center.xml share/gnome/help/control-center/ja/control-center.xml share/gnome/help/control-center/oc/control-center.xml share/gnome/help/control-center/pa/control-center.xml +share/gnome/help/control-center/pl/control-center.xml share/gnome/help/control-center/pt/control-center.xml share/gnome/help/control-center/pt_BR/control-center.xml share/gnome/help/control-center/ru/control-center.xml @@ -173,6 +148,8 @@ share/icons/hicolor/24x24/apps/gnome-sound-properties.png share/icons/hicolor/32x32/apps/gnome-display-properties.png share/icons/hicolor/32x32/apps/gnome-network-preferences.png share/icons/hicolor/32x32/apps/gnome-sound-properties.png +share/icons/hicolor/48x48/apps/gnome-network-preferences.png +share/icons/hicolor/48x48/apps/gnome-sound-properties.png share/icons/hicolor/48x48/apps/typing-monitor.png share/icons/hicolor/scalable/apps/gnome-display-properties.svg share/icons/hicolor/scalable/apps/gnome-network-preferences.svg @@ -181,6 +158,7 @@ share/icons/hicolor/scalable/apps/typing-monitor.svg share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/as/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo @@ -216,6 +194,7 @@ share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo @@ -252,8 +231,6 @@ share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo -share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo -share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo @@ -268,9 +245,11 @@ share/omf/control-center/control-center-ca.omf share/omf/control-center/control-center-en_GB.omf share/omf/control-center/control-center-es.omf share/omf/control-center/control-center-fr.omf +share/omf/control-center/control-center-it.omf share/omf/control-center/control-center-ja.omf share/omf/control-center/control-center-oc.omf share/omf/control-center/control-center-pa.omf +share/omf/control-center/control-center-pl.omf share/omf/control-center/control-center-pt.omf share/omf/control-center/control-center-pt_BR.omf share/omf/control-center/control-center-ru.omf @@ -286,9 +265,11 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/help/control-center/ru @dirrm share/gnome/help/control-center/pt_BR @dirrm share/gnome/help/control-center/pt +@dirrm share/gnome/help/control-center/pl @dirrm share/gnome/help/control-center/pa @dirrm share/gnome/help/control-center/oc @dirrm share/gnome/help/control-center/ja +@dirrm share/gnome/help/control-center/it @dirrm share/gnome/help/control-center/fr @dirrm share/gnome/help/control-center/es @dirrm share/gnome/help/control-center/en_GB @@ -296,14 +277,13 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @dirrm share/gnome/cursor-fonts -@dirrm %%DATADIR%%/xrdb @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/glade @dirrmtry share/desktop-directories +@dirrmtry share/applications @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 -@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon -@dirrm include/gnome-settings-daemon-2.0 +@dirrmtry etc/xdg/autostart @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @@ -314,8 +294,6 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh -@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES -@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/si/LC_MESSAGES @@ -338,4 +316,5 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile new file mode 100644 index 000000000000..ce19c001c76c --- /dev/null +++ b/sysutils/gnome-device-manager/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: gnome-device-manager +# Date Created: 08 January 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/gnome-device-manager/Makefile,v 1.1 2008/01/08 06:47:29 marcus Exp $ +# + +PORTNAME= gnome-device-manager +PORTVERSION= 0.2 +CATEGORIES= sysutils +MASTER_SITES= http://hal.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= HAL device manager for the GNOME Desktop + +LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnometarget intlhack ltverhack libgnomeui +USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes +USE_LDCONFIG= yes +INSTALLS_OMF= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/sysutils/gnome-device-manager/distinfo b/sysutils/gnome-device-manager/distinfo new file mode 100644 index 000000000000..631e741d3631 --- /dev/null +++ b/sysutils/gnome-device-manager/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome-device-manager-0.2.tar.bz2) = b833a90c940dd6cc992c42ad05ca6831 +SHA256 (gnome-device-manager-0.2.tar.bz2) = fecb3bf79c3f10bebf0601c044344b0105738c1533f5da62f27dc84d0a3b30d3 +SIZE (gnome-device-manager-0.2.tar.bz2) = 426804 diff --git a/sysutils/gnome-device-manager/pkg-descr b/sysutils/gnome-device-manager/pkg-descr new file mode 100644 index 000000000000..f6664a36d554 --- /dev/null +++ b/sysutils/gnome-device-manager/pkg-descr @@ -0,0 +1,6 @@ +This is a GNOME program to manage devices and device drivers. It's +inspired by hal-device-manager, from the HAL project, but rewritten in +C for efficiency and an outlook to actually make it manage devices +rather than just show information. + +WWW: http://www.freedesktop.org/Software/hal diff --git a/sysutils/gnome-device-manager/pkg-plist b/sysutils/gnome-device-manager/pkg-plist new file mode 100644 index 000000000000..c06d8f88a636 --- /dev/null +++ b/sysutils/gnome-device-manager/pkg-plist @@ -0,0 +1,24 @@ +bin/gnome-device-manager +include/gnome-device-manager/gdm-device.h +include/gnome-device-manager/gdm-info-provider-iface.h +include/gnome-device-manager/gdm-info-provider.h +include/gnome-device-manager/gdm-pool.h +lib/libgnome-device-manager.a +lib/libgnome-device-manager.la +lib/libgnome-device-manager.so +lib/libgnome-device-manager.so.0 +libdata/pkgconfig/gnome-device-manager.pc +share/applications/gnome-device-manager.desktop +share/gnome/help/gnome-device-manager/C/figures/gnome-device-manager.png +share/gnome/help/gnome-device-manager/C/gnome-device-manager.xml +share/gnome/help/gnome-device-manager/C/legal.xml +share/icons/hicolor/48x48/apps/gnome-device-manager-device-pci.png +share/icons/hicolor/48x48/apps/gnome-device-manager-device-usb-interface.png +share/icons/hicolor/48x48/apps/gnome-device-manager-device-usb.png +share/icons/hicolor/48x48/apps/gnome-device-manager.png +share/omf/gnome-device-manager/gnome-device-manager-C.omf +@dirrm share/omf/gnome-device-manager +@dirrm share/gnome/help/gnome-device-manager/C/figures +@dirrm share/gnome/help/gnome-device-manager/C +@dirrm share/gnome/help/gnome-device-manager +@dirrm include/gnome-device-manager diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile index da19f96cf641..d317e5763ff1 100644 --- a/sysutils/gnome-mount/Makefile +++ b/sysutils/gnome-mount/Makefile @@ -3,35 +3,35 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.16 2007/05/19 21:36:22 marcus Exp $ +# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.24 2008/02/04 23:18:46 mezz Exp $ # PORTNAME= gnome-mount -PORTVERSION= 0.6 -PORTREVISION= 4 +PORTVERSION= 0.7 +PORTREVISION= 5 CATEGORIES= sysutils gnome -MASTER_SITES= http://people.freedesktop.org/~david/dist/ +MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= A front-end to mount, umount, and eject using HAL LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ - notify.1:${PORTSDIR}/devel/libnotify + notify.1:${PORTSDIR}/devel/libnotify \ + gnome-keyring:${PORTSDIR}/security/gnome-keyring +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome USE_XLIB= yes -USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtk20 USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-nautilus-extension +CONFIGURE_ARGS= --disable-nautilus-extension CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gnome-mount.schemas MAN1= gnome-mount.1 - -post-patch: - @${REINPLACE_CMD} -e 's|0.5.8.1|0.5.8|g' \ - ${WRKSRC}/configure +MLINKS= gnome-mount.1 gnome-eject.1 \ + gnome-mount.1 gnome-umount.1 .include <bsd.port.mk> diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo index 94f471d4a73f..648224657e9e 100644 --- a/sysutils/gnome-mount/distinfo +++ b/sysutils/gnome-mount/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-mount-0.6.tar.gz) = d2612aecfa73806e072316033d78b203 -SHA256 (gnome-mount-0.6.tar.gz) = 4169840c49135a58dff6b99445492b74bc751dbb19c9133568ecfbcbf3219cad -SIZE (gnome-mount-0.6.tar.gz) = 466656 +MD5 (gnome-mount-0.7.tar.gz) = 6a2f14925376c2c494df89cbfbdb2ca5 +SHA256 (gnome-mount-0.7.tar.gz) = 009c8a920e40f414936bf2ad3a883e1c3fdcf0af8f736c8e840167406f737608 +SIZE (gnome-mount-0.7.tar.gz) = 484021 diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist index 1586c42b826c..d35d0b048a2c 100644 --- a/sysutils/gnome-mount/pkg-plist +++ b/sysutils/gnome-mount/pkg-plist @@ -1,13 +1,11 @@ bin/gnome-eject bin/gnome-mount bin/gnome-umount -lib/nautilus/extensions-1.0/libgnome-mount.a -lib/nautilus/extensions-1.0/libgnome-mount.la -lib/nautilus/extensions-1.0/libgnome-mount.so libdata/pkgconfig/gnome-mount.pc share/gnome-mount/gnome-mount-properties.glade share/locale/ar/LC_MESSAGES/gnome-mount.mo share/locale/be/LC_MESSAGES/gnome-mount.mo +share/locale/be@latin/LC_MESSAGES/gnome-mount.mo share/locale/ca/LC_MESSAGES/gnome-mount.mo share/locale/da/LC_MESSAGES/gnome-mount.mo share/locale/dz/LC_MESSAGES/gnome-mount.mo @@ -18,12 +16,19 @@ share/locale/fr/LC_MESSAGES/gnome-mount.mo share/locale/hu/LC_MESSAGES/gnome-mount.mo share/locale/it/LC_MESSAGES/gnome-mount.mo share/locale/ja/LC_MESSAGES/gnome-mount.mo +share/locale/lv/LC_MESSAGES/gnome-mount.mo share/locale/mk/LC_MESSAGES/gnome-mount.mo share/locale/nb/LC_MESSAGES/gnome-mount.mo +share/locale/oc/LC_MESSAGES/gnome-mount.mo +share/locale/pl/LC_MESSAGES/gnome-mount.mo share/locale/pt_BR/LC_MESSAGES/gnome-mount.mo share/locale/ru/LC_MESSAGES/gnome-mount.mo share/locale/sv/LC_MESSAGES/gnome-mount.mo share/locale/vi/LC_MESSAGES/gnome-mount.mo @dirrm share/gnome-mount +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index f86c1d6f2ea5..72c5dd95e50d 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/gnome-power-manager/Makefile,v 1.1 2007/12/02 00:33:17 mezz Exp $ +# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.40 2008/03/10 22:50:08 ahze Exp $ # PORTNAME= gnome-power-manager -PORTVERSION= 2.20.2 +PORTVERSION= 2.22.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo index 4b51dbe27140..8a732edc97a3 100644 --- a/sysutils/gnome-power-manager/distinfo +++ b/sysutils/gnome-power-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 8a38e3a169b80c44639f4383a64835d0 -SHA256 (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 60c9f8e6893123d1837f3cd1fcf834e66bc6f69b9efea5e590b1a9a97e1850c2 -SIZE (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 3020529 +MD5 (gnome2/gnome-power-manager-2.22.0.tar.bz2) = 43c76a13a803a5c034f310bb20f91ff4 +SHA256 (gnome2/gnome-power-manager-2.22.0.tar.bz2) = a28500e52844286ef85f7fc773151be62c9cf6ce10ad51eceec99aa57304e70b +SIZE (gnome2/gnome-power-manager-2.22.0.tar.bz2) = 2999358 diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist index 9dba9e121c02..6e72d046a507 100644 --- a/sysutils/gnome-power-manager/pkg-plist +++ b/sysutils/gnome-power-manager/pkg-plist @@ -1,5 +1,3 @@ -bin/gnome-brightness-applet -bin/gnome-inhibit-applet bin/gnome-power-bugreport.sh bin/gnome-power-cmd.sh bin/gnome-power-manager @@ -7,6 +5,8 @@ bin/gnome-power-preferences bin/gnome-power-statistics libdata/bonobo/servers/GNOME_BrightnessApplet.server libdata/bonobo/servers/GNOME_InhibitApplet.server +libexec/gnome-brightness-applet +libexec/gnome-inhibit-applet share/applications/gnome-power-preferences.desktop share/applications/gnome-power-statistics.desktop share/dbus-1/services/gnome-power-manager.service @@ -439,6 +439,8 @@ share/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg share/icons/hicolor/scalable/apps/gnome-power-manager.svg share/icons/hicolor/scalable/apps/gnome-power-statistics.svg share/locale/ar/LC_MESSAGES/gnome-power-manager.mo +share/locale/as/LC_MESSAGES/gnome-power-manager.mo +share/locale/be@latin/LC_MESSAGES/gnome-power-manager.mo share/locale/bg/LC_MESSAGES/gnome-power-manager.mo share/locale/bn/LC_MESSAGES/gnome-power-manager.mo share/locale/bn_IN/LC_MESSAGES/gnome-power-manager.mo @@ -457,6 +459,7 @@ share/locale/eu/LC_MESSAGES/gnome-power-manager.mo share/locale/fa/LC_MESSAGES/gnome-power-manager.mo share/locale/fi/LC_MESSAGES/gnome-power-manager.mo share/locale/fr/LC_MESSAGES/gnome-power-manager.mo +share/locale/ga/LC_MESSAGES/gnome-power-manager.mo share/locale/gl/LC_MESSAGES/gnome-power-manager.mo share/locale/gu/LC_MESSAGES/gnome-power-manager.mo share/locale/he/LC_MESSAGES/gnome-power-manager.mo @@ -466,6 +469,7 @@ share/locale/id/LC_MESSAGES/gnome-power-manager.mo share/locale/it/LC_MESSAGES/gnome-power-manager.mo share/locale/ja/LC_MESSAGES/gnome-power-manager.mo share/locale/ka/LC_MESSAGES/gnome-power-manager.mo +share/locale/kn/LC_MESSAGES/gnome-power-manager.mo share/locale/ko/LC_MESSAGES/gnome-power-manager.mo share/locale/ku/LC_MESSAGES/gnome-power-manager.mo share/locale/lt/LC_MESSAGES/gnome-power-manager.mo @@ -473,8 +477,10 @@ share/locale/lv/LC_MESSAGES/gnome-power-manager.mo share/locale/mg/LC_MESSAGES/gnome-power-manager.mo share/locale/mk/LC_MESSAGES/gnome-power-manager.mo share/locale/ml/LC_MESSAGES/gnome-power-manager.mo +share/locale/mr/LC_MESSAGES/gnome-power-manager.mo share/locale/nb/LC_MESSAGES/gnome-power-manager.mo share/locale/nl/LC_MESSAGES/gnome-power-manager.mo +share/locale/nn/LC_MESSAGES/gnome-power-manager.mo share/locale/oc/LC_MESSAGES/gnome-power-manager.mo share/locale/or/LC_MESSAGES/gnome-power-manager.mo share/locale/pa/LC_MESSAGES/gnome-power-manager.mo @@ -491,6 +497,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-power-manager.mo share/locale/sv/LC_MESSAGES/gnome-power-manager.mo share/locale/ta/LC_MESSAGES/gnome-power-manager.mo share/locale/th/LC_MESSAGES/gnome-power-manager.mo +share/locale/tr/LC_MESSAGES/gnome-power-manager.mo share/locale/uk/LC_MESSAGES/gnome-power-manager.mo share/locale/vi/LC_MESSAGES/gnome-power-manager.mo share/locale/zh_CN/LC_MESSAGES/gnome-power-manager.mo @@ -546,12 +553,15 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -560,4 +570,7 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile new file mode 100644 index 000000000000..c1c432debab2 --- /dev/null +++ b/sysutils/gnome-settings-daemon/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: gnome-settings-daemon +# Date created: 14 Jan 2008 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.16 2008/03/14 06:19:50 mezz Exp $ +# + +PORTNAME= gnome-settings-daemon +PORTVERSION= 2.22.0 +CATEGORIES= sysutils gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME 2 settings daemon + +USE_XORG= xxf86misc +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd +USE_GETTEXT= yes +USE_GSTREAMER= good +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-gstreamer=0.10 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= apps_gnome_settings_daemon_keybindings.schemas \ + apps_gnome_settings_daemon_screensaver.schemas \ + desktop_gnome_font_rendering.schemas \ + gnome-settings-daemon.schemas + +.include <bsd.port.mk> diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo new file mode 100644 index 000000000000..677f21c818b0 --- /dev/null +++ b/sysutils/gnome-settings-daemon/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome-settings-daemon-2.22.0.tar.bz2) = 5bb2b129342e3149c00892aa18926317 +SHA256 (gnome-settings-daemon-2.22.0.tar.bz2) = 265cc72958fd8ad66f7a7e2f98968bf74018c1391b5d8abb38ea1c6120c6aea5 +SIZE (gnome-settings-daemon-2.22.0.tar.bz2) = 1192937 diff --git a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c new file mode 100644 index 000000000000..6fce0da1831a --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c @@ -0,0 +1,10 @@ +--- plugins/typing-break/gsd-typing-break-manager.c.orig 2008-01-14 01:20:09.000000000 +0100 ++++ plugins/typing-break/gsd-typing-break-manager.c 2008-01-14 01:20:37.000000000 +0100 +@@ -27,6 +27,7 @@ + #include <unistd.h> + #include <string.h> + #include <errno.h> ++#include <sys/signal.h> + + #include <locale.h> + diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c new file mode 100644 index 000000000000..1db1bb16efe8 --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c @@ -0,0 +1,26 @@ +--- plugins/media-keys/gsd-media-keys-manager.c.orig 2008-01-29 15:58:30.000000000 -0600 ++++ plugins/media-keys/gsd-media-keys-manager.c 2008-01-29 16:00:55.000000000 -0600 +@@ -667,7 +667,11 @@ + if ((command != NULL) && (strcmp (command, "") != 0)) { + execute (manager, command, FALSE, FALSE); + } else { ++#if __FreeBSD__ ++ execute (manager, "cdcontrol eject", FALSE, FALSE); ++#else + execute (manager, "eject -T", FALSE, FALSE); ++#endif + } + + g_free (command); +@@ -869,7 +873,11 @@ + do_mail_action (manager); + break; + case SLEEP_KEY: ++#if __FreeBSD__ ++ do_sleep_action ("zzz", "xset dpms force off"); ++#else + do_sleep_action ("apm", "xset dpms force off"); ++#endif + break; + case SCREENSAVER_KEY: + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) { diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr new file mode 100644 index 000000000000..42b586789ffe --- /dev/null +++ b/sysutils/gnome-settings-daemon/pkg-descr @@ -0,0 +1 @@ +GNOME 2 settings daemon. diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist new file mode 100644 index 000000000000..5b7ee38e5a94 --- /dev/null +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -0,0 +1,187 @@ +include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h +lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/liba11y-keyboard.a +lib/gnome-settings-daemon-2.0/liba11y-keyboard.la +lib/gnome-settings-daemon-2.0/liba11y-keyboard.so +lib/gnome-settings-daemon-2.0/libbackground.a +lib/gnome-settings-daemon-2.0/libbackground.la +lib/gnome-settings-daemon-2.0/libbackground.so +lib/gnome-settings-daemon-2.0/libclipboard.a +lib/gnome-settings-daemon-2.0/libclipboard.la +lib/gnome-settings-daemon-2.0/libclipboard.so +lib/gnome-settings-daemon-2.0/libdummy.a +lib/gnome-settings-daemon-2.0/libdummy.la +lib/gnome-settings-daemon-2.0/libdummy.so +lib/gnome-settings-daemon-2.0/libfont.a +lib/gnome-settings-daemon-2.0/libfont.la +lib/gnome-settings-daemon-2.0/libfont.so +lib/gnome-settings-daemon-2.0/libkeybindings.a +lib/gnome-settings-daemon-2.0/libkeybindings.la +lib/gnome-settings-daemon-2.0/libkeybindings.so +lib/gnome-settings-daemon-2.0/libkeyboard.a +lib/gnome-settings-daemon-2.0/libkeyboard.la +lib/gnome-settings-daemon-2.0/libkeyboard.so +lib/gnome-settings-daemon-2.0/libmedia-keys.a +lib/gnome-settings-daemon-2.0/libmedia-keys.la +lib/gnome-settings-daemon-2.0/libmedia-keys.so +lib/gnome-settings-daemon-2.0/libmouse.a +lib/gnome-settings-daemon-2.0/libmouse.la +lib/gnome-settings-daemon-2.0/libmouse.so +lib/gnome-settings-daemon-2.0/libscreensaver.a +lib/gnome-settings-daemon-2.0/libscreensaver.la +lib/gnome-settings-daemon-2.0/libscreensaver.so +lib/gnome-settings-daemon-2.0/libsound.a +lib/gnome-settings-daemon-2.0/libsound.la +lib/gnome-settings-daemon-2.0/libsound.so +lib/gnome-settings-daemon-2.0/libtyping-break.a +lib/gnome-settings-daemon-2.0/libtyping-break.la +lib/gnome-settings-daemon-2.0/libtyping-break.so +lib/gnome-settings-daemon-2.0/libxrandr.a +lib/gnome-settings-daemon-2.0/libxrandr.la +lib/gnome-settings-daemon-2.0/libxrandr.so +lib/gnome-settings-daemon-2.0/libxrdb.a +lib/gnome-settings-daemon-2.0/libxrdb.la +lib/gnome-settings-daemon-2.0/libxrdb.so +lib/gnome-settings-daemon-2.0/libxsettings.a +lib/gnome-settings-daemon-2.0/libxsettings.la +lib/gnome-settings-daemon-2.0/libxsettings.so +lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/screensaver.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin +libdata/pkgconfig/gnome-settings-daemon.pc +libexec/gnome-settings-daemon +share/dbus-1/services/org.gnome.SettingsDaemon.service +%%DATADIR%%/acme-eject.png +%%DATADIR%%/acme.glade +%%DATADIR%%/modmap-dialog.glade +%%DATADIR%%/xrdb/Editres.ad +%%DATADIR%%/xrdb/Emacs.ad +%%DATADIR%%/xrdb/General.ad +%%DATADIR%%/xrdb/Motif.ad +%%DATADIR%%/xrdb/Tk.ad +%%DATADIR%%/xrdb/Xaw.ad +share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/et/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/fa/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/hr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/hu/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/id/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nso/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/oc/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/or/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pa/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pl/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pt/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pt_BR/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ro/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ru/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/rw/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/si/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/sk/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/sl/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/sq/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/sr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/sr@Latn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/sv/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ta/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/te/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/th/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/tr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/uk/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/vi/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/wa/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/xh/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo +@dirrm %%DATADIR%%/xrdb +@dirrm %%DATADIR%% +@dirrm lib/gnome-settings-daemon-2.0 +@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon +@dirrm include/gnome-settings-daemon-2.0 +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 5bb1ec109e92..fbb8efd729fc 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.109 2007/10/15 21:02:38 mezz Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.117 2008/03/10 22:04:22 mezz Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.20.2 +PORTVERSION= 2.22.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,7 +18,6 @@ COMMENT= GNOME 2 system monitor program BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - pcre.0:${PORTSDIR}/devel/pcre \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme @@ -28,7 +26,8 @@ USE_GETTEXT= yes USE_XLIB= yes INSTALLS_OMF= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils +USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \ + librsvg2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pcrecpp CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 7e3b1ee00341..d8b8f50d4c69 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.20.2.tar.bz2) = d5e52f923b0b725b3a49e4bb7a296436 -SHA256 (gnome2/gnome-system-monitor-2.20.2.tar.bz2) = 2829da0e37a0758b949d4a59ab22e71b6372b9e3cc6bb907aa95e2d375ccbedc -SIZE (gnome2/gnome-system-monitor-2.20.2.tar.bz2) = 1827859 +MD5 (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = 7b809a4db72902ca5f47a63f62917d14 +SHA256 (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = a2e6b6c185063fc43e6d6293a64cd3fa6f32be58b682bc58e5913c94aa3cd1e2 +SIZE (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = 1935178 diff --git a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp new file mode 100644 index 000000000000..e57a2170425e --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp @@ -0,0 +1,11 @@ +--- src/load-graph.cpp.orig 2008-01-14 23:43:43.000000000 -0600 ++++ src/load-graph.cpp 2008-01-14 23:44:15.000000000 -0600 +@@ -501,7 +501,7 @@ + // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10) + // where base10 = 1, coef10 = 101, pow2 = 16 + +- unsigned pow2 = std::floor(log2(new_max)); ++ unsigned pow2 = std::floor(log(new_max) / log(2)); + unsigned base10 = pow2 / 10; + unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10))); + g_assert(new_max <= (coef10 * (1UL << (base10 * 10)))); diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index f099100907d6..4ed8d93f72d6 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -117,6 +117,7 @@ share/locale/am/LC_MESSAGES/gnome-system-monitor.mo share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo share/locale/az/LC_MESSAGES/gnome-system-monitor.mo share/locale/be/LC_MESSAGES/gnome-system-monitor.mo +share/locale/be@latin/LC_MESSAGES/gnome-system-monitor.mo share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo @@ -147,6 +148,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo share/locale/it/LC_MESSAGES/gnome-system-monitor.mo share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo +share/locale/kn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo share/locale/li/LC_MESSAGES/gnome-system-monitor.mo @@ -196,7 +198,9 @@ share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf share/omf/gnome-system-monitor/gnome-system-monitor-pa.omf share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf +share/pixmaps/gnome-system-monitor/download.svg share/pixmaps/gnome-system-monitor/side.png +share/pixmaps/gnome-system-monitor/upload.svg @dirrm share/pixmaps/gnome-system-monitor @dirrm share/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/sv/figures @@ -216,6 +220,7 @@ share/pixmaps/gnome-system-monitor/side.png @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C @dirrm share/gnome/help/gnome-system-monitor +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/ug/LC_MESSAGES @@ -238,4 +243,5 @@ share/pixmaps/gnome-system-monitor/side.png @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 81bf196e48b3..2182de4117a4 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,21 +3,19 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.68 2007/09/16 16:56:43 ahze Exp $ +# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.78 2008/03/09 18:58:47 mezz Exp $ # PORTNAME= gnome-system-tools -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= gnome-system-tools-${PORTVERSION} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Tools to configure workstations -LIB_DEPENDS= oobs-1.3:${PORTSDIR}/devel/liboobs +LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs USE_BZIP2= yes USE_GMAKE= yes diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 1317b19b6e8d..c56c52fb6457 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 382ed1f5ad4cb6ce7b88985611e2be18 -SHA256 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 5635b305322ee4d1e2dddd3a9b9f4b29f195663f4c51e77428f81f6bbd325581 -SIZE (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 3226583 +MD5 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 6559bb97fc75bc28b559dc530571d527 +SHA256 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 57c348458efdf34118bc46102e2389cf32172f22e3429bb959a81a773ade56b9 +SIZE (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 3441541 diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure deleted file mode 100644 index 303edc2c5532..000000000000 --- a/sysutils/gnome-system-tools/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2007-12-22 22:34:20.000000000 -0600 -+++ configure 2007-12-22 22:34:43.000000000 -0600 -@@ -25180,7 +25180,7 @@ - GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS" - - GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS" --GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common" -+GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS" - - GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in" - GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in" diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index 95534a249571..3d2ede7481a5 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -3,24 +3,22 @@ bin/services-admin bin/shares-admin bin/time-admin bin/users-admin -lib/nautilus/extensions-1.0/libnautilus-gst-shares.a -lib/nautilus/extensions-1.0/libnautilus-gst-shares.la -lib/nautilus/extensions-1.0/libnautilus-gst-shares.so +lib/nautilus/extensions-2.0/libnautilus-gst-shares.a +lib/nautilus/extensions-2.0/libnautilus-gst-shares.la +lib/nautilus/extensions-2.0/libnautilus-gst-shares.so libdata/pkgconfig/gnome-system-tools.pc share/applications/network.desktop share/applications/services.desktop share/applications/shares.desktop share/applications/time.desktop share/applications/users.desktop -%%DATADIR%%/interfaces/boot.glade -%%DATADIR%%/interfaces/common.glade -%%DATADIR%%/interfaces/disks.glade -%%DATADIR%%/interfaces/network.glade -%%DATADIR%%/interfaces/services.glade -%%DATADIR%%/interfaces/shares.glade -%%DATADIR%%/interfaces/time.glade -%%DATADIR%%/interfaces/users.glade %%DATADIR%%/pixmaps/world_map-960.png +%%DATADIR%%/ui/common.ui +%%DATADIR%%/ui/network.ui +%%DATADIR%%/ui/services.ui +%%DATADIR%%/ui/shares.ui +%%DATADIR%%/ui/time.ui +%%DATADIR%%/ui/users.ui 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 @@ -39,6 +37,8 @@ share/gnome/help/services-admin/C/legal.xml share/gnome/help/services-admin/C/services-admin.xml share/gnome/help/services-admin/ca/figures/services-tool.png share/gnome/help/services-admin/ca/services-admin.xml +share/gnome/help/services-admin/el/figures/services-tool.png +share/gnome/help/services-admin/el/services-admin.xml 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/figures/services-tool.png @@ -87,7 +87,7 @@ 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/nl/figures/time-map.png share/gnome/help/time-admin/nl/figures/time-servers.png -share/gnome/help/time-admin/nl/figures/time-tool.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/figures/time-map.png @@ -110,6 +110,8 @@ share/gnome/help/users-admin/C/legal.xml share/gnome/help/users-admin/C/users-admin.xml share/gnome/help/users-admin/ca/figures/users-tool.png share/gnome/help/users-admin/ca/users-admin.xml +share/gnome/help/users-admin/el/figures/users-tool.png +share/gnome/help/users-admin/el/users-admin.xml 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/figures/users-tool.png @@ -120,8 +122,14 @@ 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/figures/users-tool.png share/gnome/help/users-admin/sv/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/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo share/locale/az/LC_MESSAGES/gnome-system-tools.mo @@ -164,6 +172,7 @@ 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/ne/LC_MESSAGES/gnome-system-tools.mo @@ -180,6 +189,7 @@ 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@Latn/LC_MESSAGES/gnome-system-tools.mo @@ -204,6 +214,7 @@ share/omf/network-admin/network-admin-oc.omf share/omf/network-admin/network-admin-sv.omf share/omf/services-admin/services-admin-C.omf share/omf/services-admin/services-admin-ca.omf +share/omf/services-admin/services-admin-el.omf share/omf/services-admin/services-admin-es.omf share/omf/services-admin/services-admin-fr.omf share/omf/services-admin/services-admin-oc.omf @@ -223,6 +234,7 @@ share/omf/time-admin/time-admin-ru.omf share/omf/time-admin/time-admin-sv.omf share/omf/users-admin/users-admin-C.omf share/omf/users-admin/users-admin-ca.omf +share/omf/users-admin/users-admin-el.omf share/omf/users-admin/users-admin-es.omf share/omf/users-admin/users-admin-fr.omf share/omf/users-admin/users-admin-oc.omf @@ -244,6 +256,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/users-admin/fr @dirrm share/gnome/help/users-admin/es/figures @dirrm share/gnome/help/users-admin/es +@dirrm share/gnome/help/users-admin/el/figures +@dirrm share/gnome/help/users-admin/el @dirrm share/gnome/help/users-admin/ca/figures @dirrm share/gnome/help/users-admin/ca @dirrm share/gnome/help/users-admin/C/figures @@ -289,6 +303,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/services-admin/fr @dirrm share/gnome/help/services-admin/es/figures @dirrm share/gnome/help/services-admin/es +@dirrm share/gnome/help/services-admin/el/figures +@dirrm share/gnome/help/services-admin/el @dirrm share/gnome/help/services-admin/ca/figures @dirrm share/gnome/help/services-admin/ca @dirrm share/gnome/help/services-admin/C/figures @@ -307,9 +323,10 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/network-admin/C/figures @dirrm share/gnome/help/network-admin/C @dirrm share/gnome/help/network-admin +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/pixmaps -@dirrm %%DATADIR%%/interfaces @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -320,6 +337,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -330,4 +349,3 @@ share/omf/users-admin/users-admin-sv.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile index e291787b154b..4f2b92b07892 100644 --- a/sysutils/gnome-volume-manager/Makefile +++ b/sysutils/gnome-volume-manager/Makefile @@ -3,12 +3,12 @@ # Whom: Jean-Yves Lefort <jylefort@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.19 2007/10/17 04:15:23 marcus Exp $ +# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.24 2008/03/15 16:48:05 marcus Exp $ # PORTNAME= gnome-volume-manager -PORTVERSION= 2.17.0 -PORTREVISION= 8 +PORTVERSION= 2.22.1 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo index a3b7541f3610..29774bf19e52 100644 --- a/sysutils/gnome-volume-manager/distinfo +++ b/sysutils/gnome-volume-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-volume-manager-2.17.0.tar.bz2) = 104cec26e721e0bba69debd392367195 -SHA256 (gnome-volume-manager-2.17.0.tar.bz2) = 5517cf5d6a70227d66afb9a8b97a704f0d8e29098cec98bcbf68da77133537a9 -SIZE (gnome-volume-manager-2.17.0.tar.bz2) = 341241 +MD5 (gnome-volume-manager-2.22.1.tar.bz2) = a0cb86f541515f33443c848879d04785 +SHA256 (gnome-volume-manager-2.22.1.tar.bz2) = 8305428940e3aab9a7c6ccaa283489170d8de96b873695b541c8a7daacd2d591 +SIZE (gnome-volume-manager-2.22.1.tar.bz2) = 361668 diff --git a/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling b/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling new file mode 100644 index 000000000000..9abff24dcd15 --- /dev/null +++ b/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling @@ -0,0 +1,1460 @@ +# Description: Disable media handling and the respective UI tabs, since nautilus does that now. +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=509823 +--- gnome-volume-manager-2.22.1/gnome-volume-manager.schemas.in 2007-12-07 18:55:47.000000000 +0100 ++++ gnome-volume-manager.schemas.in 2008-02-29 16:30:08.000000000 +0100 +@@ -16,7 +16,7 @@ + <key>/schemas/desktop/gnome/volume_manager/automount_drives</key> + <applyto>/desktop/gnome/volume_manager/automount_drives</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Automount removable drives</short> + <long>Whether gnome-volume-manager should automatically mount +@@ -28,7 +28,7 @@ + <key>/schemas/desktop/gnome/volume_manager/automount_media</key> + <applyto>/desktop/gnome/volume_manager/automount_media</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Automount removable media</short> + <long>Whether gnome-volume-manager should automatically mount +@@ -40,7 +40,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autobrowse</key> + <applyto>/desktop/gnome/volume_manager/autobrowse</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Autorun nautilus</short> + <long>Open nautilus on removeable media insert.</long> +@@ -97,7 +97,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoplay_cda</key> + <applyto>/desktop/gnome/volume_manager/autoplay_cda</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Play inserted audio CD's</short> + <long>Whether, when an audio CD is inserted, gnome-volume-manager +@@ -154,7 +154,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd</key> + <applyto>/desktop/gnome/volume_manager/autoplay_dvd</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Play inserted video DVDs</short> + <long>Whether, when a video DVD is inserted, +@@ -177,7 +177,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoplay_vcd</key> + <applyto>/desktop/gnome/volume_manager/autoplay_vcd</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Play inserted video VCDs</short> + <long>Whether, when a video VCD is inserted, +@@ -248,7 +248,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoprinter</key> + <applyto>/desktop/gnome/volume_manager/autoprinter</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Run printer program</short> + <long>Whether, when a printer is connected, gnome-volume-manager should run +diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/gnome-volume-properties.glade gnome-volume-manager-2.22.1.new/gnome-volume-properties.glade +--- gnome-volume-manager-2.22.1/gnome-volume-properties.glade 2007-12-07 18:55:47.000000000 +0100 ++++ gnome-volume-properties.glade 2008-02-29 16:30:08.000000000 +0100 +@@ -68,1197 +68,6 @@ + <property name="enable_popup">False</property> + + <child> +- <widget class="GtkVBox" id="storage_vbox"> +- <property name="border_width">12</property> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">18</property> +- +- <child> +- <widget class="GtkVBox" id="removable_drives_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="removable_drives_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Removable Storage</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="removable_drives_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="removable_drives_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="removable_drives_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="automount_drives"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">_Mount removable drives when hot-plugged</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="automount_media"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Mount removable media when _inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="autobrowse"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Browse _removable media when inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="autorun"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">_Auto-run programs on new drives and media</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="autoopen"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Auto-_open files on new drives and media</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="blank_cd_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="blank_cd_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Blank CD and DVD Discs</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="blank_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="blank_cd_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="blank_cd_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoburn"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">_Burn a CD or DVD when a blank disc is inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="autoburn_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkHBox" id="hbox73"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label32"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoburn_audio_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="label35"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Command for A_udio CDs:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoburn_audio_cd_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoburn_audio_cd_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to burn audio CDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoburn_audio_cd_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox74"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label33"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoburn_data_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="label37"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Command for _Data CDs: </property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoburn_data_cd_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoburn_data_cd_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to burn data CDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoburn_data_cd_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="tab_expand">False</property> +- <property name="tab_fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkLabel" id="storage_tab_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Storage</property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="type">tab</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="multimedia_vbox"> +- <property name="border_width">12</property> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">18</property> +- +- <child> +- <widget class="GtkVBox" id="audio_cd_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="audio_cd_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Audio CD Discs</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="audio_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="audio_cd_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="audio_cd_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoplay_cda"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Play _audio CD discs when inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox20"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label23"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoplay_cda_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="autoplay_cda_command_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">C_ommand:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_RIGHT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoplay_cda_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoplay_cda_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to play audio CDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoplay_cda_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="dvd_video_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="dvd_video_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Video DVD Discs</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="dvd_video_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="dvd_video_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="dvd_video_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoplay_dvd"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Play _video DVD discs when inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox21"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label24"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoplay_dvd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="autoplay_dvd_command_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Comma_nd:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_RIGHT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoplay_dvd_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoplay_dvd_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to play DVDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoplay_dvd_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="ipod_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="ipod_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Portable Music Players</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="ipod_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="ipod_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="ipod_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoipod"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Play _music files when connected</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox72"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label30"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoipod_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="autoipod_command_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Comman_d:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_RIGHT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoipod_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoipod_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to play music files</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoipod_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="tab_expand">False</property> +- <property name="tab_fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkLabel" id="multimedia_tab_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Multimedia</property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="type">tab</property> +- </packing> +- </child> +- +- <child> + <widget class="GtkVBox" id="cameras_vbox"> + <property name="border_width">12</property> + <property name="visible">True</property> +diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/manager.c gnome-volume-manager-2.22.1.new/src/manager.c +--- gnome-volume-manager-2.22.1/src/manager.c 2008-01-18 17:30:22.000000000 +0100 ++++ src/manager.c 2008-02-29 16:30:12.000000000 +0100 +@@ -625,6 +625,27 @@ + } + } + ++static gboolean ++filter_out_media_handling (gint key, gboolean value) ++{ ++ switch (key) { ++ case AUTOBROWSE: ++ case AUTOBURN: ++ case AUTOIPOD: ++ case AUTOMOUNT_DRIVES: ++ case AUTOMOUNT_MEDIA: ++ case AUTOOPEN: ++ case AUTOPLAY_CDA: ++ case AUTOPLAY_DVD: ++ case AUTOPLAY_VCD: ++ case AUTORUN: ++ return FALSE; ++ default: ++ return value; ++ } ++} ++ ++ + /* + * gvm_load_config - synchronize gconf => config structure + */ +@@ -644,7 +665,7 @@ + *((char **) gvm_settings[i].var) ? *((char **) gvm_settings[i].var): "NULL"); + } else if (gvm_settings[i].type == TYPE_BOOL) { + *((int *) gvm_settings[i].var) = +- gconf_client_get_bool (config.client, gvm_settings[i].key, NULL); ++ filter_out_media_handling (i, gconf_client_get_bool (config.client, gvm_settings[i].key, NULL)); + dbg ("setting[%d]: bool: %s = %d\n", i, strrchr (gvm_settings[i].key, '/') + 1, + *((int *) gvm_settings[i].var)); + } else if (gvm_settings[i].type == TYPE_FLOAT) { +@@ -693,7 +714,7 @@ + dbg ("setting changed: string: %s = %s\n", strrchr (gvm_settings[which].key, '/') + 1, + *((char **) gvm_settings[which].var)); + } else if (gvm_settings[which].type == TYPE_BOOL) { +- *((int *) gvm_settings[which].var) = gconf_value_get_bool (value); ++ *((int *) gvm_settings[which].var) = filter_out_media_handling (which, gconf_value_get_bool (value)); + dbg ("setting changed: bool: %s = %d\n", strrchr (gvm_settings[which].key, '/') + 1, + *((int *) gvm_settings[which].var)); + } else if (gvm_settings[which].type == TYPE_FLOAT) { +diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/properties.c gnome-volume-manager-2.22.1.new/src/properties.c +--- gnome-volume-manager-2.22.1/src/properties.c 2007-12-07 18:55:46.000000000 +0100 ++++ src/properties.c 2008-02-29 16:30:08.000000000 +0100 +@@ -36,77 +36,24 @@ + TYPE_STRING, + } type_t; + +-enum { +- AUTOBROWSE, +- AUTOBURN, +- AUTOBURN_AUDIO_CD_COMMAND, +- AUTOBURN_DATA_CD_COMMAND, +- AUTOIPOD, +- AUTOIPOD_COMMAND, +- AUTOKEYBOARD, +- AUTOKEYBOARD_COMMAND, +- AUTOMOUNT_DRIVES, +- AUTOMOUNT_MEDIA, +- AUTOMOUSE, +- AUTOMOUSE_COMMAND, +- AUTOOPEN, +- AUTOPHOTO, +- AUTOPHOTO_COMMAND, +- AUTOPILOT, +- AUTOPILOT_COMMAND, +- AUTOPLAY_CDA, +- AUTOPLAY_CDA_COMMAND, +- AUTOPLAY_DVD, +- AUTOPLAY_DVD_COMMAND, +- AUTOPOCKETPC, +- AUTOPOCKETPC_COMMAND, +- AUTOPRINTER, +- AUTOPRINTER_COMMAND, +- AUTORUN, +- AUTOSCANNER, +- AUTOSCANNER_COMMAND, +- AUTOTABLET, +- AUTOTABLET_COMMAND, +- AUTOVIDEOCAM, +- AUTOVIDEOCAM_COMMAND, +- AUTOWEBCAM, +- AUTOWEBCAM_COMMAND, +- AUTORUN_PATH, +- AUTOOPEN_PATH, +-}; +- + static struct { + char *key; + type_t type; + GtkWidget *widget; + gboolean need_daemon; + } gvm_settings[] = { +- { GCONF_ROOT "autobrowse", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoburn", TYPE_BOOL, NULL, FALSE }, +- { GCONF_ROOT "autoburn_audio_cd_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoburn_data_cd_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoipod", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoipod_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autokeyboard", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autokeyboard_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "automount_drives", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "automount_media", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "automouse", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "automouse_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoopen", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autophoto", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autophoto_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autopalmsync", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autopalmsync_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoplay_cda", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoplay_cda_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoplay_dvd", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoplay_dvd_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autopocketpc", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autopocketpc_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autoprinter", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autoprinter_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autorun", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autoscanner", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autoscanner_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autotablet", TYPE_BOOL, NULL, TRUE }, +@@ -115,9 +62,6 @@ + { GCONF_ROOT "autovideocam_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autowebcam", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autowebcam_command", TYPE_STRING, NULL, FALSE }, +- /* The following entries do not (yet) have a UI */ +- /*{ GCONF_ROOT "autorun_path", TYPE_STRING, NULL, FALSE },*/ +- /*{ GCONF_ROOT "autoopen_path", TYPE_STRING, NULL, FALSE },*/ + }; + + static GHashTable *gvm_settings_hash = NULL; +@@ -151,17 +95,10 @@ + gconf_client_set_bool (gconf, key, bool, NULL); + + name = strrchr (key, '/') + 1; +- if (!strncmp (name, "automount_", 10)) { +- bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) || +- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget)); +- gtk_widget_set_sensitive (gvm_settings[AUTOOPEN].widget, bool); +- gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool); +- } else { +- name = g_strdup_printf ("%s_hbox", name); +- if ((hbox = glade_xml_get_widget (xml, name))) +- gtk_widget_set_sensitive (hbox, bool); +- g_free (name); +- } ++ name = g_strdup_printf ("%s_hbox", name); ++ if ((hbox = glade_xml_get_widget (xml, name))) ++ gtk_widget_set_sensitive (hbox, bool); ++ g_free (name); + } + + static void +@@ -205,11 +142,6 @@ + gboolean bool; + size_t i; + +- /* this is the only strange one */ +- bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) || +- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget)); +- gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool); +- + /* checkboxes can enable/disable the ability to change other settings */ + for (i = 0; i < G_N_ELEMENTS (gvm_settings); i++) { + if (gvm_settings[i].type == TYPE_BOOL) { +@@ -277,17 +209,12 @@ + const char *icon; + const char *fallback; + } icons[] = { +- { "audio_cd_image", "gnome-dev-cdrom-audio", "media-optical" }, +- { "blank_cd_image", "gnome-dev-disc-cdr", "media-optical" }, + { "digital_camera_image", "camera-photo", NULL }, +- { "dvd_video_image", "gnome-dev-dvd", "media-optical" }, +- { "ipod_image", "multimedia-player", "gnome-dev-ipod" }, + { "keyboard_image", "input-keyboard", NULL }, + { "mouse_image", "input-mouse", NULL }, + { "palm_image", "pda-palm", "palm-pilot" }, + { "pocketpc_image", "pda-pocketpc", "palm-pilot" }, + { "printer_image", "printer", NULL }, +- { "removable_drives_image", "drive-removable-media", NULL }, + { "scanner_image", "scanner", NULL }, + { "tablet_image", "input-tablet", NULL }, + { "videocam_image", "camera-video", NULL }, diff --git a/sysutils/gnome-volume-manager/files/patch-src_properties.c b/sysutils/gnome-volume-manager/files/patch-src_properties.c deleted file mode 100644 index 5e8d72a2d61b..000000000000 --- a/sysutils/gnome-volume-manager/files/patch-src_properties.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/properties.c.orig Sat Jul 15 13:54:29 2006 -+++ src/properties.c Sat Jul 15 13:55:03 2006 -@@ -499,7 +499,11 @@ main (int argc, char **argv) - _("The \"hald\" service is required but not currently " - "running. Enable the service and rerun this application, " - "or contact your system administrator.\n\n" -+#ifndef __FreeBSD__ - "Note: You need Linux kernel 2.6 for volume " -+#else -+ "Note: You need sysutils/hal installed for volume " -+#endif - "management to work.")); - - gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist index 49ded72dd76e..a3d4526cf04b 100644 --- a/sysutils/gnome-volume-manager/pkg-plist +++ b/sysutils/gnome-volume-manager/pkg-plist @@ -1,12 +1,12 @@ -bin/gnome-volume-manager bin/gnome-volume-properties +etc/xdg/autostart/gnome-volume-manager.desktop +libexec/gnome-volume-manager share/applications/gnome-volume-properties.desktop -share/gnome/autostart/gnome-volume-manager.desktop -share/gnome-volume-manager/gnome-volume-properties.glade -share/gnome-volume-manager/icons/gvm-dev-tablet.png +%%DATADIR%%/gnome-volume-properties.glade share/locale/ang/LC_MESSAGES/gnome-volume-manager.mo share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo share/locale/az/LC_MESSAGES/gnome-volume-manager.mo +share/locale/be@latin/LC_MESSAGES/gnome-volume-manager.mo share/locale/bg/LC_MESSAGES/gnome-volume-manager.mo share/locale/bn/LC_MESSAGES/gnome-volume-manager.mo share/locale/bn_IN/LC_MESSAGES/gnome-volume-manager.mo @@ -50,6 +50,7 @@ share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo share/locale/ne/LC_MESSAGES/gnome-volume-manager.mo share/locale/nl/LC_MESSAGES/gnome-volume-manager.mo share/locale/nn/LC_MESSAGES/gnome-volume-manager.mo +share/locale/oc/LC_MESSAGES/gnome-volume-manager.mo share/locale/or/LC_MESSAGES/gnome-volume-manager.mo share/locale/pa/LC_MESSAGES/gnome-volume-manager.mo share/locale/pl/LC_MESSAGES/gnome-volume-manager.mo @@ -58,6 +59,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-volume-manager.mo share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo +share/locale/si/LC_MESSAGES/gnome-volume-manager.mo share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo share/locale/sl/LC_MESSAGES/gnome-volume-manager.mo share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo @@ -65,6 +67,7 @@ share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo share/locale/sr@Latn/LC_MESSAGES/gnome-volume-manager.mo share/locale/sv/LC_MESSAGES/gnome-volume-manager.mo share/locale/ta/LC_MESSAGES/gnome-volume-manager.mo +share/locale/te/LC_MESSAGES/gnome-volume-manager.mo share/locale/th/LC_MESSAGES/gnome-volume-manager.mo share/locale/tr/LC_MESSAGES/gnome-volume-manager.mo share/locale/uk/LC_MESSAGES/gnome-volume-manager.mo @@ -73,14 +76,22 @@ share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo -@dirrm share/gnome-volume-manager/icons -@dirrm share/gnome-volume-manager +@dirrm %%DATADIR%% +@dirrmtry share/applications +@dirrmtry etc/xdg/autostart +@dirrmtry etc/xdg @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -89,6 +100,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang -@dirrmtry share/applications diff --git a/sysutils/gstreamer-plugins-hal/Makefile b/sysutils/gstreamer-plugins-hal/Makefile index c83708436bd9..9ed2ed3d3e1e 100644 --- a/sysutils/gstreamer-plugins-hal/Makefile +++ b/sysutils/gstreamer-plugins-hal/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.1 2006/05/17 12:29:05 ahze Exp $ +# $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.6 2008/03/19 14:05:38 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils COMMENT= Gstreamer hal plugin diff --git a/sysutils/hal-device-manager/Makefile b/sysutils/hal-device-manager/Makefile deleted file mode 100644 index eaf3a019a88f..000000000000 --- a/sysutils/hal-device-manager/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# New ports collection makefile for: hal-device-manager -# Date created: 2006-05-18 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/sysutils/hal-device-manager/Makefile,v 1.3 2006/05/18 22:15:41 ahze Exp $ - -PORTREVISION= 1 -CATEGORIES= sysutils gnome -PKGNAMESUFFIX= -device-manager - -MAINTAINER= gnome@FreeBSD.org -COMMENT= HAL device manager - -HAL_SLAVE= yes - -MASTERDIR= ${.CURDIR}/../../sysutils/hal -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/hal-device-manager/pkg-plist b/sysutils/hal-device-manager/pkg-plist deleted file mode 100644 index b00763e2edd5..000000000000 --- a/sysutils/hal-device-manager/pkg-plist +++ /dev/null @@ -1,39 +0,0 @@ -bin/hal-device-manager -%%DATADIR%%/device-manager/Const.py -%%DATADIR%%/device-manager/Const.pyc -%%DATADIR%%/device-manager/Const.pyo -%%DATADIR%%/device-manager/Device.py -%%DATADIR%%/device-manager/Device.pyc -%%DATADIR%%/device-manager/Device.pyo -%%DATADIR%%/device-manager/DeviceManager.py -%%DATADIR%%/device-manager/DeviceManager.pyc -%%DATADIR%%/device-manager/DeviceManager.pyo -%%DATADIR%%/device-manager/GtkAttributesFacade.py -%%DATADIR%%/device-manager/GtkAttributesFacade.pyc -%%DATADIR%%/device-manager/GtkAttributesFacade.pyo -%%DATADIR%%/device-manager/LibGladeApplication.py -%%DATADIR%%/device-manager/LibGladeApplication.pyc -%%DATADIR%%/device-manager/LibGladeApplication.pyo -%%DATADIR%%/device-manager/Representation.py -%%DATADIR%%/device-manager/Representation.pyc -%%DATADIR%%/device-manager/Representation.pyo -%%DATADIR%%/device-manager/fdo-logo.png -%%DATADIR%%/device-manager/hal-abstract.png -%%DATADIR%%/device-manager/hal-audio.png -%%DATADIR%%/device-manager/hal-bus-pci.png -%%DATADIR%%/device-manager/hal-bus-usb.png -%%DATADIR%%/device-manager/hal-camera.png -%%DATADIR%%/device-manager/hal-cat-cardbus.png -%%DATADIR%%/device-manager/hal-cat-keyboard.png -%%DATADIR%%/device-manager/hal-cat-mouse.png -%%DATADIR%%/device-manager/hal-cdrom.png -%%DATADIR%%/device-manager/hal-computer.png -%%DATADIR%%/device-manager/hal-device-manager.glade -%%DATADIR%%/device-manager/hal-flash.png -%%DATADIR%%/device-manager/hal-floppy.png -%%DATADIR%%/device-manager/hal-harddisk.png -%%DATADIR%%/device-manager/hal-network.png -%%DATADIR%%/device-manager/hal-serial-port.png -%%DATADIR%%/device-manager/hal-unknown.png -%%DATADIR%%/device-manager/hal-video.png -@dirrm %%DATADIR%%/device-manager diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile new file mode 100644 index 000000000000..7bcba489a709 --- /dev/null +++ b/sysutils/hal-info/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: hal-info +# Date Created: 25 January 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/hal-info/Makefile,v 1.3 2008/03/17 22:31:58 marcus Exp $ +# + +PORTNAME= hal-info +PORTVERSION= 20080317 +CATEGORIES= sysutils +MASTER_SITES= http://hal.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Additional FDI files to further classify HAL devices + +LIB_PC_DEPENDS= hal.pc:${PORTSDIR}/sysutils/hal + +BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} +RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} + +USE_GMAKE= yes +USE_GNOME= gnomehack gnometarget +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo new file mode 100644 index 000000000000..a058eaa17f47 --- /dev/null +++ b/sysutils/hal-info/distinfo @@ -0,0 +1,3 @@ +MD5 (hal-info-20080317.tar.gz) = 4cde7ff94f660879c44da17eb525edfd +SHA256 (hal-info-20080317.tar.gz) = b6e3c45cb7929ed66eb154f28b7f89b6e36a9a6645a37f583f8b7c7e29322405 +SIZE (hal-info-20080317.tar.gz) = 184704 diff --git a/sysutils/hal-info/files/patch-configure b/sysutils/hal-info/files/patch-configure new file mode 100644 index 000000000000..0a70073241be --- /dev/null +++ b/sysutils/hal-info/files/patch-configure @@ -0,0 +1,83 @@ +--- configure.orig 2008-03-17 18:27:34.000000000 -0400 ++++ configure 2008-03-17 18:28:11.000000000 -0400 +@@ -3436,7 +3436,7 @@ else + enable_recall=yes + fi + +- if test x$enable_recall == xyes; then ++ if test x$enable_recall = xyes; then + BUILD_RECALL_TRUE= + BUILD_RECALL_FALSE='#' + else +@@ -3452,7 +3452,7 @@ else + enable_video=yes + fi + +- if test x$enable_video == xyes; then ++ if test x$enable_video = xyes; then + BUILD_VIDEO_TRUE= + BUILD_VIDEO_FALSE='#' + else +@@ -3468,7 +3468,7 @@ else + enable_keymaps=yes + fi + +- if test x$enable_keymaps == xyes; then ++ if test x$enable_keymaps = xyes; then + BUILD_KEYMAPS_TRUE= + BUILD_KEYMAPS_FALSE='#' + else +@@ -3484,7 +3484,7 @@ else + enable_killswitch_dell_wlan=yes + fi + +- if test x$enable_killswitch_dell_wlan == xyes; then ++ if test x$enable_killswitch_dell_wlan = xyes; then + BUILD_KILLSWITCH_DELL_WLAN_TRUE= + BUILD_KILLSWITCH_DELL_WLAN_FALSE='#' + else +@@ -3500,7 +3500,7 @@ else + enable_killswitch_dell_bluetooth=yes + fi + +- if test x$enable_killswitch_dell_bluetooth == xyes; then ++ if test x$enable_killswitch_dell_bluetooth = xyes; then + BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE= + BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE='#' + else +@@ -3516,7 +3516,7 @@ else + enable_killswitch_dell_wwan=yes + fi + +- if test x$enable_killswitch_dell_wwan == xyes; then ++ if test x$enable_killswitch_dell_wwan = xyes; then + BUILD_KILLSWITCH_DELL_WWAN_TRUE= + BUILD_KILLSWITCH_DELL_WWAN_FALSE='#' + else +@@ -3532,7 +3532,7 @@ else + enable_killswitch_sony_bluetooth=yes + fi + +- if test x$enable_killswitch_sony_bluetooth == xyes; then ++ if test x$enable_killswitch_sony_bluetooth = xyes; then + BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE= + BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE='#' + else +@@ -3548,7 +3548,7 @@ else + enable_killswitch_thinkpad_bluetooth=yes + fi + +- if test x$enable_killswitch_thinkpad_bluetooth == xyes; then ++ if test x$enable_killswitch_thinkpad_bluetooth = xyes; then + BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE= + BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE='#' + else +@@ -3564,7 +3564,7 @@ else + enable_killswitch_ipw_wlan=yes + fi + +- if test x$enable_killswitch_ipw_wlan == xyes; then ++ if test x$enable_killswitch_ipw_wlan = xyes; then + BUILD_KILLSWITCH_IPW_WLAN_TRUE= + BUILD_KILLSWITCH_IPW_WLAN_FALSE='#' + else diff --git a/sysutils/hal-info/pkg-descr b/sysutils/hal-info/pkg-descr new file mode 100644 index 000000000000..dd42292fcc44 --- /dev/null +++ b/sysutils/hal-info/pkg-descr @@ -0,0 +1,3 @@ +hal-info contains device information for HAL. + +WWW: http://www.freedesktop.org/Software/hal diff --git a/sysutils/hal-info/pkg-plist b/sysutils/hal-info/pkg-plist new file mode 100644 index 000000000000..b48a5514f0db --- /dev/null +++ b/sysutils/hal-info/pkg-plist @@ -0,0 +1,44 @@ +share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi +share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi +share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi +share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi +share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi +share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi +share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi +share/hal/fdi/information/10freedesktop/10-modem.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi +share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi +share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi +share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi +share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi +share/hal/fdi/information/10freedesktop/10-usb-pda.fdi +share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi +share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi +share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi +share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi +share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi +share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi +share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi +share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi +share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi +share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi +share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi +share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi +share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 32042dbb14b3..f757a5167fc7 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,25 +3,23 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.26 2006/10/13 10:00:57 ahze Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.43 2008/03/22 19:31:15 marcus Exp $ # PORTNAME= hal -PORTVERSION= ${HALVERSION}.${SNAPVERSION} -PORTREVISION?= 0 -CATEGORIES?= sysutils -MASTER_SITES= http://www.marcuscom.com/downloads/ +DISTVERSION= 0.5.11rc2 +PORTREVISION= 3 +CATEGORIES= sysutils +MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org -COMMENT?= Hardware Abstraction Layer for simplifying device access +COMMENT= Hardware Abstraction Layer for simplifying device access -.if !defined(HAL_SLAVE) -LIB_DEPENDS= polkit.0:${PORTSDIR}/sysutils/policykit \ - volume_id.0:${PORTSDIR}/devel/libvolume_id +LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ + volume_id.0:${PORTSDIR}/devel/libvolume_id \ + ck-connector.0:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids -.endif -USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget intlhack ltverhack @@ -29,56 +27,47 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_PYTHON= yes CONFIGURE_ARGS= --disable-gtk-doc \ - --with-hwdata=${LOCALBASE}/share/pciids \ --with-backend=freebsd \ --disable-docbook-docs \ + --with-pci-ids=${LOCALBASE}/share/pciids \ + --disable-usb-ids \ + --without-libpci \ + --disable-usb \ + --disable-smbios \ + --disable-apm \ + --disable-pmu \ + --enable-policy-kit \ + --enable-console-kit \ --with-socket-dir=/var/run/hald \ - --with-pid-file=/var/run/hald/hald.pid + --with-eject=/usr/sbin/cdcontrol \ + --with-pid-file=/var/run/hald/hald.pid \ + --with-deprecated-keys \ + --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" -HALVERSION= 0.5.8 -SNAPVERSION= 20080203 +#HALVERSION= 0.5.10 +#SNAPVERSION= 20080218 -.if !defined(HAL_SLAVE) USE_RC_SUBR= hald USE_GNOME_SUBR= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${HALVERSION} PLIST_SUB= VERSION=${HALVERSION} -PRIV_FILES= hal-power-hibernate \ - hal-power-poweroff \ - hal-power-reboot \ - hal-power-suspend \ - hal-storage-fixed-mount-change-uid \ - hal-storage-fixed-mount \ - hal-storage-removable-mount-change-uid \ - hal-storage-removable-mount -PRIV_FILES:= ${PRIV_FILES:S|$|.privilege|} - -RC_FILES= hal.conf:${PREFIX}/etc/dbus-1/system.d \ - ${PRIV_FILES:S|$|:${PREFIX}/etc/PolicyKit/privilege.d|} +RC_FILES= hal.conf:${PREFIX}/etc/dbus-1/system.d PLIST_FILES= ${PRIV_FILES:S|^|%%DATADIR%%/dist/|} SUB_FILES= pkg-install pkg-deinstall SUB_LIST= RC_FILES="${RC_FILES}" +MAN1= hal-disable-polling.1 hal-find-by-capability.1 \ + hal-find-by-property.1 hal-get-property.1 \ + hal-is-caller-locked-out.1 hal-is-caller-privileged.1 \ + hal-lock.1 hal-set-property.1 lshal.1 +MAN8= hald.8 + OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off -.else # Slave port stuff -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus - -USE_GNOME+= pygnome2 -DESKTOP_ENTRIES="Device Manager" \ - "Examine your devices" \ - "${DATADIR}/device-manager/hal-bus-pci.png" \ - "hal-device-manager" \ - "Application;System;" \ - true -BUILD_WRKSRC= ${WRKSRC}/tools/device-manager -INSTALL_WRKSRC= ${BUILD_WRKSRC} -.endif .include <bsd.port.pre.mk> @@ -86,7 +75,6 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} IGNORE= not supported on FreeBSD prior to 5.5-RELEASE .endif -.if !defined(HAL_SLAVE) .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64") RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif @@ -101,38 +89,28 @@ PLIST_SUB+= MEDIA="@comment " .if defined(WITH_FIXED_MOUNTPOINTS) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c .endif -.endif post-patch: -.if !defined(HAL_SLAVE) - @${REINPLACE_CMD} -e 's|device-manager||' \ - ${WRKSRC}/tools/Makefile.in -.endif @${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \ ${WRKSRC}/tools/Makefile.in \ ${WRKSRC}/tools/freebsd/Makefile.in @${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \ ${WRKSRC}/hald/Makefile.in - @${REINPLACE_CMD} -e '/^SUBDIRS/ s|txt||' \ - ${WRKSRC}/policy/Makefile.in @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \ ${WRKSRC}/hal.conf.in - @${TOUCH} ${WRKSRC}/doc/spec/hal-spec.html post-install: -.if !defined(HAL_SLAVE) ${MKDIR} ${DATADIR}/dist - ${INSTALL_DATA} ${WRKSRC}/hal.conf ${WRKSRC}/policy/txt/*.privilege \ - ${DATADIR}/dist + ${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/dist @${SETENV} PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(PACKAGE_BUILDING) && defined(NEEDS_MEDIA) ${MKDIR} /media .endif .if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ ${DOCSDIR}/README.freebsd .endif -.endif .include <bsd.port.post.mk> diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 8988c420cd0e..1c49bac643a4 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-0.5.8.20080203.tar.bz2) = 2bdd6f8dd009b8173808494c3e98b6f4 -SHA256 (hal-0.5.8.20080203.tar.bz2) = e189038d6406486534264957e0f68af32b80b36291873ed43ceb47c238513245 -SIZE (hal-0.5.8.20080203.tar.bz2) = 1366915 +MD5 (hal-0.5.11rc2.tar.gz) = ade962044a62e8f2dc4625a17f4a5c7e +SHA256 (hal-0.5.11rc2.tar.gz) = 3937d2ab06c091d0b5d604f7615096be505455448cc13635ebdba169d29b4bdc +SIZE (hal-0.5.11rc2.tar.gz) = 1665175 diff --git a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c index ce9895f941a4..82a7fb6070e0 100644 --- a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c +++ b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c @@ -1,30 +1,30 @@ ---- tools/hal-storage-mount.c.orig Sun May 14 20:57:59 2006 -+++ tools/hal-storage-mount.c Sat Apr 7 12:50:53 2007 -@@ -513,23 +513,11 @@ - explicit_mount_point_given = FALSE; - if (strlen (mount_point) == 0) { - char *p; -- const char *label; -+ char *basename; - -- if (volume != NULL) -- label = libhal_volume_get_label (volume); -- else -- label = NULL; -- -- if (label != NULL) { -- /* best - use label */ -- g_strlcpy (mount_point, label, sizeof (mount_point)); -- -- /* TODO: use drive type */ -- -- } else { -- /* fallback - use "disk" */ -- g_snprintf (mount_point, sizeof (mount_point), "disk"); -- } -+ basename = g_path_get_basename (device); -+ g_strlcpy (mount_point, basename, sizeof (mount_point)); -+ g_free (basename); - - /* sanitize computed mount point name, e.g. replace invalid chars with '-' */ - p = mount_point; +--- tools/hal-storage-mount.c.orig 2008-01-03 21:10:54.000000000 -0500 ++++ tools/hal-storage-mount.c 2008-01-04 09:29:10.000000000 -0500 +@@ -583,23 +583,11 @@ handle_mount (LibHalContext *hal_ctx, + explicit_mount_point_given = FALSE; + if (strlen (mount_point) == 0) { + char *p; +- const char *label; ++ char *basename; + +- if (volume != NULL) +- label = libhal_volume_get_label (volume); +- else +- label = NULL; +- +- if (label != NULL) { +- /* best - use label */ +- g_strlcpy (mount_point, label, sizeof (mount_point)); +- +- /* TODO: use drive type */ +- +- } else { +- /* fallback - use "disk" */ +- g_snprintf (mount_point, sizeof (mount_point), "%s", "disk"); +- } ++ basename = g_path_get_basename (device); ++ g_strlcpy (mount_point, basename, sizeof (mount_point)); ++ g_free (basename); + + /* sanitize computed mount point name, e.g. replace invalid chars with '-' */ + p = mount_point; diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index ab906a516f30..7f8f2c659c86 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: hald -# REQUIRE: DAEMON usbd devd dbus polkitd +# REQUIRE: DAEMON usbd devd dbus # # Add the following line to /etc/rc.conf to enable the HAL daemon: # @@ -24,6 +24,7 @@ pidfile="/var/run/${name}/${name}.pid" stop_postcmd="hald_postcmd" start_precmd="hald_precmd" +start_cmd="hald_start" local_force_depend() { @@ -46,10 +47,7 @@ hald_precmd() local_force_depend dbus || return 1 fi - if ! checkyesno polkitd_enable - then - local_force_depend polkitd || return 1 - fi + chmod 0755 /var/cache mkdir -p $(dirname $pidfile) } @@ -59,5 +57,23 @@ hald_postcmd() rm -f $pidfile } +hald_start() +{ + if ! checkyesno hald_enable ; then + return 0 + fi + echo "Starting ${name}." + + ( iter=0 + while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do + if [ ${iter} -eq 60 ]; then + break + fi + sleep 1 + iter=$(expr ${iter} + 1) + done + ${command} ${hald_flags} ) & +} + load_rc_config ${name} run_rc_command "$1" diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in index 27219f54c076..17d23980f55c 100644 --- a/sysutils/hal/files/patch-Makefile.in +++ b/sysutils/hal/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu May 4 15:35:41 2006 -+++ Makefile.in Thu May 4 15:36:40 2006 -@@ -377,14 +377,14 @@ distclean-libtool: +--- Makefile.in.orig 2008-01-03 21:28:32.000000000 -0500 ++++ Makefile.in 2008-01-03 21:29:15.000000000 -0500 +@@ -311,14 +311,14 @@ clean-libtool: + distclean-libtool: -rm -f libtool - uninstall-info-am: install-dist_dbusDATA: $(dist_dbus_DATA) - @$(NORMAL_INSTALL) -- test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)" +- test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" - @list='$(dist_dbus_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ @@ -13,7 +13,7 @@ - $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \ - done +# @$(NORMAL_INSTALL) -+# test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)" ++# test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" +# @list='$(dist_dbus_DATA)'; for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# f=$(am__strip_dir) \ diff --git a/sysutils/hal/files/patch-doc_Makefile.in b/sysutils/hal/files/patch-doc_Makefile.in index d05f0136ccbf..9cd951720ede 100644 --- a/sysutils/hal/files/patch-doc_Makefile.in +++ b/sysutils/hal/files/patch-doc_Makefile.in @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Tue May 2 01:04:31 2006 -+++ doc/Makefile.in Tue May 2 01:04:42 2006 -@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- doc/Makefile.in.orig 2008-01-03 21:41:19.000000000 -0500 ++++ doc/Makefile.in 2008-01-03 21:41:31.000000000 -0500 +@@ -203,7 +203,7 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ EXTRA_DIST = TODO --SUBDIRS = api spec conf -+SUBDIRS = spec conf - all: all-recursive - - .SUFFIXES: +-SUBDIRS = api spec man ++SUBDIRS = spec man + MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c new file mode 100644 index 000000000000..ebeeb072c7af --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c @@ -0,0 +1,135 @@ +--- hald/freebsd/addons/addon-storage.c.orig 2008-03-17 17:25:16.000000000 -0400 ++++ hald/freebsd/addons/addon-storage.c 2008-03-22 03:25:19.000000000 -0400 +@@ -150,6 +150,34 @@ hf_addon_storage_update (void) + return has_media; + } + ++static boolean ++poll_for_media (void) ++{ ++ boolean has_media; ++ ++ has_media = hf_addon_storage_update(); ++ if (has_media != addon.had_media) ++ { ++ /* ++ * FIXME: if the media was removed, we should force-unmount ++ * all its child volumes (see linux2/addons/addon-storage.c). ++ * However, currently (FreeBSD 6.0) umount -f is broken and ++ * can cause kernel panics. When I tried to umount -f a ++ * flash card after removing it, it failed with EAGAIN. It ++ * continued to fail after I inserted the card. The system ++ * then hung while rebooting and did not unmount my other ++ * filesystems. ++ */ ++ ++ libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error); ++ dbus_error_free(&hfp_error); ++ addon.had_media = has_media; ++ ++ return TRUE; ++ } ++ return FALSE; ++} ++ + static void + update_proc_title (const char *device, boolean polling_enabled) + { +@@ -159,6 +187,29 @@ update_proc_title (const char *device, b + setproctitle("no polling on %s because it is explicitly disabled", device); + } + ++static DBusHandlerResult ++filter_function (DBusConnection *connection, DBusMessage *message, void *user_data) ++{ ++ if (dbus_message_is_method_call(message, ++ "org.freedesktop.Hal.Device.Storage.Removable", ++ "CheckForMedia")) ++ { ++ DBusMessage *reply; ++ dbus_bool_t had_effect; ++ ++ hfp_info("Forcing poll for media becusse CheckForMedia() was called"); ++ ++ had_effect = poll_for_media(); ++ ++ reply = dbus_message_new_method_return (message); ++ dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID); ++ dbus_connection_send(connection, reply, NULL); ++ dbus_message_unref(reply); ++ } ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++} ++ + int + main (int argc, char **argv) + { +@@ -202,13 +253,30 @@ main (int argc, char **argv) + ! strcmp(driver, "cd")))) && ! strcmp(removable, "true"); + addon.had_media = hf_addon_storage_update(); + ++ if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error)) ++ goto end; ++ dbus_error_free(&hfp_error); ++ + connection = libhal_ctx_get_dbus_connection(hfp_ctx); + assert(connection != NULL); ++ dbus_connection_set_exit_on_disconnect(connection, 0); ++ dbus_connection_add_filter(connection, filter_function, NULL, NULL); + +- while (TRUE) ++ if (! libhal_device_claim_interface(hfp_ctx, ++ hfp_udi, ++ "org.freedesktop.Hal.Device.Storage.Removable", ++ " <method name=\"CheckForMedia\">\n" ++ " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n" ++ " </method>\n", ++ &hfp_error)) + { +- boolean has_media; ++ hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'"); ++ goto end; ++ } ++ dbus_error_free(&hfp_error); + ++ while (TRUE) ++ { + /* process dbus traffic until update interval has elapsed */ + while (TRUE) + { +@@ -225,7 +293,7 @@ main (int argc, char **argv) + if (timeout.tv_sec < 0) /* current time went backwards */ + timeout = addon.update_interval; + +- dbus_connection_read_write(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000); ++ dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000); + if (! dbus_connection_get_is_connected(connection)) + goto end; + } +@@ -239,24 +307,7 @@ main (int argc, char **argv) + + if (should_poll) + { +- has_media = hf_addon_storage_update(); +- if (has_media != addon.had_media) +- { +- /* +- * FIXME: if the media was removed, we should force-unmount +- * all its child volumes (see linux2/addons/addon-storage.c). +- * However, currently (FreeBSD 6.0) umount -f is broken and +- * can cause kernel panics. When I tried to umount -f a +- * flash card after removing it, it failed with EAGAIN. It +- * continued to fail after I inserted the card. The system +- * then hung while rebooting and did not unmount my other +- * filesystems. +- */ +- +- libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error); +- dbus_error_free(&hfp_error); +- addon.had_media = has_media; +- } ++ poll_for_media(); + } + else + { diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c new file mode 100644 index 000000000000..598ac6283341 --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c @@ -0,0 +1,12 @@ +--- hald/freebsd/hf-scsi.c.orig 2008-03-18 15:58:59.000000000 -0400 ++++ hald/freebsd/hf-scsi.c 2008-03-18 15:57:36.000000000 -0400 +@@ -409,8 +409,8 @@ hf_scsi_handle_pending_device (struct de + */ + hf_block_device_complete(block_device, block_device, FALSE); + +- hf_storage_device_probe(block_device, FALSE); + hf_device_add(block_device); ++ hf_storage_device_probe(block_device, FALSE); + } + } + } diff --git a/sysutils/hal/files/patch-tools_Makefile.in b/sysutils/hal/files/patch-tools_Makefile.in deleted file mode 100644 index c5ce9282732e..000000000000 --- a/sysutils/hal/files/patch-tools_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/Makefile.in.orig Tue May 2 20:23:05 2006 -+++ tools/Makefile.in Tue May 2 20:23:22 2006 -@@ -325,7 +325,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = freebsd linux device-manager -+SUBDIRS = freebsd device-manager - INCLUDES = \ - -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ - -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in index 2cfda5753d4c..72b67ff95936 100644 --- a/sysutils/hal/files/pkg-install.in +++ b/sysutils/hal/files/pkg-install.in @@ -34,6 +34,8 @@ if [ -z "${PACKAGE_BUILDING}" ]; then fi /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald + /usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald + /usr/bin/install -d -o ${USER} -g ${GROUP} /var/lib/hal fi for pair in %%RC_FILES%%; do diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist index 6b0d1e7589aa..3b60cfa41a2f 100644 --- a/sysutils/hal/pkg-plist +++ b/sysutils/hal/pkg-plist @@ -1,9 +1,13 @@ @unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true %%MEDIA%%@exec mkdir -p /media bin/hal-device +bin/hal-disable-polling bin/hal-find-by-capability bin/hal-find-by-property bin/hal-get-property +bin/hal-is-caller-locked-out +bin/hal-is-caller-privileged +bin/hal-lock bin/hal-set-property bin/lshal @exec mkdir -p %D/etc/hal/fdi/preprobe @@ -25,32 +29,40 @@ lib/libhald_freebsd_probe.so lib/libhald_freebsd_probe.so.0 libdata/pkgconfig/hal-storage.pc libdata/pkgconfig/hal.pc +libexec/hal-storage-cleanup-all-mountpoints +libexec/hal-storage-cleanup-mountpoint +libexec/hal-storage-closetray +libexec/hal-storage-eject libexec/hal-storage-mount -libexec/hal-system-power-pmu +libexec/hal-storage-unmount +libexec/hal-system-power-pm-is-supported +libexec/hal-system-setserial +libexec/hal/scripts/freebsd/hal-system-lcd-get-brightness-freebsd +libexec/hal/scripts/freebsd/hal-system-lcd-set-brightness-freebsd +libexec/hal/scripts/freebsd/hal-system-power-reboot-freebsd +libexec/hal/scripts/freebsd/hal-system-power-set-power-save-freebsd +libexec/hal/scripts/freebsd/hal-system-power-shutdown-freebsd +libexec/hal/scripts/freebsd/hal-system-power-suspend-freebsd +libexec/hal/scripts/hal-dockstation-undock +libexec/hal/scripts/hal-functions libexec/hal/scripts/hal-luks-remove libexec/hal/scripts/hal-luks-setup libexec/hal/scripts/hal-luks-teardown +libexec/hal/scripts/hal-system-killswitch-get-power +libexec/hal/scripts/hal-system-killswitch-set-power libexec/hal/scripts/hal-system-lcd-get-brightness -libexec/hal/scripts/hal-system-lcd-get-brightness-freebsd libexec/hal/scripts/hal-system-lcd-set-brightness -libexec/hal/scripts/hal-system-lcd-set-brightness-freebsd libexec/hal/scripts/hal-system-power-hibernate libexec/hal/scripts/hal-system-power-reboot -libexec/hal/scripts/hal-system-power-reboot-freebsd libexec/hal/scripts/hal-system-power-set-power-save -libexec/hal/scripts/hal-system-power-set-power-save-freebsd libexec/hal/scripts/hal-system-power-shutdown -libexec/hal/scripts/hal-system-power-shutdown-freebsd libexec/hal/scripts/hal-system-power-suspend -libexec/hal/scripts/hal-system-power-suspend-freebsd -libexec/hal/scripts/hal-system-storage-cleanup-mountpoint -libexec/hal/scripts/hal-system-storage-cleanup-mountpoints -libexec/hal/scripts/hal-system-storage-cleanup-mountpoints-freebsd -libexec/hal/scripts/hal-system-storage-eject -libexec/hal/scripts/hal-system-storage-eject-freebsd -libexec/hal/scripts/hal-system-storage-unmount -libexec/hal/scripts/hal-system-storage-unmount-freebsd +libexec/hal/scripts/hal-system-power-suspend-hybrid +libexec/hal/scripts/hal-system-wol-enable +libexec/hal/scripts/hal-system-wol-enabled +libexec/hal/scripts/hal-system-wol-supported libexec/hald-addon-storage +libexec/hald-generate-fdi-cache libexec/hald-probe-hiddev libexec/hald-probe-scsi libexec/hald-probe-smbios @@ -59,57 +71,28 @@ libexec/hald-probe-volume libexec/hald-runner sbin/hald %%PORTDOCS%%%%DOCSDIR%%/README.freebsd -%%DOCSDIR%%/conf/match-USB-camera.fdi -%%DOCSDIR%%/conf/match-USB-mp3-player.fdi -%%DOCSDIR%%/conf/match-cardreader.fdi -%%DOCSDIR%%/conf/storage-non-fixed.fdi -%%DOCSDIR%%/conf/storage-policy-examples.fdi -%%DOCSDIR%%/conf/storage-skip-all.fdi %%DATADIR%%/dist/hal.conf %%DATADIR%%/fdi/fdi.dtd -%%DATADIR%%/fdi/fdi.rng -%%DATADIR%%/fdi/information/10freedesktop/10-camera-ptp.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-cd-dvd-burner.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-card-readers.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-music-players.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-pda.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-zip-drives.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-wireless-mice.fdi +%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi @exec mkdir -p %D/%%DATADIR%%/fdi/information/20thirdparty -%%DATADIR%%/fdi/policy/10osvendor/10-keyboard-policy.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi %%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi %%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi -%%DATADIR%%/fdi/policy/10osvendor/10-toshiba-buttons.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-rfkill-switch.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-tabletPCs.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-x11-input.fdi %%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi %%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi +%%DATADIR%%/fdi/policy/10osvendor/30-wol.fdi +share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy +share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy +share/PolicyKit/policy/org.freedesktop.hal.policy +share/PolicyKit/policy/org.freedesktop.hal.power-management.policy +share/PolicyKit/policy/org.freedesktop.hal.storage.policy +share/PolicyKit/policy/org.freedesktop.hal.wol.policy @exec mkdir -p %D/%%DATADIR%%/fdi/policy/20thirdparty -%%DATADIR%%/fdi/preprobe/10osvendor/10-ide-drives.fdi @exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/20thirdparty -share/locale/cs/LC_MESSAGES/hal.mo -share/locale/da/LC_MESSAGES/hal.mo -share/locale/de/LC_MESSAGES/hal.mo -share/locale/el/LC_MESSAGES/hal.mo -share/locale/es/LC_MESSAGES/hal.mo -share/locale/eu/LC_MESSAGES/hal.mo -share/locale/fi/LC_MESSAGES/hal.mo -share/locale/fr/LC_MESSAGES/hal.mo -share/locale/hu/LC_MESSAGES/hal.mo -share/locale/it/LC_MESSAGES/hal.mo -share/locale/ja/LC_MESSAGES/hal.mo -share/locale/km/LC_MESSAGES/hal.mo -share/locale/ko/LC_MESSAGES/hal.mo -share/locale/lt/LC_MESSAGES/hal.mo -share/locale/nb/LC_MESSAGES/hal.mo -share/locale/nl/LC_MESSAGES/hal.mo -share/locale/pa/LC_MESSAGES/hal.mo -share/locale/pl/LC_MESSAGES/hal.mo -share/locale/pt/LC_MESSAGES/hal.mo -share/locale/pt_BR/LC_MESSAGES/hal.mo -share/locale/ru/LC_MESSAGES/hal.mo -share/locale/sl_SI/LC_MESSAGES/hal.mo -share/locale/uk/LC_MESSAGES/hal.mo -share/locale/zh_CN/LC_MESSAGES/hal.mo -share/locale/zh_TW/LC_MESSAGES/hal.mo @dirrm %%DATADIR%%/fdi/preprobe/20thirdparty @dirrm %%DATADIR%%/fdi/preprobe/10osvendor @dirrm %%DATADIR%%/fdi/preprobe @@ -122,8 +105,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo @dirrm %%DATADIR%%/fdi @dirrm %%DATADIR%%/dist @dirrm %%DATADIR%% -@dirrm %%DOCSDIR%%/conf @dirrm %%DOCSDIR%% +@dirrm libexec/hal/scripts/freebsd @dirrm libexec/hal/scripts @dirrm libexec/hal @dirrm include/hal @@ -136,8 +119,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo @unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true @unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true @unexec rmdir /var/run/hald 2>/dev/null || true -@dirrmtry share/locale/sl_SI/LC_MESSAGES -@dirrmtry share/locale/sl_SI -@dirrmtry share/locale/km/LC_MESSAGES -@dirrmtry share/locale/km +@unexec rmdir /var/cache/hald 2>/dev/null || true +@unexec rmdir /var/cache 2>/dev/null || true +@unexec /var/lib/hal 2>/dev/null || true +@unexec /var/lib 2>/dev/null || true %%MEDIA%%@unexec rmdir /media 2>/dev/null || true diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 9900ba6a5edf..531684648a58 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,29 +3,31 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.134 2007/09/18 00:44:04 marcus Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.141 2008/03/15 19:36:22 ahze Exp $ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 PORTREVISION= 1 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= CD burner view for Nautilus -RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao +BUILD_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount +RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ + cdrdao:${PORTSDIR}/sysutils/cdrdao +CONFIGURE_ARGS= --enable-gnome-mount USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \ - desktopfileutils + desktopfileutils ltasneededhack USE_CDRTOOLS= yes INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:15 @@ -36,8 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= nautilus-cd-burner.schemas OPTIONS= DVD "Enable DVD support" on \ - CJK "Use cdrtools-cjk instead of cdrtools" off \ - GNOMEMOUNT "Enable sysutils/gnome-mount support" off + CJK "Use cdrtools-cjk instead of cdrtools" off .include <bsd.port.pre.mk> @@ -49,14 +50,6 @@ WITHOUT_DVD= yes RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif -.if defined(WITH_GNOMEMOUNT) -BUILD_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount -RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount -CONFIGURE_ARGS+= --enable-gnome-mount -.else -CONFIGURE_ARGS+= --disable-gnome-mount -.endif - post-install: -@update-desktop-database @${CAT} ${PKGMESSAGE} diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 95075e8ab2c7..029d3fe5eb2b 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = a7ddb02c33be107f6c9c1874b7703e9e -SHA256 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = fc7a91473bc3cab7cba8ef4185e8f62ea6ad50a4558d8bce1aa639a4397ec905 -SIZE (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = 730319 +MD5 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = e75c61879a12ab329fd2f3081b7e5d76 +SHA256 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = c8bc7d9211438e5f12c755226d953884bfdf16957084ec423dcf80f4acb4cd63 +SIZE (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = 734921 diff --git a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c index 7b228d462b33..71f43178c354 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c @@ -1,10 +1,10 @@ ---- src/list_cddrives.c.orig Sun Nov 19 13:36:40 2006 -+++ src/list_cddrives.c Sun Nov 19 13:37:08 2006 +--- src/list_cddrives.c.orig 2008-01-21 11:14:45.000000000 -0500 ++++ src/list_cddrives.c 2008-01-21 19:48:49.000000000 -0500 @@ -49,6 +49,7 @@ list_drive_info (NautilusBurnDrive *driv - g_print ("Drive:\n"); - g_print (" name:\t\t\t%s\n", display_name); - g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive)); -+ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive)); - g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed"); - g_print (" type:\t\t\t%s\n", type_str); - g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE"); + g_print ("Drive:\n"); + g_print (" name:\t\t\t%s\n", display_name); + g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive)); ++ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive)); + g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed"); + g_print (" type:\t\t\t%s\n", type_str); + g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c index f3fa05c13792..18183a421d3b 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c @@ -1,38 +1,38 @@ ---- src/make-iso.c.orig Sun Nov 19 13:34:29 2006 -+++ src/make-iso.c Sun Nov 19 13:36:03 2006 +--- src/make-iso.c.orig Sun Nov 19 13:34:29 2006 ++++ src/make-iso.c Sun Nov 19 13:36:03 2006 @@ -1367,7 +1367,7 @@ get_disc_info (NautilusBurnIso *iso, - &has_data, - &_has_audio); - if (_has_audio) { -- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive)); -+ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive)); + &has_data, + &_has_audio); + if (_has_audio) { +- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive)); ++ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive)); - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "cdrdao"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "cdrdao"); @@ -1377,7 +1377,7 @@ get_disc_info (NautilusBurnIso *iso, - g_ptr_array_add (argv, NULL); + g_ptr_array_add (argv, NULL); - } else { -- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive)); -+ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); + } else { +- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive)); ++ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "readcd"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "readcd"); @@ -1547,7 +1547,7 @@ nautilus_burn_iso_make_from_drive (Nauti - g_ptr_array_add (argv, "--datafile"); - g_ptr_array_add (argv, (char *)filename); - g_ptr_array_add (argv, "--device"); -- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); -+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, "-v"); - g_ptr_array_add (argv, "2"); - g_ptr_array_add (argv, (char *)toc_filename_arg); + g_ptr_array_add (argv, "--datafile"); + g_ptr_array_add (argv, (char *)filename); + g_ptr_array_add (argv, "--device"); +- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); ++ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, "-v"); + g_ptr_array_add (argv, "2"); + g_ptr_array_add (argv, (char *)toc_filename_arg); @@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti - filename_arg = g_strdup_printf ("f=%s", filename); + filename_arg = g_strdup_printf ("f=%s", filename); -- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); +- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); ++ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "readcd"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "readcd"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c index 58743c0fe275..2d62886636fa 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c @@ -1,48 +1,48 @@ ---- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400 -+++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500 +--- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400 ++++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500 @@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo - */ - if (drive->priv->device != NULL && - (strcmp (drive->priv->device, target) == 0 || + */ + if (drive->priv->device != NULL && + (strcmp (drive->priv->device, target) == 0 || - strcmp (drive->priv->device, device) == 0)) { + strcmp (drive->priv->device, device) == 0 || + strcmp (drive->priv->cdrecord_device, device) == 0)) { - ret = nautilus_burn_drive_ref (drive); - break; - } + ret = nautilus_burn_drive_ref (drive); + break; + } @@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx, - NautilusBurnDrive *drive; - char **write_speeds = NULL; - char *raw_device = NULL; -+ char *cam_path = NULL; -+ char *cam_device = NULL; + NautilusBurnDrive *drive; + char **write_speeds = NULL; + char *raw_device = NULL; ++ char *cam_path = NULL; ++ char *cam_device = NULL; - LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE); + LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE); @@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx, - LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device); - LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device); -+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device); -+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path); - LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name); + LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device); + LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device); ++ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device); ++ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path); + LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name); - LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read); + LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read); @@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx, - drive->priv->device = raw_device; - } + drive->priv->device = raw_device; + } -+ if (cam_device != NULL) { -+ g_free (drive->priv->device); -+ drive->priv->device = cam_device; -+ } ++ if (cam_device != NULL) { ++ g_free (drive->priv->device); ++ drive->priv->device = cam_device; ++ } + -+ if (cam_path != NULL) { -+ drive->priv->cdrecord_device = cam_path; -+ } else { -+ drive->priv->cdrecord_device = g_strdup (drive->priv->device); -+ } ++ if (cam_path != NULL) { ++ drive->priv->cdrecord_device = cam_path; ++ } else { ++ drive->priv->cdrecord_device = g_strdup (drive->priv->device); ++ } + - drive->priv->drive_udi = g_strdup (udi); - drive->priv->write_speeds = hal_parse_write_speeds (write_speeds); - /* we do not own write_speeds so do not free it. */ + drive->priv->drive_udi = g_strdup (udi); + drive->priv->write_speeds = hal_parse_write_speeds (write_speeds); + /* we do not own write_speeds so do not free it. */ diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h index f70c5d4a2c65..a4da309cbb17 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h @@ -1,10 +1,10 @@ ---- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006 -+++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006 +--- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006 ++++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006 @@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate { - int type; - char *device; -+ char *cdrecord_device; - char *display_name; - int max_speed_write; - int max_speed_read; + int type; + char *device; ++ char *cdrecord_device; + char *display_name; + int max_speed_write; + int max_speed_read; diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c index 0210c9f4d32b..a3d5a2949a3e 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c @@ -1,29 +1,29 @@ ---- src/nautilus-burn-drive-selection.c.orig Sun Nov 19 13:39:17 2006 -+++ src/nautilus-burn-drive-selection.c Sun Nov 19 13:39:30 2006 +--- src/nautilus-burn-drive-selection.c.orig Sun Nov 19 13:39:17 2006 ++++ src/nautilus-burn-drive-selection.c Sun Nov 19 13:39:30 2006 @@ -151,7 +151,7 @@ nautilus_burn_drive_selection_set_drive_ - 0, drive); - g_signal_emit (G_OBJECT (selection), - nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED], -- 0, nautilus_burn_drive_get_device (drive)); -+ 0, nautilus_burn_drive_get_cdrecord_device (drive)); + 0, drive); + g_signal_emit (G_OBJECT (selection), + nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED], +- 0, nautilus_burn_drive_get_device (drive)); ++ 0, nautilus_burn_drive_get_cdrecord_device (drive)); - g_object_notify (G_OBJECT (selection), "device"); - g_object_notify (G_OBJECT (selection), "drive"); + g_object_notify (G_OBJECT (selection), "device"); + g_object_notify (G_OBJECT (selection), "drive"); @@ -584,7 +584,7 @@ nautilus_burn_drive_selection_get_defaul - if (drives == NULL) { - device = "/dev/cdrom"; - } else { -- device = nautilus_burn_drive_get_device (drives->data); -+ device = nautilus_burn_drive_get_cdrecord_device (drives->data); - g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL); - g_list_free (drives); - } + if (drives == NULL) { + device = "/dev/cdrom"; + } else { +- device = nautilus_burn_drive_get_device (drives->data); ++ device = nautilus_burn_drive_get_cdrecord_device (drives->data); + g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL); + g_list_free (drives); + } @@ -633,7 +633,7 @@ nautilus_burn_drive_selection_get_device - g_return_val_if_fail (selection != NULL, NULL); - g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL); + g_return_val_if_fail (selection != NULL, NULL); + g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL); -- return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL; -+ return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL; +- return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL; ++ return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL; } /** diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c index cb0cd120ec2a..17a0384464ec 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c @@ -1,5 +1,5 @@ ---- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006 -+++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006 +--- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006 ++++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006 @@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus } @@ -17,41 +17,28 @@ +const char * +nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive) +{ -+ g_return_val_if_fail (drive != NULL, NULL); ++ g_return_val_if_fail (drive != NULL, NULL); + -+ return drive->priv->cdrecord_device; ++ return drive->priv->cdrecord_device; +} + +/** * nautilus_burn_drive_get_drive_type: * @drive: #NautilusBurnDrive * -@@ -808,8 +827,12 @@ nautilus_burn_drive_eject (NautilusBurnD - #ifdef USE_GNOME_MOUNT - cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device); - #else -+#ifdef __FreeBSD_ -+ cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device); -+#else - cmd = g_strdup_printf ("eject %s", drive->priv->device); - #endif -+#endif - - res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL); - g_free (cmd); @@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o - g_free (drive->priv->write_speeds); - g_free (drive->priv->display_name); - g_free (drive->priv->device); -+ g_free (drive->priv->cdrecord_device); + g_free (drive->priv->write_speeds); + g_free (drive->priv->display_name); + g_free (drive->priv->device); ++ g_free (drive->priv->cdrecord_device); - if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) { - (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object); + if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) { + (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object); @@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr - drive->priv->max_speed_read = 0; - drive->priv->write_speeds = NULL; - drive->priv->device = NULL; -+ drive->priv->cdrecord_device = NULL; + drive->priv->max_speed_read = 0; + drive->priv->write_speeds = NULL; + drive->priv->device = NULL; ++ drive->priv->cdrecord_device = NULL; } /** diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h index 034d495b509e..f033fa3ba295 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h @@ -1,5 +1,5 @@ ---- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006 -+++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006 +--- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006 ++++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006 @@ -127,6 +127,7 @@ gboolean nautilus_burn_driv int nautilus_burn_drive_get_drive_type (NautilusBurnDrive *drive); char * nautilus_burn_drive_get_name_for_display (NautilusBurnDrive *drive); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c index 186f433fb659..85f6416abcfe 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c @@ -1,29 +1,29 @@ ---- src/nautilus-burn-recorder.c.orig Fri Sep 29 14:18:37 2006 -+++ src/nautilus-burn-recorder.c Mon Nov 20 18:13:24 2006 +--- src/nautilus-burn-recorder.c.orig Fri Sep 29 14:18:37 2006 ++++ src/nautilus-burn-recorder.c Mon Nov 20 18:13:24 2006 @@ -1343,7 +1343,7 @@ nautilus_burn_recorder_write_cdrecord (N - g_ptr_array_add (argv, "cdrdao"); - g_ptr_array_add (argv, "write"); - g_ptr_array_add (argv, "--device"); -- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); -+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, "--speed"); - speed_str = g_strdup_printf ("%d", speed); - g_ptr_array_add (argv, speed_str); + g_ptr_array_add (argv, "cdrdao"); + g_ptr_array_add (argv, "write"); + g_ptr_array_add (argv, "--device"); +- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); ++ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, "--speed"); + speed_str = g_strdup_printf ("%d", speed); + g_ptr_array_add (argv, speed_str); @@ -1375,7 +1375,7 @@ nautilus_burn_recorder_write_cdrecord (N - if (speed != 0) { - g_ptr_array_add (argv, speed_str); - } -- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, dev_str); - if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) { - g_ptr_array_add (argv, "-dummy"); + if (speed != 0) { + g_ptr_array_add (argv, speed_str); + } +- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); ++ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, dev_str); + if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) { + g_ptr_array_add (argv, "-dummy"); @@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "cdrecord"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "cdrecord"); -- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, dev_str); - g_ptr_array_add (argv, "-v"); +- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); ++ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, dev_str); + g_ptr_array_add (argv, "-v"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c index 9f729b800b17..3ed06173992e 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c @@ -1,5 +1,5 @@ ---- src/nautilus-cd-burner.c.orig Fri Jul 14 10:20:19 2006 -+++ src/nautilus-cd-burner.c Sun Nov 19 13:41:34 2006 +--- src/nautilus-cd-burner.c.orig Fri Jul 14 10:20:19 2006 ++++ src/nautilus-cd-burner.c Sun Nov 19 13:41:34 2006 @@ -27,6 +27,8 @@ #include "config.h" @@ -10,11 +10,11 @@ #include <stdio.h> #include <stdlib.h> @@ -246,7 +248,7 @@ selection_dialog_response (GtkWidget *di - /* save selections */ - gconf_client = gconf_client_get_default (); - gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL); -- gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive)); -+ gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive)); - g_object_unref (gconf_client); + /* save selections */ + gconf_client = gconf_client_get_default (); + gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL); +- gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive)); ++ gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive)); + g_object_unref (gconf_client); - operation = ncb_operation_new (); + operation = ncb_operation_new (); diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index efd6f53c256c..635ccb6e5989 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -1,5 +1,4 @@ bin/nautilus-cd-burner -etc/gnome-vfs-2.0/modules/mapping-modules.conf include/libnautilus-burn/nautilus-burn-drive-monitor.h include/libnautilus-burn/nautilus-burn-drive-selection.h include/libnautilus-burn/nautilus-burn-drive.h @@ -7,18 +6,14 @@ include/libnautilus-burn/nautilus-burn-features.h include/libnautilus-burn/nautilus-burn-init.h include/libnautilus-burn/nautilus-burn-recorder.h include/libnautilus-burn/nautilus-burn.h -lib/gnome-vfs-2.0/modules/libmapping.a -lib/gnome-vfs-2.0/modules/libmapping.la -lib/gnome-vfs-2.0/modules/libmapping.so lib/libnautilus-burn.a lib/libnautilus-burn.la lib/libnautilus-burn.so lib/libnautilus-burn.so.4 -lib/nautilus/extensions-1.0/libnautilus-burn-extension.a -lib/nautilus/extensions-1.0/libnautilus-burn-extension.la -lib/nautilus/extensions-1.0/libnautilus-burn-extension.so +lib/nautilus/extensions-2.0/libnautilus-burn-extension.a +lib/nautilus/extensions-2.0/libnautilus-burn-extension.la +lib/nautilus/extensions-2.0/libnautilus-burn-extension.so libdata/pkgconfig/libnautilus-burn.pc -libexec/mapping-daemon share/applications/nautilus-cd-burner-open-iso.desktop share/applications/nautilus-cd-burner.desktop share/icons/hicolor/16x16/apps/nautilus-cd-burner.png @@ -27,6 +22,7 @@ share/icons/hicolor/24x24/apps/nautilus-cd-burner.png share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/as/LC_MESSAGES/nautilus-cd-burner.mo share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo share/locale/be@latin/LC_MESSAGES/nautilus-cd-burner.mo @@ -62,6 +58,7 @@ share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ka/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/kn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ku/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo @@ -70,6 +67,7 @@ share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/mr/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo @@ -112,6 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo %%DATADIR%%/cdspin8.png %%DATADIR%%/nautilus-cd-burner.glade @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm include/libnautilus-burn @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @@ -129,6 +128,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -141,4 +142,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index 02c64f4972f9..29828f5c4c4c 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -3,11 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/sysutils/pessulus/Makefile,v 1.14 2007/09/17 20:08:42 ahze Exp $ +# $MCom: ports/sysutils/pessulus/Makefile,v 1.16 2008/03/10 23:41:35 ahze Exp $ # PORTNAME= pessulus -PORTVERSION= 2.16.3 +PORTVERSION= 2.16.4 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo index da3165e0369f..f8179e2a9a39 100644 --- a/sysutils/pessulus/distinfo +++ b/sysutils/pessulus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pessulus-2.16.3.tar.gz) = 002c70e42a04cf1abb3e02d962dad11f -SHA256 (gnome2/pessulus-2.16.3.tar.gz) = a9c164cae356382c83779ff6e1273e7e50184d95eb66a2c3e563816d4b2a73f4 -SIZE (gnome2/pessulus-2.16.3.tar.gz) = 213734 +MD5 (gnome2/pessulus-2.16.4.tar.gz) = 8eabdafd9dda0ea69052234d238dac41 +SHA256 (gnome2/pessulus-2.16.4.tar.gz) = f2af702e2f0699b556206a5a2c9bdb8edbd0183279e618eeef132d1e0476bc9a +SIZE (gnome2/pessulus-2.16.4.tar.gz) = 201497 diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist index beaade773392..0d8d984c4cb6 100644 --- a/sysutils/pessulus/pkg-plist +++ b/sysutils/pessulus/pkg-plist @@ -88,6 +88,7 @@ share/locale/mr/LC_MESSAGES/pessulus.mo share/locale/nb/LC_MESSAGES/pessulus.mo share/locale/ne/LC_MESSAGES/pessulus.mo share/locale/nl/LC_MESSAGES/pessulus.mo +share/locale/nn/LC_MESSAGES/pessulus.mo share/locale/oc/LC_MESSAGES/pessulus.mo share/locale/or/LC_MESSAGES/pessulus.mo share/locale/pa/LC_MESSAGES/pessulus.mo @@ -115,6 +116,7 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/Pessulus +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -133,4 +135,3 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile new file mode 100644 index 000000000000..95027020488e --- /dev/null +++ b/sysutils/policykit-gnome/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: PolicyKit-gnome +# Date Created: 20 January 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/policykit-gnome/Makefile,v 1.4 2008/02/15 16:48:08 mezz Exp $ +# + +PORTNAME= policykit-gnome +PORTVERSION= 0.7 +PORTREVISION= 2 +CATEGORIES= sysutils gnome +MASTER_SITES= http://hal.freedesktop.org/releases/ +DISTNAME= PolicyKit-gnome-${PORTVERSION} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME frontend to the PolicKit framework + +LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ + sexy.2:${PORTSDIR}/x11-toolkits/libsexy + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GETTEXT= yes +USE_GNOME= gnomehack gnometarget gnomevfs2 intlhack gnomedocutils +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS= --disable-gtk-doc \ + --localstatedir=/var +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/sysutils/policykit-gnome/distinfo b/sysutils/policykit-gnome/distinfo new file mode 100644 index 000000000000..c6fa5c414308 --- /dev/null +++ b/sysutils/policykit-gnome/distinfo @@ -0,0 +1,3 @@ +MD5 (PolicyKit-gnome-0.7.tar.bz2) = 978ccbe3c9426f4d59c7903f566f954b +SHA256 (PolicyKit-gnome-0.7.tar.bz2) = bff0612c12cc8380774674293fc89cb486d8e79bdb5c5b31b25aabc38d2251e4 +SIZE (PolicyKit-gnome-0.7.tar.bz2) = 990594 diff --git a/sysutils/policykit-gnome/files/patch-Makefile.in b/sysutils/policykit-gnome/files/patch-Makefile.in new file mode 100644 index 000000000000..da7d36ad049e --- /dev/null +++ b/sysutils/policykit-gnome/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2008-01-20 20:11:12.000000000 -0500 ++++ Makefile.in 2008-01-20 20:11:21.000000000 -0500 +@@ -251,7 +251,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + + # Need to build docs after examples because the docs include generated files +-SUBDIRS = data src polkit-gnome tools $(am__append_1) doc po ++SUBDIRS = data src polkit-gnome tools $(am__append_1) po + EXTRA_DIST = \ + autogen.sh \ + intltool-extract.in \ diff --git a/sysutils/policykit-gnome/pkg-descr b/sysutils/policykit-gnome/pkg-descr new file mode 100644 index 000000000000..37eebb83c9f3 --- /dev/null +++ b/sysutils/policykit-gnome/pkg-descr @@ -0,0 +1,5 @@ +PolicyKit is a framework for defining policy for system-wide components and +for desktop pieces to configure it. PolicyKit-gnome is a GTK+/GNOME frontend +for that framework. + +WWW: http://www.freedesktop.org/Software/hal diff --git a/sysutils/policykit-gnome/pkg-plist b/sysutils/policykit-gnome/pkg-plist new file mode 100644 index 000000000000..d4e3266dec01 --- /dev/null +++ b/sysutils/policykit-gnome/pkg-plist @@ -0,0 +1,21 @@ +bin/polkit-gnome-authorization +bin/polkit-gnome-example +include/PolicyKit/polkit-gnome/polkit-gnome-action.h +include/PolicyKit/polkit-gnome/polkit-gnome-auth.h +include/PolicyKit/polkit-gnome/polkit-gnome-context.h +include/PolicyKit/polkit-gnome/polkit-gnome-toggle-action.h +include/PolicyKit/polkit-gnome/polkit-gnome.h +lib/libpolkit-gnome.a +lib/libpolkit-gnome.la +lib/libpolkit-gnome.so +lib/libpolkit-gnome.so.0 +libdata/pkgconfig/polkit-gnome.pc +libexec/polkit-gnome-manager +share/PolicyKit/policy/polkit-gnome-example.policy +share/applications/polkit-gnome-authorization.desktop +share/dbus-1/services/gnome-org.freedesktop.PolicyKit.AuthenticationAgent.service +share/dbus-1/services/org.gnome.PolicyKit.AuthorizationManager.service +share/dbus-1/services/org.gnome.PolicyKit.service +share/locale/da/LC_MESSAGES/PolicyKit-gnome.mo +@dirrmtry share/applications +@dirrm include/PolicyKit/polkit-gnome diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile index 794b57676a41..4a083a5bd0f4 100644 --- a/sysutils/policykit/Makefile +++ b/sysutils/policykit/Makefile @@ -3,37 +3,54 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/policykit/Makefile,v 1.12 2006/10/07 19:45:38 marcus Exp $ +# $MCom: ports/sysutils/policykit/Makefile,v 1.19 2008/01/20 04:41:31 marcus Exp $ # PORTNAME= policykit -PORTVERSION= 0.1.20060514 -PORTREVISION= 4 +PORTVERSION= 0.7 +PORTREVISION= 2 CATEGORIES= sysutils gnome -MASTER_SITES= http://www.marcuscom.com/downloads/ +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= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +BUILD_DEPENDS= docbook2html:${PORTSDIR}/textproc/docbook-utils \ + ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + expat.6:${PORTSDIR}/textproc/expat2 +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_BZIP2= yes -USE_GNOME= gnomehack gnometarget +USE_GNOME= gnomehack gnometarget glib20 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ - --with-pid-file=/var/run/polkitd/polkitd.pid \ - --with-pam-include=system + --with-pam-include=system \ + --with-os-type=freebsd \ + --localstatedir=/var \ + --with-polkit-user=polkit \ + --with-polkit-group=polkit CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" -USE_RC_SUBR= polkitd -USE_GNOME_SUBR= yes +MAN1= polkit-action.1 polkit-auth.1 polkit-config-file-validate.1 \ + polkit-policy-file-validate.1 +MAN5= PolicyKit.conf.5 +MAN8= PolicyKit.8 post-install: + ${MKDIR} ${PREFIX}/etc/PolicyKit + if [ ! -f ${PREFIX}/etc/PolicyKit/PolicyKit.conf ]; then \ + ${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \ + ${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \ + fi + ${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \ + ${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/sysutils/policykit/distinfo b/sysutils/policykit/distinfo index 2bf4052122f3..875461516bb4 100644 --- a/sysutils/policykit/distinfo +++ b/sysutils/policykit/distinfo @@ -1,3 +1,3 @@ -MD5 (PolicyKit-0.1.20060514.tar.bz2) = f81ac5fb28603a4b419fca6c4efc027a -SHA256 (PolicyKit-0.1.20060514.tar.bz2) = d9015a69d63902b091475ad2cad1b6fe012cf0e8fead6603cf822c2033c9d552 -SIZE (PolicyKit-0.1.20060514.tar.bz2) = 333800 +MD5 (PolicyKit-0.7.tar.gz) = 99e0cc588310656fa25f8f66a411c71f +SHA256 (PolicyKit-0.7.tar.gz) = 87245f790142a245a5f5ba75d4a4e95612b391e82cf4d61659b3e50c4f6b9eeb +SIZE (PolicyKit-0.7.tar.gz) = 1214032 diff --git a/sysutils/policykit/files/patch-Makefile.in b/sysutils/policykit/files/patch-Makefile.in index 0c9552c020d6..29a907e4414a 100644 --- a/sysutils/policykit/files/patch-Makefile.in +++ b/sysutils/policykit/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Mon May 1 01:11:30 2006 -+++ Makefile.in Mon May 1 01:11:43 2006 -@@ -231,7 +231,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ +--- 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@ --SUBDIRS = libpolkit polkitd doc tools privileges -+SUBDIRS = libpolkit polkitd tools privileges - pamdir = $(sysconfdir)/pam.d - pam_DATA = policy-kit - pkgconfigdir = $(prefix)/libdata/pkgconfig + 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-config.h.in b/sysutils/policykit/files/patch-config.h.in new file mode 100644 index 000000000000..b8cb8f384d74 --- /dev/null +++ b/sysutils/policykit/files/patch-config.h.in @@ -0,0 +1,34 @@ +--- config.h.in.orig 2007-11-30 20:43:35.000000000 -0500 ++++ config.h.in 2007-12-24 14:47:06.000000000 -0500 +@@ -24,6 +24,18 @@ + /* Define to 1 if you have the `getgrouplist' function. */ + #undef HAVE_GETGROUPLIST + ++/* Define to 1 if you have the `clearenv' function. */ ++#undef HAVE_CLEARENV ++ ++/* Define to 1 if you have the `strndup' function. */ ++#undef HAVE_STRNDUP ++ ++/* Define to 1 if you have the `readdir64' function. */ ++#undef HAVE_READDIR64 ++ ++/* Define to 1 if you have the `getline' function. */ ++#undef HAVE_GETLINE ++ + /* Define if the GNU gettext() function is already present or preinstalled. */ + #undef HAVE_GETTEXT + +@@ -117,6 +129,12 @@ + /* Define if pam_strerror takes two arguments */ + #undef PAM_STRERROR_TWO_ARGS + ++/* Enable Linux inotify() usage */ ++#undef HAVE_INOTIFY ++ ++/* Enable BSD kqueue() usage */ ++#undef HAVE_KQUEUE ++ + /* Authorization Database to use */ + #undef POLKIT_AUTHDB + diff --git a/sysutils/policykit/files/patch-configure b/sysutils/policykit/files/patch-configure new file mode 100644 index 000000000000..2e99765e746d --- /dev/null +++ b/sysutils/policykit/files/patch-configure @@ -0,0 +1,735 @@ +--- configure.bak 2007-11-30 20:42:54.000000000 -0500 ++++ configure 2007-12-23 00:35:53.000000000 -0500 +@@ -929,10 +929,16 @@ OS_TYPE_GENTOO_TRUE + OS_TYPE_GENTOO_FALSE + OS_TYPE_PARDUS_TRUE + OS_TYPE_PARDUS_FALSE ++OS_TYPE_FREEBSD_TRUE ++OS_TYPE_FREEBSD_FALSE + PAM_FILE_INCLUDE_AUTH + PAM_FILE_INCLUDE_ACCOUNT + PAM_FILE_INCLUDE_PASSWORD + PAM_FILE_INCLUDE_SESSION ++HAVE_INOTIFY_TRUE ++HAVE_INOTIFY_FALSE ++HAVE_KQUEUE_TRUE ++HAVE_KQUEUE_FALSE + INTLTOOL_DESKTOP_RULE + INTLTOOL_DIRECTORY_RULE + INTLTOOL_KEYS_RULE +@@ -6544,7 +6550,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6547 "configure"' > conftest.$ac_ext ++ echo '#line 6553 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8882,11 +8888,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8885: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8891: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8889: \$? = $ac_status" >&5 ++ echo "$as_me:8895: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9172,11 +9178,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9175: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9181: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9179: \$? = $ac_status" >&5 ++ echo "$as_me:9185: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9276,11 +9282,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9279: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9285: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9283: \$? = $ac_status" >&5 ++ echo "$as_me:9289: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11627,7 +11633,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11630 "configure" ++#line 11636 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11727,7 +11733,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11730 "configure" ++#line 11736 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14147,11 +14153,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14150: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14156: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14154: \$? = $ac_status" >&5 ++ echo "$as_me:14160: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14251,11 +14257,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14254: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14260: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14258: \$? = $ac_status" >&5 ++ echo "$as_me:14264: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15815,11 +15821,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15818: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15824: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15822: \$? = $ac_status" >&5 ++ echo "$as_me:15828: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15919,11 +15925,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15922: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15928: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15926: \$? = $ac_status" >&5 ++ echo "$as_me:15932: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18108,11 +18114,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18111: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18117: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18115: \$? = $ac_status" >&5 ++ echo "$as_me:18121: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18398,11 +18404,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18401: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18407: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18405: \$? = $ac_status" >&5 ++ echo "$as_me:18411: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18502,11 +18508,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18505: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18511: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:18509: \$? = $ac_status" >&5 ++ echo "$as_me:18515: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -22501,7 +22507,9 @@ fi + + + +-for ac_func in getgrouplist ++ ++ ++for ac_func in getgrouplist clearenv strndup getline readdir64 + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + { echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -24087,6 +24095,14 @@ else + OS_TYPE_PARDUS_FALSE= + fi + ++ if test x$with_os_type = xfreebsd; then ++ OS_TYPE_FREEBSD_TRUE= ++ OS_TYPE_FREEBSD_FALSE='#' ++else ++ OS_TYPE_FREEBSD_TRUE='#' ++ OS_TYPE_FREEBSD_FALSE= ++fi ++ + + + # Check whether --with-pam-include was given. +@@ -24111,6 +24127,11 @@ elif test x$with_os_type = xsuse ; then + PAM_FILE_INCLUDE_ACCOUNT=common-account + PAM_FILE_INCLUDE_PASSWORD=common-password + PAM_FILE_INCLUDE_SESSION=common-session ++elif test x$with_os_type = xfreebsd ; then ++ PAM_FILE_INCLUDE_AUTH=system ++ PAM_FILE_INCLUDE_ACCOUNT=system ++ PAM_FILE_INCLUDE_PASSWORD=system ++ PAM_FILE_INCLUDE_SESSION=system + else + PAM_FILE_INCLUDE_AUTH=system-auth + PAM_FILE_INCLUDE_ACCOUNT=system-auth +@@ -24143,6 +24164,430 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + ++have_inotify=no ++ ++for ac_header in linux/inotify.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ----------------------------- ## ++## Report this to david@fubar.dk ## ++## ----------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ have_inotify=yes ++fi ++ ++done ++ ++ ++for ac_header in sys/inotify.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ----------------------------- ## ++## Report this to david@fubar.dk ## ++## ----------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ have_inotify=yes ++fi ++ ++done ++ ++ ++ if test "x$have_inotify" = "xyes"; then ++ HAVE_INOTIFY_TRUE= ++ HAVE_INOTIFY_FALSE='#' ++else ++ HAVE_INOTIFY_TRUE='#' ++ HAVE_INOTIFY_FALSE= ++fi ++ ++ ++if test "x$have_inotify" = "xyes" ; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_INOTIFY 1 ++_ACEOF ++ ++fi ++ ++have_kqueue=yes ++ ++for ac_func in kqueue ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++else ++ have_kqueue=no ++fi ++done ++ ++ ++ if test "x$have_kqueue" = "xyes"; then ++ HAVE_KQUEUE_TRUE= ++ HAVE_KQUEUE_FALSE='#' ++else ++ HAVE_KQUEUE_TRUE='#' ++ HAVE_KQUEUE_FALSE= ++fi ++ ++ ++if test "x$have_kqueue" = "xyes" ; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_KQUEUE 1 ++_ACEOF ++ ++fi ++ + # ******************** + # Internationalisation + # ******************** +@@ -26232,6 +26677,27 @@ echo "$as_me: error: conditional \"OS_TY + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${OS_TYPE_FREEBSD_TRUE}" && test -z "${OS_TYPE_FREEBSD_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"OS_TYPE_FREEBSD\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"OS_TYPE_FREEBSD\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_INOTIFY_TRUE}" && test -z "${HAVE_INOTIFY_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INOTIFY\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_INOTIFY\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_KQUEUE_TRUE}" && test -z "${HAVE_KQUEUE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_KQUEUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_KQUEUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + + ac_config_commands="$ac_config_commands po/stamp-it" + +@@ -26995,10 +27461,16 @@ OS_TYPE_GENTOO_TRUE!$OS_TYPE_GENTOO_TRUE + OS_TYPE_GENTOO_FALSE!$OS_TYPE_GENTOO_FALSE$ac_delim + OS_TYPE_PARDUS_TRUE!$OS_TYPE_PARDUS_TRUE$ac_delim + OS_TYPE_PARDUS_FALSE!$OS_TYPE_PARDUS_FALSE$ac_delim ++OS_TYPE_FREEBSD_TRUE!$OS_TYPE_FREEBSD_TRUE$ac_delim ++OS_TYPE_FREEBSD_FALSE!$OS_TYPE_FREEBSD_FALSE$ac_delim + PAM_FILE_INCLUDE_AUTH!$PAM_FILE_INCLUDE_AUTH$ac_delim + PAM_FILE_INCLUDE_ACCOUNT!$PAM_FILE_INCLUDE_ACCOUNT$ac_delim + PAM_FILE_INCLUDE_PASSWORD!$PAM_FILE_INCLUDE_PASSWORD$ac_delim + PAM_FILE_INCLUDE_SESSION!$PAM_FILE_INCLUDE_SESSION$ac_delim ++HAVE_INOTIFY_TRUE!$HAVE_INOTIFY_TRUE$ac_delim ++HAVE_INOTIFY_FALSE!$HAVE_INOTIFY_FALSE$ac_delim ++HAVE_KQUEUE_TRUE!$HAVE_KQUEUE_TRUE$ac_delim ++HAVE_KQUEUE_FALSE!$HAVE_KQUEUE_FALSE$ac_delim + INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim + INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim + INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim +@@ -27022,12 +27494,6 @@ INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_de + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim + INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim +-ALL_LINGUAS!$ALL_LINGUAS$ac_delim +-DATADIRNAME!$DATADIRNAME$ac_delim +-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +-USE_NLS!$USE_NLS$ac_delim +-MSGFMT!$MSGFMT$ac_delim +-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -27069,6 +27535,12 @@ _ACEOF + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++ALL_LINGUAS!$ALL_LINGUAS$ac_delim ++DATADIRNAME!$DATADIRNAME$ac_delim ++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim ++USE_NLS!$USE_NLS$ac_delim ++MSGFMT!$MSGFMT$ac_delim ++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim + XGETTEXT!$XGETTEXT$ac_delim + CATALOGS!$CATALOGS$ac_delim +@@ -27085,7 +27557,7 @@ LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/sysutils/policykit/files/patch-configure.in b/sysutils/policykit/files/patch-configure.in new file mode 100644 index 000000000000..d54068c952b8 --- /dev/null +++ b/sysutils/policykit/files/patch-configure.in @@ -0,0 +1,57 @@ +--- configure.in.orig 2007-11-25 15:43:40.000000000 -0500 ++++ configure.in 2007-12-23 00:34:37.000000000 -0500 +@@ -169,7 +169,7 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib- + AC_SUBST(DBUS_GLIB_CFLAGS) + AC_SUBST(DBUS_GLIB_LIBS) + +-AC_CHECK_FUNCS(getgrouplist) ++AC_CHECK_FUNCS(getgrouplist clearenv strndup getline readdir64) + + EXPAT_LIB="" + AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here], +@@ -406,6 +406,7 @@ AM_CONDITIONAL(OS_TYPE_RED_HAT, test x$w + AM_CONDITIONAL(OS_TYPE_SUSE, test x$with_os_type = xsuse, [Running on SUSE OS'es]) + AM_CONDITIONAL(OS_TYPE_GENTOO, test x$with_os_type = xgentoo, [Running on Gentoo OS'es]) + AM_CONDITIONAL(OS_TYPE_PARDUS, test x$with_os_type = xpardus, [Running on Pardus OS'es]) ++AM_CONDITIONAL(OS_TYPE_FREEBSD, test x$with_os_type = xfreebsd, [Running on FreeBSD OS'es]) + + AC_ARG_WITH(pam-include, [ --with-pam-include=<file> pam file to include]) + +@@ -425,6 +426,11 @@ elif test x$with_os_type = xsuse ; then + PAM_FILE_INCLUDE_ACCOUNT=common-account + PAM_FILE_INCLUDE_PASSWORD=common-password + PAM_FILE_INCLUDE_SESSION=common-session ++elif test x$with_os_type = xfreebsd ; then ++ PAM_FILE_INCLUDE_AUTH=system ++ PAM_FILE_INCLUDE_ACCOUNT=system ++ PAM_FILE_INCLUDE_PASSWORD=system ++ PAM_FILE_INCLUDE_SESSION=system + else + PAM_FILE_INCLUDE_AUTH=system-auth + PAM_FILE_INCLUDE_ACCOUNT=system-auth +@@ -441,6 +447,25 @@ AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_ACCO + AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_PASSWORD, "$PAM_FILE_INCLUDE_PASSWORD", [pam file password]) + AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_SESSION, "$PAM_FILE_INCLUDE_SESSION", [pam file session]) + ++have_inotify=no ++AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes]) ++AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes]) ++ ++AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes") ++ ++if test "x$have_inotify" = "xyes" ; then ++ AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage]) ++fi ++ ++have_kqueue=yes ++AC_CHECK_FUNCS([kqueue],,have_kqueue=no) ++ ++AM_CONDITIONAL(HAVE_KQUEUE, test "x$have_kqueue" = "xyes") ++ ++if test "x$have_kqueue" = "xyes" ; then ++ AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) ++fi ++ + # ******************** + # Internationalisation + # ******************** diff --git a/sysutils/policykit/files/patch-data_Makefile.in b/sysutils/policykit/files/patch-data_Makefile.in new file mode 100644 index 000000000000..f32ab19c0983 --- /dev/null +++ b/sysutils/policykit/files/patch-data_Makefile.in @@ -0,0 +1,25 @@ +--- 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-polkitd_policy.c b/sysutils/policykit/files/patch-polkitd_policy.c deleted file mode 100644 index c633366a2b60..000000000000 --- a/sysutils/policykit/files/patch-polkitd_policy.c +++ /dev/null @@ -1,118 +0,0 @@ ---- polkitd/policy.c.orig Tue Mar 14 07:14:33 2006 -+++ polkitd/policy.c Tue May 2 01:53:06 2006 -@@ -537,13 +537,15 @@ - int rc; - char *res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct passwd pwd; - struct passwd *pwdp; - - res = NULL; - - bufsize = sysconf (_SC_GETPW_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getpwuid_r (uid, &pwd, buf, bufsize, &pwdp); -@@ -567,13 +569,15 @@ - int rc; - char *res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct group gbuf; - struct group *gbufp; - - res = NULL; - - bufsize = sysconf (_SC_GETGR_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getgrgid_r (gid, &gbuf, buf, bufsize, &gbufp); -@@ -597,13 +601,15 @@ - int rc; - uid_t res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct passwd pwd; - struct passwd *pwdp; - - res = (uid_t) -1; - - bufsize = sysconf (_SC_GETPW_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getpwnam_r (username, &pwd, buf, bufsize, &pwdp); -@@ -627,13 +633,15 @@ - int rc; - gid_t res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct group gbuf; - struct group *gbufp; - - res = (gid_t) -1; - - bufsize = sysconf (_SC_GETGR_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getgrnam_r (groupname, &gbuf, buf, bufsize, &gbufp); -@@ -649,6 +657,23 @@ - return res; - } - -+static int -+getgrouplist_ala_linux (const char *name, -+ gid_t basegid, -+ gid_t *groups, -+ int *ngroups) -+{ -+ if (groups) -+ return getgrouplist (name, basegid, groups, ngroups); -+ else { -+ for (*ngroups = 1;; (*ngroups)++) { -+ gid_t _groups[*ngroups]; -+ if (getgrouplist (name, basegid, _groups, ngroups) != -1) -+ return 0; -+ } -+ } -+} -+ - PolicyResult - policy_get_allowed_resources_for_policy_for_uid (uid_t uid, - const char *policy, -@@ -665,9 +690,9 @@ - if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL) - goto out; - -- if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) { - groups = (gid_t *) g_new0 (gid_t, num_groups); -- if (getgrouplist(username, default_gid, groups, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) { - g_warning ("getgrouplist() failed"); - goto out; - } -@@ -702,9 +727,9 @@ - if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL) - goto out; - -- if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) { - groups = (gid_t *) g_new0 (gid_t, num_groups); -- if (getgrouplist(username, default_gid, groups, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) { - g_warning ("getgrouplist() failed"); - goto out; - } diff --git a/sysutils/policykit/files/patch-src_kit_kit-file.c b/sysutils/policykit/files/patch-src_kit_kit-file.c new file mode 100644 index 000000000000..af3ffe0f4974 --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-file.c @@ -0,0 +1,26 @@ +--- src/kit/kit-file.c.orig 2007-11-28 16:32:08.000000000 -0500 ++++ src/kit/kit-file.c 2007-12-24 14:48:35.000000000 -0500 +@@ -283,7 +283,11 @@ _kit_get_num_fd (void) + DIR *dir; + char buf[128]; + ssize_t num; ++#ifdef HAVE_READDIR64 + struct dirent64 *d; ++#else ++ struct dirent *d; ++#endif + + num = -1; + +@@ -296,7 +300,11 @@ _kit_get_num_fd (void) + } + + num = -2; ++#ifdef HAVE_READDIR64 + while ((d = readdir64 (dir)) != NULL) { ++#else ++ while ((d = readdir (dir)) != NULL) { ++#endif + if (d->d_name == NULL) + continue; + num++; diff --git a/sysutils/policykit/files/patch-src_kit_kit-file.h b/sysutils/policykit/files/patch-src_kit_kit-file.h new file mode 100644 index 000000000000..ae2a2ac7187a --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-file.h @@ -0,0 +1,10 @@ +--- src/kit/kit-file.h.orig 2007-12-22 19:14:03.000000000 -0500 ++++ src/kit/kit-file.h 2007-12-22 19:14:13.000000000 -0500 +@@ -34,6 +34,7 @@ + #ifndef KIT_FILE_H + #define KIT_FILE_H + ++#include <sys/stat.h> + #include <kit/kit.h> + + KIT_BEGIN_DECLS diff --git a/sysutils/policykit/files/patch-src_kit_kit-spawn.c b/sysutils/policykit/files/patch-src_kit_kit-spawn.c new file mode 100644 index 000000000000..7fbee5ec794b --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-spawn.c @@ -0,0 +1,10 @@ +--- src/kit/kit-spawn.c.orig 2007-12-23 00:22:49.000000000 -0500 ++++ src/kit/kit-spawn.c 2007-12-23 00:22:58.000000000 -0500 +@@ -40,6 +40,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <errno.h> ++#include <signal.h> + + #include <kit/kit.h> + #include "kit-test.h" diff --git a/sysutils/policykit/files/patch-src_kit_kit-string.c b/sysutils/policykit/files/patch-src_kit_kit-string.c new file mode 100644 index 000000000000..e7b375e05bdd --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-string.c @@ -0,0 +1,42 @@ +--- src/kit/kit-string.c.orig 2007-12-23 00:42:03.000000000 -0500 ++++ src/kit/kit-string.c 2007-12-23 00:41:26.000000000 -0500 +@@ -77,7 +77,15 @@ kit_strdup (const char *s) + out: + return p; + } ++#else /* !KIT_BUILD_TESTS */ ++char * ++kit_strdup (const char *s) ++{ ++ return strdup (s); ++} ++#endif /* KIT_BUILD_TESTS */ + ++#if defined(KIT_BUILD_TESTS) || !defined(HAVE_STRNDUP) + /** + * kit_strndup: + * @s: string +@@ -111,13 +119,7 @@ out: + return p; + } + +-#else +- +-char * +-kit_strdup (const char *s) +-{ +- return strdup (s); +-} ++#else /* !KIT_BUILD_TESTS || HAVE_STRNDUP */ + + char * + kit_strndup (const char *s, size_t n) +@@ -125,7 +127,7 @@ kit_strndup (const char *s, size_t n) + return strndup (s, n); + } + +-#endif /* KIT_BUILD_TESTS */ ++#endif /* KIT_BUILD_TESTS || !HAVE_STRNDUP */ + + /** + * kit_strdup_printf: diff --git a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c new file mode 100644 index 000000000000..d9351cea6771 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c @@ -0,0 +1,43 @@ +--- src/polkit-dbus/polkit-read-auth-helper.c.orig 2007-11-28 23:33:10.000000000 -0500 ++++ src/polkit-dbus/polkit-read-auth-helper.c 2007-12-24 14:53:38.000000000 -0500 +@@ -39,6 +39,7 @@ + #include <string.h> + #include <unistd.h> + #include <sys/types.h> ++#include <sys/param.h> + #include <sys/stat.h> + #include <security/pam_appl.h> + #include <grp.h> +@@ -156,7 +157,11 @@ dump_auths_all (const char *root) + { + DIR *dir; + int dfd; ++#ifdef HAVE_READDIR64 + struct dirent64 *d; ++#else ++ struct dirent *d; ++#endif + polkit_bool_t ret; + + ret = FALSE; +@@ -173,7 +178,11 @@ dump_auths_all (const char *root) + goto out; + } + ++#ifdef HAVE_READDIR64 + while ((d = readdir64(dir)) != NULL) { ++#else ++ while ((d = readdir(dir)) != NULL) { ++#endif + unsigned int n, m; + uid_t uid; + size_t name_len; +@@ -282,7 +291,7 @@ main (int argc, char *argv[]) + + #ifndef POLKIT_BUILD_TESTS + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c new file mode 100644 index 000000000000..8361f7c0bef2 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-dbus/polkit-set-default-helper.c.orig 2007-12-23 01:21:04.000000000 -0500 ++++ src/polkit-dbus/polkit-set-default-helper.c 2007-12-23 01:21:11.000000000 -0500 +@@ -127,7 +127,7 @@ main (int argc, char *argv[]) + + ret = 1; + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am new file mode 100644 index 000000000000..73f38d381015 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am @@ -0,0 +1,11 @@ +--- src/polkit-grant/Makefile.am.orig 2007-12-23 01:40:02.000000000 -0500 ++++ src/polkit-grant/Makefile.am 2007-12-23 01:40:27.000000000 -0500 +@@ -47,7 +47,7 @@ polkit_grant_helper_SOURCES = polkit-gra + polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la + + polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c +-polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ ++polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ $(top_builddir)/src/polkit/libpolkit.la + + polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c + polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@ diff --git a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in new file mode 100644 index 000000000000..6723a3a127ad --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in @@ -0,0 +1,11 @@ +--- src/polkit-grant/Makefile.in.orig 2007-12-23 01:40:49.000000000 -0500 ++++ src/polkit-grant/Makefile.in 2007-12-23 01:41:16.000000000 -0500 +@@ -351,7 +351,7 @@ libpolkit_grant_la_LDFLAGS = -version-in + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_SOURCES = polkit-grant-helper.c + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c +-@POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ ++@POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ $(top_builddir)/src/polkit/libpolkit.la + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@ + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_LDADD = $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c new file mode 100644 index 000000000000..cf9689c67396 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-grant/polkit-explicit-grant-helper.c.orig 2007-12-23 01:24:19.000000000 -0500 ++++ src/polkit-grant/polkit-explicit-grant-helper.c 2007-12-23 01:24:24.000000000 -0500 +@@ -67,7 +67,7 @@ main (int argc, char *argv[]) + ret = 1; + + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c new file mode 100644 index 000000000000..bb957f167e69 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c @@ -0,0 +1,20 @@ +--- src/polkit-grant/polkit-grant-helper-pam.c.orig 2007-11-28 16:28:31.000000000 -0500 ++++ src/polkit-grant/polkit-grant-helper-pam.c 2007-12-23 02:01:46.000000000 -0500 +@@ -38,6 +38,8 @@ + #include <syslog.h> + #include <security/pam_appl.h> + ++#include <polkit/polkit.h> ++ + /* Development aid: define PGH_DEBUG to get debugging output. Do _NOT_ + * enable this in production builds; it may leak passwords and other + * sensitive information. +@@ -60,7 +62,7 @@ main (int argc, char *argv[]) + pam_h = NULL; + + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto error; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c new file mode 100644 index 000000000000..0cab8899cf02 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-grant/polkit-grant-helper.c.orig 2007-12-23 01:23:13.000000000 -0500 ++++ src/polkit-grant/polkit-grant-helper.c 2007-12-23 01:23:19.000000000 -0500 +@@ -546,7 +546,7 @@ main (int argc, char *argv[]) + ret = 3; + + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c new file mode 100644 index 000000000000..c377b9614635 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c @@ -0,0 +1,19 @@ +--- src/polkit-grant/polkit-grant.c.orig 2007-11-28 16:29:25.000000000 -0500 ++++ src/polkit-grant/polkit-grant.c 2007-12-23 01:25:08.000000000 -0500 +@@ -38,6 +38,7 @@ + #include <sys/types.h> + #include <unistd.h> + #include <sys/wait.h> ++#include <signal.h> + + #include <glib.h> + #include "polkit-grant.h" +@@ -301,7 +302,7 @@ polkit_grant_io_func (PolKitGrant *polki + g_return_if_fail (polkit_grant != NULL); + g_return_if_fail (polkit_grant->helper_is_running); + +- while (getline (&line, &line_len, polkit_grant->child_stdout_f) != -1) { ++ while (polkit_sysdeps_getline (&line, &line_len, polkit_grant->child_stdout_f) != -1) { + if (strlen (line) > 0 && + line[strlen (line) - 1] == '\n') + line[strlen (line) - 1] = '\0'; diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c new file mode 100644 index 000000000000..c0ff4b64aaa7 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-grant/polkit-revoke-helper.c.orig 2007-12-23 01:22:38.000000000 -0500 ++++ src/polkit-grant/polkit-revoke-helper.c 2007-12-23 01:22:47.000000000 -0500 +@@ -109,7 +109,7 @@ main (int argc, char *argv[]) + + #ifndef POLKIT_BUILD_TESTS + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-config.c b/sysutils/policykit/files/patch-src_polkit_polkit-config.c new file mode 100644 index 000000000000..f5b2e008222a --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-config.c @@ -0,0 +1,10 @@ +--- src/polkit/polkit-config.c.orig 2007-12-23 00:25:46.000000000 -0500 ++++ src/polkit/polkit-config.c 2007-12-23 00:25:51.000000000 -0500 +@@ -39,7 +39,6 @@ + #include <grp.h> + #include <unistd.h> + #include <errno.h> +-#include <sys/inotify.h> + #include <regex.h> + #include <syslog.h> + #include <regex.h> diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-context.c b/sysutils/policykit/files/patch-src_polkit_polkit-context.c new file mode 100644 index 000000000000..b27cd8edd727 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-context.c @@ -0,0 +1,189 @@ +--- src/polkit/polkit-context.c.orig 2007-12-04 20:22:41.000000000 -0500 ++++ src/polkit/polkit-context.c 2007-12-23 00:24:45.000000000 -0500 +@@ -39,7 +39,13 @@ + #include <grp.h> + #include <unistd.h> + #include <errno.h> ++#ifdef HAVE_INOTIFY + #include <sys/inotify.h> ++#elif HAVE_KQUEUE ++#include <sys/event.h> ++#include <sys/time.h> ++#include <fcntl.h> ++#endif + #include <syslog.h> + + #include "polkit-config.h" +@@ -106,11 +112,19 @@ struct _PolKitContext + + polkit_bool_t load_descriptions; + ++#ifdef HAVE_INOTIFY + int inotify_fd; + int inotify_fd_watch_id; + int inotify_config_wd; + int inotify_policy_wd; + int inotify_grant_perm_wd; ++#elif HAVE_KQUEUE ++ int kqueue_fd; ++ int kqueue_fd_watch_id; ++ int kqueue_config_fd; ++ int kqueue_policy_fd; ++ int kqueue_grant_perm_fd; ++#endif + }; + + /** +@@ -144,6 +158,10 @@ polkit_context_new (void) + polkit_bool_t + polkit_context_init (PolKitContext *pk_context, PolKitError **error) + { ++#ifdef HAVE_KQUEUE ++ struct kevent ev; ++#endif ++ + kit_return_val_if_fail (pk_context != NULL, FALSE); + + pk_context->policy_dir = kit_strdup (PACKAGE_DATA_DIR "/PolicyKit/policy"); +@@ -153,6 +171,7 @@ polkit_context_init (PolKitContext *pk_c + + /* NOTE: we don't load the configuration file until it's needed */ + ++#ifdef HAVE_INOTIFY + if (pk_context->io_add_watch_func != NULL) { + pk_context->inotify_fd = inotify_init (); + if (pk_context->inotify_fd < 0) { +@@ -203,6 +222,88 @@ polkit_context_init (PolKitContext *pk_c + goto error; + } + } ++#elif HAVE_KQUEUE ++ if (pk_context->io_add_watch_func != NULL) { ++ pk_context->kqueue_fd = kqueue (); ++ if (pk_context->kqueue_fd < 0) { ++ _pk_debug ("failed to initialize kqueue: %s", strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ /* Watch the /etc/PolicyKit/PolicyKit.conf file */ ++ pk_context->kqueue_config_fd = open (PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf", O_RDONLY); ++ if (pk_context->kqueue_config_fd < 0) { ++ _pk_debug ("failed '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf' for reading: %s", ++ strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ EV_SET (&ev, pk_context->kqueue_config_fd, EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, ++ 0, 0); ++ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) { ++ _pk_debug ("failed to add watch on file '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf': %s", ++ strerror (errno)); ++ close (pk_context->kqueue_config_fd); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ /* Watch the /usr/share/PolicyKit/policy directory */ ++ pk_context->kqueue_policy_fd = open (PACKAGE_DATA_DIR "/PolicyKit/policy", O_RDONLY); ++ if (pk_context->kqueue_policy_fd < 0) { ++ _pk_debug ("failed to open '" PACKAGE_DATA_DIR "/PolicyKit/policy for reading: %s", ++ strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ EV_SET (&ev, pk_context->kqueue_policy_fd, EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, ++ 0, 0); ++ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) { ++ _pk_debug ("failed to add watch on directory '" PACKAGE_DATA_DIR "/PolicyKit/policy': %s", ++ strerror (errno)); ++ close (pk_context->kqueue_policy_fd); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++#ifdef POLKIT_AUTHDB_DEFAULT ++ /* Watch the /var/lib/misc/PolicyKit.reload file */ ++ pk_context->kqueue_grant_perm_fd = open (PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload", O_RDONLY); ++ if (pk_context->kqueue_grant_perm_fd < 0) { ++ _pk_debug ("failed to open '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload' for reading: %s", ++ strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ EV_SET (&ev, pk_context->kqueue_grant_perm_fd, EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, ++ 0, 0); ++ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) { ++ _pk_debug ("failed to add watch on file '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload': %s", ++ strerror (errno)); ++ close (pk_context->kqueue_grant_perm_fd); ++ /* TODO: set error */ ++ goto error; ++ } ++#endif ++ ++ pk_context->kqueue_fd_watch_id = pk_context->io_add_watch_func (pk_context, pk_context->kqueue_fd); ++ if (pk_context->kqueue_fd_watch_id == 0) { ++ _pk_debug ("failed to add io watch"); ++ /* TODO: set error */ ++ goto error; ++ } ++ } ++#endif + + return TRUE; + error: +@@ -296,6 +397,7 @@ polkit_context_io_func (PolKitContext *p + + config_changed = FALSE; + ++#ifdef HAVE_INOTIFY + if (fd == pk_context->inotify_fd) { + /* size of the event structure, not counting name */ + #define EVENT_SIZE (sizeof (struct inotify_event)) +@@ -327,6 +429,36 @@ again: + i += EVENT_SIZE + event->len; + } + } ++#elif HAVE_KQUEUE ++ if (fd == pk_context->kqueue_fd) { ++ struct kevent ev[1024]; ++ struct timespec nullts = { 0, 0 }; ++ int res; ++ int i = 0; ++ ++ res = kevent (fd, NULL, 0, ev, 1024, &nullts); ++ ++ if (res > 0) { ++ /* Sleep for a half-second to avoid potential races ++ * during install/uninstall. */ ++ usleep (500000); ++ ++ while (i < res) { ++ struct kevent *evptr; ++ ++ evptr = &ev[i]; ++ _pk_debug ("ident=%d filter=%d flags=%u fflags=%u", ++ evptr->ident, evptr->filter, evptr->flags, evptr->fflags); ++ _pk_debug ("config changed!"); ++ config_changed = TRUE; ++ ++ i++; ++ } ++ } else { ++ _pk_debug ("failed to read kqueue event: %s", strerror (errno)); ++ } ++ } ++#endif + + if (config_changed) { + polkit_context_force_reload (pk_context); diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c b/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c new file mode 100644 index 000000000000..793b531106a4 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c @@ -0,0 +1,26 @@ +--- src/polkit/polkit-policy-cache.c.orig 2007-11-29 01:14:09.000000000 -0500 ++++ src/polkit/polkit-policy-cache.c 2007-12-24 14:51:04.000000000 -0500 +@@ -98,7 +98,11 @@ PolKitPolicyCache * + _polkit_policy_cache_new (const char *dirname, polkit_bool_t load_descriptions, PolKitError **error) + { + DIR *dir; ++#ifdef HAVE_READDIR64 + struct dirent64 *d; ++#else ++ struct dirent *d; ++#endif + PolKitPolicyCache *pc; + + dir = NULL; +@@ -119,7 +123,11 @@ _polkit_policy_cache_new (const char *di + goto out; + } + ++#ifdef HAVE_READDIR64 + while ((d = readdir64 (dir)) != NULL) { ++#else ++ while ((d = readdir (dir)) != NULL) { ++#endif + char *path; + PolKitPolicyFile *pf; + PolKitError *pk_error; diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c new file mode 100644 index 000000000000..c8e4935f105a --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c @@ -0,0 +1,187 @@ +--- src/polkit/polkit-sysdeps.c.orig 2007-11-28 16:26:14.000000000 -0500 ++++ src/polkit/polkit-sysdeps.c 2008-01-02 00:42:47.000000000 -0500 +@@ -39,7 +39,6 @@ + #include <grp.h> + #include <unistd.h> + #include <errno.h> +-#include <sys/inotify.h> + #include <syslog.h> + + #include "polkit-sysdeps.h" +@@ -82,7 +81,11 @@ polkit_sysdeps_get_start_time_for_pid (p + start_time = 0; + contents = NULL; + ++#ifdef __FreeBSD__ ++ filename = kit_strdup_printf ("/proc/%d/status", pid); ++#else + filename = kit_strdup_printf ("/proc/%d/stat", pid); ++#endif + if (filename == NULL) { + errno = ENOMEM; + goto out; +@@ -93,6 +96,35 @@ polkit_sysdeps_get_start_time_for_pid (p + goto out; + } + ++#ifdef __FreeBSD__ ++ tokens = kit_strsplit (contents, ' ', &num_tokens); ++ if (tokens == NULL) ++ goto out; ++ if (num_tokens < 8) { ++ kit_strfreev (tokens); ++ goto out; ++ } ++ ++ p = kit_strdup (tokens[7]); ++ kit_strfreev (tokens); ++ ++ tokens = kit_strsplit (p, ',', &num_tokens); ++ if (tokens == NULL) ++ goto out; ++ if (num_tokens >= 1) { ++ start_time = strtoll (tokens[0], &endp, 10); ++ if (endp == tokens[0]) { ++ kit_strfreev (tokens); ++ goto out; ++ } ++ } else { ++ kit_strfreev (tokens); ++ goto out; ++ } ++ ++ kit_strfreev (tokens); ++#else ++ + /* start time is the 19th token after the '(process name)' entry */ + + p = strchr (contents, ')'); +@@ -118,6 +150,7 @@ polkit_sysdeps_get_start_time_for_pid (p + } + + kit_strfreev (tokens); ++#endif + + out: + kit_free (filename); +@@ -153,7 +186,11 @@ polkit_sysdeps_get_exe_for_pid (pid_t pi + + ret = 0; + ++#ifdef __FreeBSD__ ++ snprintf (proc_name, sizeof (proc_name), "/proc/%d/file", pid); ++#else + snprintf (proc_name, sizeof (proc_name), "/proc/%d/exe", pid); ++#endif + ret = readlink (proc_name, out_buf, buf_size - 1); + if (ret == -1) { + strncpy (out_buf, "(unknown)", buf_size); +@@ -166,6 +203,108 @@ out: + return ret; + } + ++#ifndef HAVE_GETLINE ++/* Taken from GNU sed. */ ++/* Read up to (and including) a '\n' from STREAM into *LINEPTR ++ (and null-terminate it). *LINEPTR is a pointer returned from malloc (or ++ NULL), pointing to *N characters of space. It is realloc'd as ++ necessary. Returns the number of characters read (not including the ++ null terminator), or -1 on error or EOF. */ ++ ++ssize_t ++polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream) ++{ ++ char *line, *p; ++ long size, copy; ++ ++ if (lineptr == NULL || n == NULL) { ++ errno = EINVAL; ++ return (ssize_t) -1; ++ } ++ ++ if (ferror (stream)) ++ return (ssize_t) -1; ++ ++ /* Make sure we have a line buffer to start with. */ ++ if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars. */ { ++#ifndef MAX_CANON ++#define MAX_CANON 256 ++#endif ++ if (!*lineptr) ++ line = (char *) malloc (MAX_CANON); ++ else ++ line = (char *) realloc (*lineptr, MAX_CANON); ++ if (line == NULL) ++ return (ssize_t) -1; ++ *lineptr = line; ++ *n = MAX_CANON; ++ } ++ ++ line = *lineptr; ++ size = *n; ++ ++ copy = size; ++ p = line; ++ ++ while (1) { ++ long len; ++ ++ while (--copy > 0) { ++ int c = getc (stream); ++ ++ if (c == EOF) ++ goto lose; ++ else if ((*p++ = c) == '\n') ++ goto win; ++ } ++ ++ /* Need to enlarge the line buffer. */ ++ len = p - line; ++ size *= 2; ++ line = (char *) realloc (line, size); ++ if (line == NULL) ++ goto lose; ++ *lineptr = line; ++ *n = size; ++ p = line + len; ++ copy = size - len; ++ } ++ ++lose: ++ if (p == *lineptr) ++ return (ssize_t) -1; ++ ++ /* Return a partial line since we got an error in the middle. */ ++win: ++ *p = '\0'; ++ return p - *lineptr; ++} ++#else ++ssize_t ++polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream) ++{ ++ return getline (lineptr, n, stream); ++} ++#endif ++ ++#ifndef HAVE_CLEARENV ++extern char **environ; ++int ++polkit_sysdeps_clearenv (void) ++{ ++ if (environ != NULL) { ++ environ[0] = NULL; ++ } ++ return 0; ++} ++#else ++int ++polkit_sysdeps_clearenv (void) ++{ ++ return clearenv (); ++} ++#endif ++ + #ifdef POLKIT_BUILD_TESTS + + static polkit_bool_t diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h new file mode 100644 index 000000000000..da4be3497c55 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h @@ -0,0 +1,20 @@ +--- src/polkit/polkit-sysdeps.h.orig 2007-12-23 01:46:49.000000000 -0500 ++++ src/polkit/polkit-sysdeps.h 2007-12-23 01:48:22.000000000 -0500 +@@ -35,6 +35,7 @@ + #define POLKIT_SYSDEPS_H + + #include <sys/types.h> ++#include <stdio.h> + #include <polkit/polkit-types.h> + + POLKIT_BEGIN_DECLS +@@ -43,6 +44,9 @@ polkit_uint64_t polkit_sysdeps_get_start + + int polkit_sysdeps_get_exe_for_pid (pid_t pid, char *out_buf, size_t buf_size); + ++ssize_t polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream); ++ ++int polkit_sysdeps_clearenv (void); + + POLKIT_END_DECLS + diff --git a/sysutils/policykit/files/patch-tools_Makefile.in b/sysutils/policykit/files/patch-tools_Makefile.in deleted file mode 100644 index 9308ff774f36..000000000000 --- a/sysutils/policykit/files/patch-tools_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/Makefile.in.orig Sun Oct 8 03:37:21 2006 -+++ tools/Makefile.in Sun Oct 8 03:37:37 2006 -@@ -252,9 +252,9 @@ INCLUDES = \ - @DBUS_CFLAGS@ - - polkit_is_privileged_SOURCES = polkit-is-privileged.c --polkit_is_privileged_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la -+polkit_is_privileged_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la - polkit_list_privileges_SOURCES = polkit-list-privileges.c --polkit_list_privileges_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la -+polkit_list_privileges_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la - polkit_grant_privilege_SOURCES = \ - polkit-grant-privilege.c \ - polkit-interface-manager-glue.h \ diff --git a/sysutils/policykit/files/patch-tools_polkit-auth.c b/sysutils/policykit/files/patch-tools_polkit-auth.c new file mode 100644 index 000000000000..f3ee42d1f55d --- /dev/null +++ b/sysutils/policykit/files/patch-tools_polkit-auth.c @@ -0,0 +1,61 @@ +--- tools/polkit-auth.c.orig 2007-12-05 22:30:18.000000000 -0500 ++++ tools/polkit-auth.c 2007-12-23 01:43:36.000000000 -0500 +@@ -37,12 +37,13 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/wait.h> + #include <pwd.h> + #include <grp.h> + #include <unistd.h> + #include <errno.h> + #include <termios.h> + + #include <polkit-dbus/polkit-dbus.h> + #include <polkit-grant/polkit-grant.h> + +@@ -107,7 +109,7 @@ conversation_select_admin_user (PolKitGr + } + printf ("\n"); + printf ("Select user: "); +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + user = strdup (lineptr); + free (lineptr); + return user; +@@ -133,7 +135,7 @@ conversation_pam_prompt_echo_off (PolKit + exit (1); + } + +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + + /* Restore terminal. */ + tcsetattr (fileno (stdout), TCSAFLUSH, &old); +@@ -151,7 +153,7 @@ conversation_pam_prompt_echo_on (PolKitG + size_t linelen = 0; + char *result; + printf ("%s", request); +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + result = strdup (lineptr); + free (lineptr); + printf ("\n"); +@@ -189,7 +191,7 @@ conversation_override_grant_type (PolKit + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION: + printf ("Keep this privilege for the session? [no/session]?\n"); + again: +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + if (g_str_has_prefix (lineptr, "no")) { + ; + } else if (g_str_has_prefix (lineptr, "session")) { +@@ -204,7 +206,7 @@ conversation_override_grant_type (PolKit + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS: + printf ("Keep this privilege for the session or always? [no/session/always]?\n"); + again2: +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + if (g_str_has_prefix (lineptr, "no")) { + ; + } else if (g_str_has_prefix (lineptr, "session")) { diff --git a/sysutils/policykit/files/polkitd.in b/sysutils/policykit/files/polkitd.in deleted file mode 100644 index 0e2a829c6f54..000000000000 --- a/sysutils/policykit/files/polkitd.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: polkitd -# REQUIRE: DAEMON dbus -# -# Add the following line to /etc/rc.conf to enable the PolicyKit daemon: -# -# polkitd_enable="YES" -# - -. %%RC_SUBR%% -. %%GNOME_SUBR%% - -polkitd_enable=${polkitd_enable-${gnome_enable}} - -name=polkitd -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/polkitd" -pidfile="/var/run/${name}/${name}.pid" - -start_precmd="polkitd_precmd" -stop_postcmd="polkitd_postcmd" - -local_force_depend() -{ - _depend="$1" - if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then - _depend="${_depend}.sh" - fi - - if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 && - ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then - return 1 - fi - return 0 -} - -polkitd_precmd() -{ - if ! checkyesno dbus_enable - then - local_force_depend dbus || return 1 - fi - - mkdir -p $(dirname $pidfile) -} - -polkitd_postcmd() -{ - rm -f $pidfile -} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/policykit/pkg-install b/sysutils/policykit/pkg-install index 38383f8285ee..3d49ff2062ef 100644 --- a/sysutils/policykit/pkg-install +++ b/sysutils/policykit/pkg-install @@ -32,7 +32,16 @@ POST-INSTALL) fi fi - /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/polkitd + /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 root -m 0775 -g ${GROUP} /var/lib/PolicyKit-public + /bin/mkdir -p /var/lib/misc + /usr/bin/touch -f /var/lib/misc/PolicyKit.reload + /usr/bin/chgrp ${GROUP} /var/lib/misc/PolicyKit.reload + /bin/chmod 0775 /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 index 66c27dc14847..1442b6c2b740 100644 --- a/sysutils/policykit/pkg-plist +++ b/sysutils/policykit/pkg-plist @@ -1,19 +1,71 @@ -bin/polkit-grant-privilege -bin/polkit-is-privileged -bin/polkit-list-privileges -bin/polkit-revoke-privilege -etc/PolicyKit/privilege.d/desktop-console.privilege -etc/dbus-1/system.d/PolicyKit.conf -etc/pam.d/policy-kit -include/libpolkit/libpolkit.h +bin/polkit-action +bin/polkit-auth +bin/polkit-config-file-validate +bin/polkit-policy-file-validate +@unexec if cmp -s %D/etc/PolicyKit/PolicyKit.conf %D/etc/PolicyKit/PolicyKit.conf.dist; then rm -f %D/etc/PolicyKit/PolicyKit.conf +etc/PolicyKit/PolicyKit.conf.dist +@exec [ -f %B/PolicyKit.conf ] || cp %B/%f %B/PolicyKit.conf +etc/PolicyKit/PolicyKit.conf +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-grant.a +lib/libpolkit-grant.la +lib/libpolkit-grant.so +lib/libpolkit-grant.so.2 lib/libpolkit.a lib/libpolkit.la lib/libpolkit.so -lib/libpolkit.so.0 +lib/libpolkit.so.2 +libdata/pkgconfig/polkit-dbus.pc +libdata/pkgconfig/polkit-grant.pc libdata/pkgconfig/polkit.pc -sbin/polkitd -@dirrm include/libpolkit -@dirrm etc/PolicyKit/privilege.d +libexec/polkit-explicit-grant-helper +libexec/polkit-grant-helper +libexec/polkit-grant-helper-pam +libexec/polkit-read-auth-helper +libexec/polkit-revoke-helper +libexec/polkit-set-default-helper +libexec/polkitd +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 +@dirrmtry share/PolicyKit/policy +@dirrmtry share/PolicyKit +@dirrm include/PolicyKit/polkit +@dirrm include/PolicyKit/polkit-grant +@dirrm include/PolicyKit/polkit-dbus +@dirrm include/PolicyKit +@dirrmtry etc/profile.d @dirrm etc/PolicyKit -@unexec rm -f /var/run/polkitd/polkitd.pid 2>/dev/null || true -@unexec rmdir /var/run/polkitd 2>/dev/null || true +@unexec rm -rf /var/run/PolicyKit 2>/dev/null || true +@unexec rmdir /var/lib/PolicyKit 2>/dev/null || true +@unexec rmdir /var/lib/PolicyKit-public 2>/dev/null || true +@unexec rm -f /var/lib/misc/PolicyKit.reload 2>/dev/null || true +@unexec rmdir /var/lib/misc 2>/dev/null || true diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 008b7aee13b7..d9d941992d35 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,21 +3,21 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.40 2007/10/04 11:32:48 ahze Exp $ +# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.51 2008/03/09 18:48:33 mezz Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 2.4.1 +PORTVERSION= 2.6.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Backend system admin scripts for gnome-system-tools BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + polkit-dbus.2:${PORTSDIR}/sysutils/policykit RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus USE_BZIP2= yes @@ -25,7 +25,6 @@ USE_GMAKE= yes USE_PERL5= yes USE_GNOME= gnomehack intlhack glib20 GNU_CONFIGURE= yes -USE_RC_SUBR= system-tools-backends USE_GNOME_SUBR= yes CONFIGURE_ARGS= --with-stb-group=wheel \ --localstatedir=/var diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index ccad604a0755..3e804006bda3 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/system-tools-backends-2.4.1.tar.bz2) = 063f38e6014c8f7ba9b92b0f94255652 -SHA256 (gnome2/system-tools-backends-2.4.1.tar.bz2) = c0aea44c58d32870b429337751bf3f41cd471b8c8849a373c46999fd63d583e8 -SIZE (gnome2/system-tools-backends-2.4.1.tar.bz2) = 411012 +MD5 (gnome2/system-tools-backends-2.6.0.tar.bz2) = faf321012e92b72305878cd684547c54 +SHA256 (gnome2/system-tools-backends-2.6.0.tar.bz2) = 5c35820a7a3d7fc3af5c6e3ce7c7529359809e486fdafecb68601ac4d2bfa6f0 +SIZE (gnome2/system-tools-backends-2.6.0.tar.bz2) = 421806 diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c b/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c deleted file mode 100644 index f1f49929e772..000000000000 --- a/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c +++ /dev/null @@ -1,11 +0,0 @@ ---- dispatcher/dispatcher.c.orig Thu Apr 12 23:55:38 2007 -+++ dispatcher/dispatcher.c Thu Apr 12 23:57:40 2007 -@@ -203,7 +203,7 @@ daemonize (void) - - setsid (); - -- if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1) -+ if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1) - { - str = g_strdup_printf ("%d", getpid ()); - write (pidfile_fd, str, strlen (str)); diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_main.c b/sysutils/system-tools-backends/files/patch-dispatcher_main.c new file mode 100644 index 000000000000..b575cbfd46fa --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-dispatcher_main.c @@ -0,0 +1,11 @@ +--- dispatcher/main.c.orig 2007-10-29 20:36:16.890317344 -0400 ++++ dispatcher/main.c 2007-10-29 20:37:02.584773483 -0400 +@@ -47,7 +47,7 @@ + + setsid (); + +- if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1) ++ if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1) + { + str = g_strdup_printf ("%d", getpid ()); + write (pidfile_fd, str, strlen (str)); diff --git a/sysutils/system-tools-backends/files/system-tools-backends.in b/sysutils/system-tools-backends/files/system-tools-backends.in deleted file mode 100644 index b23f16bb2648..000000000000 --- a/sysutils/system-tools-backends/files/system-tools-backends.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# $MCom: ports/sysutils/system-tools-backends/files/system-tools-backends.in,v 1.5 2007/07/10 16:47:46 ahze Exp $ - -# PROVIDE: system-tools-backends -# REQUIRE: DAEMON dbus -# -# Add the following to /etc/rc.conf to start SystemToolsBackends at boot time: -# -# system_tools_backends_enable="YES" -# - -. %%RC_SUBR%% -. %%GNOME_SUBR%% - -export PATH=${PATH}:%%PREFIX%%/bin - -system_tools_backends_enable=${system_tools_backends_enable-${gnome_enable}} - -name=system_tools_backends -rcvar=`set_rcvar` -command="%%PREFIX%%/bin/system-tools-backends" -pidfile="/var/run/system-tools-backends.pid" - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index 31f146f16b1f..c679607233eb 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -1,18 +1,22 @@ bin/system-tools-backends etc/dbus-1/system.d/system-tools-backends.conf libdata/pkgconfig/system-tools-backends-2.0.pc -share/dbus-1/services/org.freedesktop.SystemToolsBackends.GroupsConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.HostsConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.IfacesConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.NFSConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.NTPConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.Platform.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.SMBConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.ServicesConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.TimeConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.UsersConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.service +share/PolicyKit/policy/system-tools-backends.policy +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.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.ServicesConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service +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/GroupsConfig.pm share/system-tools-backends-2.0/scripts/HostsConfig.pm share/system-tools-backends-2.0/scripts/IfacesConfig.pm @@ -32,6 +36,7 @@ share/system-tools-backends-2.0/scripts/SystemToolsBackends.pl 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/Groups.pm share/system-tools-backends-2.0/scripts/Users/Shells.pm share/system-tools-backends-2.0/scripts/Users/Users.pm |