Hi ports@, This patch updates vimb to 2.11.
Moved the GH_ variables to the top of port Makefile in accordance to Makefile.template order. Notable changes : Two patches are no longer necessary and were dropped. This version now uses flock instead of fcntl for file locking, and it was necessary to add 'CPPFLAGS += -D_BSD_SOURCE' to our 'config.mk' patch. Index: Makefile =================================================================== RCS file: /cvs/ports/www/vimb/Makefile,v retrieving revision 1.10 diff -u -p -u -p -r1.10 Makefile --- Makefile 29 Dec 2015 19:49:41 -0000 1.10 +++ Makefile 11 Apr 2016 21:03:20 -0000 @@ -1,8 +1,12 @@ # $OpenBSD: Makefile,v 1.10 2015/12/29 19:49:41 jasper Exp $ COMMENT = modal webkit-based browser inspired by vim + +GH_ACCOUNT = fanglingsu +GH_PROJECT = vimb +GH_TAGNAME = 2.11 + CATEGORIES = www x11 -REVISION = 0 HOMEPAGE = http://fanglingsu.github.io/vimb/ @@ -12,10 +16,6 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += atk-1.0 c cairo fontconfig freetype gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pthread soup-2.4 z - -GH_ACCOUNT = fanglingsu -GH_PROJECT = vimb -GH_TAGNAME = 2.10 FLAVORS = gtk3 FLAVOR ?= Index: distinfo =================================================================== RCS file: /cvs/ports/www/vimb/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo 25 Jun 2015 22:57:36 -0000 1.5 +++ distinfo 11 Apr 2016 21:03:20 -0000 @@ -1,2 +1,2 @@ -SHA256 (vimb-2.10.tar.gz) = pG7pUw7I2mL+s5cqgOJwwha8b7Nju3Kc6q4ciSUT31g= -SIZE (vimb-2.10.tar.gz) = 127502 +SHA256 (vimb-2.11.tar.gz) = LsWD5uQl+NYgtU22vMVkg3cMfF/T+TsEKd3W96dVOTU= +SIZE (vimb-2.11.tar.gz) = 130722 Index: patches/patch-config_mk =================================================================== RCS file: /cvs/ports/www/vimb/patches/patch-config_mk,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-config_mk --- patches/patch-config_mk 25 Jun 2015 22:57:36 -0000 1.1 +++ patches/patch-config_mk 11 Apr 2016 21:03:20 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-config_mk,v 1.1 2015/06/ Base gcc does not have -Wno-typedef-redefinition. ---- config.mk.orig Sat Jun 13 11:29:55 2015 -+++ config.mk Wed Jun 17 15:41:05 2015 -@@ -4,8 +4,8 @@ VERSION = 2.10 +--- config.mk.orig Thu Dec 17 20:21:00 2015 ++++ config.mk Mon Apr 11 00:12:09 2016 +@@ -4,8 +4,8 @@ VERSION = 2.11 PROJECT = vimb PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin @@ -15,12 +15,21 @@ Base gcc does not have -Wno-typedef-rede #----------------compile options--------------------- -@@ -48,8 +48,6 @@ LIBFLAGS = $(shell pkg-config --libs $(LIBS)) - CFLAGS += $(shell pkg-config --cflags $(LIBS)) - CFLAGS += -Wall -pipe -std=c99 - CFLAGS += -Wno-overlength-strings -Werror=format-security --# This is to avoid redifinition warnings caused by glib. --CFLAGS += -Wno-typedef-redefinition - CFLAGS += ${CPPFLAGS} - LDFLAGS += ${LIBFLAGS} +@@ -35,6 +35,7 @@ CPPFLAGS = -DVERSION=\"${VERSION}\" + CPPFLAGS += -DPROJECT=\"${PROJECT}\" -DPROJECT_UCFIRST=\"${PROJECT_UCFIRST}\" + CPPFLAGS += -D_XOPEN_SOURCE=500 + CPPFLAGS += -D_POSIX_SOURCE ++CPPFLAGS += -D_BSD_SOURCE + ifeq ($(USEGTK3), 1) + CPPFLAGS += -DHAS_GTK3 + CPPFLAGS += -DGSEAL_ENABLE +@@ -47,8 +48,7 @@ endif + LIBFLAGS = $(shell pkg-config --libs $(LIBS)) + # some compiler flags in case CFLAGS is not set by user +-# -Wno-typedef-redefinition to avoid redifinition warnings caused by glib +-CFLAGS ?= -Wall -pipe -Wno-overlength-strings -Werror=format-security -Wno-typedef-redefinition ++CFLAGS ?= -Wall -pipe -Wno-overlength-strings -Werror=format-security + # normal compiler flags + CFLAGS += $(shell pkg-config --cflags $(LIBS)) + CFLAGS += -std=c99 Index: patches/patch-src_Makefile =================================================================== RCS file: patches/patch-src_Makefile diff -N patches/patch-src_Makefile --- patches/patch-src_Makefile 25 Jun 2015 22:57:36 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -$OpenBSD: patch-src_Makefile,v 1.1 2015/06/25 22:57:36 bcallah Exp $ - -Make verbose. - ---- src/Makefile.orig Wed Jun 17 15:20:09 2015 -+++ src/Makefile Wed Jun 17 15:20:38 2015 -@@ -23,24 +23,20 @@ $(OBJ): config.h $(BASEDIR)/config.mk - $(LOBJ): config.h $(BASEDIR)/config.mk - - $(TARGET): $(OBJ) -- @echo "$(CC) $@" -- @$(CC) $(OBJ) -o $@ $(LDFLAGS) -+ $(CC) $(OBJ) -o $@ $(LDFLAGS) - - $(LIBTARGET): $(LOBJ) -- @echo "$(CC) $@" -- @$(CC) -shared ${LOBJ} -o $@ $(LDFLAGS) -+ $(CC) -shared ${LOBJ} -o $@ $(LDFLAGS) - - config.h: - @echo create $@ from config.def.h - @cp config.def.h $@ - - %.o: %.c %.h -- @echo "${CC} $@" -- @$(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) -c -o $@ $< - - %.lo: %.c %.h -- @echo "${CC} $@" -- @$(CC) -DTESTLIB $(CFLAGS) -fPIC -c -o $@ $< -+ $(CC) -DTESTLIB $(CFLAGS) -fPIC -c -o $@ $< - - -include $(OBJ:.o=.d) - Index: patches/patch-src_config_def_h =================================================================== RCS file: /cvs/ports/www/vimb/patches/patch-src_config_def_h,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_config_def_h --- patches/patch-src_config_def_h 30 Jan 2015 22:01:24 -0000 1.1 +++ patches/patch-src_config_def_h 11 Apr 2016 21:03:20 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_config_def_h,v 1.1 2015/01/30 22:01:24 bcallah Exp $ ---- src/config.def.h.orig Fri Jan 30 13:45:06 2015 -+++ src/config.def.h Fri Jan 30 13:45:26 2015 -@@ -63,7 +63,7 @@ +--- src/config.def.h.orig Thu Dec 17 20:21:00 2015 ++++ src/config.def.h Sun Apr 10 19:03:58 2016 +@@ -65,7 +65,7 @@ #define SHOWCMD_LEN 10 /* parh to crt file for the certificate validation */ Index: patches/patch-tests_Makefile =================================================================== RCS file: patches/patch-tests_Makefile diff -N patches/patch-tests_Makefile --- patches/patch-tests_Makefile 25 Jun 2015 22:57:36 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-tests_Makefile,v 1.2 2015/06/25 22:57:36 bcallah Exp $ - -No -Wpedantic with base gcc. - ---- tests/Makefile.orig Wed Jun 17 15:18:38 2015 -+++ tests/Makefile Wed Jun 17 15:18:43 2015 -@@ -3,7 +3,7 @@ SRCDIR=$(BASEDIR)/src - include $(BASEDIR)/config.mk - - CPPFLAGS += -I $(BASEDIR)/ --CFLAGS += -fPIC -Wpedantic -+CFLAGS += -fPIC - - TEST_PROGS = test-handlers \ - test-map \
