Index: head/cad/lepton-eda/Makefile
===================================================================
--- head/cad/lepton-eda/Makefile
+++ head/cad/lepton-eda/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lepton-eda
 PORTVERSION=	1.9.7
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-20181211
 CATEGORIES=	cad
 
Index: head/cad/lepton-eda/files/patch-cli_Makefile.am
===================================================================
--- head/cad/lepton-eda/files/patch-cli_Makefile.am
+++ head/cad/lepton-eda/files/patch-cli_Makefile.am
@@ -0,0 +1,11 @@
+--- cli/Makefile.am.orig	2019-07-19 17:10:25 UTC
++++ cli/Makefile.am
+@@ -28,7 +28,7 @@ lepton_cli_CPPFLAGS = \
+ lepton_cli_CFLAGS = \
+ 	$(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GTK_CFLAGS) \
+ 	$(GDK_PIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(CAIRO_PNG_CFLAGS) \
+-	$(CAIRO_PDF_CLAGS) $(CAIRO_PS_CFLAGS) $(CAIRO_SVG_CFLAGS)
++	$(CAIRO_PDF_CLAGS) $(CAIRO_PS_CFLAGS) $(CAIRO_SVG_CFLAGS) $(CFLAGS)
+ lepton_cli_LDFLAGS = $(GUILE_LIBS) $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(CAIRO_LIBS) \
+ 	$(CAIRO_PNG_LIBS) $(CAIRO_PDF_CLAGS) $(CAIRO_PS_LIBS) $(CAIRO_SVG_LIBS)
+ lepton_cli_LDADD = \
Index: head/cad/lepton-eda/files/patch-liblepton_src_Makefile.am
===================================================================
--- head/cad/lepton-eda/files/patch-liblepton_src_Makefile.am
+++ head/cad/lepton-eda/files/patch-liblepton_src_Makefile.am
@@ -0,0 +1,11 @@
+--- liblepton/src/Makefile.am.orig	2019-07-19 16:53:37 UTC
++++ liblepton/src/Makefile.am
+@@ -99,7 +99,7 @@ liblepton_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"  
+ 	-I$(srcdir)/../include -I$(srcdir)/../include/liblepton -I$(top_srcdir)
+ liblepton_la_CFLAGS = \
+ 	$(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GLIB_CFLAGS) \
+-	$(GDK_PIXBUF_CFLAGS)
++	$(GDK_PIXBUF_CFLAGS) $(CFLAGS)
+ liblepton_la_LDFLAGS = -version-info $(LIBLEPTON_SHLIB_VERSION) \
+ 	$(WINDOWS_LIBTOOL_FLAGS) $(MINGW_LDFLAGS) $(GUILE_LIBS) \
+ 	$(GLIB_LIBS) $(GDK_PIXBUF_LIBS)
Index: head/cad/lepton-eda/files/patch-schematic_src_Makefile.am
===================================================================
--- head/cad/lepton-eda/files/patch-schematic_src_Makefile.am
+++ head/cad/lepton-eda/files/patch-schematic_src_Makefile.am
@@ -0,0 +1,11 @@
+--- schematic/src/Makefile.am.orig	2019-07-19 17:20:29 UTC
++++ schematic/src/Makefile.am
+@@ -128,7 +128,7 @@ lepton_schematic_CPPFLAGS = -I$(top_srcdir)/liblepton/
+ 	-I$(top_srcdir) -I$(includedir)
+ lepton_schematic_CFLAGS = $(GCC_CFLAGS) $(LIBSTROKE_CFLAGS) \
+ 	$(MINGW_CFLAGS) \
+-	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
++	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS) $(CFLAGS)
+ lepton_schematic_LDFLAGS = $(LIBSTROKE_LDFLAGS) $(GLIB_LIBS) $(GTK_LIBS) \
+ 	$(GTHREAD_LIBS) $(GUILE_LIBS) $(MINGW_GUI_LDFLAGS)
+ lepton_schematic_LDADD = \