- Add GCC option, turned on by default, to force compilation using

GCC, this fixes a problem in zathura which shows up only when girara
  is compiled wth clang [1]
- Make the port use gnu99 C standard to allow it to compile with
  the default gcc 4.8
- Remove USES=compiler since it's not needed anymore
- Small cosmetic change to the REINPLACE_CMD lines
- While here, make the build verbose

PR:		213595
Submitted by:	Michael Danilov <mike.d.ft402@gmail.com>
MFH:		2016Q4

x11-toolkits/girara/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	girara
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	http://pwmt.org/projects/girara/download/
 
@@ -10,22 +11,30 @@ MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	GTK3 Interface Library for Zathura PDF Viewer
 
 USE_GNOME=	glib20 gtk30
-USES=		compiler:c11 gmake pkgconfig
+USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
+USE_CSTD=	gnu99
 LIBDIR=		${PREFIX}/lib
-MAKE_ENV+=	SFLAGS=${STRIP}
+MAKE_ENV+=	SFLAGS=${STRIP} \
+		VERBOSE=1
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	GCC NLS
+# Force GCC by default due to problems in dependent port zathura with keyboard
+# input when compiled using clang.
+OPTIONS_DEFAULT=GCC
 
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
+GCC_USE=	GCC=yes
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g'\
+	${REINPLACE_CMD} -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|^\(CFLAGS +=\) -std=c11|\1|' \
+		${WRKSRC}/config.mk
 
 post-patch-NLS-off: .SILENT
-	${REINPLACE_CMD} -e '/-C po/d'\
+	${REINPLACE_CMD} -e '/-C po/d' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>