summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/anjuta/Makefile10
-rw-r--r--devel/anjuta/files/patch-plugins_glade_pluginc.c113
-rw-r--r--devel/anjuta/pkg-plist857
-rw-r--r--devel/bonobo-conf/Makefile2
-rw-r--r--devel/bonobo-conf/pkg-plist8
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in4
-rw-r--r--devel/bonobo/pkg-plist75
-rw-r--r--devel/bug-buddy/Makefile8
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc52
-rw-r--r--devel/bug-buddy/files/patch-src_bug-buddy.menu.in11
-rw-r--r--devel/bug-buddy/pkg-plist55
-rw-r--r--devel/desktop-file-utils/Makefile40
-rw-r--r--devel/desktop-file-utils/distinfo6
-rw-r--r--devel/devhelp/Makefile1
-rw-r--r--devel/devhelp/files/patch-src_dh-base.c2
-rw-r--r--devel/devhelp/pkg-plist25
-rw-r--r--devel/distcc/Makefile25
-rw-r--r--devel/distcc/distinfo3
-rw-r--r--devel/distcc/files/distccd.sh.in2
-rw-r--r--devel/doxygen/files/patch-fix_with_libiconv-1.1111
-rw-r--r--devel/gconf/Makefile4
-rw-r--r--devel/gconf/pkg-plist4
-rw-r--r--devel/gconf2/Makefile8
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/pkg-plist9
-rw-r--r--devel/gconfmm26/Makefile5
-rw-r--r--devel/gconfmm26/distinfo6
-rw-r--r--devel/glade2/Makefile7
-rw-r--r--devel/glade2/pkg-plist27
-rw-r--r--devel/glade3/Makefile23
-rw-r--r--devel/glade3/distinfo6
-rw-r--r--devel/glade3/pkg-plist590
-rw-r--r--devel/glib20/Makefile9
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/patch-ag8
-rw-r--r--devel/glib20/files/patch-glib_gregex.c13
-rw-r--r--devel/glib20/files/patch-glib_gutils.c2
-rw-r--r--devel/glib20/files/patch-gmodule::gmodule-dl.c4
-rw-r--r--devel/glib20/pkg-plist12
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/files/patch-glib_glibmm_date.cc17
-rw-r--r--devel/glibmm/files/patch-glib_glibmm_date.h20
-rw-r--r--devel/glibmm/pkg-plist4
-rw-r--r--devel/gnome-build/Makefile3
-rw-r--r--devel/gnome-build/pkg-plist22
-rw-r--r--devel/gnome-common/Makefile4
-rw-r--r--devel/gnome-common/distinfo6
-rw-r--r--devel/gnome-crash/Makefile2
-rw-r--r--devel/gnome-crash/files/patch-src::Makefile.in4
-rw-r--r--devel/gnome-crash/pkg-plist22
-rw-r--r--devel/gnome-vfs/Makefile7
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c11
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c2
-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-plist8
-rw-r--r--devel/gnome-vfs1/Makefile2
-rw-r--r--devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c11
-rw-r--r--devel/gnome-vfsmm/Makefile5
-rw-r--r--devel/gnome-vfsmm/distinfo6
-rw-r--r--devel/gnome2-hacker-tools/Makefile5
-rw-r--r--devel/goffice/Makefile3
-rw-r--r--devel/goffice/pkg-plist268
-rw-r--r--devel/goffice04/Makefile3
-rw-r--r--devel/goffice04/pkg-plist268
-rw-r--r--devel/goffice1/Makefile4
-rw-r--r--devel/goffice1/pkg-plist234
-rw-r--r--devel/gtranslator/Makefile3
-rw-r--r--devel/gtranslator/pkg-plist85
-rw-r--r--devel/guikachu/Makefile2
-rw-r--r--devel/guikachu/pkg-plist11
-rw-r--r--devel/libassetml/Makefile4
-rw-r--r--devel/libassetml/files/patch-configure11
-rw-r--r--devel/libassetml/pkg-plist4
-rw-r--r--devel/libbonobo/Makefile6
-rw-r--r--devel/libbonobo/distinfo6
-rw-r--r--devel/libbonobo/files/patch-server::Makefile.in2
-rw-r--r--devel/libbonobo/pkg-plist4
-rw-r--r--devel/libglade/Makefile2
-rw-r--r--devel/libglade/files/patch-ab2
-rw-r--r--devel/libgtop/Makefile5
-rw-r--r--devel/libgtop/distinfo6
-rw-r--r--devel/libgtop/pkg-plist9
-rw-r--r--devel/liboobs/Makefile6
-rw-r--r--devel/liboobs/distinfo6
-rw-r--r--devel/liboobs/files/patch-src_oobs-group.c4
-rw-r--r--devel/liboobs/files/patch-src_oobs-user.c4
-rw-r--r--devel/liboobs/pkg-plist50
-rw-r--r--devel/libunicode/Makefile9
-rw-r--r--devel/oaf/Makefile4
-rw-r--r--devel/oaf/files/patch-aa2
-rw-r--r--devel/oaf/files/patch-test_oaf-slay.in11
-rw-r--r--devel/oaf/pkg-plist8
-rw-r--r--devel/pharmacy/Makefile4
-rw-r--r--devel/pharmacy/pkg-plist2
-rw-r--r--devel/preps-gui/Makefile4
-rw-r--r--devel/preps-gui/pkg-plist10
-rw-r--r--devel/py-gobject/Makefile4
-rw-r--r--devel/py-gobject/distinfo6
-rw-r--r--devel/py-gobject/files/patch-docs_Makefile.in18
-rw-r--r--devel/py-gobject/pkg-plist6
-rw-r--r--devel/py-xdg/Makefile8
-rw-r--r--devel/py-xdg/files/patch-xdg::BaseDirectory.py2
-rw-r--r--devel/py-xdg/files/patch-xdg::IconTheme.py9
-rw-r--r--devel/regexxer/Makefile2
-rw-r--r--devel/regexxer/pkg-plist9
-rw-r--r--devel/ruby-glib2/Makefile2
-rw-r--r--devel/ruby-glib2/pkg-plist1
-rw-r--r--devel/wininfo/Makefile2
-rw-r--r--devel/wininfo/pkg-plist3
115 files changed, 1803 insertions, 1595 deletions
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 0fc7a77..28b5271 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,11 +3,12 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta-devel/Makefile,v 1.14 2006/09/10 00:51:07 mezz Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.13 2007/09/07 05:03:33 marcus Exp $
#
PORTNAME= anjuta
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= anjuta
@@ -20,7 +21,7 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \
neato:${PORTSDIR}/graphics/graphviz
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
gbf-1.1:${PORTSDIR}/devel/gnome-build \
- gladeui-1.5:${PORTSDIR}/devel/glade3 \
+ gladeui-1.7:${PORTSDIR}/devel/glade3 \
devhelp-1.0:${PORTSDIR}/devel/devhelp
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
autogen:${PORTSDIR}/devel/autogen \
@@ -66,13 +67,10 @@ PLIST_SUB+= SVN="@comment "
post-configure:
@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \
- s|/usr/local|${PREFIX}| ; \
- s|share/anjuta|share/gnome/anjuta|' \
+ s|/usr/local|${PREFIX}|' \
${WRKSRC}/global-tags/create_global_tags.sh
@${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/gnome|(prefix)/share/icons/gnome|g' \
- ${WRKSRC}/mime/Makefile.in
post-install:
.if !defined(NOPORTDOCS)
diff --git a/devel/anjuta/files/patch-plugins_glade_pluginc.c b/devel/anjuta/files/patch-plugins_glade_pluginc.c
new file mode 100644
index 0000000..569bafe
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_glade_pluginc.c
@@ -0,0 +1,113 @@
+--- plugins/glade/plugin.c 2007/06/20 02:18:37 3013
++++ plugins/glade/plugin.c 2007/07/07 13:25:08 3048
+@@ -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 @@
+ 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 @@
+ 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");
+@@ -459,7 +459,11 @@
+ }
+
+ #if (GLADEUI_VERSION >= 330)
+- if (glade_project_get_has_unsaved_changes (project))
++# if (GLADEUI_VERSION > 331)
++ if (glade_project_get_modified (project))
++# else
++ if (glade_project_get_has_unsaved_changes (project))
++# endif
+ #else
+ if (project->changed)
+ #endif
+@@ -502,14 +506,14 @@
+ {
+ 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);
+@@ -713,7 +717,7 @@
+ 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)
+ {
+@@ -796,7 +800,7 @@
+ 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 ();
+
+@@ -825,7 +829,7 @@
+ 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);
+@@ -862,7 +866,7 @@
+ 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 ()));
+@@ -884,7 +888,7 @@
+ "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"),
+@@ -935,7 +939,7 @@
+ 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 bcef95e..ecc2d18 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -286,246 +286,246 @@ 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/gnome/anjuta/AUTHORS
-share/gnome/anjuta/anjuta_project.template
-share/gnome/anjuta/build/automake-c.filters
-share/gnome/anjuta/class-templates/cc-header.tpl
-share/gnome/anjuta/class-templates/cc-source.tpl
-share/gnome/anjuta/class-templates/go-header.tpl
-share/gnome/anjuta/class-templates/go-source.tpl
-share/gnome/anjuta/gdb.init
-share/gnome/anjuta/glade/anjuta-build-basic-autotools-plugin.glade
-share/gnome/anjuta/glade/anjuta-class-gen-plugin.glade
-share/gnome/anjuta/glade/anjuta-cvs-plugin.glade
-share/gnome/anjuta/glade/anjuta-debug-manager.glade
-share/gnome/anjuta/glade/anjuta-document-manager.glade
-share/gnome/anjuta/glade/anjuta-file-manager-plugin.glade
-share/gnome/anjuta/glade/anjuta-file-wizard.glade
-share/gnome/anjuta/glade/anjuta-gdb.glade
-share/gnome/anjuta/glade/anjuta-language-cpp-java.glade
-share/gnome/anjuta/glade/anjuta-macro.glade
-share/gnome/anjuta/glade/anjuta-message-manager-plugin.glade
-share/gnome/anjuta/glade/anjuta-project-import.glade
-share/gnome/anjuta/glade/anjuta-project-wizard.glade
-share/gnome/anjuta/glade/anjuta-search.glade
-%%SVN%%share/gnome/anjuta/glade/anjuta-subversion.glade
-share/gnome/anjuta/glade/anjuta-symbol-browser-plugin.glade
-share/gnome/anjuta/glade/anjuta-terminal-plugin.glade
-share/gnome/anjuta/glade/anjuta-tools.glade
-share/gnome/anjuta/glade/anjuta.glade
-share/gnome/anjuta/glade/applogo.png
-share/gnome/anjuta/glade/appwizard.png
-share/gnome/anjuta/glade/editor.glade
-share/gnome/anjuta/glade/layout.glade
-share/gnome/anjuta/glade/patch-plugin.glade
-share/gnome/anjuta/glade/profiler-call-graph.glade
-share/gnome/anjuta/glade/profiler-flat-profile.glade
-share/gnome/anjuta/glade/profiler-function-call-tree.glade
-share/gnome/anjuta/glade/profiler.glade
-share/gnome/anjuta/glade/sourceview.glade
-share/gnome/anjuta/glade/start-with-import.png
-share/gnome/anjuta/glade/start-with-open.png
-share/gnome/anjuta/glade/start-with-wizard.png
-share/gnome/anjuta/gtodo/gtodo.css
-share/gnome/anjuta/gtodo/gtodo.xsl
-share/gnome/anjuta/indent_test.c
-share/gnome/anjuta/layout.xml
-share/gnome/anjuta/macros.xml
-share/gnome/anjuta/profiles/default.profile
-share/gnome/anjuta/project/anjuta-plugin-logo.png
-share/gnome/anjuta/project/anjuta-plugin.wiz
-share/gnome/anjuta/project/anjuta-plugin/configure.ac.tpl
-share/gnome/anjuta/project/anjuta-plugin/po/POTFILES.in
-share/gnome/anjuta/project/anjuta-plugin/src/Makefile.am.tpl
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.c
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.glade
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.h
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.plugin.in
-share/gnome/anjuta/project/anjuta-plugin/src/plugin.ui
-share/gnome/anjuta/project/appwiz_sdl.png
-share/gnome/anjuta/project/cpp-logo.png
-share/gnome/anjuta/project/cpp.wiz
-share/gnome/anjuta/project/cpp/configure.ac.tpl
-share/gnome/anjuta/project/cpp/po/POTFILES.in
-share/gnome/anjuta/project/cpp/src/Makefile.am.tpl
-share/gnome/anjuta/project/cpp/src/cvsignore
-share/gnome/anjuta/project/cpp/src/main.cc
-share/gnome/anjuta/project/django-logo.png
-share/gnome/anjuta/project/django.wiz
-share/gnome/anjuta/project/gcj-logo.png
-share/gnome/anjuta/project/gcj.wiz
-share/gnome/anjuta/project/gcj/configure.ac.tpl
-share/gnome/anjuta/project/gcj/src/Makefile.am.tpl
-share/gnome/anjuta/project/gnome-logo.png
-share/gnome/anjuta/project/gnome.wiz
-share/gnome/anjuta/project/gnome/po/POTFILES.in
-share/gnome/anjuta/project/gnome/src/Makefile.am.tpl
-share/gnome/anjuta/project/gnome/src/callbacks.c
-share/gnome/anjuta/project/gnome/src/callbacks.h
-share/gnome/anjuta/project/gnome/src/main.c
-share/gnome/anjuta/project/gnome/src/project.glade
-share/gnome/anjuta/project/gtk-logo.png
-share/gnome/anjuta/project/gtk.wiz
-share/gnome/anjuta/project/gtk/po/POTFILES.in
-share/gnome/anjuta/project/gtk/src/Makefile.am.tpl
-share/gnome/anjuta/project/gtk/src/callbacks.c
-share/gnome/anjuta/project/gtk/src/callbacks.h
-share/gnome/anjuta/project/gtk/src/main.c
-share/gnome/anjuta/project/gtk/src/project.glade
-share/gnome/anjuta/project/gtkmm-logo.png
-share/gnome/anjuta/project/gtkmm.wiz
-share/gnome/anjuta/project/gtkmm/po/POTFILES.in
-share/gnome/anjuta/project/gtkmm/src/Makefile.am.tpl
-share/gnome/anjuta/project/gtkmm/src/main.cc
-share/gnome/anjuta/project/gtkmm/src/project.glade
-share/gnome/anjuta/project/java-logo.png
-share/gnome/anjuta/project/java.wiz
-share/gnome/anjuta/project/java/configure.ac.tpl
-share/gnome/anjuta/project/java/po/POTFILES.in
-share/gnome/anjuta/project/java/project.anjuta
-share/gnome/anjuta/project/java/src/Makefile.am.tpl
-share/gnome/anjuta/project/java/src/main.java
-share/gnome/anjuta/project/minimal.wiz
-share/gnome/anjuta/project/minimal/Makefile.am.tpl
-share/gnome/anjuta/project/minimal/autogen.sh
-share/gnome/anjuta/project/minimal/configure.ac.tpl
-share/gnome/anjuta/project/minimal/project.anjuta
-share/gnome/anjuta/project/mkfile-logo.png
-share/gnome/anjuta/project/mkfile.wiz
-share/gnome/anjuta/project/mkfile/po/ChangeLog
-share/gnome/anjuta/project/mkfile/po/POTFILES.in
-share/gnome/anjuta/project/mkfile/project.anjuta
-share/gnome/anjuta/project/mkfile/src/Makefile.tpl
-share/gnome/anjuta/project/mkfile/src/main.c
-share/gnome/anjuta/project/python-logo.png
-share/gnome/anjuta/project/python.wiz
-share/gnome/anjuta/project/python/configure.ac.tpl
-share/gnome/anjuta/project/python/po/POTFILES.in
-share/gnome/anjuta/project/python/project.anjuta
-share/gnome/anjuta/project/python/src/Makefile.am.tpl
-share/gnome/anjuta/project/python/src/main.py
-share/gnome/anjuta/project/sdl.wiz
-share/gnome/anjuta/project/sdl/acinclude.m4.tpl
-share/gnome/anjuta/project/sdl/configure.ac.tpl
-share/gnome/anjuta/project/sdl/po/POTFILES.in
-share/gnome/anjuta/project/sdl/src/Makefile.am.tpl
-share/gnome/anjuta/project/sdl/src/main.c
-share/gnome/anjuta/project/terminal-logo.png
-share/gnome/anjuta/project/terminal.wiz
-share/gnome/anjuta/project/terminal/AUTHORS
-share/gnome/anjuta/project/terminal/ChangeLog
-share/gnome/anjuta/project/terminal/Makefile.am.tpl
-share/gnome/anjuta/project/terminal/NEWS
-share/gnome/anjuta/project/terminal/README
-share/gnome/anjuta/project/terminal/autogen.sh
-share/gnome/anjuta/project/terminal/configure.ac.tpl
-share/gnome/anjuta/project/terminal/cvsignore
-share/gnome/anjuta/project/terminal/po/ChangeLog
-share/gnome/anjuta/project/terminal/po/LINGUAS
-share/gnome/anjuta/project/terminal/po/POTFILES.in
-share/gnome/anjuta/project/terminal/po/cvsignore
-share/gnome/anjuta/project/terminal/project.anjuta
-share/gnome/anjuta/project/terminal/src/Makefile.am.tpl
-share/gnome/anjuta/project/terminal/src/cvsignore
-share/gnome/anjuta/project/terminal/src/main.c
-share/gnome/anjuta/project/wxwin-logo.png
-share/gnome/anjuta/project/wxwin.wiz
-share/gnome/anjuta/project/wxwin/configure.ac.tpl
-share/gnome/anjuta/project/wxwin/po/POTFILES.in
-share/gnome/anjuta/project/wxwin/src/Makefile.am.tpl
-share/gnome/anjuta/project/wxwin/src/main.cc
-share/gnome/anjuta/project/xlib-dock.wiz
-share/gnome/anjuta/project/xlib-dock/po/POTFILES.in
-share/gnome/anjuta/project/xlib-dock/src/Makefile.am.tpl
-share/gnome/anjuta/project/xlib-dock/src/main.c
-share/gnome/anjuta/project/xlib-dock/src/pixmaps.h
-share/gnome/anjuta/project/xlib-dock/src/wmgeneral.c
-share/gnome/anjuta/project/xlib-dock/src/wmgeneral.h
-share/gnome/anjuta/project/xlib-logo.png
-share/gnome/anjuta/project/xlib.wiz
-share/gnome/anjuta/project/xlib/configure.ac.tpl
-share/gnome/anjuta/project/xlib/po/POTFILES.in
-share/gnome/anjuta/project/xlib/src/Makefile.am.tpl
-share/gnome/anjuta/project/xlib/src/main.c
-share/gnome/anjuta/properties/Embedded.properties
-share/gnome/anjuta/properties/SciTEGlobal.properties
-share/gnome/anjuta/properties/ada.properties
-share/gnome/anjuta/properties/anjuta.properties
-share/gnome/anjuta/properties/asm.properties
-share/gnome/anjuta/properties/asn1.properties
-share/gnome/anjuta/properties/au3.properties
-share/gnome/anjuta/properties/ave.properties
-share/gnome/anjuta/properties/baan.properties
-share/gnome/anjuta/properties/bullant.properties
-share/gnome/anjuta/properties/conf.properties
-share/gnome/anjuta/properties/cpp.properties
-share/gnome/anjuta/properties/css.properties
-share/gnome/anjuta/properties/eiffel.properties
-share/gnome/anjuta/properties/erlang.properties
-share/gnome/anjuta/properties/escript.properties
-share/gnome/anjuta/properties/forth.properties
-share/gnome/anjuta/properties/fortran.properties
-share/gnome/anjuta/properties/html.properties
-share/gnome/anjuta/properties/kix.properties
-share/gnome/anjuta/properties/latex.properties
-share/gnome/anjuta/properties/lisp.properties
-share/gnome/anjuta/properties/lot.properties
-share/gnome/anjuta/properties/lout.properties
-share/gnome/anjuta/properties/lua.properties
-share/gnome/anjuta/properties/matlab.properties
-share/gnome/anjuta/properties/metapost.properties
-share/gnome/anjuta/properties/mmixal.properties
-share/gnome/anjuta/properties/nncrontab.properties
-share/gnome/anjuta/properties/nsis.properties
-share/gnome/anjuta/properties/others.properties
-share/gnome/anjuta/properties/pascal.properties
-share/gnome/anjuta/properties/perl.properties
-share/gnome/anjuta/properties/pov.properties
-share/gnome/anjuta/properties/ps.properties
-share/gnome/anjuta/properties/python.properties
-share/gnome/anjuta/properties/ruby.properties
-share/gnome/anjuta/properties/scriptol.properties
-share/gnome/anjuta/properties/specman.properties
-share/gnome/anjuta/properties/sql.properties
-share/gnome/anjuta/properties/styles.properties
-share/gnome/anjuta/properties/tcl.properties
-share/gnome/anjuta/properties/tex.properties
-share/gnome/anjuta/properties/user.properties
-share/gnome/anjuta/properties/vb.properties
-share/gnome/anjuta/properties/verilog.properties
-share/gnome/anjuta/properties/vhdl.properties
-share/gnome/anjuta/properties/yaml.properties
-share/gnome/anjuta/scripts/anjuta-tags
-share/gnome/anjuta/scripts/create_global_tags.sh
-share/gnome/anjuta/tools/find-fixmes.pl
-share/gnome/anjuta/tools/prepare-changelog.pl
-share/gnome/anjuta/tools/tools-2.xml
-share/gnome/anjuta/tools/translation-status.pl
-share/gnome/anjuta/ui/anjuta-build-basic-autotools-plugin.ui
-share/gnome/anjuta/ui/anjuta-cvs.ui
-share/gnome/anjuta/ui/anjuta-debug-manager.ui
-share/gnome/anjuta/ui/anjuta-devhelp-simple.ui
-share/gnome/anjuta/ui/anjuta-devhelp.ui
-share/gnome/anjuta/ui/anjuta-document-manager.ui
-share/gnome/anjuta/ui/anjuta-file-manager.ui
-share/gnome/anjuta/ui/anjuta-glade.ui
-share/gnome/anjuta/ui/anjuta-gtodo.ui
-share/gnome/anjuta/ui/anjuta-language-support-cpp-java.ui
-share/gnome/anjuta/ui/anjuta-loader-plugin.ui
-share/gnome/anjuta/ui/anjuta-macro.ui
-share/gnome/anjuta/ui/anjuta-message-manager.ui
-share/gnome/anjuta/ui/anjuta-patch.ui
-share/gnome/anjuta/ui/anjuta-project-manager.ui
-share/gnome/anjuta/ui/anjuta-sample.ui
-share/gnome/anjuta/ui/anjuta-search.ui
-share/gnome/anjuta/ui/anjuta-shell.ui
-%%SVN%%share/gnome/anjuta/ui/anjuta-subversion.ui
-share/gnome/anjuta/ui/anjuta-symbol-browser-plugin.ui
-share/gnome/anjuta/ui/anjuta-tools.ui
-share/gnome/anjuta/ui/anjuta.ui
-share/gnome/anjuta/ui/profiler.ui
-share/gnome/anjuta/welcome.txt
-share/gnome/applications/anjuta.desktop
+share/anjuta/AUTHORS
+share/anjuta/anjuta_project.template
+share/anjuta/build/automake-c.filters
+share/anjuta/class-templates/cc-header.tpl
+share/anjuta/class-templates/cc-source.tpl
+share/anjuta/class-templates/go-header.tpl
+share/anjuta/class-templates/go-source.tpl
+share/anjuta/gdb.init
+share/anjuta/glade/anjuta-build-basic-autotools-plugin.glade
+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-file-wizard.glade
+share/anjuta/glade/anjuta-gdb.glade
+share/anjuta/glade/anjuta-language-cpp-java.glade
+share/anjuta/glade/anjuta-macro.glade
+share/anjuta/glade/anjuta-message-manager-plugin.glade
+share/anjuta/glade/anjuta-project-import.glade
+share/anjuta/glade/anjuta-project-wizard.glade
+share/anjuta/glade/anjuta-search.glade
+%%SVN%%share/anjuta/glade/anjuta-subversion.glade
+share/anjuta/glade/anjuta-symbol-browser-plugin.glade
+share/anjuta/glade/anjuta-terminal-plugin.glade
+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/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/layout.xml
+share/anjuta/macros.xml
+share/anjuta/profiles/default.profile
+share/anjuta/project/anjuta-plugin-logo.png
+share/anjuta/project/anjuta-plugin.wiz
+share/anjuta/project/anjuta-plugin/configure.ac.tpl
+share/anjuta/project/anjuta-plugin/po/POTFILES.in
+share/anjuta/project/anjuta-plugin/src/Makefile.am.tpl
+share/anjuta/project/anjuta-plugin/src/plugin.c
+share/anjuta/project/anjuta-plugin/src/plugin.glade
+share/anjuta/project/anjuta-plugin/src/plugin.h
+share/anjuta/project/anjuta-plugin/src/plugin.plugin.in
+share/anjuta/project/anjuta-plugin/src/plugin.ui
+share/anjuta/project/appwiz_sdl.png
+share/anjuta/project/cpp-logo.png
+share/anjuta/project/cpp.wiz
+share/anjuta/project/cpp/configure.ac.tpl
+share/anjuta/project/cpp/po/POTFILES.in
+share/anjuta/project/cpp/src/Makefile.am.tpl
+share/anjuta/project/cpp/src/cvsignore
+share/anjuta/project/cpp/src/main.cc
+share/anjuta/project/django-logo.png
+share/anjuta/project/django.wiz
+share/anjuta/project/gcj-logo.png
+share/anjuta/project/gcj.wiz
+share/anjuta/project/gcj/configure.ac.tpl
+share/anjuta/project/gcj/src/Makefile.am.tpl
+share/anjuta/project/gnome-logo.png
+share/anjuta/project/gnome.wiz
+share/anjuta/project/gnome/po/POTFILES.in
+share/anjuta/project/gnome/src/Makefile.am.tpl
+share/anjuta/project/gnome/src/callbacks.c
+share/anjuta/project/gnome/src/callbacks.h
+share/anjuta/project/gnome/src/main.c
+share/anjuta/project/gnome/src/project.glade
+share/anjuta/project/gtk-logo.png
+share/anjuta/project/gtk.wiz
+share/anjuta/project/gtk/po/POTFILES.in
+share/anjuta/project/gtk/src/Makefile.am.tpl
+share/anjuta/project/gtk/src/callbacks.c
+share/anjuta/project/gtk/src/callbacks.h
+share/anjuta/project/gtk/src/main.c
+share/anjuta/project/gtk/src/project.glade
+share/anjuta/project/gtkmm-logo.png
+share/anjuta/project/gtkmm.wiz
+share/anjuta/project/gtkmm/po/POTFILES.in
+share/anjuta/project/gtkmm/src/Makefile.am.tpl
+share/anjuta/project/gtkmm/src/main.cc
+share/anjuta/project/gtkmm/src/project.glade
+share/anjuta/project/java-logo.png
+share/anjuta/project/java.wiz
+share/anjuta/project/java/configure.ac.tpl
+share/anjuta/project/java/po/POTFILES.in
+share/anjuta/project/java/project.anjuta
+share/anjuta/project/java/src/Makefile.am.tpl
+share/anjuta/project/java/src/main.java
+share/anjuta/project/minimal.wiz
+share/anjuta/project/minimal/Makefile.am.tpl
+share/anjuta/project/minimal/autogen.sh
+share/anjuta/project/minimal/configure.ac.tpl
+share/anjuta/project/minimal/project.anjuta
+share/anjuta/project/mkfile-logo.png
+share/anjuta/project/mkfile.wiz
+share/anjuta/project/mkfile/po/ChangeLog
+share/anjuta/project/mkfile/po/POTFILES.in
+share/anjuta/project/mkfile/project.anjuta
+share/anjuta/project/mkfile/src/Makefile.tpl
+share/anjuta/project/mkfile/src/main.c
+share/anjuta/project/python-logo.png
+share/anjuta/project/python.wiz
+share/anjuta/project/python/configure.ac.tpl
+share/anjuta/project/python/po/POTFILES.in
+share/anjuta/project/python/project.anjuta
+share/anjuta/project/python/src/Makefile.am.tpl
+share/anjuta/project/python/src/main.py
+share/anjuta/project/sdl.wiz
+share/anjuta/project/sdl/acinclude.m4.tpl
+share/anjuta/project/sdl/configure.ac.tpl
+share/anjuta/project/sdl/po/POTFILES.in
+share/anjuta/project/sdl/src/Makefile.am.tpl
+share/anjuta/project/sdl/src/main.c
+share/anjuta/project/terminal-logo.png
+share/anjuta/project/terminal.wiz
+share/anjuta/project/terminal/AUTHORS
+share/anjuta/project/terminal/ChangeLog
+share/anjuta/project/terminal/Makefile.am.tpl
+share/anjuta/project/terminal/NEWS
+share/anjuta/project/terminal/README
+share/anjuta/project/terminal/autogen.sh
+share/anjuta/project/terminal/configure.ac.tpl
+share/anjuta/project/terminal/cvsignore
+share/anjuta/project/terminal/po/ChangeLog
+share/anjuta/project/terminal/po/LINGUAS
+share/anjuta/project/terminal/po/POTFILES.in
+share/anjuta/project/terminal/po/cvsignore
+share/anjuta/project/terminal/project.anjuta
+share/anjuta/project/terminal/src/Makefile.am.tpl
+share/anjuta/project/terminal/src/cvsignore
+share/anjuta/project/terminal/src/main.c
+share/anjuta/project/wxwin-logo.png
+share/anjuta/project/wxwin.wiz
+share/anjuta/project/wxwin/configure.ac.tpl
+share/anjuta/project/wxwin/po/POTFILES.in
+share/anjuta/project/wxwin/src/Makefile.am.tpl
+share/anjuta/project/wxwin/src/main.cc
+share/anjuta/project/xlib-dock.wiz
+share/anjuta/project/xlib-dock/po/POTFILES.in
+share/anjuta/project/xlib-dock/src/Makefile.am.tpl
+share/anjuta/project/xlib-dock/src/main.c
+share/anjuta/project/xlib-dock/src/pixmaps.h
+share/anjuta/project/xlib-dock/src/wmgeneral.c
+share/anjuta/project/xlib-dock/src/wmgeneral.h
+share/anjuta/project/xlib-logo.png
+share/anjuta/project/xlib.wiz
+share/anjuta/project/xlib/configure.ac.tpl
+share/anjuta/project/xlib/po/POTFILES.in
+share/anjuta/project/xlib/src/Makefile.am.tpl
+share/anjuta/project/xlib/src/main.c
+share/anjuta/properties/Embedded.properties
+share/anjuta/properties/SciTEGlobal.properties
+share/anjuta/properties/ada.properties
+share/anjuta/properties/anjuta.properties
+share/anjuta/properties/asm.properties
+share/anjuta/properties/asn1.properties
+share/anjuta/properties/au3.properties
+share/anjuta/properties/ave.properties
+share/anjuta/properties/baan.properties
+share/anjuta/properties/bullant.properties
+share/anjuta/properties/conf.properties
+share/anjuta/properties/cpp.properties
+share/anjuta/properties/css.properties
+share/anjuta/properties/eiffel.properties
+share/anjuta/properties/erlang.properties
+share/anjuta/properties/escript.properties
+share/anjuta/properties/forth.properties
+share/anjuta/properties/fortran.properties
+share/anjuta/properties/html.properties
+share/anjuta/properties/kix.properties
+share/anjuta/properties/latex.properties
+share/anjuta/properties/lisp.properties
+share/anjuta/properties/lot.properties
+share/anjuta/properties/lout.properties
+share/anjuta/properties/lua.properties
+share/anjuta/properties/matlab.properties
+share/anjuta/properties/metapost.properties
+share/anjuta/properties/mmixal.properties
+share/anjuta/properties/nncrontab.properties
+share/anjuta/properties/nsis.properties
+share/anjuta/properties/others.properties
+share/anjuta/properties/pascal.properties
+share/anjuta/properties/perl.properties
+share/anjuta/properties/pov.properties
+share/anjuta/properties/ps.properties
+share/anjuta/properties/python.properties
+share/anjuta/properties/ruby.properties
+share/anjuta/properties/scriptol.properties
+share/anjuta/properties/specman.properties
+share/anjuta/properties/sql.properties
+share/anjuta/properties/styles.properties
+share/anjuta/properties/tcl.properties
+share/anjuta/properties/tex.properties
+share/anjuta/properties/user.properties
+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
+share/anjuta/tools/tools-2.xml
+share/anjuta/tools/translation-status.pl
+share/anjuta/ui/anjuta-build-basic-autotools-plugin.ui
+share/anjuta/ui/anjuta-cvs.ui
+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
+share/anjuta/ui/anjuta-loader-plugin.ui
+share/anjuta/ui/anjuta-macro.ui
+share/anjuta/ui/anjuta-message-manager.ui
+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/profiler.ui
+share/anjuta/welcome.txt
+share/applications/anjuta.desktop
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
@@ -607,135 +607,135 @@ 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/omf/anjuta-manual/anjuta-manual-C.omf
-share/gnome/pixmaps/anjuta/Icons.16x16.Class
-share/gnome/pixmaps/anjuta/Icons.16x16.Enum
-share/gnome/pixmaps/anjuta/Icons.16x16.Field
-share/gnome/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront
-share/gnome/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack
-share/gnome/pixmaps/anjuta/Icons.16x16.Interface
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalClass
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalDelegate
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalEnum
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalEvent
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalField
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalInterface
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalMethod
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalProperty
-share/gnome/pixmaps/anjuta/Icons.16x16.InternalStruct
-share/gnome/pixmaps/anjuta/Icons.16x16.Literal
-share/gnome/pixmaps/anjuta/Icons.16x16.Method
-share/gnome/pixmaps/anjuta/Icons.16x16.NameSpace
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateClass
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateDelegate
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateEnum
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateEvent
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateField
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateInterface
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateMethod
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateProperty
-share/gnome/pixmaps/anjuta/Icons.16x16.PrivateStruct
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedClass
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedDelegate
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedEnum
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedEvent
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedField
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedInterface
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedMethod
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedProperty
-share/gnome/pixmaps/anjuta/Icons.16x16.ProtectedStruct
-share/gnome/pixmaps/anjuta/Icons.16x16.Reference
-share/gnome/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-cvs-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-debug-manager.plugin.png
-share/gnome/pixmaps/anjuta/anjuta-devhelp-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-document-manager.png
-share/gnome/pixmaps/anjuta/anjuta-editor.png
-share/gnome/pixmaps/anjuta/anjuta-file-manager-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-file-wizard-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-gdb.plugin.png
-share/gnome/pixmaps/anjuta/anjuta-glade-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-gtodo-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-language-cpp-java-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-loader-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-macro.png
-share/gnome/pixmaps/anjuta/anjuta-message-view.png
-share/gnome/pixmaps/anjuta/anjuta-patch-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-project-import-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-project-manager-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-project-wizard-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-sample-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-search.png
-%%SVN%%share/gnome/pixmaps/anjuta/anjuta-subversion.png
-share/gnome/pixmaps/anjuta/anjuta-symbol-browser-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-terminal-plugin.png
-share/gnome/pixmaps/anjuta/anjuta-tools-plugin.png
-share/gnome/pixmaps/anjuta/anjuta.png
-share/gnome/pixmaps/anjuta/anjuta_logo.png
-share/gnome/pixmaps/anjuta/anjuta_splash.png
-share/gnome/pixmaps/anjuta/autocomplete-16.png
-share/gnome/pixmaps/anjuta/autocomplete.png
-share/gnome/pixmaps/anjuta/block-end-16.png
-share/gnome/pixmaps/anjuta/block-end.png
-share/gnome/pixmaps/anjuta/block-start-16.png
-share/gnome/pixmaps/anjuta/block-start.png
-share/gnome/pixmaps/anjuta/block_select.xpm
-share/gnome/pixmaps/anjuta/bookmark-clear.png
-share/gnome/pixmaps/anjuta/bookmark-first.png
-share/gnome/pixmaps/anjuta/bookmark-last.png
-share/gnome/pixmaps/anjuta/bookmark-next.png
-share/gnome/pixmaps/anjuta/bookmark-prev.png
-share/gnome/pixmaps/anjuta/bookmark-toggle.png
-share/gnome/pixmaps/anjuta/bookmark.png
-share/gnome/pixmaps/anjuta/breakpoint-disabled.png
-share/gnome/pixmaps/anjuta/breakpoint-enabled.png
-share/gnome/pixmaps/anjuta/breakpoint.png
-share/gnome/pixmaps/anjuta/class-inheritance.png
-share/gnome/pixmaps/anjuta/class_logo.xpm
-share/gnome/pixmaps/anjuta/detach-16.png
-share/gnome/pixmaps/anjuta/detach.png
-share/gnome/pixmaps/anjuta/directory-accept.png
-share/gnome/pixmaps/anjuta/directory.png
-share/gnome/pixmaps/anjuta/error-next-16.png
-share/gnome/pixmaps/anjuta/error-next.png
-share/gnome/pixmaps/anjuta/error-prev-16.png
-share/gnome/pixmaps/anjuta/error-prev.png
-share/gnome/pixmaps/anjuta/fold_close.xpm
-share/gnome/pixmaps/anjuta/fold_open.xpm
-share/gnome/pixmaps/anjuta/fold_toggle.xpm
-share/gnome/pixmaps/anjuta/gtodo-about.png
-share/gnome/pixmaps/anjuta/gtodo-edit.png
-share/gnome/pixmaps/anjuta/gtodo.png
-share/gnome/pixmaps/anjuta/gtodo_tray.png
-share/gnome/pixmaps/anjuta/indent.xpm
-share/gnome/pixmaps/anjuta/indent_auto.xpm
-share/gnome/pixmaps/anjuta/indent_dcr.xpm
-share/gnome/pixmaps/anjuta/indent_inc.xpm
-share/gnome/pixmaps/anjuta/indent_set.xpm
-share/gnome/pixmaps/anjuta/linemarker.png
-share/gnome/pixmaps/anjuta/locals.png
-share/gnome/pixmaps/anjuta/messages.xpm
-share/gnome/pixmaps/anjuta/password.png
-share/gnome/pixmaps/anjuta/pointer.png
-share/gnome/pixmaps/anjuta/preferences-editor.png
-share/gnome/pixmaps/anjuta/preferences-general.png
-share/gnome/pixmaps/anjuta/preferences-messages.png
-share/gnome/pixmaps/anjuta/preferences-terminal.png
-share/gnome/pixmaps/anjuta/profiler.png
-share/gnome/pixmaps/anjuta/program-counter.png
-share/gnome/pixmaps/anjuta/run-to-cursor.png
-share/gnome/pixmaps/anjuta/sourceview.png
-share/gnome/pixmaps/anjuta/stack.png
-share/gnome/pixmaps/anjuta/step-into-16.png
-share/gnome/pixmaps/anjuta/step-into.png
-share/gnome/pixmaps/anjuta/step-out-16.png
-share/gnome/pixmaps/anjuta/step-out.png
-share/gnome/pixmaps/anjuta/step-over-16.png
-share/gnome/pixmaps/anjuta/step-over.png
-share/gnome/pixmaps/anjuta/swap.png
-share/gnome/pixmaps/anjuta/watch.png
share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png
share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg
+share/omf/anjuta-manual/anjuta-manual-C.omf
+share/pixmaps/anjuta/Icons.16x16.Class
+share/pixmaps/anjuta/Icons.16x16.Enum
+share/pixmaps/anjuta/Icons.16x16.Field
+share/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront
+share/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack
+share/pixmaps/anjuta/Icons.16x16.Interface
+share/pixmaps/anjuta/Icons.16x16.InternalClass
+share/pixmaps/anjuta/Icons.16x16.InternalDelegate
+share/pixmaps/anjuta/Icons.16x16.InternalEnum
+share/pixmaps/anjuta/Icons.16x16.InternalEvent
+share/pixmaps/anjuta/Icons.16x16.InternalField
+share/pixmaps/anjuta/Icons.16x16.InternalInterface
+share/pixmaps/anjuta/Icons.16x16.InternalMethod
+share/pixmaps/anjuta/Icons.16x16.InternalProperty
+share/pixmaps/anjuta/Icons.16x16.InternalStruct
+share/pixmaps/anjuta/Icons.16x16.Literal
+share/pixmaps/anjuta/Icons.16x16.Method
+share/pixmaps/anjuta/Icons.16x16.NameSpace
+share/pixmaps/anjuta/Icons.16x16.PrivateClass
+share/pixmaps/anjuta/Icons.16x16.PrivateDelegate
+share/pixmaps/anjuta/Icons.16x16.PrivateEnum
+share/pixmaps/anjuta/Icons.16x16.PrivateEvent
+share/pixmaps/anjuta/Icons.16x16.PrivateField
+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.ProtectedClass
+share/pixmaps/anjuta/Icons.16x16.ProtectedDelegate
+share/pixmaps/anjuta/Icons.16x16.ProtectedEnum
+share/pixmaps/anjuta/Icons.16x16.ProtectedEvent
+share/pixmaps/anjuta/Icons.16x16.ProtectedField
+share/pixmaps/anjuta/Icons.16x16.ProtectedInterface
+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/anjuta-file-wizard-plugin.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-language-cpp-java-plugin.png
+share/pixmaps/anjuta/anjuta-loader-plugin.png
+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.png
+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/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
@@ -785,73 +785,67 @@ 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
-@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
-@dirrm share/gnome/pixmaps/anjuta
-@dirrm share/gnome/omf/anjuta-manual
+@dirrm share/pixmaps/anjuta
+@dirrm share/omf/anjuta-manual
@dirrm share/gnome/help/anjuta-manual/C/figures
@dirrm share/gnome/help/anjuta-manual/C
@dirrm share/gnome/help/anjuta-manual
@dirrm share/gnome/help/anjuta-faqs/C
@dirrm share/gnome/help/anjuta-faqs
-@dirrm share/gnome/anjuta/ui
-@dirrm share/gnome/anjuta/tools
-@dirrm share/gnome/anjuta/scripts
-@dirrm share/gnome/anjuta/properties
-@dirrm share/gnome/anjuta/project/xlib/src
-@dirrm share/gnome/anjuta/project/xlib/po
-@dirrm share/gnome/anjuta/project/xlib-dock/src
-@dirrm share/gnome/anjuta/project/xlib-dock/po
-@dirrm share/gnome/anjuta/project/xlib-dock
-@dirrm share/gnome/anjuta/project/xlib
-@dirrm share/gnome/anjuta/project/wxwin/src
-@dirrm share/gnome/anjuta/project/wxwin/po
-@dirrm share/gnome/anjuta/project/wxwin
-@dirrm share/gnome/anjuta/project/terminal/src
-@dirrm share/gnome/anjuta/project/terminal/po
-@dirrm share/gnome/anjuta/project/terminal
-@dirrm share/gnome/anjuta/project/sdl/src
-@dirrm share/gnome/anjuta/project/sdl/po
-@dirrm share/gnome/anjuta/project/sdl
-@dirrm share/gnome/anjuta/project/python/src
-@dirrm share/gnome/anjuta/project/python/po
-@dirrm share/gnome/anjuta/project/python
-@dirrm share/gnome/anjuta/project/mkfile/src
-@dirrm share/gnome/anjuta/project/mkfile/po
-@dirrm share/gnome/anjuta/project/mkfile
-@dirrm share/gnome/anjuta/project/minimal
-@dirrm share/gnome/anjuta/project/java/src
-@dirrm share/gnome/anjuta/project/java/po
-@dirrm share/gnome/anjuta/project/java
-@dirrm share/gnome/anjuta/project/gtkmm/src
-@dirrm share/gnome/anjuta/project/gtkmm/po
-@dirrm share/gnome/anjuta/project/gtkmm
-@dirrm share/gnome/anjuta/project/gtk/src
-@dirrm share/gnome/anjuta/project/gtk/po
-@dirrm share/gnome/anjuta/project/gtk
-@dirrm share/gnome/anjuta/project/gnome/src
-@dirrm share/gnome/anjuta/project/gnome/po
-@dirrm share/gnome/anjuta/project/gnome
-@dirrm share/gnome/anjuta/project/gcj/src
-@dirrm share/gnome/anjuta/project/gcj
-@dirrm share/gnome/anjuta/project/cpp/src
-@dirrm share/gnome/anjuta/project/cpp/po
-@dirrm share/gnome/anjuta/project/cpp
-@dirrm share/gnome/anjuta/project/anjuta-plugin/src
-@dirrm share/gnome/anjuta/project/anjuta-plugin/po
-@dirrm share/gnome/anjuta/project/anjuta-plugin
-@dirrm share/gnome/anjuta/project
-@dirrm share/gnome/anjuta/profiles
-@dirrm share/gnome/anjuta/gtodo
-@dirrm share/gnome/anjuta/glade
-@dirrm share/gnome/anjuta/class-templates
-@dirrm share/gnome/anjuta/build
-@dirrm share/gnome/anjuta
@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrm share/anjuta/ui
+@dirrm share/anjuta/tools
+@dirrm share/anjuta/scripts
+@dirrm share/anjuta/properties
+@dirrm share/anjuta/project/xlib/src
+@dirrm share/anjuta/project/xlib/po
+@dirrm share/anjuta/project/xlib-dock/src
+@dirrm share/anjuta/project/xlib-dock/po
+@dirrm share/anjuta/project/xlib-dock
+@dirrm share/anjuta/project/xlib
+@dirrm share/anjuta/project/wxwin/src
+@dirrm share/anjuta/project/wxwin/po
+@dirrm share/anjuta/project/wxwin
+@dirrm share/anjuta/project/terminal/src
+@dirrm share/anjuta/project/terminal/po
+@dirrm share/anjuta/project/terminal
+@dirrm share/anjuta/project/sdl/src
+@dirrm share/anjuta/project/sdl/po
+@dirrm share/anjuta/project/sdl
+@dirrm share/anjuta/project/python/src
+@dirrm share/anjuta/project/python/po
+@dirrm share/anjuta/project/python
+@dirrm share/anjuta/project/mkfile/src
+@dirrm share/anjuta/project/mkfile/po
+@dirrm share/anjuta/project/mkfile
+@dirrm share/anjuta/project/minimal
+@dirrm share/anjuta/project/java/src
+@dirrm share/anjuta/project/java/po
+@dirrm share/anjuta/project/java
+@dirrm share/anjuta/project/gtkmm/src
+@dirrm share/anjuta/project/gtkmm/po
+@dirrm share/anjuta/project/gtkmm
+@dirrm share/anjuta/project/gtk/src
+@dirrm share/anjuta/project/gtk/po
+@dirrm share/anjuta/project/gtk
+@dirrm share/anjuta/project/gnome/src
+@dirrm share/anjuta/project/gnome/po
+@dirrm share/anjuta/project/gnome
+@dirrm share/anjuta/project/gcj/src
+@dirrm share/anjuta/project/gcj
+@dirrm share/anjuta/project/cpp/src
+@dirrm share/anjuta/project/cpp/po
+@dirrm share/anjuta/project/cpp
+@dirrm share/anjuta/project/anjuta-plugin/src
+@dirrm share/anjuta/project/anjuta-plugin/po
+@dirrm share/anjuta/project/anjuta-plugin
+@dirrm share/anjuta/project
+@dirrm share/anjuta/profiles
+@dirrm share/anjuta/gtodo
+@dirrm share/anjuta/glade
+@dirrm share/anjuta/class-templates
+@dirrm share/anjuta/build
+@dirrm share/anjuta
@dirrm share/doc/libanjuta
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/anjuta
@@ -860,3 +854,10 @@ 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/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
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 90eefe5..4010b09 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bonobo-conf
PORTVERSION= 0.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/bonobo-conf/0.16
diff --git a/devel/bonobo-conf/pkg-plist b/devel/bonobo-conf/pkg-plist
index 188a788..3090dfb 100644
--- a/devel/bonobo-conf/pkg-plist
+++ b/devel/bonobo-conf/pkg-plist
@@ -20,10 +20,10 @@ lib/libbonobo_conf.a
lib/libbonobo_conf.la
lib/libbonobo_conf.so
lib/libbonobo_conf.so.0
-share/gnome/idl/Bonobo_Config.idl
-share/gnome/oaf/Bonobo_Moniker_config.oaf
-share/gnome/oaf/Bonobo_Moniker_gconf.oaf
-share/gnome/oaf/Bonobo_Moniker_xmldb.oaf
+share/idl/Bonobo_Config.idl
+share/oaf/Bonobo_Moniker_config.oaf
+share/oaf/Bonobo_Moniker_gconf.oaf
+share/oaf/Bonobo_Moniker_xmldb.oaf
share/locale/az/LC_MESSAGES/bonobo-conf.mo
share/locale/da/LC_MESSAGES/bonobo-conf.mo
share/locale/de/LC_MESSAGES/bonobo-conf.mo
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 3a8773e..729484e 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
-# $MCom: ports/devel/bonobo/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
+# $MCom: ports/devel/bonobo/Makefile,v 1.5 2007/05/19 21:36:04 marcus Exp $
#
PORTNAME= bonobo
PORTVERSION= 1.0.22
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
diff --git a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
index 5fc3fc2..36eac4b 100644
--- a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
+++ b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
cxxflags_set = @cxxflags_set@
l = @l@
--audio_ulaw_helpdir = $(datadir)/bonobo/docs/audio_ulaw/C
-+audio_ulaw_helpdir = $(datadir)/help/audio_ulaw/C
+-audio_ulaw_helpdir = $(datadir)/gnome/bonobo/docs/audio_ulaw/C
++audio_ulaw_helpdir = $(datadir)/gnome/help/bonobo/audio_ulaw/C
#
# Module configuration information
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 4cc3ae9..927719f 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -177,41 +177,29 @@ libdata/pkgconfig/libefs.pc
%%DOCSDIR%%/bonobo/bonobo-ui.html
%%DOCSDIR%%/bonobo/bonobo-view.html
%%DOCSDIR%%/bonobo/book1.html
-share/gnome/help/audio_ulaw/C/index.html
-share/gnome/idl/Bonobo.idl
-share/gnome/idl/Bonobo_Advise.idl
-share/gnome/idl/Bonobo_Canvas.idl
-share/gnome/idl/Bonobo_ClientSite.idl
-share/gnome/idl/Bonobo_Context.idl
-share/gnome/idl/Bonobo_Control.idl
-share/gnome/idl/Bonobo_Desktop.idl
-share/gnome/idl/Bonobo_Embeddable.idl
-share/gnome/idl/Bonobo_Exception.idl
-share/gnome/idl/Bonobo_ItemContainer.idl
-share/gnome/idl/Bonobo_Listener.idl
-share/gnome/idl/Bonobo_Moniker.idl
-share/gnome/idl/Bonobo_Persist.idl
-share/gnome/idl/Bonobo_Print.idl
-share/gnome/idl/Bonobo_Progressive.idl
-share/gnome/idl/Bonobo_Property.idl
-share/gnome/idl/Bonobo_Sample_Echo.idl
-share/gnome/idl/Bonobo_Storage.idl
-share/gnome/idl/Bonobo_UI.idl
-share/gnome/idl/Bonobo_Unknown.idl
-share/gnome/idl/Bonobo_Zoomable.idl
-share/gnome/oaf/Bonobo_Moniker_gzip.oaf
-share/gnome/oaf/Bonobo_Moniker_http.oaf
-share/gnome/oaf/Bonobo_Moniker_std.oaf
-share/gnome/oaf/Bonobo_Sample_Audio.oaf
-share/gnome/oaf/Bonobo_Sample_CanvasItem.oaf
-share/gnome/oaf/Bonobo_Sample_Controls.oaf
-share/gnome/oaf/Bonobo_Sample_Echo.oaf
-share/gnome/oaf/Bonobo_Sample_Hello.oafinfo
-share/gnome/oaf/Bonobo_Sample_Mines.oaf
-share/gnome/oaf/Bonobo_Sample_Paint.oaf
-share/gnome/oaf/Bonobo_Sample_Text.oaf
-share/gnome/oaf/Bonobo_Selector.oaf
+share/gnome/help/bonobo/audio_ulaw/C/index.html
share/gnome/ui/gshell-ui.xml
+share/idl/Bonobo.idl
+share/idl/Bonobo_Advise.idl
+share/idl/Bonobo_Canvas.idl
+share/idl/Bonobo_ClientSite.idl
+share/idl/Bonobo_Context.idl
+share/idl/Bonobo_Control.idl
+share/idl/Bonobo_Desktop.idl
+share/idl/Bonobo_Embeddable.idl
+share/idl/Bonobo_Exception.idl
+share/idl/Bonobo_ItemContainer.idl
+share/idl/Bonobo_Listener.idl
+share/idl/Bonobo_Moniker.idl
+share/idl/Bonobo_Persist.idl
+share/idl/Bonobo_Print.idl
+share/idl/Bonobo_Progressive.idl
+share/idl/Bonobo_Property.idl
+share/idl/Bonobo_Sample_Echo.idl
+share/idl/Bonobo_Storage.idl
+share/idl/Bonobo_UI.idl
+share/idl/Bonobo_Unknown.idl
+share/idl/Bonobo_Zoomable.idl
share/locale/az/LC_MESSAGES/bonobo.mo
share/locale/ca/LC_MESSAGES/bonobo.mo
share/locale/da/LC_MESSAGES/bonobo.mo
@@ -244,9 +232,22 @@ share/locale/uk/LC_MESSAGES/bonobo.mo
share/locale/wa/LC_MESSAGES/bonobo.mo
share/locale/zh_CN/LC_MESSAGES/bonobo.mo
share/locale/zh_TW/LC_MESSAGES/bonobo.mo
-@dirrm share/gnome/help/audio_ulaw/C/images
-@dirrm share/gnome/help/audio_ulaw/C
-@dirrm share/gnome/help/audio_ulaw
+share/oaf/Bonobo_Moniker_gzip.oaf
+share/oaf/Bonobo_Moniker_http.oaf
+share/oaf/Bonobo_Moniker_std.oaf
+share/oaf/Bonobo_Sample_Audio.oaf
+share/oaf/Bonobo_Sample_CanvasItem.oaf
+share/oaf/Bonobo_Sample_Controls.oaf
+share/oaf/Bonobo_Sample_Echo.oaf
+share/oaf/Bonobo_Sample_Hello.oafinfo
+share/oaf/Bonobo_Sample_Mines.oaf
+share/oaf/Bonobo_Sample_Paint.oaf
+share/oaf/Bonobo_Sample_Text.oaf
+share/oaf/Bonobo_Selector.oaf
+@dirrm share/gnome/help/bonobo/audio_ulaw/C/images
+@dirrm share/gnome/help/bonobo/audio_ulaw/C
+@dirrm share/gnome/help/bonobo/audio_ulaw
+@dirrm share/gnome/help/bonobo
@dirrm %%DOCSDIR%%/libefs
@dirrm %%DOCSDIR%%/bonobo
@dirrm %%DOCSDIR%%
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 68dc5552..b65ae3b 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bug-buddy/Makefile,v 1.44 2007/03/13 12:27:23 ahze Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.55 2007/10/06 22:03:31 mezz Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.18.1
-PORTREVISION= 2
+PORTVERSION= 2.20.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -37,5 +36,8 @@ GCONF_SCHEMAS= bug-buddy.schemas
post-patch:
@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
${WRKSRC}/src/bugzilla.c
+ @${REINPLACE_CMD} -e 's|libelf.h||g ; \
+ s|gelf.h||g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index fbfff72..b443c5b 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.18.1.tar.bz2) = ebeaeee4acc1432b59a4ef242abff620
-SHA256 (gnome2/bug-buddy-2.18.1.tar.bz2) = 99cbdbe16942291f6a02060bf7b0bb7e5a36096379a02e513ad669eec0fdd311
-SIZE (gnome2/bug-buddy-2.18.1.tar.bz2) = 553967
+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
diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
new file mode 100644
index 0000000..801be10
--- /dev/null
+++ b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
@@ -0,0 +1,52 @@
+--- gnome-breakpad/gnome-breakpad.cc.orig 2007-08-16 13:55:38.000000000 -0400
++++ gnome-breakpad/gnome-breakpad.cc 2007-09-02 19:21:10.000000000 -0400
+@@ -6,8 +6,14 @@
+ #include <cassert>
+ #include <cstring>
+
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ #include <libelf.h>
+ #include <gelf.h>
++#endif
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -114,6 +120,7 @@ find_in_debug_path (const char *filename
+ }
+
+
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ static gboolean
+ elf_has_debug_symbols (const char *filename)
+ {
+@@ -166,7 +173,7 @@ elf_has_debug_symbols (const char *filen
+ elf_end (elf);
+ return false;
+ }
+-
++#endif
+
+
+
+@@ -269,9 +276,17 @@ check_if_gdb (void *callback_context)
+ _exit(0);
+ }
+
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ memset(mypath, 0, sizeof(mypath));
++#ifndef __FreeBSD__
+ readlink ("/proc/self/exe", mypath, sizeof(mypath));
++#else
++ readlink ("/proc/curproc/file", mypath, sizeof(mypath));
++#endif
+ has_debug_symbols = elf_has_debug_symbols (mypath);
++#else
++ has_debug_symbols = TRUE;
++#endif
+
+
+ if (bugbuddy && gdb && has_debug_symbols) {
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
deleted file mode 100644
index 0866ee3..0000000
--- a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bug-buddy.menu.in.orig Tue Feb 27 13:46:40 2007
-+++ src/bug-buddy.menu.in Tue Feb 27 13:46:54 2007
-@@ -6,7 +6,7 @@
- <Name>Bug Buddy programs</Name>
-
- <!-- Read only files in default .desktop file location -->
-- <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir>
-+ <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir>
- <LegacyDir>@prefix@/@DATADIRNAME@/gnome/autostart</LegacyDir>
-
- <!-- we want to process all desktop files; Unfortunately,
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 4ac6b5c..27f3b5f 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,22 +1,26 @@
bin/bug-buddy
-share/gnome/applications/bug-buddy.desktop
-share/gnome/bug-buddy/bug-buddy.glade
-share/gnome/bug-buddy/bug-buddy.menu
-share/gnome/bug-buddy/bug-buddy.png
-share/gnome/bug-buddy/bugzilla/gnome.bugzilla
-share/gnome/bug-buddy/bugzilla/gnome/config
-share/gnome/bug-buddy/bugzilla/gnome/mostfreq
-share/gnome/bug-buddy/bugzilla/gnome/products
-share/gnome/bug-buddy/bugzilla/ximian.bugzilla
-share/gnome/bug-buddy/bugzilla/ximian/config
-share/gnome/bug-buddy/bugzilla/ximian/mostfreq
-share/gnome/bug-buddy/bugzilla/ximian/products
-share/gnome/bug-buddy/gdb-cmd
+lib/gtk-2.0/modules/libgnomebreakpad.la
+lib/gtk-2.0/modules/libgnomebreakpad.so
+share/applications/bug-buddy.desktop
+%%DATADIR%%/bug-buddy.gtkbuilder
+%%DATADIR%%/bug-buddy.menu
+%%DATADIR%%/bug-buddy.png
+%%DATADIR%%/bugzilla/gnome.bugzilla
+%%DATADIR%%/bugzilla/gnome/config
+%%DATADIR%%/bugzilla/gnome/mostfreq
+%%DATADIR%%/bugzilla/gnome/products
+%%DATADIR%%/bugzilla/ximian.bugzilla
+%%DATADIR%%/bugzilla/ximian/config
+%%DATADIR%%/bugzilla/ximian/mostfreq
+%%DATADIR%%/bugzilla/ximian/products
+%%DATADIR%%/gdb-cmd
share/icons/hicolor/48x48/apps/bug-buddy.png
share/locale/am/LC_MESSAGES/bug-buddy.mo
share/locale/ar/LC_MESSAGES/bug-buddy.mo
+share/locale/as/LC_MESSAGES/bug-buddy.mo
share/locale/az/LC_MESSAGES/bug-buddy.mo
share/locale/be/LC_MESSAGES/bug-buddy.mo
+share/locale/be@latin/LC_MESSAGES/bug-buddy.mo
share/locale/bg/LC_MESSAGES/bug-buddy.mo
share/locale/bn/LC_MESSAGES/bug-buddy.mo
share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo
@@ -63,6 +67,7 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo
share/locale/ne/LC_MESSAGES/bug-buddy.mo
share/locale/nl/LC_MESSAGES/bug-buddy.mo
share/locale/nn/LC_MESSAGES/bug-buddy.mo
+share/locale/oc/LC_MESSAGES/bug-buddy.mo
share/locale/or/LC_MESSAGES/bug-buddy.mo
share/locale/pa/LC_MESSAGES/bug-buddy.mo
share/locale/pl/LC_MESSAGES/bug-buddy.mo
@@ -71,6 +76,7 @@ share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
share/locale/ro/LC_MESSAGES/bug-buddy.mo
share/locale/ru/LC_MESSAGES/bug-buddy.mo
share/locale/rw/LC_MESSAGES/bug-buddy.mo
+share/locale/si/LC_MESSAGES/bug-buddy.mo
share/locale/sk/LC_MESSAGES/bug-buddy.mo
share/locale/sl/LC_MESSAGES/bug-buddy.mo
share/locale/sq/LC_MESSAGES/bug-buddy.mo
@@ -78,28 +84,38 @@ share/locale/sr/LC_MESSAGES/bug-buddy.mo
share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo
share/locale/sv/LC_MESSAGES/bug-buddy.mo
share/locale/ta/LC_MESSAGES/bug-buddy.mo
+share/locale/te/LC_MESSAGES/bug-buddy.mo
share/locale/th/LC_MESSAGES/bug-buddy.mo
share/locale/tr/LC_MESSAGES/bug-buddy.mo
share/locale/ug/LC_MESSAGES/bug-buddy.mo
share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/uz@cyrillic/LC_MESSAGES/bug-buddy.mo
share/locale/vi/LC_MESSAGES/bug-buddy.mo
share/locale/wa/LC_MESSAGES/bug-buddy.mo
share/locale/xh/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
-@dirrm share/gnome/bug-buddy/bugzilla/ximian
-@dirrm share/gnome/bug-buddy/bugzilla/gnome
-@dirrm share/gnome/bug-buddy/bugzilla
-@dirrm share/gnome/bug-buddy
+@dirrm %%DATADIR%%/bugzilla/ximian
+@dirrm %%DATADIR%%/bugzilla/gnome
+@dirrm %%DATADIR%%/bugzilla
+@dirrm %%DATADIR%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@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
@@ -112,3 +128,8 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/applications
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index 1c3002d..8cb9e12 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -3,38 +3,32 @@
# Whom: Jean-Yves Lefort <jylefort@brutele.be>
#
# $FreeBSD$
+# $MCom: ports/devel/desktop-file-utils/Makefile,v 1.8 2007/09/07 20:22:45 mezz Exp $
#
-PORTNAME= desktop-file-utils
-PORTVERSION= 0.12
-PORTREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/
+PORTNAME= desktop-file-utils
+PORTVERSION= 0.14
+CATEGORIES= devel
+MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A couple of command line utilities for working with desktop entries
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A couple of command line utilities for working with desktop entries
-LIB_DEPENDS= popt:${PORTSDIR}/devel/popt
-
-USE_GNOME= glib20
-WANT_GNOME= yes
+USE_GNOME= glib20
+WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-lispdir
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" EMACS="no"
+CONFIGURE_ARGS= --without-lispdir
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" EMACS="no"
-PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
+PKGINSTALL= ${WRKDIR}/pkg-install
+PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-PORT_MIMEDIRS= ${LOCALBASE}/share/applications \
- ${LOCALBASE}/share/gnome/applications
+PORT_MIMEDIRS= ${LOCALBASE}/share/applications
-MIMEDIRS= ${PORT_MIMEDIRS} \
- /usr/share/applications \
- /usr/share/gnome/applications
+MIMEDIRS= ${PORT_MIMEDIRS}
-RMDIRS= ${PORT_MIMEDIRS} \
- ${LOCALBASE}/share/gnome
+RMDIRS= ${PORT_MIMEDIRS}
post-patch:
@${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
index 9646bf3..d7cdd143 100644
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (desktop-file-utils-0.12.tar.gz) = 335b91ec70ea1c08f87dfde8c5926e7b
-SHA256 (desktop-file-utils-0.12.tar.gz) = 7db6ade355d56913cecd098a5bec1037bca42e7c7e4b7257c7f7f9f655c5e606
-SIZE (desktop-file-utils-0.12.tar.gz) = 348418
+MD5 (desktop-file-utils-0.14.tar.gz) = e0b5057a4e3166f34635ac6f27c712c0
+SHA256 (desktop-file-utils-0.14.tar.gz) = 97856d2621d4e3273340b7f1172c2e074c74263629b05bde0f0f077425ec0699
+SIZE (desktop-file-utils-0.14.tar.gz) = 348743
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index f5fd82d..7e5956a 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= devhelp
PORTVERSION= 0.16
+PORTREVISION= 1
CATEGORIES?= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c
index dc989e1..ffa3c3b 100644
--- a/devel/devhelp/files/patch-src_dh-base.c
+++ b/devel/devhelp/files/patch-src_dh-base.c
@@ -5,7 +5,7 @@
base_add_books (base, dir);
g_free (dir);
+
-+ dir = g_build_filename (data_dir, "..", "doc", NULL);
++ dir = g_build_filename (data_dir, "doc", NULL);
+ base_add_books (base, dir);
+ g_free (dir);
}
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 69b3be5..4269311 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -23,14 +23,14 @@ lib/libdevhelp-1.la
lib/libdevhelp-1.so
lib/libdevhelp-1.so.0
libdata/pkgconfig/libdevhelp-1.0.pc
-share/gnome/applications/devhelp.desktop
-share/gnome/devhelp/default-prefs.js
-share/gnome/devhelp/devhelp.glade
-share/gnome/devhelp/dtd/devhelp-1.dtd
-share/gnome/devhelp/images/book_closed.png
-share/gnome/devhelp/images/book_open.png
-share/gnome/devhelp/images/helpdoc.png
-share/gnome/devhelp/ui/window.ui
+share/applications/devhelp.desktop
+share/devhelp/default-prefs.js
+share/devhelp/devhelp.glade
+share/devhelp/dtd/devhelp-1.dtd
+share/devhelp/images/book_closed.png
+share/devhelp/images/book_open.png
+share/devhelp/images/helpdoc.png
+share/devhelp/ui/window.ui
share/icons/hicolor/48x48/apps/devhelp.png
share/icons/hicolor/scalable/apps/devhelp.svg
share/locale/am/LC_MESSAGES/devhelp.mo
@@ -93,10 +93,10 @@ share/locale/vi/LC_MESSAGES/devhelp.mo
share/locale/zh_CN/LC_MESSAGES/devhelp.mo
share/locale/zh_HK/LC_MESSAGES/devhelp.mo
share/locale/zh_TW/LC_MESSAGES/devhelp.mo
-@dirrm share/gnome/devhelp/ui
-@dirrm share/gnome/devhelp/images
-@dirrm share/gnome/devhelp/dtd
-@dirrm share/gnome/devhelp
+@dirrm share/devhelp/ui
+@dirrm share/devhelp/images
+@dirrm share/devhelp/dtd
+@dirrm share/devhelp
@dirrm include/devhelp-1.0/devhelp
@dirrm include/devhelp-1.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -113,3 +113,4 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 4a7cbdb..e622d24 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -3,13 +3,15 @@
# Whom: Frerich Raabe <frerich.raabe@gmx.de>
#
# $FreeBSD$
+# $MCom: ports/devel/distcc/Makefile,v 1.3 2007/10/21 02:46:13 ahze Exp $
#
PORTNAME= distcc
PORTVERSION= 2.18.3
-PORTREVISION= 5
-CATEGORIES= devel ipv6
+PORTREVISION= 7
+CATEGORIES= devel
MASTER_SITES= http://distcc.samba.org/ftp/distcc/
+PATCH_SITES= http://0pointer.de/public/
MAINTAINER= ahze@FreeBSD.org
COMMENT= Distribute compilation of C(++) code acrosss machines on a network
@@ -20,19 +22,28 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= --enable-rfc2553
WANT_GNOME= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
DISTCCD_PIDFILE=/var/run/distccd.pid
USE_RC_SUBR= distccd.sh
SUB_LIST= DISTCCD_PIDFILE=${DISTCCD_PIDFILE}
-OPTIONS= GNOME "Build GUI monitor based on GNOME" Off \
+OPTIONS= AVAHI "Enable Avahi Zeroconf/mDNS/Bonjour support" Off \
+ GNOME "Build GUI monitor based on GNOME" Off \
GTK "Build GUI monitor based on GTK" Off \
- IPV6 "Enable IPV6" Off \
- COMPILER_LINKS "Create symlinks to distcc" Off
+ COMPILER_LINKS "Create symlinks to distcc" On
.include <bsd.port.pre.mk>
+.if defined(WITH_AVAHI)
+PATCHFILES+= distcc-avahi.patch
+LIB_DEPENDS+= avahi-glib.1:${PORTSDIR}/net/avahi
+PATCH_DIST_STRIP= -p1
+USE_AUTOTOOLS+= autoconf:261
+CFLAGS+= -DHAVE_AVAHI
+.endif
+
.if defined(WITH_COMPILER_LINKS)
CCLINKDIR?= libexec/distcc
PLIST_DIRS= ${CCLINKDIR}
@@ -61,10 +72,6 @@ PLIST_SUB+= WITH_GNOME=""
PLIST_SUB+= WITH_GNOME="@comment "
.endif
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+= --enable-rfc2553
-.endif
-
MAN1= distcc.1 distccd.1
DOC_FILES= AUTHORS INSTALL NEWS README \
doc/protocol-1.txt doc/status-1.txt \
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index e20d0e5..1d8af34 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1,3 +1,6 @@
MD5 (distcc-2.18.3.tar.bz2) = 0d6b80a1efc3a3d816c4f4175f63eaa2
SHA256 (distcc-2.18.3.tar.bz2) = 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
SIZE (distcc-2.18.3.tar.bz2) = 341601
+MD5 (distcc-avahi.patch) = 621dc7dc1e3b9b6770110117df45611a
+SHA256 (distcc-avahi.patch) = e6651e3de7fee6d953b6ee56732eafa7d4666cb4070db5a925ba071626067c9a
+SIZE (distcc-avahi.patch) = 54086
diff --git a/devel/distcc/files/distccd.sh.in b/devel/distcc/files/distccd.sh.in
index d5a9efb..0942b30 100644
--- a/devel/distcc/files/distccd.sh.in
+++ b/devel/distcc/files/distccd.sh.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-#
+# $MCom: ports/devel/distcc/files/distccd.sh.in,v 1.1 2007/05/19 17:43:14 ahze Exp $
# PROVIDE: distccd
# REQUIRE: NETWORKING
diff --git a/devel/doxygen/files/patch-fix_with_libiconv-1.11 b/devel/doxygen/files/patch-fix_with_libiconv-1.11
new file mode 100644
index 0000000..64c9867
--- /dev/null
+++ b/devel/doxygen/files/patch-fix_with_libiconv-1.11
@@ -0,0 +1,11 @@
+--- src/portable.cpp.orig 2007-10-11 14:27:23.000000000 -0500
++++ src/portable.cpp 2007-10-11 14:28:15.000000000 -0500
+@@ -378,7 +378,7 @@
+ #else
+ #define CASTNEEDED(x) (char **)(x)
+ #endif
+- return iconv(cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft);
++ return iconv(cd,inbuf,inbytesleft,outbuf,outbytesleft);
+ }
+
+ int portable_iconv_close (void *cd)
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 71b81f8..3da0819 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
+# $MCom: ports/devel/gconf/Makefile,v 1.5 2007/05/19 21:36:05 marcus Exp $
#
PORTNAME= gconf
PORTVERSION= 1.0.9
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/GConf/1.0
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index 7ff8432..7c2bad2 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -58,8 +58,8 @@ share/locale/sv/LC_MESSAGES/GConf.mo
share/locale/tr/LC_MESSAGES/GConf.mo
share/locale/uk/LC_MESSAGES/GConf.mo
share/locale/zh_CN/LC_MESSAGES/GConf.mo
-@dirrm share/gnome/gconf/1
-@dirrm share/gnome/gconf
+@dirrm %%DATADIR%%/1
+@dirrm %%DATADIR%%
@dirrm lib/GConf/1
@dirrm include/gconf/1/gconf
@dirrm include/gconf/1
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index c14e74e..d647f75 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.81 2007/03/06 17:05:38 marcus Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.87 2007/10/15 14:17:14 ahze Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.18.0.1
-PORTREVISION?= 1
+PORTVERSION= 2.20.1
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,8 +22,6 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-
USE_GMAKE= yes
USE_GETTEXT= yes
USE_XLIB= yes
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 2c95436..d1bea09 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.18.0.1.tar.bz2) = aa0e0a0729fb021bab72b4166fd392f9
-SHA256 (gnome2/GConf-2.18.0.1.tar.bz2) = 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1
-SIZE (gnome2/GConf-2.18.0.1.tar.bz2) = 1347765
+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
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 7ccbc02..968ab8d 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -42,6 +42,7 @@ share/locale/cs/LC_MESSAGES/GConf2.mo
share/locale/cy/LC_MESSAGES/GConf2.mo
share/locale/da/LC_MESSAGES/GConf2.mo
share/locale/de/LC_MESSAGES/GConf2.mo
+share/locale/dz/LC_MESSAGES/GConf2.mo
share/locale/el/LC_MESSAGES/GConf2.mo
share/locale/en_CA/LC_MESSAGES/GConf2.mo
share/locale/en_GB/LC_MESSAGES/GConf2.mo
@@ -76,6 +77,7 @@ share/locale/nb/LC_MESSAGES/GConf2.mo
share/locale/ne/LC_MESSAGES/GConf2.mo
share/locale/nl/LC_MESSAGES/GConf2.mo
share/locale/nn/LC_MESSAGES/GConf2.mo
+share/locale/oc/LC_MESSAGES/GConf2.mo
share/locale/or/LC_MESSAGES/GConf2.mo
share/locale/pa/LC_MESSAGES/GConf2.mo
share/locale/pl/LC_MESSAGES/GConf2.mo
@@ -91,6 +93,7 @@ share/locale/sr/LC_MESSAGES/GConf2.mo
share/locale/sr@Latn/LC_MESSAGES/GConf2.mo
share/locale/sv/LC_MESSAGES/GConf2.mo
share/locale/ta/LC_MESSAGES/GConf2.mo
+share/locale/te/LC_MESSAGES/GConf2.mo
share/locale/th/LC_MESSAGES/GConf2.mo
share/locale/tr/LC_MESSAGES/GConf2.mo
share/locale/uk/LC_MESSAGES/GConf2.mo
@@ -114,11 +117,17 @@ share/sgml/gconf/gconf-1.0.dtd
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 61a7412..d3ad422 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.16 2007/03/10 05:27:50 marcus Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.18 2007/09/17 03:25:24 marcus Exp $
#
PORTNAME= gconfmm
-PORTVERSION= 2.18.0
-PORTREVISION= 1
+PORTVERSION= 2.20.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 8fe555c..1c8397b 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.18.0.tar.bz2) = 0771dde14af1443f9ac142010eb3d403
-SHA256 (gnome2/gconfmm-2.18.0.tar.bz2) = 0f82e951069395c28b86205233e2a061505544811448f1bd75a3ee76b44d9316
-SIZE (gnome2/gconfmm-2.18.0.tar.bz2) = 292484
+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
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 83d37e0..8b7ba74 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glade2/Makefile,v 1.16 2005/10/09 20:01:49 marcus Exp $
+# $MCom: ports/devel/glade2/Makefile,v 1.20 2007/08/04 03:51:29 marcus Exp $
#
PORTNAME= glade
PORTVERSION= 2.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -18,8 +18,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A user interface builder for GTK+/GNOME
-BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+LIB_DEPENDS= rarian.0:${PORTSDIR}/textproc/rarian
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index c4c9ad6..b3c4cf1 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -1,6 +1,6 @@
bin/glade-2
-share/gnome/applications/glade-2.desktop
-share/gnome/glade-2/gtk/autogen.sh
+share/applications/glade-2.desktop
+share/glade-2/gtk/autogen.sh
share/gnome/help/glade-2/C/figures/edit-menu.png
share/gnome/help/glade-2/C/figures/file-menu.png
share/gnome/help/glade-2/C/figures/glade-windows.png
@@ -23,11 +23,11 @@ share/gnome/help/glade-2/C/glade-user-guide.xml
share/gnome/help/glade-2/C/legal.xml
share/gnome/help/glade-2/ro/glade-faq.xml
share/gnome/help/glade-2/ro/legal.xml
-share/gnome/omf/glade-2/glade-faq-C.omf
-share/gnome/omf/glade-2/glade-faq-ro.omf
-share/gnome/omf/glade-2/glade-user-guide-C.omf
-share/gnome/pixmaps/glade-2.png
-share/gnome/pixmaps/glade-2/glade_logo.png
+share/omf/glade-2/glade-faq-C.omf
+share/omf/glade-2/glade-faq-ro.omf
+share/omf/glade-2/glade-user-guide-C.omf
+share/pixmaps/glade-2.png
+share/pixmaps/glade-2/glade_logo.png
share/locale/am/LC_MESSAGES/glade-2.0.mo
share/locale/az/LC_MESSAGES/glade-2.0.mo
share/locale/be/LC_MESSAGES/glade-2.0.mo
@@ -74,14 +74,19 @@ share/locale/vi/LC_MESSAGES/glade-2.0.mo
share/locale/yi/LC_MESSAGES/glade-2.0.mo
share/locale/zh_CN/LC_MESSAGES/glade-2.0.mo
share/locale/zh_TW/LC_MESSAGES/glade-2.0.mo
-@dirrm share/gnome/pixmaps/glade-2
-@dirrm share/gnome/omf/glade-2
+@dirrm share/pixmaps/glade-2
+@dirrm share/omf/glade-2
@dirrm share/gnome/help/glade-2/C/figures
@dirrm share/gnome/help/glade-2/C
@dirrm share/gnome/help/glade-2/ro/figures
@dirrm share/gnome/help/glade-2/ro
@dirrm share/gnome/help/glade-2
-@dirrm share/gnome/glade-2/gtk
-@dirrm share/gnome/glade-2
+@dirrm share/glade-2/gtk
+@dirrm share/glade-2
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 53dc839..e302fda 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glade3/Makefile,v 1.29 2007/03/13 17:16:00 mezz Exp $
+# $MCom: ports/devel/glade3/Makefile,v 1.38 2007/09/17 15:59:36 ahze Exp $
#
PORTNAME= glade3
-PORTVERSION= 3.2.2
+PORTVERSION= 3.4.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,12 +21,12 @@ USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 libxml2 gnomeprefix gnomehack \
- gnomedocutils desktopfileutils
+ gnomedocutils desktopfileutils ltverhack
WANT_GNOME= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@@ -42,15 +42,16 @@ PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gnome
CONFIGURE_ARGS+=--disable-gnome
.endif
-.if ${HAVE_GNOME:Mpygtk2}!=""
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+= pygtk2
-PLIST_SUB+= PYTHON:=""
-.else
+#.if ${HAVE_GNOME:Mpygtk2}!=""
+#USE_PYTHON= yes
+#.include "${PORTSDIR}/Mk/bsd.python.mk"
+#USE_GNOME+= pygtk2
+#PLIST_SUB+= PYTHON:=""
+#CONFIGURE_ARGS+=--enable-python
+#.else
CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON:="@comment "
-.endif
+#.endif
post-install:
${MKDIR} ${PREFIX}/lib/glade3/bindings
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index 8424c43..7e9141c 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.2.2.tar.bz2) = 07f24fed99e424988964d6b2d77d5ba7
-SHA256 (gnome2/glade3-3.2.2.tar.bz2) = 28f97d7c41c6e1e1fd91e1e660e49aa0a7dee7839ea92f5cb661e571685b19bd
-SIZE (gnome2/glade3-3.2.2.tar.bz2) = 1429808
+MD5 (gnome2/glade3-3.4.0.tar.bz2) = 7d9354a92d3d95417d1e2d0bc3ebf4f5
+SHA256 (gnome2/glade3-3.4.0.tar.bz2) = af16831ee69f4e323175e0d3710ddc081bbd598abad711cfa141f8a0a9e60331
+SIZE (gnome2/glade3-3.4.0.tar.bz2) = 1493286
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index 6058687..472a251 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -1,12 +1,7 @@
bin/glade-3
-include/libgladeui-1.0/gladeui/atk.xpm
-include/libgladeui-1.0/gladeui/fixed_bg.xpm
-include/libgladeui-1.0/gladeui/glade-accumulators.h
include/libgladeui-1.0/gladeui/glade-app.h
include/libgladeui-1.0/gladeui/glade-base-editor.h
-include/libgladeui-1.0/gladeui/glade-binding.h
include/libgladeui-1.0/gladeui/glade-builtins.h
-include/libgladeui-1.0/gladeui/glade-catalog.h
include/libgladeui-1.0/gladeui/glade-clipboard-view.h
include/libgladeui-1.0/gladeui/glade-clipboard.h
include/libgladeui-1.0/gladeui/glade-command.h
@@ -18,308 +13,278 @@ include/libgladeui-1.0/gladeui/glade-design-view.h
include/libgladeui-1.0/gladeui/glade-editor-property.h
include/libgladeui-1.0/gladeui/glade-editor.h
include/libgladeui-1.0/gladeui/glade-fixed.h
-include/libgladeui-1.0/gladeui/glade-id-allocator.h
-include/libgladeui-1.0/gladeui/glade-marshallers.h
-include/libgladeui-1.0/gladeui/glade-palette-box.h
-include/libgladeui-1.0/gladeui/glade-palette-expander.h
+include/libgladeui-1.0/gladeui/glade-gtk.h
+include/libgladeui-1.0/gladeui/glade-inspector.h
include/libgladeui-1.0/gladeui/glade-palette-item.h
include/libgladeui-1.0/gladeui/glade-palette.h
include/libgladeui-1.0/gladeui/glade-parameter.h
include/libgladeui-1.0/gladeui/glade-parser.h
include/libgladeui-1.0/gladeui/glade-placeholder.h
-include/libgladeui-1.0/gladeui/glade-popup.h
-include/libgladeui-1.0/gladeui/glade-project-view.h
include/libgladeui-1.0/gladeui/glade-project.h
include/libgladeui-1.0/gladeui/glade-property-class.h
include/libgladeui-1.0/gladeui/glade-property.h
include/libgladeui-1.0/gladeui/glade-signal-editor.h
include/libgladeui-1.0/gladeui/glade-signal.h
include/libgladeui-1.0/gladeui/glade-utils.h
+include/libgladeui-1.0/gladeui/glade-widget-action.h
include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
include/libgladeui-1.0/gladeui/glade-widget.h
include/libgladeui-1.0/gladeui/glade-xml-utils.h
include/libgladeui-1.0/gladeui/glade.h
-%%PYTHON:%%lib/glade3/bindings/libgladepython.la
-%%PYTHON:%%lib/glade3/bindings/libgladepython.so
+%%GNOME:%%lib/glade3/modules/libgladegnome.a
%%GNOME:%%lib/glade3/modules/libgladegnome.la
%%GNOME:%%lib/glade3/modules/libgladegnome.so
+lib/glade3/modules/libgladegtk.a
lib/glade3/modules/libgladegtk.la
lib/glade3/modules/libgladegtk.so
+lib/libgladeui-1.a
lib/libgladeui-1.la
lib/libgladeui-1.so
-lib/libgladeui-1.so.5
+lib/libgladeui-1.so.7
libdata/pkgconfig/gladeui-1.0.pc
-%%DOCSDIR%%/GladeApp.html
-%%DOCSDIR%%/GladeClipboard.html
-%%DOCSDIR%%/GladeClipboardView.html
-%%DOCSDIR%%/GladeEditor.html
-%%DOCSDIR%%/GladeEditorProperty.html
-%%DOCSDIR%%/GladeFixed.html
-%%DOCSDIR%%/GladePalette.html
-%%DOCSDIR%%/GladePlaceholder.html
-%%DOCSDIR%%/GladeProject.html
-%%DOCSDIR%%/GladeProjectView.html
-%%DOCSDIR%%/GladeProperty.html
-%%DOCSDIR%%/GladeWidget.html
-%%DOCSDIR%%/catalog.html
-%%DOCSDIR%%/catalogintro.html
-%%DOCSDIR%%/children.html
-%%DOCSDIR%%/core.html
-%%DOCSDIR%%/dockables.html
-%%DOCSDIR%%/gladeui-GladeCommand.html
-%%DOCSDIR%%/gladeui-GladePropertyClass.html
-%%DOCSDIR%%/gladeui-GladeWidgetClass.html
-%%DOCSDIR%%/gladeui-glade-base-editor.html
-%%DOCSDIR%%/gladeui-glade-parameter.html
-%%DOCSDIR%%/gladeui-glade-signal-editor.html
-%%DOCSDIR%%/gladeui-glade-utils.html
-%%DOCSDIR%%/gladeui.devhelp
-%%DOCSDIR%%/gladeui.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/ix01.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/misc.html
-%%DOCSDIR%%/properties.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/widgetclasses.html
-share/gnome/applications/glade-3.desktop
-%%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml
-%%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml.in
-%%GNOME:%%share/gnome/glade3/catalogs/canvas.xml
-%%GNOME:%%share/gnome/glade3/catalogs/canvas.xml.in
-%%GNOME:%%share/gnome/glade3/catalogs/gnome.xml
-%%GNOME:%%share/gnome/glade3/catalogs/gnome.xml.in
-share/gnome/glade3/catalogs/gtk+.xml
-share/gnome/glade3/catalogs/gtk+.xml.in
-share/gnome/glade3/pixmaps/16x16/aboutdialog.png
-share/gnome/glade3/pixmaps/16x16/accellabel.png
-share/gnome/glade3/pixmaps/16x16/alignment.png
-share/gnome/glade3/pixmaps/16x16/arrow.png
-share/gnome/glade3/pixmaps/16x16/aspectframe.png
-share/gnome/glade3/pixmaps/16x16/assistant.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodock.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodockitem.png
-share/gnome/glade3/pixmaps/16x16/button.png
-share/gnome/glade3/pixmaps/16x16/calendar.png
-share/gnome/glade3/pixmaps/16x16/checkbutton.png
-share/gnome/glade3/pixmaps/16x16/checkmenuitem.png
-share/gnome/glade3/pixmaps/16x16/clist.png
-share/gnome/glade3/pixmaps/16x16/colorbutton.png
-share/gnome/glade3/pixmaps/16x16/colorselection.png
-share/gnome/glade3/pixmaps/16x16/colorselectiondialog.png
-share/gnome/glade3/pixmaps/16x16/combo.png
-share/gnome/glade3/pixmaps/16x16/combobox.png
-share/gnome/glade3/pixmaps/16x16/comboboxentry.png
-share/gnome/glade3/pixmaps/16x16/curve.png
-share/gnome/glade3/pixmaps/16x16/custom.png
-share/gnome/glade3/pixmaps/16x16/dialog.png
-share/gnome/glade3/pixmaps/16x16/drawingarea.png
-share/gnome/glade3/pixmaps/16x16/entry.png
-share/gnome/glade3/pixmaps/16x16/eventbox.png
-share/gnome/glade3/pixmaps/16x16/expander.png
-share/gnome/glade3/pixmaps/16x16/filechooserbutton.png
-share/gnome/glade3/pixmaps/16x16/filechooserdialog.png
-share/gnome/glade3/pixmaps/16x16/fileselection.png
-share/gnome/glade3/pixmaps/16x16/fixed.png
-share/gnome/glade3/pixmaps/16x16/fontbutton.png
-share/gnome/glade3/pixmaps/16x16/fontselection.png
-share/gnome/glade3/pixmaps/16x16/fontselectiondialog.png
-share/gnome/glade3/pixmaps/16x16/frame.png
-share/gnome/glade3/pixmaps/16x16/gammacurve.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeabout.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeapp.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeappbar.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomecanvas.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomecolorpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedateedit.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedialog.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruid.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruidpageedge.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomedruidpagestandard.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomefileentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomefontpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomehref.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconlist.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomeiconselection.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomemessagebox.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepixmap.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepixmapentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/16x16/gnomepropertybox.png
-share/gnome/glade3/pixmaps/16x16/handlebox.png
-share/gnome/glade3/pixmaps/16x16/hbox.png
-share/gnome/glade3/pixmaps/16x16/hbuttonbox.png
-share/gnome/glade3/pixmaps/16x16/hpaned.png
-share/gnome/glade3/pixmaps/16x16/hruler.png
-share/gnome/glade3/pixmaps/16x16/hscale.png
-share/gnome/glade3/pixmaps/16x16/hscrollbar.png
-share/gnome/glade3/pixmaps/16x16/hseparator.png
-share/gnome/glade3/pixmaps/16x16/iconview.png
-share/gnome/glade3/pixmaps/16x16/image.png
-share/gnome/glade3/pixmaps/16x16/imagemenuitem.png
-share/gnome/glade3/pixmaps/16x16/inputdialog.png
-share/gnome/glade3/pixmaps/16x16/label.png
-share/gnome/glade3/pixmaps/16x16/layout.png
-share/gnome/glade3/pixmaps/16x16/linkbutton.png
-share/gnome/glade3/pixmaps/16x16/list.png
-share/gnome/glade3/pixmaps/16x16/listitem.png
-share/gnome/glade3/pixmaps/16x16/menu.png
-share/gnome/glade3/pixmaps/16x16/menubar.png
-share/gnome/glade3/pixmaps/16x16/menuitem.png
-share/gnome/glade3/pixmaps/16x16/menutoolbutton.png
-share/gnome/glade3/pixmaps/16x16/messagedialog.png
-share/gnome/glade3/pixmaps/16x16/notebook.png
-share/gnome/glade3/pixmaps/16x16/optionmenu.png
-share/gnome/glade3/pixmaps/16x16/pagesetupdialog.png
-share/gnome/glade3/pixmaps/16x16/printdialog.png
-share/gnome/glade3/pixmaps/16x16/progressbar.png
-share/gnome/glade3/pixmaps/16x16/radiobutton.png
-share/gnome/glade3/pixmaps/16x16/radiomenuitem.png
-share/gnome/glade3/pixmaps/16x16/radiotoolbutton.png
-share/gnome/glade3/pixmaps/16x16/recentchooser.png
-share/gnome/glade3/pixmaps/16x16/recentchooserdialog.png
-share/gnome/glade3/pixmaps/16x16/ruler.png
-share/gnome/glade3/pixmaps/16x16/scrolledwindow.png
-share/gnome/glade3/pixmaps/16x16/separatormenuitem.png
-share/gnome/glade3/pixmaps/16x16/separatortoolitem.png
-share/gnome/glade3/pixmaps/16x16/spinbutton.png
-share/gnome/glade3/pixmaps/16x16/statusbar.png
-share/gnome/glade3/pixmaps/16x16/table.png
-share/gnome/glade3/pixmaps/16x16/textview.png
-share/gnome/glade3/pixmaps/16x16/togglebutton.png
-share/gnome/glade3/pixmaps/16x16/toggletoolbutton.png
-share/gnome/glade3/pixmaps/16x16/toolbar.png
-share/gnome/glade3/pixmaps/16x16/toolbutton.png
-share/gnome/glade3/pixmaps/16x16/toolitem.png
-share/gnome/glade3/pixmaps/16x16/treeview.png
-share/gnome/glade3/pixmaps/16x16/vbox.png
-share/gnome/glade3/pixmaps/16x16/vbuttonbox.png
-share/gnome/glade3/pixmaps/16x16/viewport.png
-share/gnome/glade3/pixmaps/16x16/vpaned.png
-share/gnome/glade3/pixmaps/16x16/vruler.png
-share/gnome/glade3/pixmaps/16x16/vscale.png
-share/gnome/glade3/pixmaps/16x16/vscrollbar.png
-share/gnome/glade3/pixmaps/16x16/vseparator.png
-share/gnome/glade3/pixmaps/16x16/window.png
-share/gnome/glade3/pixmaps/22x22/aboutdialog.png
-share/gnome/glade3/pixmaps/22x22/accellabel.png
-share/gnome/glade3/pixmaps/22x22/alignment.png
-share/gnome/glade3/pixmaps/22x22/arrow.png
-share/gnome/glade3/pixmaps/22x22/aspectframe.png
-share/gnome/glade3/pixmaps/22x22/assistant.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodock.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodockitem.png
-share/gnome/glade3/pixmaps/22x22/button.png
-share/gnome/glade3/pixmaps/22x22/calendar.png
-share/gnome/glade3/pixmaps/22x22/checkbutton.png
-share/gnome/glade3/pixmaps/22x22/checkmenuitem.png
-share/gnome/glade3/pixmaps/22x22/clist.png
-share/gnome/glade3/pixmaps/22x22/colorbutton.png
-share/gnome/glade3/pixmaps/22x22/colorselection.png
-share/gnome/glade3/pixmaps/22x22/colorselectiondialog.png
-share/gnome/glade3/pixmaps/22x22/combo.png
-share/gnome/glade3/pixmaps/22x22/combobox.png
-share/gnome/glade3/pixmaps/22x22/comboboxentry.png
-share/gnome/glade3/pixmaps/22x22/curve.png
-share/gnome/glade3/pixmaps/22x22/custom.png
-share/gnome/glade3/pixmaps/22x22/dialog.png
-share/gnome/glade3/pixmaps/22x22/drawingarea.png
-share/gnome/glade3/pixmaps/22x22/entry.png
-share/gnome/glade3/pixmaps/22x22/eventbox.png
-share/gnome/glade3/pixmaps/22x22/expander.png
-share/gnome/glade3/pixmaps/22x22/filechooserbutton.png
-share/gnome/glade3/pixmaps/22x22/filechooserdialog.png
-share/gnome/glade3/pixmaps/22x22/fileselection.png
-share/gnome/glade3/pixmaps/22x22/fixed.png
-share/gnome/glade3/pixmaps/22x22/fontbutton.png
-share/gnome/glade3/pixmaps/22x22/fontselection.png
-share/gnome/glade3/pixmaps/22x22/fontselectiondialog.png
-share/gnome/glade3/pixmaps/22x22/frame.png
-share/gnome/glade3/pixmaps/22x22/gammacurve.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeabout.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeapp.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeappbar.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomecanvas.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomecolorpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedateedit.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedialog.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruid.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruidpageedge.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomedruidpagestandard.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomefileentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomefontpicker.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomehref.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconlist.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomeiconselection.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomemessagebox.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepixmap.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepixmapentry.png
-%%GNOME:%%share/gnome/glade3/pixmaps/22x22/gnomepropertybox.png
-share/gnome/glade3/pixmaps/22x22/handlebox.png
-share/gnome/glade3/pixmaps/22x22/hbox.png
-share/gnome/glade3/pixmaps/22x22/hbuttonbox.png
-share/gnome/glade3/pixmaps/22x22/hpaned.png
-share/gnome/glade3/pixmaps/22x22/hruler.png
-share/gnome/glade3/pixmaps/22x22/hscale.png
-share/gnome/glade3/pixmaps/22x22/hscrollbar.png
-share/gnome/glade3/pixmaps/22x22/hseparator.png
-share/gnome/glade3/pixmaps/22x22/iconview.png
-share/gnome/glade3/pixmaps/22x22/image.png
-share/gnome/glade3/pixmaps/22x22/imagemenuitem.png
-share/gnome/glade3/pixmaps/22x22/inputdialog.png
-share/gnome/glade3/pixmaps/22x22/label.png
-share/gnome/glade3/pixmaps/22x22/layout.png
-share/gnome/glade3/pixmaps/22x22/linkbutton.png
-share/gnome/glade3/pixmaps/22x22/list.png
-share/gnome/glade3/pixmaps/22x22/listitem.png
-share/gnome/glade3/pixmaps/22x22/menu.png
-share/gnome/glade3/pixmaps/22x22/menubar.png
-share/gnome/glade3/pixmaps/22x22/menuitem.png
-share/gnome/glade3/pixmaps/22x22/menutoolbutton.png
-share/gnome/glade3/pixmaps/22x22/messagedialog.png
-share/gnome/glade3/pixmaps/22x22/notebook.png
-share/gnome/glade3/pixmaps/22x22/optionmenu.png
-share/gnome/glade3/pixmaps/22x22/pagesetupdialog.png
-share/gnome/glade3/pixmaps/22x22/printdialog.png
-share/gnome/glade3/pixmaps/22x22/progressbar.png
-share/gnome/glade3/pixmaps/22x22/radiobutton.png
-share/gnome/glade3/pixmaps/22x22/radiomenuitem.png
-share/gnome/glade3/pixmaps/22x22/radiotoolbutton.png
-share/gnome/glade3/pixmaps/22x22/recentchooser.png
-share/gnome/glade3/pixmaps/22x22/recentchooserdialog.png
-share/gnome/glade3/pixmaps/22x22/ruler.png
-share/gnome/glade3/pixmaps/22x22/scrolledwindow.png
-share/gnome/glade3/pixmaps/22x22/separatormenuitem.png
-share/gnome/glade3/pixmaps/22x22/separatortoolitem.png
-share/gnome/glade3/pixmaps/22x22/spinbutton.png
-share/gnome/glade3/pixmaps/22x22/statusbar.png
-share/gnome/glade3/pixmaps/22x22/table.png
-share/gnome/glade3/pixmaps/22x22/textview.png
-share/gnome/glade3/pixmaps/22x22/togglebutton.png
-share/gnome/glade3/pixmaps/22x22/toggletoolbutton.png
-share/gnome/glade3/pixmaps/22x22/toolbar.png
-share/gnome/glade3/pixmaps/22x22/toolbutton.png
-share/gnome/glade3/pixmaps/22x22/toolitem.png
-share/gnome/glade3/pixmaps/22x22/treeview.png
-share/gnome/glade3/pixmaps/22x22/vbox.png
-share/gnome/glade3/pixmaps/22x22/vbuttonbox.png
-share/gnome/glade3/pixmaps/22x22/viewport.png
-share/gnome/glade3/pixmaps/22x22/vpaned.png
-share/gnome/glade3/pixmaps/22x22/vruler.png
-share/gnome/glade3/pixmaps/22x22/vscale.png
-share/gnome/glade3/pixmaps/22x22/vscrollbar.png
-share/gnome/glade3/pixmaps/22x22/vseparator.png
-share/gnome/glade3/pixmaps/22x22/window.png
-share/gnome/glade3/pixmaps/devhelp.png
-share/gnome/glade3/pixmaps/plus.png
-share/gnome/glade3/pixmaps/selector.png
+share/applications/glade-3.desktop
+%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml
+%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml.in
+%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml
+%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml.in
+%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml
+%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml.in
+%%DATADIR%%/catalogs/gtk+.xml
+%%DATADIR%%/catalogs/gtk+.xml.in
+%%DATADIR%%/catalogs/gtkunixprint.xml
+%%DATADIR%%/catalogs/gtkunixprint.xml.in
+%%DATADIR%%/pixmaps/atk.png
+%%DATADIR%%/pixmaps/devhelp.png
+%%DATADIR%%/pixmaps/drag-resize.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-clist.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combo.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxentry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-curve.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-custom.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fileselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-gammacurve.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-gtktextview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hruler.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-image.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-label.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-list.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-listitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-optionmenu.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-ruler.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-table.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vruler.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
+%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-button.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-clist.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combo.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxentry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-curve.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-custom.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fileselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-gammacurve.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-image.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-label.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-list.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-listitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-optionmenu.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-ruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-table.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-window.png
+%%DATADIR%%/pixmaps/plus.png
+%%DATADIR%%/pixmaps/selector.png
share/gnome/help/glade/C/figures/main-window.png
share/gnome/help/glade/C/glade.xml
share/gnome/help/glade/C/legal.xml
@@ -335,15 +300,12 @@ share/gnome/help/glade/es/legal.xml
share/gnome/help/glade/fr/figures/main-window.png
share/gnome/help/glade/fr/glade.xml
share/gnome/help/glade/fr/legal.xml
+share/gnome/help/glade/oc/figures/main-window.png
+share/gnome/help/glade/oc/glade.xml
+share/gnome/help/glade/oc/legal.xml
share/gnome/help/glade/sv/figures/main-window.png
share/gnome/help/glade/sv/glade.xml
share/gnome/help/glade/sv/legal.xml
-share/gnome/omf/glade/glade-C.omf
-share/gnome/omf/glade/glade-bg.omf
-share/gnome/omf/glade/glade-en_GB.omf
-share/gnome/omf/glade/glade-es.omf
-share/gnome/omf/glade/glade-fr.omf
-share/gnome/omf/glade/glade-sv.omf
share/icons/hicolor/16x16/apps/glade-3.png
share/icons/hicolor/22x22/apps/glade-3.png
share/icons/hicolor/24x24/apps/glade-3.png
@@ -353,14 +315,17 @@ share/icons/hicolor/scalable/apps/glade-3.svg
share/locale/ar/LC_MESSAGES/glade3.mo
share/locale/az/LC_MESSAGES/glade3.mo
share/locale/bg/LC_MESSAGES/glade3.mo
+share/locale/bn/LC_MESSAGES/glade3.mo
+share/locale/bn_IN/LC_MESSAGES/glade3.mo
share/locale/ca/LC_MESSAGES/glade3.mo
share/locale/da/LC_MESSAGES/glade3.mo
share/locale/de/LC_MESSAGES/glade3.mo
-share/locale/dz/LC_MESSAGES/glade3.mo
share/locale/el/LC_MESSAGES/glade3.mo
share/locale/en_CA/LC_MESSAGES/glade3.mo
share/locale/en_GB/LC_MESSAGES/glade3.mo
share/locale/es/LC_MESSAGES/glade3.mo
+share/locale/et/LC_MESSAGES/glade3.mo
+share/locale/fi/LC_MESSAGES/glade3.mo
share/locale/fr/LC_MESSAGES/glade3.mo
share/locale/gl/LC_MESSAGES/glade3.mo
share/locale/hu/LC_MESSAGES/glade3.mo
@@ -373,15 +338,20 @@ share/locale/ml/LC_MESSAGES/glade3.mo
share/locale/ms/LC_MESSAGES/glade3.mo
share/locale/nb/LC_MESSAGES/glade3.mo
share/locale/nn/LC_MESSAGES/glade3.mo
+share/locale/oc/LC_MESSAGES/glade3.mo
+share/locale/or/LC_MESSAGES/glade3.mo
share/locale/pa/LC_MESSAGES/glade3.mo
share/locale/pl/LC_MESSAGES/glade3.mo
share/locale/pt/LC_MESSAGES/glade3.mo
share/locale/pt_BR/LC_MESSAGES/glade3.mo
share/locale/ru/LC_MESSAGES/glade3.mo
+share/locale/si/LC_MESSAGES/glade3.mo
share/locale/sk/LC_MESSAGES/glade3.mo
+share/locale/sl/LC_MESSAGES/glade3.mo
share/locale/sq/LC_MESSAGES/glade3.mo
share/locale/sv/LC_MESSAGES/glade3.mo
share/locale/ta/LC_MESSAGES/glade3.mo
+share/locale/te/LC_MESSAGES/glade3.mo
share/locale/th/LC_MESSAGES/glade3.mo
share/locale/tr/LC_MESSAGES/glade3.mo
share/locale/uk/LC_MESSAGES/glade3.mo
@@ -389,9 +359,18 @@ share/locale/vi/LC_MESSAGES/glade3.mo
share/locale/zh_CN/LC_MESSAGES/glade3.mo
share/locale/zh_HK/LC_MESSAGES/glade3.mo
share/locale/zh_TW/LC_MESSAGES/glade3.mo
-@dirrm share/gnome/omf/glade
+share/omf/glade/glade-C.omf
+share/omf/glade/glade-bg.omf
+share/omf/glade/glade-en_GB.omf
+share/omf/glade/glade-es.omf
+share/omf/glade/glade-fr.omf
+share/omf/glade/glade-oc.omf
+share/omf/glade/glade-sv.omf
+@dirrm share/omf/glade
@dirrm share/gnome/help/glade/sv/figures
@dirrm share/gnome/help/glade/sv
+@dirrm share/gnome/help/glade/oc/figures
+@dirrm share/gnome/help/glade/oc
@dirrm share/gnome/help/glade/fr/figures
@dirrm share/gnome/help/glade/fr
@dirrm share/gnome/help/glade/es/figures
@@ -403,12 +382,14 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
@dirrm share/gnome/help/glade/C/figures
@dirrm share/gnome/help/glade/C
@dirrm share/gnome/help/glade
-@dirrm share/gnome/glade3/pixmaps/22x22
-@dirrm share/gnome/glade3/pixmaps/16x16
-@dirrm share/gnome/glade3/pixmaps
-@dirrm share/gnome/glade3/catalogs
-@dirrm share/gnome/glade3
-@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/pixmaps/hicolor/22x22/actions
+@dirrm %%DATADIR%%/pixmaps/hicolor/22x22
+@dirrm %%DATADIR%%/pixmaps/hicolor/16x16/actions
+@dirrm %%DATADIR%%/pixmaps/hicolor/16x16
+@dirrm %%DATADIR%%/pixmaps/hicolor
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/catalogs
+@dirrm %%DATADIR%%
@dirrm lib/glade3/modules
@dirrm lib/glade3/bindings
@dirrm lib/glade3
@@ -418,5 +399,12 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 2c42903..fb55b81 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,11 +3,11 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.91 2006/10/05 06:55:34 mezz Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.105 2007/10/16 12:35:26 ahze Exp $
#
PORTNAME= glib
-PORTVERSION= 2.12.13
+PORTVERSION= 2.14.2
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -28,6 +28,8 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
+LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
+
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
@@ -36,7 +38,8 @@ USE_GMAKE= 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
+ --disable-man --without-xml-catalog \
+ --with-pcre=system
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 9c979ac..650782e 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.12.13.tar.bz2) = d76124236e4e216e8c0861341e967a76
-SHA256 (gnome2/glib-2.12.13.tar.bz2) = 1253d563ca2e50292d924849fe3a23c3b7bc707ab8b79bda19319f9d192b0e8e
-SIZE (gnome2/glib-2.12.13.tar.bz2) = 2938164
+MD5 (gnome2/glib-2.14.2.tar.bz2) = fca5d26c8efea4e6e547c81c801bf67c
+SHA256 (gnome2/glib-2.14.2.tar.bz2) = bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97
+SIZE (gnome2/glib-2.14.2.tar.bz2) = 3340273
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index f5799d9..8a89b6e 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue May 1 20:39:42 2007
-+++ Makefile.in Tue May 1 20:40:23 2007
-@@ -239,7 +239,7 @@ target_alias = @target_alias@
+--- 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@
AUTOMAKE_OPTIONS = 1.7
@@ -9,7 +9,7 @@
bin_SCRIPTS = glib-gettextize
-@@ -292,8 +292,8 @@ BUILT_EXTRA_DIST = \
+@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \
config.h.win32 \
gtk-doc.make
diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c
new file mode 100644
index 0000000..ef7f0a8
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gregex.c
@@ -0,0 +1,13 @@
+--- glib/gregex.c.orig 2007-09-09 18:35:32.000000000 -0400
++++ glib/gregex.c 2007-09-09 18:36:05.000000000 -0400
+@@ -164,8 +164,10 @@ match_error (gint errcode)
+ case PCRE_ERROR_DFA_RECURSE:
+ case PCRE_ERROR_RECURSIONLIMIT:
+ return _("recursion limit reached");
++#ifdef PCRE_ERROR_NULLWSLIMIT
+ case PCRE_ERROR_NULLWSLIMIT:
+ return _("workspace limit for empty substrings reached");
++#endif
+ case PCRE_ERROR_BADNEWLINE:
+ return _("invalid combination of newline flags");
+ default:
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
index 8fd5f9e..95a02e4 100644
--- a/devel/glib20/files/patch-glib_gutils.c
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -5,7 +5,7 @@
if (!data_dirs || !data_dirs[0])
- data_dirs = "/usr/local/share/:/usr/share/";
-+ data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++ data_dirs = "/usr/local/share/";
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index 47ca3e6..586d7f8 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,7 +1,3 @@
-
-$FreeBSD$
- $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz Exp $
-
--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
@@ -104,6 +104,7 @@
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 55ee6ca..1caac44 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -41,8 +41,10 @@ include/glib-2.0/glib/gqsort.h
include/glib-2.0/glib/gquark.h
include/glib-2.0/glib/gqueue.h
include/glib-2.0/glib/grand.h
+include/glib-2.0/glib/gregex.h
include/glib-2.0/glib/grel.h
include/glib-2.0/glib/gscanner.h
+include/glib-2.0/glib/gsequence.h
include/glib-2.0/glib/gshell.h
include/glib-2.0/glib/gslice.h
include/glib-2.0/glib/gslist.h
@@ -105,6 +107,7 @@ share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/Makefile.in.in
share/locale/am/LC_MESSAGES/glib20.mo
share/locale/ar/LC_MESSAGES/glib20.mo
+share/locale/as/LC_MESSAGES/glib20.mo
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/be/LC_MESSAGES/glib20.mo
share/locale/be@latin/LC_MESSAGES/glib20.mo
@@ -141,10 +144,12 @@ share/locale/is/LC_MESSAGES/glib20.mo
share/locale/it/LC_MESSAGES/glib20.mo
share/locale/ja/LC_MESSAGES/glib20.mo
share/locale/ka/LC_MESSAGES/glib20.mo
+share/locale/kn/LC_MESSAGES/glib20.mo
share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/ku/LC_MESSAGES/glib20.mo
share/locale/lt/LC_MESSAGES/glib20.mo
share/locale/lv/LC_MESSAGES/glib20.mo
+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
@@ -153,6 +158,7 @@ share/locale/nb/LC_MESSAGES/glib20.mo
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
+share/locale/oc/LC_MESSAGES/glib20.mo
share/locale/or/LC_MESSAGES/glib20.mo
share/locale/pa/LC_MESSAGES/glib20.mo
share/locale/pl/LC_MESSAGES/glib20.mo
@@ -204,6 +210,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@@ -214,3 +224,5 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index e0fdc62..b733ebd 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glibmm/Makefile,v 1.39 2006/12/30 18:56:48 marcus Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.48 2007/10/06 21:15:01 mezz Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.12.10
+PORTVERSION= 2.14.1
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 9da3ca6..74627bf 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.12.10.tar.bz2) = 85830693d669f0d86d6e64db3b57f581
-SHA256 (gnome2/glibmm-2.12.10.tar.bz2) = 21b760b1567f9fcd9ea5244f02fdb0583852f7f4c513ab83726a1a076093320b
-SIZE (gnome2/glibmm-2.12.10.tar.bz2) = 2360587
+MD5 (gnome2/glibmm-2.14.1.tar.bz2) = b75877e454afa956a1e86a89ab1fa9b0
+SHA256 (gnome2/glibmm-2.14.1.tar.bz2) = 963b47b530a0cead2148295d8929b957db53578ca80dee362d1dbd675ea1b2d5
+SIZE (gnome2/glibmm-2.14.1.tar.bz2) = 9273164
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.cc b/devel/glibmm/files/patch-glib_glibmm_date.cc
index 66c8560..539778d 100644
--- a/devel/glibmm/files/patch-glib_glibmm_date.cc
+++ b/devel/glibmm/files/patch-glib_glibmm_date.cc
@@ -1,19 +1,16 @@
---- glib/glibmm/date.cc.orig Sun Apr 22 12:28:36 2007
-+++ glib/glibmm/date.cc Sun Apr 22 12:28:48 2007
-@@ -73,7 +73,7 @@
-
+--- glib/glibmm/date.cc.orig Sun May 6 00:19:51 2007
++++ glib/glibmm/date.cc Sun May 6 00:21:36 2007
+@@ -72,12 +72,14 @@ void Date::set_parse(const Glib::ustring
+ }
#ifndef GLIBMM_DISABLE_DEPRECATED
--
+#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
- //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
- //That would make the set_time() method overload impossible.
-@@ -84,7 +84,7 @@
+ void Date::set_time(GTime time)
+ {
+ //This method, and the C function that it wraps, are deprecated.
g_date_set_time(&gobject_, time);
}
- #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
--
+#endif
#endif // GLIBMM_DISABLE_DEPRECATED
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.h b/devel/glibmm/files/patch-glib_glibmm_date.h
index fdf6ccc..12a6604 100644
--- a/devel/glibmm/files/patch-glib_glibmm_date.h
+++ b/devel/glibmm/files/patch-glib_glibmm_date.h
@@ -1,19 +1,17 @@
---- glib/glibmm/date.h.orig Sun Apr 22 12:29:49 2007
-+++ glib/glibmm/date.h Sun Apr 22 12:30:39 2007
-@@ -121,7 +121,7 @@
-
+--- glib/glibmm/date.h.orig Sun May 6 00:22:03 2007
++++ glib/glibmm/date.h Sun May 6 00:22:31 2007
+@@ -120,6 +120,7 @@ enum DMY
+ void set_parse (const Glib::ustring& str);
#ifndef GLIBMM_DISABLE_DEPRECATED
--
+#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
-
- //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
- //That would make the set_time() method overload impossible.
-@@ -134,7 +134,7 @@
+
+ /** Sets the value of a date from a GTime (time_t) value.
+ *
+@@ -128,6 +129,7 @@ enum DMY
+ * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
*/
void set_time(GTime time);
- #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
--
+#endif
#endif // GLIBMM_DISABLE_DEPRECATED
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 324f5d4..f816389 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -16,6 +16,7 @@ include/glibmm-%%API_VERSION%%/glibmm/i18n.h
include/glibmm-%%API_VERSION%%/glibmm/init.h
include/glibmm-%%API_VERSION%%/glibmm/interface.h
include/glibmm-%%API_VERSION%%/glibmm/iochannel.h
+include/glibmm-%%API_VERSION%%/glibmm/keyfile.h
include/glibmm-%%API_VERSION%%/glibmm/listhandle.h
include/glibmm-%%API_VERSION%%/glibmm/main.h
include/glibmm-%%API_VERSION%%/glibmm/markup.h
@@ -32,12 +33,14 @@ include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/optioncontext_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/optionentry_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/optiongroup_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/regex_p.h
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
@@ -48,6 +51,7 @@ include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
include/glibmm-%%API_VERSION%%/glibmm/quark.h
include/glibmm-%%API_VERSION%%/glibmm/random.h
include/glibmm-%%API_VERSION%%/glibmm/refptr.h
+include/glibmm-%%API_VERSION%%/glibmm/regex.h
include/glibmm-%%API_VERSION%%/glibmm/sarray.h
include/glibmm-%%API_VERSION%%/glibmm/shell.h
include/glibmm-%%API_VERSION%%/glibmm/signalproxy.h
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 50aae17..17e0d6b 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-build/Makefile,v 1.1 2007/02/12 05:30:37 mezz Exp $
+# $MCom: ports/devel/gnome-build/Makefile,v 1.5 2007/09/09 22:45:25 mezz Exp $
#
PORTNAME= gnome-build
PORTVERSION= 0.2.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist
index c0420a5..6820a05 100644
--- a/devel/gnome-build/pkg-plist
+++ b/devel/gnome-build/pkg-plist
@@ -22,13 +22,13 @@ lib/libgbf-widgets-1.la
lib/libgbf-widgets-1.so
lib/libgbf-widgets-1.so.1
libdata/pkgconfig/gnome-build-1.0.pc
-share/gnome/gnome-build/GBF/AmFiles.pm
-share/gnome/gnome-build/GBF/General.pm
-share/gnome/gnome-build/GBF/Make.pm
-share/gnome/gnome-build/glade/create_dialogs.glade
-share/gnome/gnome-build/glade/gbf-am-dialogs.glade
-share/gnome/pixmaps/gbf-build.png
-share/gnome/pixmaps/gbf-install.png
+share/gnome-build/GBF/AmFiles.pm
+share/gnome-build/GBF/General.pm
+share/gnome-build/GBF/Make.pm
+share/gnome-build/glade/create_dialogs.glade
+share/gnome-build/glade/gbf-am-dialogs.glade
+share/pixmaps/gbf-build.png
+share/pixmaps/gbf-install.png
share/locale/am/LC_MESSAGES/gbf-1.mo
share/locale/ar/LC_MESSAGES/gbf-1.mo
share/locale/az/LC_MESSAGES/gbf-1.mo
@@ -69,12 +69,14 @@ share/locale/sv/LC_MESSAGES/gbf-1.mo
share/locale/uk/LC_MESSAGES/gbf-1.mo
share/locale/vi/LC_MESSAGES/gbf-1.mo
share/locale/zh_CN/LC_MESSAGES/gbf-1.mo
-@dirrm share/gnome/gnome-build/glade
-@dirrm share/gnome/gnome-build/GBF
-@dirrm share/gnome/gnome-build
+@dirrm share/gnome-build/glade
+@dirrm share/gnome-build/GBF
+@dirrm share/gnome-build
@dirrm lib/gnome-build-1.0/backends
@dirrm lib/gnome-build-1.0
@dirrm include/gnome-build-1.0/gbf
@dirrm include/gnome-build-1.0
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index e1f9bea..45c002d 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnomecommon/Makefile,v 1.5 2005/09/20 09:39:51 ahze Exp $
+# $MCom: ports/devel/gnome-common/Makefile,v 1.7 2007/09/17 18:37:36 ahze Exp $
#
PORTNAME= gnome-common
-PORTVERSION= 2.18.0
+PORTVERSION= 2.20.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index 424c461..394b5ed 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-common-2.18.0.tar.bz2) = 567172e685fc0783b1d6ab9843a85d6a
-SHA256 (gnome2/gnome-common-2.18.0.tar.bz2) = ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b
-SIZE (gnome2/gnome-common-2.18.0.tar.bz2) = 62628
+MD5 (gnome2/gnome-common-2.20.0.tar.bz2) = 89e47677fb72695c75d2cefac84ff9f1
+SHA256 (gnome2/gnome-common-2.20.0.tar.bz2) = 0e807cfe74a684c494a0949b7f96d231660f323253a89053e3ec32c4f518c8d9
+SIZE (gnome2/gnome-common-2.20.0.tar.bz2) = 64309
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index e539021..4d27d5d 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-crash
PORTVERSION= 0.0.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-crash/0.0
diff --git a/devel/gnome-crash/files/patch-src::Makefile.in b/devel/gnome-crash/files/patch-src::Makefile.in
index b9ede67..fab997d 100644
--- a/devel/gnome-crash/files/patch-src::Makefile.in
+++ b/devel/gnome-crash/files/patch-src::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
gdb_DATA = gdb-cmd
#CFLAGS+=-Werror
--INCLUDES = -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\" -DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\" -DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\" -DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
-+INCLUDES = $(GNOME_PRINT_CFLAGS) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\" -DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\" -DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\" -DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
+-INCLUDES = -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\" -DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\" -DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\" -DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
++INCLUDES = $(GNOME_PRINT_CFLAGS) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(EXTRA_GNOME_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOME_CRASH_GLADE_DIR=\""$(gladedir)"\" -DGNOME_CRASH_GDB_DIR=\""$(gdbdir)"\" -DGNOME_CRASH_ICON_DIR=\""$(datadir)/pixmaps"\" -DGNOME_CRASH_DATA_DIR=\""$(datadir)/gnome-crash"\"
bin_PROGRAMS = gnome-crash
diff --git a/devel/gnome-crash/pkg-plist b/devel/gnome-crash/pkg-plist
index 11469ae..0fbb0a4 100644
--- a/devel/gnome-crash/pkg-plist
+++ b/devel/gnome-crash/pkg-plist
@@ -1,12 +1,12 @@
bin/gnome-crash
-share/gnome/apps/Utilities/gnome-crash.desktop
-share/gnome/gnome-crash/gdb/gdb-cmd
-share/gnome/gnome-crash/glade/about.glade
-share/gnome/gnome-crash/glade/gnome-crash.glade
-share/gnome/gnome-crash/gnome-crash-animation.png
-share/gnome/mime-info/gnome-crash.keys
-share/gnome/mime-info/gnome-crash.mime
-share/gnome/pixmaps/gnome-crash-icon.png
-@dirrm share/gnome/gnome-crash/glade
-@dirrm share/gnome/gnome-crash/gdb
-@dirrm share/gnome/gnome-crash
+share/apps/Utilities/gnome-crash.desktop
+share/gnome-crash/gdb/gdb-cmd
+share/gnome-crash/glade/about.glade
+share/gnome-crash/glade/gnome-crash.glade
+share/gnome-crash/gnome-crash-animation.png
+share/mime-info/gnome-crash.keys
+share/mime-info/gnome-crash.mime
+share/pixmaps/gnome-crash-icon.png
+@dirrm share/gnome-crash/glade
+@dirrm share/gnome-crash/gdb
+@dirrm share/gnome-crash
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 798462e..4946aa0 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,16 +3,15 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/Makefile,v 1.167 2007/03/13 13:02:20 ahze Exp $
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.179 2007/10/22 21:07:02 ahze Exp $
#
PORTNAME= gnome-vfs
-PORTVERSION= 2.18.1
+PORTVERSION= 2.20.0
PORTREVISION?= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME= gnome-vfs-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index f5b3aa6..dbfa59b 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.18.1.tar.bz2) = bf4a6d95180d05981893e5d021c6695c
-SHA256 (gnome2/gnome-vfs-2.18.1.tar.bz2) = 098d920cb7d4a50e245deaafabfd8e06b86c88771d56be567597c09c09207f5e
-SIZE (gnome2/gnome-vfs-2.18.1.tar.bz2) = 1916897
+MD5 (gnome2/gnome-vfs-2.20.0.tar.bz2) = b9fe0a066d0e693e74a000e55338235b
+SHA256 (gnome2/gnome-vfs-2.20.0.tar.bz2) = cd95ec5a4808799f033dcb9daf37ed38436c594d4014e5804967fa9e5893e91f
+SIZE (gnome2/gnome-vfs-2.20.0.tar.bz2) = 1918358
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
new file mode 100644
index 0000000..c7fb1cf
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
@@ -0,0 +1,11 @@
+--- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2007-09-17 14:48:45.000000000 -0400
++++ libgnomevfs/gnome-vfs-filesystem-type.c 2007-09-17 14:50:06.000000000 -0400
+@@ -65,6 +65,8 @@ static struct FSInfo fs_data[] = {
+ { "msdosfs" , N_("MSDOS Volume"), 0 },
+ { "nfs" , N_("NFS Network Volume"), 1 },
+ { "ntfs" , N_("Windows NT Volume"), 0 },
++ { "nullfs" , N_("BSD Loopback Volume"), 1 },
++ { "zfs" , N_("ZFS Volume"), 1 },
+ { "nwfs" , N_("Netware Volume"), 0 },
+ { "proc" , N_("System Volume"), 0 },
+ { "procfs" , N_("System Volume"), 0 },
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 068d177..0000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005
-+++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005
-@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
- for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
- full_filename = g_build_filename (*temp_paths,
- "share",
-+ "gnome",
- "pixmaps",
- relative_filename,
- NULL);
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
index aaa8ff2..a987957 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
@@ -5,7 +5,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "%%LOCALBASE%%/share/gnome/:%%LOCALBASE%%/share/:/usr/share/";
++ xdg_data_dirs = "%%LOCALBASE%%/share/";
ptr = xdg_data_dirs;
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index f920c57..dffcc3d 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.12 2006/12/18 12:34:11 ahze Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.15 2007/08/15 17:52:05 mezz Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index ff583b7..ea79417 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.12 2006/12/18 12:34:11 ahze Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.15 2007/08/15 17:52:05 mezz Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 81ed5c9..606b21c 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -28,12 +28,12 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
@@ -160,6 +160,7 @@ share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -176,6 +177,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -200,10 +202,14 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
@dirrmtry share/locale/mr/LC_MESSAGES
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 3a5fa10..80b3531 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 1.0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/1.0
diff --git a/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 07854242..0000000
--- a/devel/gnome-vfs1/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 16:42:00 2002
-+++ libgnomevfs/gnome-vfs-utils.c Sun May 5 16:42:15 2002
-@@ -771,7 +771,7 @@
- paths = g_strsplit (gnome_var, ":", 0);
-
- for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
-- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
-+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- if (hack_file_exists (full_filename)) {
- g_strfreev (paths);
- return full_filename;
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 040fc69..e01ed0f 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.23 2007/03/10 05:33:01 marcus Exp $
+# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.25 2007/09/17 16:37:10 marcus Exp $
#
PORTNAME= gnome-vfsmm
-PORTVERSION= 2.18.0
-PORTREVISION= 1
+PORTVERSION= 2.20.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/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index 7c4b659..b70b4da 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = 1c5c0ef2ffcf52e682375fa11facebbf
-SHA256 (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = fd9a083db7d631666df2872e5d3b0a236e3116f417ee5fc116d64e0082f363a6
-SIZE (gnome2/gnome-vfsmm-2.18.0.tar.bz2) = 345525
+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
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index 1e5c964..6539969 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.42 2006/10/14 06:29:06 ahze Exp $
+# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.45 2007/09/19 23:27:28 marcus Exp $
#
PORTREVISION= 0
@@ -21,7 +21,8 @@ RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \
meld:${PORTSDIR}/textproc/meld \
gtranslator:${PORTSDIR}/devel/gtranslator \
regexxer:${PORTSDIR}/devel/regexxer \
- anjuta:${PORTSDIR}/devel/anjuta
+ anjuta:${PORTSDIR}/devel/anjuta \
+ accerciser:${PORTSDIR}/accessibility/accerciser
MASTERDIR= ${.CURDIR}/../../x11/gnome2
GNOME_SLAVE= yes
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 99c7392..79a6b1f 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -3,12 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/goffice/Makefile,v 1.23 2007/03/11 20:02:56 mezz Exp $
+# $MCom: ports/devel/goffice/Makefile,v 1.32 2007/09/06 05:01:28 marcus Exp $
#
# !!! When updating goffice, don't forget to update science/gchempaint pkg-plists too! !!!
PORTNAME= goffice
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index 3c0fd39..d748495 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -290,130 +290,22 @@ libdata/pkgconfig/libgoffice-0.4.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
-share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-series-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
-share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/%%VERSION%%/area.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-none.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/boxplot.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bubble.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/color.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/column.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/doughnut.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/dropbar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/hist.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/linegraph.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/minmax.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/pie.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/polar.png
-share/gnome/pixmaps/goffice/%%VERSION%%/radar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/scatter.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/stock.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/surface.xpm
+%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade
+%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade
+%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml
share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -458,16 +350,120 @@ share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/gnome/pixmaps/goffice/%%VERSION%%
-@dirrm share/gnome/pixmaps/goffice
-@dirrm share/gnome/goffice/%%VERSION%%/patterns
-@dirrm share/gnome/goffice/%%VERSION%%/glade
-@dirrm share/gnome/goffice/%%VERSION%%
-@dirrm share/gnome/goffice
+share/pixmaps/goffice/%%VERSION%%/area.xpm
+share/pixmaps/goffice/%%VERSION%%/bar-hboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-hminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-hplus.png
+share/pixmaps/goffice/%%VERSION%%/bar-none.png
+share/pixmaps/goffice/%%VERSION%%/bar-vboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-vminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-vplus.png
+share/pixmaps/goffice/%%VERSION%%/bar.xpm
+share/pixmaps/goffice/%%VERSION%%/boxplot.xpm
+share/pixmaps/goffice/%%VERSION%%/bubble.xpm
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/pixmaps/goffice/%%VERSION%%/color.xpm
+share/pixmaps/goffice/%%VERSION%%/column.xpm
+share/pixmaps/goffice/%%VERSION%%/doughnut.xpm
+share/pixmaps/goffice/%%VERSION%%/dropbar.xpm
+share/pixmaps/goffice/%%VERSION%%/hist.xpm
+share/pixmaps/goffice/%%VERSION%%/linegraph.xpm
+share/pixmaps/goffice/%%VERSION%%/minmax.xpm
+share/pixmaps/goffice/%%VERSION%%/pie.xpm
+share/pixmaps/goffice/%%VERSION%%/polar.png
+share/pixmaps/goffice/%%VERSION%%/radar.xpm
+share/pixmaps/goffice/%%VERSION%%/scatter.xpm
+share/pixmaps/goffice/%%VERSION%%/stock.xpm
+share/pixmaps/goffice/%%VERSION%%/surface.xpm
+@dirrm share/pixmaps/goffice/%%VERSION%%
+@dirrm share/pixmaps/goffice
+@dirrm %%DATADIR%%/%%VERSION%%/patterns
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
@dirrm lib/goffice/%%VERSION%%/plugins/smoothing
@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@@ -493,3 +489,7 @@ share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
@dirrm include/libgoffice-0.4/goffice/app
@dirrm include/libgoffice-0.4/goffice
@dirrm include/libgoffice-0.4
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile
index 99c7392..79a6b1f 100644
--- a/devel/goffice04/Makefile
+++ b/devel/goffice04/Makefile
@@ -3,12 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/goffice/Makefile,v 1.23 2007/03/11 20:02:56 mezz Exp $
+# $MCom: ports/devel/goffice/Makefile,v 1.32 2007/09/06 05:01:28 marcus Exp $
#
# !!! When updating goffice, don't forget to update science/gchempaint pkg-plists too! !!!
PORTNAME= goffice
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/goffice04/pkg-plist b/devel/goffice04/pkg-plist
index 3c0fd39..d748495 100644
--- a/devel/goffice04/pkg-plist
+++ b/devel/goffice04/pkg-plist
@@ -290,130 +290,22 @@ libdata/pkgconfig/libgoffice-0.4.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
-share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-series-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
-share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/%%VERSION%%/area.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-hplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-none.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vboth.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vminus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar-vplus.png
-share/gnome/pixmaps/goffice/%%VERSION%%/bar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/boxplot.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/bubble.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/%%VERSION%%/color.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/column.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/doughnut.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/dropbar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/hist.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/linegraph.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/minmax.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/pie.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/polar.png
-share/gnome/pixmaps/goffice/%%VERSION%%/radar.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/scatter.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/stock.xpm
-share/gnome/pixmaps/goffice/%%VERSION%%/surface.xpm
+%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade
+%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade
+%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml
share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -458,16 +350,120 @@ share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/gnome/pixmaps/goffice/%%VERSION%%
-@dirrm share/gnome/pixmaps/goffice
-@dirrm share/gnome/goffice/%%VERSION%%/patterns
-@dirrm share/gnome/goffice/%%VERSION%%/glade
-@dirrm share/gnome/goffice/%%VERSION%%
-@dirrm share/gnome/goffice
+share/pixmaps/goffice/%%VERSION%%/area.xpm
+share/pixmaps/goffice/%%VERSION%%/bar-hboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-hminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-hplus.png
+share/pixmaps/goffice/%%VERSION%%/bar-none.png
+share/pixmaps/goffice/%%VERSION%%/bar-vboth.png
+share/pixmaps/goffice/%%VERSION%%/bar-vminus.png
+share/pixmaps/goffice/%%VERSION%%/bar-vplus.png
+share/pixmaps/goffice/%%VERSION%%/bar.xpm
+share/pixmaps/goffice/%%VERSION%%/boxplot.xpm
+share/pixmaps/goffice/%%VERSION%%/bubble.xpm
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
+share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
+share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
+share/pixmaps/goffice/%%VERSION%%/color.xpm
+share/pixmaps/goffice/%%VERSION%%/column.xpm
+share/pixmaps/goffice/%%VERSION%%/doughnut.xpm
+share/pixmaps/goffice/%%VERSION%%/dropbar.xpm
+share/pixmaps/goffice/%%VERSION%%/hist.xpm
+share/pixmaps/goffice/%%VERSION%%/linegraph.xpm
+share/pixmaps/goffice/%%VERSION%%/minmax.xpm
+share/pixmaps/goffice/%%VERSION%%/pie.xpm
+share/pixmaps/goffice/%%VERSION%%/polar.png
+share/pixmaps/goffice/%%VERSION%%/radar.xpm
+share/pixmaps/goffice/%%VERSION%%/scatter.xpm
+share/pixmaps/goffice/%%VERSION%%/stock.xpm
+share/pixmaps/goffice/%%VERSION%%/surface.xpm
+@dirrm share/pixmaps/goffice/%%VERSION%%
+@dirrm share/pixmaps/goffice
+@dirrm %%DATADIR%%/%%VERSION%%/patterns
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
@dirrm lib/goffice/%%VERSION%%/plugins/smoothing
@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@@ -493,3 +489,7 @@ share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
@dirrm include/libgoffice-0.4/goffice/app
@dirrm include/libgoffice-0.4/goffice
@dirrm include/libgoffice-0.4
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile
index 3a904a6..225ba2c 100644
--- a/devel/goffice1/Makefile
+++ b/devel/goffice1/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/goffice/Makefile,v 1.9 2006/01/31 22:13:22 ahze Exp $
+# $MCom: ports/devel/goffice1/Makefile,v 1.1 2007/07/23 21:36:19 mezz Exp $
#
PORTNAME= goffice
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
diff --git a/devel/goffice1/pkg-plist b/devel/goffice1/pkg-plist
index 2bfccab..313ef95 100644
--- a/devel/goffice1/pkg-plist
+++ b/devel/goffice1/pkg-plist
@@ -174,116 +174,116 @@ lib/libgoffice-1.la
lib/libgoffice-1.so
lib/libgoffice-1.so.2
libdata/pkgconfig/libgoffice-1.pc
-share/gnome/goffice/%%VERSION%%/glade/go-font-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-format-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/go-rotation-sel.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-chart-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-guru.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-object-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
-share/gnome/goffice/%%VERSION%%/glade/gog-style-prefs.glade
-share/gnome/goffice/%%VERSION%%/patterns/svg-patterns.xml
-share/gnome/pixmaps/goffice/area.xpm
-share/gnome/pixmaps/goffice/bar-hboth.png
-share/gnome/pixmaps/goffice/bar-hminus.png
-share/gnome/pixmaps/goffice/bar-hplus.png
-share/gnome/pixmaps/goffice/bar-none.png
-share/gnome/pixmaps/goffice/bar-vboth.png
-share/gnome/pixmaps/goffice/bar-vminus.png
-share/gnome/pixmaps/goffice/bar-vplus.png
-share/gnome/pixmaps/goffice/bar.xpm
-share/gnome/pixmaps/goffice/boxplot.xpm
-share/gnome/pixmaps/goffice/bubble.xpm
-share/gnome/pixmaps/goffice/chart_area_1_1.png
-share/gnome/pixmaps/goffice/chart_area_1_2.png
-share/gnome/pixmaps/goffice/chart_area_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_1_1.png
-share/gnome/pixmaps/goffice/chart_bar_1_2.png
-share/gnome/pixmaps/goffice/chart_bar_1_3.png
-share/gnome/pixmaps/goffice/chart_bar_2_1.png
-share/gnome/pixmaps/goffice/chart_bar_2_2.png
-share/gnome/pixmaps/goffice/chart_bar_2_3.png
-share/gnome/pixmaps/goffice/chart_boxplot_1_1.png
-share/gnome/pixmaps/goffice/chart_bubble_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_1.png
-share/gnome/pixmaps/goffice/chart_column_1_2.png
-share/gnome/pixmaps/goffice/chart_column_1_3.png
-share/gnome/pixmaps/goffice/chart_column_2_1.png
-share/gnome/pixmaps/goffice/chart_column_2_2.png
-share/gnome/pixmaps/goffice/chart_column_2_3.png
-share/gnome/pixmaps/goffice/chart_column_3_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_1.png
-share/gnome/pixmaps/goffice/chart_cone_1_2.png
-share/gnome/pixmaps/goffice/chart_cone_1_3.png
-share/gnome/pixmaps/goffice/chart_cone_2_1.png
-share/gnome/pixmaps/goffice/chart_cone_2_2.png
-share/gnome/pixmaps/goffice/chart_cone_2_3.png
-share/gnome/pixmaps/goffice/chart_cone_3_1.png
-share/gnome/pixmaps/goffice/chart_contour_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_1_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_1.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_2.png
-share/gnome/pixmaps/goffice/chart_cylinder_2_3.png
-share/gnome/pixmaps/goffice/chart_cylinder_3_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_1.png
-share/gnome/pixmaps/goffice/chart_dropbar_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_1.png
-share/gnome/pixmaps/goffice/chart_line_1_2.png
-share/gnome/pixmaps/goffice/chart_line_1_3.png
-share/gnome/pixmaps/goffice/chart_line_2_1.png
-share/gnome/pixmaps/goffice/chart_line_2_2.png
-share/gnome/pixmaps/goffice/chart_line_2_3.png
-share/gnome/pixmaps/goffice/chart_line_3_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_1.png
-share/gnome/pixmaps/goffice/chart_minmax_1_2.png
-share/gnome/pixmaps/goffice/chart_minmax_2_1.png
-share/gnome/pixmaps/goffice/chart_minmax_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_1.png
-share/gnome/pixmaps/goffice/chart_pie_1_2.png
-share/gnome/pixmaps/goffice/chart_pie_1_3.png
-share/gnome/pixmaps/goffice/chart_pie_2_1.png
-share/gnome/pixmaps/goffice/chart_pie_2_2.png
-share/gnome/pixmaps/goffice/chart_pie_2_3.png
-share/gnome/pixmaps/goffice/chart_polar_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_1_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_1.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_2.png
-share/gnome/pixmaps/goffice/chart_pyramid_2_3.png
-share/gnome/pixmaps/goffice/chart_pyramid_3_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_1.png
-share/gnome/pixmaps/goffice/chart_radar_1_2.png
-share/gnome/pixmaps/goffice/chart_radar_1_3.png
-share/gnome/pixmaps/goffice/chart_ring_1_1.png
-share/gnome/pixmaps/goffice/chart_ring_1_2.png
-share/gnome/pixmaps/goffice/chart_scatter_1_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_1.png
-share/gnome/pixmaps/goffice/chart_scatter_2_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_1.png
-share/gnome/pixmaps/goffice/chart_scatter_3_2.png
-share/gnome/pixmaps/goffice/chart_scatter_3_3.png
-share/gnome/pixmaps/goffice/chart_stock_1_1.png
-share/gnome/pixmaps/goffice/chart_stock_1_2.png
-share/gnome/pixmaps/goffice/chart_stock_2_1.png
-share/gnome/pixmaps/goffice/chart_stock_2_2.png
-share/gnome/pixmaps/goffice/column.xpm
-share/gnome/pixmaps/goffice/doughnut.xpm
-share/gnome/pixmaps/goffice/dropbar.xpm
-share/gnome/pixmaps/goffice/linegraph.xpm
-share/gnome/pixmaps/goffice/minmax.xpm
-share/gnome/pixmaps/goffice/pie.xpm
-share/gnome/pixmaps/goffice/polar.png
-share/gnome/pixmaps/goffice/radar.xpm
-share/gnome/pixmaps/goffice/scatter.xpm
-share/gnome/pixmaps/goffice/stock.xpm
-share/gnome/pixmaps/goffice/surface.xpm
+share/goffice/%%VERSION%%/glade/go-font-sel.glade
+share/goffice/%%VERSION%%/glade/go-format-sel.glade
+share/goffice/%%VERSION%%/glade/go-rotation-sel.glade
+share/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-chart-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
+share/goffice/%%VERSION%%/glade/gog-guru.glade
+share/goffice/%%VERSION%%/glade/gog-object-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
+share/goffice/%%VERSION%%/glade/gog-style-prefs.glade
+share/goffice/%%VERSION%%/patterns/svg-patterns.xml
+share/pixmaps/goffice/area.xpm
+share/pixmaps/goffice/bar-hboth.png
+share/pixmaps/goffice/bar-hminus.png
+share/pixmaps/goffice/bar-hplus.png
+share/pixmaps/goffice/bar-none.png
+share/pixmaps/goffice/bar-vboth.png
+share/pixmaps/goffice/bar-vminus.png
+share/pixmaps/goffice/bar-vplus.png
+share/pixmaps/goffice/bar.xpm
+share/pixmaps/goffice/boxplot.xpm
+share/pixmaps/goffice/bubble.xpm
+share/pixmaps/goffice/chart_area_1_1.png
+share/pixmaps/goffice/chart_area_1_2.png
+share/pixmaps/goffice/chart_area_1_3.png
+share/pixmaps/goffice/chart_bar_1_1.png
+share/pixmaps/goffice/chart_bar_1_2.png
+share/pixmaps/goffice/chart_bar_1_3.png
+share/pixmaps/goffice/chart_bar_2_1.png
+share/pixmaps/goffice/chart_bar_2_2.png
+share/pixmaps/goffice/chart_bar_2_3.png
+share/pixmaps/goffice/chart_boxplot_1_1.png
+share/pixmaps/goffice/chart_bubble_1_1.png
+share/pixmaps/goffice/chart_column_1_1.png
+share/pixmaps/goffice/chart_column_1_2.png
+share/pixmaps/goffice/chart_column_1_3.png
+share/pixmaps/goffice/chart_column_2_1.png
+share/pixmaps/goffice/chart_column_2_2.png
+share/pixmaps/goffice/chart_column_2_3.png
+share/pixmaps/goffice/chart_column_3_1.png
+share/pixmaps/goffice/chart_cone_1_1.png
+share/pixmaps/goffice/chart_cone_1_2.png
+share/pixmaps/goffice/chart_cone_1_3.png
+share/pixmaps/goffice/chart_cone_2_1.png
+share/pixmaps/goffice/chart_cone_2_2.png
+share/pixmaps/goffice/chart_cone_2_3.png
+share/pixmaps/goffice/chart_cone_3_1.png
+share/pixmaps/goffice/chart_contour_1_1.png
+share/pixmaps/goffice/chart_cylinder_1_1.png
+share/pixmaps/goffice/chart_cylinder_1_2.png
+share/pixmaps/goffice/chart_cylinder_1_3.png
+share/pixmaps/goffice/chart_cylinder_2_1.png
+share/pixmaps/goffice/chart_cylinder_2_2.png
+share/pixmaps/goffice/chart_cylinder_2_3.png
+share/pixmaps/goffice/chart_cylinder_3_1.png
+share/pixmaps/goffice/chart_dropbar_1_1.png
+share/pixmaps/goffice/chart_dropbar_1_2.png
+share/pixmaps/goffice/chart_line_1_1.png
+share/pixmaps/goffice/chart_line_1_2.png
+share/pixmaps/goffice/chart_line_1_3.png
+share/pixmaps/goffice/chart_line_2_1.png
+share/pixmaps/goffice/chart_line_2_2.png
+share/pixmaps/goffice/chart_line_2_3.png
+share/pixmaps/goffice/chart_line_3_1.png
+share/pixmaps/goffice/chart_minmax_1_1.png
+share/pixmaps/goffice/chart_minmax_1_2.png
+share/pixmaps/goffice/chart_minmax_2_1.png
+share/pixmaps/goffice/chart_minmax_2_2.png
+share/pixmaps/goffice/chart_pie_1_1.png
+share/pixmaps/goffice/chart_pie_1_2.png
+share/pixmaps/goffice/chart_pie_1_3.png
+share/pixmaps/goffice/chart_pie_2_1.png
+share/pixmaps/goffice/chart_pie_2_2.png
+share/pixmaps/goffice/chart_pie_2_3.png
+share/pixmaps/goffice/chart_polar_1_1.png
+share/pixmaps/goffice/chart_pyramid_1_1.png
+share/pixmaps/goffice/chart_pyramid_1_2.png
+share/pixmaps/goffice/chart_pyramid_1_3.png
+share/pixmaps/goffice/chart_pyramid_2_1.png
+share/pixmaps/goffice/chart_pyramid_2_2.png
+share/pixmaps/goffice/chart_pyramid_2_3.png
+share/pixmaps/goffice/chart_pyramid_3_1.png
+share/pixmaps/goffice/chart_radar_1_1.png
+share/pixmaps/goffice/chart_radar_1_2.png
+share/pixmaps/goffice/chart_radar_1_3.png
+share/pixmaps/goffice/chart_ring_1_1.png
+share/pixmaps/goffice/chart_ring_1_2.png
+share/pixmaps/goffice/chart_scatter_1_1.png
+share/pixmaps/goffice/chart_scatter_2_1.png
+share/pixmaps/goffice/chart_scatter_2_2.png
+share/pixmaps/goffice/chart_scatter_3_1.png
+share/pixmaps/goffice/chart_scatter_3_2.png
+share/pixmaps/goffice/chart_scatter_3_3.png
+share/pixmaps/goffice/chart_stock_1_1.png
+share/pixmaps/goffice/chart_stock_1_2.png
+share/pixmaps/goffice/chart_stock_2_1.png
+share/pixmaps/goffice/chart_stock_2_2.png
+share/pixmaps/goffice/column.xpm
+share/pixmaps/goffice/doughnut.xpm
+share/pixmaps/goffice/dropbar.xpm
+share/pixmaps/goffice/linegraph.xpm
+share/pixmaps/goffice/minmax.xpm
+share/pixmaps/goffice/pie.xpm
+share/pixmaps/goffice/polar.png
+share/pixmaps/goffice/radar.xpm
+share/pixmaps/goffice/scatter.xpm
+share/pixmaps/goffice/stock.xpm
+share/pixmaps/goffice/surface.xpm
share/locale/am/LC_MESSAGES/goffice.mo
share/locale/az/LC_MESSAGES/goffice.mo
share/locale/bg/LC_MESSAGES/goffice.mo
@@ -328,13 +328,11 @@ share/locale/uk/LC_MESSAGES/goffice.mo
share/locale/vi/LC_MESSAGES/goffice.mo
share/locale/zh_CN/LC_MESSAGES/goffice.mo
share/locale/zh_TW/LC_MESSAGES/goffice.mo
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/gnome/pixmaps/goffice
-@dirrm share/gnome/goffice/%%VERSION%%/patterns
-@dirrm share/gnome/goffice/%%VERSION%%/glade
-@dirrm share/gnome/goffice/%%VERSION%%
-@dirrm share/gnome/goffice
+@dirrm share/pixmaps/goffice
+@dirrm share/goffice/%%VERSION%%/patterns
+@dirrm share/goffice/%%VERSION%%/glade
+@dirrm share/goffice/%%VERSION%%
+@dirrm share/goffice
@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit
@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear
@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy
@@ -358,3 +356,5 @@ share/locale/zh_TW/LC_MESSAGES/goffice.mo
@dirrm include/libgoffice-1/goffice/app
@dirrm include/libgoffice-1/goffice
@dirrm include/libgoffice-1
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index a1b3fa0..97ef9b0 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gtranslator/Makefile,v 1.12 2007/07/04 15:52:37 mezz Exp $
#
PORTNAME= gtranslator
PORTVERSION= 1.1.7
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist
index 88ce574..842258d 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -1,46 +1,36 @@
bin/gtranslator
bin/pozilla.sh
-share/gnome/applications/gtranslator.desktop
-share/gnome/gtranslator/colorschemes/arek.xml
-share/gnome/gtranslator/colorschemes/boom-boom.xml
-share/gnome/gtranslator/colorschemes/clean.xml
-share/gnome/gtranslator/colorschemes/curlymonster.xml
-share/gnome/gtranslator/colorschemes/default.xml
-share/gnome/gtranslator/colorschemes/extremely-kabalak.xml
-share/gnome/gtranslator/colorschemes/kabalak.xml
-share/gnome/gtranslator/colorschemes/kbabel.xml
-share/gnome/gtranslator/colorschemes/menesis.xml
-share/gnome/gtranslator/colorschemes/mmc.xml
-share/gnome/gtranslator/colorschemes/nizuu.xml
-share/gnome/gtranslator/colorschemes/pdmc.xml
-share/gnome/gtranslator/colorschemes/sepia.xml
-share/gnome/gtranslator/colorschemes/spiffE.xml
-share/gnome/gtranslator/colorschemes/thinice.xml
-share/gnome/gtranslator/colorschemes/toyfactory.xml
-share/gnome/gtranslator/colorschemes/tuey.xml
-share/gnome/gtranslator/colorschemes/vim.xml
-share/gnome/gtranslator/colorschemes/waliays.xml
-share/gnome/gtranslator/colorschemes/yef.xml
-share/gnome/gtranslator/colorschemes/zuper.xml
-share/gnome/gtranslator/dtd/umtf.dtd
-share/gnome/gtranslator/scripts/build-gtranslator-learn-buffer.sh
-share/gnome/gtranslator/scripts/cleanup-gtranslator-settings.sh
-share/gnome/gtranslator/scripts/my-update.sh
+share/applications/gtranslator.desktop
share/gnome/help/gtranslator/C/figures/mainwindow.png
share/gnome/help/gtranslator/C/figures/prefs.png
share/gnome/help/gtranslator/C/figures/toolbar.png
share/gnome/help/gtranslator/C/gtranslator.xml
share/gnome/help/gtranslator/C/legal.xml
-share/gnome/mime-info/gtranslator.keys
-share/gnome/mime-info/gtranslator.mime
-share/gnome/omf/gtranslator/gtranslator-C.omf
-share/gnome/pixmaps/gnome-application-x-gmo.png
-share/gnome/pixmaps/gnome-application-x-po.png
-share/gnome/pixmaps/gtranslator.png
-share/gnome/pixmaps/gtranslator/fuzzy.png
-share/gnome/pixmaps/gtranslator/fuzzy_small.png
-share/gnome/pixmaps/gtranslator/untranslated.png
-share/gnome/pixmaps/gtranslator/untranslated_small.png
+%%DATADIR%%/colorschemes/arek.xml
+%%DATADIR%%/colorschemes/boom-boom.xml
+%%DATADIR%%/colorschemes/clean.xml
+%%DATADIR%%/colorschemes/curlymonster.xml
+%%DATADIR%%/colorschemes/default.xml
+%%DATADIR%%/colorschemes/extremely-kabalak.xml
+%%DATADIR%%/colorschemes/kabalak.xml
+%%DATADIR%%/colorschemes/kbabel.xml
+%%DATADIR%%/colorschemes/menesis.xml
+%%DATADIR%%/colorschemes/mmc.xml
+%%DATADIR%%/colorschemes/nizuu.xml
+%%DATADIR%%/colorschemes/pdmc.xml
+%%DATADIR%%/colorschemes/sepia.xml
+%%DATADIR%%/colorschemes/spiffE.xml
+%%DATADIR%%/colorschemes/thinice.xml
+%%DATADIR%%/colorschemes/toyfactory.xml
+%%DATADIR%%/colorschemes/tuey.xml
+%%DATADIR%%/colorschemes/vim.xml
+%%DATADIR%%/colorschemes/waliays.xml
+%%DATADIR%%/colorschemes/yef.xml
+%%DATADIR%%/colorschemes/zuper.xml
+%%DATADIR%%/dtd/umtf.dtd
+%%DATADIR%%/scripts/build-gtranslator-learn-buffer.sh
+%%DATADIR%%/scripts/cleanup-gtranslator-settings.sh
+%%DATADIR%%/scripts/my-update.sh
share/locale/am/LC_MESSAGES/gtranslator.mo
share/locale/az/LC_MESSAGES/gtranslator.mo
share/locale/be/LC_MESSAGES/gtranslator.mo
@@ -92,12 +82,23 @@ share/locale/vi/LC_MESSAGES/gtranslator.mo
share/locale/wa/LC_MESSAGES/gtranslator.mo
share/locale/zh_CN/LC_MESSAGES/gtranslator.mo
share/locale/zh_TW/LC_MESSAGES/gtranslator.mo
-@dirrm share/gnome/pixmaps/gtranslator
-@dirrm share/gnome/omf/gtranslator
+share/mime-info/gtranslator.keys
+share/mime-info/gtranslator.mime
+share/omf/gtranslator/gtranslator-C.omf
+share/pixmaps/gnome-application-x-gmo.png
+share/pixmaps/gnome-application-x-po.png
+share/pixmaps/gtranslator.png
+share/pixmaps/gtranslator/fuzzy.png
+share/pixmaps/gtranslator/fuzzy_small.png
+share/pixmaps/gtranslator/untranslated.png
+share/pixmaps/gtranslator/untranslated_small.png
+@dirrm share/pixmaps/gtranslator
+@dirrm share/omf/gtranslator
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/dtd
+@dirrm %%DATADIR%%/colorschemes
+@dirrm %%DATADIR%%
@dirrm share/gnome/help/gtranslator/C/figures
@dirrm share/gnome/help/gtranslator/C
@dirrm share/gnome/help/gtranslator
-@dirrm share/gnome/gtranslator/scripts
-@dirrm share/gnome/gtranslator/dtd
-@dirrm share/gnome/gtranslator/colorschemes
-@dirrm share/gnome/gtranslator
+@dirrmtry share/applications
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 05c5d8b..338f12d 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guikachu
PORTVERSION= 1.5.10
-PORTEPOCH= 2
+PORTEPOCH= 3
CATEGORIES= devel palm gnome
MASTER_SITES= http://cactus.rulez.org/projects/guikachu/download/
diff --git a/devel/guikachu/pkg-plist b/devel/guikachu/pkg-plist
index 82cdac3..75e94b1 100644
--- a/devel/guikachu/pkg-plist
+++ b/devel/guikachu/pkg-plist
@@ -1,7 +1,7 @@
bin/guikachu
bin/guikachu2rcp
-share/gnome/application-registry/guikachu.applications
-share/gnome/applications/guikachu.desktop
+share/application-registry/guikachu.applications
+share/applications/guikachu.desktop
share/gnome/help/guikachu/C/bitmaps.html
share/gnome/help/guikachu/C/form-editor.html
share/gnome/help/guikachu/C/guikachu-doc-html.css
@@ -34,9 +34,9 @@ share/gnome/help/guikachu/C/resource-win.html
share/gnome/help/guikachu/C/resources.html
share/gnome/help/guikachu/C/using.html
share/gnome/help/guikachu/C/widgets.html
-share/gnome/pixmaps/guikachu-96.png
-share/gnome/pixmaps/guikachu-application-x-guikachu-96.png
-share/gnome/pixmaps/guikachu.png
+share/pixmaps/guikachu-96.png
+share/pixmaps/guikachu-application-x-guikachu-96.png
+share/pixmaps/guikachu.png
share/locale/az/LC_MESSAGES/guikachu.mo
share/locale/ca/LC_MESSAGES/guikachu.mo
share/locale/cs/LC_MESSAGES/guikachu.mo
@@ -67,3 +67,4 @@ share/mime/packages/guikachu.mime.xml
@dirrm share/gnome/help/guikachu
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 64c502e..400335c 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libassetml
PORTVERSION= 1.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ofset
@@ -31,6 +31,6 @@ CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
INFO= libassetml
post-install:
- @${MKDIR} ${PREFIX}/share/gnome/assetml
+ @${MKDIR} ${PREFIX}/share/assetml
.include <bsd.port.mk>
diff --git a/devel/libassetml/files/patch-configure b/devel/libassetml/files/patch-configure
deleted file mode 100644
index 788ddab..0000000
--- a/devel/libassetml/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Thu Dec 4 12:51:13 2003
-+++ configure Thu Dec 4 12:52:04 2003
-@@ -11645,7 +11646,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define ASSETML_DIR "${myprefix}/${DATADIRNAME}/${ASSETML_DIR}"
-+#define ASSETML_DIR "${myprefix}/${DATADIRNAME}/gnome/${ASSETML_DIR}"
- _ACEOF
-
-
diff --git a/devel/libassetml/pkg-plist b/devel/libassetml/pkg-plist
index 7f12dfb..d40c251 100644
--- a/devel/libassetml/pkg-plist
+++ b/devel/libassetml/pkg-plist
@@ -10,9 +10,9 @@ share/gnome/help/libassetml/C/topic.dat
share/locale/fr/LC_MESSAGES/libassetml.mo
share/locale/it/LC_MESSAGES/libassetml.mo
share/locale/ja/LC_MESSAGES/libassetml.mo
-@exec /bin/mkdir -p %D/share/gnome/assetml
+@exec /bin/mkdir -p %D/share/assetml
@dirrm share/gnome/help/libassetml/C
@dirrm share/gnome/help/libassetml
-@unexec /bin/rmdir %D/share/gnome/assetml 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/assetml 2>/dev/null || /usr/bin/true
@dirrm include/libassetml-1.0/libassetml
@dirrm include/libassetml-1.0
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 5523bf9..94f4101 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libbonobo/Makefile,v 1.58 2007/03/12 17:59:36 marcus Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.67 2007/10/17 21:36:11 mezz Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.18.0
-PORTREVISION?= 2
+PORTVERSION= 2.20.1
+PORTREVISION?= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 9e0d3cf..184b35b 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.18.0.tar.bz2) = 8f0676e63420abf622f799cdd24ed9cc
-SHA256 (gnome2/libbonobo-2.18.0.tar.bz2) = 55b37d7863683d6947bdff6da7caec9ddd8a8001aac3e97a7b9d5e91898685aa
-SIZE (gnome2/libbonobo-2.18.0.tar.bz2) = 1441461
+MD5 (gnome2/libbonobo-2.20.1.tar.bz2) = 76e52d1c39e6ef1079c757c21f06f5ff
+SHA256 (gnome2/libbonobo-2.20.1.tar.bz2) = ff64d8e1acf6fdaa68980f7969e3f8b88d6c196d28f8fb9342d951c8c4a98c70
+SIZE (gnome2/libbonobo-2.20.1.tar.bz2) = 1447009
diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server::Makefile.in
index f07320f..45fc8fc 100644
--- a/devel/libbonobo/files/patch-server::Makefile.in
+++ b/devel/libbonobo/files/patch-server::Makefile.in
@@ -5,7 +5,7 @@
-I$(top_srcdir)/bonobo-activation \
-DPREFIX=\""$(prefix)"\" \
- -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \
-+ -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \
++ -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \
-DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
$(SERVER_CFLAGS) \
-DSERVER_CONFDIR=\"$(sysconfdir)\" \
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 2f47272..b129a88 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -145,6 +145,7 @@ share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo
share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo
share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/oc/LC_MESSAGES/libbonobo-2.0.mo
share/locale/or/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
@@ -160,6 +161,7 @@ share/locale/sr/LC_MESSAGES/libbonobo-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/libbonobo-2.0.mo
share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/th/LC_MESSAGES/libbonobo-2.0.mo
share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo
share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo
@@ -190,6 +192,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index d370b97..ec67a1f 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libglade
PORTVERSION= 0.17
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libglade/0.17
diff --git a/devel/libglade/files/patch-ab b/devel/libglade/files/patch-ab
index 244d49b..e77bc41 100644
--- a/devel/libglade/files/patch-ab
+++ b/devel/libglade/files/patch-ab
@@ -10,7 +10,7 @@ $FreeBSD$
-SUBDIRS = intl macros glade doc
+SUBDIRS = intl macros glade
- m4datadir = $(prefix)/share/aclocal
+ m4datadir = $(datadir)/aclocal
m4data_DATA = libglade.m4
-confexecdir = $(libdir)
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 6d13526..e2c6ee0 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop/Makefile,v 1.5 2006/10/02 23:26:51 ahze Exp $
+# $MCom: ports/devel/libgtop/Makefile,v 1.24 2007/09/16 17:22:25 ahze Exp $
#
PORTNAME= libgtop
-PORTVERSION= 2.14.9
+PORTVERSION= 2.20.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,6 +17,7 @@ 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
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 9edde92..a080866 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.14.9.tar.bz2) = a228ccab58216f7fef97de9c2b6e328e
-SHA256 (gnome2/libgtop-2.14.9.tar.bz2) = 6b10e1e416d823e7acf7e5665fda7547b1794b62789d8c2d73383fede2bad782
-SIZE (gnome2/libgtop-2.14.9.tar.bz2) = 772126
+MD5 (gnome2/libgtop-2.20.0.tar.bz2) = ddc05ffe9499294801cbd5fdac949045
+SHA256 (gnome2/libgtop-2.20.0.tar.bz2) = 5cae684d0af69193d9b6c31bbb90f74350855a23f245aef8538c17a877ba04a5
+SIZE (gnome2/libgtop-2.20.0.tar.bz2) = 766106
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 73ea7de..54b982f 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -1,13 +1,13 @@
bin/libgtop_daemon2
bin/libgtop_server2
include/libgtop-2.0/glibtop.h
+include/libgtop-2.0/glibtop_private.h
include/libgtop-2.0/glibtop/close.h
include/libgtop-2.0/glibtop/command.h
include/libgtop-2.0/glibtop/cpu.h
include/libgtop-2.0/glibtop/fsusage.h
include/libgtop-2.0/glibtop/global.h
include/libgtop-2.0/glibtop/gnuserv.h
-include/libgtop-2.0/glibtop/inodedb.h
include/libgtop-2.0/glibtop/loadavg.h
include/libgtop-2.0/glibtop/mem.h
include/libgtop-2.0/glibtop/mountlist.h
@@ -28,6 +28,7 @@ include/libgtop-2.0/glibtop/procsignal.h
include/libgtop-2.0/glibtop/procstate.h
include/libgtop-2.0/glibtop/proctime.h
include/libgtop-2.0/glibtop/procuid.h
+include/libgtop-2.0/glibtop/procwd.h
include/libgtop-2.0/glibtop/sem_limits.h
include/libgtop-2.0/glibtop/shm_limits.h
include/libgtop-2.0/glibtop/signal.h
@@ -54,7 +55,6 @@ libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/libgtop-Command.html
%%DOCSDIR%%/libgtop-GlibTop-Server.html
%%DOCSDIR%%/libgtop-GlibTop.html
-%%DOCSDIR%%/libgtop-Inode-DB.html
%%DOCSDIR%%/libgtop-Net-List.html
%%DOCSDIR%%/libgtop-Net-Load.html
%%DOCSDIR%%/libgtop-PPP.html
@@ -144,6 +144,7 @@ share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/oc/LC_MESSAGES/libgtop-2.0.mo
share/locale/or/LC_MESSAGES/libgtop-2.0.mo
share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
@@ -170,6 +171,7 @@ share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrm include/libgtop-2.0/glibtop
@dirrm include/libgtop-2.0
+@dirrm %%DOCSDIR%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -178,6 +180,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -190,4 +194,3 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrm %%DOCSDIR%%
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 3fc7308..b9f987d 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/liboobs/Makefile,v 1.18 2007/03/12 12:34:37 ahze Exp $
+# $MCom: ports/devel/liboobs/Makefile,v 1.23 2007/09/16 16:45:35 ahze Exp $
+#
PORTNAME= liboobs
-PORTVERSION= 2.18.1
-PORTREVISION= 1
+PORTVERSION= 2.20.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/liboobs/distinfo b/devel/liboobs/distinfo
index 3385131..de4bba6 100644
--- a/devel/liboobs/distinfo
+++ b/devel/liboobs/distinfo
@@ -1,3 +1,3 @@
-MD5 (liboobs-2.18.1.tar.bz2) = 3462f6cf93d1c13b4cd7cb070e919c4a
-SHA256 (liboobs-2.18.1.tar.bz2) = c722c74c607d87879997646cdda9707d338de68cab3a865d282407dda6746de2
-SIZE (liboobs-2.18.1.tar.bz2) = 315332
+MD5 (liboobs-2.20.0.tar.bz2) = c0562e115af4777da471182b9d462b40
+SHA256 (liboobs-2.20.0.tar.bz2) = 45a3cd562ac6d0002dc5c5972e1b4ec7fe611fe7ed9d0d8da9dbaaffd1c04623
+SIZE (liboobs-2.20.0.tar.bz2) = 331456
diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c
index d863f03..6abd8b7 100644
--- a/devel/liboobs/files/patch-src_oobs-group.c
+++ b/devel/liboobs/files/patch-src_oobs-group.c
@@ -1,5 +1,5 @@
---- src/oobs-group.c.orig Fri Sep 15 18:41:04 2006
-+++ src/oobs-group.c Tue Oct 31 23:12:40 2006
+--- oobs/oobs-group.c.orig Fri Sep 15 18:41:04 2006
++++ oobs/oobs-group.c Tue Oct 31 23:12:40 2006
@@ -18,7 +18,12 @@
* Authors: Carlos Garnacho Parro <carlosg@gnome.org>
*/
diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c
index d7037a2..e571a36 100644
--- a/devel/liboobs/files/patch-src_oobs-user.c
+++ b/devel/liboobs/files/patch-src_oobs-user.c
@@ -1,5 +1,5 @@
---- src/oobs-user.c.orig Fri Sep 15 19:16:41 2006
-+++ src/oobs-user.c Tue Oct 31 23:12:29 2006
+--- 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 @@
* Authors: Carlos Garnacho Parro <carlosg@gnome.org>
*/
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
index 35fe3da..a36b53d 100644
--- a/devel/liboobs/pkg-plist
+++ b/devel/liboobs/pkg-plist
@@ -32,6 +32,31 @@ lib/liboobs-1.la
lib/liboobs-1.so
lib/liboobs-1.so.3
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
+%%DOCSDIR%%/OobsList.html
+%%DOCSDIR%%/OobsNFSConfig.html
+%%DOCSDIR%%/OobsNTPConfig.html
+%%DOCSDIR%%/OobsObject.html
+%%DOCSDIR%%/OobsSMBConfig.html
+%%DOCSDIR%%/OobsService.html
+%%DOCSDIR%%/OobsServicesConfig.html
+%%DOCSDIR%%/OobsSession.html
+%%DOCSDIR%%/OobsShare.html
+%%DOCSDIR%%/OobsShareNFS.html
+%%DOCSDIR%%/OobsShareSMB.html
+%%DOCSDIR%%/OobsStaticHost.html
+%%DOCSDIR%%/OobsTimeConfig.html
+%%DOCSDIR%%/OobsUser.html
+%%DOCSDIR%%/OobsUsersConfig.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
@@ -44,33 +69,8 @@ libdata/pkgconfig/liboobs-1.pc
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
-%%DOCSDIR%%/liboobs-OobsGroup.html
-%%DOCSDIR%%/liboobs-OobsGroupsConfig.html
%%DOCSDIR%%/liboobs-OobsHostsConfig.html
-%%DOCSDIR%%/liboobs-OobsIface.html
-%%DOCSDIR%%/liboobs-OobsIfaceEthernet.html
-%%DOCSDIR%%/liboobs-OobsIfaceIRLan.html
-%%DOCSDIR%%/liboobs-OobsIfaceISDN.html
-%%DOCSDIR%%/liboobs-OobsIfaceModem.html
-%%DOCSDIR%%/liboobs-OobsIfacePlip.html
-%%DOCSDIR%%/liboobs-OobsIfaceWireless.html
-%%DOCSDIR%%/liboobs-OobsIfacesConfig.html
-%%DOCSDIR%%/liboobs-OobsList.html
-%%DOCSDIR%%/liboobs-OobsNFSConfig.html
-%%DOCSDIR%%/liboobs-OobsNTPConfig.html
%%DOCSDIR%%/liboobs-OobsNTPServer.html
-%%DOCSDIR%%/liboobs-OobsObject.html
-%%DOCSDIR%%/liboobs-OobsSMBConfig.html
-%%DOCSDIR%%/liboobs-OobsService.html
-%%DOCSDIR%%/liboobs-OobsServicesConfig.html
-%%DOCSDIR%%/liboobs-OobsSession.html
-%%DOCSDIR%%/liboobs-OobsShare.html
-%%DOCSDIR%%/liboobs-OobsShareNFS.html
-%%DOCSDIR%%/liboobs-OobsShareSMB.html
-%%DOCSDIR%%/liboobs-OobsStaticHost.html
-%%DOCSDIR%%/liboobs-OobsTimeConfig.html
-%%DOCSDIR%%/liboobs-OobsUser.html
-%%DOCSDIR%%/liboobs-OobsUsersConfig.html
%%DOCSDIR%%/liboobs.devhelp
%%DOCSDIR%%/liboobs.devhelp2
%%DOCSDIR%%/right.png
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 74ec2c6..61405f0 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libunicode/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
+# $MCom: ports/devel/libunicode/Makefile,v 1.4 2007/09/10 05:27:38 mezz Exp $
+#
PORTNAME= libunicode
PORTVERSION= 0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libunicode/0.4
@@ -21,8 +22,8 @@ USE_GMAKE= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \
+ --datadir=${PREFIX}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 257f9d4..61923ed 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/oaf/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
+# $MCom: ports/devel/oaf/Makefile,v 1.5 2007/05/19 21:36:06 marcus Exp $
#
PORTNAME= oaf
PORTVERSION= 0.6.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/oaf/0.6
diff --git a/devel/oaf/files/patch-aa b/devel/oaf/files/patch-aa
index e0caa8a..ebcf570 100644
--- a/devel/oaf/files/patch-aa
+++ b/devel/oaf/files/patch-aa
@@ -11,4 +11,4 @@ $FreeBSD$
+confexecdir = $(sysconfdir)
confexec_DATA = oafConf.sh
- m4datadir = $(prefix)/share/aclocal
+ m4datadir = $(datadir)/aclocal
diff --git a/devel/oaf/files/patch-test_oaf-slay.in b/devel/oaf/files/patch-test_oaf-slay.in
deleted file mode 100644
index bd5f51b..0000000
--- a/devel/oaf/files/patch-test_oaf-slay.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/oaf-slay.in.orig Fri Oct 18 15:33:00 2002
-+++ test/oaf-slay.in Fri Oct 18 15:33:12 2002
-@@ -51,7 +51,7 @@
-
- # get OAF files
- #
--@oaf_dirs = ( "@prefix@/share/oaf" );
-+@oaf_dirs = ( "@datadir@/oaf" );
- foreach $dir (split(':', $ENV{'OAF_INFO_PATH'})) {
- if (-d $dir) {
- push @oaf_dirs, $dir;
diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist
index b118520..518eac4 100644
--- a/devel/oaf/pkg-plist
+++ b/devel/oaf/pkg-plist
@@ -26,10 +26,8 @@ lib/liboaf.la
lib/liboaf.so
lib/liboaf.so.0
share/aclocal/oaf.m4
-share/gnome/idl/oaf-factory.idl
-share/gnome/idl/oaf.idl
-share/gnome/oaf/OAF_naming-service.oaf
-share/gnome/oaf/empty.oafinfo
+share/idl/oaf-factory.idl
+share/idl/oaf.idl
share/locale/az/LC_MESSAGES/oaf.mo
share/locale/bg/LC_MESSAGES/oaf.mo
share/locale/da/LC_MESSAGES/oaf.mo
@@ -61,6 +59,8 @@ share/locale/tr/LC_MESSAGES/oaf.mo
share/locale/uk/LC_MESSAGES/oaf.mo
share/locale/zh_CN/LC_MESSAGES/oaf.mo
share/locale/zh_TW/LC_MESSAGES/oaf.mo
+%%DATADIR%%/OAF_naming-service.oaf
+%%DATADIR%%/empty.oafinfo
@dirrm include/liboaf
@dirrm etc/oaf
@unexec ps gx | grep '[0-9]:[0-9][0-9]\.[0-9][0-9] oafd --ac-activate' | awk '{print $1}' | xargs kill 2>/dev/null || true
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index 5b87ac6..e03d94b 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pharmacy
PORTVERSION= 0.3
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= SF
@@ -26,8 +27,5 @@ pre-patch:
s|\(DATADIRNAME=\)lib|\1share|g ; \
s|USE_INCLUDED_LIBINTL=yes|#&|g ; \
s|\$$(top_builddir)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|\(\$$(datadir)/\)gnome/|\1|g ; \
- s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
.include <bsd.port.mk>
diff --git a/devel/pharmacy/pkg-plist b/devel/pharmacy/pkg-plist
index 326d642..0c50c21 100644
--- a/devel/pharmacy/pkg-plist
+++ b/devel/pharmacy/pkg-plist
@@ -11,7 +11,7 @@ share/gnome/help/pharmacy/C/topic.dat
share/gnome/help/pharmacy/C/update.html
share/gnome/help/pharmacy/C/using.html
share/gnome/help/pharmacy/C/web.html
-share/gnome/pixmaps/pharmacy.png
+share/pixmaps/pharmacy.png
share/locale/de/LC_MESSAGES/pharmacy.mo
share/locale/fr/LC_MESSAGES/pharmacy.mo
share/locale/it/LC_MESSAGES/pharmacy.mo
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index 553235f..17124cb 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= preps
PORTVERSION= 2.0.4
-PORTREVISION= 3
+PORTREVISION= 6
CATEGORIES= devel
MASTER_SITES= http://fresh.t-systems-sfr.com/unix/src/misc/
PKGNAMESUFFIX= -gui
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-pgsqldir=${LOCALBASE} \
--localstatedir=/var
post-patch:
- @${REINPLACE_CMD} -e 's|@PACKAGE@/gnome/help|help|g' \
+ @${REINPLACE_CMD} -e 's|@PACKAGE@/gnome/help|gnome/help|g' \
${WRKSRC}/help/C/Makefile.in
.include <bsd.port.mk>
diff --git a/devel/preps-gui/pkg-plist b/devel/preps-gui/pkg-plist
index d35c0dc..0d891f6 100644
--- a/devel/preps-gui/pkg-plist
+++ b/devel/preps-gui/pkg-plist
@@ -22,11 +22,11 @@ share/gnome/help/preps/C/figures/statedit.png
share/gnome/help/preps/C/figures/useredit.png
share/gnome/help/preps/C/legal.xml
share/gnome/help/preps/C/preps.xml
-share/gnome/omf/preps/preps-C.omf
-share/gnome/pixmaps/preps.png
-share/gnome/preps/preps_logo.xpm
-@dirrm share/gnome/preps
-@dirrm share/gnome/omf/preps
+share/omf/preps/preps-C.omf
+share/pixmaps/preps.png
+share/preps/preps_logo.xpm
+@dirrm share/preps
+@dirrm share/omf/preps
@dirrm share/gnome/help/preps/C/figures
@dirrm share/gnome/help/preps/C
@dirrm share/gnome/help/preps
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index e97f1d2..35e6da4 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/py-gobject/Makefile,v 1.17 2006/10/03 20:44:25 ahze Exp $
+# $MCom: ports/devel/py-gobject/Makefile,v 1.21 2007/09/16 17:11:09 ahze Exp $
PORTNAME= gobject
-PORTVERSION= 2.12.3
+PORTVERSION= 2.14.0
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index bf1940a..4b9ac6b 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.12.3.tar.bz2) = 009986021225b7ea6e0ba848707785af
-SHA256 (gnome2/pygobject-2.12.3.tar.bz2) = efa81e0281668988b8cc2af9d0546befa4365662f1ebec37e0c7c863e969da41
-SIZE (gnome2/pygobject-2.12.3.tar.bz2) = 339088
+MD5 (gnome2/pygobject-2.14.0.tar.bz2) = de781a21f483c941a73009a9f68f150e
+SHA256 (gnome2/pygobject-2.14.0.tar.bz2) = 3a5919703f71c2d7059d02f03dc6566cbe86c6efb09a16730b7cdb4b0fbef9e8
+SIZE (gnome2/pygobject-2.14.0.tar.bz2) = 360630
diff --git a/devel/py-gobject/files/patch-docs_Makefile.in b/devel/py-gobject/files/patch-docs_Makefile.in
index 76edf5d..39d35be 100644
--- a/devel/py-gobject/files/patch-docs_Makefile.in
+++ b/devel/py-gobject/files/patch-docs_Makefile.in
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig Thu Aug 24 23:34:38 2006
-+++ docs/Makefile.in Thu Aug 24 23:35:02 2006
-@@ -218,7 +218,7 @@ XSL_FILES = \
-
- CSSdir = $(HTMLdir)
+--- docs/Makefile.in.orig Sat May 5 01:25:03 2007
++++ docs/Makefile.in Sat May 5 01:25:39 2007
+@@ -223,7 +223,7 @@ XSL_FILES = \
+ # fixxref cannot be included in XSL_FILES, because automake is touching it
+ # so the date is newer then the files in HTML_FILES
+ FIXXREF = xsl/fixxref.py
+-TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
++TARGET_DIR = $(prefix)/share/doc/pygobject
+ CSSdir = $(TARGET_DIR)
CSS_DATA = $(CSS_FILES)
--HTMLdir = $(datadir)/gtk-doc/html/pygobject
-+HTMLdir = $(prefix)/share/doc/pygobject
- HTML_DATA = $(HTML_FILES)
XSLdir = $(datadir)/pygobject/xsl
- XSL_DATA = $(XSL_FILES)
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index b4eb720..de86b14 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -7,9 +7,15 @@ include/pygtk-2.0/pygobject.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyo
%%PYTHON_SITELIBDIR%%/pygtk.pth
%%PYTHON_SITELIBDIR%%/pygtk.py
%%PYTHON_SITELIBDIR%%/pygtk.pyc
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 6916f59..648c257 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -3,12 +3,12 @@
# Whom: michael johnson <ahze@ahze.net>
#
# $FreeBSD$
-# $MCom: ports/devel/py-xdg/Makefile,v 1.2 2006/09/02 14:38:55 ahze Exp $
+# $MCom: ports/devel/py-xdg/Makefile,v 1.4 2007/09/10 05:35:05 mezz Exp $
#
PORTNAME= xdg
PORTVERSION= 0.15
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel python
MASTER_SITES= http://www.freedesktop.org/~lanius/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -23,9 +23,7 @@ PYDISTUTILS_PKGNAME= pyxdg
post-patch:
@${REINPLACE_CMD} -e \
- 's|/etc|${LOCALBASE}/etc|g ; \
- s|%%X11BASE%%|${X11BASE}|g ; \
- s|%%LOCALBASE%%|${LOCALBASE}|g' \
+ 's|/etc|${LOCALBASE}/etc|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/xdg/BaseDirectory.py \
${WRKSRC}/xdg/IconTheme.py
diff --git a/devel/py-xdg/files/patch-xdg::BaseDirectory.py b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
index 47bd3f3..77f09b5 100644
--- a/devel/py-xdg/files/patch-xdg::BaseDirectory.py
+++ b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
@@ -5,7 +5,7 @@
xdg_data_dirs = [xdg_data_home] + \
- os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
-+ os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share/gnome:%%LOCALBASE%%/share:/usr/share').split(':')
++ os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share').split(':')
xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
os.path.join(_home, '.config'))
diff --git a/devel/py-xdg/files/patch-xdg::IconTheme.py b/devel/py-xdg/files/patch-xdg::IconTheme.py
index cc5714b..c7af809 100644
--- a/devel/py-xdg/files/patch-xdg::IconTheme.py
+++ b/devel/py-xdg/files/patch-xdg::IconTheme.py
@@ -1,14 +1,11 @@
---- xdg/IconTheme.py.orig Sun Jun 5 14:20:19 2005
-+++ xdg/IconTheme.py Sun Jun 5 14:21:07 2005
-@@ -215,7 +215,11 @@
+--- xdg/IconTheme.py.orig 2007-09-10 00:33:42.000000000 -0500
++++ xdg/IconTheme.py 2007-09-10 00:34:37.000000000 -0500
+@@ -215,7 +215,8 @@
icondirs = []
for basedir in xdg_data_dirs:
icondirs.append(os.path.join(basedir, "icons"))
-icondirs.append("/usr/share/pixmaps")
-+icondirs.append("%%X11BASE%%/share/pixmaps")
+icondirs.append("%%LOCALBASE%%/share/pixmaps")
-+icondirs.append("%%LOCALBASE%%/share/gnome/pixmaps")
-+icondirs.append("%%X11BASE%%/share/icons")
+icondirs.append("%%LOCALBASE%%/share/icons")
icondirs.append(os.path.expanduser("~/.icons"))
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 0798863..61d7305 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= regexxer
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel textproc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/devel/regexxer/pkg-plist b/devel/regexxer/pkg-plist
index 502209b..6e25f28 100644
--- a/devel/regexxer/pkg-plist
+++ b/devel/regexxer/pkg-plist
@@ -1,7 +1,7 @@
bin/regexxer
-share/gnome/applications/regexxer.desktop
-share/gnome/regexxer/mainwindow.glade
-share/gnome/regexxer/prefdialog.glade
+share/applications/regexxer.desktop
+share/regexxer/mainwindow.glade
+share/regexxer/prefdialog.glade
share/icons/hicolor/48x48/apps/regexxer.png
share/locale/ar/LC_MESSAGES/regexxer.mo
share/locale/bg/LC_MESSAGES/regexxer.mo
@@ -34,8 +34,9 @@ share/locale/vi/LC_MESSAGES/regexxer.mo
share/locale/zh_CN/LC_MESSAGES/regexxer.mo
share/locale/zh_HK/LC_MESSAGES/regexxer.mo
share/locale/zh_TW/LC_MESSAGES/regexxer.mo
-@dirrm share/gnome/regexxer
+@dirrm share/regexxer
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index ab08208..85163c4 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -3,7 +3,7 @@
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
#
# $FreeBSD$
-# $MCom: ports/devel/ruby-glib2/Makefile,v 1.2 2005/10/17 07:05:39 mezz Exp $
+# $MCom: ports/devel/ruby-glib2/Makefile,v 1.5 2007/10/05 05:06:39 mezz Exp $
#
PORTNAME= glib2
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index da018cc..2e80be8 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -17,6 +17,7 @@
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/runner.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/shell.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spawn.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_enum.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_glib2.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_iochannel.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_unicode.rb
diff --git a/devel/wininfo/Makefile b/devel/wininfo/Makefile
index 67b3186..7f00490 100644
--- a/devel/wininfo/Makefile
+++ b/devel/wininfo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wininfo
PORTVERSION= 0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.freedesktop.org/software/wininfo/
diff --git a/devel/wininfo/pkg-plist b/devel/wininfo/pkg-plist
index d71987b..be29d0b 100644
--- a/devel/wininfo/pkg-plist
+++ b/devel/wininfo/pkg-plist
@@ -1,2 +1,3 @@
bin/wininfo
-share/gnome/applications/xdg-wininfo.desktop
+share/applications/xdg-wininfo.desktop
+@dirrmtry share/applications
OpenPOWER on IntegriCloud