- Update to 4.1.20

- Remove VNC IPv6 patch because it has been fixed upstream
- Pet portlint once again (LICENSE section)

Submitted by:	Mikhail Tsatsenko <m.tsatsenko@gmail.com>

7 files changed, 17 insertions, 32 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 62f580013b58..f0f35a25c31d 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.1.18
-PORTREVISION=	1
+DISTVERSION=	4.1.20
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -19,13 +18,13 @@ DISTNAME=	VirtualBox-${DISTVERSION}
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	VirtualBox additions for FreeBSD guests
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		as86:${PORTSDIR}/devel/dev86 \
 		kmk:${PORTSDIR}/devel/kBuild-devel
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxguest vboxservice
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 228fa029bd43..a4069e4f916f 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.1.18.tar.bz2) = e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7
-SIZE (VirtualBox-4.1.18.tar.bz2) = 73688436
+SHA256 (VirtualBox-4.1.20.tar.bz2) = b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb
+SIZE (VirtualBox-4.1.20.tar.bz2) = 73391720
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index f86ab7bdaf05..2768c544aabf 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.1.18
-PORTREVISION=	1
+DISTVERSION=	4.1.20
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 228fa029bd43..a4069e4f916f 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.1.18.tar.bz2) = e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7
-SIZE (VirtualBox-4.1.18.tar.bz2) = 73688436
+SHA256 (VirtualBox-4.1.20.tar.bz2) = b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb
+SIZE (VirtualBox-4.1.20.tar.bz2) = 73391720
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 51571978a98e..e52ebf774e5e 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.1.18
+DISTVERSION=	4.1.20
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -20,6 +20,9 @@ EXTRACT_ONLY=	VirtualBox-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	A general-purpose full virtualizer for x86 hardware
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		as86:${PORTSDIR}/devel/dev86 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
@@ -30,9 +33,6 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 USE_CDRTOOLS=	yes
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index db0f0b9db2cf..240eaa916ad6 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.1.18.tar.bz2) = e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7
-SIZE (VirtualBox-4.1.18.tar.bz2) = 73688436
-SHA256 (VBoxGuestAdditions_4.1.18.iso) = 0b670a698dcb427ebf69cdec1e040b26e93538e1ca76f58506c1db70308152ff
-SIZE (VBoxGuestAdditions_4.1.18.iso) = 52164608
+SHA256 (VirtualBox-4.1.20.tar.bz2) = b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb
+SIZE (VirtualBox-4.1.20.tar.bz2) = 73391720
+SHA256 (VBoxGuestAdditions_4.1.20.iso) = 04ab744725c17db441077ef471eeb41db5fc6e4569ac54e6c4f52923737b0494
+SIZE (VBoxGuestAdditions_4.1.20.iso) = 52207616
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxHeadless-FramebufferVNC.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxHeadless-FramebufferVNC.cpp
deleted file mode 100644
index 8af83a23a87a..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxHeadless-FramebufferVNC.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp.orig	2012-05-12 19:50:26.807639833 +0100
-+++ src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp	2012-05-12 19:50:38.568636058 +0100
-@@ -89,7 +89,10 @@
-     vncServer = rfbGetScreen(0, NULL, mWidth, mHeight, 8, 3, 1);
-     vncServer->screenData = (void*)this;
-     if (mVncPort)
-+    {
-         vncServer->port = mVncPort;
-+        vncServer->ipv6port = mVncPort;
-+    }
-     char *pszDesktopName;
-     rc = RTStrAPrintf(&pszDesktopName, "%s - VirtualBox", pszName);
-     if (rc >= 0)