--- graphics/djview4/Makefile	2015-11-07 04:27:14.829272000 +0900
+++ graphics/djview4/Makefile	2016-03-23 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@ 
 # $FreeBSD: head/graphics/djview4/Makefile 400947 2015-11-06 17:11:34Z rm $
 
 PORTNAME=	djview
-PORTVERSION=	4.10.3
+PORTVERSION=	4.10.6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/djvu/DjView/${PORTVERSION:R}
 
@@ -16,43 +16,50 @@ 
 LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
-INSTALL_TARGET=	install-strip
-GNU_CONFIGURE=	yes
 USES=		autoreconf desktop-file-utils gmake libtool pkgconfig \
 		webplugin:native
+USE_GL=		gl
 USE_XORG=	sm ice xt
-CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
-		--x-libraries="${LOCALBASE}/lib"
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LRELEASE="${LRELEASE}" LUPDATE="${LUPDATE}"
+MAKE_ENV=	V=1
+INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 WEBPLUGIN_DIR=		${PREFIX}/lib/djview4/plugins
 WEBPLUGIN_FILES=	nsdejavu.so
 
-OPTIONS_SINGLE=	QT
-OPTIONS_SINGLE_QT=	QT4 QT5
+OPTIONS_SINGLE=		TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
 OPTIONS_DEFAULT=	QT5
 
-QT4_USE=	QT4=gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build
-QT5_USE=	QT5=gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build
-
-post-patch: .SILENT
+QT4_USE=		qt4=gui,network,opengl \
+			qt4=linguisttools_build,moc_build,qmake_build \
+			qt4=rcc_build,uic_build
+QT5_USE=		qt5=gui,network,opengl,printsupport,widgets \
+			qt5=buildtools_build,linguisttools_build,qmake_build
+TOOLKIT_DESC=		Qt toolkit
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/CXXFLAGS=$$/s|^|#| ; \
+		 /CFLAGS=$$/s|^|#| ; \
+		 s|$$OPTS -O2|$$OPTS|' ${WRKSRC}/config/acinclude.m4
+	@${REINPLACE_CMD} -e \
+		's|FLAGS+=|FLAGS_RELEASE=|' ${WRKSRC}/src/Makefile.am
 # Change plugins directory
 # Add GLIB cflags and libs (including -lX*)
-	${REINPLACE_CMD} -e '/^pluginsdir/s/mozilla/djview4/ ; \
-		/NSDEJAVU_CFLAGS/s|$$| $$\(GLIB_CFLAGS\)| ; \
-		/NSDEJAVU_LIBS/s|$$| $$\(GLIB_LIBS\) -lXt -lXext|' \
+	@${REINPLACE_CMD} -e \
+		'/^pluginsdir/s|mozilla|djview4| ; \
+		 /NSDEJAVU_CFLAGS/s|$$| $$(GLIB_CFLAGS)| ; \
+		 /NSDEJAVU_LIBS/s|$$| $$(GLIB_LIBS) -lXext -lXt|' \
 		${WRKSRC}/nsdejavu/Makefile.am
 
 post-install:
-# Changing file write permissions needed to strip a file installed as a script
-	${CHMOD} +w ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${CHMOD} -w ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/djview
 # Create a symbolic link to match desktop file exec name
-	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf ${PORTNAME} ${PORTNAME}4)
+	${LN} -sf djview ${STAGEDIR}${PREFIX}/bin/djview4
 
 .include <bsd.port.mk>
--- graphics/djview4/distinfo	2015-11-07 04:27:14.829631000 +0900
+++ graphics/djview4/distinfo	2016-03-23 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@ 
-SHA256 (djview-4.10.3.tar.gz) = 50b80ecddc5aec03c49882c91b3af2f42abfe8454d5ddc01fb313e3481e6ab25
-SIZE (djview-4.10.3.tar.gz) = 1119618
+SHA256 (djview-4.10.6.tar.gz) = 8446f3cd692238421a342f12baa365528445637bffb96899f319fe762fda7c21
+SIZE (djview-4.10.6.tar.gz) = 1113072