3 files changed, 40 insertions, 16 deletions

diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 2cdb73107f4a..25fda0982150 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.42 2006/09/07 19:05:16 marcus Exp $
+#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.54 2007/03/14 11:58:47 ahze Exp $
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	2.16.2
+PORTVERSION=	2.18.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,6 +16,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Omnipresent versatile search interface
 
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
@@ -24,7 +27,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--disable-beagle
+INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -34,10 +37,6 @@ OPTIONS=	EVO "Enable evolution support" on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=	Does not build on 4.X
-.endif
-
 .if !defined(WITHOUT_EVO)
 USE_GNOME+=	evolutiondataserver
 PLIST_SUB+=	EVO=""
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 1cd366f86195..ece34fe4d1f2 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.16.2.tar.bz2) = 6a4780813a55e2f464e69cdfac89894d
-SHA256 (gnome2/deskbar-applet-2.16.2.tar.bz2) = 60af4a2924bc67eb497b3df24b710cc5d586336eab9ef338f5538c07e3bff18f
-SIZE (gnome2/deskbar-applet-2.16.2.tar.bz2) = 617194
+MD5 (gnome2/deskbar-applet-2.18.0.tar.bz2) = 2fb3bfc4d1a657adf175fa444a2309f0
+SHA256 (gnome2/deskbar-applet-2.18.0.tar.bz2) = 51c6c8cd68793a92dc172d5cfb9bad9fbc80e9be49cdbcff449635c482931e5f
+SIZE (gnome2/deskbar-applet-2.18.0.tar.bz2) = 645787
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 9b7b0481de99..8856f3c53b2d 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -17,18 +17,12 @@ lib/deskbar-applet/handlers/epiphany.pyo
 lib/deskbar-applet/handlers/files.py
 lib/deskbar-applet/handlers/files.pyc
 lib/deskbar-applet/handlers/files.pyo
-lib/deskbar-applet/handlers/galago.py
-lib/deskbar-applet/handlers/galago.pyc
-lib/deskbar-applet/handlers/galago.pyo
 lib/deskbar-applet/handlers/galeon.py
 lib/deskbar-applet/handlers/galeon.pyc
 lib/deskbar-applet/handlers/galeon.pyo
 lib/deskbar-applet/handlers/gdmactions.py
 lib/deskbar-applet/handlers/gdmactions.pyc
 lib/deskbar-applet/handlers/gdmactions.pyo
-lib/deskbar-applet/handlers/google-live.py
-lib/deskbar-applet/handlers/google-live.pyc
-lib/deskbar-applet/handlers/google-live.pyo
 lib/deskbar-applet/handlers/history.py
 lib/deskbar-applet/handlers/history.pyc
 lib/deskbar-applet/handlers/history.pyo
@@ -41,6 +35,9 @@ lib/deskbar-applet/handlers/mozilla.pyo
 lib/deskbar-applet/handlers/programs.py
 lib/deskbar-applet/handlers/programs.pyc
 lib/deskbar-applet/handlers/programs.pyo
+lib/deskbar-applet/handlers/recent.py
+lib/deskbar-applet/handlers/recent.pyc
+lib/deskbar-applet/handlers/recent.pyo
 lib/deskbar-applet/handlers/web_address.py
 lib/deskbar-applet/handlers/web_address.pyc
 lib/deskbar-applet/handlers/web_address.pyo
@@ -77,6 +74,9 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
@@ -203,6 +203,18 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyo
 libdata/bonobo/servers/Deskbar_Applet.server
 libdata/pkgconfig/deskbar-applet.pc
 share/gnome/deskbar-applet/Deskbar_Applet.xml
@@ -221,6 +233,10 @@ 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/help/deskbar/C/deskbar.xml
+share/gnome/help/deskbar/C/figures/deskbar-applet.png
+share/gnome/help/deskbar/C/legal.xml
+share/gnome/omf/deskbar/deskbar-C.omf
 share/icons/hicolor/16x16/apps/deskbar-applet.png
 share/icons/hicolor/22x22/apps/deskbar-applet.png
 share/icons/hicolor/32x32/apps/deskbar-applet.png
@@ -243,6 +259,7 @@ 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/eu/LC_MESSAGES/deskbar-applet.mo
+share/locale/fa/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
@@ -271,6 +288,7 @@ 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/ro/LC_MESSAGES/deskbar-applet.mo
 share/locale/ru/LC_MESSAGES/deskbar-applet.mo
 share/locale/sk/LC_MESSAGES/deskbar-applet.mo
 share/locale/sl/LC_MESSAGES/deskbar-applet.mo
@@ -286,8 +304,13 @@ 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
+@dirrm share/gnome/omf/deskbar
+@dirrm share/gnome/help/deskbar/C/figures
+@dirrm share/gnome/help/deskbar/C
+@dirrm share/gnome/help/deskbar
 @dirrm share/gnome/deskbar-applet/art
 @dirrm share/gnome/deskbar-applet
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/updater
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/window
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
@@ -317,6 +340,8 @@ share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
 @dirrmtry share/locale/sl
 @dirrmtry share/locale/sk/LC_MESSAGES
 @dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
 @dirrmtry share/locale/pt/LC_MESSAGES
 @dirrmtry share/locale/pt
 @dirrmtry share/locale/pl/LC_MESSAGES