Index: head/security/fwbuilder/Makefile
===================================================================
--- head/security/fwbuilder/Makefile	(revision 459217)
+++ head/security/fwbuilder/Makefile	(revision 459218)
@@ -1,82 +1,83 @@
 # Created by: Roman Shterenzon <roman@xpert.com>
 # $FreeBSD$
 
 PORTNAME=	fwbuilder
 PORTVERSION=	5.1.0
 DISTVERSIONSUFFIX=	.${BUILD}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/Current_Packages/${PORTVERSION}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
 #OPTIONS_DEFINE=	DOCS
 
 BUILD=		3599
 
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == -devel
 CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-[234].* \
 		libfwbuilder-[234].* libfwbuilder-devel-[234].*
 .else
 CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-* \
 		libfwbuilder-[234].* libfwbuilder-devel-*
 .endif
 LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 		libnetsnmp.so:net-mgmt/net-snmp
 
 PLIST_SUB=	BUILD_VERSION=${PORTVERSION}.${BUILD}
 USE_QT4=	corelib \
 		gui \
 		iconengines \
 		inputmethods \
 		linguist_build \
 		moc_build \
 		rcc_build \
 		qmake_build \
 		svg \
 		uic_build \
 		xml
 
 QTDIR?=		${PREFIX}
 
 USES=		autoreconf:build gmake libtool ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
 		INSTALL_ROOT=${STAGEDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
+CXXFLAGS+=	-Wno-reserved-user-defined-literal
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR} \
 		--prefix=${PREFIX}
 MAKE_ARGS+=	QTDIR="${QTDIR}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 MAKE_ENV=	INSTALL_ROOT=${STAGEDIR} CCACHE_DISABLE=yes
 USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if !exists (/usr/bin/rcs)
 # IMPORTANT: Newer versions of rcs will NOT work with fwbuilder.
 RUN_DEPENDS+=	rcs:devel/rcs57
 .endif
 
 .if empty(PORT_OPTIONS:MDOCS)
 BROKEN=		DOCS must be enabled in this port
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} '/^\.\/configure/d' ${WRKSRC}/autogen.sh
 
 pre-configure:
 	(cd ${WRKSRC} && ./autogen.sh)
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fwbuilder
 	@${ECHO} If you are upgrading from a previous version of fwbuilder,
 	@${ECHO} please make sure to backup your fwbuilder database files
 	@${ECHO} prior to invoking fwbuilder for the first time.
 
 .include <bsd.port.mk>
Index: head/security/fwbuilder/files/patch-qmake.inc.in
===================================================================
--- head/security/fwbuilder/files/patch-qmake.inc.in	(revision 459217)
+++ head/security/fwbuilder/files/patch-qmake.inc.in	(revision 459218)
@@ -1,22 +1,15 @@
---- qmake.inc.in.orig	2011-04-20 10:48:53.000000000 -0700
-+++ qmake.inc.in	2011-05-08 13:57:57.471497111 -0700
-@@ -17,7 +17,6 @@
- 
- # CONFIG -= nostrip
- # CONFIG += release
--CONFIG += debug
- 
- unix {
-     PREFIX = @PREFIX@
-@@ -35,11 +34,6 @@
+--- qmake.inc.in.orig	2012-03-22 23:10:54.000000000 -0700
++++ qmake.inc.in	2018-01-16 19:10:57.908531000 -0800
+@@ -35,10 +35,8 @@
      MOC_DIR = .moc
      OBJECTS_DIR = .obj
  
 -    QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
 -    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
 -    QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
 -    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
--
++    QMAKE_CXXFLAGS_DEBUG += -Wno-reserved-user-defined-literal
++    QMAKE_CXXFLAGS_RELEASE += -Wno-reserved-user-defined-literal
+ 
      !macx {
  
-         exec_prefix = @EXEC_PREFIX@