Index: www/vimb-gtk2/Makefile =================================================================== --- www/vimb-gtk2/Makefile (revision 404194) +++ www/vimb-gtk2/Makefile (working copy) @@ -1,8 +1,39 @@ # $FreeBSD$ -PORTNAME= vimb-gtk2 +PORTNAME?= vimb-gtk2 +PORTVERSION= 2.11 +CATEGORIES= www -VIMB_GTK2= yes +MAINTAINER= mike.d.ft402@gmail.com +COMMENT= Vim like browser -.include "${.CURDIR}/../vimb-gtk2/Makefile.common" +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 + +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 Index: www/vimb-gtk2/Makefile.common =================================================================== --- www/vimb-gtk2/Makefile.common (revision 404194) +++ www/vimb-gtk2/Makefile.common (nonexistent) @@ -1,52 +0,0 @@ -# $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: www/vimb-gtk2/Makefile.common ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: www/vimb-gtk2/distinfo =================================================================== --- www/vimb-gtk2/distinfo (revision 404194) +++ www/vimb-gtk2/distinfo (working copy) @@ -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 Index: www/vimb-gtk2/files/patch-config.mk =================================================================== --- www/vimb-gtk2/files/patch-config.mk (nonexistent) +++ www/vimb-gtk2/files/patch-config.mk (working copy) @@ -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 Property changes on: www/vimb-gtk2/files/patch-config.mk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/vimb-gtk2/files/patch-src_config.h =================================================================== --- www/vimb-gtk2/files/patch-src_config.h (revision 404194) +++ www/vimb-gtk2/files/patch-src_config.h (working copy) @@ -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 */