diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 278a0de11150..4e9124ccd74c 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -1,66 +1,65 @@ PORTNAME= reportlab -PORTVERSION= 3.5.68 -PORTREVISION= 1 +PORTVERSION= 3.6.11 CATEGORIES= print python MASTER_SITES= CHEESESHOP \ https://www.reportlab.com/ftp/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PFBFER} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= bofh@FreeBSD.org COMMENT= Library to create PDF documents using the Python language WWW= https://www.reportlab.com/ LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PY_PILLOW} USES= cpe python:3.6+ USE_PYTHON= distutils autoplist CONFLICTS= py*-reportlab[^3]-[^3].* \ py*-reportlab-[^3].* PFBFER_VERSION= 20180109 PFBFER= pfbfer-${PFBFER_VERSION}.zip MAKE_ENV= PACKAGE_PATH="${REPORTLABDIR}" REPORTLABDIR= ${PYTHONPREFIX_SITELIBDIR}/reportlab DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= reportlab-userguide.pdf OPTIONS_DEFINE= CJK FREETYPE DOCS OPTIONS_DEFAULT=CJK FREETYPE CJK_DESC= Adobe CMaps CJK_RUN_DEPENDS= ${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:print/adobe-cmaps FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 post-patch: @${REINPLACE_CMD} -e 's|%%DISTDIR%%|${DISTDIR}|' \ -e 's|%%PFBFER%%|${PFBFER}|' \ ${WRKSRC}/setup.py post-patch-DOCS-on: .for f in genAll.py userguide/genuserguide.py @${REINPLACE_CMD} -e 's|%%STAGEDIR%%|${STAGEDIR}|' \ -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' \ ${WRKSRC}/docs/${f} .endfor post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/reportlab/*/*.so post-install-DOCS-on: @cd ${WRKSRC}/docs && ${PYTHON_CMD} genAll.py @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} .endfor do-test: @(cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ./runAll.py) .include diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo index 7048115e383e..bd36a5089bf9 100644 --- a/print/py-reportlab/distinfo +++ b/print/py-reportlab/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1625171705 -SHA256 (reportlab-3.5.68.tar.gz) = efef6a97e3ab49f3f40037dbf9a4166668a17cc6aaba13d5ecbabdf854a9b332 -SIZE (reportlab-3.5.68.tar.gz) = 4512985 +TIMESTAMP = 1667594395 +SHA256 (reportlab-3.6.11.tar.gz) = 04fc4420f0548815d0623e031c86a1f7f3f3003e699d9af7148742e2d72b024a +SIZE (reportlab-3.6.11.tar.gz) = 4519404 SHA256 (pfbfer-20180109.zip) = 851b431550e866b217317d09dd33b5535ae081200975ad4dd25e80be2af10fec SIZE (pfbfer-20180109.zip) = 737561 diff --git a/print/py-reportlab/files/patch-docs-userguide-genuserguide.py b/print/py-reportlab/files/patch-docs-userguide-genuserguide.py index 9a19f6af7b8d..e94719cf592d 100644 --- a/print/py-reportlab/files/patch-docs-userguide-genuserguide.py +++ b/print/py-reportlab/files/patch-docs-userguide-genuserguide.py @@ -1,12 +1,12 @@ ---- docs/userguide/genuserguide.py.orig 2014-02-14 14:22:37 UTC +--- docs/userguide/genuserguide.py.orig 2022-06-08 08:27:36 UTC +++ docs/userguide/genuserguide.py -@@ -8,7 +8,8 @@ This module contains the script for buil +@@ -8,7 +8,8 @@ def run(pagesize=None, verbose=0, outDir=None): """ def run(pagesize=None, verbose=0, outDir=None): - import sys,os + import sys,os,site + site.addsitedir("%%STAGEDIR%%%%PYTHON_SITELIBDIR%%") - from reportlab.lib.utils import open_and_read, asUnicode + from reportlab.lib.utils import open_and_read cwd = os.getcwd() docsDir=os.path.dirname(os.path.dirname(sys.argv[0]) or cwd) diff --git a/print/py-reportlab/files/patch-setup.py b/print/py-reportlab/files/patch-setup.py index 0da5036eb294..f24e88059088 100644 --- a/print/py-reportlab/files/patch-setup.py +++ b/print/py-reportlab/files/patch-setup.py @@ -1,25 +1,13 @@ ---- setup.py.orig 2018-11-06 07:20:18 UTC +--- setup.py.orig 2022-06-08 08:27:36 UTC +++ setup.py -@@ -288,11 +288,6 @@ reportlab_files= [ - - def url2data(url,returnRaw=False): - import io -- if isPy3: -- import urllib.request as ureq -- else: -- import urllib2 as ureq -- remotehandle = ureq.urlopen(url) - try: - raw = remotehandle.read() - return raw if returnRaw else io.BytesIO(raw) -@@ -308,9 +303,7 @@ def get_fonts(PACKAGE_DIR, reportlab_files): +@@ -443,9 +443,7 @@ def get_fonts(PACKAGE_DIR, reportlab_files): xitmsg = "not downloading T1 font curve files" else: try: - infoline("Downloading standard T1 font curves") - zipdata = url2data("http://www.reportlab.com/ftp/pfbfer-20180109.zip") - archive = zipfile.ZipFile(zipdata) + archive = zipfile.ZipFile("%%DISTDIR%%/%%PFBFER%%") dst = pjoin(rl_dir, 'fonts') for name in archive.namelist():