Index: head/converters/wkhtmltopdf/Makefile
===================================================================
--- head/converters/wkhtmltopdf/Makefile	(revision 418055)
+++ head/converters/wkhtmltopdf/Makefile	(revision 418056)
@@ -1,75 +1,78 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wkhtmltopdf
-PORTVERSION=	0.12.2.1
-PORTREVISION=	1
+PORTVERSION=	0.12.3.2
 CATEGORIES=	converters
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
-DISTNAME=	wkhtmltox-${PORTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Convert HTML (or live webpages) to PDF or image
 
 LICENSE=	LGPL3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	Does not build
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
-USES=		gmake iconv jpeg perl5 pkgconfig tar:bzip2
+USES=		gmake iconv jpeg perl5 pkgconfig
 USE_XORG=	x11 xext xrender
 USE_PERL5=	build
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+WKQT_TAGNAME=	fe194f9
+GH_TUPLE=	${PORTNAME}:qt:${WKQT_TAGNAME}:qt
 HAS_CONFIGURE=	yes
 
-WRKSRC=			${WRKDIR}/wkhtmltox-${PORTVERSION}
 PATCH_WRKSRC=		${WRKSRC}/qt
 CONFIGURE_WRKSRC=	${WRKSRC}/build/qt
 BUILD_WRKSRC=		${WRKSRC}/build/qt
 INSTALL_WRKSRC=		${WRKSRC}/build/app
 
 CONFIGURE_SCRIPT=	../../qt/configure
 CONFIGURE_ARGS=	-prefix ${WRKSRC}/build/qt \
 	-opensource -confirm-license -fast -release -static \
 	-graphicssystem raster -webkit -exceptions -xmlpatterns -system-zlib \
 	-system-libpng -system-libjpeg -no-libmng -no-libtiff -no-stl \
 	-no-accessibility -no-qt3support -no-phonon -no-phonon-backend \
 	-no-opengl -no-declarative -no-script -no-scripttools \
 	-no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
 	-no-sql-sqlite -no-sql-sqlite2 -no-mmx -no-3dnow -no-sse -no-sse2 \
 	-no-multimedia -nomake demos -nomake docs -nomake examples \
 	-nomake tools -nomake tests -nomake translations -xrender -largefile \
 	-iconv -openssl -no-rpath -no-dbus -no-nis -no-cups -no-pch \
 	-no-gtkstyle -no-nas-sound -no-sm -no-xshape -no-xinerama -no-xcursor \
 	-no-xfixes -no-xrandr -no-mitshm -no-xinput -no-xkb -no-glib \
 	-no-gstreamer -D ENABLE_VIDEO=0 -no-openvg -no-xsync \
 	-no-audio-backend -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx \
 	-no-neon
 
 MAKE_ARGS=	INSTALL_ROOT="${STAGEDIR}${PREFIX}"
+
+pre-patch:
+	@${RMDIR} ${WRKSRC}/qt
+	@${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's|/usr/X11R6/include|${LOCALBASE}/include/X11|g' \
 		-e 's|/usr/X11R6/lib|${LOCALBASE}/lib|g' \
 		${PATCH_WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \
 		${PATCH_WRKSRC}/mkspecs/common/g++-base.conf
 	@${REINPLACE_CMD} -e "s|share/man|man|g" \
 		${WRKSRC}/src/image/image.pro \
 		${WRKSRC}/src/pdf/pdf.pro
 	@${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \
 		${WRKSRC}/build/wkhtmltox
 
 post-build:
 	@cd ${WRKSRC}/build/app && ${SETENV} ${MAKE_ENV} \
 		../qt/bin/qmake ../../wkhtmltopdf.pro && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \
 		${ALL_TARGET}
 
 .include <bsd.port.mk>
Index: head/converters/wkhtmltopdf/distinfo
===================================================================
--- head/converters/wkhtmltopdf/distinfo	(revision 418055)
+++ head/converters/wkhtmltopdf/distinfo	(revision 418056)
@@ -1,2 +1,5 @@
-SHA256 (wkhtmltox-0.12.2.1.tar.bz2) = acb62fa593c537f028883bc827cbb459ed232611d810be109f3942ec8c5aa5c2
-SIZE (wkhtmltox-0.12.2.1.tar.bz2) = 36248626
+TIMESTAMP = 1467664988
+SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.3.2_GH0.tar.gz) = 721523ef87ccb937bf3714ade19b112f4cb8a2cd840e34b30f26ee262c41fe16
+SIZE (wkhtmltopdf-wkhtmltopdf-0.12.3.2_GH0.tar.gz) = 128050
+SHA256 (wkhtmltopdf-qt-fe194f9_GH0.tar.gz) = fa3f9dfc3fe3ee68280226bd1f4b8500883dd2549b985373e71aeff4e958b95a
+SIZE (wkhtmltopdf-qt-fe194f9_GH0.tar.gz) = 173008155
Index: head/converters/wkhtmltopdf/pkg-plist
===================================================================
--- head/converters/wkhtmltopdf/pkg-plist	(revision 418055)
+++ head/converters/wkhtmltopdf/pkg-plist	(revision 418056)
@@ -1,12 +1,12 @@
 bin/wkhtmltopdf
 bin/wkhtmltoimage
 include/wkhtmltox/dllbegin.inc
 include/wkhtmltox/dllend.inc
 include/wkhtmltox/image.h
 include/wkhtmltox/pdf.h
 lib/libwkhtmltox.so
 lib/libwkhtmltox.so.0
 lib/libwkhtmltox.so.0.12
-lib/libwkhtmltox.so.0.12.2
+lib/libwkhtmltox.so.0.12.3
 man/man1/wkhtmltoimage.1.gz
 man/man1/wkhtmltopdf.1.gz