aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile7
-rw-r--r--devel/anjuta/Makefile18
-rw-r--r--devel/anjuta/distinfo6
-rw-r--r--devel/anjuta/files/patch-global-tags_create_global_tags.sh4
-rw-r--r--devel/anjuta/files/patch-libanjuta_anjuta-launcher.c36
-rw-r--r--devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c69
-rw-r--r--devel/anjuta/files/patch-plugins_glade_pluginc.c100
-rw-r--r--devel/anjuta/pkg-plist756
-rw-r--r--devel/bug-buddy/Makefile9
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/pkg-plist3
-rw-r--r--devel/dbus/Makefile14
-rw-r--r--devel/dbus/distinfo6
-rw-r--r--devel/dbus/files/patch-bus_Makefile.in20
-rw-r--r--devel/dbus/files/patch-bus_bus.c30
-rw-r--r--devel/dbus/files/patch-bus_system.conf.in10
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c56
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c23
-rw-r--r--devel/dbus/pkg-install1
-rw-r--r--devel/dbus/pkg-plist15
-rw-r--r--devel/gamin/Makefile5
-rw-r--r--devel/gconf2/Makefile9
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/pkg-plist9
-rw-r--r--devel/gconfmm26/Makefile4
-rw-r--r--devel/gconfmm26/distinfo6
-rw-r--r--devel/gio-fam-backend/Makefile39
-rw-r--r--devel/gio-fam-backend/distinfo3
-rw-r--r--devel/gio-fam-backend/files/patch-fam52
-rw-r--r--devel/gio-fam-backend/files/patch-gio_fam_Makefile.in27
-rw-r--r--devel/gio-fam-backend/pkg-descr2
-rw-r--r--devel/gio-fam-backend/pkg-plist5
-rw-r--r--devel/glib20/Makefile14
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/extra-patch-gthread_gthread-posix.c32
-rw-r--r--devel/glib20/files/patch-ae28
-rw-r--r--devel/glib20/files/patch-ag25
-rw-r--r--devel/glib20/files/patch-ah22
-rw-r--r--devel/glib20/files/patch-config.h.in12
-rw-r--r--devel/glib20/files/patch-gio_glocalfile.c11
-rw-r--r--devel/glib20/files/patch-gio_gunixmount.c21
-rw-r--r--devel/glib20/files/patch-gio_gunixmounts.c148
-rw-r--r--devel/glib20/files/patch-gio_gunixvolume.c17
-rw-r--r--devel/glib20/files/patch-gio_xdgmime_xdgmime.c11
-rw-r--r--devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h12
-rw-r--r--devel/glib20/files/patch-glib::libcharset::Makefile.in27
-rw-r--r--devel/glib20/pkg-plist64
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/pkg-plist94
-rw-r--r--devel/gnome-vfs/Makefile6
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/pkg-deinstall.in2
-rw-r--r--devel/gnome-vfs/pkg-install.in2
-rw-r--r--devel/gnome-vfs/pkg-plist4
-rw-r--r--devel/gnome-vfsmm/Makefile7
-rw-r--r--devel/gnome-vfsmm/distinfo6
-rw-r--r--devel/gnome-vfsmm/pkg-plist6
-rw-r--r--devel/gstreamer-plugins-gconf/Makefile3
-rw-r--r--devel/gstreamer-plugins-gio/Makefile18
-rw-r--r--devel/gstreamer-plugins-gnomevfs/Makefile3
-rw-r--r--devel/gstreamer-plugins-sdl/Makefile3
-rw-r--r--devel/gstreamer-plugins-soup/Makefile18
-rw-r--r--devel/gvfs/Makefile73
-rw-r--r--devel/gvfs/distinfo3
-rw-r--r--devel/gvfs/files/patch-Makefile.in11
-rw-r--r--devel/gvfs/files/patch-client_Makefile.in11
-rw-r--r--devel/gvfs/files/patch-client_gvfsfusedaemon.c12
-rw-r--r--devel/gvfs/files/patch-configure84
-rw-r--r--devel/gvfs/files/patch-daemon_gvfswritechannel.c10
-rw-r--r--devel/gvfs/files/patch-hal_ghalvolume.c14
-rw-r--r--devel/gvfs/pkg-descr6
-rw-r--r--devel/gvfs/pkg-plist112
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libbonobo/distinfo6
-rw-r--r--devel/libbonobo/pkg-plist3
-rw-r--r--devel/libgtop/Makefile15
-rw-r--r--devel/libgtop/distinfo6
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in28
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c61
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c171
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c186
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procwd.c94
-rw-r--r--devel/libgtop/pkg-plist3
-rw-r--r--devel/liboil/Makefile11
-rw-r--r--devel/liboil/distinfo6
-rw-r--r--devel/liboil/pkg-plist4
-rw-r--r--devel/liboobs/Makefile12
-rw-r--r--devel/liboobs/distinfo6
-rw-r--r--devel/liboobs/files/patch-src_oobs-user.c28
-rw-r--r--devel/liboobs/pkg-plist10
-rw-r--r--devel/libsigc++20/Makefile3
-rw-r--r--devel/libsigc++20/distinfo6
-rw-r--r--devel/libsigc++20/pkg-plist109
-rw-r--r--devel/libsoup/Makefile11
-rw-r--r--devel/libsoup/distinfo6
-rw-r--r--devel/libsoup/pkg-plist22
-rw-r--r--devel/libsoup22/Makefile13
-rw-r--r--devel/libvolume_id/Makefile3
-rw-r--r--devel/libvolume_id/distinfo6
-rw-r--r--devel/libvolume_id/files/patch-fat.c38
-rw-r--r--devel/ndesk-dbus-glib/Makefile35
-rw-r--r--devel/ndesk-dbus-glib/distinfo3
-rw-r--r--devel/ndesk-dbus-glib/pkg-descr3
-rw-r--r--devel/ndesk-dbus-glib/pkg-plist12
-rw-r--r--devel/ndesk-dbus/Makefile35
-rw-r--r--devel/ndesk-dbus/distinfo3
-rw-r--r--devel/ndesk-dbus/pkg-descr8
-rw-r--r--devel/ndesk-dbus/pkg-plist11
-rw-r--r--devel/pkg-config/Makefile4
-rw-r--r--devel/pkg-config/distinfo6
-rw-r--r--devel/pkg-config/files/patch-glib-1.2.10_Makefile.in (renamed from devel/pkg-config/files/patch-glib-1.2.8::Makefile.in)4
-rw-r--r--devel/pkg-config/files/patch-pkg.c14
-rw-r--r--devel/pkg-config/files/patch-pkg_conflicts29
114 files changed, 2418 insertions, 950 deletions
diff --git a/devel/Makefile b/devel/Makefile
index a5c3293887b3..ea282d8054f7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -397,6 +397,7 @@
SUBDIR += getxml
SUBDIR += gflags
SUBDIR += gindent
+ SUBDIR += gio-fam-backend
SUBDIR += git
SUBDIR += glade2
SUBDIR += glade3
@@ -437,8 +438,10 @@
SUBDIR += gputils
SUBDIR += gsoap
SUBDIR += gstreamer-plugins-gconf
+ SUBDIR += gstreamer-plugins-gio
SUBDIR += gstreamer-plugins-gnomevfs
SUBDIR += gstreamer-plugins-sdl
+ SUBDIR += gstreamer-plugins-soup
SUBDIR += gtgt
SUBDIR += gtkmozedit
SUBDIR += gtranslator
@@ -447,6 +450,7 @@
SUBDIR += guile-lib
SUBDIR += guiloader
SUBDIR += guiloader-c++
+ SUBDIR += gvfs
SUBDIR += gwenhywfar
SUBDIR += gzstream
SUBDIR += hachoir-core
@@ -672,6 +676,7 @@
SUBDIR += libslang2
SUBDIR += libsoup
SUBDIR += libsoup-reference
+ SUBDIR += libsoup22
SUBDIR += libstatgrab
SUBDIR += libstrfunc
SUBDIR += libstroke
@@ -805,6 +810,8 @@
SUBDIR += ncnf
SUBDIR += ncurses
SUBDIR += ncurses-devel
+ SUBDIR += ndesk-dbus
+ SUBDIR += ndesk-dbus-glib
SUBDIR += netscape-java40
SUBDIR += newfile
SUBDIR += newt
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index c23e51b27056..1240a20d580a 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,11 +3,11 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta/Makefile,v 1.13 2007/09/07 05:03:33 marcus Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.22 2008/03/11 03:52:48 marcus Exp $
#
PORTNAME= anjuta
-PORTVERSION= 2.2.3
+PORTVERSION= 2.4.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= anjuta
@@ -21,6 +21,7 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
gbf-1.1:${PORTSDIR}/devel/gnome-build \
gladeui-1.7:${PORTSDIR}/devel/glade3 \
+ neon.26:${PORTSDIR}/www/neon \
devhelp-1.0:${PORTSDIR}/devel/devhelp
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
autogen:${PORTSDIR}/devel/autogen \
@@ -40,7 +41,16 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprintui libgnomeui vte \
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --enable-plugin-symbol-db
USE_LDCONFIG= yes
+PKGMESSAGE= ${WRKDIR}/pkg-message
+GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \
+ anjuta-cvs-plugin.schemas anjuta-document-manager.schemas \
+ anjuta-editor-scintilla.schemas anjuta-language-cpp-java.schemas \
+ anjuta-message-manager-plugin.schemas \
+ anjuta-editor-sourceview.schemas \
+ anjuta-symbol-browser-plugin.schemas \
+ anjuta-terminal-plugin.schemas anjuta.schemas
MAN1= anjuta.1 anjuta_launcher.1
@@ -67,9 +77,11 @@ PLIST_SUB+= SVN="@comment "
post-configure:
@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \
s|/usr/local|${PREFIX}|' \
- ${WRKSRC}/global-tags/create_global_tags.sh
+ ${WRKSRC}/global-tags/create_global_tags.sh.in
@${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|make|gmake|g' \
+ ${WRKSRC}/plugins/build-basic-autotools/build-basic-autotools.c
post-install:
.if !defined(NOPORTDOCS)
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 4e95bbfd1d49..d053c7a5db36 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (anjuta-2.2.3.tar.bz2) = d84b255b5ddb81a955b3ad1fc5ea8f9a
-SHA256 (anjuta-2.2.3.tar.bz2) = c91fbc3c7b233d60d511eab025042dd73f43d1ea0e2b2d73d39d6479bb0320f9
-SIZE (anjuta-2.2.3.tar.bz2) = 5547518
+MD5 (anjuta-2.4.0.tar.bz2) = 5eca972ef7b95de85a8088eaf9cc0753
+SHA256 (anjuta-2.4.0.tar.bz2) = 5bc67461e5d263c4f4b05f9fc3eb27c599a38ee0fb1393b0f941090774c35e95
+SIZE (anjuta-2.4.0.tar.bz2) = 6257700
diff --git a/devel/anjuta/files/patch-global-tags_create_global_tags.sh b/devel/anjuta/files/patch-global-tags_create_global_tags.sh
index 206e390c23bc..f542c83ea557 100644
--- a/devel/anjuta/files/patch-global-tags_create_global_tags.sh
+++ b/devel/anjuta/files/patch-global-tags_create_global_tags.sh
@@ -1,5 +1,5 @@
---- global-tags/create_global_tags.sh.orig Sun Jul 8 03:39:26 2007
-+++ global-tags/create_global_tags.sh Sun Jul 8 03:41:12 2007
+--- global-tags/create_global_tags.sh.in.orig Sun Jul 8 03:39:26 2007
++++ global-tags/create_global_tags.sh.in Sun Jul 8 03:41:12 2007
@@ -68,9 +68,9 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C
## the packages, which we don't like. We only want cflags relevent
## to the packages alone.
diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
index 73987d782cd5..1c7679ab2b95 100644
--- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
+++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
@@ -1,5 +1,5 @@
---- libanjuta/anjuta-launcher.c.orig Mon Jun 11 13:22:08 2007
-+++ libanjuta/anjuta-launcher.c Sun Jul 8 03:39:07 2007
+--- libanjuta/anjuta-launcher.c.orig 2008-02-15 18:32:29.000000000 -0500
++++ libanjuta/anjuta-launcher.c 2008-02-25 22:45:03.000000000 -0500
@@ -37,7 +37,7 @@
#include <signal.h>
@@ -9,17 +9,17 @@
# include <pty.h>
# else
# include <libutil.h>
-@@ -713,7 +713,8 @@ anjuta_launcher_scan_output (GIOChannel
+@@ -749,7 +749,8 @@ anjuta_launcher_scan_output (GIOChannel
GError *err = NULL;
do
{
- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
+ GIOStatus status;
+ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
- if (n > 0 && !err) /* There is output */
+ if (n > 0) /* There is output */
{
gchar *utf8_chars;
-@@ -733,6 +734,13 @@ anjuta_launcher_scan_output (GIOChannel
+@@ -776,6 +777,13 @@ anjuta_launcher_scan_output (GIOChannel
anjuta_launcher_synchronize (launcher);
ret = FALSE;
}
@@ -33,17 +33,17 @@
/* Read next chars if buffer was too small
* (the maximum length of one character is 6 bytes) */
} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -762,7 +770,8 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -805,7 +813,8 @@ anjuta_launcher_scan_error (GIOChannel *
GError *err = NULL;
do
{
- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
+ GIOStatus status;
+ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
- if (n > 0 && !err) /* There is stderr output */
+ if (n > 0) /* There is stderr output */
{
gchar *utf8_chars;
-@@ -782,6 +791,13 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -833,6 +842,13 @@ anjuta_launcher_scan_error (GIOChannel *
anjuta_launcher_synchronize (launcher);
ret = FALSE;
}
@@ -57,24 +57,24 @@
/* Read next chars if buffer was too small
* (the maximum length of one character is 6 bytes) */
} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -811,7 +827,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+@@ -862,7 +878,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
GError *err = NULL;
do
{
- g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
+ GIOStatus status;
+ status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
- if (n > 0 && !err) /* There is stderr output */
+ if (n > 0) /* There is stderr output */
{
gchar *utf8_chars;
-@@ -833,6 +850,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch
- else if (err && errno != EAGAIN && errno != EINTR)
- {
- g_warning (_("launcher.c: Error while reading child pty\n"));
-+ ret = FALSE;
-+ }
-+ else if (status == G_IO_STATUS_EOF)
-+ {
+@@ -893,6 +910,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+ g_warning ("pty: %s", err->message);
ret = FALSE;
}
++ else if (status == G_IO_STATUS_EOF)
++ {
++ ret = FALSE;
++ }
/* Read next chars if buffer was too small
+ * (the maximum length of one character is 6 bytes) */
+ } while (!err && (n > FILE_BUFFER_SIZE - 7));
diff --git a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c b/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c
deleted file mode 100644
index 986d68057a05..000000000000
--- a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- plugins/document-manager/anjuta-docman.c.orig Thu Jun 7 14:56:53 2007
-+++ plugins/document-manager/anjuta-docman.c Fri Aug 31 16:53:19 2007
-@@ -902,6 +902,7 @@
- const gchar *linenum;
- glong lineno;
- gboolean is_local_uri;
-+ gchar normalized_path_buf[PATH_MAX];
- gchar *normalized_path = NULL;
-
- IAnjutaEditor *te;
-@@ -926,9 +927,11 @@
- /* Get the normalized file path for comparision */
- is_local_uri = gnome_vfs_uri_is_local (vfs_uri);
- if (is_local_uri)
-- normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), NULL);
-- if (normalized_path == NULL)
-- normalized_path = g_strdup (uri);
-+ normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), normalized_path_buf);
-+ if (normalized_path == NULL) {
-+ (void) strlcpy (normalized_path_buf, uri, PATH_MAX);
-+ normalized_path = normalized_path_buf;
-+ }
-
- gnome_vfs_uri_unref (vfs_uri);
- /* g_free(filename); */
-@@ -942,6 +945,7 @@
- AnjutaDocmanPage *page;
- gboolean te_is_local_uri;
- gchar *te_uri;
-+ char te_normalized_path_buf[PATH_MAX];
- gchar *te_normalized_path = NULL;
-
- page = (AnjutaDocmanPage *) node->data;
-@@ -959,9 +963,11 @@
- te_is_local_uri = gnome_vfs_uri_is_local (vfs_uri);
- if (te_is_local_uri)
- te_normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri),
-- NULL);
-- if (te_normalized_path == NULL)
-- te_normalized_path = g_strdup (te_uri);
-+ te_normalized_path_buf);
-+ if (te_normalized_path == NULL) {
-+ (void) strlcpy (te_normalized_path_buf, te_uri, PATH_MAX);
-+ te_normalized_path = te_normalized_path_buf;
-+ }
- gnome_vfs_uri_unref (vfs_uri);
-
- if (strcmp (normalized_path, te_normalized_path) == 0)
-@@ -982,12 +988,9 @@
- an_file_history_push (te_uri, lineno);
- g_free (uri);
- g_free (te_uri);
-- g_free (normalized_path);
-- g_free (te_normalized_path);
- return te;
- }
- g_free (te_uri);
-- g_free (te_normalized_path);
- node = g_list_next (node);
- }
- te = anjuta_docman_add_editor (docman, uri, NULL);
-@@ -1006,7 +1009,6 @@
- }
- }
- g_free (uri);
-- g_free (normalized_path);
- return te ;
- }
-
diff --git a/devel/anjuta/files/patch-plugins_glade_pluginc.c b/devel/anjuta/files/patch-plugins_glade_pluginc.c
deleted file mode 100644
index c2bd9847c4cd..000000000000
--- a/devel/anjuta/files/patch-plugins_glade_pluginc.c
+++ /dev/null
@@ -1,100 +0,0 @@
---- plugins/glade/plugin.c.orig 2007-10-23 04:24:26.000000000 -0400
-+++ plugins/glade/plugin.c 2007-10-29 11:05:01.000000000 -0400
-@@ -20,7 +20,7 @@
-
- #include <config.h>
-
--#if (GLADEUI_VERSION <= 302)
-+#if (GLADEUI_VERSION <= 303)
- # include <glade.h>
- #else
- # if (GLADEUI_VERSION <= 314)
-@@ -54,7 +54,7 @@ struct _GladePluginPriv
- GtkActionGroup *action_group;
- GladeApp *gpw;
- GtkWidget *inspector;
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- GtkWidget *design_notebook;
- #endif
- GtkWidget *view_box;
-@@ -428,7 +428,7 @@ on_api_help (GladeEditor* editor,
- static void
- glade_do_close (GladePlugin *plugin, GladeProject *project)
- {
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- GtkWidget *design_view;
-
- design_view = g_object_get_data (G_OBJECT (project), "design_view");
-@@ -506,14 +506,14 @@ on_glade_project_changed (GtkComboBox *c
- {
- GladeProject *project;
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- GtkWidget *design_view;
- gint design_pagenum;
- #endif
- gtk_tree_model_get (model, &iter, PROJECT_COL, &project, -1);
- glade_app_set_project (project);
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- design_view = g_object_get_data (G_OBJECT (project), "design_view");
- design_pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (plugin->priv->design_notebook),
- design_view);
-@@ -717,7 +717,7 @@ on_shell_destroy (AnjutaShell *shell, Gl
- gtk_container_remove (GTK_CONTAINER (parent), wid);
- }
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- static void
- glade_plugin_add_project (GladePlugin *glade_plugin, GladeProject *project)
- {
-@@ -800,7 +800,7 @@ activate_plugin (AnjutaPlugin *plugin)
- g_object_unref (G_OBJECT (store));
- gtk_box_pack_start (GTK_BOX (priv->view_box), priv->projects_combo,
- FALSE, FALSE, 0);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- # if (GLADEUI_VERSION >= 330)
- priv->inspector = glade_inspector_new ();
-
-@@ -829,7 +829,7 @@ activate_plugin (AnjutaPlugin *plugin)
- gtk_notebook_popup_enable (GTK_NOTEBOOK (glade_app_get_editor ()->notebook));
-
-
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- /* Create design_notebook */
- priv->design_notebook = gtk_notebook_new ();
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->design_notebook), FALSE);
-@@ -866,7 +866,7 @@ activate_plugin (AnjutaPlugin *plugin)
- g_object_ref (glade_app_get_palette ());
- g_object_ref (glade_app_get_editor ());
- g_object_ref (priv->view_box);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- g_object_ref (priv->design_notebook);
- #endif
- gtk_widget_show (GTK_WIDGET (glade_app_get_palette ()));
-@@ -888,7 +888,7 @@ activate_plugin (AnjutaPlugin *plugin)
- "AnjutaGladeEditor", _("Properties"),
- "glade-plugin-icon",
- ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell,
- GTK_WIDGET (priv->design_notebook),
- "AnjutaGladeDesigner", _("Designer"),
-@@ -939,7 +939,7 @@ deactivate_plugin (AnjutaPlugin *plugin)
- anjuta_shell_remove_widget (plugin->shell,
- GTK_WIDGET (priv->view_box),
- NULL);
--#if (GLADEUI_VERSION > 302)
-+#if (GLADEUI_VERSION > 303)
- anjuta_shell_remove_widget (plugin->shell,
- GTK_WIDGET (priv->design_notebook),
- NULL);
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index ecc2d183247d..6b489f8ab7e2 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -1,16 +1,16 @@
bin/anjuta
-bin/anjuta-shell
bin/anjuta_import.sh
bin/anjuta_launcher
-include/libanjuta-1.0/libanjuta/anjuta-children.h
+include/libanjuta-1.0/libanjuta/anjuta-async-command.h
+include/libanjuta-1.0/libanjuta/anjuta-command.h
include/libanjuta-1.0/libanjuta/anjuta-debug.h
include/libanjuta-1.0/libanjuta/anjuta-encodings.h
include/libanjuta-1.0/libanjuta/anjuta-enum-types.h
-include/libanjuta-1.0/libanjuta/anjuta-glue-factory.h
-include/libanjuta-1.0/libanjuta/anjuta-glue-plugin.h
+include/libanjuta-1.0/libanjuta/anjuta-error.h
include/libanjuta-1.0/libanjuta/anjuta-launcher.h
include/libanjuta-1.0/libanjuta/anjuta-marshal.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h
+include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h
include/libanjuta-1.0/libanjuta/anjuta-plugin.h
include/libanjuta-1.0/libanjuta/anjuta-preferences-dialog.h
@@ -24,14 +24,19 @@ include/libanjuta-1.0/libanjuta/anjuta-shell.h
include/libanjuta-1.0/libanjuta/anjuta-status.h
include/libanjuta-1.0/libanjuta/anjuta-ui.h
include/libanjuta-1.0/libanjuta/anjuta-utils.h
+include/libanjuta-1.0/libanjuta/anjuta-vcs-status-tree-view.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-bookmark.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-cpu-debugger.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debug-manager.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-breakpoint.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-instruction.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-memory.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-register.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-variable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document-manager.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-assist.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-autocomplete.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell-style.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-comment.h
@@ -42,6 +47,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-goto.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-hover.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-language.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-line-mode.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-search.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-zoom.h
@@ -55,12 +61,13 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-indicable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable-tree.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language-support.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-loader.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-macro.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-markable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-manager.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-view.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-plugin-loader.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-plugin-factory.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-preferences.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-print.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h
@@ -71,7 +78,6 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-manager.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-terminal.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-todo.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-variable-debugger.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-vcs.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-wizard.h
include/libanjuta-1.0/libanjuta/interfaces/libanjuta-iface-marshallers.h
@@ -87,7 +93,6 @@ lib/anjuta/anjuta-debug-manager.plugin
lib/anjuta/anjuta-devhelp.plugin
lib/anjuta/anjuta-document-manager.plugin
lib/anjuta/anjuta-editor.plugin
-lib/anjuta/anjuta-file-manager.plugin
lib/anjuta/anjuta-file-wizard.plugin
lib/anjuta/anjuta-gdb.plugin
lib/anjuta/anjuta-glade.plugin
@@ -106,6 +111,8 @@ lib/anjuta/anjuta-search.plugin
lib/anjuta/anjuta-symbol-browser.plugin
lib/anjuta/anjuta-terminal.plugin
lib/anjuta/anjuta-tools.plugin
+lib/anjuta/file-manager.plugin
+lib/anjuta/language-manager.plugin
lib/anjuta/libanjuta-build-basic-autotools.la
lib/anjuta/libanjuta-build-basic-autotools.so
lib/anjuta/libanjuta-class-gen.la
@@ -122,8 +129,6 @@ lib/anjuta/libanjuta-document-manager.la
lib/anjuta/libanjuta-document-manager.so
lib/anjuta/libanjuta-editor.la
lib/anjuta/libanjuta-editor.so
-lib/anjuta/libanjuta-file-manager.la
-lib/anjuta/libanjuta-file-manager.so
lib/anjuta/libanjuta-file-wizard.la
lib/anjuta/libanjuta-file-wizard.so
lib/anjuta/libanjuta-gdb.la
@@ -164,8 +169,16 @@ lib/anjuta/libanjuta-terminal.la
lib/anjuta/libanjuta-terminal.so
lib/anjuta/libanjuta-tools.la
lib/anjuta/libanjuta-tools.so
+lib/anjuta/libfile-manager.la
+lib/anjuta/libfile-manager.so
+lib/anjuta/libfile-manager.so.0
+lib/anjuta/liblanguage-manager.la
+lib/anjuta/liblanguage-manager.so
+lib/anjuta/liblanguage-manager.so.0
lib/anjuta/profiler.plugin
lib/anjuta/sourceview.plugin
+lib/glade3/modules/libgladeanjuta.la
+lib/glade3/modules/libgladeanjuta.so
lib/libanjuta-ctags.la
lib/libanjuta-ctags.so
lib/libanjuta-ctags.so.0
@@ -176,116 +189,6 @@ lib/libanjuta.la
lib/libanjuta.so
lib/libanjuta.so.0
libdata/pkgconfig/libanjuta-1.0.pc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/FUTURE
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/doc/libanjuta/AnjutaLauncher.html
-share/doc/libanjuta/AnjutaPlugin.html
-share/doc/libanjuta/AnjutaPluginHandle.html
-share/doc/libanjuta/AnjutaPluginManager.html
-share/doc/libanjuta/AnjutaPreferences.html
-share/doc/libanjuta/AnjutaPreferencesDialog.html
-share/doc/libanjuta/AnjutaProfile.html
-share/doc/libanjuta/AnjutaProfileManager.html
-share/doc/libanjuta/AnjutaSavePrompt.html
-share/doc/libanjuta/AnjutaSerializer.html
-share/doc/libanjuta/AnjutaSession.html
-share/doc/libanjuta/AnjutaStatus.html
-share/doc/libanjuta/AnjutaUI.html
-share/doc/libanjuta/action-block.html
-share/doc/libanjuta/anjuta-architecture.html
-share/doc/libanjuta/anjuta-architecture.png
-share/doc/libanjuta/content-block.html
-share/doc/libanjuta/header-block.html
-share/doc/libanjuta/home.png
-share/doc/libanjuta/index.html
-share/doc/libanjuta/index.sgml
-share/doc/libanjuta/left.png
-share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html
-share/doc/libanjuta/libanjuta-ESplash.html
-share/doc/libanjuta/libanjuta-GluePlugin.html
-share/doc/libanjuta/libanjuta-anjuta-children.html
-share/doc/libanjuta/libanjuta-anjuta-debug.html
-share/doc/libanjuta/libanjuta-anjuta-encodings.html
-share/doc/libanjuta/libanjuta-anjuta-enum-types.html
-share/doc/libanjuta/libanjuta-anjuta-marshal.html
-share/doc/libanjuta/libanjuta-anjuta-plugin-description.html
-share/doc/libanjuta/libanjuta-anjuta-shell.html
-share/doc/libanjuta/libanjuta-anjuta-utils.html
-share/doc/libanjuta/libanjuta-api.html
-share/doc/libanjuta/libanjuta-glue-cpp.html
-share/doc/libanjuta/libanjuta-glue-factory.html
-share/doc/libanjuta/libanjuta-ianjuta-bookmark.html
-share/doc/libanjuta/libanjuta-ianjuta-buildable.html
-share/doc/libanjuta/libanjuta-ianjuta-cpu-debugger.html
-share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger.html
-share/doc/libanjuta/libanjuta-ianjuta-document-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-language.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-view.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html
-share/doc/libanjuta/libanjuta-ianjuta-editor.html
-share/doc/libanjuta/libanjuta-ianjuta-file-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-file-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-file-savable.html
-share/doc/libanjuta/libanjuta-ianjuta-file.html
-share/doc/libanjuta/libanjuta-ianjuta-help.html
-share/doc/libanjuta/libanjuta-ianjuta-indicable.html
-share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html
-share/doc/libanjuta/libanjuta-ianjuta-iterable.html
-share/doc/libanjuta/libanjuta-ianjuta-language-support.html
-share/doc/libanjuta/libanjuta-ianjuta-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-macro.html
-share/doc/libanjuta/libanjuta-ianjuta-markable.html
-share/doc/libanjuta/libanjuta-ianjuta-message-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-message-view.html
-share/doc/libanjuta/libanjuta-ianjuta-preferences.html
-share/doc/libanjuta/libanjuta-ianjuta-print.html
-share/doc/libanjuta/libanjuta-ianjuta-project-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html
-share/doc/libanjuta/libanjuta-ianjuta-stream.html
-share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-symbol.html
-share/doc/libanjuta/libanjuta-ianjuta-terminal.html
-share/doc/libanjuta/libanjuta-ianjuta-todo.html
-share/doc/libanjuta/libanjuta-ianjuta-variable-debugger.html
-share/doc/libanjuta/libanjuta-ianjuta-vcs.html
-share/doc/libanjuta/libanjuta-ianjuta-wizard.html
-share/doc/libanjuta/libanjuta-internal-api.html
-share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html
-share/doc/libanjuta/libanjuta-resources.html
-share/doc/libanjuta/libanjuta.devhelp
-share/doc/libanjuta/libanjuta.devhelp2
-share/doc/libanjuta/object-hierarchy.html
-share/doc/libanjuta/page-block.html
-share/doc/libanjuta/plugin-description-file.html
-share/doc/libanjuta/plugin-interfaces.html
-share/doc/libanjuta/project-wizard-format.html
-share/doc/libanjuta/right.png
-share/doc/libanjuta/style.css
-share/doc/libanjuta/up.png
-share/doc/libanjuta/writing-plugins-build-setup.html
-share/doc/libanjuta/writing-plugins-simple.html
-share/doc/libanjuta/writing-plugins-sources.html
-share/doc/libanjuta/writing-plugins.html
share/anjuta/AUTHORS
share/anjuta/anjuta_project.template
share/anjuta/build/automake-c.filters
@@ -299,7 +202,8 @@ share/anjuta/glade/anjuta-class-gen-plugin.glade
share/anjuta/glade/anjuta-cvs-plugin.glade
share/anjuta/glade/anjuta-debug-manager.glade
share/anjuta/glade/anjuta-document-manager.glade
-share/anjuta/glade/anjuta-file-manager-plugin.glade
+share/anjuta/glade/anjuta-editor-scintilla.glade
+share/anjuta/glade/anjuta-editor-sourceview.glade
share/anjuta/glade/anjuta-file-wizard.glade
share/anjuta/glade/anjuta-gdb.glade
share/anjuta/glade/anjuta-language-cpp-java.glade
@@ -315,20 +219,19 @@ share/anjuta/glade/anjuta-tools.glade
share/anjuta/glade/anjuta.glade
share/anjuta/glade/applogo.png
share/anjuta/glade/appwizard.png
-share/anjuta/glade/editor.glade
+share/anjuta/glade/file-manager.glade
share/anjuta/glade/layout.glade
share/anjuta/glade/patch-plugin.glade
share/anjuta/glade/profiler-call-graph.glade
share/anjuta/glade/profiler-flat-profile.glade
share/anjuta/glade/profiler-function-call-tree.glade
share/anjuta/glade/profiler.glade
-share/anjuta/glade/sourceview.glade
share/anjuta/glade/start-with-import.png
share/anjuta/glade/start-with-open.png
share/anjuta/glade/start-with-wizard.png
share/anjuta/gtodo/gtodo.css
share/anjuta/gtodo/gtodo.xsl
-share/anjuta/indent_test.c
+share/anjuta/languages.xml
share/anjuta/layout.xml
share/anjuta/macros.xml
share/anjuta/profiles/default.profile
@@ -495,7 +398,6 @@ share/anjuta/properties/vb.properties
share/anjuta/properties/verilog.properties
share/anjuta/properties/vhdl.properties
share/anjuta/properties/yaml.properties
-share/anjuta/scripts/anjuta-tags
share/anjuta/scripts/create_global_tags.sh
share/anjuta/tools/find-fixmes.pl
share/anjuta/tools/prepare-changelog.pl
@@ -507,7 +409,6 @@ share/anjuta/ui/anjuta-debug-manager.ui
share/anjuta/ui/anjuta-devhelp-simple.ui
share/anjuta/ui/anjuta-devhelp.ui
share/anjuta/ui/anjuta-document-manager.ui
-share/anjuta/ui/anjuta-file-manager.ui
share/anjuta/ui/anjuta-glade.ui
share/anjuta/ui/anjuta-gtodo.ui
share/anjuta/ui/anjuta-language-support-cpp-java.ui
@@ -518,66 +419,168 @@ share/anjuta/ui/anjuta-patch.ui
share/anjuta/ui/anjuta-project-manager.ui
share/anjuta/ui/anjuta-sample.ui
share/anjuta/ui/anjuta-search.ui
-share/anjuta/ui/anjuta-shell.ui
%%SVN%%share/anjuta/ui/anjuta-subversion.ui
share/anjuta/ui/anjuta-symbol-browser-plugin.ui
share/anjuta/ui/anjuta-tools.ui
share/anjuta/ui/anjuta.ui
+share/anjuta/ui/file-manager.ui
share/anjuta/ui/profiler.ui
share/anjuta/welcome.txt
share/applications/anjuta.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FUTURE
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/doc/libanjuta/AnjutaLauncher.html
+share/doc/libanjuta/AnjutaPlugin.html
+share/doc/libanjuta/AnjutaPluginHandle.html
+share/doc/libanjuta/AnjutaPluginManager.html
+share/doc/libanjuta/AnjutaPreferences.html
+share/doc/libanjuta/AnjutaPreferencesDialog.html
+share/doc/libanjuta/AnjutaProfile.html
+share/doc/libanjuta/AnjutaProfileManager.html
+share/doc/libanjuta/AnjutaSavePrompt.html
+share/doc/libanjuta/AnjutaSerializer.html
+share/doc/libanjuta/AnjutaSession.html
+share/doc/libanjuta/AnjutaStatus.html
+share/doc/libanjuta/AnjutaUI.html
+share/doc/libanjuta/action-block.html
+share/doc/libanjuta/anjuta-architecture.html
+share/doc/libanjuta/anjuta-architecture.png
+share/doc/libanjuta/content-block.html
+share/doc/libanjuta/header-block.html
+share/doc/libanjuta/home.png
+share/doc/libanjuta/index.html
+share/doc/libanjuta/index.sgml
+share/doc/libanjuta/left.png
+share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html
+share/doc/libanjuta/libanjuta-ESplash.html
+share/doc/libanjuta/libanjuta-IAnjutaVariableDebugger.html
+share/doc/libanjuta/libanjuta-anjuta-c-module.html
+share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html
+share/doc/libanjuta/libanjuta-anjuta-debug.html
+share/doc/libanjuta/libanjuta-anjuta-encodings.html
+share/doc/libanjuta/libanjuta-anjuta-enum-types.html
+share/doc/libanjuta/libanjuta-anjuta-error.html
+share/doc/libanjuta/libanjuta-anjuta-marshal.html
+share/doc/libanjuta/libanjuta-anjuta-plugin-description.html
+share/doc/libanjuta/libanjuta-anjuta-shell.html
+share/doc/libanjuta/libanjuta-anjuta-utils-priv.html
+share/doc/libanjuta/libanjuta-anjuta-utils.html
+share/doc/libanjuta/libanjuta-api.html
+share/doc/libanjuta/libanjuta-ianjuta-bookmark.html
+share/doc/libanjuta/libanjuta-ianjuta-buildable.html
+share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html
+share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.html
+share/doc/libanjuta/libanjuta-ianjuta-debugger-instruction.html
+share/doc/libanjuta/libanjuta-ianjuta-debugger-memory.html
+share/doc/libanjuta/libanjuta-ianjuta-debugger-register.html
+share/doc/libanjuta/libanjuta-ianjuta-debugger-variable.html
+share/doc/libanjuta/libanjuta-ianjuta-debugger.html
+share/doc/libanjuta/libanjuta-ianjuta-document-manager.html
+share/doc/libanjuta/libanjuta-ianjuta-document.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-language.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-search.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-view.html
+share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html
+share/doc/libanjuta/libanjuta-ianjuta-editor.html
+share/doc/libanjuta/libanjuta-ianjuta-file-loader.html
+share/doc/libanjuta/libanjuta-ianjuta-file-manager.html
+share/doc/libanjuta/libanjuta-ianjuta-file-savable.html
+share/doc/libanjuta/libanjuta-ianjuta-file.html
+share/doc/libanjuta/libanjuta-ianjuta-help.html
+share/doc/libanjuta/libanjuta-ianjuta-indicable.html
+share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html
+share/doc/libanjuta/libanjuta-ianjuta-iterable.html
+share/doc/libanjuta/libanjuta-ianjuta-language-support.html
+share/doc/libanjuta/libanjuta-ianjuta-language.html
+share/doc/libanjuta/libanjuta-ianjuta-loader.html
+share/doc/libanjuta/libanjuta-ianjuta-macro.html
+share/doc/libanjuta/libanjuta-ianjuta-markable.html
+share/doc/libanjuta/libanjuta-ianjuta-message-manager.html
+share/doc/libanjuta/libanjuta-ianjuta-message-view.html
+share/doc/libanjuta/libanjuta-ianjuta-plugin-factory.html
+share/doc/libanjuta/libanjuta-ianjuta-plugin-loader.html
+share/doc/libanjuta/libanjuta-ianjuta-preferences.html
+share/doc/libanjuta/libanjuta-ianjuta-print.html
+share/doc/libanjuta/libanjuta-ianjuta-project-manager.html
+share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html
+share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html
+share/doc/libanjuta/libanjuta-ianjuta-stream.html
+share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html
+share/doc/libanjuta/libanjuta-ianjuta-symbol.html
+share/doc/libanjuta/libanjuta-ianjuta-terminal.html
+share/doc/libanjuta/libanjuta-ianjuta-todo.html
+share/doc/libanjuta/libanjuta-ianjuta-vcs.html
+share/doc/libanjuta/libanjuta-ianjuta-wizard.html
+share/doc/libanjuta/libanjuta-internal-api.html
+share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html
+share/doc/libanjuta/libanjuta-resources.html
+share/doc/libanjuta/libanjuta.devhelp
+share/doc/libanjuta/libanjuta.devhelp2
+share/doc/libanjuta/object-hierarchy.html
+share/doc/libanjuta/page-block.html
+share/doc/libanjuta/plugin-description-file.html
+share/doc/libanjuta/plugin-interfaces.html
+share/doc/libanjuta/project-wizard-format.html
+share/doc/libanjuta/right.png
+share/doc/libanjuta/style.css
+share/doc/libanjuta/up.png
+share/doc/libanjuta/writing-plugins-build-setup.html
+share/doc/libanjuta/writing-plugins-simple.html
+share/doc/libanjuta/writing-plugins-sources.html
+share/doc/libanjuta/writing-plugins.html
+share/glade3/catalogs/anjuta-glade.xml
share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml
share/gnome/help/anjuta-faqs/C/legal.xml
share/gnome/help/anjuta-manual/C/anjuta-manual.xml
share/gnome/help/anjuta-manual/C/authors.xml
share/gnome/help/anjuta-manual/C/debugger.xml
-share/gnome/help/anjuta-manual/C/figures/a2ps.png
share/gnome/help/anjuta-manual/C/figures/add_edit_macro.png
share/gnome/help/anjuta-manual/C/figures/anjuta-in-action.png
share/gnome/help/anjuta-manual/C/figures/arguments.png
share/gnome/help/anjuta-manual/C/figures/attach.png
share/gnome/help/anjuta-manual/C/figures/brk_add.png
share/gnome/help/anjuta-manual/C/figures/brk_dlg.png
-share/gnome/help/anjuta-manual/C/figures/brk_edit.png
-share/gnome/help/anjuta-manual/C/figures/ccview.png
-share/gnome/help/anjuta-manual/C/figures/ccview_class.png
-share/gnome/help/anjuta-manual/C/figures/ccview_struct.png
share/gnome/help/anjuta-manual/C/figures/configure_dlg.png
-share/gnome/help/anjuta-manual/C/figures/defines.png
-share/gnome/help/anjuta-manual/C/figures/devt_menu.png
share/gnome/help/anjuta-manual/C/figures/display_macro.png
-share/gnome/help/anjuta-manual/C/figures/doxygen.png
share/gnome/help/anjuta-manual/C/figures/editor_guides.png
share/gnome/help/anjuta-manual/C/figures/editor_margins.png
share/gnome/help/anjuta-manual/C/figures/editor_markers.png
-share/gnome/help/anjuta-manual/C/figures/evaluate.png
share/gnome/help/anjuta-manual/C/figures/file_menu.png
-share/gnome/help/anjuta-manual/C/figures/fileview.png
-share/gnome/help/anjuta-manual/C/figures/frame.png
-share/gnome/help/anjuta-manual/C/figures/includes.png
share/gnome/help/anjuta-manual/C/figures/insert_text.png
-share/gnome/help/anjuta-manual/C/figures/inspect.png
share/gnome/help/anjuta-manual/C/figures/keyword_macro.png
-share/gnome/help/anjuta-manual/C/figures/lib_paths.png
-share/gnome/help/anjuta-manual/C/figures/libraries.png
share/gnome/help/anjuta-manual/C/figures/local_variables.png
-share/gnome/help/anjuta-manual/C/figures/mainwin.png
-share/gnome/help/anjuta-manual/C/figures/menu_detached.png
share/gnome/help/anjuta-manual/C/figures/menubar.png
share/gnome/help/anjuta-manual/C/figures/message_win.png
share/gnome/help/anjuta-manual/C/figures/new_file_wizard.png
share/gnome/help/anjuta-manual/C/figures/open_file.png
share/gnome/help/anjuta-manual/C/figures/open_file_multiple.png
-share/gnome/help/anjuta-manual/C/figures/other_opts.png
share/gnome/help/anjuta-manual/C/figures/prefs_print.png
+share/gnome/help/anjuta-manual/C/figures/print_dlg.png
share/gnome/help/anjuta-manual/C/figures/print_preview.png
+share/gnome/help/anjuta-manual/C/figures/project-window.png
share/gnome/help/anjuta-manual/C/figures/project_info.png
-share/gnome/help/anjuta-manual/C/figures/project_win.png
share/gnome/help/anjuta-manual/C/figures/registers.png
share/gnome/help/anjuta-manual/C/figures/save_as_file.png
share/gnome/help/anjuta-manual/C/figures/search_expr.png
share/gnome/help/anjuta-manual/C/figures/search_expr_basic.png
-share/gnome/help/anjuta-manual/C/figures/search_file_list.png
share/gnome/help/anjuta-manual/C/figures/search_file_pattern.png
share/gnome/help/anjuta-manual/C/figures/search_replace.png
share/gnome/help/anjuta-manual/C/figures/search_setting.png
@@ -585,19 +588,10 @@ share/gnome/help/anjuta-manual/C/figures/search_target.png
share/gnome/help/anjuta-manual/C/figures/search_target_action.png
share/gnome/help/anjuta-manual/C/figures/search_target_in.png
share/gnome/help/anjuta-manual/C/figures/sharedlibs.png
-share/gnome/help/anjuta-manual/C/figures/signal_mod.png
share/gnome/help/anjuta-manual/C/figures/signals.png
share/gnome/help/anjuta-manual/C/figures/stack.png
-share/gnome/help/anjuta-manual/C/figures/supports.png
share/gnome/help/anjuta-manual/C/figures/symbol_browser.png
share/gnome/help/anjuta-manual/C/figures/tool-editor.png
-share/gnome/help/anjuta-manual/C/figures/toolbar_browser.png
-share/gnome/help/anjuta-manual/C/figures/toolbar_debug.png
-share/gnome/help/anjuta-manual/C/figures/toolbar_main.png
-share/gnome/help/anjuta-manual/C/figures/variable_tip.png
-share/gnome/help/anjuta-manual/C/figures/warnings.png
-share/gnome/help/anjuta-manual/C/figures/watch.png
-share/gnome/help/anjuta-manual/C/figures/watch_add.png
share/gnome/help/anjuta-manual/C/fileoperations.xml
share/gnome/help/anjuta-manual/C/interface.xml
share/gnome/help/anjuta-manual/C/introduction.xml
@@ -607,11 +601,194 @@ share/gnome/help/anjuta-manual/C/preferences.xml
share/gnome/help/anjuta-manual/C/projects.xml
share/gnome/help/anjuta-manual/C/template.xml
share/gnome/help/anjuta-manual/C/tools.xml
+share/gnome/help/anjuta-manual/es/anjuta-manual.xml
+share/gnome/help/anjuta-manual/es/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/es/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/es/figures/arguments.png
+share/gnome/help/anjuta-manual/es/figures/attach.png
+share/gnome/help/anjuta-manual/es/figures/brk_add.png
+share/gnome/help/anjuta-manual/es/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/es/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/es/figures/display_macro.png
+share/gnome/help/anjuta-manual/es/figures/editor_guides.png
+share/gnome/help/anjuta-manual/es/figures/editor_margins.png
+share/gnome/help/anjuta-manual/es/figures/editor_markers.png
+share/gnome/help/anjuta-manual/es/figures/file_menu.png
+share/gnome/help/anjuta-manual/es/figures/insert_text.png
+share/gnome/help/anjuta-manual/es/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/es/figures/local_variables.png
+share/gnome/help/anjuta-manual/es/figures/menubar.png
+share/gnome/help/anjuta-manual/es/figures/message_win.png
+share/gnome/help/anjuta-manual/es/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/es/figures/open_file.png
+share/gnome/help/anjuta-manual/es/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/es/figures/prefs_print.png
+share/gnome/help/anjuta-manual/es/figures/print_dlg.png
+share/gnome/help/anjuta-manual/es/figures/print_preview.png
+share/gnome/help/anjuta-manual/es/figures/project-window.png
+share/gnome/help/anjuta-manual/es/figures/project_info.png
+share/gnome/help/anjuta-manual/es/figures/registers.png
+share/gnome/help/anjuta-manual/es/figures/save_as_file.png
+share/gnome/help/anjuta-manual/es/figures/search_expr.png
+share/gnome/help/anjuta-manual/es/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/es/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/es/figures/search_replace.png
+share/gnome/help/anjuta-manual/es/figures/search_setting.png
+share/gnome/help/anjuta-manual/es/figures/search_target.png
+share/gnome/help/anjuta-manual/es/figures/search_target_action.png
+share/gnome/help/anjuta-manual/es/figures/search_target_in.png
+share/gnome/help/anjuta-manual/es/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/es/figures/signals.png
+share/gnome/help/anjuta-manual/es/figures/stack.png
+share/gnome/help/anjuta-manual/es/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/es/figures/tool-editor.png
+share/gnome/help/anjuta-manual/oc/anjuta-manual.xml
+share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/oc/figures/arguments.png
+share/gnome/help/anjuta-manual/oc/figures/attach.png
+share/gnome/help/anjuta-manual/oc/figures/brk_add.png
+share/gnome/help/anjuta-manual/oc/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/oc/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/oc/figures/display_macro.png
+share/gnome/help/anjuta-manual/oc/figures/editor_guides.png
+share/gnome/help/anjuta-manual/oc/figures/editor_margins.png
+share/gnome/help/anjuta-manual/oc/figures/editor_markers.png
+share/gnome/help/anjuta-manual/oc/figures/file_menu.png
+share/gnome/help/anjuta-manual/oc/figures/insert_text.png
+share/gnome/help/anjuta-manual/oc/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/oc/figures/local_variables.png
+share/gnome/help/anjuta-manual/oc/figures/menubar.png
+share/gnome/help/anjuta-manual/oc/figures/message_win.png
+share/gnome/help/anjuta-manual/oc/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/oc/figures/open_file.png
+share/gnome/help/anjuta-manual/oc/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/oc/figures/prefs_print.png
+share/gnome/help/anjuta-manual/oc/figures/print_dlg.png
+share/gnome/help/anjuta-manual/oc/figures/print_preview.png
+share/gnome/help/anjuta-manual/oc/figures/project-window.png
+share/gnome/help/anjuta-manual/oc/figures/project_info.png
+share/gnome/help/anjuta-manual/oc/figures/registers.png
+share/gnome/help/anjuta-manual/oc/figures/save_as_file.png
+share/gnome/help/anjuta-manual/oc/figures/search_expr.png
+share/gnome/help/anjuta-manual/oc/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/oc/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/oc/figures/search_replace.png
+share/gnome/help/anjuta-manual/oc/figures/search_setting.png
+share/gnome/help/anjuta-manual/oc/figures/search_target.png
+share/gnome/help/anjuta-manual/oc/figures/search_target_action.png
+share/gnome/help/anjuta-manual/oc/figures/search_target_in.png
+share/gnome/help/anjuta-manual/oc/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/oc/figures/signals.png
+share/gnome/help/anjuta-manual/oc/figures/stack.png
+share/gnome/help/anjuta-manual/oc/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/oc/figures/tool-editor.png
+share/gnome/help/anjuta-manual/sv/anjuta-manual.xml
+share/gnome/help/anjuta-manual/sv/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/sv/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/sv/figures/arguments.png
+share/gnome/help/anjuta-manual/sv/figures/attach.png
+share/gnome/help/anjuta-manual/sv/figures/brk_add.png
+share/gnome/help/anjuta-manual/sv/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/sv/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/sv/figures/display_macro.png
+share/gnome/help/anjuta-manual/sv/figures/editor_guides.png
+share/gnome/help/anjuta-manual/sv/figures/editor_margins.png
+share/gnome/help/anjuta-manual/sv/figures/editor_markers.png
+share/gnome/help/anjuta-manual/sv/figures/file_menu.png
+share/gnome/help/anjuta-manual/sv/figures/insert_text.png
+share/gnome/help/anjuta-manual/sv/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/sv/figures/local_variables.png
+share/gnome/help/anjuta-manual/sv/figures/menubar.png
+share/gnome/help/anjuta-manual/sv/figures/message_win.png
+share/gnome/help/anjuta-manual/sv/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/sv/figures/open_file.png
+share/gnome/help/anjuta-manual/sv/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/sv/figures/prefs_print.png
+share/gnome/help/anjuta-manual/sv/figures/print_dlg.png
+share/gnome/help/anjuta-manual/sv/figures/print_preview.png
+share/gnome/help/anjuta-manual/sv/figures/project-window.png
+share/gnome/help/anjuta-manual/sv/figures/project_info.png
+share/gnome/help/anjuta-manual/sv/figures/registers.png
+share/gnome/help/anjuta-manual/sv/figures/save_as_file.png
+share/gnome/help/anjuta-manual/sv/figures/search_expr.png
+share/gnome/help/anjuta-manual/sv/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/sv/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/sv/figures/search_replace.png
+share/gnome/help/anjuta-manual/sv/figures/search_setting.png
+share/gnome/help/anjuta-manual/sv/figures/search_target.png
+share/gnome/help/anjuta-manual/sv/figures/search_target_action.png
+share/gnome/help/anjuta-manual/sv/figures/search_target_in.png
+share/gnome/help/anjuta-manual/sv/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/sv/figures/signals.png
+share/gnome/help/anjuta-manual/sv/figures/stack.png
+share/gnome/help/anjuta-manual/sv/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/sv/figures/tool-editor.png
share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png
share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg
+share/icons/hicolor/48x48/apps/anjuta.png
+share/icons/hicolor/scalable/apps/anjuta.svg
+share/locale/ar/LC_MESSAGES/anjuta.mo
+share/locale/az/LC_MESSAGES/anjuta.mo
+share/locale/be/LC_MESSAGES/anjuta.mo
+share/locale/be@latin/LC_MESSAGES/anjuta.mo
+share/locale/bg/LC_MESSAGES/anjuta.mo
+share/locale/ca/LC_MESSAGES/anjuta.mo
+share/locale/cs/LC_MESSAGES/anjuta.mo
+share/locale/da/LC_MESSAGES/anjuta.mo
+share/locale/de/LC_MESSAGES/anjuta.mo
+share/locale/dz/LC_MESSAGES/anjuta.mo
+share/locale/el/LC_MESSAGES/anjuta.mo
+share/locale/en_CA/LC_MESSAGES/anjuta.mo
+share/locale/en_GB/LC_MESSAGES/anjuta.mo
+share/locale/es/LC_MESSAGES/anjuta.mo
+share/locale/fi/LC_MESSAGES/anjuta.mo
+share/locale/fr/LC_MESSAGES/anjuta.mo
+share/locale/ga/LC_MESSAGES/anjuta.mo
+share/locale/gl/LC_MESSAGES/anjuta.mo
+share/locale/hi/LC_MESSAGES/anjuta.mo
+share/locale/hr/LC_MESSAGES/anjuta.mo
+share/locale/hu/LC_MESSAGES/anjuta.mo
+share/locale/id/LC_MESSAGES/anjuta.mo
+share/locale/it/LC_MESSAGES/anjuta.mo
+share/locale/ja/LC_MESSAGES/anjuta.mo
+share/locale/kn/LC_MESSAGES/anjuta.mo
+share/locale/ko/LC_MESSAGES/anjuta.mo
+share/locale/lt/LC_MESSAGES/anjuta.mo
+share/locale/mk/LC_MESSAGES/anjuta.mo
+share/locale/ml/LC_MESSAGES/anjuta.mo
+share/locale/ms/LC_MESSAGES/anjuta.mo
+share/locale/nb/LC_MESSAGES/anjuta.mo
+share/locale/ne/LC_MESSAGES/anjuta.mo
+share/locale/nl/LC_MESSAGES/anjuta.mo
+share/locale/oc/LC_MESSAGES/anjuta.mo
+share/locale/pa/LC_MESSAGES/anjuta.mo
+share/locale/pl/LC_MESSAGES/anjuta.mo
+share/locale/pt/LC_MESSAGES/anjuta.mo
+share/locale/pt_BR/LC_MESSAGES/anjuta.mo
+share/locale/ru/LC_MESSAGES/anjuta.mo
+share/locale/rw/LC_MESSAGES/anjuta.mo
+share/locale/si/LC_MESSAGES/anjuta.mo
+share/locale/sk/LC_MESSAGES/anjuta.mo
+share/locale/sl/LC_MESSAGES/anjuta.mo
+share/locale/sq/LC_MESSAGES/anjuta.mo
+share/locale/sr/LC_MESSAGES/anjuta.mo
+share/locale/sr@Latn/LC_MESSAGES/anjuta.mo
+share/locale/sv/LC_MESSAGES/anjuta.mo
+share/locale/tr/LC_MESSAGES/anjuta.mo
+share/locale/uk/LC_MESSAGES/anjuta.mo
+share/locale/zh_CN/LC_MESSAGES/anjuta.mo
+share/locale/zh_HK/LC_MESSAGES/anjuta.mo
+share/locale/zh_TW/LC_MESSAGES/anjuta.mo
+share/mime/application/x-anjuta.xml
+share/mime/packages/anjuta.xml
share/omf/anjuta-manual/anjuta-manual-C.omf
+share/omf/anjuta-manual/anjuta-manual-es.omf
+share/omf/anjuta-manual/anjuta-manual-oc.omf
+share/omf/anjuta-manual/anjuta-manual-sv.omf
share/pixmaps/anjuta/Icons.16x16.Class
share/pixmaps/anjuta/Icons.16x16.Enum
+share/pixmaps/anjuta/Icons.16x16.Event
share/pixmaps/anjuta/Icons.16x16.Field
share/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront
share/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack
@@ -637,6 +814,7 @@ share/pixmaps/anjuta/Icons.16x16.PrivateInterface
share/pixmaps/anjuta/Icons.16x16.PrivateMethod
share/pixmaps/anjuta/Icons.16x16.PrivateProperty
share/pixmaps/anjuta/Icons.16x16.PrivateStruct
+share/pixmaps/anjuta/Icons.16x16.Property
share/pixmaps/anjuta/Icons.16x16.ProtectedClass
share/pixmaps/anjuta/Icons.16x16.ProtectedDelegate
share/pixmaps/anjuta/Icons.16x16.ProtectedEnum
@@ -647,146 +825,164 @@ share/pixmaps/anjuta/Icons.16x16.ProtectedMethod
share/pixmaps/anjuta/Icons.16x16.ProtectedProperty
share/pixmaps/anjuta/Icons.16x16.ProtectedStruct
share/pixmaps/anjuta/Icons.16x16.Reference
-share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.png
-share/pixmaps/anjuta/anjuta-cvs-plugin.png
-share/pixmaps/anjuta/anjuta-debug-manager.plugin.png
-share/pixmaps/anjuta/anjuta-devhelp-plugin.png
-share/pixmaps/anjuta/anjuta-document-manager.png
-share/pixmaps/anjuta/anjuta-editor.png
-share/pixmaps/anjuta/anjuta-file-manager-plugin.png
+share/pixmaps/anjuta/Icons.16x16.Struct
+share/pixmaps/anjuta/anjuta-attach-16.png
+share/pixmaps/anjuta/anjuta-attach-24.png
+share/pixmaps/anjuta/anjuta-block-end-16.png
+share/pixmaps/anjuta/anjuta-block-end-24.png
+share/pixmaps/anjuta/anjuta-block-select-16.png
+share/pixmaps/anjuta/anjuta-block-select-24.png
+share/pixmaps/anjuta/anjuta-block-start-16.png
+share/pixmaps/anjuta/anjuta-block-start-24.png
+share/pixmaps/anjuta/anjuta-bookmark-16.png
+share/pixmaps/anjuta/anjuta-bookmark-clear-16.png
+share/pixmaps/anjuta/anjuta-bookmark-clear-24.png
+share/pixmaps/anjuta/anjuta-bookmark-first-16.png
+share/pixmaps/anjuta/anjuta-bookmark-first-24.png
+share/pixmaps/anjuta/anjuta-bookmark-last-16.png
+share/pixmaps/anjuta/anjuta-bookmark-last-24.png
+share/pixmaps/anjuta/anjuta-bookmark-next-16.png
+share/pixmaps/anjuta/anjuta-bookmark-next-24.png
+share/pixmaps/anjuta/anjuta-bookmark-prev-16.png
+share/pixmaps/anjuta/anjuta-bookmark-prev-24.png
+share/pixmaps/anjuta/anjuta-bookmark-toggle-16.png
+share/pixmaps/anjuta/anjuta-bookmark-toggle-24.png
+share/pixmaps/anjuta/anjuta-breakpoint-clear-16.png
+share/pixmaps/anjuta/anjuta-breakpoint-clear-24.png
+share/pixmaps/anjuta/anjuta-breakpoint-disabled-16.png
+share/pixmaps/anjuta/anjuta-breakpoint-enabled-16.png
+share/pixmaps/anjuta/anjuta-breakpoint-toggle-16.png
+share/pixmaps/anjuta/anjuta-breakpoint-toggle-24.png
+share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin-48.png
+share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.svg
+share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png
+share/pixmaps/anjuta/anjuta-class-inheritance-plugin.svg
+share/pixmaps/anjuta/anjuta-complete-16.png
+share/pixmaps/anjuta/anjuta-complete-24.png
+share/pixmaps/anjuta/anjuta-complete-auto-16.png
+share/pixmaps/anjuta/anjuta-complete-auto-24.png
+share/pixmaps/anjuta/anjuta-cvs-plugin-48.png
+share/pixmaps/anjuta/anjuta-cvs-plugin.svg
+share/pixmaps/anjuta/anjuta-debug-manager-plugin-48.png
+share/pixmaps/anjuta/anjuta-debug-manager-plugin.svg
+share/pixmaps/anjuta/anjuta-devhelp-plugin-48.png
+share/pixmaps/anjuta/anjuta-devhelp-plugin.svg
+share/pixmaps/anjuta/anjuta-document-manager-plugin-48.png
+share/pixmaps/anjuta/anjuta-document-manager-plugin.svg
+share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png
+share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg
+share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png
+share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png
+share/pixmaps/anjuta/anjuta-file-manager-plugin.svg
share/pixmaps/anjuta/anjuta-file-wizard-plugin.png
+share/pixmaps/anjuta/anjuta-fold-close-16.png
+share/pixmaps/anjuta/anjuta-fold-close-24.png
+share/pixmaps/anjuta/anjuta-fold-open-16.png
+share/pixmaps/anjuta/anjuta-fold-open-24.png
+share/pixmaps/anjuta/anjuta-fold-toggle-16.png
+share/pixmaps/anjuta/anjuta-fold-toggle-24.png
share/pixmaps/anjuta/anjuta-gdb.plugin.png
-share/pixmaps/anjuta/anjuta-glade-plugin.png
-share/pixmaps/anjuta/anjuta-gtodo-plugin.png
+share/pixmaps/anjuta/anjuta-glade-plugin-48.png
+share/pixmaps/anjuta/anjuta-glade-plugin.svg
+share/pixmaps/anjuta/anjuta-go-help-next-16.png
+share/pixmaps/anjuta/anjuta-go-help-next-24.png
+share/pixmaps/anjuta/anjuta-go-help-prev-16.png
+share/pixmaps/anjuta/anjuta-go-help-prev-24.png
+share/pixmaps/anjuta/anjuta-go-history-next-16.png
+share/pixmaps/anjuta/anjuta-go-history-next-24.png
+share/pixmaps/anjuta/anjuta-go-history-prev-16.png
+share/pixmaps/anjuta/anjuta-go-history-prev-24.png
+share/pixmaps/anjuta/anjuta-go-line-16.png
+share/pixmaps/anjuta/anjuta-go-line-24.png
+share/pixmaps/anjuta/anjuta-go-match-next-16.png
+share/pixmaps/anjuta/anjuta-go-match-next-24.png
+share/pixmaps/anjuta/anjuta-go-match-prev-16.png
+share/pixmaps/anjuta/anjuta-go-match-prev-24.png
+share/pixmaps/anjuta/anjuta-go-message-next-16.png
+share/pixmaps/anjuta/anjuta-go-message-next-24.png
+share/pixmaps/anjuta/anjuta-go-message-prev-16.png
+share/pixmaps/anjuta/anjuta-go-message-prev-24.png
+share/pixmaps/anjuta/anjuta-gtodo-plugin-48.png
+share/pixmaps/anjuta/anjuta-gtodo-plugin.svg
+share/pixmaps/anjuta/anjuta-indent-auto-16.png
+share/pixmaps/anjuta/anjuta-indent-auto-24.png
+share/pixmaps/anjuta/anjuta-indent-less-16.png
+share/pixmaps/anjuta/anjuta-indent-less-24.png
+share/pixmaps/anjuta/anjuta-indent-more-16.png
+share/pixmaps/anjuta/anjuta-indent-more-24.png
share/pixmaps/anjuta/anjuta-language-cpp-java-plugin.png
-share/pixmaps/anjuta/anjuta-loader-plugin.png
+share/pixmaps/anjuta/anjuta-language-manager-plugin-48.png
+share/pixmaps/anjuta/anjuta-language-manager-plugin.svg
+share/pixmaps/anjuta/anjuta-linemark-16.png
+share/pixmaps/anjuta/anjuta-loader-plugin-48.png
+share/pixmaps/anjuta/anjuta-loader-plugin.svg
share/pixmaps/anjuta/anjuta-macro.png
-share/pixmaps/anjuta/anjuta-message-view.png
-share/pixmaps/anjuta/anjuta-patch-plugin.png
-share/pixmaps/anjuta/anjuta-project-import-plugin.png
-share/pixmaps/anjuta/anjuta-project-manager-plugin.png
-share/pixmaps/anjuta/anjuta-project-wizard-plugin.png
-share/pixmaps/anjuta/anjuta-sample-plugin.png
-share/pixmaps/anjuta/anjuta-search.png
-%%SVN%%share/pixmaps/anjuta/anjuta-subversion.png
-share/pixmaps/anjuta/anjuta-symbol-browser-plugin.png
-share/pixmaps/anjuta/anjuta-terminal-plugin.png
-share/pixmaps/anjuta/anjuta-tools-plugin.png
+share/pixmaps/anjuta/anjuta-messages-plugin-48.png
+share/pixmaps/anjuta/anjuta-messages-plugin.svg
+share/pixmaps/anjuta/anjuta-patch-plugin-48.png
+share/pixmaps/anjuta/anjuta-patch-plugin.svg
+share/pixmaps/anjuta/anjuta-pcmark-16.png
+share/pixmaps/anjuta/anjuta-preferences-general-48.png
+share/pixmaps/anjuta/anjuta-preferences-general.svg
+share/pixmaps/anjuta/anjuta-profiler-plugin-48.png
+share/pixmaps/anjuta/anjuta-profiler-plugin.svg
+share/pixmaps/anjuta/anjuta-project-import-plugin-48.png
+share/pixmaps/anjuta/anjuta-project-import-plugin.svg
+share/pixmaps/anjuta/anjuta-project-manager-plugin-48.png
+share/pixmaps/anjuta/anjuta-project-manager-plugin.svg
+share/pixmaps/anjuta/anjuta-project-wizard-plugin-48.png
+share/pixmaps/anjuta/anjuta-project-wizard-plugin.svg
+share/pixmaps/anjuta/anjuta-run-to-cursor-16.png
+share/pixmaps/anjuta/anjuta-run-to-cursor-24.png
+share/pixmaps/anjuta/anjuta-sample-plugin-48.png
+share/pixmaps/anjuta/anjuta-sample-plugin.svg
+share/pixmaps/anjuta/anjuta-search-plugin-48.png
+share/pixmaps/anjuta/anjuta-search-plugin.svg
+share/pixmaps/anjuta/anjuta-step-into-16.png
+share/pixmaps/anjuta/anjuta-step-into-24.png
+share/pixmaps/anjuta/anjuta-step-out-16.png
+share/pixmaps/anjuta/anjuta-step-out-24.png
+share/pixmaps/anjuta/anjuta-step-over-16.png
+share/pixmaps/anjuta/anjuta-step-over-24.png
+%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin-48.png
+%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin.svg
+share/pixmaps/anjuta/anjuta-swap-16.png
+share/pixmaps/anjuta/anjuta-swap-24.png
+share/pixmaps/anjuta/anjuta-symbol-browser-plugin-48.png
+share/pixmaps/anjuta/anjuta-symbol-browser-plugin.svg
+share/pixmaps/anjuta/anjuta-terminal-plugin-48.png
+share/pixmaps/anjuta/anjuta-terminal-plugin.svg
+share/pixmaps/anjuta/anjuta-tools-plugin-48.png
+share/pixmaps/anjuta/anjuta-tools-plugin.svg
+share/pixmaps/anjuta/anjuta-watch-16.png
+share/pixmaps/anjuta/anjuta-watch-24.png
+share/pixmaps/anjuta/anjuta-watch.svg
share/pixmaps/anjuta/anjuta.png
+share/pixmaps/anjuta/anjuta.svg
share/pixmaps/anjuta/anjuta_logo.png
share/pixmaps/anjuta/anjuta_splash.png
-share/pixmaps/anjuta/autocomplete-16.png
-share/pixmaps/anjuta/autocomplete.png
-share/pixmaps/anjuta/block-end-16.png
-share/pixmaps/anjuta/block-end.png
-share/pixmaps/anjuta/block-start-16.png
-share/pixmaps/anjuta/block-start.png
-share/pixmaps/anjuta/block_select.xpm
-share/pixmaps/anjuta/bookmark-clear.png
-share/pixmaps/anjuta/bookmark-first.png
-share/pixmaps/anjuta/bookmark-last.png
-share/pixmaps/anjuta/bookmark-next.png
-share/pixmaps/anjuta/bookmark-prev.png
-share/pixmaps/anjuta/bookmark-toggle.png
-share/pixmaps/anjuta/bookmark.png
-share/pixmaps/anjuta/breakpoint-disabled.png
-share/pixmaps/anjuta/breakpoint-enabled.png
share/pixmaps/anjuta/breakpoint.png
-share/pixmaps/anjuta/class-inheritance.png
share/pixmaps/anjuta/class_logo.xpm
-share/pixmaps/anjuta/detach-16.png
-share/pixmaps/anjuta/detach.png
share/pixmaps/anjuta/directory-accept.png
share/pixmaps/anjuta/directory.png
-share/pixmaps/anjuta/error-next-16.png
-share/pixmaps/anjuta/error-next.png
-share/pixmaps/anjuta/error-prev-16.png
-share/pixmaps/anjuta/error-prev.png
-share/pixmaps/anjuta/fold_close.xpm
-share/pixmaps/anjuta/fold_open.xpm
-share/pixmaps/anjuta/fold_toggle.xpm
share/pixmaps/anjuta/gtodo-about.png
share/pixmaps/anjuta/gtodo-edit.png
-share/pixmaps/anjuta/gtodo.png
share/pixmaps/anjuta/gtodo_tray.png
-share/pixmaps/anjuta/indent.xpm
-share/pixmaps/anjuta/indent_auto.xpm
-share/pixmaps/anjuta/indent_dcr.xpm
-share/pixmaps/anjuta/indent_inc.xpm
-share/pixmaps/anjuta/indent_set.xpm
-share/pixmaps/anjuta/linemarker.png
share/pixmaps/anjuta/locals.png
-share/pixmaps/anjuta/messages.xpm
+share/pixmaps/anjuta/madeinanjuta.xcf
share/pixmaps/anjuta/password.png
share/pixmaps/anjuta/pointer.png
share/pixmaps/anjuta/preferences-editor.png
-share/pixmaps/anjuta/preferences-general.png
-share/pixmaps/anjuta/preferences-messages.png
-share/pixmaps/anjuta/preferences-terminal.png
-share/pixmaps/anjuta/profiler.png
-share/pixmaps/anjuta/program-counter.png
-share/pixmaps/anjuta/run-to-cursor.png
-share/pixmaps/anjuta/sourceview.png
share/pixmaps/anjuta/stack.png
-share/pixmaps/anjuta/step-into-16.png
-share/pixmaps/anjuta/step-into.png
-share/pixmaps/anjuta/step-out-16.png
-share/pixmaps/anjuta/step-out.png
-share/pixmaps/anjuta/step-over-16.png
-share/pixmaps/anjuta/step-over.png
-share/pixmaps/anjuta/swap.png
-share/pixmaps/anjuta/watch.png
-share/icons/hicolor/48x48/apps/anjuta.png
-share/icons/hicolor/scalable/apps/anjuta.svg
-share/locale/ar/LC_MESSAGES/anjuta.mo
-share/locale/az/LC_MESSAGES/anjuta.mo
-share/locale/be/LC_MESSAGES/anjuta.mo
-share/locale/bg/LC_MESSAGES/anjuta.mo
-share/locale/ca/LC_MESSAGES/anjuta.mo
-share/locale/cs/LC_MESSAGES/anjuta.mo
-share/locale/da/LC_MESSAGES/anjuta.mo
-share/locale/de/LC_MESSAGES/anjuta.mo
-share/locale/dz/LC_MESSAGES/anjuta.mo
-share/locale/el/LC_MESSAGES/anjuta.mo
-share/locale/en_CA/LC_MESSAGES/anjuta.mo
-share/locale/en_GB/LC_MESSAGES/anjuta.mo
-share/locale/es/LC_MESSAGES/anjuta.mo
-share/locale/fi/LC_MESSAGES/anjuta.mo
-share/locale/fr/LC_MESSAGES/anjuta.mo
-share/locale/ga/LC_MESSAGES/anjuta.mo
-share/locale/gl/LC_MESSAGES/anjuta.mo
-share/locale/hi/LC_MESSAGES/anjuta.mo
-share/locale/hr/LC_MESSAGES/anjuta.mo
-share/locale/hu/LC_MESSAGES/anjuta.mo
-share/locale/it/LC_MESSAGES/anjuta.mo
-share/locale/ja/LC_MESSAGES/anjuta.mo
-share/locale/ko/LC_MESSAGES/anjuta.mo
-share/locale/mk/LC_MESSAGES/anjuta.mo
-share/locale/ml/LC_MESSAGES/anjuta.mo
-share/locale/ms/LC_MESSAGES/anjuta.mo
-share/locale/nb/LC_MESSAGES/anjuta.mo
-share/locale/ne/LC_MESSAGES/anjuta.mo
-share/locale/nl/LC_MESSAGES/anjuta.mo
-share/locale/oc/LC_MESSAGES/anjuta.mo
-share/locale/pa/LC_MESSAGES/anjuta.mo
-share/locale/pl/LC_MESSAGES/anjuta.mo
-share/locale/pt/LC_MESSAGES/anjuta.mo
-share/locale/pt_BR/LC_MESSAGES/anjuta.mo
-share/locale/ru/LC_MESSAGES/anjuta.mo
-share/locale/rw/LC_MESSAGES/anjuta.mo
-share/locale/sk/LC_MESSAGES/anjuta.mo
-share/locale/sq/LC_MESSAGES/anjuta.mo
-share/locale/sr/LC_MESSAGES/anjuta.mo
-share/locale/sr@Latn/LC_MESSAGES/anjuta.mo
-share/locale/sv/LC_MESSAGES/anjuta.mo
-share/locale/tr/LC_MESSAGES/anjuta.mo
-share/locale/uk/LC_MESSAGES/anjuta.mo
-share/locale/zh_CN/LC_MESSAGES/anjuta.mo
-share/locale/zh_TW/LC_MESSAGES/anjuta.mo
-share/mime/application/x-anjuta.xml
-share/mime/packages/anjuta.xml
+share/pixmaps/anjuta/start-with-import.png
@dirrm share/pixmaps/anjuta
@dirrm share/omf/anjuta-manual
+@dirrm share/gnome/help/anjuta-manual/sv/figures
+@dirrm share/gnome/help/anjuta-manual/sv
+@dirrm share/gnome/help/anjuta-manual/oc/figures
+@dirrm share/gnome/help/anjuta-manual/oc
+@dirrm share/gnome/help/anjuta-manual/es/figures
+@dirrm share/gnome/help/anjuta-manual/es
@dirrm share/gnome/help/anjuta-manual/C/figures
@dirrm share/gnome/help/anjuta-manual/C
@dirrm share/gnome/help/anjuta-manual
@@ -854,10 +1050,16 @@ share/mime/packages/anjuta.xml
@dirrm include/libanjuta-1.0
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@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/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/applications
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index b65ae3b36103..efe22fb7f2be 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,21 +3,20 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bug-buddy/Makefile,v 1.55 2007/10/06 22:03:31 mezz Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.60 2008/03/11 03:04:07 mezz Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.20.1
+PORTVERSION= 2.22.0
CATEGORIES= devel 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= A bug reporting tool for GNOME 2
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
- soup-2.2.8:${PORTSDIR}/devel/libsoup
+ soup-2.4.1:${PORTSDIR}/devel/libsoup
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index b443c5b57814..05e227a42086 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.20.1.tar.bz2) = 6b9ea4c067674120bd93711b3b9a9e63
-SHA256 (gnome2/bug-buddy-2.20.1.tar.bz2) = cb0cb3f2400f201e2bf7afc6de81df6ab4b68c5a770ec0a132c300efe72d5f4e
-SIZE (gnome2/bug-buddy-2.20.1.tar.bz2) = 1070862
+MD5 (gnome2/bug-buddy-2.22.0.tar.bz2) = 092e1f91d0be4ca133cd0650622a6b06
+SHA256 (gnome2/bug-buddy-2.22.0.tar.bz2) = 09c6d01f8b029b5ffccabfcbc502f637d06a7989e93c374de24b5b838b9878a6
+SIZE (gnome2/bug-buddy-2.22.0.tar.bz2) = 1076752
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 27f3b5fad558..27e3a523bc6c 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -15,6 +15,7 @@ share/applications/bug-buddy.desktop
%%DATADIR%%/bugzilla/ximian/products
%%DATADIR%%/gdb-cmd
share/icons/hicolor/48x48/apps/bug-buddy.png
+share/locale/af/LC_MESSAGES/bug-buddy.mo
share/locale/am/LC_MESSAGES/bug-buddy.mo
share/locale/ar/LC_MESSAGES/bug-buddy.mo
share/locale/as/LC_MESSAGES/bug-buddy.mo
@@ -100,6 +101,7 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrm %%DATADIR%%/bugzilla/gnome
@dirrm %%DATADIR%%/bugzilla
@dirrm %%DATADIR%%
+@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -132,4 +134,3 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrmtry share/locale/be@latin
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
-@dirrmtry share/applications
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index c52855667aec..92de3079975b 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= dbus
-PORTVERSION?= 1.0.2
-PORTREVISION?= 2
+PORTVERSION?= 1.1.20
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=--localstatedir=/var \
--disable-doxygen-docs \
--disable-xml-docs
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
.if !defined(DBUS_SLAVE)
@@ -48,10 +48,7 @@ USE_XLIB= yes
.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
- ${WRKSRC}/bus/system.conf.in
- @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
- s|/usr/X11R6|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/dbus/dbus-sysdeps-unix.c
@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
${WRKSRC}/dbus/Makefile.in \
@@ -62,8 +59,7 @@ post-install:
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
- ${MKDIR} ${X11BASE}/etc/dbus-1/system.d
- ${MKDIR} ${X11BASE}/share/dbus-1/services
+ ${MKDIR} ${PREFIX}/share/dbus-1/interfaces
.endif
.include <bsd.port.post.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 86dade22f679..9ec2266417ce 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.0.2.tar.gz) = 0552a9b54beb4a044951b7cdbc8fc855
-SHA256 (dbus-1.0.2.tar.gz) = 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
-SIZE (dbus-1.0.2.tar.gz) = 1400278
+MD5 (dbus-1.1.20.tar.gz) = c552b9bc4b69e4c602644abc21b7661e
+SHA256 (dbus-1.1.20.tar.gz) = 6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
+SIZE (dbus-1.1.20.tar.gz) = 1401902
diff --git a/devel/dbus/files/patch-bus_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in
new file mode 100644
index 000000000000..b55c5dc79f22
--- /dev/null
+++ b/devel/dbus/files/patch-bus_Makefile.in
@@ -0,0 +1,20 @@
+--- bus/Makefile.in.orig 2008-01-22 14:45:58.000000000 -0500
++++ bus/Makefile.in 2008-01-22 15:24:26.000000000 -0500
+@@ -412,7 +412,7 @@ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ configdir = $(sysconfdir)/dbus-1
+-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+ -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
+
+@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \
+ $(DBUS_BUS_LIBS) \
+ $(top_builddir)/dbus/libdbus-convenience.la
+
+-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+ $(XML_SOURCES) \
+ config-parser-common.c \
diff --git a/devel/dbus/files/patch-bus_bus.c b/devel/dbus/files/patch-bus_bus.c
deleted file mode 100644
index af6b06529fe3..000000000000
--- a/devel/dbus/files/patch-bus_bus.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- bus/bus.c.orig Wed Mar 21 16:20:57 2007
-+++ bus/bus.c Wed Mar 21 16:22:08 2007
-@@ -21,6 +21,7 @@
- *
- */
-
-+#include <signal.h>
- #include "bus.h"
- #include "activation.h"
- #include "connection.h"
-@@ -731,14 +732,18 @@ bus_context_new (const DBusString *confi
- }
-
- bytes = _dbus_string_get_length (&pid);
-- if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
-+ signal (SIGPIPE, SIG_IGN);
-+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
-+ errno != EPIPE)
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Printing message bus PID: %s\n",
- _dbus_strerror (errno));
- _dbus_string_free (&pid);
-+ signal (SIGPIPE, SIG_DFL);
- goto failed;
- }
-+ signal (SIGPIPE, SIG_DFL);
-
- if (print_pid_fd > 2)
- _dbus_close_socket (print_pid_fd, NULL);
diff --git a/devel/dbus/files/patch-bus_system.conf.in b/devel/dbus/files/patch-bus_system.conf.in
deleted file mode 100644
index cfb3f879ec79..000000000000
--- a/devel/dbus/files/patch-bus_system.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- bus/system.conf.in.orig Wed May 3 02:08:16 2006
-+++ bus/system.conf.in Wed May 3 02:09:58 2006
-@@ -52,6 +52,7 @@
- <!-- Config files are placed here that among other things, punch
- holes in the above policy for specific services. -->
- <includedir>system.d</includedir>
-+ <includedir>%%X11BASE%%/etc/dbus-1/system.d</includedir>
-
- <!-- This is included last so local configuration can override what's
- in this standard file -->
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
index 83b1c33d72be..bd0353d36d62 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -1,12 +1,10 @@
---- dbus/dbus-sysdeps-unix.c.orig Wed Nov 1 18:30:46 2006
-+++ dbus/dbus-sysdeps-unix.c Sun Nov 5 21:57:27 2006
-@@ -834,10 +834,10 @@ write_credentials_byte (int
- {
+--- dbus/dbus-sysdeps-unix.c.orig 2008-02-15 20:26:46.000000000 -0500
++++ dbus/dbus-sysdeps-unix.c 2008-02-15 20:28:46.000000000 -0500
+@@ -1032,9 +1032,9 @@ write_credentials_byte (int
int bytes_written;
char buf[1] = { '\0' };
--#if defined(HAVE_CMSGCRED)
+ #if defined(HAVE_CMSGCRED)
- struct {
-+#if defined(HAVE_CMSGCRED)
+ union {
struct cmsghdr hdr;
- struct cmsgcred cred;
@@ -14,7 +12,7 @@
} cmsg;
struct iovec iov;
struct msghdr msg;
-@@ -848,10 +848,10 @@ write_credentials_byte (int
+@@ -1045,10 +1045,10 @@ write_credentials_byte (int
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
@@ -28,20 +26,19 @@
cmsg.hdr.cmsg_level = SOL_SOCKET;
cmsg.hdr.cmsg_type = SCM_CREDS;
#endif
-@@ -918,9 +918,10 @@ _dbus_read_credentials_unix_socket (int
- char buf;
-
+@@ -1124,9 +1124,9 @@ _dbus_read_credentials_socket (int
+ pid_read = DBUS_PID_UNSET;
+
#ifdef HAVE_CMSGCRED
- struct {
-+ struct cmsgcred *cred;
+ union {
- struct cmsghdr hdr;
-- struct cmsgcred cred;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ struct cmsghdr hdr;
+- struct cmsgcred cred;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
} cmsg;
#elif defined(LOCAL_CREDS)
-@@ -957,8 +958,8 @@ _dbus_read_credentials_unix_socket (int
+@@ -1163,8 +1163,8 @@ _dbus_read_credentials_socket (int
#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
memset (&cmsg, 0, sizeof (cmsg));
@@ -52,7 +49,7 @@
#endif
again:
-@@ -981,7 +982,8 @@ _dbus_read_credentials_unix_socket (int
+@@ -1202,7 +1202,8 @@ _dbus_read_credentials_socket (int
}
#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
@@ -62,26 +59,17 @@
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Message from recvmsg() was not SCM_CREDS");
-@@ -1009,9 +1011,10 @@ _dbus_read_credentials_unix_socket (int
+@@ -1229,8 +1230,11 @@ _dbus_read_credentials_socket (int
cr_len, (int) sizeof (cr), _dbus_strerror (errno));
}
#elif defined(HAVE_CMSGCRED)
-- credentials->pid = cmsg.cred.cmcred_pid;
-- credentials->uid = cmsg.cred.cmcred_euid;
-- credentials->gid = cmsg.cred.cmcred_groups[0];
+- pid_read = cmsg.cred.cmcred_pid;
+- uid_read = cmsg.cred.cmcred_euid;
++ struct cmsgcred *cred;
++
+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+ credentials->pid = cred->cmcred_pid;
-+ credentials->uid = cred->cmcred_euid;
-+ credentials->gid = cred->cmcred_groups[0];
++ pid_read = cred->cmcred_pid;
++ uid_read = cred->cmcred_euid;
#elif defined(LOCAL_CREDS)
- credentials->pid = DBUS_PID_UNSET;
- credentials->uid = cmsg.cred.sc_uid;
-@@ -2687,7 +2690,7 @@ _dbus_get_standard_session_servicedirs (
- }
- else
- {
-- if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+ if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/X11R6/share:/usr/share:"))
- goto oom;
- }
-
+ pid_read = DBUS_PID_UNSET;
+ uid_read = cmsg.cred.sc_uid;
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
deleted file mode 100644
index 4a6bf2c7a505..000000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- dbus/dbus-sysdeps-util-unix.c.orig Mon Dec 11 14:21:10 2006
-+++ dbus/dbus-sysdeps-util-unix.c Wed Mar 21 16:22:45 2007
-@@ -157,15 +157,19 @@ _dbus_become_daemon (const DBusString *p
- }
-
- bytes = _dbus_string_get_length (&pid);
-- if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes)
-+ signal (SIGPIPE, SIG_IGN);
-+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes &&
-+ errno != EPIPE)
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Printing message bus PID: %s\n",
- _dbus_strerror (errno));
- _dbus_string_free (&pid);
- kill (child_pid, SIGTERM);
-+ signal (SIGPIPE, SIG_DFL);
- return FALSE;
- }
-+ signal (SIGPIPE, SIG_DFL);
-
- _dbus_string_free (&pid);
- }
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
index 5a49ace79e13..4ed46afa771a 100644
--- a/devel/dbus/pkg-install
+++ b/devel/dbus/pkg-install
@@ -34,6 +34,7 @@ POST-INSTALL)
/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
/usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
+ /usr/bin/chgrp ${GROUP} ${PKG_PREFIX}/libexec/dbus-daemon-launch-helper
${PKG_PREFIX}/bin/dbus-uuidgen --ensure
exit 0
;;
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 9836e0dbbbaa..3bbf8b3c9956 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -28,21 +28,24 @@ lib/libdbus-1.la
lib/libdbus-1.so
lib/libdbus-1.so.3
libdata/pkgconfig/dbus-1.pc
+libexec/dbus-daemon-launch-helper
+@exec mkdir -p %D/libexec/dbus-1
@exec mkdir -p %D/etc/dbus-1/system.d
-@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
+@exec mkdir -p %D/share/dbus-1/interfaces
@exec mkdir -p %D/share/dbus-1/services
-@exec mkdir -p %%X11BASE%%/share/dbus-1/services
+@exec mkdir -p %D/share/dbus-1/system-services
+@exec mkdir -p %D/etc/dbus-1/session.d
+@dirrmtry share/dbus-1/system-services
@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1/interfaces
@dirrmtry share/dbus-1
-@unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/etc/dbus-1 2>/dev/null || true
+@dirrmtry libexec/dbus-1
@dirrm include/dbus-%%VERSION%%/include/dbus
@dirrm include/dbus-%%VERSION%%/include
@dirrm include/dbus-%%VERSION%%/dbus
@dirrm include/dbus-%%VERSION%%
@dirrm etc/dbus-1/system.d
+@dirrm etc/dbus-1/session.d
@dirrm etc/dbus-1
@unexec rm -f /var/run/dbus/dbus.pid
@unexec rm -f /var/run/dbus/dbus.pipe
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index ceb6db889c0e..fd87e0f15fb3 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gamin/Makefile,v 1.2 2007/02/02 18:57:01 mezz Exp $
+# $MCom: ports/devel/gamin/Makefile,v 1.4 2008/01/09 19:55:24 marcus Exp $
#
PORTNAME= gamin
PORTVERSION= 0.1.9
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/
@@ -16,7 +17,7 @@ COMMENT?= A file and directory monitoring system
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
-USE_GNOME?= gnomehack glib20
+USE_GNOME?= gnomehack _glib20
USE_LDCONFIG= yes
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--without-python
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index d647f75d62c3..c0205d1d74ba 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.87 2007/10/15 14:17:14 ahze Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.96 2008/03/10 16:25:56 ahze Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.20.1
+PORTVERSION= 2.22.0
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -24,9 +24,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_XLIB= yes
-USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack \
- referencehack
+USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \
+ referencehack intlhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index d1bea0986e97..69fd7f190c62 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.20.1.tar.bz2) = 646fc896c6282a8f103365af0fa2e303
-SHA256 (gnome2/GConf-2.20.1.tar.bz2) = 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838
-SIZE (gnome2/GConf-2.20.1.tar.bz2) = 1404919
+MD5 (gnome2/GConf-2.22.0.tar.bz2) = a56c043afeb1052abaf45407409b0331
+SHA256 (gnome2/GConf-2.22.0.tar.bz2) = 54e40cf047eb431cdf994f763ae840107ed6e9b8f9521b2b2eb07c7a55f92ce0
+SIZE (gnome2/GConf-2.22.0.tar.bz2) = 1416685
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 968ab8db4d97..fc96aad3d6fd 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -31,6 +31,7 @@ libexec/gconfd-2
share/aclocal/gconf-2.m4
share/locale/am/LC_MESSAGES/GConf2.mo
share/locale/ar/LC_MESSAGES/GConf2.mo
+share/locale/as/LC_MESSAGES/GConf2.mo
share/locale/az/LC_MESSAGES/GConf2.mo
share/locale/be/LC_MESSAGES/GConf2.mo
share/locale/bg/LC_MESSAGES/GConf2.mo
@@ -72,6 +73,7 @@ share/locale/mg/LC_MESSAGES/GConf2.mo
share/locale/mk/LC_MESSAGES/GConf2.mo
share/locale/ml/LC_MESSAGES/GConf2.mo
share/locale/mn/LC_MESSAGES/GConf2.mo
+share/locale/mr/LC_MESSAGES/GConf2.mo
share/locale/ms/LC_MESSAGES/GConf2.mo
share/locale/nb/LC_MESSAGES/GConf2.mo
share/locale/ne/LC_MESSAGES/GConf2.mo
@@ -86,6 +88,7 @@ share/locale/pt_BR/LC_MESSAGES/GConf2.mo
share/locale/ro/LC_MESSAGES/GConf2.mo
share/locale/ru/LC_MESSAGES/GConf2.mo
share/locale/rw/LC_MESSAGES/GConf2.mo
+share/locale/si/LC_MESSAGES/GConf2.mo
share/locale/sk/LC_MESSAGES/GConf2.mo
share/locale/sl/LC_MESSAGES/GConf2.mo
share/locale/sq/LC_MESSAGES/GConf2.mo
@@ -119,10 +122,14 @@ share/sgml/gconf/gconf-1.0.dtd
@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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -131,3 +138,5 @@ share/sgml/gconf/gconf-1.0.dtd
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index d3ad42259521..e2bf7256abf4 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.18 2007/09/17 03:25:24 marcus Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.20 2008/03/08 16:24:44 marcus Exp $
#
PORTNAME= gconfmm
-PORTVERSION= 2.20.0
+PORTVERSION= 2.22.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index 1c8397b0a18a..12c3db942420 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.20.0.tar.bz2) = 24d7e01104394229f28e32a1dc17c819
-SHA256 (gnome2/gconfmm-2.20.0.tar.bz2) = 79fde1ed43605961b2526f6074a57fd7ddfaa1851c4e91609829e439cc1ef2e9
-SIZE (gnome2/gconfmm-2.20.0.tar.bz2) = 283074
+MD5 (gnome2/gconfmm-2.22.0.tar.bz2) = 4090b7333a928c6baeff583a9a0b2b55
+SHA256 (gnome2/gconfmm-2.22.0.tar.bz2) = ff0db2c7d91f69f825ec5988547ebf5be144930b4f4013c678313ee0b2725f4a
+SIZE (gnome2/gconfmm-2.22.0.tar.bz2) = 283460
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
new file mode 100644
index 000000000000..27857eb6eded
--- /dev/null
+++ b/devel/gio-fam-backend/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for: gio-fam-backend
+# Date Created: 22 December 2007
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.9 2008/03/12 17:46:37 marcus Exp $
+#
+
+PORTNAME= gio-fam-backend
+PORTVERSION= 2.16.1
+PORTREVISION= 1
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
+ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
+ ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
+ http://www.ameth.org/gimp/%SUBDIR%/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
+MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DISTNAME= glib-${PORTVERSION}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= FAM backend for GLib's GIO library
+
+USE_BZIP2= yes
+BUILD_WRKSRC= ${WRKSRC}/gio/fam
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+GNU_CONFIGURE= yes
+USE_GNOME= gnomehack gnometarget pkgconfig _glib20
+USE_FAM= yes
+USE_GMAKE= yes
+CONFIGURE_ARGS= --enable-static --with-libiconv=gnu
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+.include <bsd.port.mk>
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
new file mode 100644
index 000000000000..8ccc88c9f7df
--- /dev/null
+++ b/devel/gio-fam-backend/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/glib-2.16.1.tar.bz2) = 9852daf0605f827bfd7199ffe4f5b22d
+SHA256 (gnome2/glib-2.16.1.tar.bz2) = f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695
+SIZE (gnome2/glib-2.16.1.tar.bz2) = 4529604
diff --git a/devel/gio-fam-backend/files/patch-fam b/devel/gio-fam-backend/files/patch-fam
new file mode 100644
index 000000000000..a3b5fe4aa716
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-fam
@@ -0,0 +1,52 @@
+--- gio/fam/fam-helper.h.orig 2008-03-10 13:50:12.000000000 -0400
++++ gio/fam/fam-helper.h 2008-03-10 13:50:29.000000000 -0400
+@@ -28,6 +28,7 @@
+ typedef struct _fam_sub fam_sub;
+
+ gboolean _fam_sub_startup (void);
++void _fam_sub_shutdown (void);
+ fam_sub* _fam_sub_add (const gchar* pathname,
+ gboolean directory,
+ gpointer user_data);
+--- gio/fam/fam-helper.c.orig 2008-03-10 20:31:58.000000000 -0400
++++ gio/fam/fam-helper.c 2008-03-10 23:06:32.000000000 -0400
+@@ -181,6 +181,22 @@ _fam_sub_startup (void)
+ return TRUE;
+ }
+
++void
++_fam_sub_shutdown (void)
++{
++ G_LOCK (fam_connection);
++
++ if (fam_connection != NULL) {
++ FAMClose (fam_connection);
++ g_free (fam_connection);
++ g_source_remove (fam_watch_id);
++ fam_watch_id = 0;
++ fam_connection = NULL;
++ }
++
++ G_UNLOCK (fam_connection);
++}
++
+ fam_sub*
+ _fam_sub_add (const gchar* pathname,
+ gboolean directory,
+--- gio/fam/fam-module.c.orig 2008-03-12 13:38:54.000000000 -0400
++++ gio/fam/fam-module.c 2008-03-12 13:39:31.000000000 -0400
+@@ -26,6 +26,7 @@
+ #include "giomodule.h"
+ #include "gfamdirectorymonitor.h"
+ #include "gfamfilemonitor.h"
++#include "fam-helper.h"
+
+ void
+ g_io_module_load (GIOModule *module)
+@@ -37,5 +38,6 @@ g_io_module_load (GIOModule *module)
+ void
+ g_io_module_unload (GIOModule *module)
+ {
++ _fam_sub_shutdown ();
+ }
+
diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
new file mode 100644
index 000000000000..0f6a9e25ead1
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
@@ -0,0 +1,27 @@
+--- gio/fam/Makefile.in.orig 2008-01-07 19:40:38.000000000 -0500
++++ gio/fam/Makefile.in 2008-01-07 19:41:53.000000000 -0500
+@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule
+ giomoduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(giomodule_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
+- $(top_builddir)/gobject/libgobject-2.0.la \
+- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
++libgiofam_la_DEPENDENCIES = \
++ $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
+@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \
+
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+- $(top_builddir)/gio/libgio-2.0.la \
+- $(top_builddir)/gobject/libgobject-2.0.la \
+- $(top_builddir)/glib/libglib-2.0.la \
++ -lgio-2.0 \
++ -lgobject-2.0 \
++ -lglib-2.0 \
+ $(GLIB_LIBS) \
+ $(FAM_LIBS) \
+ $(NULL)
diff --git a/devel/gio-fam-backend/pkg-descr b/devel/gio-fam-backend/pkg-descr
new file mode 100644
index 000000000000..b44b5d5576ec
--- /dev/null
+++ b/devel/gio-fam-backend/pkg-descr
@@ -0,0 +1,2 @@
+gio-fam-backend provides a file Alteration Monitor (FAM) backend module for
+GLib's GIO subsystem.
diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist
new file mode 100644
index 000000000000..4304d626a688
--- /dev/null
+++ b/devel/gio-fam-backend/pkg-plist
@@ -0,0 +1,5 @@
+lib/gio/modules/libgiofam.a
+lib/gio/modules/libgiofam.la
+lib/gio/modules/libgiofam.so
+@dirrmtry lib/gio/modules
+@dirrmtry lib/gio
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 0964225a4421..d43f0ff2e151 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/glib20/Makefile,v 1.1 2007/11/30 18:48:03 marcus Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.117 2008/03/19 04:44:58 marcus Exp $
#
PORTNAME= glib
-PORTVERSION= 2.14.6
-PORTREVISION?= 0
+PORTVERSION= 2.16.1
+PORTREVISION?= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -35,11 +35,13 @@ USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
USE_GMAKE= yes
+USE_PYTHON= yes
USE_PERL5= yes
CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \
--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
--disable-man --without-xml-catalog \
- --with-pcre=system
+ --with-pcre=system \
+ --disable-fam
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
@@ -59,10 +61,6 @@ GLIB_ARCH= ${ARCH}
.endif
CONFIGURE_TARGET= --build=${GLIB_ARCH}-portbld-freebsd${OSREL}
-.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) )
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c
-.endif
-
.if defined(WITH_COLLATION_FIX)
LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index c6616ee5e610..8ccc88c9f7df 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.14.6.tar.bz2) = 3b340946d6916ee9cbf2c348e7c099f1
-SHA256 (gnome2/glib-2.14.6.tar.bz2) = 78dfbbd339ff1049275f76a2a6e6c8f0cf124d5cdbea62a2b36e9d76c0ea24ba
-SIZE (gnome2/glib-2.14.6.tar.bz2) = 3406651
+MD5 (gnome2/glib-2.16.1.tar.bz2) = 9852daf0605f827bfd7199ffe4f5b22d
+SHA256 (gnome2/glib-2.16.1.tar.bz2) = f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695
+SIZE (gnome2/glib-2.16.1.tar.bz2) = 4529604
diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c
deleted file mode 100644
index bde2862f605e..000000000000
--- a/devel/glib20/files/extra-patch-gthread_gthread-posix.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- gthread/gthread-posix.c.orig Thu Jun 9 11:25:01 2005
-+++ gthread/gthread-posix.c Fri Jun 10 20:23:17 2005
-@@ -115,7 +115,11 @@ static gint priority_normal_value;
- # define PRIORITY_NORMAL_VALUE priority_normal_value
- #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */
-
-+#define G_THREAD_STACK_SIZE32 (1*1024*1024)
-+#define G_THREAD_STACK_SIZE64 (2*1024*1024)
-+
- static gulong g_thread_min_stack_size = 0;
-+static gulong g_thread_default_stack_size = 0;
-
- #define G_MUTEX_SIZE (sizeof (pthread_mutex_t))
-
-@@ -309,8 +313,16 @@ g_thread_create_posix_impl (GThreadFunc
- stack_size = MAX (g_thread_min_stack_size, stack_size);
- /* No error check here, because some systems can't do it and
- * we simply don't want threads to fail because of that. */
-- pthread_attr_setstacksize (&attr, stack_size);
- }
-+ else
-+ {
-+ if (sizeof(void *) == 8)
-+ g_thread_default_stack_size = G_THREAD_STACK_SIZE64;
-+ else
-+ g_thread_default_stack_size = G_THREAD_STACK_SIZE32;
-+ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size);
-+ }
-+ pthread_attr_setstacksize (&attr, stack_size);
- #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-
- #ifdef PTHREAD_SCOPE_SYSTEM
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 46738f939e1a..2ba6ab189dda 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,28 @@
---- configure.orig Sun Jan 29 13:06:22 2006
-+++ configure Sun Jan 29 13:06:48 2006
-@@ -34462,6 +34461,8 @@
+--- configure.orig 2008-03-17 23:32:05.000000000 -0400
++++ configure 2008-03-18 17:55:42.000000000 -0400
+@@ -32748,6 +32748,12 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++#ifdef HAVE_SYS_MOUNT_H
++#include <sys/mount.h>
++#endif
+ int
+ main ()
+ {
+@@ -34051,7 +34057,7 @@ done
+
+
+
+-for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
++for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -39139,6 +39145,8 @@ fi
;;
esac
fi
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index 8a89b6e972e9..5ee7fe3d539f 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,22 +1,21 @@
---- Makefile.in.orig Thu May 3 15:19:30 2007
-+++ Makefile.in Thu May 3 15:19:44 2007
-@@ -248,7 +248,7 @@ target_alias = @target_alias@
-
+--- Makefile.in.orig 2008-02-12 00:16:23.000000000 +0100
++++ Makefile.in 2008-02-12 00:16:23.000000000 +0100
+@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLo
+ gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+ TEST_PROGS =
AUTOMAKE_OPTIONS = 1.7
-
--SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
-+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
-
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
-
-@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \
+ AM_CPPFLAGS = \
+@@ -356,7 +356,8 @@ BUILT_EXTRA_DIST = \
config.h.win32 \
gtk-doc.make
--
-configexecincludedir = $(libdir)/glib-2.0/include
+glibincludedir = $(includedir)/glib-2.0
+configexecincludedir = $(glibincludedir)
-
+ configexecinclude_DATA = glibconfig.h
CONFIGURE_DEPENDENCIES = acglib.m4
-
+ BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
index c339b76e2477..3784d16b8ed2 100644
--- a/devel/glib20/files/patch-ah
+++ b/devel/glib20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig Fri Oct 24 18:05:32 2003
-+++ docs/reference/Makefile.in Fri Oct 24 18:06:00 2003
-@@ -226,7 +226,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = glib gobject
-+SUBDIRS = #glib gobject
- subdir = docs/reference
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
+--- docs/reference/Makefile.in.orig 2007-12-21 16:54:10.000000000 -0500
++++ docs/reference/Makefile.in 2007-12-21 16:54:40.000000000 -0500
+@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt
+ # initialize variables for unconditional += appending
+ EXTRA_DIST =
+ TEST_PROGS =
+-SUBDIRS = glib gobject gio
++SUBDIRS = #glib gobject gio
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/devel/glib20/files/patch-config.h.in b/devel/glib20/files/patch-config.h.in
new file mode 100644
index 000000000000..3c2bc5d2626f
--- /dev/null
+++ b/devel/glib20/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig 2008-03-18 18:24:24.000000000 -0400
++++ config.h.in 2008-03-18 18:24:59.000000000 -0400
+@@ -197,6 +197,9 @@
+ /* Define to 1 if you have the `getpwuid' function. */
+ #undef HAVE_GETPWUID
+
++/* Define to 1 if you have the `sysctlbyname' function. */
++#undef HAVE_SYSCTLBYNAME
++
+ /* Define if the GNU gettext() function is already present or preinstalled. */
+ #undef HAVE_GETTEXT
+
diff --git a/devel/glib20/files/patch-gio_glocalfile.c b/devel/glib20/files/patch-gio_glocalfile.c
new file mode 100644
index 000000000000..9cf00d383eff
--- /dev/null
+++ b/devel/glib20/files/patch-gio_glocalfile.c
@@ -0,0 +1,11 @@
+--- gio/glocalfile.c.orig 2008-03-10 23:04:57.000000000 -0400
++++ gio/glocalfile.c 2008-03-10 23:05:23.000000000 -0400
+@@ -1001,7 +1001,7 @@ g_local_file_query_filesystem_info (GFil
+ #endif
+ }
+ #ifdef USE_STATFS
+-#if defined(HAVE_STRUCT_STATFS_FS_TYPENAME)
++#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
+ fstype = g_strdup(statfs_buffer.f_fstypename);
+ #else
+ fstype = get_fs_type (statfs_buffer.f_type);
diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c
new file mode 100644
index 000000000000..b9bfe143ed0c
--- /dev/null
+++ b/devel/glib20/files/patch-gio_gunixmount.c
@@ -0,0 +1,21 @@
+--- gio/gunixmount.c.orig 2007-12-23 15:53:50.000000000 -0500
++++ gio/gunixmount.c 2007-12-23 15:52:52.000000000 -0500
+@@ -372,12 +372,18 @@ g_unix_mount_eject (GMount *
+ gpointer user_data)
+ {
+ GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
++#ifndef __FreeBSD__
+ char *argv[] = {"eject", NULL, NULL};
+
+ if (unix_mount->mount_path != NULL)
+ argv[1] = unix_mount->mount_path;
+ else
+ argv[1] = unix_mount->device_path;
++#else
++ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
++
++ argv[2] = unix_mount->device_path;
++#endif
+
+ return eject_unmount_do (mount, cancellable, callback, user_data, argv);
+ }
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
new file mode 100644
index 000000000000..9b6fa2df36f0
--- /dev/null
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -0,0 +1,148 @@
+--- ggio/unixmounts.c.orig 2008-03-10 20:31:58.000000000 -0400
++++ gio/gunixmounts.c 2008-03-19 22:31:23.000000000 -0400
+@@ -128,6 +128,9 @@ struct _GUnixMountMonitor {
+
+ GFileMonitor *fstab_monitor;
+ GFileMonitor *mtab_monitor;
++
++ guint mount_poller_source;
++ GList *mount_poller_mounts;
+ };
+
+ struct _GUnixMountMonitorClass {
+@@ -139,6 +142,8 @@ static GUnixMountMonitor *the_mount_moni
+ static GList *_g_get_unix_mounts (void);
+ static GList *_g_get_unix_mount_points (void);
+
++static guint64 mount_poller_time = 0;
++
+ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
+
+ #define MOUNT_POLL_INTERVAL 4000
+@@ -165,6 +170,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
+ #endif
+
+ #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
++#include <sys/param.h>
+ #include <sys/ucred.h>
+ #include <sys/mount.h>
+ #include <fstab.h>
+@@ -215,20 +221,28 @@ g_unix_is_mount_path_system_internal (co
+ "/", /* we already have "Filesystem root" in Nautilus */
+ "/bin",
+ "/boot",
++ "/compat/linux/proc",
++ "/compat/linux/sys",
+ "/dev",
+ "/etc",
+ "/home",
+ "/lib",
+ "/lib64",
++ "/libexec",
+ "/media",
+ "/mnt",
+ "/opt",
++ "/rescue",
+ "/root",
+ "/sbin",
+ "/srv",
+ "/tmp",
+ "/usr",
++ "/usr/X11R6",
+ "/usr/local",
++ "/usr/obj",
++ "/usr/ports",
++ "/usr/src",
+ "/var",
+ "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
+ "/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
+@@ -988,6 +1002,10 @@ get_mounts_timestamp (void)
+ if (stat (monitor_file, &buf) == 0)
+ return (guint64)buf.st_mtime;
+ }
++ else
++ {
++ return mount_poller_time;
++ }
+ return 0;
+ }
+
+@@ -1129,6 +1147,13 @@ g_unix_mount_monitor_finalize (GObject *
+ g_object_unref (monitor->mtab_monitor);
+ }
+
++ if (monitor->mount_poller_source > 0)
++ {
++ g_source_remove (monitor->mount_poller_source);
++ g_list_foreach (monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
++ g_list_free (monitor->mount_poller_mounts);
++ }
++
+ the_mount_monitor = NULL;
+
+ if (G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize)
+@@ -1206,6 +1231,51 @@ mtab_file_changed (GFileMonitor *mo
+ g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
+ }
+
++static gboolean
++mount_change_poller (gpointer user_data)
++{
++ GUnixMountMonitor *mount_monitor;
++ GList *current_mounts;
++ gboolean has_changed = FALSE;
++
++ mount_monitor = user_data;
++ current_mounts = _g_get_unix_mounts ();
++
++ if (g_list_length (current_mounts) != g_list_length (mount_monitor->mount_poller_mounts))
++ {
++ g_list_foreach (mount_monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
++ has_changed = TRUE;
++ }
++ else
++ {
++ int i;
++
++ for (i = 0; i < g_list_length (current_mounts); i++)
++ {
++ GUnixMountEntry *m1;
++ GUnixMountEntry *m2;
++
++ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
++ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
++ if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
++ has_changed = TRUE;
++
++ g_unix_mount_free (m2);
++ }
++ }
++
++ g_list_free (mount_monitor->mount_poller_mounts);
++ mount_monitor->mount_poller_mounts = current_mounts;
++
++ if (has_changed)
++ {
++ mount_poller_time = (guint64)time (NULL);
++ g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
++ }
++
++ return TRUE;
++}
++
+ static void
+ g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
+ {
+@@ -1228,6 +1298,12 @@ g_unix_mount_monitor_init (GUnixMountMon
+
+ g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
+ }
++ else
++ {
++ monitor->mount_poller_mounts = _g_get_unix_mounts ();
++ mount_poller_time = (guint64)time (NULL);
++ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor);
++ }
+ }
+
+ /**
diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
new file mode 100644
index 000000000000..377a7d6b5686
--- /dev/null
+++ b/devel/glib20/files/patch-gio_gunixvolume.c
@@ -0,0 +1,17 @@
+--- gio/gunixvolume.c.orig 2007-12-23 15:43:17.000000000 -0500
++++ gio/gunixvolume.c 2007-12-23 15:47:08.000000000 -0500
+@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume *volume,
+ gpointer user_data)
+ {
+ GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
++#ifdef __FreeBSD__
++ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
++ argv[2] = unix_volume->device_path;
++#else
+ char *argv[] = {"eject", NULL, NULL};
+-
+ argv[1] = unix_volume->device_path;
++#endif
+
+ eject_mount_do (volume, cancellable, callback, user_data, argv);
+ }
diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmime.c b/devel/glib20/files/patch-gio_xdgmime_xdgmime.c
new file mode 100644
index 000000000000..8c36dc5d8d4d
--- /dev/null
+++ b/devel/glib20/files/patch-gio_xdgmime_xdgmime.c
@@ -0,0 +1,11 @@
+--- gio/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004
++++ gio/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004
+@@ -204,7 +204,7 @@
+
+ xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+ if (xdg_data_dirs == NULL)
+- xdg_data_dirs = "/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "/usr/local/share/";
+
+ ptr = xdg_data_dirs;
+
diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
new file mode 100644
index 000000000000..58aa93037507
--- /dev/null
+++ b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
@@ -0,0 +1,12 @@
+--- gio/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400
++++ gio/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400
+@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
+ #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
+ #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
+
+ #endif
+
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
index 9afd57416296..9cec8906fb28 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,31 +1,30 @@
---- glib/libcharset/Makefile.in.orig Fri Apr 30 12:10:27 2004
-+++ glib/libcharset/Makefile.in Fri Apr 30 12:12:01 2004
-@@ -225,7 +225,7 @@
- target_alias = @target_alias@
-
+--- glib/libcharset/Makefile.in.orig 2007-12-21 16:55:09.000000000 -0500
++++ glib/libcharset/Makefile.in 2007-12-21 16:56:04.000000000 -0500
+@@ -277,15 +277,15 @@ EXTRA_DIST = README config.charset ref-a
+ codeset.m4 update.sh make-patch.sh libcharset-glib.patch
+ TEST_PROGS =
INCLUDES = \
- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
+ -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir)
-
noinst_LTLIBRARIES = libcharset.la
-@@ -246,8 +246,8 @@
- make-patch.sh
-
+ libcharset_la_SOURCES = \
+ libcharset.h \
+ localcharset.c
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
-
SUFFIXES = .sed .sin
+ CLEANFILES = charset.alias ref-add.sed ref-del.sed
+ all: all-am
+@@ -497,7 +497,7 @@ install-data-am:
-@@ -487,7 +487,7 @@
-
- install-data-am:
+ install-dvi: install-dvi-am
-install-exec-am: install-exec-local
+install-exec-am: # install-exec-local
- install-info: install-info-am
+ install-html: install-html-am
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 1caac4492aca..44bbc76976a6 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -2,6 +2,52 @@ bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
bin/gobject-query
+bin/gtester
+bin/gtester-report
+include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gunixinputstream.h
+include/gio-unix-2.0/gio/gunixmounts.h
+include/gio-unix-2.0/gio/gunixoutputstream.h
+include/glib-2.0/gio/gappinfo.h
+include/glib-2.0/gio/gasyncresult.h
+include/glib-2.0/gio/gbufferedinputstream.h
+include/glib-2.0/gio/gbufferedoutputstream.h
+include/glib-2.0/gio/gcancellable.h
+include/glib-2.0/gio/gcontenttype.h
+include/glib-2.0/gio/gdatainputstream.h
+include/glib-2.0/gio/gdataoutputstream.h
+include/glib-2.0/gio/gdrive.h
+include/glib-2.0/gio/gfile.h
+include/glib-2.0/gio/gfileattribute.h
+include/glib-2.0/gio/gfileenumerator.h
+include/glib-2.0/gio/gfileicon.h
+include/glib-2.0/gio/gfileinfo.h
+include/glib-2.0/gio/gfileinputstream.h
+include/glib-2.0/gio/gfilemonitor.h
+include/glib-2.0/gio/gfilenamecompleter.h
+include/glib-2.0/gio/gfileoutputstream.h
+include/glib-2.0/gio/gfilterinputstream.h
+include/glib-2.0/gio/gfilteroutputstream.h
+include/glib-2.0/gio/gicon.h
+include/glib-2.0/gio/ginputstream.h
+include/glib-2.0/gio/gio.h
+include/glib-2.0/gio/gioenumtypes.h
+include/glib-2.0/gio/gioerror.h
+include/glib-2.0/gio/giomodule.h
+include/glib-2.0/gio/gioscheduler.h
+include/glib-2.0/gio/gloadableicon.h
+include/glib-2.0/gio/gmemoryinputstream.h
+include/glib-2.0/gio/gmemoryoutputstream.h
+include/glib-2.0/gio/gmount.h
+include/glib-2.0/gio/gmountoperation.h
+include/glib-2.0/gio/gnativevolumemonitor.h
+include/glib-2.0/gio/goutputstream.h
+include/glib-2.0/gio/gseekable.h
+include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gthemedicon.h
+include/glib-2.0/gio/gvfs.h
+include/glib-2.0/gio/gvolume.h
+include/glib-2.0/gio/gvolumemonitor.h
include/glib-2.0/glib-object.h
include/glib-2.0/glib.h
include/glib-2.0/glib/galloca.h
@@ -12,6 +58,7 @@ include/glib-2.0/glib/gbacktrace.h
include/glib-2.0/glib/gbase64.h
include/glib-2.0/glib/gbookmarkfile.h
include/glib-2.0/glib/gcache.h
+include/glib-2.0/glib/gchecksum.h
include/glib-2.0/glib/gcompletion.h
include/glib-2.0/glib/gconvert.h
include/glib-2.0/glib/gdataset.h
@@ -52,12 +99,14 @@ include/glib-2.0/glib/gspawn.h
include/glib-2.0/glib/gstdio.h
include/glib-2.0/glib/gstrfuncs.h
include/glib-2.0/glib/gstring.h
+include/glib-2.0/glib/gtestutils.h
include/glib-2.0/glib/gthread.h
include/glib-2.0/glib/gthreadpool.h
include/glib-2.0/glib/gtimer.h
include/glib-2.0/glib/gtree.h
include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
+include/glib-2.0/glib/gurifuncs.h
include/glib-2.0/glib/gutils.h
include/glib-2.0/glib/gwin32.h
include/glib-2.0/glibconfig.h
@@ -79,6 +128,10 @@ include/glib-2.0/gobject/gvalue.h
include/glib-2.0/gobject/gvaluearray.h
include/glib-2.0/gobject/gvaluecollector.h
include/glib-2.0/gobject/gvaluetypes.h
+lib/libgio-2.0.a
+lib/libgio-2.0.la
+lib/libgio-2.0.so
+lib/libgio-2.0.so.0
lib/libglib-2.0.a
lib/libglib-2.0.la
lib/libglib-2.0.so
@@ -95,6 +148,8 @@ lib/libgthread-2.0.a
lib/libgthread-2.0.la
lib/libgthread-2.0.so
lib/libgthread-2.0.so.0
+libdata/pkgconfig/gio-2.0.pc
+libdata/pkgconfig/gio-unix-2.0.pc
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gmodule-export-2.0.pc
@@ -153,6 +208,7 @@ share/locale/mg/LC_MESSAGES/glib20.mo
share/locale/mk/LC_MESSAGES/glib20.mo
share/locale/ml/LC_MESSAGES/glib20.mo
share/locale/mn/LC_MESSAGES/glib20.mo
+share/locale/mr/LC_MESSAGES/glib20.mo
share/locale/ms/LC_MESSAGES/glib20.mo
share/locale/nb/LC_MESSAGES/glib20.mo
share/locale/ne/LC_MESSAGES/glib20.mo
@@ -167,6 +223,7 @@ share/locale/pt_BR/LC_MESSAGES/glib20.mo
share/locale/ro/LC_MESSAGES/glib20.mo
share/locale/ru/LC_MESSAGES/glib20.mo
share/locale/rw/LC_MESSAGES/glib20.mo
+share/locale/si/LC_MESSAGES/glib20.mo
share/locale/sk/LC_MESSAGES/glib20.mo
share/locale/sl/LC_MESSAGES/glib20.mo
share/locale/sq/LC_MESSAGES/glib20.mo
@@ -193,7 +250,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrm share/glib-2.0
@dirrm include/glib-2.0/gobject
@dirrm include/glib-2.0/glib
+@dirrm include/glib-2.0/gio
@dirrm include/glib-2.0
+@dirrm include/gio-unix-2.0/gio
+@dirrm include/gio-unix-2.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yi/LC_MESSAGES
@@ -208,10 +268,14 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
+@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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index f209f7eb4173..26bac99b4e21 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/glibmm/Makefile,v 1.3 2007/12/02 00:19:26 mezz Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.58 2008/03/10 23:01:49 ahze Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.0
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 96c2604ecfb2..f9e12ab393b9 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.14.2.tar.bz2) = 58b4fdc97738795a19b1f5ad37f186b4
-SHA256 (gnome2/glibmm-2.14.2.tar.bz2) = 7602068e8ea8e705c3970b5f2f524c7335db4ee0ca630a424690bc4951544851
-SIZE (gnome2/glibmm-2.14.2.tar.bz2) = 9268918
+MD5 (gnome2/glibmm-2.16.0.tar.bz2) = 0a2442b754b97c67d0ccb4a9a2bebcb2
+SHA256 (gnome2/glibmm-2.16.0.tar.bz2) = b587b9f88fd6b355857b9ec1a18f4a6a65005b8e9e1f2128c63b646d3937c92b
+SIZE (gnome2/glibmm-2.16.0.tar.bz2) = 11719272
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index f816389349f0..4ecfe4391546 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -1,5 +1,82 @@
+include/giomm-%%API_VERSION%%/giomm.h
+include/giomm-%%API_VERSION%%/giomm/appinfo.h
+include/giomm-%%API_VERSION%%/giomm/asyncresult.h
+include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h
+include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/cancellable.h
+include/giomm-%%API_VERSION%%/giomm/contenttype.h
+include/giomm-%%API_VERSION%%/giomm/datainputstream.h
+include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h
+include/giomm-%%API_VERSION%%/giomm/drive.h
+include/giomm-%%API_VERSION%%/giomm/enums.h
+include/giomm-%%API_VERSION%%/giomm/error.h
+include/giomm-%%API_VERSION%%/giomm/file.h
+include/giomm-%%API_VERSION%%/giomm/fileattributeinfo.h
+include/giomm-%%API_VERSION%%/giomm/fileattributeinfolist.h
+include/giomm-%%API_VERSION%%/giomm/fileenumerator.h
+include/giomm-%%API_VERSION%%/giomm/fileicon.h
+include/giomm-%%API_VERSION%%/giomm/fileinfo.h
+include/giomm-%%API_VERSION%%/giomm/fileinputstream.h
+include/giomm-%%API_VERSION%%/giomm/filemonitor.h
+include/giomm-%%API_VERSION%%/giomm/filenamecompleter.h
+include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/filterinputstream.h
+include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h
+include/giomm-%%API_VERSION%%/giomm/icon.h
+include/giomm-%%API_VERSION%%/giomm/init.h
+include/giomm-%%API_VERSION%%/giomm/inputstream.h
+include/giomm-%%API_VERSION%%/giomm/loadableicon.h
+include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h
+include/giomm-%%API_VERSION%%/giomm/mount.h
+include/giomm-%%API_VERSION%%/giomm/mountoperation.h
+include/giomm-%%API_VERSION%%/giomm/outputstream.h
+include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h
+include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h
+include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h
+include/giomm-%%API_VERSION%%/giomm/private/drive_p.h
+include/giomm-%%API_VERSION%%/giomm/private/enums_p.h
+include/giomm-%%API_VERSION%%/giomm/private/error_p.h
+include/giomm-%%API_VERSION%%/giomm/private/file_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfo_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfolist_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileenumerator_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileicon_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileinfo_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/filemonitor_p.h
+include/giomm-%%API_VERSION%%/giomm/private/filenamecompleter_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/icon_p.h
+include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h
+include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/mount_p.h
+include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h
+include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/volume_p.h
+include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h
+include/giomm-%%API_VERSION%%/giomm/seekable.h
+include/giomm-%%API_VERSION%%/giomm/themedicon.h
+include/giomm-%%API_VERSION%%/giomm/unixinputstream.h
+include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/volume.h
+include/giomm-%%API_VERSION%%/giomm/volumemonitor.h
+include/giomm-%%API_VERSION%%/giomm/wrap_init.h
include/glibmm-%%API_VERSION%%/glibmm.h
include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h
+include/glibmm-%%API_VERSION%%/glibmm/checksum.h
include/glibmm-%%API_VERSION%%/glibmm/class.h
include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h
include/glibmm-%%API_VERSION%%/glibmm/containers.h
@@ -12,6 +89,7 @@ include/glibmm-%%API_VERSION%%/glibmm/exception.h
include/glibmm-%%API_VERSION%%/glibmm/exceptionhandler.h
include/glibmm-%%API_VERSION%%/glibmm/fileutils.h
include/glibmm-%%API_VERSION%%/glibmm/helperlist.h
+include/glibmm-%%API_VERSION%%/glibmm/i18n-lib.h
include/glibmm-%%API_VERSION%%/glibmm/i18n.h
include/glibmm-%%API_VERSION%%/glibmm/init.h
include/glibmm-%%API_VERSION%%/glibmm/interface.h
@@ -28,6 +106,8 @@ include/glibmm-%%API_VERSION%%/glibmm/optioncontext.h
include/glibmm-%%API_VERSION%%/glibmm/optionentry.h
include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h
include/glibmm-%%API_VERSION%%/glibmm/pattern.h
+include/glibmm-%%API_VERSION%%/glibmm/priorities.h
+include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
@@ -45,6 +125,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h
include/glibmm-%%API_VERSION%%/glibmm/property.h
include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h
include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
@@ -65,6 +146,7 @@ include/glibmm-%%API_VERSION%%/glibmm/threadpool.h
include/glibmm-%%API_VERSION%%/glibmm/timer.h
include/glibmm-%%API_VERSION%%/glibmm/timeval.h
include/glibmm-%%API_VERSION%%/glibmm/unicode.h
+include/glibmm-%%API_VERSION%%/glibmm/uriutils.h
include/glibmm-%%API_VERSION%%/glibmm/ustring.h
include/glibmm-%%API_VERSION%%/glibmm/utility.h
include/glibmm-%%API_VERSION%%/glibmm/value.h
@@ -73,6 +155,7 @@ include/glibmm-%%API_VERSION%%/glibmm/value_custom.h
include/glibmm-%%API_VERSION%%/glibmm/wrap.h
include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h
include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
+lib/giomm-%%API_VERSION%%/include/giommconfig.h
lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h
lib/glibmm-%%API_VERSION%%/proc/beautify_docs.pl
lib/glibmm-%%API_VERSION%%/proc/generate_wrap_init.pl
@@ -92,6 +175,7 @@ lib/glibmm-%%API_VERSION%%/proc/m4/convert.m4
lib/glibmm-%%API_VERSION%%/proc/m4/convert_atk.m4
lib/glibmm-%%API_VERSION%%/proc/m4/convert_base.m4
lib/glibmm-%%API_VERSION%%/proc/m4/convert_gdk.m4
+lib/glibmm-%%API_VERSION%%/proc/m4/convert_gio.m4
lib/glibmm-%%API_VERSION%%/proc/m4/convert_glib.m4
lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
@@ -116,6 +200,10 @@ lib/glibmm-%%API_VERSION%%/proc/pm/Output.pm
lib/glibmm-%%API_VERSION%%/proc/pm/Property.pm
lib/glibmm-%%API_VERSION%%/proc/pm/Util.pm
lib/glibmm-%%API_VERSION%%/proc/pm/WrapParser.pm
+lib/libgiomm-%%VERSION%%.a
+lib/libgiomm-%%VERSION%%.la
+lib/libgiomm-%%VERSION%%.so
+lib/libgiomm-%%VERSION%%.so.1
lib/libglibmm-%%VERSION%%.a
lib/libglibmm-%%VERSION%%.la
lib/libglibmm-%%VERSION%%.so
@@ -124,6 +212,7 @@ lib/libglibmm_generate_extra_defs-%%VERSION%%.a
lib/libglibmm_generate_extra_defs-%%VERSION%%.la
lib/libglibmm_generate_extra_defs-%%VERSION%%.so
lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1
+libdata/pkgconfig/giomm-%%API_VERSION%%.pc
libdata/pkgconfig/glibmm-%%API_VERSION%%.pc
share/aclocal/glibmm_check_perl.m4
@dirrm lib/glibmm-%%API_VERSION%%/proc/pm
@@ -131,7 +220,12 @@ share/aclocal/glibmm_check_perl.m4
@dirrm lib/glibmm-%%API_VERSION%%/proc
@dirrm lib/glibmm-%%API_VERSION%%/include
@dirrm lib/glibmm-%%API_VERSION%%
+@dirrm lib/giomm-%%API_VERSION%%/include
+@dirrm lib/giomm-%%API_VERSION%%
@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
@dirrm include/glibmm-%%API_VERSION%%/glibmm/private
@dirrm include/glibmm-%%API_VERSION%%/glibmm
@dirrm include/glibmm-%%API_VERSION%%
+@dirrm include/giomm-%%API_VERSION%%/giomm/private
+@dirrm include/giomm-%%API_VERSION%%/giomm
+@dirrm include/giomm-%%API_VERSION%%
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 2f8838f9b8fb..6d8c66993264 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/gnome-vfs/Makefile,v 1.1 2007/12/02 00:27:45 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.182 2008/03/10 23:08:21 ahze Exp $
#
PORTNAME= gnome-vfs
-PORTVERSION= 2.20.1
+PORTVERSION= 2.22.0
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -28,7 +28,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
- libbonobo ltverhack referencehack
+ ltverhack referencehack
USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 5c7228b0867d..71b68d87f596 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.20.1.tar.bz2) = a350a5a3e201951d7e7867d0900df423
-SHA256 (gnome2/gnome-vfs-2.20.1.tar.bz2) = 37475d17350b0e54b2e0b7bdcd7effd04eafd96b4b07604ff7d941377dd112d3
-SIZE (gnome2/gnome-vfs-2.20.1.tar.bz2) = 1890300
+MD5 (gnome2/gnome-vfs-2.22.0.tar.bz2) = 369105fd82cb99e69e63acab8f3b89b7
+SHA256 (gnome2/gnome-vfs-2.22.0.tar.bz2) = 622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1
+SIZE (gnome2/gnome-vfs-2.22.0.tar.bz2) = 1939765
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index d7bb1e998f99..f8b22aaaf1b4 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports-stable/devel/gnome-vfs/pkg-deinstall.in,v 1.1 2007/12/02 00:27:46 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.17 2008/01/30 17:29:15 mezz Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 5be36cc435bb..72da3bf8ba79 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports-stable/devel/gnome-vfs/pkg-install.in,v 1.1 2007/12/02 00:27:46 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.17 2008/01/30 17:29:15 mezz Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 606b21cb5f72..d1e23ffc8251 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -111,6 +111,7 @@ share/dbus-1/services/gnome-vfs-daemon.service
share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -144,6 +145,7 @@ share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -220,3 +222,5 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index e01ed0f54a4b..2acfea609087 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.25 2007/09/17 16:37:10 marcus Exp $
+# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.27 2008/03/08 16:44:51 marcus Exp $
#
PORTNAME= gnome-vfsmm
-PORTVERSION= 2.20.0
+PORTVERSION= 2.22.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -30,7 +30,8 @@ CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
post-patch:
- @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
+ @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples// ; \
+ /^SUBDIRS =/s/docs//' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
${WRKSRC}/tools/extra_defs_gen/Makefile.in
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index b70b4da67aa0..20c4c5507789 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 3da9908850655031a383998d0cda1f85
-SHA256 (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 5a2cdeab177278ccb8b2e55eb257d332d57c750ba698b4199b7798b45afa7690
-SIZE (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 344213
+MD5 (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 80b86e6f88ee0bd3a1babb686d0be03a
+SHA256 (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 0e5d4e55aef65c5144217d4136ac2924f9c1a11f83e7dab13a4e0082e183fa92
+SIZE (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 354127
diff --git a/devel/gnome-vfsmm/pkg-plist b/devel/gnome-vfsmm/pkg-plist
index 5a23e55b3fc9..a117076e450b 100644
--- a/devel/gnome-vfsmm/pkg-plist
+++ b/devel/gnome-vfsmm/pkg-plist
@@ -1,6 +1,8 @@
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/address.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/application-registry.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-2.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle-2.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/directory-handle.h
@@ -18,6 +20,7 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-monitor.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/monitor-handle.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/address_p.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle-2_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/drive_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/enums_p.h
@@ -26,11 +29,14 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-action_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-application_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-monitor_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/resolve-handle_p.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress-2_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/uri_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume-monitor_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume_p.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/resolve-handle.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-2.h
+include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress-2.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer.h
include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/types.h
diff --git a/devel/gstreamer-plugins-gconf/Makefile b/devel/gstreamer-plugins-gconf/Makefile
index 28579979d91a..4fd80989507e 100644
--- a/devel/gstreamer-plugins-gconf/Makefile
+++ b/devel/gstreamer-plugins-gconf/Makefile
@@ -3,9 +3,10 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-gconf/Makefile,v 1.6 2008/03/19 14:05:33 ahze Exp $
#
-PORTREVISION= 4
+PORTREVISION= 2
CATEGORIES= devel
COMMENT= Gstreamer gconf plugin
diff --git a/devel/gstreamer-plugins-gio/Makefile b/devel/gstreamer-plugins-gio/Makefile
new file mode 100644
index 000000000000..a149dfef3bae
--- /dev/null
+++ b/devel/gstreamer-plugins-gio/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: gstreamer-plugins-gio
+# Date created: 21 April 2008
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-gio/Makefile,v 1.1 2008/03/21 04:14:18 ahze Exp $
+#
+
+PORTREVISION= 0
+CATEGORIES= devel
+
+COMMENT= Gstreamer gio (Glib I/O) plugin
+
+GST_PLUGIN= gio
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/gstreamer-plugins-gnomevfs/Makefile b/devel/gstreamer-plugins-gnomevfs/Makefile
index 91b767005357..ed689d4fb4f2 100644
--- a/devel/gstreamer-plugins-gnomevfs/Makefile
+++ b/devel/gstreamer-plugins-gnomevfs/Makefile
@@ -3,9 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-gnomevfs/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $
#
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= devel
COMMENT= Gstreamer gnomevfs plugin
diff --git a/devel/gstreamer-plugins-sdl/Makefile b/devel/gstreamer-plugins-sdl/Makefile
index afca794f46ce..a6295e3fbab7 100644
--- a/devel/gstreamer-plugins-sdl/Makefile
+++ b/devel/gstreamer-plugins-sdl/Makefile
@@ -3,9 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-sdl/Makefile,v 1.5 2008/03/19 14:05:33 ahze Exp $
#
-PORTREVISION= 4
+PORTREVISION= 2
CATEGORIES= devel
COMMENT= Gstreamer SDL plugin
diff --git a/devel/gstreamer-plugins-soup/Makefile b/devel/gstreamer-plugins-soup/Makefile
new file mode 100644
index 000000000000..996824d2f7ae
--- /dev/null
+++ b/devel/gstreamer-plugins-soup/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: gstreamer-plugins-soup
+# Date created: 9 Feb 2008
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-soup/Makefile,v 1.3 2008/03/19 14:05:33 ahze Exp $
+#
+
+PORTREVISION= 2
+CATEGORIES= devel
+
+COMMENT= Gstreamer soup http src plugin
+
+GST_PLUGIN= soup
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
new file mode 100644
index 000000000000..d52baa3468e1
--- /dev/null
+++ b/devel/gvfs/Makefile
@@ -0,0 +1,73 @@
+# New ports collection makefile for: gvfs
+# Date created: 2007-11-06
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gvfs/Makefile,v 1.21 2008/03/18 16:16:48 mezz Exp $
+#
+
+PORTNAME= gvfs
+PORTVERSION= 0.2.1
+PORTREVISION= 1
+CATEGORIES= devel gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME virtual file system
+
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \
+ hal.1:${PORTSDIR}/sysutils/hal \
+ soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ gnome-keyring:${PORTSDIR}/security/gnome-keyring \
+ avahi-client.3:${PORTSDIR}/net/avahi-app
+RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+
+USE_BZIP2= yes
+USE_GNOME= glib20 gnomehack gnomeprefix intlhack gconf2
+USE_GMAKE= yes
+USE_GETTEXT= yes
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-obexftp
+OPTIONS= FUSE "Enable fuse" on \
+ SAMBA "Enable Samba" on \
+ GPHOTO2 "Enable Gphoto 2 camera support" on
+# CDDA "Enable CDDA" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_FUSE) && ${OSVERSION} >= 600000
+LIB_DEPENDS+= fuse.2:${PORTSDIR}/sysutils/fusefs-libs
+PLIST_SUB+= FUSE=""
+.else
+CONFIGURE_ARGS+= --disable-fuse
+PLIST_SUB+= FUSE="@comment "
+.endif
+
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+= SMB=""
+.else
+CONFIGURE_ARGS+= --disable-samba
+PLIST_SUB+= SMB="@comment "
+.endif
+
+#.if defined(WITH_CDDA)
+#LIB_DEPENDS+= cdio_paranoia.0:${PORTSDIR}/sysutils/libcdio
+#PLIST_SUB+= CDDA=""
+#.else
+CONFIGURE_ARGS+= --disable-cdda
+PLIST_SUB+= CDDA="@comment "
+#.endif
+
+.if defined(WITH_GPHOTO2)
+LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+PLIST_SUB+= GPHOTO2=""
+.else
+CONFIGURE_ARGS+= --disable-gphoto2
+PLIST_SUB+= GPHOTO2="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
new file mode 100644
index 000000000000..8449712a6c57
--- /dev/null
+++ b/devel/gvfs/distinfo
@@ -0,0 +1,3 @@
+MD5 (gvfs-0.2.1.tar.bz2) = 039e796a721bb178dd1759af76be5c13
+SHA256 (gvfs-0.2.1.tar.bz2) = bb51a59ab302f156a4ea2ec359be015229432728a4091576267ad4ed6b7c847b
+SIZE (gvfs-0.2.1.tar.bz2) = 817139
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in
new file mode 100644
index 000000000000..7832811c4608
--- /dev/null
+++ b/devel/gvfs/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2008-02-11 20:04:47.000000000 -0500
++++ Makefile.in 2008-02-11 20:05:02.000000000 -0500
+@@ -60,7 +60,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = common client daemon gconf po programs test hal
++DIST_SUBDIRS = common client daemon gconf po programs hal
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in
new file mode 100644
index 000000000000..ffbfd5878dc1
--- /dev/null
+++ b/devel/gvfs/files/patch-client_Makefile.in
@@ -0,0 +1,11 @@
+--- client/Makefile.in.orig 2008-02-11 20:05:14.000000000 -0500
++++ client/Makefile.in 2008-02-11 20:05:42.000000000 -0500
+@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FUSE_CFLAGS = @FUSE_CFLAGS@
+-FUSE_LIBS = @FUSE_LIBS@
++FUSE_LIBS = @FUSE_LIBS@ -lfuse
+ GCONF_CFLAGS = @GCONF_CFLAGS@
+ GCONF_LIBS = @GCONF_LIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
new file mode 100644
index 000000000000..3733aa7e3cd9
--- /dev/null
+++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
@@ -0,0 +1,12 @@
+--- client/gvfsfusedaemon.c.orig 2007-11-06 18:06:41.000000000 -0500
++++ client/gvfsfusedaemon.c 2007-11-06 18:07:30.000000000 -0500
+@@ -28,7 +28,9 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#ifdef __linux__
+ #include <sys/vfs.h>
++#endif
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
new file mode 100644
index 000000000000..5187da5d4282
--- /dev/null
+++ b/devel/gvfs/files/patch-configure
@@ -0,0 +1,84 @@
+--- configure.orig 2008-02-25 16:48:49.000000000 -0500
++++ configure 2008-02-25 16:51:17.000000000 -0500
+@@ -24589,7 +24589,7 @@ if test "x$enable_http" != "xno"; then
+ msg_http=yes
+ fi
+
+- if test "x$msg_http" == "xyes"; then
++ if test "x$msg_http" = "xyes"; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for HTTP" >&5
+@@ -24857,7 +24857,7 @@ if test "x$enable_cdda" != "xno"; then
+ msg_cdda=yes
+ fi
+
+- if test "x$msg_cdda" == "xyes"; then
++ if test "x$msg_cdda" = "xyes"; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for CDDA" >&5
+@@ -25008,7 +25008,7 @@ if test "x$enable_fuse" != "xno"; then
+ msg_fuse=yes
+ fi
+
+- if test "x$msg_fuse" == "xyes"; then
++ if test "x$msg_fuse" = "xyes"; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for FUSE" >&5
+@@ -25159,7 +25159,7 @@ if test "x$enable_gconf" != "xno"; then
+ msg_gconf=yes
+ fi
+
+- if test "x$msg_gconf" == "xyes"; then
++ if test "x$msg_gconf" = "xyes"; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GCONF" >&5
+@@ -25312,7 +25312,7 @@ if test "x$enable_hal" != "xno"; then
+ msg_hal=yes
+ fi
+
+- if test "x$msg_hal" == "xyes"; then
++ if test "x$msg_hal" = "xyes"; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for HAL" >&5
+@@ -25494,7 +25494,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
+ have_hal_fast_init=yes
+ fi
+
+- if test "x$have_hal_fast_init" == "xyes"; then
++ if test "x$have_hal_fast_init" = "xyes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL_FAST_INIT 1
+@@ -25540,13 +25540,16 @@ fi
+ *-linux*)
+ use_gphoto2=yes
+ ;;
++ *-freebsd*)
++ use_gphoto2=yes
++ ;;
+ *)
+ use_gphoto2=no
+ ;;
+ esac
+
+- if test "x$msg_gphoto2" == "xyes"; then
+- if test "x$use_gphoto2" == "xyes"; then
++ if test "x$msg_gphoto2" = "xyes"; then
++ if test "x$use_gphoto2" = "xyes"; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GPHOTO2" >&5
+@@ -25702,7 +25705,7 @@ if test "x$enable_keyring" != "xno"; the
+ msg_keyring=yes
+ fi
+
+- if test "x$msg_keyring" == "xyes"; then
++ if test "x$msg_keyring" = "xyes"; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for KEYRING" >&5
diff --git a/devel/gvfs/files/patch-daemon_gvfswritechannel.c b/devel/gvfs/files/patch-daemon_gvfswritechannel.c
new file mode 100644
index 000000000000..54c4216873e4
--- /dev/null
+++ b/devel/gvfs/files/patch-daemon_gvfswritechannel.c
@@ -0,0 +1,10 @@
+--- daemon/gvfswritechannel.c.orig 2007-12-22 18:50:10.000000000 -0500
++++ daemon/gvfswritechannel.c 2007-12-22 18:50:20.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include <sys/un.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <string.h>
+
+ #include <glib.h>
+ #include <glib-object.h>
diff --git a/devel/gvfs/files/patch-hal_ghalvolume.c b/devel/gvfs/files/patch-hal_ghalvolume.c
new file mode 100644
index 000000000000..519718969441
--- /dev/null
+++ b/devel/gvfs/files/patch-hal_ghalvolume.c
@@ -0,0 +1,14 @@
+--- hal/ghalvolume.c.orig 2008-02-25 16:51:39.000000000 -0500
++++ hal/ghalvolume.c 2008-02-25 16:52:00.000000000 -0500
+@@ -550,7 +550,11 @@ g_hal_volume_new (GVolumeMonitor *volu
+ return NULL;
+
+ /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */
++#ifdef __FreeBSD__
++ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file");
++#else
+ device_path = hal_device_get_property_string (drive_device, "linux.device_file");
++#endif
+ if (strlen (device_path) == 0)
+ device_path = NULL;
+
diff --git a/devel/gvfs/pkg-descr b/devel/gvfs/pkg-descr
new file mode 100644
index 000000000000..f6ea31130f4b
--- /dev/null
+++ b/devel/gvfs/pkg-descr
@@ -0,0 +1,6 @@
+GVFS allows applications and users to treat any number of file system
+concepts as a part of the local filesystem. With GVFS, filesystems across
+the internet, on connected devices, and in multiple formats are as simple
+to access (and write code for) as any directory on the local machine.
+
+WWW: http://www.gnome.org/
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
new file mode 100644
index 000000000000..f1b4305b9c05
--- /dev/null
+++ b/devel/gvfs/pkg-plist
@@ -0,0 +1,112 @@
+bin/gvfs-cat
+bin/gvfs-copy
+bin/gvfs-info
+bin/gvfs-less
+bin/gvfs-ls
+bin/gvfs-mkdir
+bin/gvfs-monitor-dir
+bin/gvfs-monitor-file
+bin/gvfs-mount
+bin/gvfs-move
+bin/gvfs-open
+bin/gvfs-rename
+bin/gvfs-rm
+bin/gvfs-save
+bin/gvfs-trash
+bin/gvfs-tree
+etc/profile.d/gvfs-bash-completion.sh
+include/gvfs-client/gvfs/gvfsurimapper.h
+include/gvfs-client/gvfs/gvfsuriutils.h
+lib/gio/modules/libgiogconf.la
+lib/gio/modules/libgiogconf.so
+lib/gio/modules/libgiohal-volume-monitor.la
+lib/gio/modules/libgiohal-volume-monitor.so
+lib/gio/modules/libgvfsdbus.la
+lib/gio/modules/libgvfsdbus.so
+lib/libgvfscommon.la
+lib/libgvfscommon.so
+lib/libgvfscommon.so.0
+%%FUSE%%libexec/gvfs-fuse-daemon
+libexec/gvfsd
+libexec/gvfsd-archive
+libexec/gvfsd-burn
+libexec/gvfsd-computer
+libexec/gvfsd-dav
+libexec/gvfsd-dnssd
+libexec/gvfsd-ftp
+%%GPHOTO2%%libexec/gvfsd-gphoto2
+libexec/gvfsd-http
+libexec/gvfsd-localtest
+libexec/gvfsd-network
+libexec/gvfsd-sftp
+%%SMB%%libexec/gvfsd-smb
+%%SMB%%libexec/gvfsd-smb-browse
+libexec/gvfsd-trash
+share/dbus-1/services/gvfs-daemon.service
+share/gvfs/mounts/archive.mount
+share/gvfs/mounts/burn.mount
+share/gvfs/mounts/computer.mount
+share/gvfs/mounts/dav.mount
+share/gvfs/mounts/dns-sd.mount
+share/gvfs/mounts/ftp.mount
+%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount
+share/gvfs/mounts/http.mount
+share/gvfs/mounts/localtest.mount
+share/gvfs/mounts/network.mount
+share/gvfs/mounts/sftp.mount
+%%SMB%%share/gvfs/mounts/smb-browse.mount
+%%SMB%%share/gvfs/mounts/smb.mount
+share/gvfs/mounts/trash.mount
+share/locale/ar/LC_MESSAGES/gvfs.mo
+share/locale/be@latin/LC_MESSAGES/gvfs.mo
+share/locale/bn_IN/LC_MESSAGES/gvfs.mo
+share/locale/ca/LC_MESSAGES/gvfs.mo
+share/locale/cs/LC_MESSAGES/gvfs.mo
+share/locale/da/LC_MESSAGES/gvfs.mo
+share/locale/de/LC_MESSAGES/gvfs.mo
+share/locale/el/LC_MESSAGES/gvfs.mo
+share/locale/en_GB/LC_MESSAGES/gvfs.mo
+share/locale/es/LC_MESSAGES/gvfs.mo
+share/locale/eu/LC_MESSAGES/gvfs.mo
+share/locale/fi/LC_MESSAGES/gvfs.mo
+share/locale/fr/LC_MESSAGES/gvfs.mo
+share/locale/gl/LC_MESSAGES/gvfs.mo
+share/locale/he/LC_MESSAGES/gvfs.mo
+share/locale/hi/LC_MESSAGES/gvfs.mo
+share/locale/hu/LC_MESSAGES/gvfs.mo
+share/locale/it/LC_MESSAGES/gvfs.mo
+share/locale/ja/LC_MESSAGES/gvfs.mo
+share/locale/ko/LC_MESSAGES/gvfs.mo
+share/locale/lt/LC_MESSAGES/gvfs.mo
+share/locale/mk/LC_MESSAGES/gvfs.mo
+share/locale/ml/LC_MESSAGES/gvfs.mo
+share/locale/mr/LC_MESSAGES/gvfs.mo
+share/locale/nb/LC_MESSAGES/gvfs.mo
+share/locale/nl/LC_MESSAGES/gvfs.mo
+share/locale/pa/LC_MESSAGES/gvfs.mo
+share/locale/pl/LC_MESSAGES/gvfs.mo
+share/locale/pt/LC_MESSAGES/gvfs.mo
+share/locale/pt_BR/LC_MESSAGES/gvfs.mo
+share/locale/ru/LC_MESSAGES/gvfs.mo
+share/locale/sk/LC_MESSAGES/gvfs.mo
+share/locale/sl/LC_MESSAGES/gvfs.mo
+share/locale/sv/LC_MESSAGES/gvfs.mo
+share/locale/ta/LC_MESSAGES/gvfs.mo
+share/locale/th/LC_MESSAGES/gvfs.mo
+share/locale/tr/LC_MESSAGES/gvfs.mo
+share/locale/uk/LC_MESSAGES/gvfs.mo
+share/locale/zh_CN/LC_MESSAGES/gvfs.mo
+share/locale/zh_HK/LC_MESSAGES/gvfs.mo
+share/locale/zh_TW/LC_MESSAGES/gvfs.mo
+@dirrm %%DATADIR%%/mounts
+@dirrm %%DATADIR%%
+@dirrm include/gvfs-client/gvfs
+@dirrm include/gvfs-client
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@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/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index fe8bf8939a59..614ce3b69054 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libbonobo/Makefile,v 1.67 2007/10/17 21:36:11 mezz Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.71 2008/03/10 16:30:35 ahze Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.20.4
+PORTVERSION= 2.22.0
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 9014fe169a5d..8fdd99c40ea0 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.20.4.tar.bz2) = 36da8bfe57f2b93cde5537a3349583b8
-SHA256 (gnome2/libbonobo-2.20.4.tar.bz2) = 81796573e99c2a70255684e49d3326d2341cd6dd918082e53fdf9792c3f9168a
-SIZE (gnome2/libbonobo-2.20.4.tar.bz2) = 1446532
+MD5 (gnome2/libbonobo-2.22.0.tar.bz2) = 998a576ad26784ac87eab99e96013527
+SHA256 (gnome2/libbonobo-2.22.0.tar.bz2) = 5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4
+SIZE (gnome2/libbonobo-2.22.0.tar.bz2) = 1445318
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index af2dbb8849e3..1cbf066c87d1 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -97,6 +97,7 @@ share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl
share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
share/locale/am/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/as/LC_MESSAGES/libbonobo-2.0.mo
share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
@@ -205,3 +206,5 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 8467154af8af..e7a846abb82c 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,23 +3,18 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop/Makefile,v 1.24 2007/09/16 17:22:25 ahze Exp $
+# $MCom: ports/devel/libgtop/Makefile,v 1.34 2008/03/10 21:59:17 mezz Exp $
#
PORTNAME= libgtop
-PORTVERSION= 2.20.1
-PORTREVISION= 1
+PORTVERSION= 2.22.0
CATEGORIES= devel 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= GNOME 2 top library
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof
-
USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GETTEXT= yes
@@ -36,6 +31,10 @@ INFO= libgtop2
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 800019
+RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
+.endif
+
.if ${OSVERSION} >= 600000
PKGMESSAGE= ${FILESDIR}/pkg-message
.endif
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index c2752cf6af14..41067cad3395 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.20.1.tar.bz2) = b6fa671e8325bd8dbce684527791225a
-SHA256 (gnome2/libgtop-2.20.1.tar.bz2) = 1e4d9cdedee5105c99a7bf3363e9bc375bff82923e24f55e475050937f482135
-SIZE (gnome2/libgtop-2.20.1.tar.bz2) = 770145
+MD5 (gnome2/libgtop-2.22.0.tar.bz2) = c4f15d95dea6441a08b4f2260996becd
+SHA256 (gnome2/libgtop-2.22.0.tar.bz2) = f6e05fcc185d57c55bdd1f98d36f8a83ca0a335c150d3d7201505bc7dab3abcf
+SIZE (gnome2/libgtop-2.22.0.tar.bz2) = 779243
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
new file mode 100644
index 000000000000..e8a6bd895fa5
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in
@@ -0,0 +1,28 @@
+--- sysdeps/freebsd/Makefile.in.orig 2007-11-02 23:55:07.000000000 -0400
++++ sysdeps/freebsd/Makefile.in 2007-11-02 23:58:08.000000000 -0400
+@@ -54,7 +54,7 @@ libgtop_sysdeps_2_0_la_LIBADD =
+ am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \
+ shm_limits.lo cpu.lo msg_limits.lo sem_limits.lo loadavg.lo \
+ uptime.lo netlist.lo fsusage.lo mem.lo procopenfiles.lo \
+- procwd.lo glibtop_private.lo
++ procwd.lo glibtop_private.lo mountlist.lo
+ libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
+ am__DEPENDENCIES_1 =
+ libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -303,7 +303,7 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid.
+ cpu.c msg_limits.c sem_limits.c loadavg.c \
+ uptime.c netlist.c fsusage.c mem.c \
+ procopenfiles.c procwd.c \
+- glibtop_private.c
++ glibtop_private.c mountlist.c
+
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+ libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
+@@ -374,6 +374,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibtop_private.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadavg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c
new file mode 100644
index 000000000000..90da05b1b71d
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c
@@ -0,0 +1,61 @@
+--- sysdeps/freebsd/fsusage.c.orig 2007-06-03 16:06:05.000000000 -0400
++++ sysdeps/freebsd/fsusage.c 2008-02-09 19:50:44.000000000 -0500
+@@ -10,6 +10,7 @@
+ #include <unistd.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>
++#include <sys/statvfs.h>
+ #if __FreeBSD_version >= 600000 || defined(__FreeBSD_kernel__)
+ #include <libgeom.h>
+ #include <sys/resource.h>
+@@ -21,15 +22,13 @@
+ #include <string.h>
+ #include <stdlib.h>
+
+-void
+-_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+- glibtop_fsusage *buf,
+- const char *path);
++static const unsigned long _glibtop_sysdeps_fsusage =
++(1L << GLIBTOP_FSUSAGE_BLOCKS) + (1L << GLIBTOP_FSUSAGE_BFREE)
+++ (1L << GLIBTOP_FSUSAGE_BAVAIL) + (1L << GLIBTOP_FSUSAGE_FILES)
+++ (1L << GLIBTOP_FSUSAGE_FFREE) + (1L << GLIBTOP_FSUSAGE_BLOCK_SIZE);
+
+-void
+-_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
+- glibtop_fsusage *buf,
+- const char *path)
++static void
++_glibtop_get_fsusage_read_write (glibtop *server, glibtop_fsusage *buf, const char *path)
+ {
+ int result;
+ struct statfs sfs;
+@@ -135,3 +134,28 @@ _glibtop_freebsd_get_fsusage_read_write(
+ #endif
+ buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
+ }
++
++void
++glibtop_get_fsusage_s(glibtop *server, glibtop_fsusage *buf, const char *path)
++{
++ struct statvfs fsd;
++
++ glibtop_init_r (&server, 0, 0);
++
++ memset (buf, 0, sizeof (glibtop_fsusage));
++
++ if (statvfs (path, &fsd) < 0)
++ return;
++
++ buf->block_size = fsd.f_frsize;
++ buf->blocks = fsd.f_blocks;
++ buf->bfree = fsd.f_bfree;
++ buf->bavail = (fsd.f_bavail > fsd.f_bfree) ? 0 : fsd.f_bavail;
++ buf->files = fsd.f_files;
++ buf->ffree = fsd.f_ffree;
++
++ buf->flags = _glibtop_sysdeps_fsusage;
++
++ _glibtop_get_fsusage_read_write(server, buf, path);
++}
++
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c b/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c
new file mode 100644
index 000000000000..7c1b1774cd89
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c
@@ -0,0 +1,171 @@
+--- sysdeps/freebsd/mountlist.c.orig 2008-02-15 02:11:59.000000000 -0500
++++ sysdeps/freebsd/mountlist.c 2008-02-15 02:28:14.000000000 -0500
+@@ -0,0 +1,168 @@
++/* mountlist.c -- return a list of mounted filesystems
++ Copyright (C) 1991, 1992 Free Software Foundation, Inc.
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software Foundation,
++ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++
++#include <config.h>
++
++#include <glib.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/mount.h>
++
++#include <string.h>
++
++#include <glibtop.h>
++#include <glibtop/mountlist.h>
++
++/* A mount table entry. */
++struct mount_entry
++{
++ char *me_devname; /* Device node pathname, including "/dev/". */
++ char *me_mountdir; /* Mount point directory pathname. */
++ char *me_type; /* "nfs", "4.2", etc. */
++ dev_t me_dev; /* Device number of me_mountdir. */
++ struct mount_entry *me_next;
++};
++
++static struct mount_entry *read_filesystem_list (void);
++
++/* Return a list of the currently mounted filesystems, or NULL on error.
++ Add each entry to the tail of the list so that they stay in order.
++*/
++
++static struct mount_entry *
++read_filesystem_list (void)
++{
++ struct mount_entry *mount_list;
++ struct mount_entry *me;
++ struct mount_entry *mtail;
++
++ /* Start the list off with a dummy entry. */
++ me = g_new (struct mount_entry, 1);
++ me->me_next = NULL;
++ mount_list = mtail = me;
++ {
++ struct statfs *fsp;
++ int entries;
++
++ entries = getmntinfo (&fsp, MNT_NOWAIT);
++ if (entries < 0)
++ return NULL;
++ while (entries-- > 0)
++ {
++ me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
++ me->me_devname = g_strdup (fsp->f_mntfromname);
++ me->me_mountdir = g_strdup (fsp->f_mntonname);
++ me->me_type = g_strdup (fsp->f_fstypename);
++ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
++ me->me_next = NULL;
++
++ /* Add to the linked list. */
++ mtail->me_next = me;
++ mtail = me;
++ fsp++;
++ }
++ }
++
++ /* Free the dummy head. */
++ me = mount_list;
++ mount_list = mount_list->me_next;
++ g_free (me);
++ return mount_list;
++}
++
++static gboolean ignore_mount_entry(const struct mount_entry *me)
++{
++ /* keep sorted */
++ static const char ignored[][17] = {
++ "autofs",
++ "devfs",
++ "fusectl",
++ "linprocfs",
++ "linsysfs",
++ "mfs",
++ "none",
++ "nfs",
++ "nullfs",
++ "nwfs",
++ "portalfs",
++ "proc",
++ "procfs",
++ "smbfs",
++ "tmpfs",
++ "unionfs",
++ "unknown"
++ };
++
++ typedef int (*Comparator)(const void*, const void*);
++
++ return bsearch(me->me_type,
++ ignored, G_N_ELEMENTS(ignored), sizeof ignored[0],
++ (Comparator) strcmp) != NULL;
++}
++
++
++glibtop_mountentry *
++glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
++{
++ struct mount_entry *entries, *cur, *next;
++
++ GArray *mount_array = g_array_new(FALSE, FALSE,
++ sizeof(glibtop_mountentry));
++
++ glibtop_init_r (&server, 0, 0);
++
++ memset (buf, 0, sizeof (glibtop_mountlist));
++
++ /* Read filesystem list. */
++
++ if((entries = read_filesystem_list ()) == NULL)
++ return NULL;
++
++ for (cur = &entries[0]; cur != NULL; cur = next) {
++
++ if(all_fs || !ignore_mount_entry(cur)) {
++ /* add a new glibtop_mountentry */
++ glibtop_mountentry e;
++
++ g_strlcpy(e.devname, cur->me_devname, sizeof e.devname);
++ g_strlcpy(e.mountdir, cur->me_mountdir, sizeof e.mountdir);
++ g_strlcpy(e.type, cur->me_type, sizeof e.type);
++ e.dev = cur->me_dev;
++
++ g_array_append_val(mount_array, e);
++ }
++
++ /* free current mount_entry and move to the next */
++ next = cur->me_next;
++ g_free(cur->me_devname);
++ g_free(cur->me_mountdir);
++ g_free(cur->me_type);
++ g_free(cur);
++ }
++
++ buf->size = sizeof (glibtop_mountentry);
++ buf->number = mount_array->len;
++ buf->total = buf->number * buf->size;
++
++ buf->flags = (1 << GLIBTOP_MOUNTLIST_SIZE)
++ | (1 << GLIBTOP_MOUNTLIST_NUMBER)
++ | (1 << GLIBTOP_MOUNTLIST_TOTAL);
++
++ return (glibtop_mountentry*) g_array_free(mount_array, FALSE);
++}
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
new file mode 100644
index 000000000000..93e596dcf5fb
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
@@ -0,0 +1,186 @@
+--- sysdeps/freebsd/procopenfiles.c.orig 2007-07-01 09:14:23.000000000 -0400
++++ sysdeps/freebsd/procopenfiles.c 2008-02-10 02:45:20.000000000 -0500
+@@ -28,6 +28,13 @@
+ #include <glibtop/error.h>
+ #include <glibtop/procopenfiles.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/un.h>
++#include <sys/user.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <string.h>
+ #include <stdlib.h>
+
+@@ -46,6 +53,63 @@ _glibtop_init_proc_open_files_s (glibtop
+ server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files;
+ }
+
++#if __FreeBSD_version > 800018
++static char *
++addr_to_string(struct sockaddr_storage *ss)
++{
++ char *buffer;
++ char buffer2[INET6_ADDRSTRLEN];
++ struct sockaddr_in6 *sin6;
++ struct sockaddr_in *sin;
++ struct sockaddr_un *sun;
++
++ switch (ss->ss_family) {
++ case AF_LOCAL:
++ sun = (struct sockaddr_un *)ss;
++ if (strlen(sun->sun_path) == 0)
++ buffer = g_strdup("-");
++ else
++ buffer = g_strdup(sun->sun_path);
++ break;
++ case AF_INET:
++ sin = (struct sockaddr_in *)ss;
++ buffer = g_strdup(inet_ntoa(sin->sin_addr));
++ break;
++ case AF_INET6:
++ sin6 = (struct sockaddr_in6 *)ss;
++ if (inet_ntop(AF_INET6, &sin6->sin6_addr, buffer2,
++ sizeof(buffer2)) != NULL)
++ buffer = g_strdup(buffer2);
++ else
++ buffer = g_strdup("-");
++ break;
++ }
++
++ return buffer;
++}
++
++static int
++addr_to_port(struct sockaddr_storage *ss)
++{
++ int port;
++ struct sockaddr_in6 *sin6;
++ struct sockaddr_in *sin;
++
++ switch (ss->ss_family) {
++ case AF_INET:
++ sin = (struct sockaddr_in *)ss;
++ port = ntohs(sin->sin_port);
++ break;
++ case AF_INET6:
++ sin6 = (struct sockaddr_in6 *)ss;
++ port = ntohs(sin6->sin6_port);
++ break;
++ }
++
++ return port;
++}
++#else
++
+ static GArray *
+ parse_output(const char *output) {
+ GArray *entries;
+@@ -159,21 +223,105 @@ parse_output(const char *output) {
+
+ return entries;
+ }
++#endif
+
+ glibtop_open_files_entry *
+ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid)
+ {
++#if __FreeBSD_version > 800018
++ struct kinfo_file *freep, *kif;
++ int name[4];
++ size_t len;
++ int i;
++#else
+ char *output;
++#endif
+ GArray *entries;
+
+ memset(buf, 0, sizeof (glibtop_proc_open_files));
+
++#if __FreeBSD_version > 800018
++ name[0] = CTL_KERN;
++ name[1] = KERN_PROC;
++ name[2] = KERN_PROC_FILEDESC;
++ name[3] = pid;
++
++ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0)
++ return NULL;
++
++ freep = kif = g_malloc(len);
++ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) {
++ g_free(freep);
++ return NULL;
++ }
++
++ entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));
++
++ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
++ glibtop_open_files_entry entry = {0};
++
++ if (kif->kf_fd < 0)
++ continue;
++
++ if (kif->kf_type == KF_TYPE_SOCKET) {
++ if (kif->kf_sock_domain == AF_LOCAL) {
++ struct sockaddr_un *sun;
++
++ entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET;
++ sun = (struct sockaddr_un *)&kif->kf_sa_local;
++
++ if (sun->sun_path[0]) {
++ char *addrstr;
++
++ addrstr = addr_to_string(&kif->kf_sa_local);
++ g_strlcpy(entry.info.localsock.name,
++ addrstr,
++ sizeof(entry.info.localsock.name));
++ g_free(addrstr);
++ } else {
++ char *addrstr;
++
++ addrstr = addr_to_string(&kif->kf_sa_peer);
++ g_strlcpy(entry.info.localsock.name,
++ addrstr,
++ sizeof(entry.info.localsock.name));
++ g_free(addrstr);
++ }
++ } else if (kif->kf_sock_domain == AF_INET ||
++ kif->kf_sock_domain == AF_INET6) {
++ char *addrstr;
++
++ entry.type = GLIBTOP_FILE_TYPE_INETSOCKET;
++ addrstr = addr_to_string(&kif->kf_sa_peer);
++ g_strlcpy(entry.info.sock.dest_host,
++ addrstr,
++ sizeof(entry.info.sock.dest_host));
++ g_free(addrstr);
++ entry.info.sock.dest_port = addr_to_port(&kif->kf_sa_peer);
++ }
++ } else if (kif->kf_type == KF_TYPE_PIPE) {
++ entry.type = GLIBTOP_FILE_TYPE_PIPE;
++ } else if (kif->kf_type == KF_TYPE_VNODE) {
++ entry.type = GLIBTOP_FILE_TYPE_FILE;
++ g_strlcpy(entry.info.file.name, kif->kf_path,
++ sizeof(entry.info.file.name));
++ } else
++ continue;
++
++ entry.fd = kif->kf_fd;
++
++ g_array_append_val(entries, entry);
++ }
++ g_free(freep);
++#else
++
+ output = execute_lsof(pid);
+ if (output == NULL) return NULL;
+
+ entries = parse_output(output);
+
+ g_free(output);
++#endif
+
+ buf->flags = _glibtop_sysdeps_proc_open_files;
+ buf->number = entries->len;
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
new file mode 100644
index 000000000000..08a58359e584
--- /dev/null
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
@@ -0,0 +1,94 @@
+--- sysdeps/freebsd/procwd.c.orig 2008-02-09 12:46:32.000000000 -0500
++++ sysdeps/freebsd/procwd.c 2008-02-09 12:48:24.000000000 -0500
+@@ -24,7 +24,9 @@
+ #include <glibtop_private.h>
+
+ #include <sys/types.h>
++#include <sys/sysctl.h>
+ #include <sys/param.h>
++#include <sys/user.h>
+ #include <string.h>
+
+ static const unsigned long _glibtop_sysdeps_proc_wd =
+@@ -38,6 +40,7 @@ _glibtop_init_proc_wd_s(glibtop *server)
+ server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
+ }
+
++#if __FreeBSD_version < 800019
+ static GPtrArray *
+ parse_output(const char *output, glibtop_proc_wd *buf)
+ {
+@@ -89,12 +92,21 @@ parse_output(const char *output, glibtop
+
+ return dirs;
+ }
++#endif
+
+ char**
+ glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
+ {
+ char path[MAXPATHLEN];
++#if __FreeBSD_version > 800018
++ struct kinfo_file *freep, *kif;
++ GPtrArray *dirs;
++ size_t len;
++ int i;
++ int name[4];
++#else
+ char *output;
++#endif
+
+ memset (buf, 0, sizeof (glibtop_proc_wd));
+
+@@ -102,6 +114,43 @@ glibtop_get_proc_wd_s(glibtop *server, g
+ if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
+ buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
+
++#if __FreeBSD_version > 800018
++ name[0] = CTL_KERN;
++ name[1] = KERN_PROC;
++ name[2] = KERN_PROC_FILEDESC;
++ name[3] = pid;
++
++ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0)
++ return NULL;
++ freep = kif = g_malloc(len);
++ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) {
++ g_free(freep);
++ return NULL;
++ }
++
++ dirs = g_ptr_array_sized_new(1);
++
++ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
++ switch (kif->kf_fd) {
++ case KF_FD_TYPE_ROOT:
++ g_strlcpy(buf->root, kif->kf_path,
++ sizeof(buf->root));
++ buf->flags |= (1 << GLIBTOP_PROC_WD_ROOT);
++ break;
++ case KF_FD_TYPE_CWD:
++ g_ptr_array_add(dirs, g_strdup (kif->kf_path));
++ break;
++ }
++ }
++ g_free(freep);
++
++ buf->number = dirs->len;
++ buf->flags |= (1 << GLIBTOP_PROC_WD_NUMBER);
++
++ g_ptr_array_add(dirs, NULL);
++
++ return (char **)g_ptr_array_free(dirs, FALSE);
++#else
+ output = execute_lsof(pid);
+ if (output != NULL) {
+ GPtrArray *dirs;
+@@ -116,6 +165,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
+
+ return (char **)g_ptr_array_free(dirs, FALSE);
+ }
++#endif
+
+ return NULL;
+ }
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 88f66a24bd55..91e8d83abe47 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -139,6 +139,7 @@ share/locale/mi/LC_MESSAGES/libgtop-2.0.mo
share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
share/locale/mn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/mr/LC_MESSAGES/libgtop-2.0.mo
share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
@@ -182,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.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/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile
index 265d4eccfedc..a4141c397703 100644
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@@ -3,20 +3,19 @@
# Whom: ijliao
#
# $FreeBSD$
+# $MCom: ports/devel/liboil/Makefile,v 1.7 2008/03/23 06:57:57 marcus Exp $
# $Id: Makefile 23 2006-10-25 14:24:32Z buhnux $
PORTNAME= liboil
-PORTVERSION= 0.3.12
+PORTVERSION= 0.3.14
CATEGORIES= devel
-MASTER_SITES= http://liboil.freedesktop.org/download/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ahze
+MASTER_SITES= http://liboil.freedesktop.org/download/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Library of optimized inner loops
-USE_GNOME= pkgconfig gnomehack gnometarget
-GNU_CONFIGURE= yes
+USE_GNOME= pkgconfig gnomehack gnometarget ltverhack
+USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--disable-glib
diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo
index 284e75511acf..372e8aa25773 100644
--- a/devel/liboil/distinfo
+++ b/devel/liboil/distinfo
@@ -1,3 +1,3 @@
-MD5 (liboil-0.3.12.tar.gz) = 96ee4c627ffb0db3999cef3c7454b1d9
-SHA256 (liboil-0.3.12.tar.gz) = 9be2cdd17214935b0dd2bac1508c9db1df88c60bba91652f0a2944aa93a7b53d
-SIZE (liboil-0.3.12.tar.gz) = 810532
+MD5 (liboil-0.3.14.tar.gz) = 7a9f719e50656b795c06c0167012a84f
+SHA256 (liboil-0.3.14.tar.gz) = a40c09db6ee24e03aa81f58329a57e45e55462a2e0f619b3796d4bf942c23f2f
+SIZE (liboil-0.3.14.tar.gz) = 819559
diff --git a/devel/liboil/pkg-plist b/devel/liboil/pkg-plist
index 57057fa781fd..bbf34358c86c 100644
--- a/devel/liboil/pkg-plist
+++ b/devel/liboil/pkg-plist
@@ -4,6 +4,7 @@ include/liboil-0.3/liboil/liboil.h
include/liboil-0.3/liboil/liboilclasses.h
include/liboil-0.3/liboil/liboilcpu.h
include/liboil-0.3/liboil/liboildebug.h
+include/liboil-0.3/liboil/liboilfault.h
include/liboil-0.3/liboil/liboilfuncs.h
include/liboil-0.3/liboil/liboilfunction.h
include/liboil-0.3/liboil/liboilgcc.h
@@ -14,10 +15,11 @@ include/liboil-0.3/liboil/liboilprototype.h
include/liboil-0.3/liboil/liboilrandom.h
include/liboil-0.3/liboil/liboiltest.h
include/liboil-0.3/liboil/liboiltypes.h
+include/liboil-0.3/liboil/liboilutils.h
lib/liboil-0.3.a
lib/liboil-0.3.la
lib/liboil-0.3.so
-lib/liboil-0.3.so.1
+lib/liboil-0.3.so.0
libdata/pkgconfig/liboil-0.3.pc
share/gtk-doc/html/liboil/ch01.html
share/gtk-doc/html/liboil/ch02.html
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index b9f987d7cd72..836643c0a7cb 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,20 +3,21 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/liboobs/Makefile,v 1.23 2007/09/16 16:45:35 ahze Exp $
+# $MCom: ports/devel/liboobs/Makefile,v 1.35 2008/03/09 18:52:59 mezz Exp $
#
PORTNAME= liboobs
-PORTVERSION= 2.20.0
+PORTVERSION= 2.22.0
CATEGORIES= devel 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= Wrapping library to the System Tools Backends
BUILD_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends
-LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ hal.1:${PORTSDIR}/sysutils/hal
RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends
USE_BZIP2= yes
@@ -24,5 +25,6 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
.include <bsd.port.mk>
diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo
index de4bba60f2af..b1099f55b21a 100644
--- a/devel/liboobs/distinfo
+++ b/devel/liboobs/distinfo
@@ -1,3 +1,3 @@
-MD5 (liboobs-2.20.0.tar.bz2) = c0562e115af4777da471182b9d462b40
-SHA256 (liboobs-2.20.0.tar.bz2) = 45a3cd562ac6d0002dc5c5972e1b4ec7fe611fe7ed9d0d8da9dbaaffd1c04623
-SIZE (liboobs-2.20.0.tar.bz2) = 331456
+MD5 (gnome2/liboobs-2.22.0.tar.bz2) = 1b090ecd6c0df58b131795ff9a5c9057
+SHA256 (gnome2/liboobs-2.22.0.tar.bz2) = b35760855d7d1def532e9e808cecde29b75cec455b238590072abf4a8206536e
+SIZE (gnome2/liboobs-2.22.0.tar.bz2) = 340348
diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c
index e571a363fdb0..484b86f32e64 100644
--- a/devel/liboobs/files/patch-src_oobs-user.c
+++ b/devel/liboobs/files/patch-src_oobs-user.c
@@ -1,6 +1,6 @@
---- oobs/oobs-user.c.orig Fri Sep 15 19:16:41 2006
-+++ oobs/oobs-user.c Tue Oct 31 23:12:29 2006
-@@ -18,6 +18,10 @@
+--- oobs/oobs-user.c.orig 2007-10-30 09:16:53.406333206 -0400
++++ oobs/oobs-user.c 2007-10-30 09:40:02.560797530 -0400
+@@ -18,12 +18,18 @@
* Authors: Carlos Garnacho Parro <carlosg@gnome.org>
*/
@@ -11,13 +11,25 @@
#include <glib-object.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -30,7 +34,9 @@
- #include "oobs-group.h"
- #include "oobs-defines.h"
- #include "utils.h"
+ #include <stdlib.h>
+ #include <string.h>
+#ifdef HAVE_CRYPT_H
#include <crypt.h>
+#endif
+ #include <utmp.h>
- #define OOBS_USER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_USER, OobsUserPrivate))
+ #include "oobs-usersconfig.h"
+@@ -852,6 +858,7 @@
+ login = oobs_user_get_login_name (user);
+
++#if 0 /* FreeBSD does not have ut_type in utmp */
+ while (!match && (entry = getutent ()) != NULL)
+ {
+ match = (entry->ut_type == USER_PROCESS &&
+@@ -862,4 +869,5 @@
+ endutent ();
+
+ return match;
++#endif
+ }
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
index a36b53d54b73..f6cb6c5e0d11 100644
--- a/devel/liboobs/pkg-plist
+++ b/devel/liboobs/pkg-plist
@@ -3,9 +3,8 @@ include/liboobs-1.0/oobs/oobs-groupsconfig.h
include/liboobs-1.0/oobs/oobs-hostsconfig.h
include/liboobs-1.0/oobs/oobs-iface-ethernet.h
include/liboobs-1.0/oobs/oobs-iface-irlan.h
-include/liboobs-1.0/oobs/oobs-iface-isdn.h
-include/liboobs-1.0/oobs/oobs-iface-modem.h
include/liboobs-1.0/oobs/oobs-iface-plip.h
+include/liboobs-1.0/oobs/oobs-iface-ppp.h
include/liboobs-1.0/oobs/oobs-iface-wireless.h
include/liboobs-1.0/oobs/oobs-iface.h
include/liboobs-1.0/oobs/oobs-ifacesconfig.h
@@ -15,6 +14,7 @@ include/liboobs-1.0/oobs/oobs-ntpconfig.h
include/liboobs-1.0/oobs/oobs-ntpserver.h
include/liboobs-1.0/oobs/oobs-object.h
include/liboobs-1.0/oobs/oobs-result.h
+include/liboobs-1.0/oobs/oobs-selfconfig.h
include/liboobs-1.0/oobs/oobs-service.h
include/liboobs-1.0/oobs/oobs-servicesconfig.h
include/liboobs-1.0/oobs/oobs-session.h
@@ -30,15 +30,13 @@ include/liboobs-1.0/oobs/oobs.h
lib/liboobs-1.a
lib/liboobs-1.la
lib/liboobs-1.so
-lib/liboobs-1.so.3
+lib/liboobs-1.so.4
libdata/pkgconfig/liboobs-1.pc
%%DOCSDIR%%/OobsGroup.html
%%DOCSDIR%%/OobsGroupsConfig.html
%%DOCSDIR%%/OobsIface.html
%%DOCSDIR%%/OobsIfaceEthernet.html
%%DOCSDIR%%/OobsIfaceIRLan.html
-%%DOCSDIR%%/OobsIfaceISDN.html
-%%DOCSDIR%%/OobsIfaceModem.html
%%DOCSDIR%%/OobsIfacePlip.html
%%DOCSDIR%%/OobsIfaceWireless.html
%%DOCSDIR%%/OobsIfacesConfig.html
@@ -70,6 +68,8 @@ libdata/pkgconfig/liboobs-1.pc
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
%%DOCSDIR%%/liboobs-OobsHostsConfig.html
+%%DOCSDIR%%/liboobs-OobsIfaceISDN.html
+%%DOCSDIR%%/liboobs-OobsIfaceModem.html
%%DOCSDIR%%/liboobs-OobsNTPServer.html
%%DOCSDIR%%/liboobs.devhelp
%%DOCSDIR%%/liboobs.devhelp2
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 997aa2669928..79b894f2775f 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -3,10 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/libsigc++20/Makefile,v 1.11 2008/03/10 15:08:22 ahze Exp $
#
PORTNAME= libsigc++
-PORTVERSION= 2.0.18
+PORTVERSION= 2.2.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libsigc++/${PORTVERSION:R}
diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo
index ee29f9fbd980..a5ee58a513b6 100644
--- a/devel/libsigc++20/distinfo
+++ b/devel/libsigc++20/distinfo
@@ -1,3 +1,3 @@
-MD5 (libsigc++-2.0.18.tar.bz2) = ddebf5aafc8525d10366a8724abc9f28
-SHA256 (libsigc++-2.0.18.tar.bz2) = 53e7d030b73815a31781c26acb42f7880df3e786ed46a8fe3cde08a4c21ecceb
-SIZE (libsigc++-2.0.18.tar.bz2) = 1842485
+MD5 (libsigc++-2.2.2.tar.bz2) = 962493fd6b26425f21504c3416c4efa1
+SHA256 (libsigc++-2.2.2.tar.bz2) = 3df7d2750fd579d0776130eb4cf117c4a584677123d1447c0758a0f0a750e2a2
+SIZE (libsigc++-2.2.2.tar.bz2) = 4502360
diff --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist
index f18cfb743999..da2d43c97d77 100644
--- a/devel/libsigc++20/pkg-plist
+++ b/devel/libsigc++20/pkg-plist
@@ -31,7 +31,6 @@ include/sigc++-%%API_VERSION%%/sigc++/adaptors/retype_return.h
include/sigc++-%%API_VERSION%%/sigc++/bind.h
include/sigc++-%%API_VERSION%%/sigc++/bind_return.h
include/sigc++-%%API_VERSION%%/sigc++/class_slot.h
-include/sigc++-%%API_VERSION%%/sigc++/compatibility.h
include/sigc++-%%API_VERSION%%/sigc++/connection.h
include/sigc++-%%API_VERSION%%/sigc++/functors/functor_trait.h
include/sigc++-%%API_VERSION%%/sigc++/functors/functors.h
@@ -88,59 +87,10 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/bind_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/bind__return_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/bound__argument_8h.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal0-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal0.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal0__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal1-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal1.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal1__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal2-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal2.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal2__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal3-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal3.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal3__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal4-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal4.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal4__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal5-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal5.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal5__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal6-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal6.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal6__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal7-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal7.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal7__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot0-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot0.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot0__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot1-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot1.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot1__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot2-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot2.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot2__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot3-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot3.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot3__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot4-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot4.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot4__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot5-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot5.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot5__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot6-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot6.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot6__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot7-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot7.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/class__slot_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classes.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classinternal_1_1lambda__core.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classinternal_1_1lambda__core__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classnil.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1bound__argument-members.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1bound__argument.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4-members.html
@@ -439,11 +389,9 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1volatile__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1volatile__mem__functor7.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1volatile__mem__functor7__inherit__graph.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/compatibility_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/compose_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/connection_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/deduce__result__type_8h.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/deprecated.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/doxygen.css
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/doxygen.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/exception__catch_8h.html
@@ -504,26 +452,40 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_type_0x74.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_type_0x76.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x61.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x62.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x63.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x64.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x65.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x66.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x67.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x69.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x6c.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x6f.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x70.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x72.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x73.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x74.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x76.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functor__trait_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functors_2slot_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functors_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x62.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x63.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x64.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x65.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x66.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x67.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x68.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x6d.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x6f.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x70.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x72.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x73.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x75.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x76.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_defs.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x63.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x64.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x65.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x67.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x68.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x6d.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x6f.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x70.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x72.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x73.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x75.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x76.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_type.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_vars.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/graph_legend.dot
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/graph_legend.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/graph_legend.png
@@ -532,7 +494,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__adaptors.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__bind.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__bind.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__compat.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__compose.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__compose.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__exception__catch.html
@@ -740,7 +701,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__260.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__261.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__262.png
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__263.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__27.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__28.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__29.png
@@ -827,7 +787,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/mem__fun_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/method__slot_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/modules.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespaceSigC.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespacemembers.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespacemembers_0x62.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespacemembers_0x63.html
@@ -864,7 +823,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/object_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/object__slot_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/operator_8h.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/pages.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/ptr__fun_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/reference__wrapper_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/retype_8h.html
@@ -875,11 +833,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/signal__base_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/slot_8h.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/slot__base_8h.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor_1_1deduce__result__type-members.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor_1_1deduce__result__type.html
-%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1adaptor__base.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1adaptor__base__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1adaptor__functor-members.html
@@ -1114,6 +1067,10 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__rep-members.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__rep.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__rep__inherit__graph.png
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf-members.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf_3_01T__emitter_00_01void_01_4-members.html
+%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf_3_01T__emitter_00_01void_01_4.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1temp__slot__list-members.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1temp__slot__list.html
%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1trackable__callback-members.html
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 3456c3df1567..49c233f002d2 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/libsoup/Makefile,v 1.7 2007/12/01 19:19:55 marcus Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.42 2008/03/10 21:18:42 mezz Exp $
#
PORTNAME= libsoup
-PORTVERSION= 2.2.105
-PORTREVISION?= 1
+PORTVERSION= 2.4.0
+PORTREVISION?= 0
CATEGORIES= devel 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
@@ -32,7 +31,7 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB= VERSION="2.2"
+PLIST_SUB= VERSION="2.4"
.if !defined(WITHOUT_SSL)
LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index c808f4cd3ca0..379868111b5d 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libsoup-2.2.105.tar.bz2) = 7fa48b06a0e2b0ff3d2fa45cf331f169
-SHA256 (gnome2/libsoup-2.2.105.tar.bz2) = 3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f
-SIZE (gnome2/libsoup-2.2.105.tar.bz2) = 505095
+MD5 (gnome2/libsoup-2.4.0.tar.bz2) = 16d325a14ee4da61f72fb21cd3ffa439
+SHA256 (gnome2/libsoup-2.4.0.tar.bz2) = 400104f0ad7b805ba534295ed17e6426a8ce41eb425dc2b0a56a2b75665c065a
+SIZE (gnome2/libsoup-2.4.0.tar.bz2) = 615898
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index 24f7140d1e00..915831c2d51f 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -1,32 +1,34 @@
include/libsoup-%%VERSION%%/libsoup/soup-address.h
-include/libsoup-%%VERSION%%/libsoup/soup-connection.h
+include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-basic.h
+include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-digest.h
+include/libsoup-%%VERSION%%/libsoup/soup-auth-domain.h
+include/libsoup-%%VERSION%%/libsoup/soup-auth.h
include/libsoup-%%VERSION%%/libsoup/soup-date.h
+include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h
+include/libsoup-%%VERSION%%/libsoup/soup-form.h
include/libsoup-%%VERSION%%/libsoup/soup-headers.h
-include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h
-include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h
+include/libsoup-%%VERSION%%/libsoup/soup-logger.h
+include/libsoup-%%VERSION%%/libsoup/soup-message-body.h
+include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h
include/libsoup-%%VERSION%%/libsoup/soup-message.h
include/libsoup-%%VERSION%%/libsoup/soup-method.h
include/libsoup-%%VERSION%%/libsoup/soup-misc.h
include/libsoup-%%VERSION%%/libsoup/soup-portability.h
-include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h
-include/libsoup-%%VERSION%%/libsoup/soup-server-message.h
include/libsoup-%%VERSION%%/libsoup/soup-server.h
include/libsoup-%%VERSION%%/libsoup/soup-session-async.h
include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h
include/libsoup-%%VERSION%%/libsoup/soup-session.h
-include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h
include/libsoup-%%VERSION%%/libsoup/soup-socket.h
include/libsoup-%%VERSION%%/libsoup/soup-status.h
include/libsoup-%%VERSION%%/libsoup/soup-types.h
include/libsoup-%%VERSION%%/libsoup/soup-uri.h
-include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-response.h
+include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
+include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h
include/libsoup-%%VERSION%%/libsoup/soup.h
lib/libsoup-%%VERSION%%.a
lib/libsoup-%%VERSION%%.la
lib/libsoup-%%VERSION%%.so
-lib/libsoup-%%VERSION%%.so.8
+lib/libsoup-%%VERSION%%.so.1
libdata/pkgconfig/libsoup-%%VERSION%%.pc
@dirrm include/libsoup-%%VERSION%%/libsoup
@dirrm include/libsoup-%%VERSION%%
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 3456c3df1567..f6385a655c34 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/libsoup/Makefile,v 1.7 2007/12/01 19:19:55 marcus Exp $
+# $MCom: ports/devel/libsoup22/Makefile,v 1.40 2008/03/04 20:28:19 mezz Exp $
#
PORTNAME= libsoup
PORTVERSION= 2.2.105
-PORTREVISION?= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,12 +17,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A SOAP (Simple Object Access Protocol) implementation in C
-USE_BZIP2= yes
-
-.if !defined(REFERENCE_PORT)
-
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+NO_LATEST_LINK= yes
+
+USE_BZIP2= yes
USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
@@ -49,5 +48,3 @@ pre-everything::
@${ECHO_MSG} ""
.include <bsd.port.post.mk>
-
-.endif
diff --git a/devel/libvolume_id/Makefile b/devel/libvolume_id/Makefile
index 0658217f5806..06487905df37 100644
--- a/devel/libvolume_id/Makefile
+++ b/devel/libvolume_id/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= libvolume_id
-PORTVERSION= 0.75.0
-PORTREVISION= 1
+PORTVERSION= 0.81.0
CATEGORIES= devel
MASTER_SITES= http://www.marcuscom.com/downloads/
diff --git a/devel/libvolume_id/distinfo b/devel/libvolume_id/distinfo
index 9cf44d0fe7b8..c7035610c20f 100644
--- a/devel/libvolume_id/distinfo
+++ b/devel/libvolume_id/distinfo
@@ -1,3 +1,3 @@
-MD5 (libvolume_id-0.75.0.tar.bz2) = 804d222ea29b9401fb4a6ba00a22b072
-SHA256 (libvolume_id-0.75.0.tar.bz2) = 54072554468f732e60dae024947efaa880cf7847df2651b6dfcc16f2a58832d8
-SIZE (libvolume_id-0.75.0.tar.bz2) = 19408
+MD5 (libvolume_id-0.81.0.tar.bz2) = d5a66bb607e9811f28d40ee3ac8580e0
+SHA256 (libvolume_id-0.81.0.tar.bz2) = 2f6b685893a15d2d4d578bd41692e3091dcfcf88973a23bb0c6b02b266b8f5b6
+SIZE (libvolume_id-0.81.0.tar.bz2) = 23274
diff --git a/devel/libvolume_id/files/patch-fat.c b/devel/libvolume_id/files/patch-fat.c
deleted file mode 100644
index 2780d613c9de..000000000000
--- a/devel/libvolume_id/files/patch-fat.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- fat.c.orig Wed May 30 16:16:49 2007
-+++ fat.c Wed May 30 16:17:12 2007
-@@ -277,7 +277,7 @@ magic:
-
- label = get_attr_volume_id(dir, root_dir_entries);
-
-- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
-+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
- if (vs == NULL)
- return -1;
-
-@@ -294,7 +294,7 @@ magic:
- fat32:
- /* FAT32 should have a valid signature in the fsinfo block */
- fsinfo_sect = le16_to_cpu(vs->type.fat32.fsinfo_sector);
-- buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), 0x200);
-+ buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), sector_size);
- if (buf == NULL)
- return -1;
- fsinfo = (struct fat32_fsinfo *) buf;
-@@ -303,7 +303,7 @@ fat32:
- if (memcmp(fsinfo->signature2, "\x72\x72\x41\x61", 4) != 0)
- err("Found invalid signature2: 0x%08x", fsinfo->signature2);
-
-- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
-+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
- if (vs == NULL)
- return -1;
-
-@@ -355,7 +355,7 @@ fat32:
- if (maxloop == 0)
- dbg("reached maximum follow count of root cluster chain, give up");
-
-- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
-+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
- if (vs == NULL)
- return -1;
-
diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile
new file mode 100644
index 000000000000..ed33c09edfdf
--- /dev/null
+++ b/devel/ndesk-dbus-glib/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for: ndesk-dbus-glib
+# Date created: 14 January 2008
+# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/ndesk-dbus-glib/Makefile,v 1.2 2008/01/14 22:35:41 mezz Exp $
+#
+
+PORTNAME= ndesk-dbus-glib
+PORTVERSION= 0.4.1
+CATEGORIES= devel
+MASTER_SITES= http://www.ndesk.org/archive/ndesk-dbus/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GLib main loop integration for Managed D-Bus
+
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
+
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget
+GNU_CONFIGURE= yes
+
+DOCS= AUTHORS COPYING README
+
+.ifndef (NOPORTDOCS)
+post-install:
+ @${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
+.include <bsd.port.mk>
diff --git a/devel/ndesk-dbus-glib/distinfo b/devel/ndesk-dbus-glib/distinfo
new file mode 100644
index 000000000000..5846a183a5be
--- /dev/null
+++ b/devel/ndesk-dbus-glib/distinfo
@@ -0,0 +1,3 @@
+MD5 (ndesk-dbus-glib-0.4.1.tar.gz) = 7faf8770b214956fa9de009def550826
+SHA256 (ndesk-dbus-glib-0.4.1.tar.gz) = 0a6d5fe7be55b6301615d71b89507b712f287b4ba498b798301333ffabe06769
+SIZE (ndesk-dbus-glib-0.4.1.tar.gz) = 85471
diff --git a/devel/ndesk-dbus-glib/pkg-descr b/devel/ndesk-dbus-glib/pkg-descr
new file mode 100644
index 000000000000..f2e74523916c
--- /dev/null
+++ b/devel/ndesk-dbus-glib/pkg-descr
@@ -0,0 +1,3 @@
+This code provides GLib main loop integration for Managed D-Bus.
+
+WWW: http://www.ndesk.org/DBusSharp
diff --git a/devel/ndesk-dbus-glib/pkg-plist b/devel/ndesk-dbus-glib/pkg-plist
new file mode 100644
index 000000000000..f669faa767b3
--- /dev/null
+++ b/devel/ndesk-dbus-glib/pkg-plist
@@ -0,0 +1,12 @@
+lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.GLib.dll
+lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.GLib.dll.config
+lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.GLib.dll.mdb
+lib/mono/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll
+libdata/pkgconfig/ndesk-dbus-glib-1.0.pc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/mono/ndesk-dbus-glib-1.0
+@dirrm lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099
+@dirrm lib/mono/gac/NDesk.DBus.GLib
diff --git a/devel/ndesk-dbus/Makefile b/devel/ndesk-dbus/Makefile
new file mode 100644
index 000000000000..0b5b085c7466
--- /dev/null
+++ b/devel/ndesk-dbus/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for: ndesk-dbus
+# Date created: 14 January 2008
+# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/ndesk-dbus/Makefile,v 1.2 2008/01/14 22:35:41 mezz Exp $
+#
+
+PORTNAME= ndesk-dbus
+PORTVERSION= 0.6.0
+CATEGORIES= devel
+MASTER_SITES= http://www.ndesk.org/archive/ndesk-dbus/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A C\# implementation of D-Bus
+
+BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
+
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget
+GNU_CONFIGURE= yes
+
+DOCS= AUTHORS COPYING README
+
+.ifndef (NOPORTDOCS)
+post-install:
+ @${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
+.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
+.include <bsd.port.mk>
diff --git a/devel/ndesk-dbus/distinfo b/devel/ndesk-dbus/distinfo
new file mode 100644
index 000000000000..fe9c62ff8519
--- /dev/null
+++ b/devel/ndesk-dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (ndesk-dbus-0.6.0.tar.gz) = 5157ba105c9ac491f6e900bc78d1791f
+SHA256 (ndesk-dbus-0.6.0.tar.gz) = 252322f18e906ba7e64cecd0baec08d1a0109206777a5507a713e12def126424
+SIZE (ndesk-dbus-0.6.0.tar.gz) = 122303
diff --git a/devel/ndesk-dbus/pkg-descr b/devel/ndesk-dbus/pkg-descr
new file mode 100644
index 000000000000..dbc41441dacd
--- /dev/null
+++ b/devel/ndesk-dbus/pkg-descr
@@ -0,0 +1,8 @@
+This is a C# implementation of D-Bus. It's often referred to as "managed
+D-Bus" to avoid confusion with existing bindings (which wrap libdbus).
+
+D-Bus is an inter-process communication framework that lets applications
+interface with the system event bus as well as allowing them to talk to
+one another in a peer-to-peer configuration.
+
+WWW: http://www.ndesk.org/DBusSharp
diff --git a/devel/ndesk-dbus/pkg-plist b/devel/ndesk-dbus/pkg-plist
new file mode 100644
index 000000000000..43615a4a2abf
--- /dev/null
+++ b/devel/ndesk-dbus/pkg-plist
@@ -0,0 +1,11 @@
+lib/mono/gac/NDesk.DBus/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.dll
+lib/mono/gac/NDesk.DBus/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.dll.mdb
+lib/mono/ndesk-dbus-1.0/NDesk.DBus.dll
+libdata/pkgconfig/ndesk-dbus-1.0.pc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/mono/ndesk-dbus-1.0
+@dirrm lib/mono/gac/NDesk.DBus/1.0.0.0__f6716e4f9b2ed099
+@dirrm lib/mono/gac/NDesk.DBus
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index b3cff746a453..e883ac0d75cf 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/pkg-config/Makefile,v 1.9 2007/07/01 20:46:42 mezz Exp $
+# $MCom: ports/devel/pkg-config/Makefile,v 1.12 2008/02/04 19:22:00 mezz Exp $
#
PORTNAME= pkg-config
-PORTVERSION= 0.22
+PORTVERSION= 0.23
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://pkgconfig.freedesktop.org/releases/
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 9e0e9994a30e..459710f196c9 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pkg-config-0.22.tar.gz) = fd5c547e9d66ba49bc735ccb8c791f2a
-SHA256 (gnome2/pkg-config-0.22.tar.gz) = 7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6
-SIZE (gnome2/pkg-config-0.22.tar.gz) = 1006425
+MD5 (gnome2/pkg-config-0.23.tar.gz) = d922a88782b64441d06547632fd85744
+SHA256 (gnome2/pkg-config-0.23.tar.gz) = 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53
+SIZE (gnome2/pkg-config-0.23.tar.gz) = 1032839
diff --git a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in b/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in
index 330415ed6f92..0031087c84c1 100644
--- a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in
+++ b/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in
@@ -1,5 +1,5 @@
---- glib-1.2.8/Makefile.in.orig Tue Apr 12 13:51:56 2005
-+++ glib-1.2.8/Makefile.in Tue Apr 12 13:52:41 2005
+--- glib-1.2.10/Makefile.in.orig Tue Apr 12 13:51:56 2005
++++ glib-1.2.10/Makefile.in Tue Apr 12 13:52:41 2005
@@ -727,7 +727,6 @@
installdirs-am:
diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c
new file mode 100644
index 000000000000..48315feb9589
--- /dev/null
+++ b/devel/pkg-config/files/patch-pkg.c
@@ -0,0 +1,14 @@
+diff -Naur pkg-config-0.23-old/pkg.c pkg-config-0.23-new/pkg.c
+--- pkg-config-0.23-old/pkg.c 2008-01-16 13:59:49.000000000 -0800
++++ pkg.c 2008-01-22 15:00:55.000000000 -0800
+@@ -483,6 +483,10 @@
+ g_string_append (str, pcsysrootdir);
+ g_string_append (str, tmpstr+2);
+ }
++ else
++ {
++ g_string_append (str, tmpstr);
++ }
+ }
+ else
+ {
diff --git a/devel/pkg-config/files/patch-pkg_conflicts b/devel/pkg-config/files/patch-pkg_conflicts
deleted file mode 100644
index 471fd02b24bc..000000000000
--- a/devel/pkg-config/files/patch-pkg_conflicts
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up pkg-config-0.22/pkg.c.conflicts pkg-config-0.22/pkg.c
---- pkg.c.conflicts 2007-11-15 23:56:26.000000000 -0500
-+++ pkg.c 2007-11-15 23:57:26.000000000 -0500
-@@ -821,7 +821,7 @@ verify_package (Package *pkg)
- */
-
- recursive_fill_list (pkg, get_requires_private, &requires);
-- recursive_fill_list (pkg, get_conflicts, &conflicts);
-+ conflicts = get_conflicts (pkg);
-
- requires_iter = requires;
- while (requires_iter != NULL)
-@@ -843,7 +843,7 @@ verify_package (Package *pkg)
- req->version, req->name,
- ver->name,
- comparison_to_str (ver->comparison),
-- ver->version,
-+ ver->version ? ver->version : "(any)",
- ver->owner->name,
- ver->owner->version);
-
-@@ -857,7 +857,6 @@ verify_package (Package *pkg)
- }
-
- g_slist_free (requires);
-- g_slist_free (conflicts);
-
- /* We make a list of system directories that gcc expects so we can remove
- * them.