On Sat, Apr 28, 2018 at 05:15:04PM -0400, Brian Callahan wrote:
> Hi all --
>
> Attached is an update to graphics/feh. It fixes a bug in the version we have
> according to upstream's changelogs among other added features.
>
> Additionally, I am hoping we can remove some patches and instead compile
> with a -std=gnu99 flag. It seems like extra work to maintain support for C89
> compilers, and even gcc-3.3.5 has the -std=gnu99 flag.
>
> OK?
OK
>
> ~Brian
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/feh/Makefile,v
> retrieving revision 1.89
> diff -u -p -r1.89 Makefile
> --- Makefile 11 Feb 2018 19:23:49 -0000 1.89
> +++ Makefile 28 Apr 2018 21:09:49 -0000
> @@ -2,7 +2,7 @@
>
> 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
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/feh/distinfo,v
> retrieving revision 1.56
> diff -u -p -r1.56 distinfo
> --- distinfo 11 Feb 2018 19:23:49 -0000 1.56
> +++ distinfo 28 Apr 2018 21:09:49 -0000
> @@ -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
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/feh/patches/patch-Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-Makefile
> --- patches/patch-Makefile 11 Feb 2018 19:23:49 -0000 1.7
> +++ patches/patch-Makefile 28 Apr 2018 21:09:49 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.7 2018/02/1
> 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}
> Index: patches/patch-config_mk
> ===================================================================
> RCS file: /cvs/ports/graphics/feh/patches/patch-config_mk,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-config_mk
> --- patches/patch-config_mk 11 Feb 2018 19:23:49 -0000 1.9
> +++ patches/patch-config_mk 28 Apr 2018 21:09:49 -0000
> @@ -7,7 +7,7 @@ fix "filelist.c:253:45: error: use of un
> 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
> Index: patches/patch-man_feh_pre
> ===================================================================
> RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v
> retrieving revision 1.41
> diff -u -p -r1.41 patch-man_feh_pre
> --- patches/patch-man_feh_pre 11 Feb 2018 19:23:49 -0000 1.41
> +++ patches/patch-man_feh_pre 28 Apr 2018 21:09:49 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-man_feh_pre,v 1.41 2018/
> 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
> Index: patches/patch-src_keyevents_c
> ===================================================================
> RCS file: /cvs/ports/graphics/feh/patches/patch-src_keyevents_c,v
> retrieving revision 1.17
> diff -u -p -r1.17 patch-src_keyevents_c
> --- patches/patch-src_keyevents_c 17 Mar 2018 08:30:09 -0000 1.17
> +++ patches/patch-src_keyevents_c 28 Apr 2018 21:09:49 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_keyevents_c,v 1.17 2
> 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];
> - }
> Index: patches/patch-src_wallpaper_c
> ===================================================================
> RCS file: patches/patch-src_wallpaper_c
> diff -N patches/patch-src_wallpaper_c
> --- patches/patch-src_wallpaper_c 17 Mar 2018 08:30:09 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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);
> - }
