summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/deskbar-applet/Makefile40
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_Utils.py (renamed from deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py)4
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py16
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py18
-rw-r--r--deskutils/deskbar-applet/pkg-plist202
-rw-r--r--deskutils/evolution-jescs/Makefile12
-rw-r--r--deskutils/evolution-jescs/distinfo6
-rw-r--r--deskutils/evolution-jescs/pkg-plist7
-rw-r--r--deskutils/gdesklets/Makefile4
-rw-r--r--deskutils/gnome-utils/Makefile23
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/files/patch-configure11
-rw-r--r--deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c10
-rw-r--r--deskutils/gnome-utils/files/patch-logview__logview.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_calendar.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_desc_db.c10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_loglist.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logrtns.c52
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logview-findbar.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logview.c29
-rw-r--r--deskutils/gnome-utils/files/patch-logview_misc.c21
-rw-r--r--deskutils/gnome-utils/pkg-plist217
-rw-r--r--deskutils/gnomeutils2/Makefile23
-rw-r--r--deskutils/gnomeutils2/distinfo6
-rw-r--r--deskutils/gnomeutils2/files/patch-configure11
-rw-r--r--deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview__logview.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_calendar.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_desc_db.c10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_loglist.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logrtns.c52
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logview-findbar.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logview.c29
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_misc.c21
-rw-r--r--deskutils/gnomeutils2/pkg-plist217
-rw-r--r--deskutils/gucharmap/Makefile9
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c62
-rw-r--r--deskutils/gucharmap/pkg-plist23
-rw-r--r--deskutils/nautilus-sendto/Makefile8
-rw-r--r--deskutils/nautilus-sendto/distinfo6
42 files changed, 697 insertions, 570 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 1a17923a65d4..3cbd3dc72671 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,27 +3,26 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.4 2005/11/02 01:42:00 marcus Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.24 2006/04/17 07:51:13 marcus Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 0.8.8
-PORTREVISION= 1
+PORTVERSION= 2.14.1.1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome panel applet similar to Google's (Windows only) Deskbar
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack pygnomeextras
+USE_GNOME= gnomeprefix gnomehack pygnomedesktop intlhack
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
CONFIGURE_ARGS= --disable-beagle
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -35,7 +34,7 @@ OPTIONS= EVO "Enable evolution support" on
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Does not build on 4.X"
+BROKEN= Does not build on 4.X
.endif
.if !defined(WITHOUT_EVO)
@@ -46,11 +45,36 @@ CONFIGURE_ARGS+=--disable-evolution
PLIST_SUB+= EVO="@comment "
.endif
+.if !defined(DISPLAY)
+BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
+ ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+.if !defined(PACKAGE_BUILDING)
+CONFIGURE_ENV+= DISPLAY="localhost:1001"
+.endif
+.endif
+
post-patch:
@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
's|/usr/share/applications|${X11BASE}/share/gnome/applications|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/deskbar/handler_utils.py
+ ${WRKSRC}/deskbar/handlers/mozilla.py \
+ ${WRKSRC}/deskbar/Utils.py
+
+.if !defined(DISPLAY)
+pre-configure:
+ @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
+ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
+ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \
+ fi
+ ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ @sleep 5
+
+post-configure:
+ @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
+ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
+ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \
+ fi
+.endif
.include <bsd.port.post.mk>
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 8491a6ac5474..147cebfffcc9 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-0.8.8.tar.bz2) = 2d45cd24feb023cd4083e53bdc8b478e
-SHA256 (gnome2/deskbar-applet-0.8.8.tar.bz2) = 89813323e0da4f68ed5b26ab8ae97968fda7472583b4ff2805743fc7ee80f74f
-SIZE (gnome2/deskbar-applet-0.8.8.tar.bz2) = 384587
+MD5 (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 9264c4cf5eaab4ac99009aea393d30ff
+SHA256 (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 0e623108df00e7a87a822661abe301537c0bbc3b0e512302f706fdf6b989d7b5
+SIZE (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 484608
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
index 8173fc2d0db0..773c8e15ae77 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
@@ -1,5 +1,5 @@
---- deskbar/handler_utils.py.orig Tue Nov 1 20:32:51 2005
-+++ deskbar/handler_utils.py Tue Nov 1 20:33:08 2005
+--- deskbar/Utils.py.orig Tue Nov 1 20:32:51 2005
++++ deskbar/Utils.py Tue Nov 1 20:33:08 2005
@@ -10,7 +10,7 @@
sysdirs = os.getenv("XDG_DATA_DIRS")
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
index 1cca47519b67..1cf0777c4a81 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
@@ -1,13 +1,17 @@
---- deskbar/deskbar-applet.py.orig Sat Nov 19 14:15:58 2005
-+++ deskbar/deskbar-applet.py Thu Dec 8 22:23:00 2005
-@@ -34,8 +34,8 @@
- gettext.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
+--- deskbar/deskbar-applet.py.orig Mon Mar 13 23:23:20 2006
++++ deskbar/deskbar-applet.py Mon Mar 13 23:23:52 2006
+@@ -42,10 +42,10 @@
+ gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
gettext.textdomain('deskbar-applet')
-locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
+-if hasattr(locale, 'bind_textdomain_codeset'):
+- locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
-locale.textdomain('deskbar-applet')
+#locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
++#if hasattr(locale, 'bind_textdomain_codeset'):
++# locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
+#locale.textdomain('deskbar-applet')
- def applet_factory(applet, iid):
- print 'Starting Deskbar instance:', applet, iid
+ import gtkexcepthook
+
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
new file mode 100644
index 000000000000..a668777c193e
--- /dev/null
+++ b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
@@ -0,0 +1,18 @@
+--- deskbar/handlers/mozilla.py.orig Wed Mar 1 13:32:12 2006
++++ deskbar/handlers/mozilla.py Wed Mar 1 13:33:19 2006
+@@ -189,6 +189,7 @@ class MozillaSearchHandler(deskbar.Handl
+ get_firefox_home_file("searchplugins"),
+ get_firefox_home_file("search"),
+ expanduser("~/.mozilla/searchplugins"),
++ "%%X11BASE%%/lib/firefox/searchplugins",
+ "/usr/lib/firefox/searchplugins",
+ "/usr/local/lib/firefox/searchplugins",
+ "/usr/lib/mozilla-firefox/searchplugins",
+@@ -197,6 +198,7 @@ class MozillaSearchHandler(deskbar.Handl
+ smart_dirs = [
+ get_mozilla_home_file("search"),
+ expanduser("~/.mozilla/searchplugins"),
++ "%%X11BASE%%/lib/mozilla/searchplugins",
+ "/usr/lib/mozilla/searchplugins",
+ "/usr/local/lib/mozilla/searchplugins"]
+
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 14ef80af14e7..bfeca0921357 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -2,9 +2,9 @@ lib/deskbar-applet/deskbar-applet
lib/deskbar-applet/handlers/beagle-live.py
lib/deskbar-applet/handlers/beagle-live.pyc
lib/deskbar-applet/handlers/beagle-live.pyo
-lib/deskbar-applet/handlers/beagle.py
-lib/deskbar-applet/handlers/beagle.pyc
-lib/deskbar-applet/handlers/beagle.pyo
+lib/deskbar-applet/handlers/beagle-static.py
+lib/deskbar-applet/handlers/beagle-static.pyc
+lib/deskbar-applet/handlers/beagle-static.pyo
lib/deskbar-applet/handlers/email_address.py
lib/deskbar-applet/handlers/email_address.pyc
lib/deskbar-applet/handlers/email_address.pyo
@@ -29,6 +29,9 @@ lib/deskbar-applet/handlers/google-live.pyo
lib/deskbar-applet/handlers/gtkbookmarks.py
lib/deskbar-applet/handlers/gtkbookmarks.pyc
lib/deskbar-applet/handlers/gtkbookmarks.pyo
+lib/deskbar-applet/handlers/history.py
+lib/deskbar-applet/handlers/history.pyc
+lib/deskbar-applet/handlers/history.pyo
lib/deskbar-applet/handlers/mozilla.py
lib/deskbar-applet/handlers/mozilla.pyc
lib/deskbar-applet/handlers/mozilla.pyo
@@ -44,107 +47,204 @@ lib/deskbar-applet/handlers/volumes.pyo
lib/deskbar-applet/handlers/web_address.py
lib/deskbar-applet/handlers/web_address.pyc
lib/deskbar-applet/handlers/web_address.pyo
+lib/deskbar-applet/handlers/yahoo.py
+lib/deskbar-applet/handlers/yahoo.pyc
+lib/deskbar-applet/handlers/yahoo.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.py
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.py
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.py
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.py
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.py
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Match.py
+%%PYTHON_SITELIBDIR%%/deskbar/Match.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Match.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.py
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.py
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyo
%%PYTHON_SITELIBDIR%%/deskbar/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/about.py
-%%PYTHON_SITELIBDIR%%/deskbar/about.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/about.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/applet.py
-%%PYTHON_SITELIBDIR%%/deskbar/applet.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/applet.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.py
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.pyo
%%PYTHON_SITELIBDIR%%/deskbar/defs.py
%%PYTHON_SITELIBDIR%%/deskbar/defs.pyc
%%PYTHON_SITELIBDIR%%/deskbar/defs.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.py
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.py
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyo
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.la
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.so
-%%PYTHON_SITELIBDIR%%/deskbar/handler.py
-%%PYTHON_SITELIBDIR%%/deskbar/handler.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handler.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.py
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/history.py
-%%PYTHON_SITELIBDIR%%/deskbar/history.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/history.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.py
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyo
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyo
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.la
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.so
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.py
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.pyo
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyo
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.la
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.so
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.py
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.py
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.py
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/_osutils.la
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/_osutils.so
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyo
libdata/bonobo/servers/Deskbar_Applet.server
libdata/pkgconfig/deskbar-applet.pc
share/gnome/deskbar-applet/Deskbar_Applet.xml
+share/gnome/deskbar-applet/art/deskbar-applet-panel-h.png
+share/gnome/deskbar-applet/art/deskbar-applet-panel-h.svg
+share/gnome/deskbar-applet/art/deskbar-applet-panel-v.png
+share/gnome/deskbar-applet/art/deskbar-applet-panel-v.svg
share/gnome/deskbar-applet/art/deskbar-applet-small.png
share/gnome/deskbar-applet/art/deskbar-applet.svg
+share/gnome/deskbar-applet/art/epiphany-history.png
share/gnome/deskbar-applet/art/folder-bookmark.png
share/gnome/deskbar-applet/art/generic.png
share/gnome/deskbar-applet/art/google.png
-share/gnome/deskbar-applet/art/web-bookmark.png
+share/gnome/deskbar-applet/art/yahoo.png
+share/gnome/deskbar-applet/mozilla-search.glade
share/gnome/deskbar-applet/prefs-dialog.glade
share/gnome/deskbar-applet/smart-bookmarks.glade
share/gnome/pixmaps/deskbar-applet.svg
share/locale/bg/LC_MESSAGES/deskbar-applet.mo
+share/locale/ca/LC_MESSAGES/deskbar-applet.mo
+share/locale/cs/LC_MESSAGES/deskbar-applet.mo
+share/locale/cy/LC_MESSAGES/deskbar-applet.mo
+share/locale/da/LC_MESSAGES/deskbar-applet.mo
share/locale/de/LC_MESSAGES/deskbar-applet.mo
+share/locale/dz/LC_MESSAGES/deskbar-applet.mo
+share/locale/el/LC_MESSAGES/deskbar-applet.mo
share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo
share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
share/locale/es/LC_MESSAGES/deskbar-applet.mo
+share/locale/et/LC_MESSAGES/deskbar-applet.mo
share/locale/fi/LC_MESSAGES/deskbar-applet.mo
+share/locale/fr/LC_MESSAGES/deskbar-applet.mo
share/locale/gl/LC_MESSAGES/deskbar-applet.mo
share/locale/gu/LC_MESSAGES/deskbar-applet.mo
+share/locale/he/LC_MESSAGES/deskbar-applet.mo
+share/locale/hi/LC_MESSAGES/deskbar-applet.mo
share/locale/hu/LC_MESSAGES/deskbar-applet.mo
+share/locale/it/LC_MESSAGES/deskbar-applet.mo
share/locale/ja/LC_MESSAGES/deskbar-applet.mo
+share/locale/ka/LC_MESSAGES/deskbar-applet.mo
+share/locale/ko/LC_MESSAGES/deskbar-applet.mo
+share/locale/ku/LC_MESSAGES/deskbar-applet.mo
share/locale/lt/LC_MESSAGES/deskbar-applet.mo
share/locale/mk/LC_MESSAGES/deskbar-applet.mo
share/locale/nb/LC_MESSAGES/deskbar-applet.mo
share/locale/nl/LC_MESSAGES/deskbar-applet.mo
share/locale/pa/LC_MESSAGES/deskbar-applet.mo
+share/locale/pl/LC_MESSAGES/deskbar-applet.mo
+share/locale/pt/LC_MESSAGES/deskbar-applet.mo
+share/locale/pt_BR/LC_MESSAGES/deskbar-applet.mo
+share/locale/ru/LC_MESSAGES/deskbar-applet.mo
share/locale/sk/LC_MESSAGES/deskbar-applet.mo
+share/locale/sq/LC_MESSAGES/deskbar-applet.mo
+share/locale/sr/LC_MESSAGES/deskbar-applet.mo
+share/locale/sr@Latn/LC_MESSAGES/deskbar-applet.mo
share/locale/sv/LC_MESSAGES/deskbar-applet.mo
share/locale/th/LC_MESSAGES/deskbar-applet.mo
+share/locale/uk/LC_MESSAGES/deskbar-applet.mo
+share/locale/vi/LC_MESSAGES/deskbar-applet.mo
share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
+share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
+share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/deskbar-applet/art
@dirrm share/gnome/deskbar-applet
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/completion
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/osutils
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/keybinder
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/iconentry
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 44971b2eadb1..711b2a9a0a18 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.1 2005/09/08 14:22:13 marcus Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.9 2006/04/13 07:52:31 bland Exp $
#
PORTNAME= jescs
-PORTVERSION= 2.4.3
-PORTREVISION= 1
+PORTVERSION= 2.5.3
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= evolution-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
@@ -24,14 +23,15 @@ RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_PERL= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-EVO_VERSION= 2.4
-PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.4"
+EVO_VERSION= 2.6
+PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \
diff --git a/deskutils/evolution-jescs/distinfo b/deskutils/evolution-jescs/distinfo
index 6c055501ee6e..07f587c30fda 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-jescs-2.4.3.tar.bz2) = f691bc771c47af7f870f62215f0e159b
-SHA256 (evolution-jescs-2.4.3.tar.bz2) = c934802666c6969476b504d8765f6486394551b66203cef1c671b3ad3280a503
-SIZE (evolution-jescs-2.4.3.tar.bz2) = 446850
+MD5 (evolution-jescs-2.5.3.tar.bz2) = c0b8a696147ee470729f4b05c20b84bd
+SHA256 (evolution-jescs-2.5.3.tar.bz2) = 58cfd453fb30eed73547a464b2dd64f500a4616a63a9dc5e1b5f0dbbdeabf63b
+SIZE (evolution-jescs-2.5.3.tar.bz2) = 448739
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index 67968ebb841c..781942533208 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -1,8 +1,3 @@
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.a
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.la
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.so
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.so.0
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.a
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.la
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.so
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.urls
@@ -21,6 +16,7 @@ share/locale/en_CA/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -34,6 +30,7 @@ share/locale/sk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 36560fe34d52..3c49b7357da9 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdesklets
PORTVERSION= 0.35.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.gdesklets.org/downloads/ \
http://www.pycage.de/download/${PORTNAME}/ \
@@ -17,7 +17,7 @@ DISTNAME= gDesklets-${PORTVERSION}
MAINTAINER= klammer@webonaut.com
COMMENT= A framework for Gnome 2.x for desktop applets
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 3ec29ebda867..dd323073e74d 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,15 +3,16 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.70 2005/10/04 17:39:31 mezz Exp $
+# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.92 2006/04/19 04:46:41 marcus Exp $
#
PORTNAME= gnomeutils2
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.0
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/2.12
+MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,26 +20,20 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 support utilities
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
+INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- libgnomeprintui gnomedesktop
-GNU_CONFIGURE= yes
+ libgnomeprintui gnomedesktop ltverhack
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
-GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \
+GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
gnome-search-tool.schemas logview.schemas
-post-extract:
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
- 's| $$||g'
-
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
.include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index eed200ddfee4..4ac628f22126 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.12.2.tar.bz2) = 71d615932e4ddf7182abeb734b8e370c
-SHA256 (gnome2/gnome-utils-2.12.2.tar.bz2) = be61efed2a5e78533d89ecb10339b72c2cc59d82de0422a7cc72c1ee3320c0de
-SIZE (gnome2/gnome-utils-2.12.2.tar.bz2) = 1726889
+MD5 (gnome2/gnome-utils-2.14.0.tar.bz2) = d1d16ff6bfc1f6ddc110d18ec4dfdbfa
+SHA256 (gnome2/gnome-utils-2.14.0.tar.bz2) = 44586246763c9bfb2b67baedff8c800abde0898012e646ee580ce7a4c2d57e7e
+SIZE (gnome2/gnome-utils-2.14.0.tar.bz2) = 1881962
diff --git a/deskutils/gnome-utils/files/patch-configure b/deskutils/gnome-utils/files/patch-configure
deleted file mode 100644
index d5d7d0e103f2..000000000000
--- a/deskutils/gnome-utils/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Mon Nov 25 09:25:29 2002
-+++ configure Tue Nov 26 16:04:42 2002
-@@ -10347,7 +10347,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
index 03a974c23aa4..9d1ee8c9c55c 100644
--- a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
+++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
@@ -1,10 +1,10 @@
---- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004
-+++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004
-@@ -30,6 +30,7 @@
- #endif
+--- gsearchtool/gsearchtool-support.c.orig Thu Jan 5 23:26:25 2006
++++ gsearchtool/gsearchtool-support.c Thu Jan 5 23:27:04 2006
+@@ -31,6 +31,7 @@
#include <glib/gi18n.h>
+ #include <glib/gdate.h>
+#include <sys/types.h>
#include <regex.h>
#include <gdk/gdkx.h>
- #include <bonobo-activation/bonobo-activation.h>
+ #include <libart_lgpl/art_rgb.h>
diff --git a/deskutils/gnome-utils/files/patch-logview__logview.h b/deskutils/gnome-utils/files/patch-logview__logview.h
new file mode 100644
index 000000000000..3cd50f68c4bd
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview__logview.h
@@ -0,0 +1,10 @@
+--- logview/logview.h.orig Wed Apr 19 12:39:07 2006
++++ logview/logview.h Wed Apr 19 12:40:08 2006
+@@ -73,6 +73,7 @@
+ void logview_set_window_title (LogviewWindow *window);
+ void logview_set_font (LogviewWindow *window, const gchar *fontname);
+ void logview_show_main_content (LogviewWindow *window);
++GType logview_window_get_type (void);
+ GtkWidget *logview_window_new (void);
+
+ #endif /* __LOGVIEW_H__ */
diff --git a/deskutils/gnome-utils/files/patch-logview_calendar.h b/deskutils/gnome-utils/files/patch-logview_calendar.h
new file mode 100644
index 000000000000..3aefb999f00c
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_calendar.h
@@ -0,0 +1,10 @@
+--- logview/calendar.h.orig Tue Apr 18 22:20:35 2006
++++ logview/calendar.h Tue Apr 18 22:20:58 2006
+@@ -45,6 +45,7 @@ typedef struct CalendarClass
+ GtkCalendarClass parent_class;
+ }CalendarClass;
+
++GType calendar_get_type (void);
+ GtkWidget *calendar_new (void);
+ void calendar_select_date (Calendar *calendar, GDate *date);
+ void calendar_init_data (Calendar *calendar, LogviewWindow *logview);
diff --git a/deskutils/gnome-utils/files/patch-logview_desc_db.c b/deskutils/gnome-utils/files/patch-logview_desc_db.c
deleted file mode 100644
index 5b687f492e88..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_desc_db.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004
-+++ logview/desc_db.c Wed Dec 1 16:45:25 2004
-@@ -21,6 +21,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include "logview.h"
- #include "desc_db.h"
diff --git a/deskutils/gnome-utils/files/patch-logview_loglist.h b/deskutils/gnome-utils/files/patch-logview_loglist.h
new file mode 100644
index 000000000000..149e04a59abc
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_loglist.h
@@ -0,0 +1,10 @@
+--- logview/loglist.h.orig Wed Apr 19 00:30:12 2006
++++ logview/loglist.h Wed Apr 19 00:30:23 2006
+@@ -39,6 +39,7 @@ typedef struct LogListClass
+ GtkTreeViewClass parent_class;
+ }LogListClass;
+
++GType loglist_get_type (void);
+ GtkWidget *loglist_new (void);
+ void loglist_connect (LogList *list, LogviewWindow *window);
+ void loglist_add_log (LogList *list, Log *log);
diff --git a/deskutils/gnome-utils/files/patch-logview_logrtns.c b/deskutils/gnome-utils/files/patch-logview_logrtns.c
new file mode 100644
index 000000000000..85333d2fe164
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logrtns.c
@@ -0,0 +1,52 @@
+--- logview/logrtns.c.orig Wed Apr 19 00:28:00 2006
++++ logview/logrtns.c Wed Apr 19 00:29:24 2006
+@@ -48,7 +48,7 @@ file_exist (char *filename, gboolean sho
+ char *secondary = NULL;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
+ if (result != GNOME_VFS_OK) {
+@@ -83,7 +83,7 @@ file_is_zipped (char *filename)
+ char *mime_type;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ mime_type = gnome_vfs_get_mime_type (filename);
+ if (mime_type == NULL)
+@@ -106,7 +106,7 @@ file_is_log (char *filename, gboolean sh
+ LogStats *stats;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ stats = log_stats_new (filename, show_error);
+ if (stats==NULL)
+@@ -134,11 +134,11 @@ string_get_date_string (gchar *line)
+ int i=0;
+
+ if (line == NULL || line[0] == 0)
+- return;
++ return NULL;
+
+ split = g_strsplit (line, " ", 4);
+ if (split == NULL)
+- return;
++ return NULL;
+
+ while ((day == NULL || month == NULL) && split[i]!=NULL && i<4) {
+ if (g_str_equal (split[i], "")) {
+@@ -531,7 +531,7 @@ log_unbold (gpointer data)
+ LogList *list;
+ Log *log = data;
+
+- g_return_if_fail (log != NULL);
++ g_return_val_if_fail (log != NULL, FALSE);
+
+ logview = log->window;
+
diff --git a/deskutils/gnome-utils/files/patch-logview_logview-findbar.h b/deskutils/gnome-utils/files/patch-logview_logview-findbar.h
new file mode 100644
index 000000000000..1e6acd101c08
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logview-findbar.h
@@ -0,0 +1,10 @@
+--- logview/logview-findbar.h.orig Wed Apr 19 00:27:03 2006
++++ logview/logview-findbar.h Wed Apr 19 00:27:17 2006
+@@ -44,6 +44,7 @@ typedef struct LogviewFindBarClass
+ GtkHBoxClass parent_class;
+ }LogviewFindBarClass;
+
++GType logview_findbar_get_type (void);
+ GtkWidget *logview_findbar_new (void);
+ void logview_findbar_connect (LogviewFindBar *findbar, LogviewWindow *logview);
+ void logview_findbar_update_visibility (LogviewFindBar *findbar, LogviewWindow *logview);
diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c
deleted file mode 100644
index 5dd057d1a77c..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_logview.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- logview/logview.c.orig Tue Oct 4 12:31:47 2005
-+++ logview/logview.c Tue Oct 4 12:32:04 2005
-@@ -930,7 +930,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->regexp_db_path);
-@@ -952,7 +952,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->descript_db_path);
-@@ -983,7 +983,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->action_db_path);
diff --git a/deskutils/gnome-utils/files/patch-logview_misc.c b/deskutils/gnome-utils/files/patch-logview_misc.c
new file mode 100644
index 000000000000..1a0f54cfe5b1
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_misc.c
@@ -0,0 +1,21 @@
+--- logview/misc.c.orig Tue Apr 18 21:28:07 2006
++++ logview/misc.c Tue Apr 18 21:28:30 2006
+@@ -135,15 +135,15 @@ string_get_date (char *line)
+ {
+ GDate *date;
+ struct tm tp;
+- int cp;
++ char *cp;
+
+ if (line == NULL || line[0] == 0)
+ return NULL;
+
+ cp = strptime (line, "%b %d", &tp);
+- if (cp == 0) {
++ if (cp == NULL) {
+ cp = strptime (line, "%F", &tp);
+- if (cp == 0) {
++ if (cp == NULL) {
+ return NULL;
+ }
+ }
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 24ef4bd1cfd7..51eef16fbc83 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -3,119 +3,96 @@ bin/gnome-panel-screenshot
bin/gnome-screenshot
bin/gnome-search-tool
bin/gnome-system-log
-libdata/bonobo/servers/GNOME_GDictApplet.server
-libexec/gdict-applet
+include/gdict-1.0/gdict/gdict-client-context.h
+include/gdict-1.0/gdict/gdict-context.h
+include/gdict-1.0/gdict/gdict-defbox.h
+include/gdict-1.0/gdict/gdict-entry.h
+include/gdict-1.0/gdict/gdict-enum-types.h
+include/gdict-1.0/gdict/gdict-source-loader.h
+include/gdict-1.0/gdict/gdict-source.h
+include/gdict-1.0/gdict/gdict-utils.h
+include/gdict-1.0/gdict/gdict-version.h
+include/gdict-1.0/gdict/gdict.h
+lib/libgdict-1.0.a
+lib/libgdict-1.0.la
+lib/libgdict-1.0.so
+lib/libgdict-1.0.so.1
+libdata/bonobo/servers/GNOME_DictionaryApplet.server
+libdata/pkgconfig/gdict-1.0.pc
+libexec/gnome-dictionary-applet
+share/doc/gdict/gdict-GdictClientContext.html
+share/doc/gdict/gdict-GdictContext.html
+share/doc/gdict/gdict-GdictDefbox.html
+share/doc/gdict/gdict-GdictEntry.html
+share/doc/gdict/gdict-GdictSource.html
+share/doc/gdict/gdict-GdictSourceLoader.html
+share/doc/gdict/gdict.devhelp
+share/doc/gdict/gdict.devhelp2
+share/doc/gdict/gdict.html
+share/doc/gdict/gdictui.html
+share/doc/gdict/home.png
+share/doc/gdict/index.html
+share/doc/gdict/index.sgml
+share/doc/gdict/introduction.html
+share/doc/gdict/left.png
+share/doc/gdict/right.png
+share/doc/gdict/sources-loader.html
+share/doc/gdict/sources.html
+share/doc/gdict/style.css
+share/doc/gdict/up.png
share/gnome/applications/gnome-dictionary.desktop
+share/gnome/applications/gnome-screenshot.desktop
share/gnome/applications/gnome-search-tool.desktop
share/gnome/applications/gnome-system-log.desktop
-share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
+share/gnome/gdict-1.0/sources/default.desktop
+share/gnome/gdict-1.0/sources/french.desktop
+share/gnome/gdict-1.0/sources/spanish.desktop
+share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
+share/gnome/gnome-dictionary/gnome-dictionary-preferences.glade
+share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
share/gnome/gnome-system-log/gnome-system-log-actions.db
share/gnome/gnome-system-log/gnome-system-log-descript.db
share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
-share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/ja/legal.xml
-share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/uk/legal.xml
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/es/legal.xml
-share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/fr/legal.xml
share/gnome/help/gnome-search-tool/it/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/it/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/it/legal.xml
-share/gnome/help/gnome-search-tool/ja/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ja/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ja/legal.xml
-share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ko/legal.xml
-share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/sv/legal.xml
-share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/uk/legal.xml
-share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_CN/legal.xml
-share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_HK/legal.xml
-share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_TW/legal.xml
share/gnome/help/gnome-system-log/C/figures/syslog_window.png
share/gnome/help/gnome-system-log/C/gnome-system-log.xml
share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/help/gnome-system-log/de/figures/syslog_window.png
-share/gnome/help/gnome-system-log/de/gnome-system-log.xml
-share/gnome/help/gnome-system-log/de/legal.xml
share/gnome/help/gnome-system-log/es/figures/syslog_window.png
share/gnome/help/gnome-system-log/es/gnome-system-log.xml
-share/gnome/help/gnome-system-log/es/legal.xml
-share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
-share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
-share/gnome/help/gnome-system-log/fr/legal.xml
-share/gnome/help/gnome-system-log/it/figures/syslog_window.png
-share/gnome/help/gnome-system-log/it/gnome-system-log.xml
-share/gnome/help/gnome-system-log/it/legal.xml
-share/gnome/help/gnome-system-log/ja/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ja/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ja/legal.xml
-share/gnome/help/gnome-system-log/ko/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ko/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ko/legal.xml
-share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
-share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
-share/gnome/help/gnome-system-log/sv/legal.xml
-share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
-share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
-share/gnome/help/gnome-system-log/uk/legal.xml
-share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_CN/legal.xml
-share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_TW/legal.xml
-share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-it.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf
-share/gnome/omf/gnome-utils/gnome-system-log-C.omf
-share/gnome/omf/gnome-utils/gnome-system-log-de.omf
-share/gnome/omf/gnome-utils/gnome-system-log-es.omf
-share/gnome/omf/gnome-utils/gnome-system-log-fr.omf
-share/gnome/omf/gnome-utils/gnome-system-log-it.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ja.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ko.omf
-share/gnome/omf/gnome-utils/gnome-system-log-sv.omf
-share/gnome/omf/gnome-utils/gnome-system-log-uk.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-C.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-it.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
+share/gnome/pixmaps/gnome-dictionary.png
share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
@@ -149,6 +126,7 @@ share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
@@ -181,62 +159,39 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/gsearchtool
-@dirrm share/gnome/omf/gnome-utils
-@dirrm share/gnome/help/gnome-system-log/zh_TW/figures
-@dirrm share/gnome/help/gnome-system-log/zh_TW
-@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
-@dirrm share/gnome/help/gnome-system-log/zh_CN
-@dirrm share/gnome/help/gnome-system-log/uk/figures
-@dirrm share/gnome/help/gnome-system-log/uk
-@dirrm share/gnome/help/gnome-system-log/sv/figures
-@dirrm share/gnome/help/gnome-system-log/sv
-@dirrm share/gnome/help/gnome-system-log/ko/figures
-@dirrm share/gnome/help/gnome-system-log/ko
-@dirrm share/gnome/help/gnome-system-log/ja/figures
-@dirrm share/gnome/help/gnome-system-log/ja
-@dirrm share/gnome/help/gnome-system-log/it/figures
-@dirrm share/gnome/help/gnome-system-log/it
-@dirrm share/gnome/help/gnome-system-log/fr/figures
-@dirrm share/gnome/help/gnome-system-log/fr
+@dirrm share/gnome/omf/gnome-system-log
+@dirrm share/gnome/omf/gnome-search-tool
+@dirrm share/gnome/omf/gnome-dictionary
@dirrm share/gnome/help/gnome-system-log/es/figures
@dirrm share/gnome/help/gnome-system-log/es
-@dirrm share/gnome/help/gnome-system-log/de/figures
-@dirrm share/gnome/help/gnome-system-log/de
@dirrm share/gnome/help/gnome-system-log/C/figures
@dirrm share/gnome/help/gnome-system-log/C
@dirrm share/gnome/help/gnome-system-log
-@dirrm share/gnome/help/gnome-search-tool/zh_TW/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_TW
-@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_HK
-@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_CN
-@dirrm share/gnome/help/gnome-search-tool/uk/figures
-@dirrm share/gnome/help/gnome-search-tool/uk
-@dirrm share/gnome/help/gnome-search-tool/sv/figures
-@dirrm share/gnome/help/gnome-search-tool/sv
-@dirrm share/gnome/help/gnome-search-tool/ko/figures
-@dirrm share/gnome/help/gnome-search-tool/ko
-@dirrm share/gnome/help/gnome-search-tool/ja/figures
-@dirrm share/gnome/help/gnome-search-tool/ja
@dirrm share/gnome/help/gnome-search-tool/it/figures
@dirrm share/gnome/help/gnome-search-tool/it
-@dirrm share/gnome/help/gnome-search-tool/fr/figures
-@dirrm share/gnome/help/gnome-search-tool/fr
@dirrm share/gnome/help/gnome-search-tool/es/figures
@dirrm share/gnome/help/gnome-search-tool/es
@dirrm share/gnome/help/gnome-search-tool/C/figures
@dirrm share/gnome/help/gnome-search-tool/C
@dirrm share/gnome/help/gnome-search-tool
-@dirrm share/gnome/help/gnome-dictionary/uk/figures
-@dirrm share/gnome/help/gnome-dictionary/uk
-@dirrm share/gnome/help/gnome-dictionary/ja/figures
-@dirrm share/gnome/help/gnome-dictionary/ja
+@dirrm share/gnome/help/gnome-dictionary/es/figures
+@dirrm share/gnome/help/gnome-dictionary/es
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
@dirrm share/gnome/gnome-system-log
@dirrm share/gnome/gnome-screenshot/glade
@dirrm share/gnome/gnome-screenshot
+@dirrm share/gnome/gnome-dictionary
+@dirrm share/gnome/gdict-1.0/sources
+@dirrm share/gnome/gdict-1.0
+@dirrm share/doc/gdict
+@dirrm include/gdict-1.0/gdict
+@dirrm include/gdict-1.0
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 3ec29ebda867..dd323073e74d 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -3,15 +3,16 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.70 2005/10/04 17:39:31 mezz Exp $
+# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.92 2006/04/19 04:46:41 marcus Exp $
#
PORTNAME= gnomeutils2
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.0
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/2.12
+MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,26 +20,20 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 support utilities
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
+INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- libgnomeprintui gnomedesktop
-GNU_CONFIGURE= yes
+ libgnomeprintui gnomedesktop ltverhack
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
-GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \
+GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
gnome-search-tool.schemas logview.schemas
-post-extract:
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
- 's| $$||g'
-
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
.include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index eed200ddfee4..4ac628f22126 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.12.2.tar.bz2) = 71d615932e4ddf7182abeb734b8e370c
-SHA256 (gnome2/gnome-utils-2.12.2.tar.bz2) = be61efed2a5e78533d89ecb10339b72c2cc59d82de0422a7cc72c1ee3320c0de
-SIZE (gnome2/gnome-utils-2.12.2.tar.bz2) = 1726889
+MD5 (gnome2/gnome-utils-2.14.0.tar.bz2) = d1d16ff6bfc1f6ddc110d18ec4dfdbfa
+SHA256 (gnome2/gnome-utils-2.14.0.tar.bz2) = 44586246763c9bfb2b67baedff8c800abde0898012e646ee580ce7a4c2d57e7e
+SIZE (gnome2/gnome-utils-2.14.0.tar.bz2) = 1881962
diff --git a/deskutils/gnomeutils2/files/patch-configure b/deskutils/gnomeutils2/files/patch-configure
deleted file mode 100644
index d5d7d0e103f2..000000000000
--- a/deskutils/gnomeutils2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Mon Nov 25 09:25:29 2002
-+++ configure Tue Nov 26 16:04:42 2002
-@@ -10347,7 +10347,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
index 03a974c23aa4..9d1ee8c9c55c 100644
--- a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
+++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
@@ -1,10 +1,10 @@
---- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004
-+++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004
-@@ -30,6 +30,7 @@
- #endif
+--- gsearchtool/gsearchtool-support.c.orig Thu Jan 5 23:26:25 2006
++++ gsearchtool/gsearchtool-support.c Thu Jan 5 23:27:04 2006
+@@ -31,6 +31,7 @@
#include <glib/gi18n.h>
+ #include <glib/gdate.h>
+#include <sys/types.h>
#include <regex.h>
#include <gdk/gdkx.h>
- #include <bonobo-activation/bonobo-activation.h>
+ #include <libart_lgpl/art_rgb.h>
diff --git a/deskutils/gnomeutils2/files/patch-logview__logview.h b/deskutils/gnomeutils2/files/patch-logview__logview.h
new file mode 100644
index 000000000000..3cd50f68c4bd
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview__logview.h
@@ -0,0 +1,10 @@
+--- logview/logview.h.orig Wed Apr 19 12:39:07 2006
++++ logview/logview.h Wed Apr 19 12:40:08 2006
+@@ -73,6 +73,7 @@
+ void logview_set_window_title (LogviewWindow *window);
+ void logview_set_font (LogviewWindow *window, const gchar *fontname);
+ void logview_show_main_content (LogviewWindow *window);
++GType logview_window_get_type (void);
+ GtkWidget *logview_window_new (void);
+
+ #endif /* __LOGVIEW_H__ */
diff --git a/deskutils/gnomeutils2/files/patch-logview_calendar.h b/deskutils/gnomeutils2/files/patch-logview_calendar.h
new file mode 100644
index 000000000000..3aefb999f00c
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_calendar.h
@@ -0,0 +1,10 @@
+--- logview/calendar.h.orig Tue Apr 18 22:20:35 2006
++++ logview/calendar.h Tue Apr 18 22:20:58 2006
+@@ -45,6 +45,7 @@ typedef struct CalendarClass
+ GtkCalendarClass parent_class;
+ }CalendarClass;
+
++GType calendar_get_type (void);
+ GtkWidget *calendar_new (void);
+ void calendar_select_date (Calendar *calendar, GDate *date);
+ void calendar_init_data (Calendar *calendar, LogviewWindow *logview);
diff --git a/deskutils/gnomeutils2/files/patch-logview_desc_db.c b/deskutils/gnomeutils2/files/patch-logview_desc_db.c
deleted file mode 100644
index 5b687f492e88..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview_desc_db.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004
-+++ logview/desc_db.c Wed Dec 1 16:45:25 2004
-@@ -21,6 +21,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include "logview.h"
- #include "desc_db.h"
diff --git a/deskutils/gnomeutils2/files/patch-logview_loglist.h b/deskutils/gnomeutils2/files/patch-logview_loglist.h
new file mode 100644
index 000000000000..149e04a59abc
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_loglist.h
@@ -0,0 +1,10 @@
+--- logview/loglist.h.orig Wed Apr 19 00:30:12 2006
++++ logview/loglist.h Wed Apr 19 00:30:23 2006
+@@ -39,6 +39,7 @@ typedef struct LogListClass
+ GtkTreeViewClass parent_class;
+ }LogListClass;
+
++GType loglist_get_type (void);
+ GtkWidget *loglist_new (void);
+ void loglist_connect (LogList *list, LogviewWindow *window);
+ void loglist_add_log (LogList *list, Log *log);
diff --git a/deskutils/gnomeutils2/files/patch-logview_logrtns.c b/deskutils/gnomeutils2/files/patch-logview_logrtns.c
new file mode 100644
index 000000000000..85333d2fe164
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_logrtns.c
@@ -0,0 +1,52 @@
+--- logview/logrtns.c.orig Wed Apr 19 00:28:00 2006
++++ logview/logrtns.c Wed Apr 19 00:29:24 2006
+@@ -48,7 +48,7 @@ file_exist (char *filename, gboolean sho
+ char *secondary = NULL;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
+ if (result != GNOME_VFS_OK) {
+@@ -83,7 +83,7 @@ file_is_zipped (char *filename)
+ char *mime_type;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ mime_type = gnome_vfs_get_mime_type (filename);
+ if (mime_type == NULL)
+@@ -106,7 +106,7 @@ file_is_log (char *filename, gboolean sh
+ LogStats *stats;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ stats = log_stats_new (filename, show_error);
+ if (stats==NULL)
+@@ -134,11 +134,11 @@ string_get_date_string (gchar *line)
+ int i=0;
+
+ if (line == NULL || line[0] == 0)
+- return;
++ return NULL;
+
+ split = g_strsplit (line, " ", 4);
+ if (split == NULL)
+- return;
++ return NULL;
+
+ while ((day == NULL || month == NULL) && split[i]!=NULL && i<4) {
+ if (g_str_equal (split[i], "")) {
+@@ -531,7 +531,7 @@ log_unbold (gpointer data)
+ LogList *list;
+ Log *log = data;
+
+- g_return_if_fail (log != NULL);
++ g_return_val_if_fail (log != NULL, FALSE);
+
+ logview = log->window;
+
diff --git a/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h b/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
new file mode 100644
index 000000000000..1e6acd101c08
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
@@ -0,0 +1,10 @@
+--- logview/logview-findbar.h.orig Wed Apr 19 00:27:03 2006
++++ logview/logview-findbar.h Wed Apr 19 00:27:17 2006
+@@ -44,6 +44,7 @@ typedef struct LogviewFindBarClass
+ GtkHBoxClass parent_class;
+ }LogviewFindBarClass;
+
++GType logview_findbar_get_type (void);
+ GtkWidget *logview_findbar_new (void);
+ void logview_findbar_connect (LogviewFindBar *findbar, LogviewWindow *logview);
+ void logview_findbar_update_visibility (LogviewFindBar *findbar, LogviewWindow *logview);
diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c
deleted file mode 100644
index 5dd057d1a77c..000000000000
--- a/deskutils/gnomeutils2/files/patch-logview_logview.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- logview/logview.c.orig Tue Oct 4 12:31:47 2005
-+++ logview/logview.c Tue Oct 4 12:32:04 2005
-@@ -930,7 +930,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->regexp_db_path);
-@@ -952,7 +952,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->descript_db_path);
-@@ -983,7 +983,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->action_db_path);
diff --git a/deskutils/gnomeutils2/files/patch-logview_misc.c b/deskutils/gnomeutils2/files/patch-logview_misc.c
new file mode 100644
index 000000000000..1a0f54cfe5b1
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_misc.c
@@ -0,0 +1,21 @@
+--- logview/misc.c.orig Tue Apr 18 21:28:07 2006
++++ logview/misc.c Tue Apr 18 21:28:30 2006
+@@ -135,15 +135,15 @@ string_get_date (char *line)
+ {
+ GDate *date;
+ struct tm tp;
+- int cp;
++ char *cp;
+
+ if (line == NULL || line[0] == 0)
+ return NULL;
+
+ cp = strptime (line, "%b %d", &tp);
+- if (cp == 0) {
++ if (cp == NULL) {
+ cp = strptime (line, "%F", &tp);
+- if (cp == 0) {
++ if (cp == NULL) {
+ return NULL;
+ }
+ }
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 24ef4bd1cfd7..51eef16fbc83 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -3,119 +3,96 @@ bin/gnome-panel-screenshot
bin/gnome-screenshot
bin/gnome-search-tool
bin/gnome-system-log
-libdata/bonobo/servers/GNOME_GDictApplet.server
-libexec/gdict-applet
+include/gdict-1.0/gdict/gdict-client-context.h
+include/gdict-1.0/gdict/gdict-context.h
+include/gdict-1.0/gdict/gdict-defbox.h
+include/gdict-1.0/gdict/gdict-entry.h
+include/gdict-1.0/gdict/gdict-enum-types.h
+include/gdict-1.0/gdict/gdict-source-loader.h
+include/gdict-1.0/gdict/gdict-source.h
+include/gdict-1.0/gdict/gdict-utils.h
+include/gdict-1.0/gdict/gdict-version.h
+include/gdict-1.0/gdict/gdict.h
+lib/libgdict-1.0.a
+lib/libgdict-1.0.la
+lib/libgdict-1.0.so
+lib/libgdict-1.0.so.1
+libdata/bonobo/servers/GNOME_DictionaryApplet.server
+libdata/pkgconfig/gdict-1.0.pc
+libexec/gnome-dictionary-applet
+share/doc/gdict/gdict-GdictClientContext.html
+share/doc/gdict/gdict-GdictContext.html
+share/doc/gdict/gdict-GdictDefbox.html
+share/doc/gdict/gdict-GdictEntry.html
+share/doc/gdict/gdict-GdictSource.html
+share/doc/gdict/gdict-GdictSourceLoader.html
+share/doc/gdict/gdict.devhelp
+share/doc/gdict/gdict.devhelp2
+share/doc/gdict/gdict.html
+share/doc/gdict/gdictui.html
+share/doc/gdict/home.png
+share/doc/gdict/index.html
+share/doc/gdict/index.sgml
+share/doc/gdict/introduction.html
+share/doc/gdict/left.png
+share/doc/gdict/right.png
+share/doc/gdict/sources-loader.html
+share/doc/gdict/sources.html
+share/doc/gdict/style.css
+share/doc/gdict/up.png
share/gnome/applications/gnome-dictionary.desktop
+share/gnome/applications/gnome-screenshot.desktop
share/gnome/applications/gnome-search-tool.desktop
share/gnome/applications/gnome-system-log.desktop
-share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
+share/gnome/gdict-1.0/sources/default.desktop
+share/gnome/gdict-1.0/sources/french.desktop
+share/gnome/gdict-1.0/sources/spanish.desktop
+share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
+share/gnome/gnome-dictionary/gnome-dictionary-preferences.glade
+share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
share/gnome/gnome-system-log/gnome-system-log-actions.db
share/gnome/gnome-system-log/gnome-system-log-descript.db
share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
-share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/ja/legal.xml
-share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/uk/legal.xml
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/es/legal.xml
-share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/fr/legal.xml
share/gnome/help/gnome-search-tool/it/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/it/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/it/legal.xml
-share/gnome/help/gnome-search-tool/ja/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ja/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ja/legal.xml
-share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ko/legal.xml
-share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/sv/legal.xml
-share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/uk/legal.xml
-share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_CN/legal.xml
-share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_HK/legal.xml
-share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_TW/legal.xml
share/gnome/help/gnome-system-log/C/figures/syslog_window.png
share/gnome/help/gnome-system-log/C/gnome-system-log.xml
share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/help/gnome-system-log/de/figures/syslog_window.png
-share/gnome/help/gnome-system-log/de/gnome-system-log.xml
-share/gnome/help/gnome-system-log/de/legal.xml
share/gnome/help/gnome-system-log/es/figures/syslog_window.png
share/gnome/help/gnome-system-log/es/gnome-system-log.xml
-share/gnome/help/gnome-system-log/es/legal.xml
-share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
-share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
-share/gnome/help/gnome-system-log/fr/legal.xml
-share/gnome/help/gnome-system-log/it/figures/syslog_window.png
-share/gnome/help/gnome-system-log/it/gnome-system-log.xml
-share/gnome/help/gnome-system-log/it/legal.xml
-share/gnome/help/gnome-system-log/ja/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ja/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ja/legal.xml
-share/gnome/help/gnome-system-log/ko/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ko/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ko/legal.xml
-share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
-share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
-share/gnome/help/gnome-system-log/sv/legal.xml
-share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
-share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
-share/gnome/help/gnome-system-log/uk/legal.xml
-share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_CN/legal.xml
-share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_TW/legal.xml
-share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-it.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf
-share/gnome/omf/gnome-utils/gnome-system-log-C.omf
-share/gnome/omf/gnome-utils/gnome-system-log-de.omf
-share/gnome/omf/gnome-utils/gnome-system-log-es.omf
-share/gnome/omf/gnome-utils/gnome-system-log-fr.omf
-share/gnome/omf/gnome-utils/gnome-system-log-it.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ja.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ko.omf
-share/gnome/omf/gnome-utils/gnome-system-log-sv.omf
-share/gnome/omf/gnome-utils/gnome-system-log-uk.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-C.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-it.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
+share/gnome/pixmaps/gnome-dictionary.png
share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
@@ -149,6 +126,7 @@ share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
@@ -181,62 +159,39 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/gsearchtool
-@dirrm share/gnome/omf/gnome-utils
-@dirrm share/gnome/help/gnome-system-log/zh_TW/figures
-@dirrm share/gnome/help/gnome-system-log/zh_TW
-@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
-@dirrm share/gnome/help/gnome-system-log/zh_CN
-@dirrm share/gnome/help/gnome-system-log/uk/figures
-@dirrm share/gnome/help/gnome-system-log/uk
-@dirrm share/gnome/help/gnome-system-log/sv/figures
-@dirrm share/gnome/help/gnome-system-log/sv
-@dirrm share/gnome/help/gnome-system-log/ko/figures
-@dirrm share/gnome/help/gnome-system-log/ko
-@dirrm share/gnome/help/gnome-system-log/ja/figures
-@dirrm share/gnome/help/gnome-system-log/ja
-@dirrm share/gnome/help/gnome-system-log/it/figures
-@dirrm share/gnome/help/gnome-system-log/it
-@dirrm share/gnome/help/gnome-system-log/fr/figures
-@dirrm share/gnome/help/gnome-system-log/fr
+@dirrm share/gnome/omf/gnome-system-log
+@dirrm share/gnome/omf/gnome-search-tool
+@dirrm share/gnome/omf/gnome-dictionary
@dirrm share/gnome/help/gnome-system-log/es/figures
@dirrm share/gnome/help/gnome-system-log/es
-@dirrm share/gnome/help/gnome-system-log/de/figures
-@dirrm share/gnome/help/gnome-system-log/de
@dirrm share/gnome/help/gnome-system-log/C/figures
@dirrm share/gnome/help/gnome-system-log/C
@dirrm share/gnome/help/gnome-system-log
-@dirrm share/gnome/help/gnome-search-tool/zh_TW/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_TW
-@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_HK
-@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_CN
-@dirrm share/gnome/help/gnome-search-tool/uk/figures
-@dirrm share/gnome/help/gnome-search-tool/uk
-@dirrm share/gnome/help/gnome-search-tool/sv/figures
-@dirrm share/gnome/help/gnome-search-tool/sv
-@dirrm share/gnome/help/gnome-search-tool/ko/figures
-@dirrm share/gnome/help/gnome-search-tool/ko
-@dirrm share/gnome/help/gnome-search-tool/ja/figures
-@dirrm share/gnome/help/gnome-search-tool/ja
@dirrm share/gnome/help/gnome-search-tool/it/figures
@dirrm share/gnome/help/gnome-search-tool/it
-@dirrm share/gnome/help/gnome-search-tool/fr/figures
-@dirrm share/gnome/help/gnome-search-tool/fr
@dirrm share/gnome/help/gnome-search-tool/es/figures
@dirrm share/gnome/help/gnome-search-tool/es
@dirrm share/gnome/help/gnome-search-tool/C/figures
@dirrm share/gnome/help/gnome-search-tool/C
@dirrm share/gnome/help/gnome-search-tool
-@dirrm share/gnome/help/gnome-dictionary/uk/figures
-@dirrm share/gnome/help/gnome-dictionary/uk
-@dirrm share/gnome/help/gnome-dictionary/ja/figures
-@dirrm share/gnome/help/gnome-dictionary/ja
+@dirrm share/gnome/help/gnome-dictionary/es/figures
+@dirrm share/gnome/help/gnome-dictionary/es
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
@dirrm share/gnome/gnome-system-log
@dirrm share/gnome/gnome-screenshot/glade
@dirrm share/gnome/gnome-screenshot
+@dirrm share/gnome/gnome-dictionary
+@dirrm share/gnome/gdict-1.0/sources
+@dirrm share/gnome/gdict-1.0
+@dirrm share/doc/gdict
+@dirrm include/gdict-1.0/gdict
+@dirrm include/gdict-1.0
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 418b9366511f..17d656f8bb1f 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.12 2005/10/29 22:31:15 marcus Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.24 2006/04/13 07:52:31 bland Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 1.4.4
-PORTREVISION= 3
+PORTVERSION= 1.6.0
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -22,6 +21,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils
@@ -29,6 +29,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
+INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index a54d6076786b..d5508f6a1ed8 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.4.4.tar.bz2) = c9741329d08908a271864664c3f2e91c
-SHA256 (gnome2/gucharmap-1.4.4.tar.bz2) = 17a1776d1f9b3c481601fc7b33cee38665c384b07b0b3224ae91e7c0c6ba6e23
-SIZE (gnome2/gucharmap-1.4.4.tar.bz2) = 1450271
+MD5 (gnome2/gucharmap-1.6.0.tar.bz2) = 8af03f350c988d1565922b10776bc725
+SHA256 (gnome2/gucharmap-1.6.0.tar.bz2) = b27f201b58ec077ebe6f97ffc040c9f1e171b9595d5a917052345f711c6d2107
+SIZE (gnome2/gucharmap-1.6.0.tar.bz2) = 2131883
diff --git a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
deleted file mode 100644
index c0abeb262374..000000000000
--- a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- gucharmap/gucharmap-window.c.orig Mon Jan 24 05:56:53 2005
-+++ gucharmap/gucharmap-window.c Sat Sep 17 04:04:07 2005
-@@ -82,6 +82,8 @@
- ChaptersMode chapters_mode;
- };
-
-+static GtkWindowClass *parent_class = NULL;
-+
- static void
- status_message (GtkWidget *widget,
- const gchar *message,
-@@ -417,8 +419,8 @@
- {
- GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
- gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ()));
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script"));;
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script"));;
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script"));
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script"));
- }
- }
-
-@@ -430,8 +432,8 @@
- {
- GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
- gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ()));
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block"));;
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block"));;
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block"));
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block"));
- }
- }
-
-@@ -834,12 +836,12 @@
- g_signal_connect (priv->status, "realize", G_CALLBACK (status_realize), guw);
-
- priv->progress = gtk_progress_bar_new ();
-- gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0);;
-+ gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0);
-
- #if 0
- grip = gtk_statusbar_new ();
- gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (grip), TRUE);
-- gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);;
-+ gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);
- #endif
- gtk_widget_show_all (hbox);
-
-@@ -886,11 +888,13 @@
- g_free (priv->last_search);
- */
- #endif
-+ G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-
- static void
- gucharmap_window_class_init (GucharmapWindowClass *clazz)
- {
-+ parent_class = g_type_class_peek_parent (clazz);
- GTK_WIDGET_CLASS (clazz)->show_all = show_all;
- G_OBJECT_CLASS (clazz)->finalize = window_finalize;
- g_type_class_add_private (clazz, sizeof (GucharmapWindowPrivate));
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index 69c6052950f8..a8039b55ab82 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -18,14 +18,22 @@ lib/libgucharmap.so
lib/libgucharmap.so.4
libdata/pkgconfig/gucharmap.pc
share/gnome/applications/gucharmap.desktop
+share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/C/figures/gucharmap_window.png
share/gnome/help/gucharmap/C/gucharmap.xml
share/gnome/help/gucharmap/C/legal.xml
+share/gnome/help/gucharmap/bg/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/bg/figures/gucharmap_window.png
+share/gnome/help/gucharmap/bg/gucharmap.xml
share/gnome/help/gucharmap/de/figures/gucharmap_window.png
share/gnome/help/gucharmap/de/gucharmap.xml
share/gnome/help/gucharmap/de/legal.xml
+share/gnome/help/gucharmap/es/figures/gucharmap_start_window.png
share/gnome/help/gucharmap/es/figures/gucharmap_window.png
share/gnome/help/gucharmap/es/gucharmap.xml
-share/gnome/help/gucharmap/es/legal.xml
+share/gnome/help/gucharmap/fi/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/fi/figures/gucharmap_window.png
+share/gnome/help/gucharmap/fi/gucharmap.xml
share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
share/gnome/help/gucharmap/fr/gucharmap.xml
share/gnome/help/gucharmap/fr/legal.xml
@@ -48,8 +56,10 @@ share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
share/gnome/help/gucharmap/zh_TW/gucharmap.xml
share/gnome/help/gucharmap/zh_TW/legal.xml
share/gnome/omf/gucharmap/gucharmap-C.omf
+share/gnome/omf/gucharmap/gucharmap-bg.omf
share/gnome/omf/gucharmap/gucharmap-de.omf
share/gnome/omf/gucharmap/gucharmap-es.omf
+share/gnome/omf/gucharmap/gucharmap-fi.omf
share/gnome/omf/gucharmap/gucharmap-fr.omf
share/gnome/omf/gucharmap/gucharmap-it.omf
share/gnome/omf/gucharmap/gucharmap-ja.omf
@@ -57,7 +67,7 @@ share/gnome/omf/gucharmap/gucharmap-ko.omf
share/gnome/omf/gucharmap/gucharmap-sv.omf
share/gnome/omf/gucharmap/gucharmap-zh_CN.omf
share/gnome/omf/gucharmap/gucharmap-zh_TW.omf
-share/gnome/pixmaps/gucharmap.png
+share/icons/hicolor/48x48/apps/gucharmap.png
share/locale/am/LC_MESSAGES/gucharmap.mo
share/locale/ar/LC_MESSAGES/gucharmap.mo
share/locale/az/LC_MESSAGES/gucharmap.mo
@@ -76,6 +86,7 @@ share/locale/en_GB/LC_MESSAGES/gucharmap.mo
share/locale/eo/LC_MESSAGES/gucharmap.mo
share/locale/es/LC_MESSAGES/gucharmap.mo
share/locale/et/LC_MESSAGES/gucharmap.mo
+share/locale/eu/LC_MESSAGES/gucharmap.mo
share/locale/fa/LC_MESSAGES/gucharmap.mo
share/locale/fi/LC_MESSAGES/gucharmap.mo
share/locale/fr/LC_MESSAGES/gucharmap.mo
@@ -121,7 +132,10 @@ share/locale/vi/LC_MESSAGES/gucharmap.mo
share/locale/wa/LC_MESSAGES/gucharmap.mo
share/locale/xh/LC_MESSAGES/gucharmap.mo
share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
+share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrm share/gnome/omf/gucharmap
@dirrm share/gnome/help/gucharmap/zh_TW/figures
@dirrm share/gnome/help/gucharmap/zh_TW
@@ -137,10 +151,15 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
@dirrm share/gnome/help/gucharmap/it
@dirrm share/gnome/help/gucharmap/fr/figures
@dirrm share/gnome/help/gucharmap/fr
+@dirrm share/gnome/help/gucharmap/fi/figures
+@dirrm share/gnome/help/gucharmap/fi
@dirrm share/gnome/help/gucharmap/es/figures
@dirrm share/gnome/help/gucharmap/es
@dirrm share/gnome/help/gucharmap/de/figures
@dirrm share/gnome/help/gucharmap/de
+@dirrm share/gnome/help/gucharmap/bg/figures
+@dirrm share/gnome/help/gucharmap/bg
+@dirrm share/gnome/help/gucharmap/C/figures
@dirrm share/gnome/help/gucharmap/C
@dirrm share/gnome/help/gucharmap
@dirrm include/gucharmap
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 1169c59c7823..b5b857e6b9c8 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,14 +3,14 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.2 2006/02/24 05:52:41 marcus Exp $
PORTNAME= nautilus-sendto
-PORTVERSION= 0.4
-PORTREVISION= 2
+PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/nautilus-sendto/0.4
+MASTER_SITE_SUBDIR= sources/nautilus-sendto/0.5
MAINTAINER= gnome@FreeBSD.org
COMMENT= Integration between nautilus, evolution, and gaim
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index b959463871a4..2b285a5ea4bf 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-0.4.tar.bz2) = 2b8bff75d6cda7b1648d59dde6e4e3b2
-SHA256 (nautilus-sendto-0.4.tar.bz2) = 2454d21fd5fc63009903bbdf6ef50bbfb30c0535feaee3d89318dee71c1d1d7b
-SIZE (nautilus-sendto-0.4.tar.bz2) = 257301
+MD5 (nautilus-sendto-0.5.tar.bz2) = e43a5e51270ef3e0f4743ed4d23f7409
+SHA256 (nautilus-sendto-0.5.tar.bz2) = 63709f0b8dc4c8006c9aa792b2898c3e956cb457b1c49e9e552d2fd1c4df7d38
+SIZE (nautilus-sendto-0.5.tar.bz2) = 268518