Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jul 2016 20:44:23 +0000 (UTC)
From:      Martin Matuska <mm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418056 - head/converters/wkhtmltopdf
Message-ID:  <201607042044.u64KiNFg072286@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mm
Date: Mon Jul  4 20:44:22 2016
New Revision: 418056
URL: https://svnweb.freebsd.org/changeset/ports/418056

Log:
  Update converters/wkhtmltopdf to 0.12.3.2

Modified:
  head/converters/wkhtmltopdf/Makefile
  head/converters/wkhtmltopdf/distinfo
  head/converters/wkhtmltopdf/pkg-plist

Modified: head/converters/wkhtmltopdf/Makefile
==============================================================================
--- head/converters/wkhtmltopdf/Makefile	Mon Jul  4 20:00:46 2016	(r418055)
+++ head/converters/wkhtmltopdf/Makefile	Mon Jul  4 20:44:22 2016	(r418056)
@@ -2,17 +2,14 @@
 # $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
 
@@ -20,13 +17,15 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/
 		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
@@ -52,6 +51,10 @@ CONFIGURE_ARGS=	-prefix ${WRKSRC}/build/
 
 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' \

Modified: head/converters/wkhtmltopdf/distinfo
==============================================================================
--- head/converters/wkhtmltopdf/distinfo	Mon Jul  4 20:00:46 2016	(r418055)
+++ head/converters/wkhtmltopdf/distinfo	Mon Jul  4 20:44:22 2016	(r418056)
@@ -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

Modified: head/converters/wkhtmltopdf/pkg-plist
==============================================================================
--- head/converters/wkhtmltopdf/pkg-plist	Mon Jul  4 20:00:46 2016	(r418055)
+++ head/converters/wkhtmltopdf/pkg-plist	Mon Jul  4 20:44:22 2016	(r418056)
@@ -7,6 +7,6 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607042044.u64KiNFg072286>