- Update to 0.5.0

Approved by:	tabthorpe (mentor)

5 files changed, 93 insertions, 48 deletions

diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index cede1f5ff21b..d38468698949 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -6,44 +6,34 @@
 #
 
 PORTNAME=	vboxgtk
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	deskutils emulators gnome
-MASTER_SITES=	http://www.xente.mundo-r.com/narf/vboxgtk/releases/ \
-		LOCAL/avl
+MASTER_SITES=	SF
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	GTK frontend for VirtualBox
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject \
-		VBoxManage:${PORTSDIR}/emulators/virtualbox
+		${PYTHON_SITELIBDIR}/virtualbox/xpcom/vboxxpcom.py:${PORTSDIR}/emulators/virtualbox
 
-USE_BZIP2=	yes
-NO_BUILD=	yes
-USE_PYTHON_RUN=	yes
+USE_PYTHON=	yes
 USE_GNOME=	pygtk2
-VBOXGTKDIR=	${PREFIX}/libexec/${PORTNAME}
-DESKTOP_ENTRIES="Sun VirtualBox" \
-		"Run several virtual systems on a single host computer" \
-		"${PORTNAME}.png" \
-		"${PORTNAME}" \
-		"Application;System;Emulator;" \
-		true
-PLIST_SUB=	VBOXGTKDIR="${VBOXGTKDIR:S,^${PREFIX}/,,}"
+USE_PYDISTUTILS=	yes
+INSTALLS_ICONS=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|\([^#]self.base_path = \).*|\1\"${VBOXGTKDIR}/\"|' \
-			-e 's|/usr/bin|${PREFIX}/bin|' ${WRKSRC}/${PORTNAME}
-	@${REINPLACE_CMD} -e 's|createvdi|createhd|' -e 's|(hd_size|(int(hd_size)|' \
-			${WRKSRC}/vboxdao_vboxmanage.py
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
 
-do-install:
-	${MKDIR} ${VBOXGTKDIR}/pixmaps
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${VBOXGTKDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.py ${VBOXGTKDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.glade ${VBOXGTKDIR}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${VBOXGTKDIR}/pixmaps
-	${LN} -sf ${VBOXGTKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-	${LN} -sf ${VBOXGTKDIR}/pixmaps/48x48.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+post-patch:
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e '/self.add_mo_files/d' \
+		-e '/os.system("intltool/d' ${WRKSRC}/setup.py
+.endif
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' ${WRKSRC}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/deskutils/vboxgtk/distinfo b/deskutils/vboxgtk/distinfo
index 2921a0ca3e31..69616aeac0c3 100644
--- a/deskutils/vboxgtk/distinfo
+++ b/deskutils/vboxgtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (vboxgtk-0.4.1.tar.bz2) = 9afcb0d09bd86b02a6a422bdb8598b49
-SHA256 (vboxgtk-0.4.1.tar.bz2) = 96b721ddafe2a788d9f31ba0a4299fdacc0a2ac56c956877479f9edb000e1ec9
-SIZE (vboxgtk-0.4.1.tar.bz2) = 33318
+MD5 (vboxgtk-0.5.0.tar.gz) = 3f431b4ae6cfd411f53372f8a7e2010c
+SHA256 (vboxgtk-0.5.0.tar.gz) = 8d9e5b5557370365f618871c931c663f2410165b034dc5b605762ecc5213db62
+SIZE (vboxgtk-0.5.0.tar.gz) = 41419
diff --git a/deskutils/vboxgtk/files/patch-bin_vboxgtk b/deskutils/vboxgtk/files/patch-bin_vboxgtk
new file mode 100644
index 000000000000..f5b823684506
--- /dev/null
+++ b/deskutils/vboxgtk/files/patch-bin_vboxgtk
@@ -0,0 +1,22 @@
+--- 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:
+-        dir_list = ('/usr/lib/virtualbox-ose',
++        dir_list = ('%%LOCALBASE%%/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%%/virtualbox'
++        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)
diff --git a/deskutils/vboxgtk/files/patch-vboxgtk___init__.py b/deskutils/vboxgtk/files/patch-vboxgtk___init__.py
new file mode 100644
index 000000000000..2765115b95a7
--- /dev/null
+++ b/deskutils/vboxgtk/files/patch-vboxgtk___init__.py
@@ -0,0 +1,11 @@
+--- vboxgtk/__init__.py.orig	2009-06-20 00:16:28.000000000 +1000
++++ vboxgtk/__init__.py	2009-09-04 21:47:01.000000000 +1000
+@@ -37,8 +37,6 @@
+ gettext_domain = 'vboxgtk'
+ gettext.install(gettext_domain, locale_path, unicode = True)
+ locale.setlocale(locale.LC_ALL, '')
+-locale.bindtextdomain(gettext_domain, locale_path)
+-locale.textdomain(gettext_domain)
+ 
+ 
+ # Import main for the launch script
diff --git a/deskutils/vboxgtk/pkg-plist b/deskutils/vboxgtk/pkg-plist
index 4147acae3931..760e773a4db8 100644
--- a/deskutils/vboxgtk/pkg-plist
+++ b/deskutils/vboxgtk/pkg-plist
@@ -1,17 +1,39 @@
 bin/vboxgtk
-%%VBOXGTKDIR%%/pixmaps/16x16.png
-%%VBOXGTKDIR%%/pixmaps/32x32.png
-%%VBOXGTKDIR%%/pixmaps/48x48.png
-%%VBOXGTKDIR%%/util.py
-%%VBOXGTKDIR%%/vboxdao_vboxmanage.py
-%%VBOXGTKDIR%%/vboxdao_xml.py
-%%VBOXGTKDIR%%/vboxgtk
-%%VBOXGTKDIR%%/vboxgtk.glade
-%%VBOXGTKDIR%%/vboxiface.py
-%%VBOXGTKDIR%%/vboxmgr.py
-%%VBOXGTKDIR%%/vboxrunner_sdl_cs.py
-%%VBOXGTKDIR%%/vboxrunner_sdl_thr.py
-%%VBOXGTKDIR%%/vmvdi.py
-share/pixmaps/vboxgtk.png
-@dirrm %%VBOXGTKDIR%%/pixmaps
-@dirrm %%VBOXGTKDIR%%
+%%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.pyo
+%%PYTHON_SITELIBDIR%%/vboxgtk/vboxgtk_iface.pyo
+share/applications/vboxgtk.desktop
+%%NLS%%share/locale/es/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
+share/icons/hicolor/32x32/apps/vboxgtk.png
+share/icons/hicolor/scalable/apps/vboxgtk.svg
+%%DATADIR%%/xml/vboxgtk-actions.xml
+%%DATADIR%%/xml/vboxgtk.xml
+@dirrm %%PYTHON_SITELIBDIR%%/vboxgtk
+@dirrm %%DATADIR%%/xml
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable