Index: branches/2016Q4/x11-toolkits/girara/Makefile
===================================================================
--- branches/2016Q4/x11-toolkits/girara/Makefile	(revision 424443)
+++ branches/2016Q4/x11-toolkits/girara/Makefile	(revision 424444)
@@ -1,40 +1,36 @@
 # Created by: Mike Krutov <neko@takino.org>
 # $FreeBSD$
 
 PORTNAME=	girara
 PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 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=		gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_CSTD=	gnu99
 LIBDIR=		${PREFIX}/lib
 MAKE_ENV+=	SFLAGS=${STRIP} \
 		VERBOSE=1
 
-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_DEFINE=	NLS
 
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
-GCC_USE=	GCC=yes
 
 post-patch:	.SILENT
 	${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' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: branches/2016Q4/x11-toolkits/girara/files/patch-girara_callbacks.h
===================================================================
--- branches/2016Q4/x11-toolkits/girara/files/patch-girara_callbacks.h	(nonexistent)
+++ branches/2016Q4/x11-toolkits/girara/files/patch-girara_callbacks.h	(revision 424444)
@@ -0,0 +1,19 @@
+--- girara/callbacks.h.orig	2016-04-18 20:35:34 UTC
++++ girara/callbacks.h
+@@ -4,6 +4,7 @@
+ #define GIRARA_CALLBACKS_H
+ 
+ #include "types.h"
++#include "macros.h"
+ #include <gtk/gtk.h>
+ 
+ /**
+@@ -108,7 +109,7 @@ bool girara_callback_inputbar_activate(G
+  * @return FALSE An error occurred
+  */
+ bool girara_callback_inputbar_key_press_event(GtkWidget* widget,
+-    GdkEventKey* event, girara_session_t* session);
++    GdkEventKey* event, girara_session_t* session) GIRARA_OPTNONE;
+ 
+ /**
+  * Default callback if the text of the input bar has changed

Property changes on: branches/2016Q4/x11-toolkits/girara/files/patch-girara_callbacks.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q4/x11-toolkits/girara/files/patch-girara_macros.h
===================================================================
--- branches/2016Q4/x11-toolkits/girara/files/patch-girara_macros.h	(nonexistent)
+++ branches/2016Q4/x11-toolkits/girara/files/patch-girara_macros.h	(revision 424444)
@@ -0,0 +1,15 @@
+--- girara/macros.h.orig	2015-04-13 20:49:26 UTC
++++ girara/macros.h
+@@ -69,4 +69,12 @@
+     GIRARA_DO_PRAGMA(GCC diagnostic pop)
+ #endif
+ 
++#ifndef GIRARA_OPTNONE
++# if defined(__clang__)
++#  define GIRARA_OPTNONE __attribute__ ((optnone))
++# else
++#  define GIRARA_OPTNONE
++# endif
++#endif
++
+ #endif

Property changes on: branches/2016Q4/x11-toolkits/girara/files/patch-girara_macros.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 424443)
+++ branches/2016Q4	(revision 424444)

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