aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--converters/wkhtmltopdf/Makefile20
-rw-r--r--converters/wkhtmltopdf/distinfo4
2 files changed, 13 insertions, 11 deletions
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index fe2c6dd2548..0d46e295f3c 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -2,12 +2,13 @@
# $FreeBSD$
PORTNAME= wkhtmltopdf
-DISTVERSION= 0.12.0
+PORTVERSION= 0.12.0
+PORTREVISION= 1
CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mm/wkhtmltopdf
-DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
- wkhtmltopdf-qt-${WKQTVERSION}.tar.xz
+MASTER_SITES= GH:wk \
+ http://github.com/${GH_ACCOUNT}/qt/archive/${WKQT_TAGNAME}.tar.gz?dummy=/:wkqt
+DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:wk \
+ wkhtmltopdf-qt-${PORTVERSION}.tar.gz:wkqt
MAINTAINER= mm@FreeBSD.org
COMMENT= Convert HTML (or live webpages) to PDF or image files
@@ -18,19 +19,20 @@ LICENSE_FILE_LGPL3= ${INSTALL_WRKSRC}/COPYING
LIB_DEPENDS+= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libfreetype.so:${PORTSDIR}/print/freetype2
-#USE_GITHUB= yes
+USE_GITHUB= yes
GH_ACCOUNT= wkhtmltopdf
GH_PROJECT= wkhtmltopdf
-GH_TAGNAME= 0.12.0
GH_COMMIT= 03c001d
-WKQTVERSION= 0ec3313
+GH_TAGNAME= 0.12.0
+WKQT_TAGNAME= wkhtmltopdf_0.12.0
+
USES= pkgconfig gmake perl5
USE_XORG= x11 xext xrender
USE_PERL5= build
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/qt-wk_4.8.5
+WRKSRC= ${WRKDIR}/qt-${WKQT_TAGNAME}
INSTALL_WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
OPTIONS_DEFINE= BUNDLED_LIBS
diff --git a/converters/wkhtmltopdf/distinfo b/converters/wkhtmltopdf/distinfo
index 3109afd4f6b..3d9200f99d2 100644
--- a/converters/wkhtmltopdf/distinfo
+++ b/converters/wkhtmltopdf/distinfo
@@ -1,4 +1,4 @@
SHA256 (wkhtmltopdf-0.12.0.tar.gz) = 47b35536ca60220c402113c9ceee9b1f68bd7ca0dc831e3242e26684a9fd4baf
SIZE (wkhtmltopdf-0.12.0.tar.gz) = 135609
-SHA256 (wkhtmltopdf-qt-0ec3313.tar.xz) = cd930bb84124a5cf4f74f430233be4aa5c1c69b5846684f1223ab1a0bc9110a7
-SIZE (wkhtmltopdf-qt-0ec3313.tar.xz) = 132737360
+SHA256 (wkhtmltopdf-qt-0.12.0.tar.gz) = 45c675a379478ec6bc4a5bae92264b92ba413a7b870615fac5f7868c304b992d
+SIZE (wkhtmltopdf-qt-0.12.0.tar.gz) = 173004829