Attachment #153036 for bug #197687

Lines 7421-7423 Link Here

(-)MOVED (+1 lines)
7421	japanese/xlockmore\|x11/xlockmore\|2015-02-02\|Merged into x11/xlockmore	7421	japanese/xlockmore\|x11/xlockmore\|2015-02-02\|Merged into x11/xlockmore
7422	deskutils/currtime\|sysutils/currtime\|2015-02-03\|Move to sysutils category	7422	deskutils/currtime\|sysutils/currtime\|2015-02-03\|Move to sysutils category
7423	sysutils/pcbsd-utils-qt4\|sysutils/pcbsd-utils-qt5\|2015-02-03\|Renamed to pcbsd-utils-qt5	7423	sysutils/pcbsd-utils-qt4\|sysutils/pcbsd-utils-qt5\|2015-02-03\|Renamed to pcbsd-utils-qt5
		7424	www/vimb\|\|2015-01-16\|Split into www/vimb-gtk2 and www/vimb-gtk3




# $FreeBSD$

PORTNAME=	vimb
PORTVERSION=	2.8
CATEGORIES=	www

MAINTAINER=	mike.d.ft402@gmail.com
COMMENT=	The vim like browser

LICENSE=	GPLv3

USE_GITHUB=	yes
GH_ACCOUNT=	fanglingsu
GH_COMMIT=	c642901
PLIST_FILES=	bin/vimb man/man1/vimb.1.gz

USES=		gmake pkgconfig

OPTIONS_SINGLE=		GTK
OPTIONS_SINGLE_GTK=	GTK2 GTK3
OPTIONS_DEFAULT=	GTK3

GTK2_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
GTK2_USE=		GNOME=gtk20
GTK3_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
GTK3_USE=		GNOME=gtk30
GTK3_MAKE_ENV=		GTK="3"

do-install:
	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)www/vimb/distinfo (-2 lines)
1	SHA256 (vimb-2.8.tar.gz) = b34ecd475a075adf6cc4f8133f2358fc57ff286642e78102383130f8e51cc1ac
2	SIZE (vimb-2.8.tar.gz) = 116390

Lines 1-6 Link Here

(-)www/vimb/pkg-descr (-6 lines)
1	Vimb is a web browser that behaves like Vimprobable, but with some
2	paradigms from dwb and hopefully a cleaner code base. The goal of Vimb is
3	to build a completely keyboard-driven, efficient and pleasurable browsing
4	experience with low memory and cpu usage.
5
6	WWW: http://fanglingsu.github.io/vimb/




# $FreeBSD$

PORTNAME=	vimb
PORTVERSION=	2.9
CATEGORIES=	www
PKGNAMESUFFIX=	-gtk2

MAINTAINER=	mike.d.ft402@gmail.com
COMMENT=	Vim like browser

LICENSE=	GPLv3

LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2

USE_GITHUB=	yes
GH_ACCOUNT=	fanglingsu
GH_COMMIT=	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
OPTIONS_DEFAULT=	GTK3

GTK2_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
GTK2_USE=		GNOME=gtk20
GTK3_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
GTK3_USE=		GNOME=gtk30
GTK3_MAKE_ENV=		GTK="3"

do-install:
	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin

Lines 1-2 Link Here

(-)www/vimb-gtk2/distinfo (-2 / +2 lines)
1	SHA256 (vimb-2.8.tar.gz) = b34ecd475a075adf6cc4f8133f2358fc57ff286642e78102383130f8e51cc1ac	1	SHA256 (vimb-2.9.tar.gz) = 97f7c6567d1f12b4b6bf6dfd07e93d82fe0ff99e3ee013a7a69a5e7e350bfc45
2	SIZE (vimb-2.8.tar.gz) = 116390	2	SIZE (vimb-2.9.tar.gz) = 126341




--- src/config.h.orig	2015-01-17 03:39:50.000000000 +0500
+++ src/config.h
@@ -27,7 +27,7 @@
 /* highlight search results */
 #define FEATURE_SEARCH_HIGHLIGHT
 /* disable scrollbars */
-#define FEATURE_NO_SCROLLBARS
+/*#define FEATURE_NO_SCROLLBARS*/
 /* show page title in url completions */
 #define FEATURE_TITLE_IN_COMPLETION
 /* enable the read it later queue */
@@ -63,7 +63,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 */




# $FreeBSD$

PORTNAME=	vimb
PORTVERSION=	2.9
CATEGORIES=	www
PKGNAMESUFFIX=	-gtk3

MAINTAINER=	mike.d.ft402@gmail.com
COMMENT=	Vim like browser

LICENSE=	GPLv3

LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3

USE_GITHUB=	yes
GH_ACCOUNT=	fanglingsu
GH_COMMIT=	cd61814
PLIST_FILES=	bin/vimb man/man1/vimb.1.gz

MAKE_ENV=	GTK="3"
USES=		gmake pkgconfig
USE_GNOME=	gtk30

post-extract:
	${MV}	${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h
OPTIONS_DEFAULT=	GTK3

GTK2_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
GTK2_USE=		GNOME=gtk20
GTK3_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
GTK3_USE=		GNOME=gtk30
GTK3_MAKE_ENV=		GTK="3"

do-install:
	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin

Lines 1-2 Link Here

(-)www/vimb-gtk3/distinfo (-2 / +2 lines)
1	SHA256 (vimb-2.8.tar.gz) = b34ecd475a075adf6cc4f8133f2358fc57ff286642e78102383130f8e51cc1ac	1	SHA256 (vimb-2.9.tar.gz) = 97f7c6567d1f12b4b6bf6dfd07e93d82fe0ff99e3ee013a7a69a5e7e350bfc45
2	SIZE (vimb-2.8.tar.gz) = 116390	2	SIZE (vimb-2.9.tar.gz) = 126341




--- src/config.h.orig	2015-01-17 03:39:50.000000000 +0500
+++ src/config.h
@@ -27,7 +27,7 @@
 /* highlight search results */
 #define FEATURE_SEARCH_HIGHLIGHT
 /* disable scrollbars */
-#define FEATURE_NO_SCROLLBARS
+/*#define FEATURE_NO_SCROLLBARS*/
 /* show page title in url completions */
 #define FEATURE_TITLE_IN_COMPLETION
 /* enable the read it later queue */
@@ -63,7 +63,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 */

Return to bug 197687

Lines 1-33 Link Here

(-)www/vimb/Makefile (-33 lines)
1	# $FreeBSD$
2
3	PORTNAME= vimb
4	PORTVERSION= 2.8
5	CATEGORIES= www
6
7	MAINTAINER= mike.d.ft402@gmail.com
8	COMMENT= The vim like browser
9
10	LICENSE= GPLv3
11
12	USE_GITHUB= yes
13	GH_ACCOUNT= fanglingsu
14	GH_COMMIT= c642901
15	PLIST_FILES= bin/vimb man/man1/vimb.1.gz
16
17	USES= gmake pkgconfig
18
19	OPTIONS_SINGLE= GTK
20	OPTIONS_SINGLE_GTK= GTK2 GTK3
21	OPTIONS_DEFAULT= GTK3
22
23	GTK2_LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
24	GTK2_USE= GNOME=gtk20
25	GTK3_LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
26	GTK3_USE= GNOME=gtk30
27	GTK3_MAKE_ENV= GTK="3"
28
29	do-install:
30	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
31	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin
32
33	.include <bsd.port.mk>

Lines 1-31 Link Here

(-)www/vimb-gtk2/Makefile (-12 / +10 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= vimb	3	PORTNAME= vimb
4	PORTVERSION= 2.8	4	PORTVERSION= 2.9
5	CATEGORIES= www	5	CATEGORIES= www
		6	PKGNAMESUFFIX= -gtk2
6		7
7	MAINTAINER= mike.d.ft402@gmail.com	8	MAINTAINER= mike.d.ft402@gmail.com
8	COMMENT= The vim like browser	9	COMMENT= Vim like browser
9		10
10	LICENSE= GPLv3	11	LICENSE= GPLv3
11		12
		13	LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
		14
12	USE_GITHUB= yes	15	USE_GITHUB= yes
13	GH_ACCOUNT= fanglingsu	16	GH_ACCOUNT= fanglingsu
14	GH_COMMIT= c642901	17	GH_COMMIT= cd61814
15	PLIST_FILES= bin/vimb man/man1/vimb.1.gz	18	PLIST_FILES= bin/vimb man/man1/vimb.1.gz
16		19
		20	MAKE_ENV= GTK="2"
17	USES= gmake pkgconfig	21	USES= gmake pkgconfig
		22	USE_GNOME= gtk20
18		23
19	OPTIONS_SINGLE= GTK	24	post-extract:
20	OPTIONS_SINGLE_GTK= GTK2 GTK3	25	${MV} ${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h
21	OPTIONS_DEFAULT= GTK3
22		26
23	GTK2_LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
24	GTK2_USE= GNOME=gtk20
25	GTK3_LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
26	GTK3_USE= GNOME=gtk30
27	GTK3_MAKE_ENV= GTK="3"
28
29	do-install:	27	do-install:
30	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/	28	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
31	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin	29	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin

Line 0 Link Here

(-)www/vimb-gtk2/files/patch-src_config.h (+20 lines)
	1	--- src/config.h.orig 2015-01-17 03:39:50.000000000 +0500
	2	+++ src/config.h
	3	@@ -27,7 +27,7 @@
	4	/* highlight search results */
	5	#define FEATURE_SEARCH_HIGHLIGHT
	6	/* disable scrollbars */
	7	-#define FEATURE_NO_SCROLLBARS
	8	+/#define FEATURE_NO_SCROLLBARS/
	9	/* show page title in url completions */
	10	#define FEATURE_TITLE_IN_COMPLETION
	11	/* enable the read it later queue */
	12	@@ -63,7 +63,7 @@
	13	#define SHOWCMD_LEN 10
	14
	15	/* parh to crt file for the certificate validation */
	16	-#define SETTING_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
	17	+#define SETTING_CA_BUNDLE "/usr/local/share/certs/ca-root-nss.crt"
	18	#define SETTING_MAX_CONNS 25
	19	#define SETTING_MAX_CONNS_PER_HOST 5
	20	/* default font size for fonts in webview */

Lines 1-31 Link Here

(-)www/vimb-gtk3/Makefile (-12 / +10 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= vimb	3	PORTNAME= vimb
4	PORTVERSION= 2.8	4	PORTVERSION= 2.9
5	CATEGORIES= www	5	CATEGORIES= www
		6	PKGNAMESUFFIX= -gtk3
6		7
7	MAINTAINER= mike.d.ft402@gmail.com	8	MAINTAINER= mike.d.ft402@gmail.com
8	COMMENT= The vim like browser	9	COMMENT= Vim like browser
9		10
10	LICENSE= GPLv3	11	LICENSE= GPLv3
11		12
		13	LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
		14
12	USE_GITHUB= yes	15	USE_GITHUB= yes
13	GH_ACCOUNT= fanglingsu	16	GH_ACCOUNT= fanglingsu
14	GH_COMMIT= c642901	17	GH_COMMIT= cd61814
15	PLIST_FILES= bin/vimb man/man1/vimb.1.gz	18	PLIST_FILES= bin/vimb man/man1/vimb.1.gz
16		19
		20	MAKE_ENV= GTK="3"
17	USES= gmake pkgconfig	21	USES= gmake pkgconfig
		22	USE_GNOME= gtk30
18		23
19	OPTIONS_SINGLE= GTK	24	post-extract:
20	OPTIONS_SINGLE_GTK= GTK2 GTK3	25	${MV} ${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h
21	OPTIONS_DEFAULT= GTK3
22		26
23	GTK2_LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
24	GTK2_USE= GNOME=gtk20
25	GTK3_LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
26	GTK3_USE= GNOME=gtk30
27	GTK3_MAKE_ENV= GTK="3"
28
29	do-install:	27	do-install:
30	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/	28	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/
31	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin	29	${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin

Line 0 Link Here

(-)www/vimb-gtk3/files/patch-src_config.h (+20 lines)
	1	--- src/config.h.orig 2015-01-17 03:39:50.000000000 +0500
	2	+++ src/config.h
	3	@@ -27,7 +27,7 @@
	4	/* highlight search results */
	5	#define FEATURE_SEARCH_HIGHLIGHT
	6	/* disable scrollbars */
	7	-#define FEATURE_NO_SCROLLBARS
	8	+/#define FEATURE_NO_SCROLLBARS/
	9	/* show page title in url completions */
	10	#define FEATURE_TITLE_IN_COMPLETION
	11	/* enable the read it later queue */
	12	@@ -63,7 +63,7 @@
	13	#define SHOWCMD_LEN 10
	14
	15	/* parh to crt file for the certificate validation */
	16	-#define SETTING_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
	17	+#define SETTING_CA_BUNDLE "/usr/local/share/certs/ca-root-nss.crt"
	18	#define SETTING_MAX_CONNS 25
	19	#define SETTING_MAX_CONNS_PER_HOST 5
	20	/* default font size for fonts in webview */