Update to feh-2.26

Compile with -std=gnu99 to remove some patches.
MAINTAINER timeout
ok pirofti@

graphics/feh/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.89 2018/02/11 19:23:49 kn Exp $
+# $OpenBSD: Makefile,v 1.90 2018/05/06 15:22:12 bcallah Exp $
 
 COMMENT=	lightweight image viewer
 
-DISTNAME=	feh-2.23.1
+DISTNAME=	feh-2.26
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	graphics
 FIX_EXTRACT_PERMISSIONS=Yes
@@ -27,12 +27,13 @@ RUN_DEPENDS+=	devel/desktop-file-utils \
 TEST_DEPENDS=	devel/p5-Test-Command
 
 CFLAGS+=	-I${LOCALBASE}/include \
-		-I${X11BASE}/include
+		-I${X11BASE}/include \
+		-std=gnu99
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 MAKE_FLAGS=	LDFLAGS="${LDFLAGS}" \
 		man_dir="${DESTDIR}${PREFIX}/man" \
 		example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
-		exif=1
+		exif=1 verscmp=0
 FAKE_FLAGS=	PREFIX="${PREFIX}"
 
 USE_GMAKE=	Yes

graphics/feh/distinfo

@@ -1,2 +1,2 @@
-SHA256 (feh-2.23.1.tar.bz2) = m8Fk0IY9QSAb0lOiZS3O5YBqnGqLWRi7i6CfzubX6b4=
-SIZE (feh-2.23.1.tar.bz2) = 2130373
+SHA256 (feh-2.26.tar.bz2) = sda/3XkGDYZLjv8FuRYVO+BIAZmBSGIBJeOsMfmfbIY=
+SIZE (feh-2.26.tar.bz2) = 2131837

graphics/feh/patches/patch-Makefile

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Makefile,v 1.7 2018/02/11 19:23:49 kn Exp $
+$OpenBSD: patch-Makefile,v 1.8 2018/05/06 15:22:12 bcallah Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -91,6 +91,7 @@ install-examples:
+@@ -93,6 +93,7 @@ install-examples:
  	@echo installing examples to ${example_dir}
  	@mkdir -p ${example_dir}
  	@cp examples/* ${example_dir}

graphics/feh/patches/patch-config_mk

@@ -1,4 +1,4 @@
-$OpenBSD: patch-config_mk,v 1.9 2018/02/11 19:23:49 kn Exp $
+$OpenBSD: patch-config_mk,v 1.10 2018/05/06 15:22:12 bcallah Exp $
 
 zap redundant CFLAGS
 
@@ -7,7 +7,7 @@ fix "filelist.c:253:45: error: use of undeclared identifier 'alphasort'"
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -35,10 +35,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
+@@ -36,10 +36,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
  
  # default CFLAGS
  CFLAGS ?= -g -O2

graphics/feh/patches/patch-man_feh_pre

@@ -1,8 +1,8 @@
-$OpenBSD: patch-man_feh_pre,v 1.41 2018/02/11 19:23:49 kn Exp $
+$OpenBSD: patch-man_feh_pre,v 1.42 2018/05/06 15:22:12 bcallah Exp $
 Index: man/feh.pre
 --- man/feh.pre.orig
 +++ man/feh.pre
-@@ -1088,7 +1088,7 @@ which
+@@ -1186,7 +1186,7 @@ which
  defaults to
  .Pa ~/.config/feh/ .
  If the files are not found in that directory, it will also try

graphics/feh/patches/patch-src_keyevents_c

@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_keyevents_c,v 1.17 2018/03/17 08:30:09 landry Exp $
+$OpenBSD: patch-src_keyevents_c,v 1.18 2018/05/06 15:22:12 bcallah Exp $
 Index: src/keyevents.c
 --- src/keyevents.c.orig
 +++ src/keyevents.c
-@@ -225,7 +225,7 @@ void init_keyevents(void) {
+@@ -226,7 +226,7 @@ void init_keyevents(void) {
  
  	free(confpath);
  
@@ -11,13 +11,3 @@ Index: src/keyevents.c
  		return;
  
  	while (fgets(line, sizeof(line), conf)) {
-@@ -390,7 +390,8 @@ void feh_event_handle_keypress(XEvent * ev)
- 
- fehkey *feh_str_to_kb(char *action)
- {
--	for (unsigned int i = 0; i < EVENT_LIST_END; i++) {
-+	unsigned int i;
-+	for (i = 0; i < EVENT_LIST_END; i++) {
- 		if (!strcmp(action, keys[i].name)) {
- 			return &keys[i];
- 		}

graphics/feh/patches/patch-src_wallpaper_c

@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_wallpaper_c,v 1.3 2018/03/17 08:30:09 landry Exp $
-
-Fix for old compilers
-
-Index: src/wallpaper.c
---- src/wallpaper.c.orig
-+++ src/wallpaper.c
-@@ -434,13 +434,14 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int cent
- 				FILE *fp;
- 				char *path;
- 				struct stat s;
-+				int i;
- 				path = estrjoin("/", home, ".fehbg", NULL);
- 				if ((fp = fopen(path, "w")) == NULL) {
- 					weprintf("Can't write to %s", path);
- 				} else {
- 					fputs("#!/bin/sh\n", fp);
- 					if (use_filelist) {
--						for (int i = 0; i < cmdargc; i++) {
-+						for (i = 0; i < cmdargc; i++) {
- 							fputs(shell_escape(cmdargv[i]), fp);
- 							fputc(' ', fp);
- 						}