4 files changed, 22 insertions, 44 deletions

diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index 3c737db378f7..7e24b0a9bc7e 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vboxgtk
-PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTVERSION=	0.5.2
 CATEGORIES=	deskutils emulators gnome
 MASTER_SITES=	SF
 
@@ -29,8 +28,6 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-IGNORE=		does not work with virtualbox-3.0.51.r22683
-
 post-patch:
 .if defined(WITHOUT_NLS)
 	@${REINPLACE_CMD} -e '/self.add_mo_files/d' \
diff --git a/deskutils/vboxgtk/distinfo b/deskutils/vboxgtk/distinfo
index 69616aeac0c3..3b81314aeb93 100644
--- a/deskutils/vboxgtk/distinfo
+++ b/deskutils/vboxgtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (vboxgtk-0.5.0.tar.gz) = 3f431b4ae6cfd411f53372f8a7e2010c
-SHA256 (vboxgtk-0.5.0.tar.gz) = 8d9e5b5557370365f618871c931c663f2410165b034dc5b605762ecc5213db62
-SIZE (vboxgtk-0.5.0.tar.gz) = 41419
+MD5 (vboxgtk-0.5.2.tar.gz) = 48a808b7f069df52d9e857c6e9b14d61
+SHA256 (vboxgtk-0.5.2.tar.gz) = e287e81c97e2e2e74a654b06657a3295ea022acf9af5e3fd6c703d2af9e125be
+SIZE (vboxgtk-0.5.2.tar.gz) = 43547
diff --git a/deskutils/vboxgtk/files/patch-bin_vboxgtk b/deskutils/vboxgtk/files/patch-bin_vboxgtk
index 680dca6bd01c..c36a9a226616 100644
--- a/deskutils/vboxgtk/files/patch-bin_vboxgtk
+++ b/deskutils/vboxgtk/files/patch-bin_vboxgtk
@@ -1,31 +1,11 @@
 --- bin/vboxgtk.orig	2009-09-04 21:39:38.000000000 +1000
 +++ bin/vboxgtk	2009-09-04 21:41:14.000000000 +1000
-@@ -47,7 +47,7 @@
-                     vbox_install_path = line.lstrip(head).rstrip('\n')
-                     break
-     else:
+@@ -54,7 +54,7 @@
+                         vbox_program_path = line.lstrip(head).rstrip('\n')
+                         break
+     if vbox_program_path is None:
 -        dir_list = ('/usr/lib/virtualbox-ose',
 +        dir_list = ('%%LOCALBASE%%/lib/virtualbox',
+                     '/usr/lib/virtualbox',
+                     '/usr/local/lib/virtualbox',
                      '/opt/VirtualBox')
-         for d in dir_list:
-             if os.path.isdir(d):
-@@ -56,8 +56,8 @@
-     if vbox_install_path is not None:
-         vbox_install_path = os.path.abspath(vbox_install_path)
-         sys.path.insert(0, vbox_install_path)
--        sdk_dir = 'sdk/bindings/xpcom/python'
--        sys.path.insert(0, os.path.join(vbox_install_path, sdk_dir))
-+        sdk_dir = '%%PYTHON_SITELIBDIR%%/xpcom'
-+        sys.path.insert(0, sdk_dir)
-     base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-     if os.path.isdir(os.path.join(base_path, 'vboxgtk')):
-         sys.path.insert(0, base_path)
-@@ -72,7 +72,7 @@
-     Otherwise this program will not run.
-     """
-     try:
--        import xpcom.vboxxpcom
-+        import vboxxpcom
-     except ImportError as ex:
-         print "ERROR: xpcom package not found\n" + textwrap.dedent(msg)
-         raise ex    
diff --git a/deskutils/vboxgtk/pkg-plist b/deskutils/vboxgtk/pkg-plist
index 760e773a4db8..84b4965c70cc 100644
--- a/deskutils/vboxgtk/pkg-plist
+++ b/deskutils/vboxgtk/pkg-plist
@@ -1,21 +1,22 @@
 bin/vboxgtk
-%%PYTHON_SITELIBDIR%%/vboxgtk/vboxdao_xpcom.py
 %%PYTHON_SITELIBDIR%%/vboxgtk/__init__.py
-%%PYTHON_SITELIBDIR%%/vboxgtk/util.py
-%%PYTHON_SITELIBDIR%%/vboxgtk/paths.py
-%%PYTHON_SITELIBDIR%%/vboxgtk/vboxgtk_iface.py
-%%PYTHON_SITELIBDIR%%/vboxgtk/vboxdao_xpcom.pyc
 %%PYTHON_SITELIBDIR%%/vboxgtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/vboxgtk/util.pyc
-%%PYTHON_SITELIBDIR%%/vboxgtk/paths.pyc
-%%PYTHON_SITELIBDIR%%/vboxgtk/vboxgtk_iface.pyc
-%%PYTHON_SITELIBDIR%%/vboxgtk/vboxdao_xpcom.pyo
 %%PYTHON_SITELIBDIR%%/vboxgtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/vboxgtk/util.pyo
+%%PYTHON_SITELIBDIR%%/vboxgtk/paths.py
+%%PYTHON_SITELIBDIR%%/vboxgtk/paths.pyc
 %%PYTHON_SITELIBDIR%%/vboxgtk/paths.pyo
+%%PYTHON_SITELIBDIR%%/vboxgtk/util.py
+%%PYTHON_SITELIBDIR%%/vboxgtk/util.pyc
+%%PYTHON_SITELIBDIR%%/vboxgtk/util.pyo
+%%PYTHON_SITELIBDIR%%/vboxgtk/vboxdao_generic.py
+%%PYTHON_SITELIBDIR%%/vboxgtk/vboxdao_generic.pyc
+%%PYTHON_SITELIBDIR%%/vboxgtk/vboxdao_generic.pyo
+%%PYTHON_SITELIBDIR%%/vboxgtk/vboxgtk_iface.py
+%%PYTHON_SITELIBDIR%%/vboxgtk/vboxgtk_iface.pyc
 %%PYTHON_SITELIBDIR%%/vboxgtk/vboxgtk_iface.pyo
 share/applications/vboxgtk.desktop
-%%NLS%%share/locale/es/LC_MESSAGES/vboxgtk.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/vboxgtk.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/vboxgtk.mo
 share/icons/hicolor/16x16/apps/vboxgtk.png
 share/icons/hicolor/22x22/apps/vboxgtk.png
 share/icons/hicolor/24x24/apps/vboxgtk.png