On Fri, Apr 15, 2016 at 01:31:01AM +0200, Adam Wolk wrote:
>
> Looks good to me and works correctly. make port-lib-depends-check does
> complain on extra deps but it did the same for 2.10.
>
> vimb-2.11(www/vimb):
> Extra: iconv.6 m.9 pthread.21
>
> vimb-2.10p0(www/vimb):
> Extra: iconv.6 m.9 pthread.21
>
Indeed, good catch. I believed those issues are now fixed.
Here is an improved diff which removes the extraneous stuff in
WANTLIB, and moved some of the required libs (fontconfig, freetype,
pangoft2-1.0 and z) to the else clause of the ${FLAVOR} if block, in
order to remove such warnings when building the GTK3 flavor.
Also removed devel/gettext from MODULES and added intl to WANTLIB. I'm
not 100% confident about this modification as portcheck complains about
it, would be nice if someone could double check.
Lastly, this diff drops all the patches by using CFLAGS and MAKE_ENV in
the port Makefile, and a do-patch section to fix the CA bundle path.
> Do you want to take MAINTAINER on this port? There is none in the
> Makefile now.
Sure, added MAINTAINER.
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 15 Apr 2016 21:56:24 -0000
@@ -1,44 +1,48 @@
# $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/
+MAINTAINER = Frederic Cambus <[email protected]>
+
# GPLv3+
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
+WANTLIB += atk-1.0 c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += intl pango-1.0 pangocairo-1.0 soup-2.4
FLAVORS = gtk3
FLAVOR ?=
-MODULES = devel/gettext
-
.if ${FLAVOR} == "gtk3"
-WANTLIB += cairo-gobject gdk-3 gtk-3 javascriptcoregtk-3.0
-WANTLIB += webkitgtk-3.0
+WANTLIB += cairo-gobject gdk-3 gtk-3 javascriptcoregtk-3.0 webkitgtk-3.0
LIB_DEPENDS = www/webkit,gtk3
MAKE_FLAGS = GTK=3
.else
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender gdk-x11-2.0 gtk-x11-2.0 javascriptcoregtk-1.0
-WANTLIB += webkitgtk-1.0
+WANTLIB += Xrandr Xrender fontconfig freetype gdk-x11-2.0 gtk-x11-2.0
+WANTLIB += javascriptcoregtk-1.0 pangoft2-1.0 webkitgtk-1.0 z
LIB_DEPENDS = www/webkit
.endif
USE_GMAKE = Yes
-FAKE_FLAGS = DESTDIR="${WRKINST}" PREFIX="${TRUEPREFIX}"
+CFLAGS += -D_BSD_SOURCE
+MAKE_ENV += EXAMPLEDIR="${PREFIX}/share/examples/vimb"
MANDIR="${PREFIX}/man"
+
+FAKE_FLAGS = PREFIX="${TRUEPREFIX}"
+
+do-patch:
+ @sed -i 's,certs/ca-certificates.crt,cert.pem,'
${WRKSRC}/src/config.def.h
.include <bsd.port.mk>
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 15 Apr 2016 21:56:24 -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: patches/patch-config_mk
diff -N patches/patch-config_mk
--- patches/patch-config_mk 25 Jun 2015 22:57:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-config_mk,v 1.1 2015/06/25 22:57:36 bcallah Exp $
-
-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-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: patches/patch-src_config_def_h
diff -N patches/patch-src_config_def_h
--- patches/patch-src_config_def_h 30 Jan 2015 22:01:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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 @@
- #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 "/etc/ssl/cert.pem"
- #define SETTING_MAX_CONNS 25
- #define SETTING_MAX_CONNS_PER_HOST 5
- /* default font size for fonts in webview */
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 \
