Index: branches/2016Q4/x11-toolkits/girara/Makefile
===================================================================
--- branches/2016Q4/x11-toolkits/girara/Makefile	(revision 424307)
+++ branches/2016Q4/x11-toolkits/girara/Makefile	(revision 424308)
@@ -1,31 +1,40 @@
 # Created by: Mike Krutov <neko@takino.org>
 # $FreeBSD$
 
 PORTNAME=	girara
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	http://pwmt.org/projects/girara/download/
 
 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>
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 424307)
+++ branches/2016Q4	(revision 424308)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r424292