Index: head/www/vimb-gtk2/Makefile =================================================================== --- head/www/vimb-gtk2/Makefile (revision 400198) +++ head/www/vimb-gtk2/Makefile (revision 400199) @@ -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 +.include "${.CURDIR}/../vimb-gtk2/Makefile.common" +.include Index: head/www/vimb-gtk2/Makefile.common =================================================================== --- head/www/vimb-gtk2/Makefile.common (nonexistent) +++ head/www/vimb-gtk2/Makefile.common (revision 400199) @@ -0,0 +1,52 @@ +# $FreeBSD$ + +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 + +.include + +post-extract: + ${MV} ${WRKSRC}/src/config.def.h ${WRKSRC}/src/config.h +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 + # cc on FreeBSD-9 does not know -Wno-typedef-redefinition + ${REINPLACE_CMD} -e 's|-Wno-typedef-redefinition|-Wall|' \ + ${WRKSRC}/config.mk +.endif + +do-install: + ${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/vimb ${STAGEDIR}${PREFIX}/bin Property changes on: head/www/vimb-gtk2/Makefile.common ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/vimb-gtk2/distinfo =================================================================== --- head/www/vimb-gtk2/distinfo (revision 400198) +++ head/www/vimb-gtk2/distinfo (revision 400199) @@ -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 Index: head/www/vimb-gtk2/files/patch-src_config.h =================================================================== --- head/www/vimb-gtk2/files/patch-src_config.h (revision 400198) +++ head/www/vimb-gtk2/files/patch-src_config.h (revision 400199) @@ -1,20 +1,20 @@ ---- 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 */ #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 */ Index: head/www/vimb-gtk3/Makefile =================================================================== --- head/www/vimb-gtk3/Makefile (revision 400198) +++ head/www/vimb-gtk3/Makefile (revision 400199) @@ -1,33 +1,8 @@ # $FreeBSD$ -PORTNAME= vimb -PORTVERSION= 2.9 -CATEGORIES= www -PKGNAMESUFFIX= -gtk3 +PORTNAME= vimb-gtk3 -MAINTAINER= mike.d.ft402@gmail.com -COMMENT= Vim like browser +VIMB_GTK3= yes -LICENSE= GPLv3 - -LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 - -CONFLICTS_INSTALL= vimb-gtk2-* - -USE_GITHUB= yes -GH_ACCOUNT= fanglingsu -GH_TAGNAME= 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 - -do-install: - ${INSTALL_MAN} ${WRKSRC}/doc/vimb.1 ${STAGEDIR}${MANPREFIX}/man/man1/ - ${INSTALL_PROGRAM} ${WRKSRC}/vimb ${STAGEDIR}${PREFIX}/bin - -.include +.include "${.CURDIR}/../vimb-gtk2/Makefile.common" +.include Index: head/www/vimb-gtk3/distinfo =================================================================== --- head/www/vimb-gtk3/distinfo (revision 400198) +++ head/www/vimb-gtk3/distinfo (revision 400199) @@ -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 Index: head/www/vimb-gtk3/files/patch-src_config.h =================================================================== --- head/www/vimb-gtk3/files/patch-src_config.h (revision 400198) +++ head/www/vimb-gtk3/files/patch-src_config.h (revision 400199) @@ -1,20 +1,20 @@ ---- 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 */ #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 */