- Update to 3.2.4

- Replace virtualbox.desktop with the one from the FreeBSD installer,
chase rebranding and remove DocPath because we don't install the user
manual. [1]
- Fix icon location

Reported by:	Mike Harding <mvh AT ix.netcom.com>, avg@, Warren Block <wblock AT wonkity.com> [1]
Approved by:	beat (co-mentor)

8 files changed, 54 insertions, 30 deletions

diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 623847119f97..63bb4c28de19 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.2.2
+DISTVERSION=	3.2.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -277,10 +277,10 @@ post-install:
 	@${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 .if !defined(WITHOUT_QT4)
-	${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps/
-	${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/icons/hicolor/48x48/apps/VBox.png
+	${MKDIR} ${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/pixmaps/VBox.png
 	${MKDIR} ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/solaris/virtualbox.desktop ${PREFIX}/share/applications/virtualbox.desktop
+	${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop ${PREFIX}/share/applications/virtualbox.desktop
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/emulators/virtualbox-ose-legacy/distinfo b/emulators/virtualbox-ose-legacy/distinfo
index c3d8eb05f392..2a3c85a25606 100644
--- a/emulators/virtualbox-ose-legacy/distinfo
+++ b/emulators/virtualbox-ose-legacy/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.2.2-OSE.tar.bz2) = a00884da2f5dd8dc2fad5e27940446c6
-SHA256 (VirtualBox-3.2.2-OSE.tar.bz2) = e3d26ce4cffef5aa26aef7d387015f6636d03cd8f9d38f6ac1a55e40210c9df2
-SIZE (VirtualBox-3.2.2-OSE.tar.bz2) = 57639895
-MD5 (VBoxGuestAdditions_3.2.2.iso) = 00647d660e3ffcb878617cd5e7f33e4e
-SHA256 (VBoxGuestAdditions_3.2.2.iso) = 4a668132153ff50c616518b53531e007db7920b0f1b9289ad5a247ed6f318073
-SIZE (VBoxGuestAdditions_3.2.2.iso) = 33460224
+MD5 (VirtualBox-3.2.4-OSE.tar.bz2) = 80052833c8d9fd162c29fbf91cedd3d0
+SHA256 (VirtualBox-3.2.4-OSE.tar.bz2) = 49e69fd357a80d2537a8139f970a23af9aa5e2f6c3179eefca69d1a75e1fb25c
+SIZE (VirtualBox-3.2.4-OSE.tar.bz2) = 57492454
+MD5 (VBoxGuestAdditions_3.2.4.iso) = 4000e6dce2a646f9ae948724720fd99f
+SHA256 (VBoxGuestAdditions_3.2.4.iso) = 74c711e7b89ca910ba124349a17248e14c4e4d47a7222be4030beaf9a7aad023
+SIZE (VBoxGuestAdditions_3.2.4.iso) = 33470464
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
new file mode 100644
index 000000000000..e08926c4ed15
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
@@ -0,0 +1,16 @@
+--- src/VBox/Installer/freebsd/virtualbox.desktop.orig	2010-06-09 13:54:18.000000000 +0200
++++ src/VBox/Installer/freebsd/virtualbox.desktop	2010-06-09 13:58:47.000000000 +0200
+@@ -2,12 +2,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Version=1.0
+-Name=Sun VirtualBox
++Name=Oracle VM VirtualBox
+ GenericName=Virtual Machine
+ Type=Application
+ Exec=VirtualBox
+ TryExec=VirtualBox
+-DocPath=file://$VBOX_DOC_PATH/UserManual.pdf
+ Icon=VBox
+ Categories=Emulator;System;
+ Comment=Run several virtual systems on a single host computer
diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist
index f60b290476ea..b26346761f3d 100644
--- a/emulators/virtualbox-ose-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-legacy/pkg-plist
@@ -128,7 +128,7 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%NLS%%%%DATADIR%%/nls/qt_zh_CN.qm
 %%NLS%%%%DATADIR%%/nls/qt_zh_TW.qm
 %%QT4%%share/applications/virtualbox.desktop
-%%QT4%%share/icons/hicolor/48x48/apps/VBox.png
+%%QT4%%share/pixmaps/VBox.png
 %%DATADIR%%/idl/nsIDebug.idl
 %%DATADIR%%/idl/nsIInterfaceRequestor.idl
 %%DATADIR%%/idl/nsIMemory.idl
@@ -604,10 +604,6 @@ include/virtualbox/xpcom/xpcom-config.h
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/idl
 @dirrm %%DATADIR%%
-%%QT4%%@dirrmtry share/icons/hicolor/48x48/apps
-%%QT4%%@dirrmtry share/icons/hicolor/48x48
-%%QT4%%@dirrmtry share/icons/hicolor
-%%QT4%%@dirrmtry share/icons
 %%QT4%%@dirrmtry share/applications
 @dirrm lib/virtualbox/components
 %%GUESTADDITIONS%%@dirrm lib/virtualbox/additions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 623847119f97..63bb4c28de19 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.2.2
+DISTVERSION=	3.2.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -277,10 +277,10 @@ post-install:
 	@${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 .if !defined(WITHOUT_QT4)
-	${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps/
-	${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/icons/hicolor/48x48/apps/VBox.png
+	${MKDIR} ${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/pixmaps/VBox.png
 	${MKDIR} ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/solaris/virtualbox.desktop ${PREFIX}/share/applications/virtualbox.desktop
+	${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop ${PREFIX}/share/applications/virtualbox.desktop
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index c3d8eb05f392..2a3c85a25606 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.2.2-OSE.tar.bz2) = a00884da2f5dd8dc2fad5e27940446c6
-SHA256 (VirtualBox-3.2.2-OSE.tar.bz2) = e3d26ce4cffef5aa26aef7d387015f6636d03cd8f9d38f6ac1a55e40210c9df2
-SIZE (VirtualBox-3.2.2-OSE.tar.bz2) = 57639895
-MD5 (VBoxGuestAdditions_3.2.2.iso) = 00647d660e3ffcb878617cd5e7f33e4e
-SHA256 (VBoxGuestAdditions_3.2.2.iso) = 4a668132153ff50c616518b53531e007db7920b0f1b9289ad5a247ed6f318073
-SIZE (VBoxGuestAdditions_3.2.2.iso) = 33460224
+MD5 (VirtualBox-3.2.4-OSE.tar.bz2) = 80052833c8d9fd162c29fbf91cedd3d0
+SHA256 (VirtualBox-3.2.4-OSE.tar.bz2) = 49e69fd357a80d2537a8139f970a23af9aa5e2f6c3179eefca69d1a75e1fb25c
+SIZE (VirtualBox-3.2.4-OSE.tar.bz2) = 57492454
+MD5 (VBoxGuestAdditions_3.2.4.iso) = 4000e6dce2a646f9ae948724720fd99f
+SHA256 (VBoxGuestAdditions_3.2.4.iso) = 74c711e7b89ca910ba124349a17248e14c4e4d47a7222be4030beaf9a7aad023
+SIZE (VBoxGuestAdditions_3.2.4.iso) = 33470464
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop b/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
new file mode 100644
index 000000000000..e08926c4ed15
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-virtualbox.desktop
@@ -0,0 +1,16 @@
+--- src/VBox/Installer/freebsd/virtualbox.desktop.orig	2010-06-09 13:54:18.000000000 +0200
++++ src/VBox/Installer/freebsd/virtualbox.desktop	2010-06-09 13:58:47.000000000 +0200
+@@ -2,12 +2,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Version=1.0
+-Name=Sun VirtualBox
++Name=Oracle VM VirtualBox
+ GenericName=Virtual Machine
+ Type=Application
+ Exec=VirtualBox
+ TryExec=VirtualBox
+-DocPath=file://$VBOX_DOC_PATH/UserManual.pdf
+ Icon=VBox
+ Categories=Emulator;System;
+ Comment=Run several virtual systems on a single host computer
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index f60b290476ea..b26346761f3d 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -128,7 +128,7 @@ lib/virtualbox/components/VBoxXPCOMBase.xpt
 %%NLS%%%%DATADIR%%/nls/qt_zh_CN.qm
 %%NLS%%%%DATADIR%%/nls/qt_zh_TW.qm
 %%QT4%%share/applications/virtualbox.desktop
-%%QT4%%share/icons/hicolor/48x48/apps/VBox.png
+%%QT4%%share/pixmaps/VBox.png
 %%DATADIR%%/idl/nsIDebug.idl
 %%DATADIR%%/idl/nsIInterfaceRequestor.idl
 %%DATADIR%%/idl/nsIMemory.idl
@@ -604,10 +604,6 @@ include/virtualbox/xpcom/xpcom-config.h
 @dirrm %%DATADIR%%/samples
 @dirrm %%DATADIR%%/idl
 @dirrm %%DATADIR%%
-%%QT4%%@dirrmtry share/icons/hicolor/48x48/apps
-%%QT4%%@dirrmtry share/icons/hicolor/48x48
-%%QT4%%@dirrmtry share/icons/hicolor
-%%QT4%%@dirrmtry share/icons
 %%QT4%%@dirrmtry share/applications
 @dirrm lib/virtualbox/components
 %%GUESTADDITIONS%%@dirrm lib/virtualbox/additions