11 files changed, 46 insertions, 116 deletions
diff --git a/MOVED b/MOVED
index ab93524e9793..6e6074380ea7 100644
--- a/MOVED
+++ b/MOVED
@@ -7329,7 +7329,6 @@ security/cyassl|security/wolfssl|2015-03-28|Renamed upstream
 devel/rubygem-rcov||2015-03-28|Has expired: Does not work with Ruby 2.x
 emulators/linux_dist-gentoo-stage3||2015-03-28|Has expired: Broken for more than 6 months
 emulators/linux_base-gentoo-stage3||2015-03-28|Has expired: Broken for more than 6 months
-www/vimb|www/vimb-gtk3|2015-03-29|Split into www/vimb-gtk2 and www/vimb-gtk3 (former default)
 ports-mgmt/portbuilder||2015-03-31|Has expired: No longer developed and overcome by changed in the Ports Collection
 devel/subversion16|devel/subversion|2015-03-31|Has expired: EoL, use devel/subversion
 lang/nimrod|lang/nim|2015-04-03|Renamed by upstream
@@ -11976,3 +11975,5 @@ textproc/xxdiff-scripts||2019-03-16|Has expired: Qt4 has been EOL since december
 graphics/py-pivy||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 security/pinentry-qt4||2019-03-17|Has expired: Qt4 has been EOL since december 2015
 www/libsocialweb||2019-03-23|Project was archived upstream
+www/vimb-gtk2|www/vimb|2019-03-24|Merged into www/vimb
+www/vimb-gtk3|www/vimb|2019-03-24|Merged into www/vimb
diff --git a/www/Makefile b/www/Makefile
index 7892d311b1ad..dbdb9da20041 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2422,8 +2422,7 @@
     SUBDIR += vdradmin-am
     SUBDIR += vee
     SUBDIR += vertx
-    SUBDIR += vimb-gtk2
-    SUBDIR += vimb-gtk3
+    SUBDIR += vimb
     SUBDIR += visitors
     SUBDIR += volta
     SUBDIR += w3m
diff --git a/www/vimb-gtk2/Makefile b/www/vimb-gtk2/Makefile
deleted file mode 100644
index 8503f5a1dc03..000000000000
--- a/www/vimb-gtk2/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $FreeBSD$
-
-PORTNAME?=	vimb-gtk2
-PORTVERSION=	2.12
-CATEGORIES=	www
-
-MAINTAINER=	mike.d.ft402@gmail.com
-COMMENT=	Vim like browser
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-LIB_DEPENDS?=	libwebkitgtk-1.0.so:www/webkit-gtk2 \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
-		libsoup-2.4.so:devel/libsoup
-
-DEPRECATED=	Uses webkit-gtk2 which has security issues
-EXPIRATION_DATE=2019-03-24
-
-USES=		gmake pkgconfig
-USE_GNOME?=	gtk20 cairo gdkpixbuf2
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	fanglingsu
-GH_PROJECT=	vimb
-PLIST_FILES=	bin/vimb man/man1/vimb.1.gz
-
-MAKE_ENV?=	GTK="2"
-
-CONFLICTS?=	vimb-gtk3-*
-
-OPTIONS_DEFINE=	HTML5 NOSCROLLBARS
-OPTIONS_DEFAULT=	HTML5
-
-HTML5_DESC=	HTML5 support
-NOSCROLLBARS_DESC=	Disable scrollbars
-
-HTML5_RUN_DEPENDS=	gstreamer1-libav>=1.6.3:multimedia/gstreamer1-libav\
-	gstreamer1-plugins-good>=1.6.3:multimedia/gstreamer1-plugins-good
-
-NOSCROLLBARS_CFLAGS+=	-DFEATURE_NO_SCROLLBARS
-
-post-extract:
-	${MV} ${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h
-
-do-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/vimb ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/www/vimb-gtk2/distinfo b/www/vimb-gtk2/distinfo
deleted file mode 100644
index a5351401b4b2..000000000000
--- a/www/vimb-gtk2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1500383944
-SHA256 (fanglingsu-vimb-2.12_GH0.tar.gz) = 2443a27d625ff2a7aa7e7b694ec853e25dbdcb33b7c681c98c8fe81b1833b0b7
-SIZE (fanglingsu-vimb-2.12_GH0.tar.gz) = 132958
diff --git a/www/vimb-gtk2/files/patch-config.mk b/www/vimb-gtk2/files/patch-config.mk
deleted file mode 100644
index b6cf504ac303..000000000000
--- a/www/vimb-gtk2/files/patch-config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.mk.orig	2017-04-11 19:31:27 UTC
-+++ config.mk
-@@ -34,8 +34,6 @@ PROJECT_UCFIRST = $(shell echo '${PROJEC
- 
- CPPFLAGS  = -DVERSION=\"${VERSION}\"
- CPPFLAGS += -DPROJECT=\"${PROJECT}\" -DPROJECT_UCFIRST=\"${PROJECT_UCFIRST}\"
--CPPFLAGS += -D_XOPEN_SOURCE=500
--CPPFLAGS += -D_POSIX_SOURCE
- ifeq ($(USEGTK3), 1)
- CPPFLAGS += -DHAS_GTK3
- CPPFLAGS += -DGSEAL_ENABLE
diff --git a/www/vimb-gtk2/files/patch-src_config.h b/www/vimb-gtk2/files/patch-src_config.h
deleted file mode 100644
index 31f0c17668f9..000000000000
--- a/www/vimb-gtk2/files/patch-src_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/config.h.orig	2017-04-11 19:31:27 UTC
-+++ src/config.h
-@@ -27,7 +27,7 @@
- /* highlight search results */
- #define FEATURE_SEARCH_HIGHLIGHT
- /* disable scrollbars */
--#define FEATURE_NO_SCROLLBARS
-+/*#define FEATURE_NO_SCROLLBARS*/
- /* disable X window embedding */
- /* #define FEATURE_NO_XEMBED */
- /* show page title in url completions */
-@@ -69,7 +69,7 @@
- #define SHOWCMD_LEN                 10
- 
- /* parh to crt file for the certificate validation */
--#define SETTING_CA_BUNDLE           "/etc/ssl/certs/ca-certificates.crt"
-+#define SETTING_CA_BUNDLE           "/usr/local/share/certs/ca-root-nss.crt"
- #define SETTING_MAX_CONNS           25
- #define SETTING_MAX_CONNS_PER_HOST   5
- /* default font size for fonts in webview */
diff --git a/www/vimb-gtk2/pkg-descr b/www/vimb-gtk2/pkg-descr
deleted file mode 100644
index 76f7882956c0..000000000000
--- a/www/vimb-gtk2/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Vimb is a web browser that behaves like Vimprobable, but with some
-paradigms from dwb and hopefully a cleaner code base. The goal of Vimb is
-to build a completely keyboard-driven, efficient and pleasurable browsing
-experience with low memory and cpu usage.
-
-WWW: http://fanglingsu.github.io/vimb/
diff --git a/www/vimb-gtk3/Makefile b/www/vimb-gtk3/Makefile
deleted file mode 100644
index a1856dcb8125..000000000000
--- a/www/vimb-gtk3/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	vimb-gtk3
-
-LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
-
-DEPRECATED=	Uses webkit-gtk3 which has security issues
-EXPIRATION_DATE=2019-03-24
-
-MAKE_ENV=	GTK="3"
-USE_GNOME=	gtk30
-
-CONFLICTS=	vimb-gtk2-*
-
-MASTERDIR=	${.CURDIR}/../vimb-gtk2
-
-DESCR=		${MASTERDIR}/pkg-descr
-DISTINFO_FILE=	${MASTERDIR}/distinfo
-PKGMESSAGE=	${MASTERDIR}/pkg-message
-FILESDIR=	${MASTERDIR}/files
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/vimb/Makefile b/www/vimb/Makefile
new file mode 100644
index 000000000000..0fff925abf7b
--- /dev/null
+++ b/www/vimb/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME=	vimb
+DISTVERSION=	3.3.0
+CATEGORIES=	www
+
+MAINTAINER=	tobik@FreeBSD.org
+COMMENT=	Vim like browser
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+
+USES=		compiler:c11 desktop-file-utils gmake gnome pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	fanglingsu
+GH_PROJECT=	vimb
+USE_GNOME=	cairo gdkpixbuf2 gtk30
+
+LDFLAGS+=	-Wl,--as-needed
+MAKE_ARGS=	MANPREFIX=${STAGEDIR}${PREFIX}/man \
+		V=1
+PLIST_FILES=	bin/vimb \
+		lib/vimb/webext_main.so \
+		man/man1/vimb.1.gz \
+		share/applications/vimb.desktop
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vimb \
+		${STAGEDIR}${PREFIX}/lib/vimb/webext_main.so
+
+.include <bsd.port.mk>
diff --git a/www/vimb/distinfo b/www/vimb/distinfo
new file mode 100644
index 000000000000..8c4d591be192
--- /dev/null
+++ b/www/vimb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1553154212
+SHA256 (fanglingsu-vimb-3.3.0_GH0.tar.gz) = 5c6fe39b1b2ca18a342bb6683f7fd5b139ead53903f57dd9eecd5a1074576d6c
+SIZE (fanglingsu-vimb-3.3.0_GH0.tar.gz) = 136151
diff --git a/www/vimb/pkg-descr b/www/vimb/pkg-descr
new file mode 100644
index 000000000000..c846e6ab2618
--- /dev/null
+++ b/www/vimb/pkg-descr
@@ -0,0 +1,6 @@
+Vimb is a web browser that behaves like Vimprobable, but with some
+paradigms from dwb and hopefully a cleaner code base.  The goal of
+Vimb is to build a completely keyboard-driven, efficient and
+pleasurable browsing experience with low memory and cpu usage.
+
+WWW: http://fanglingsu.github.io/vimb/