diff options
| author | Alexander Logvinov <avl@FreeBSD.org> | 2009-09-12 04:43:35 +0000 |
|---|---|---|
| committer | Alexander Logvinov <avl@FreeBSD.org> | 2009-09-12 04:43:35 +0000 |
| commit | 177bfaf759b287e9604bb309bc42db20c414e764 (patch) | |
| tree | 66357357e303317e26d938bad3793a552007c4ef /deskutils/vboxgtk | |
| parent | 27aa0470ccfd7f962d2b12374bfa9e752e6f942d (diff) | |
- Fix virtualbox python api dependency
- Mark IGNORE, since vboxgtk doesn't work with virtualbox-3.0.51.r22683
Approved by: tabthorpe, glarkin (mentors, implicit)
Notes
Notes:
svn path=/head/; revision=241261
Diffstat (limited to 'deskutils/vboxgtk')
| -rw-r--r-- | deskutils/vboxgtk/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/vboxgtk/files/patch-bin_vboxgtk | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile index d38468698949..44113bd2f974 100644 --- a/deskutils/vboxgtk/Makefile +++ b/deskutils/vboxgtk/Makefile @@ -14,7 +14,7 @@ MAINTAINER= avl@FreeBSD.org COMMENT= GTK frontend for VirtualBox RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject \ - ${PYTHON_SITELIBDIR}/virtualbox/xpcom/vboxxpcom.py:${PORTSDIR}/emulators/virtualbox + ${PYTHON_SITELIBDIR}/xpcom/vboxxpcom.py:${PORTSDIR}/emulators/virtualbox USE_PYTHON= yes USE_GNOME= pygtk2 @@ -28,6 +28,8 @@ 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/files/patch-bin_vboxgtk b/deskutils/vboxgtk/files/patch-bin_vboxgtk index f5b823684506..680dca6bd01c 100644 --- a/deskutils/vboxgtk/files/patch-bin_vboxgtk +++ b/deskutils/vboxgtk/files/patch-bin_vboxgtk @@ -15,8 +15,17 @@ 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' ++ 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 |