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

[Raphael Kubo da Costa]

Author: rakuco
Date: Fri Feb 19 21:11:29 2016
New Revision: 409209
URL: https://svnweb.freebsd.org/changeset/ports/409209

Log:
  Update www/vimb-gtk{2,3} to 2.11.
  
  And convert the ports to a master-slave setup.
  
  PR:		205842
  Submitted by:	Michael Danilov <mike.d.ft402 at gmail.com> (maintainer)

Added:
  head/www/vimb-gtk2/files/patch-config.mk   (contents, props changed)
Deleted:
  head/www/vimb-gtk2/Makefile.common
  head/www/vimb-gtk3/distinfo
  head/www/vimb-gtk3/files/
  head/www/vimb-gtk3/pkg-descr
Modified:
  head/www/vimb-gtk2/Makefile
  head/www/vimb-gtk2/distinfo
  head/www/vimb-gtk2/files/patch-src_config.h
  head/www/vimb-gtk3/Makefile

Modified: head/www/vimb-gtk2/Makefile
==============================================================================
--- head/www/vimb-gtk2/Makefile	Fri Feb 19 20:51:27 2016	(r409208)
+++ head/www/vimb-gtk2/Makefile	Fri Feb 19 21:11:29 2016	(r409209)
@@ -1,8 +1,39 @@
 # $FreeBSD$
 
-PORTNAME=	vimb-gtk2
+PORTNAME?=	vimb-gtk2
+PORTVERSION=	2.11
+CATEGORIES=	www
 
-VIMB_GTK2=	yes
+MAINTAINER=	mike.d.ft402 at 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_PROJECT=	vimb
+PLIST_FILES=	bin/vimb man/man1/vimb.1.gz
+
+MAKE_ENV?=	GTK="2"
+USE_GNOME?=	gtk20
+USES=		gmake pkgconfig
+
+CONFLICTS?=	vimb-gtk3-*
+
+.include <bsd.port.pre.mk>
+
+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
 
-.include "${.CURDIR}/../vimb-gtk2/Makefile.common"
 .include <bsd.port.post.mk>

Modified: head/www/vimb-gtk2/distinfo
==============================================================================
--- head/www/vimb-gtk2/distinfo	Fri Feb 19 20:51:27 2016	(r409208)
+++ head/www/vimb-gtk2/distinfo	Fri Feb 19 21:11:29 2016	(r409209)
@@ -1,2 +1,2 @@
-SHA256 (fanglingsu-vimb-2.10_GH0.tar.gz) = a46ee9530ec8da62feb3972a80e270c216bc6fb363bb729ceaae1c892513df58
-SIZE (fanglingsu-vimb-2.10_GH0.tar.gz) = 127502
+SHA256 (fanglingsu-vimb-2.11_GH0.tar.gz) = 2ec583e6e425f8d620b54db6bcc56483770c7c5fd3f93b0429ddd6f7a7553935
+SIZE (fanglingsu-vimb-2.11_GH0.tar.gz) = 130722

Added: head/www/vimb-gtk2/files/patch-config.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/vimb-gtk2/files/patch-config.mk	Fri Feb 19 21:11:29 2016	(r409209)
@@ -0,0 +1,11 @@
+--- config.mk.orig	2015-12-17 19:21:00 UTC
++++ config.mk
+@@ -33,8 +33,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

Modified: head/www/vimb-gtk2/files/patch-src_config.h
==============================================================================
--- head/www/vimb-gtk2/files/patch-src_config.h	Fri Feb 19 20:51:27 2016	(r409208)
+++ head/www/vimb-gtk2/files/patch-src_config.h	Fri Feb 19 21:11:29 2016	(r409209)
@@ -1,4 +1,4 @@
---- src/config.h.orig	2015-06-13 15:29:55 UTC
+--- src/config.h.orig	2015-12-17 19:21:00 UTC
 +++ src/config.h
 @@ -27,7 +27,7 @@
  /* highlight search results */
@@ -9,7 +9,7 @@
  /* show page title in url completions */
  #define FEATURE_TITLE_IN_COMPLETION
  /* enable the read it later queue */
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@
  #define SHOWCMD_LEN                 10
  
  /* parh to crt file for the certificate validation */

Modified: head/www/vimb-gtk3/Makefile
==============================================================================
--- head/www/vimb-gtk3/Makefile	Fri Feb 19 20:51:27 2016	(r409208)
+++ head/www/vimb-gtk3/Makefile	Fri Feb 19 21:11:29 2016	(r409209)
@@ -2,7 +2,18 @@
 
 PORTNAME=	vimb-gtk3
 
-VIMB_GTK3=	yes
+LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
 
-.include "${.CURDIR}/../vimb-gtk2/Makefile.common"
-.include <bsd.port.post.mk>
+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"