summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gconf-editor/Makefile8
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/files/patch-src_gconf-editor-window.c11
-rw-r--r--sysutils/gconf-editor/pkg-plist4
-rw-r--r--sysutils/gnome-control-center/Makefile22
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c33
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c34
-rw-r--r--sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c10
-rw-r--r--sysutils/gnome-control-center/pkg-plist22
-rw-r--r--sysutils/gnome-system-monitor/Makefile10
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/files/patch-configure19
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_openfiles.c13
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist23
-rw-r--r--sysutils/gnome-system-tools/Makefile12
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/gnome-system-tools/pkg-plist47
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile22
-rw-r--r--sysutils/gnomecontrolcenter2/distinfo6
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c33
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c34
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c10
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist22
-rw-r--r--sysutils/gnomesystemmonitor/Makefile10
-rw-r--r--sysutils/gnomesystemmonitor/distinfo6
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-configure19
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-src_openfiles.c13
-rw-r--r--sysutils/gnomesystemmonitor/pkg-plist23
-rw-r--r--sysutils/gnomesystemtools/Makefile12
-rw-r--r--sysutils/gnomesystemtools/distinfo6
-rw-r--r--sysutils/gnomesystemtools/pkg-plist47
-rw-r--r--sysutils/nautilus-cd-burner/Makefile10
-rw-r--r--sysutils/nautilus-cd-burner/distinfo6
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist10
-rw-r--r--sysutils/pessulus/Makefile40
-rw-r--r--sysutils/pessulus/distinfo3
-rw-r--r--sysutils/pessulus/pkg-descr6
-rw-r--r--sysutils/pessulus/pkg-plist100
-rw-r--r--sysutils/slmon/Makefile5
40 files changed, 491 insertions, 244 deletions
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index c73da4505bfa..21b6c917854d 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,21 +3,23 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.41 2005/10/08 19:41:39 marcus Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.50 2006/04/24 07:23:03 marcus Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.12.1
+PORTVERSION= 2.14.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A gconf database editor for the GNOME 2 environment
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index b734b4b802ea..1ced8c304901 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.12.1.tar.bz2) = 0fa81dee78ca10f0192eb19afa6883f5
-SHA256 (gnome2/gconf-editor-2.12.1.tar.bz2) = 3f1da5b93f1182c0b750a49d7de739f835a69600e74d4147db8ae68400f6aa59
-SIZE (gnome2/gconf-editor-2.12.1.tar.bz2) = 539803
+MD5 (gnome2/gconf-editor-2.14.0.tar.bz2) = eb8b979464f6e383e5a27b57ee4e8382
+SHA256 (gnome2/gconf-editor-2.14.0.tar.bz2) = 974e1ba2c6bb650ee638a80e81174582123d7bfbe14cccf613542dd103e2b554
+SIZE (gnome2/gconf-editor-2.14.0.tar.bz2) = 541099
diff --git a/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c b/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
new file mode 100644
index 000000000000..7ff0eb544269
--- /dev/null
+++ b/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
@@ -0,0 +1,11 @@
+--- src/gconf-editor-window.c.orig Mon Apr 24 03:19:49 2006
++++ src/gconf-editor-window.c Mon Apr 24 03:20:00 2006
+@@ -950,7 +950,7 @@ gconf_editor_gconf_value_changed (GConfC
+ gconf_add_recent_key (window, key);
+ }
+
+- g_free (value);
++ gconf_value_free (value);
+ g_free (key);
+ gtk_tree_path_free (path);
+ }
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index de48244c72be..d3c4bd63506e 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -35,6 +35,7 @@ share/locale/az/LC_MESSAGES/gconf-editor.mo
share/locale/be/LC_MESSAGES/gconf-editor.mo
share/locale/bg/LC_MESSAGES/gconf-editor.mo
share/locale/bn/LC_MESSAGES/gconf-editor.mo
+share/locale/br/LC_MESSAGES/gconf-editor.mo
share/locale/bs/LC_MESSAGES/gconf-editor.mo
share/locale/ca/LC_MESSAGES/gconf-editor.mo
share/locale/cs/LC_MESSAGES/gconf-editor.mo
@@ -98,6 +99,7 @@ share/locale/uk/LC_MESSAGES/gconf-editor.mo
share/locale/vi/LC_MESSAGES/gconf-editor.mo
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
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@@ -105,6 +107,8 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
@dirrm share/gnome/pixmaps/gconf-editor
@dirrm share/gnome/omf/gconf-editor
@dirrm share/gnome/help/gconf-editor/uk/figures
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 94b63a0febd0..10adbe119774 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $
+# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.109 2006/04/18 02:28:56 marcus Exp $
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/2.12
+MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,16 +21,20 @@ COMMENT= Control center for GNOME 2 project
LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GSTREAMER= yes
+USE_GSTREAMER= good
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
- gnomemenus desktopfileutils
+ gnomemenus desktopfileutils nautilus2
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --enable-gstreamer=0.10 \
+ --disable-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -48,10 +52,6 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not build on 4.X
-.endif
-
.if ${HAVE_GNOME:Mevolutiondataserver}!=""
USE_GNOME+= evolutiondataserver
CONFIGURE_ARGS+=--enable-aboutme
@@ -64,8 +64,6 @@ PLIST_SUB+= ABOUTME="@comment "
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
- @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
- ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
s|/bin/gzip|/usr/bin/gzip|g' \
${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 7e03447ea0e1..02add5cb6a2f 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.12.3.tar.bz2) = e8f57ec1852d08d421016732b605a615
-SHA256 (gnome2/control-center-2.12.3.tar.bz2) = c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8
-SIZE (gnome2/control-center-2.12.3.tar.bz2) = 1787009
+MD5 (gnome2/control-center-2.14.1.tar.bz2) = d673df12692ee08b9fc3d69739f8779e
+SHA256 (gnome2/control-center-2.14.1.tar.bz2) = c55cc800a6d636b8a98885a68685eff32db158fe1b638ff02ff89394ee6e6163
+SIZE (gnome2/control-center-2.14.1.tar.bz2) = 1869223
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
index 7ea6bb0dd359..49727c882a89 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -1,16 +1,25 @@
---- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005
-+++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005
-@@ -35,7 +35,13 @@
- #include <sys/wait.h>
- #include <sys/poll.h>
- #include <termios.h>
-+#include <signal.h>
+--- capplets/about-me/gnome-about-me-password.c.orig Mon Nov 28 10:02:57 2005
++++ capplets/about-me/gnome-about-me-password.c Wed Dec 14 13:56:42 2005
+@@ -25,7 +25,9 @@
+ # include <config.h>
+ #endif
+
+#ifndef __FreeBSD__
- #include <pty.h>
-+#else
+ #include <stropts.h>
++#endif
+ #include <gnome.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+@@ -45,6 +47,12 @@
+
+ #if __sun
+ #include <sys/types.h>
++#include <signal.h>
++#endif
++
++#if __FreeBSD__
+#include <sys/types.h>
+#include <libutil.h>
-+#endif
+ #include <signal.h>
+ #endif
- #include "capplet-util.h"
- #include "eel-alert-dialog.h"
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
deleted file mode 100644
index 0d1f85f32c7f..000000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005
-+++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005
-@@ -258,12 +258,10 @@
- static char *
- get_user_login (void)
- {
-- char buf[LINE_MAX * 4];
-- struct passwd pwd, *err;
-+ struct passwd *pwd;
-
-- int i;
-- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err);
-- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL;
-+ pwd = getpwuid(getuid());
-+ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL;
- }
-
- /*
-@@ -664,6 +662,7 @@
- struct passwd *pwent;
- char *user = NULL;
- gchar *str;
-+ gchar **tok;
-
- me = g_new0 (GnomeAboutMe, 1);
-
-@@ -733,7 +732,6 @@
- _("Unknown login ID, the user database might be corrupted"));
- return ;
- }
-- gchar **tok;
- tok = g_strsplit (pwent->pw_gecos, ",", 0);
-
- /************************************************/
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
new file mode 100644
index 000000000000..3362406ddcc0
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
@@ -0,0 +1,10 @@
+--- gnome-settings-daemon/actions/acme-volume-gstreamer.c.orig Mon Apr 17 22:23:18 2006
++++ gnome-settings-daemon/actions/acme-volume-gstreamer.c Mon Apr 17 22:25:17 2006
+@@ -29,6 +29,7 @@
+
+ #ifdef HAVE_GST10
+ #include <gst/gst.h>
++#include <gst/audio/mixerutils.h>
+ #include <gst/interfaces/mixer.h>
+ #include <gst/interfaces/propertyprobe.h>
+ #else
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 99756d3136ad..faafe835eab5 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -129,6 +129,9 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/desktop-directories/font-method.directory
+share/gnome/desktop-directories/theme-method.directory
+share/gnome/gnome-default-applications/gnome-default-applications.xml
share/gnome/help/control-center/C/config-accessibility-keyboard.xml
share/gnome/help/control-center/C/config-background.xml
share/gnome/help/control-center/C/config-behavior.xml
@@ -144,12 +147,12 @@ share/gnome/help/control-center/C/config-screensaver.xml
share/gnome/help/control-center/C/config-sound.xml
share/gnome/help/control-center/C/config-themes.xml
share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/es/control-center.xml
share/gnome/idl/ConfigArchiver.idl
share/gnome/idl/GNOME_SettingsDaemon.idl
share/gnome/omf/control-center/control-center-C.omf
+share/gnome/omf/control-center/control-center-es.omf
share/gnome/pixmaps/display-capplet.png
-share/gnome/vfolders/font-method.directory
-share/gnome/vfolders/theme-method.directory
share/icons/hicolor/48x48/apps/gnome-control-center.png
share/locale/af/LC_MESSAGES/control-center-2.0.mo
share/locale/am/LC_MESSAGES/control-center-2.0.mo
@@ -158,12 +161,14 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
share/locale/be/LC_MESSAGES/control-center-2.0.mo
share/locale/bg/LC_MESSAGES/control-center-2.0.mo
share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/br/LC_MESSAGES/control-center-2.0.mo
share/locale/bs/LC_MESSAGES/control-center-2.0.mo
share/locale/ca/LC_MESSAGES/control-center-2.0.mo
share/locale/cs/LC_MESSAGES/control-center-2.0.mo
share/locale/cy/LC_MESSAGES/control-center-2.0.mo
share/locale/da/LC_MESSAGES/control-center-2.0.mo
share/locale/de/LC_MESSAGES/control-center-2.0.mo
+share/locale/dz/LC_MESSAGES/control-center-2.0.mo
share/locale/el/LC_MESSAGES/control-center-2.0.mo
share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
@@ -184,6 +189,7 @@ share/locale/id/LC_MESSAGES/control-center-2.0.mo
share/locale/is/LC_MESSAGES/control-center-2.0.mo
share/locale/it/LC_MESSAGES/control-center-2.0.mo
share/locale/ja/LC_MESSAGES/control-center-2.0.mo
+share/locale/ka/LC_MESSAGES/control-center-2.0.mo
share/locale/ko/LC_MESSAGES/control-center-2.0.mo
share/locale/ku/LC_MESSAGES/control-center-2.0.mo
share/locale/lt/LC_MESSAGES/control-center-2.0.mo
@@ -220,20 +226,30 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
share/locale/wa/LC_MESSAGES/control-center-2.0.mo
share/locale/xh/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@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/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/es
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
-@dirrmtry share/gnome/gnome-background-properties
+@dirrm share/gnome/gnome-default-applications
+@dirrm share/gnome/gnome-background-properties
+@dirrm share/gnome/desktop-directories
@dirrm share/gnome/cursor-fonts
@dirrm share/gnome/control-center-2.0/xrdb
@dirrm share/gnome/control-center-2.0/pixmaps
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 9659a14013e6..e5553c13e10f 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,27 +3,27 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $
+# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.67 2006/04/23 23:04:15 mezz Exp $
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 system monitor program
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 9fe5221376e5..c259d28b00be 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 100f3599b95a375db85df521f3e2554e
-SHA256 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = c0c18d1f9e29c11c02adac83dcfffdb1f839d9c5575496d0f5beb8de09a31d1f
-SIZE (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 786092
+MD5 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 5d9265d712665eaa1a341ad493c284b2
+SHA256 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 21af60fd9b307d2f969e526423ba966639020d128b9f61561ab1c14e3bfb7f5a
+SIZE (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 1416460
diff --git a/sysutils/gnome-system-monitor/files/patch-configure b/sysutils/gnome-system-monitor/files/patch-configure
index 504276306bba..aed30356f7ab 100644
--- a/sysutils/gnome-system-monitor/files/patch-configure
+++ b/sysutils/gnome-system-monitor/files/patch-configure
@@ -1,20 +1,11 @@
---- configure.orig Mon Nov 25 21:02:50 2002
-+++ configure Fri Nov 29 20:30:44 2002
-@@ -3731,7 +3731,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
-@@ -6630,7 +6630,7 @@
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+--- configure.orig Wed Dec 14 19:11:33 2005
++++ configure Wed Dec 14 19:11:33 2005
+@@ -25028,7 +25028,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
+s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@GCONF_SCHEMAS_INSTALL_TRUE@,$GCONF_SCHEMAS_INSTALL_TRUE,;t t
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
index 1b94fbb9f499..971e718b2101 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
+++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
@@ -8,16 +8,3 @@
#include <arpa/inet.h>
#include "procman.h"
#include "openfiles.h"
-@@ -152,10 +153,10 @@
- {
- ProcInfo *info;
- GtkTreeModel *model;
-- glibtop_open_files_entry *openfiles;
-- glibtop_proc_open_files procmap;
- GHashTable *new_maps;
- gint i;
-+ glibtop_open_files_entry *openfiles;
-+ glibtop_proc_open_files procmap;
-
- info = g_object_get_data (G_OBJECT (tree), "selected_info");
- g_return_if_fail (info);
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 419ddc095099..eec36e00660f 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -15,7 +15,23 @@ share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/bg/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/bg/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/bg/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/bg/figures/processListing.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/bg/legal.xml
share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
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
@@ -28,6 +44,7 @@ share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo
share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
@@ -47,6 +64,7 @@ share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
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/ko/LC_MESSAGES/gnome-system-monitor.mo
share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
@@ -79,10 +97,15 @@ share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/bg/figures
+@dirrm share/gnome/help/gnome-system-monitor/bg
@dirrm share/gnome/help/gnome-system-monitor/C/figures
@dirrm share/gnome/help/gnome-system-monitor/C
@dirrm share/gnome/help/gnome-system-monitor
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 7d98a8fbf20d..b64ab1eff2a6 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,15 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $
+# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.40 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= gnomesystemtools
-PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4
+MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-tools-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,10 +22,11 @@ RUN_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sys
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
CONFIGURE_ARGS= --enable-services
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,7 +37,7 @@ GCONF_SCHEMAS= gnome-system-tools.schemas
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-IGNORE= Uses symbols not present in 4.X
+IGNORE= uses symbols not present in 4.X
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 8a73d9d3f890..dea2f0713697 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 9ede7bcadde796396a30cdb5fa347f49
-SHA256 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = b279e6b08989772cca3a7a1038971191ea6c8b9f26e02238c2e79b5faaedf380
-SIZE (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 2045146
+MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
+SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
+SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 9d5c574cdcdc..acbf5571d27a 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -73,13 +73,20 @@ share/gnome/applications/users.desktop
share/gnome/help/boot-admin/C/boot-admin.xml
share/gnome/help/boot-admin/C/figures/boot-tool.png
share/gnome/help/boot-admin/C/legal.xml
+share/gnome/help/boot-admin/es/boot-admin.xml
+share/gnome/help/boot-admin/es/figures/boot-tool.png
share/gnome/help/network-admin/C/figures/network-tool.png
share/gnome/help/network-admin/C/legal.xml
share/gnome/help/network-admin/C/network-admin.xml
+share/gnome/help/network-admin/es/figures/network-tool.png
+share/gnome/help/network-admin/es/network-admin.xml
share/gnome/help/services-admin/C/figures/service-properties.png
share/gnome/help/services-admin/C/figures/services-tool.png
share/gnome/help/services-admin/C/legal.xml
share/gnome/help/services-admin/C/services-admin.xml
+share/gnome/help/services-admin/es/figures/service-properties.png
+share/gnome/help/services-admin/es/figures/services-tool.png
+share/gnome/help/services-admin/es/services-admin.xml
share/gnome/help/services-admin/nl/figures/service-properties.png
share/gnome/help/services-admin/nl/figures/services-tool.png
share/gnome/help/services-admin/nl/legal.xml
@@ -89,6 +96,10 @@ share/gnome/help/time-admin/C/figures/time-servers.png
share/gnome/help/time-admin/C/figures/time-tool.png
share/gnome/help/time-admin/C/legal.xml
share/gnome/help/time-admin/C/time-admin.xml
+share/gnome/help/time-admin/es/figures/time-map.png
+share/gnome/help/time-admin/es/figures/time-servers.png
+share/gnome/help/time-admin/es/figures/time-tool.png
+share/gnome/help/time-admin/es/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
@@ -97,13 +108,20 @@ share/gnome/help/time-admin/nl/time-admin.xml
share/gnome/help/users-admin/C/figures/users-tool.png
share/gnome/help/users-admin/C/legal.xml
share/gnome/help/users-admin/C/users-admin.xml
-share/gnome/omf/gnome-system-tools/boot-admin-C.omf
-share/gnome/omf/gnome-system-tools/network-admin-C.omf
-share/gnome/omf/gnome-system-tools/services-admin-C.omf
+share/gnome/help/users-admin/es/figures/users-tool.png
+share/gnome/help/users-admin/es/users-admin.xml
+share/gnome/omf/boot-admin/boot-admin-C.omf
+share/gnome/omf/boot-admin/boot-admin-es.omf
share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-C.omf
share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/gnome-system-tools/users-admin-C.omf
+share/gnome/omf/network-admin/network-admin-C.omf
+share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/services-admin/services-admin-C.omf
+share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/time-admin/time-admin-C.omf
+share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/users-admin/users-admin-C.omf
+share/gnome/omf/users-admin/users-admin-es.omf
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
@@ -111,6 +129,7 @@ share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
+share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
share/locale/da/LC_MESSAGES/gnome-system-tools.mo
share/locale/de/LC_MESSAGES/gnome-system-tools.mo
share/locale/el/LC_MESSAGES/gnome-system-tools.mo
@@ -164,26 +183,44 @@ share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrm share/gnome/omf/users-admin
+@dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/services-admin
+@dirrm share/gnome/omf/network-admin
@dirrm share/gnome/omf/gnome-system-tools
+@dirrm share/gnome/omf/boot-admin
@dirrm share/gnome/help/users-admin/C/figures
@dirrm share/gnome/help/users-admin/C
+@dirrm share/gnome/help/users-admin/es/figures
+@dirrm share/gnome/help/users-admin/es
@dirrm share/gnome/help/users-admin
@dirrm share/gnome/help/time-admin/nl/figures
@dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/es/figures
+@dirrm share/gnome/help/time-admin/es
@dirrm share/gnome/help/time-admin/C/figures
@dirrm share/gnome/help/time-admin/C
@dirrm share/gnome/help/time-admin
@dirrm share/gnome/help/services-admin/nl/figures
@dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/es/figures
+@dirrm share/gnome/help/services-admin/es
@dirrm share/gnome/help/services-admin/C/figures
@dirrm share/gnome/help/services-admin/C
@dirrm share/gnome/help/services-admin
+@dirrm share/gnome/help/network-admin/es/figures
+@dirrm share/gnome/help/network-admin/es
@dirrm share/gnome/help/network-admin/C/figures
@dirrm share/gnome/help/network-admin/C
@dirrm share/gnome/help/network-admin
+@dirrm share/gnome/help/boot-admin/es/figures
+@dirrm share/gnome/help/boot-admin/es
@dirrm share/gnome/help/boot-admin/C/figures
@dirrm share/gnome/help/boot-admin/C
@dirrm share/gnome/help/boot-admin
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 94b63a0febd0..10adbe119774 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $
+# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.109 2006/04/18 02:28:56 marcus Exp $
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/2.12
+MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,16 +21,20 @@ COMMENT= Control center for GNOME 2 project
LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GSTREAMER= yes
+USE_GSTREAMER= good
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
- gnomemenus desktopfileutils
+ gnomemenus desktopfileutils nautilus2
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --enable-gstreamer=0.10 \
+ --disable-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -48,10 +52,6 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not build on 4.X
-.endif
-
.if ${HAVE_GNOME:Mevolutiondataserver}!=""
USE_GNOME+= evolutiondataserver
CONFIGURE_ARGS+=--enable-aboutme
@@ -64,8 +64,6 @@ PLIST_SUB+= ABOUTME="@comment "
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
- @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
- ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
s|/bin/gzip|/usr/bin/gzip|g' \
${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 7e03447ea0e1..02add5cb6a2f 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.12.3.tar.bz2) = e8f57ec1852d08d421016732b605a615
-SHA256 (gnome2/control-center-2.12.3.tar.bz2) = c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8
-SIZE (gnome2/control-center-2.12.3.tar.bz2) = 1787009
+MD5 (gnome2/control-center-2.14.1.tar.bz2) = d673df12692ee08b9fc3d69739f8779e
+SHA256 (gnome2/control-center-2.14.1.tar.bz2) = c55cc800a6d636b8a98885a68685eff32db158fe1b638ff02ff89394ee6e6163
+SIZE (gnome2/control-center-2.14.1.tar.bz2) = 1869223
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
index 7ea6bb0dd359..49727c882a89 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -1,16 +1,25 @@
---- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005
-+++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005
-@@ -35,7 +35,13 @@
- #include <sys/wait.h>
- #include <sys/poll.h>
- #include <termios.h>
-+#include <signal.h>
+--- capplets/about-me/gnome-about-me-password.c.orig Mon Nov 28 10:02:57 2005
++++ capplets/about-me/gnome-about-me-password.c Wed Dec 14 13:56:42 2005
+@@ -25,7 +25,9 @@
+ # include <config.h>
+ #endif
+
+#ifndef __FreeBSD__
- #include <pty.h>
-+#else
+ #include <stropts.h>
++#endif
+ #include <gnome.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+@@ -45,6 +47,12 @@
+
+ #if __sun
+ #include <sys/types.h>
++#include <signal.h>
++#endif
++
++#if __FreeBSD__
+#include <sys/types.h>
+#include <libutil.h>
-+#endif
+ #include <signal.h>
+ #endif
- #include "capplet-util.h"
- #include "eel-alert-dialog.h"
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
deleted file mode 100644
index 0d1f85f32c7f..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005
-+++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005
-@@ -258,12 +258,10 @@
- static char *
- get_user_login (void)
- {
-- char buf[LINE_MAX * 4];
-- struct passwd pwd, *err;
-+ struct passwd *pwd;
-
-- int i;
-- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err);
-- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL;
-+ pwd = getpwuid(getuid());
-+ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL;
- }
-
- /*
-@@ -664,6 +662,7 @@
- struct passwd *pwent;
- char *user = NULL;
- gchar *str;
-+ gchar **tok;
-
- me = g_new0 (GnomeAboutMe, 1);
-
-@@ -733,7 +732,6 @@
- _("Unknown login ID, the user database might be corrupted"));
- return ;
- }
-- gchar **tok;
- tok = g_strsplit (pwent->pw_gecos, ",", 0);
-
- /************************************************/
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
new file mode 100644
index 000000000000..3362406ddcc0
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
@@ -0,0 +1,10 @@
+--- gnome-settings-daemon/actions/acme-volume-gstreamer.c.orig Mon Apr 17 22:23:18 2006
++++ gnome-settings-daemon/actions/acme-volume-gstreamer.c Mon Apr 17 22:25:17 2006
+@@ -29,6 +29,7 @@
+
+ #ifdef HAVE_GST10
+ #include <gst/gst.h>
++#include <gst/audio/mixerutils.h>
+ #include <gst/interfaces/mixer.h>
+ #include <gst/interfaces/propertyprobe.h>
+ #else
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 99756d3136ad..faafe835eab5 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -129,6 +129,9 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/desktop-directories/font-method.directory
+share/gnome/desktop-directories/theme-method.directory
+share/gnome/gnome-default-applications/gnome-default-applications.xml
share/gnome/help/control-center/C/config-accessibility-keyboard.xml
share/gnome/help/control-center/C/config-background.xml
share/gnome/help/control-center/C/config-behavior.xml
@@ -144,12 +147,12 @@ share/gnome/help/control-center/C/config-screensaver.xml
share/gnome/help/control-center/C/config-sound.xml
share/gnome/help/control-center/C/config-themes.xml
share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/es/control-center.xml
share/gnome/idl/ConfigArchiver.idl
share/gnome/idl/GNOME_SettingsDaemon.idl
share/gnome/omf/control-center/control-center-C.omf
+share/gnome/omf/control-center/control-center-es.omf
share/gnome/pixmaps/display-capplet.png
-share/gnome/vfolders/font-method.directory
-share/gnome/vfolders/theme-method.directory
share/icons/hicolor/48x48/apps/gnome-control-center.png
share/locale/af/LC_MESSAGES/control-center-2.0.mo
share/locale/am/LC_MESSAGES/control-center-2.0.mo
@@ -158,12 +161,14 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
share/locale/be/LC_MESSAGES/control-center-2.0.mo
share/locale/bg/LC_MESSAGES/control-center-2.0.mo
share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/br/LC_MESSAGES/control-center-2.0.mo
share/locale/bs/LC_MESSAGES/control-center-2.0.mo
share/locale/ca/LC_MESSAGES/control-center-2.0.mo
share/locale/cs/LC_MESSAGES/control-center-2.0.mo
share/locale/cy/LC_MESSAGES/control-center-2.0.mo
share/locale/da/LC_MESSAGES/control-center-2.0.mo
share/locale/de/LC_MESSAGES/control-center-2.0.mo
+share/locale/dz/LC_MESSAGES/control-center-2.0.mo
share/locale/el/LC_MESSAGES/control-center-2.0.mo
share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
@@ -184,6 +189,7 @@ share/locale/id/LC_MESSAGES/control-center-2.0.mo
share/locale/is/LC_MESSAGES/control-center-2.0.mo
share/locale/it/LC_MESSAGES/control-center-2.0.mo
share/locale/ja/LC_MESSAGES/control-center-2.0.mo
+share/locale/ka/LC_MESSAGES/control-center-2.0.mo
share/locale/ko/LC_MESSAGES/control-center-2.0.mo
share/locale/ku/LC_MESSAGES/control-center-2.0.mo
share/locale/lt/LC_MESSAGES/control-center-2.0.mo
@@ -220,20 +226,30 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
share/locale/wa/LC_MESSAGES/control-center-2.0.mo
share/locale/xh/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@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/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/es
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
-@dirrmtry share/gnome/gnome-background-properties
+@dirrm share/gnome/gnome-default-applications
+@dirrm share/gnome/gnome-background-properties
+@dirrm share/gnome/desktop-directories
@dirrm share/gnome/cursor-fonts
@dirrm share/gnome/control-center-2.0/xrdb
@dirrm share/gnome/control-center-2.0/pixmaps
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 9659a14013e6..e5553c13e10f 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -3,27 +3,27 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $
+# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.67 2006/04/23 23:04:15 mezz Exp $
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 system monitor program
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 9fe5221376e5..c259d28b00be 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 100f3599b95a375db85df521f3e2554e
-SHA256 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = c0c18d1f9e29c11c02adac83dcfffdb1f839d9c5575496d0f5beb8de09a31d1f
-SIZE (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 786092
+MD5 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 5d9265d712665eaa1a341ad493c284b2
+SHA256 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 21af60fd9b307d2f969e526423ba966639020d128b9f61561ab1c14e3bfb7f5a
+SIZE (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 1416460
diff --git a/sysutils/gnomesystemmonitor/files/patch-configure b/sysutils/gnomesystemmonitor/files/patch-configure
index 504276306bba..aed30356f7ab 100644
--- a/sysutils/gnomesystemmonitor/files/patch-configure
+++ b/sysutils/gnomesystemmonitor/files/patch-configure
@@ -1,20 +1,11 @@
---- configure.orig Mon Nov 25 21:02:50 2002
-+++ configure Fri Nov 29 20:30:44 2002
-@@ -3731,7 +3731,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
-@@ -6630,7 +6630,7 @@
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+--- configure.orig Wed Dec 14 19:11:33 2005
++++ configure Wed Dec 14 19:11:33 2005
+@@ -25028,7 +25028,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
+s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@GCONF_SCHEMAS_INSTALL_TRUE@,$GCONF_SCHEMAS_INSTALL_TRUE,;t t
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
index 1b94fbb9f499..971e718b2101 100644
--- a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
+++ b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
@@ -8,16 +8,3 @@
#include <arpa/inet.h>
#include "procman.h"
#include "openfiles.h"
-@@ -152,10 +153,10 @@
- {
- ProcInfo *info;
- GtkTreeModel *model;
-- glibtop_open_files_entry *openfiles;
-- glibtop_proc_open_files procmap;
- GHashTable *new_maps;
- gint i;
-+ glibtop_open_files_entry *openfiles;
-+ glibtop_proc_open_files procmap;
-
- info = g_object_get_data (G_OBJECT (tree), "selected_info");
- g_return_if_fail (info);
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 419ddc095099..eec36e00660f 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -15,7 +15,23 @@ share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/bg/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/bg/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/bg/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/bg/figures/processListing.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/bg/legal.xml
share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
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
@@ -28,6 +44,7 @@ share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo
share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
@@ -47,6 +64,7 @@ share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
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/ko/LC_MESSAGES/gnome-system-monitor.mo
share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
@@ -79,10 +97,15 @@ share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/bg/figures
+@dirrm share/gnome/help/gnome-system-monitor/bg
@dirrm share/gnome/help/gnome-system-monitor/C/figures
@dirrm share/gnome/help/gnome-system-monitor/C
@dirrm share/gnome/help/gnome-system-monitor
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 7d98a8fbf20d..b64ab1eff2a6 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -3,15 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $
+# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.40 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= gnomesystemtools
-PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4
+MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-tools-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,10 +22,11 @@ RUN_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sys
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
CONFIGURE_ARGS= --enable-services
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,7 +37,7 @@ GCONF_SCHEMAS= gnome-system-tools.schemas
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-IGNORE= Uses symbols not present in 4.X
+IGNORE= uses symbols not present in 4.X
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index 8a73d9d3f890..dea2f0713697 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 9ede7bcadde796396a30cdb5fa347f49
-SHA256 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = b279e6b08989772cca3a7a1038971191ea6c8b9f26e02238c2e79b5faaedf380
-SIZE (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 2045146
+MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
+SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
+SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index 9d5c574cdcdc..acbf5571d27a 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -73,13 +73,20 @@ share/gnome/applications/users.desktop
share/gnome/help/boot-admin/C/boot-admin.xml
share/gnome/help/boot-admin/C/figures/boot-tool.png
share/gnome/help/boot-admin/C/legal.xml
+share/gnome/help/boot-admin/es/boot-admin.xml
+share/gnome/help/boot-admin/es/figures/boot-tool.png
share/gnome/help/network-admin/C/figures/network-tool.png
share/gnome/help/network-admin/C/legal.xml
share/gnome/help/network-admin/C/network-admin.xml
+share/gnome/help/network-admin/es/figures/network-tool.png
+share/gnome/help/network-admin/es/network-admin.xml
share/gnome/help/services-admin/C/figures/service-properties.png
share/gnome/help/services-admin/C/figures/services-tool.png
share/gnome/help/services-admin/C/legal.xml
share/gnome/help/services-admin/C/services-admin.xml
+share/gnome/help/services-admin/es/figures/service-properties.png
+share/gnome/help/services-admin/es/figures/services-tool.png
+share/gnome/help/services-admin/es/services-admin.xml
share/gnome/help/services-admin/nl/figures/service-properties.png
share/gnome/help/services-admin/nl/figures/services-tool.png
share/gnome/help/services-admin/nl/legal.xml
@@ -89,6 +96,10 @@ share/gnome/help/time-admin/C/figures/time-servers.png
share/gnome/help/time-admin/C/figures/time-tool.png
share/gnome/help/time-admin/C/legal.xml
share/gnome/help/time-admin/C/time-admin.xml
+share/gnome/help/time-admin/es/figures/time-map.png
+share/gnome/help/time-admin/es/figures/time-servers.png
+share/gnome/help/time-admin/es/figures/time-tool.png
+share/gnome/help/time-admin/es/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
@@ -97,13 +108,20 @@ share/gnome/help/time-admin/nl/time-admin.xml
share/gnome/help/users-admin/C/figures/users-tool.png
share/gnome/help/users-admin/C/legal.xml
share/gnome/help/users-admin/C/users-admin.xml
-share/gnome/omf/gnome-system-tools/boot-admin-C.omf
-share/gnome/omf/gnome-system-tools/network-admin-C.omf
-share/gnome/omf/gnome-system-tools/services-admin-C.omf
+share/gnome/help/users-admin/es/figures/users-tool.png
+share/gnome/help/users-admin/es/users-admin.xml
+share/gnome/omf/boot-admin/boot-admin-C.omf
+share/gnome/omf/boot-admin/boot-admin-es.omf
share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-C.omf
share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/gnome-system-tools/users-admin-C.omf
+share/gnome/omf/network-admin/network-admin-C.omf
+share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/services-admin/services-admin-C.omf
+share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/time-admin/time-admin-C.omf
+share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/users-admin/users-admin-C.omf
+share/gnome/omf/users-admin/users-admin-es.omf
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
@@ -111,6 +129,7 @@ share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
+share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
share/locale/da/LC_MESSAGES/gnome-system-tools.mo
share/locale/de/LC_MESSAGES/gnome-system-tools.mo
share/locale/el/LC_MESSAGES/gnome-system-tools.mo
@@ -164,26 +183,44 @@ share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrm share/gnome/omf/users-admin
+@dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/services-admin
+@dirrm share/gnome/omf/network-admin
@dirrm share/gnome/omf/gnome-system-tools
+@dirrm share/gnome/omf/boot-admin
@dirrm share/gnome/help/users-admin/C/figures
@dirrm share/gnome/help/users-admin/C
+@dirrm share/gnome/help/users-admin/es/figures
+@dirrm share/gnome/help/users-admin/es
@dirrm share/gnome/help/users-admin
@dirrm share/gnome/help/time-admin/nl/figures
@dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/es/figures
+@dirrm share/gnome/help/time-admin/es
@dirrm share/gnome/help/time-admin/C/figures
@dirrm share/gnome/help/time-admin/C
@dirrm share/gnome/help/time-admin
@dirrm share/gnome/help/services-admin/nl/figures
@dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/es/figures
+@dirrm share/gnome/help/services-admin/es
@dirrm share/gnome/help/services-admin/C/figures
@dirrm share/gnome/help/services-admin/C
@dirrm share/gnome/help/services-admin
+@dirrm share/gnome/help/network-admin/es/figures
+@dirrm share/gnome/help/network-admin/es
@dirrm share/gnome/help/network-admin/C/figures
@dirrm share/gnome/help/network-admin/C
@dirrm share/gnome/help/network-admin
+@dirrm share/gnome/help/boot-admin/es/figures
+@dirrm share/gnome/help/boot-admin/es
@dirrm share/gnome/help/boot-admin/C/figures
@dirrm share/gnome/help/boot-admin/C
@dirrm share/gnome/help/boot-admin
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index d8b55b38e8f0..2a68be925112 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,28 +3,28 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.77 2005/10/03 23:36:08 marcus Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.96 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= nautilus-cd-burner
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= CD burner view for Nautilus
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --disable-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index b56c8d9af84f..4dc063ddda38 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.12.3.tar.bz2) = 518bc18f9c2c5478fe3a473d2e57b094
-SHA256 (gnome2/nautilus-cd-burner-2.12.3.tar.bz2) = 174806266488be5b56f1ec6b89ebe0b017dd96f72c6233398670d2f12ea03786
-SIZE (gnome2/nautilus-cd-burner-2.12.3.tar.bz2) = 615109
+MD5 (gnome2/nautilus-cd-burner-2.14.1.tar.bz2) = 093b21536b6a6670742dfadafecd032c
+SHA256 (gnome2/nautilus-cd-burner-2.14.1.tar.bz2) = 573dbf7df7aa6214c596dd667567fd59105aa3b4f18b34a8c4f84f067d89af47
+SIZE (gnome2/nautilus-cd-burner-2.14.1.tar.bz2) = 672957
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 4226cf2c680d..ed60e981e09f 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -2,16 +2,18 @@ bin/nautilus-cd-burner
etc/gnome-vfs-2.0/modules/mapping-modules.conf
include/libnautilus-burn/nautilus-burn-drive-selection.h
include/libnautilus-burn/nautilus-burn-drive.h
+include/libnautilus-burn/nautilus-burn-features.h
include/libnautilus-burn/nautilus-burn-recorder.h
lib/gnome-vfs-2.0/modules/libmapping.la
lib/gnome-vfs-2.0/modules/libmapping.so
lib/libnautilus-burn.la
lib/libnautilus-burn.so
-lib/libnautilus-burn.so.2
+lib/libnautilus-burn.so.3
lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
libdata/pkgconfig/libnautilus-burn.pc
libexec/mapping-daemon
+share/gnome/applications/nautilus-cd-burner.desktop
share/gnome/nautilus-cd-burner/cdburn.glade
share/gnome/nautilus-cd-burner/cdspin1.png
share/gnome/nautilus-cd-burner/cdspin2.png
@@ -53,6 +55,7 @@ share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
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/ko/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
@@ -87,8 +90,13 @@ share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrm share/gnome/nautilus-cd-burner
@dirrm include/libnautilus-burn
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
new file mode 100644
index 000000000000..4bb267b6f952
--- /dev/null
+++ b/sysutils/pessulus/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for: pessulus
+# Date created: 14 March 2006
+# Whom: FreeBSD GNOME Team
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.3 2006/04/10 13:23:35 ahze Exp $
+#
+
+PORTNAME= pessulus
+PORTVERSION= 0.9.1
+CATEGORIES= sysutils gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A lockdown editor for GNOME
+
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnomeprefix intlhack pygnome2
+WANT_GNOME= yes
+USE_PYTHON= yes
+USE_GETTEXT= yes
+USE_X_PREFIX= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+DOCS= AUTHORS COPYING ChangeLog HACKING \
+ MAINTAINERS NEWS README TODO
+
+.ifndef (NOPORTDOCS)
+post-install:
+ @${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
new file mode 100644
index 000000000000..90022b424d55
--- /dev/null
+++ b/sysutils/pessulus/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/pessulus-0.9.1.tar.gz) = d5c67fb75254d93dd28c9a73880007db
+SHA256 (gnome2/pessulus-0.9.1.tar.gz) = 55a038530650d1e8d79be37d12122b5ac0f44f6b0e70d27b8e109f53fe6c33a8
+SIZE (gnome2/pessulus-0.9.1.tar.gz) = 166001
diff --git a/sysutils/pessulus/pkg-descr b/sysutils/pessulus/pkg-descr
new file mode 100644
index 000000000000..f1105467ee28
--- /dev/null
+++ b/sysutils/pessulus/pkg-descr
@@ -0,0 +1,6 @@
+Pessulus is a lockdown editor for GNOME, written in python. It enables
+administrators to set mandatory settings in GConf. The users can not change
+these settings. Use of pessulus can be useful on computers that are open to
+use by everyone, e.g. in an internet cafe.
+
+WWW: http://www.gnome.org/~vuntz/pessulus/
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
new file mode 100644
index 000000000000..1cefcd83f875
--- /dev/null
+++ b/sysutils/pessulus/pkg-plist
@@ -0,0 +1,100 @@
+bin/pessulus
+%%PYTHON_SITELIBDIR%%/Pessulus/__init__.py
+%%PYTHON_SITELIBDIR%%/Pessulus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/config.py
+%%PYTHON_SITELIBDIR%%/Pessulus/config.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/config.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.py
+%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.py
+%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/icons.py
+%%PYTHON_SITELIBDIR%%/Pessulus/icons.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/icons.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/main.py
+%%PYTHON_SITELIBDIR%%/Pessulus/main.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/main.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.py
+%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.py
+%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.py
+%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyo
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/gnome/applications/pessulus.desktop
+share/gnome/pessulus/glade/pessulus.glade
+share/locale/bg/LC_MESSAGES/pessulus.mo
+share/locale/bn/LC_MESSAGES/pessulus.mo
+share/locale/ca/LC_MESSAGES/pessulus.mo
+share/locale/cs/LC_MESSAGES/pessulus.mo
+share/locale/cy/LC_MESSAGES/pessulus.mo
+share/locale/da/LC_MESSAGES/pessulus.mo
+share/locale/de/LC_MESSAGES/pessulus.mo
+share/locale/dz/LC_MESSAGES/pessulus.mo
+share/locale/el/LC_MESSAGES/pessulus.mo
+share/locale/en_CA/LC_MESSAGES/pessulus.mo
+share/locale/es/LC_MESSAGES/pessulus.mo
+share/locale/et/LC_MESSAGES/pessulus.mo
+share/locale/eu/LC_MESSAGES/pessulus.mo
+share/locale/fi/LC_MESSAGES/pessulus.mo
+share/locale/fr/LC_MESSAGES/pessulus.mo
+share/locale/gl/LC_MESSAGES/pessulus.mo
+share/locale/gu/LC_MESSAGES/pessulus.mo
+share/locale/hi/LC_MESSAGES/pessulus.mo
+share/locale/hu/LC_MESSAGES/pessulus.mo
+share/locale/id/LC_MESSAGES/pessulus.mo
+share/locale/it/LC_MESSAGES/pessulus.mo
+share/locale/ja/LC_MESSAGES/pessulus.mo
+share/locale/ka/LC_MESSAGES/pessulus.mo
+share/locale/ko/LC_MESSAGES/pessulus.mo
+share/locale/lt/LC_MESSAGES/pessulus.mo
+share/locale/mk/LC_MESSAGES/pessulus.mo
+share/locale/nb/LC_MESSAGES/pessulus.mo
+share/locale/nl/LC_MESSAGES/pessulus.mo
+share/locale/pa/LC_MESSAGES/pessulus.mo
+share/locale/pt/LC_MESSAGES/pessulus.mo
+share/locale/pt_BR/LC_MESSAGES/pessulus.mo
+share/locale/sk/LC_MESSAGES/pessulus.mo
+share/locale/sq/LC_MESSAGES/pessulus.mo
+share/locale/sr/LC_MESSAGES/pessulus.mo
+share/locale/sr@Latn/LC_MESSAGES/pessulus.mo
+share/locale/sv/LC_MESSAGES/pessulus.mo
+share/locale/th/LC_MESSAGES/pessulus.mo
+share/locale/uk/LC_MESSAGES/pessulus.mo
+share/locale/vi/LC_MESSAGES/pessulus.mo
+share/locale/zh_CN/LC_MESSAGES/pessulus.mo
+share/locale/zh_HK/LC_MESSAGES/pessulus.mo
+share/locale/zh_TW/LC_MESSAGES/pessulus.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrm share/gnome/pessulus/glade
+@dirrm share/gnome/pessulus
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/Pessulus
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index 36a84cfeb50a..7ecc07d1420d 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= slmon
PORTVERSION= 0.5.13
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,10 +16,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= S-Lang System Monitor
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
slang.1:${PORTSDIR}/devel/libslang
-USE_REINPLACE= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes