--- www/vimb-gtk2/Makefile	(revision 399529)
+++ www/vimb-gtk2/Makefile	(working copy)
@@ -1,33 +1,8 @@ 
 # $FreeBSD$
 
-PORTNAME=	vimb
-PORTVERSION=	2.9
-CATEGORIES=	www
-PKGNAMESUFFIX=	-gtk2
+PORTNAME=	vimb-gtk2
 
-MAINTAINER=	mike.d.ft402@gmail.com
-COMMENT=	Vim like browser
+VIMB_GTK2=	yes
 
-LICENSE=	GPLv3
-
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-
-CONFLICTS_INSTALL=	vimb-gtk3-*
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	fanglingsu
-GH_TAGNAME=	cd61814
-PLIST_FILES=	bin/vimb man/man1/vimb.1.gz
-
-MAKE_ENV=	GTK="2"
-USES=		gmake pkgconfig
-USE_GNOME=	gtk20
-
-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}/vimb ${STAGEDIR}${PREFIX}/bin
-
+.include "${.CURDIR}/../vimb-gtk2/common.mk"
 .include <bsd.port.mk>
--- www/vimb-gtk2/common.mk	(revision 0)
+++ www/vimb-gtk2/common.mk	(working copy)
@@ -0,0 +1,45 @@ 
+# $FreeBSD: head/www/vimb/Makefile 367888 2014-09-10 20:50:31Z gerald $
+
+PORTVERSION=	2.10
+CATEGORIES=	www
+
+MAINTAINER=	mike.d.ft402@gmail.com
+COMMENT=	Vim like browser
+
+LICENSE=	GPLv3
+
+.ifdef(VIMB_GTK2)
+LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+.endif
+.ifdef(VIMB_GTK3)
+LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+.endif
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	fanglingsu
+GH_PROJECT=	vimb
+PLIST_FILES=	bin/vimb man/man1/vimb.1.gz
+
+.ifdef(VIMB_GTK2)
+MAKE_ENV=	GTK="2"
+USE_GNOME=	gtk20
+.endif
+.ifdef(VIMB_GTK3)
+MAKE_ENV=	GTK="3"
+USE_GNOME=	gtk30
+.endif
+USES=		gmake pkgconfig
+
+.ifdef(VIMB_GTK2)
+CONFLICTS=	vimb-gtk3-*
+.endif
+.ifdef(VIMB_GTK3)
+CONFLICTS=	vimb-gtk2-*
+.endif
+
+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
--- www/vimb-gtk2/distinfo	(revision 399529)
+++ www/vimb-gtk2/distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (fanglingsu-vimb-2.9-cd61814_GH0.tar.gz) = d3e71a87726e7a711f3c86908f9630ac76e6539a5decdf2742510517aea90f1c
-SIZE (fanglingsu-vimb-2.9-cd61814_GH0.tar.gz) = 126290
+SHA256 (fanglingsu-vimb-2.10_GH0.tar.gz) = a46ee9530ec8da62feb3972a80e270c216bc6fb363bb729ceaae1c892513df58
+SIZE (fanglingsu-vimb-2.10_GH0.tar.gz) = 127502
--- www/vimb-gtk2/files/patch-src_config.h	(revision 399529)
+++ www/vimb-gtk2/files/patch-src_config.h	(working copy)
@@ -1,4 +1,4 @@ 
---- src/config.h.orig	2015-01-17 03:39:50.000000000 +0500
+--- src/config.h.orig	2015-06-13 15:29:55 UTC
 +++ src/config.h
 @@ -27,7 +27,7 @@
  /* highlight search results */