5 files changed, 126 insertions, 38 deletions

diff --git a/print/py-reportlab2/Makefile b/print/py-reportlab2/Makefile
index 91affc7d9ceb..404e2dac7a6d 100644
--- a/print/py-reportlab2/Makefile
+++ b/print/py-reportlab2/Makefile
@@ -6,22 +6,28 @@
 #
 
 PORTNAME=	reportlab2
-PORTVERSION=	2.4
-PORTREVISION=	1
+PORTVERSION=	2.5
 CATEGORIES=	print python
-MASTER_SITES=	http://www.reportlab.com/ftp/ \
-		ftp://ftp.reportlab.org/
+MASTER_SITES=	http://www.reportlab.com/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	ReportLab_${PORTVERSION:S/./_/}
+DISTFILES=	reportlab-${PORTVERSION}${EXTRACT_SUFX} pfbfer-${PFBFER_VERSION}.zip
+EXTRACT_ONLY=	reportlab-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	lwhsu@FreeBSD.org
+MAINTAINER=	buganini@gmail.com
 COMMENT=	Library to create PDF documents using the Python language
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging
+LICENSE=	BSD
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging
+
+OPTIONS=	CJK "Adobe CMaps" on \
+		FREETYPE "FreeType" on
+
+WRKSRC=		${WRKDIR}/reportlab-${PORTVERSION}
 
 CONFLICTS=	py2[0-9]-reportlab-[0-9]*
 
-BROKEN=		does not package
+PFBFER_VERSION=	20070710
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
@@ -35,10 +41,22 @@ DOCS=		reportlab-graphics-reference.pdf \
 		reportlab-reference.pdf \
 		reportlab-userguide.pdf
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/ports/distfiles|${DISTDIR}|g' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's|pfbfer.zip|pfbfer-${PFBFER_VERSION}.zip|g' ${WRKSRC}/setup.py
 
+.include <bsd.port.pre.mk>
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not install on sparc64
+
+.endif
+
+.if !defined(WITHOUT_CJK)
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
+.endif
+
+.if !defined(WITHOUT_FREETYPE)
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .endif
 
 post-install:
@@ -49,6 +67,5 @@ post-install:
 	${CP} ${WRKSRC}/docs/${i} ${DOCSDIR}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/print/py-reportlab2/distinfo b/print/py-reportlab2/distinfo
index ddef711f21d1..4c0c7df1ef37 100644
--- a/print/py-reportlab2/distinfo
+++ b/print/py-reportlab2/distinfo
@@ -1,2 +1,4 @@
-SHA256 (ReportLab_2_4.tar.gz) = e82a4ff45e405b6cf8ed607ea87203b3ceb22aaa8b6f2298ceb40bde2304741d
-SIZE (ReportLab_2_4.tar.gz) = 1884175
+SHA256 (reportlab-2.5.tar.gz) = 805152084cc8421104a5e1e705482a1034598ecb4c266670dfba31996de6ff69
+SIZE (reportlab-2.5.tar.gz) = 1917306
+SHA256 (pfbfer-20070710.zip) = fb1462ff6ce8efae58a0c496f0537c5ac16d4895c68f1640c2973db574ddb376
+SIZE (pfbfer-20070710.zip) = 677333
diff --git a/print/py-reportlab2/files/patch-setup.py b/print/py-reportlab2/files/patch-setup.py
new file mode 100644
index 000000000000..c2cc67b55d9c
--- /dev/null
+++ b/print/py-reportlab2/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2011-08-05 17:12:44.000000000 +0800
++++ setup.py	2011-08-05 17:13:39.000000000 +0800
+@@ -224,7 +224,7 @@
+     try:
+         infoline("Downloading standard T1 font curves")
+ 
+-        remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip")
++        remotehandle = open("/usr/ports/distfiles/pfbfer.zip")
+         zipdata = StringIO.StringIO(remotehandle.read())
+         remotehandle.close()
+         archive = zipfile.ZipFile(zipdata)
diff --git a/print/py-reportlab2/pkg-message b/print/py-reportlab2/pkg-message
deleted file mode 100644
index bfe4eb36d62f..000000000000
--- a/print/py-reportlab2/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-=======================================================
- You may need to install print/adobe-cmaps port to use
- East Asian languages.
-=======================================================
diff --git a/print/py-reportlab2/pkg-plist b/print/py-reportlab2/pkg-plist
index 7ac22b2d5ce7..2a37d09f8939 100644
--- a/print/py-reportlab2/pkg-plist
+++ b/print/py-reportlab2/pkg-plist
@@ -1,6 +1,5 @@
-%%PYTHON_SITELIBDIR%%/_rl_accel.so
 %%PYTHON_SITELIBDIR%%/_renderPM.so
-%%PYTHON_SITELIBDIR%%/sgmlop.so
+%%PYTHON_SITELIBDIR%%/_rl_accel.so
 %%PYTHON_SITELIBDIR%%/pyHnj.so
 %%PYTHON_SITELIBDIR%%/reportlab/__init__.py
 %%PYTHON_SITELIBDIR%%/reportlab/__init__.pyc
@@ -16,23 +15,19 @@
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/VeraBI.ttf
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/VeraBd.ttf
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/VeraIt.ttf
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/bitstream-vera-license.txt
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/_abi____.pfb
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/_a______.pfb
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/_ab_____.pfb
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/_abi____.pfb
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/_ai_____.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/_a______.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/cobo____.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/cob_____.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/com_____.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/coo_____.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/_ebi____.pfb
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/_eb_____.pfb
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/_ebi____.pfb
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/_ei_____.pfb
 %%PYTHON_SITELIBDIR%%/reportlab/fonts/_er_____.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/Sy______.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/Zd______.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/Zx______.pfb
-%%PYTHON_SITELIBDIR%%/reportlab/fonts/Zy______.pfb
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/bitstream-vera-license.txt
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/cob_____.pfb
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/cobo____.pfb
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/com_____.pfb
+%%PYTHON_SITELIBDIR%%/reportlab/fonts/coo_____.pfb
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/__init__.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/__init__.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/__init__.pyo
@@ -60,6 +55,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/lto.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/lto.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/lto.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/qr.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/qr.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/qr.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/test.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/test.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode/test.pyo
@@ -331,6 +329,69 @@
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata.py
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_macexpert.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_macexpert.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_macexpert.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_macroman.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_macroman.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_macroman.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_pdfdoc.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_pdfdoc.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_pdfdoc.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_standard.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_standard.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_standard.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_symbol.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_symbol.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_symbol.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_winansi.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_winansi.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_winansi.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_zapfdingbats.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_zapfdingbats.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_enc_zapfdingbats.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courier.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courier.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courier.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courierbold.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courierbold.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courierbold.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courierboldoblique.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courierboldoblique.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courierboldoblique.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courieroblique.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courieroblique.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_courieroblique.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helvetica.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helvetica.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helvetica.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticabold.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticabold.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticabold.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticaboldoblique.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticaboldoblique.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticaboldoblique.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticaoblique.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticaoblique.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_helveticaoblique.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_symbol.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_symbol.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_symbol.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesbold.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesbold.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesbold.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesbolditalic.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesbolditalic.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesbolditalic.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesitalic.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesitalic.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesitalic.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesroman.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesroman.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_timesroman.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_zapfdingbats.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_zapfdingbats.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/_fontdata_widths_zapfdingbats.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/cidfonts.py
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/cidfonts.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/cidfonts.pyo
@@ -412,16 +473,17 @@
 %%PYTHON_SITELIBDIR%%/reportlab/rl_config.py
 %%PYTHON_SITELIBDIR%%/reportlab/rl_config.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/rl_config.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/fonts
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/samples
+%%PYTHON_SITELIBDIR%%/sgmlop.so
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/platypus
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/pdfgen
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/pdfbase
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/lib
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/samples
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/barcode
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/lib
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/pdfbase
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/pdfgen
-@dirrm %%PYTHON_SITELIBDIR%%/reportlab/platypus
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/fonts
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab
 %%PORTDOCS%%%%DOCSDIR%%/reportlab-graphics-reference.pdf
 %%PORTDOCS%%%%DOCSDIR%%/reportlab-reference.pdf