From d413593722cee8cc9e60df15cc06e8f9a3ee7f1e Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 19 Oct 2020 16:57:57 +0000
Subject: [PATCH] respect CFLAGS

---
 graphics/fswebcam/Makefile                 |  7 +++---
 graphics/fswebcam/patches/patch-fswebcam_c | 25 ----------------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 graphics/fswebcam/patches/patch-fswebcam_c

diff --git a/graphics/fswebcam/Makefile b/graphics/fswebcam/Makefile
index e4dffa3a819..7a2fbf1273d 100644
--- a/graphics/fswebcam/Makefile
+++ b/graphics/fswebcam/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2020/10/19 16:50:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2020/10/19 16:57:57 sthen Exp $
 
 COMMENT=		fswebcam is a small and simple webcam app
 
 DISTNAME=		fswebcam-20140113
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		graphics
 
@@ -19,9 +19,8 @@ WANTLIB=		c gd
 LIB_DEPENDS=		graphics/gd
 
 CONFIGURE_STYLE=	gnu
-#CONFIGURE_STYLE=	simple
 CONFIGURE_ARGS+=	--disable-v4l1
-CONFIGURE_ENV=		CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 NO_TEST=		Yes
diff --git a/graphics/fswebcam/patches/patch-fswebcam_c b/graphics/fswebcam/patches/patch-fswebcam_c
deleted file mode 100644
index 44b33e3df12..00000000000
--- a/graphics/fswebcam/patches/patch-fswebcam_c
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-fswebcam_c,v 1.1 2020/10/19 16:50:16 sthen Exp $
-
-From d5c708782bb947c9a610e413b4c7383dc10c388c Mon Sep 17 00:00:00 2001
-From: Ashley Dixon <ash@suugaku.co.uk>
-Date: Tue, 21 Jul 2020 02:33:50 +0100
-Subject: [PATCH] Fixed usage of gdImageStringFT.
-
-Since libgd 2.3.0, gdImageStringFT does not return NULL for an empty
-string, thus convincing fswebcam that the font cannot be found and the
-banner must be disabled.
-
-https://github.com/libgd/libgd/issues/615
-
-Index: fswebcam.c
---- fswebcam.c.orig
-+++ fswebcam.c
-@@ -467,7 +467,7 @@ int fswc_output(fswebcam_config_t *config, char *name,
- 		char *err;
- 		
- 		/* Check if drawing text works */
--		err = gdImageStringFT(NULL, NULL, 0, config->font, config->fontsize, 0.0, 0, 0, "");
-+		err = gdImageStringFT(NULL, NULL, 0, config->font, config->fontsize, 0.0, 0, 0, "A");
- 		
- 		if(!err) fswc_draw_banner(config, im);
- 		else