Hi ports --
Attached is an update to vimb. It's mostly routine, but I have a
question about the config.mk patch--our gcc now supports typedef
redefinition but doesn't have the -Wno-typedef-redefinition (or
-Wtypedef-redefition) flag. Would it be worthwhile to have even a dummy
-Wno-typedef-redefinition flag?
OK?
~Brian
? vimb210.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/vimb/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 5 Apr 2015 13:31:15 -0000 1.6
+++ Makefile 17 Jun 2015 21:23:47 -0000
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2015/04/05 13:31:15 sthen Exp $
-V = 2.9
+V = 2.10
COMMENT = modal webkit-based browser inspired by vim
DISTNAME = vimb-${V}
CATEGORIES = www x11
-REVISION = 0
HOMEPAGE = http://fanglingsu.github.io/vimb/
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
@@ -41,8 +40,5 @@ LIB_DEPENDS = www/webkit
.endif
USE_GMAKE = Yes
-
-FAKE_FLAGS = BINDIR=${PREFIX}/bin \
- MANDIR1=${PREFIX}/man/man1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/vimb/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 30 Jan 2015 22:01:24 -0000 1.4
+++ distinfo 17 Jun 2015 21:23:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (vimb-2.9.tar.gz) = F5Ak4HwTOwSdn7fEh77ZuahRK2M+HYV+A4smoB0uNUE=
-SIZE (vimb-2.9.tar.gz) = 126272
+SHA256 (vimb-2.10.tar.gz) = pG7pUw7I2mL+s5cqgOJwwha8b7Nju3Kc6q4ciSUT31g=
+SIZE (vimb-2.10.tar.gz) = 127502
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/vimb/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 19 Aug 2014 22:52:41 -0000 1.1.1.1
+++ patches/patch-Makefile 17 Jun 2015 21:23:47 -0000
@@ -1,45 +1,22 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2014/08/19 22:52:41 bcallah Exp $
-
-Make verbose.
-
---- Makefile.orig Sun Jul 20 10:14:53 2014
-+++ Makefile Sun Aug 10 18:51:52 2014
-@@ -53,32 +53,26 @@ $(DOBJ): src/config.h config.mk
- $(LOBJ): src/config.h config.mk
-
- $(TARGET): $(OBJ)
-- @echo "$(CC) $@"
-- @$(CC) $(OBJ) -o $@ $(LDFLAGS)
-+ $(CC) $(OBJ) -o $@ $(LDFLAGS)
-
- $(DTARGET): $(DOBJ)
-- @echo "$(CC) $@"
-- @$(CC) $(DOBJ) -o $@ $(DLDFLAGS)
-+ $(CC) $(DOBJ) -o $@ $(DLDFLAGS)
-
- $(LIBTARGET): $(LOBJ)
-- @echo "$(CC) $@"
-- @$(CC) -shared ${LOBJ} -o $@ $(LDFLAGS)
-+ $(CC) -shared ${LOBJ} -o $@ $(LDFLAGS)
-
- src/config.h:
- @echo create $@ from src/config.def.h
- @cp src/config.def.h $@
-
- %.o: %.c %.h
-- @echo "${CC} $@"
-- @$(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) -c -o $@ $<
-
- %.do: %.c %.h
-- @echo "${CC} $@"
-- @$(CC) $(DFLAGS) -c -o $@ $<
-+ $(CC) $(DFLAGS) -c -o $@ $<
-
- %.lo: %.c %.h
-- @echo "${CC} $@"
-- @$(CC) -DTESTLIB $(DFLAGS) -fPIC -c -o $@ $<
-+ $(CC) -DTESTLIB $(DFLAGS) -fPIC -c -o $@ $<
-
- -include $(DEPS)
+$OpenBSD$
+--- Makefile.orig Sat Jun 13 11:29:55 2015
++++ Makefile Wed Jun 17 15:32:04 2015
+@@ -19,13 +19,13 @@ clean:
+ @$(MAKE) $(MFLAGS) -C tests clean
+
+ install: $(TARGET) $(DOCDIR)/$(MAN1)
+- install -D -m 755 $(SRCDIR)/$(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
+- install -d $(DESTDIR)$(EXAMPLEDIR)
+- cp -r examples/* $(DESTDIR)$(EXAMPLEDIR)
+- install -d $(DESTDIR)$(MANDIR)/man1
++ install -m 755 $(SRCDIR)/$(TARGET) $(BINDIR)/$(TARGET)
++ install -d $(EXAMPLEDIR)
++ cp -r examples/* $(EXAMPLEDIR)
++ install -d $(MANDIR)/man1
+ @sed -e "s!VERSION!$(VERSION)!g" \
+ -e "s!PREFIX!$(PREFIX)!g" \
+- -e "s!DATE!`date +'%m %Y'`!g" $(DOCDIR)/$(MAN1) > $(DESTDIR)$(MANDIR)/man1/$(MAN1)
++ -e "s!DATE!`date +'%m %Y'`!g" $(DOCDIR)/$(MAN1) > $(MANDIR)/man1/$(MAN1)
+ uninstall:
+ $(RM) $(DESTDIR)$(BINDIR)/$(TARGET)
Index: patches/patch-config_mk
===================================================================
RCS file: patches/patch-config_mk
diff -N patches/patch-config_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-config_mk 17 Jun 2015 21:23:47 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+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
+ PROJECT = vimb
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
+-MANDIR ?= $(PREFIX)/share/man
+-EXAMPLEDIR ?= $(PREFIX)/share/$(PROJECT)/examples
++MANDIR ?= $(PREFIX)/man
++EXAMPLEDIR ?= $(PREFIX)/share/examples/$(PROJECT)
+
+ #----------------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}
+
Index: patches/patch-doc_vimb_1
===================================================================
RCS file: patches/patch-doc_vimb_1
diff -N patches/patch-doc_vimb_1
--- patches/patch-doc_vimb_1 14 Mar 2015 21:07:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-doc_vimb_1,v 1.1 2015/03/14 21:07:29 schwarze Exp $
---- doc/vimb.1.orig Fri Jan 16 23:39:50 2015
-+++ doc/vimb.1 Sat Feb 21 02:06:28 2015
-@@ -1,7 +1,8 @@
- .\" vim: ft=groff
- .\" Process this file with
- .\" groff -man -Tutf8 vimb.1
--.TH vimb 1 "DATE" "vimb/VERSION" "Vimb Manual"
-+.TH VIMB 1 "DATE" "vimb/VERSION" "Vimb Manual"
-+.tr \[char34]\(dq\[char92]\(rs
- .de EX
- .nf
- .ft CW
-@@ -14,10 +15,9 @@
- vimb - Vim Browser - A modal web browser based on webkit, inspired by vim the
- great editor.
- .SH SYNOPSIS
--.SY vimb
-+.B vimb
- .OP OPTIONS
- .RI [ URI "|" file "|" - ]
--.YS
- .SH DESCRIPTION
- vimb is a webkit based web browser that behaves like the vimperator
- plugin for the firefox and usage paradigms from the great editor vim. The goal
Index: patches/patch-src_Makefile
===================================================================
RCS file: patches/patch-src_Makefile
diff -N patches/patch-src_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile 17 Jun 2015 21:23:47 -0000
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+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-tests_Makefile
===================================================================
RCS file: /cvs/ports/www/vimb/patches/patch-tests_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tests_Makefile
--- patches/patch-tests_Makefile 19 Aug 2014 22:52:41 -0000 1.1.1.1
+++ patches/patch-tests_Makefile 17 Jun 2015 21:23:47 -0000
@@ -2,12 +2,12 @@ $OpenBSD: patch-tests_Makefile,v 1.1.1.1
No -Wpedantic with base gcc.
---- tests/Makefile.orig Sat Jun 28 19:42:58 2014
-+++ tests/Makefile Sat Jun 28 19:43:05 2014
-@@ -1,7 +1,7 @@
- include ../config.mk
+--- 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 ../
+ CPPFLAGS += -I $(BASEDIR)/
-CFLAGS += -fPIC -Wpedantic
+CFLAGS += -fPIC
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/vimb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 19 Aug 2014 22:52:41 -0000 1.1.1.1
+++ pkg/PLIST 17 Jun 2015 21:23:47 -0000
@@ -1,3 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2014/08/19 22:52:41 bcallah Exp $
@bin bin/vimb
@man man/man1/vimb.1
+share/examples/vimb/
+share/examples/vimb/formfiller/
+share/examples/vimb/formfiller/formfiller
+share/examples/vimb/formfiller/scripts.js
