svn commit: r382599 - in head: . www www/vimb www/vimb-gtk2 www/vimb-gtk2/files www/vimb-gtk3 www/vimb-gtk3/files

Sun Mar 29 14:35:14 UTC 2015

Author: riggs
Date: Sun Mar 29 14:35:10 2015
New Revision: 382599
URL: https://svnweb.freebsd.org/changeset/ports/382599
QAT: https://qat.redports.org/buildarchive/r382599/

Log:
  - Split www/vimb into www/vimb-gtk{2,3}
  - Update to upstream version 2.9
  - Pet portlint, sanity-check
  
  PR:		197687
  Submitted by:	mike.d.ft402 at gmail.com (maintainer)

Added:
  head/www/vimb-gtk2/
     - copied from r382597, head/www/vimb/
  head/www/vimb-gtk2/files/
  head/www/vimb-gtk2/files/patch-src_config.h   (contents, props changed)
  head/www/vimb-gtk3/
     - copied from r382597, head/www/vimb/
  head/www/vimb-gtk3/files/
  head/www/vimb-gtk3/files/patch-src_config.h   (contents, props changed)
Deleted:
  head/www/vimb/
Modified:
  head/MOVED
  head/www/Makefile
  head/www/vimb-gtk2/Makefile
  head/www/vimb-gtk2/distinfo
  head/www/vimb-gtk3/Makefile
  head/www/vimb-gtk3/distinfo

Modified: head/MOVED
==============================================================================

--- head/MOVED	Sun Mar 29 14:29:10 2015	(r382598)
+++ head/MOVED	Sun Mar 29 14:35:10 2015	(r382599)
@@ -7449,3 +7449,4 @@ security/cyassl|security/wolfssl|2015-03
 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)

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Sun Mar 29 14:29:10 2015	(r382598)
+++ head/www/Makefile	Sun Mar 29 14:35:10 2015	(r382599)
@@ -2147,7 +2147,8 @@
     SUBDIR += vdradmin-am
     SUBDIR += vee
     SUBDIR += vertx
-    SUBDIR += vimb
+    SUBDIR += vimb-gtk2
+    SUBDIR += vimb-gtk3
     SUBDIR += visitors
     SUBDIR += volta
     SUBDIR += w3m

Modified: head/www/vimb-gtk2/Makefile
==============================================================================
--- head/www/vimb/Makefile	Sun Mar 29 12:43:58 2015	(r382597)
+++ head/www/vimb-gtk2/Makefile	Sun Mar 29 14:35:10 2015	(r382599)
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	vimb
-PORTVERSION=	2.8
+PORTVERSION=	2.9
 CATEGORIES=	www
+PKGNAMESUFFIX=	-gtk2
 
 MAINTAINER=	mike.d.ft402 at gmail.com
-COMMENT=	The vim like browser
+COMMENT=	Vim like browser
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+
+CONFLICTS_INSTALL=	vimb-gtk3-*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	fanglingsu
-GH_COMMIT=	c642901
+GH_TAGNAME=	cd61814
 PLIST_FILES=	bin/vimb man/man1/vimb.1.gz
 
+MAKE_ENV=	GTK="2"
 USES=		gmake pkgconfig
+USE_GNOME=	gtk20
 
-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"
+post-extract:
+	${MV}	${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/

Modified: head/www/vimb-gtk2/distinfo
==============================================================================
--- head/www/vimb/distinfo	Sun Mar 29 12:43:58 2015	(r382597)
+++ head/www/vimb-gtk2/distinfo	Sun Mar 29 14:35:10 2015	(r382599)
@@ -1,2 +1,2 @@
-SHA256 (vimb-2.8.tar.gz) = b34ecd475a075adf6cc4f8133f2358fc57ff286642e78102383130f8e51cc1ac
-SIZE (vimb-2.8.tar.gz) = 116390
+SHA256 (fanglingsu-vimb-2.9-cd61814_GH0.tar.gz) = d3e71a87726e7a711f3c86908f9630ac76e6539a5decdf2742510517aea90f1c
+SIZE (fanglingsu-vimb-2.9-cd61814_GH0.tar.gz) = 126290

Added: head/www/vimb-gtk2/files/patch-src_config.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/vimb-gtk2/files/patch-src_config.h	Sun Mar 29 14:35:10 2015	(r382599)
@@ -0,0 +1,20 @@
+--- 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 */

Modified: head/www/vimb-gtk3/Makefile
==============================================================================
--- head/www/vimb/Makefile	Sun Mar 29 12:43:58 2015	(r382597)
+++ head/www/vimb-gtk3/Makefile	Sun Mar 29 14:35:10 2015	(r382599)
@@ -1,30 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	vimb
-PORTVERSION=	2.8
+PORTVERSION=	2.9
 CATEGORIES=	www
+PKGNAMESUFFIX=	-gtk3
 
 MAINTAINER=	mike.d.ft402 at gmail.com
-COMMENT=	The vim like browser
+COMMENT=	Vim like browser
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+
+CONFLICTS_INSTALL=	vimb-gtk2-*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	fanglingsu
-GH_COMMIT=	c642901
+GH_TAGNAME=	cd61814
 PLIST_FILES=	bin/vimb man/man1/vimb.1.gz
 
+MAKE_ENV=	GTK="3"
 USES=		gmake pkgconfig
+USE_GNOME=	gtk30
 
-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"
+post-extract:
+	${MV}	${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/

Modified: head/www/vimb-gtk3/distinfo
==============================================================================
--- head/www/vimb/distinfo	Sun Mar 29 12:43:58 2015	(r382597)
+++ head/www/vimb-gtk3/distinfo	Sun Mar 29 14:35:10 2015	(r382599)
@@ -1,2 +1,2 @@
-SHA256 (vimb-2.8.tar.gz) = b34ecd475a075adf6cc4f8133f2358fc57ff286642e78102383130f8e51cc1ac
-SIZE (vimb-2.8.tar.gz) = 116390
+SHA256 (fanglingsu-vimb-2.9-cd61814_GH0.tar.gz) = d3e71a87726e7a711f3c86908f9630ac76e6539a5decdf2742510517aea90f1c
+SIZE (fanglingsu-vimb-2.9-cd61814_GH0.tar.gz) = 126290

Added: head/www/vimb-gtk3/files/patch-src_config.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/vimb-gtk3/files/patch-src_config.h	Sun Mar 29 14:35:10 2015	(r382599)
@@ -0,0 +1,20 @@
+--- 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 */
