Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Feb 2014 12:44:10 +0000 (UTC)
From:      TAKATSU Tomonari <tota@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345987 - in head: biology/py-biopython deskutils/gourmet deskutils/griffith games/pythonsudoku misc/pdfmap print print/py-reportlab print/py-reportlab/files print/py-reportlab1 print/p...
Message-ID:  <201402251244.s1PCiAGn004740@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tota
Date: Tue Feb 25 12:44:10 2014
New Revision: 345987
URL: http://svnweb.freebsd.org/changeset/ports/345987
QAT: https://qat.redports.org/buildarchive/r345987/

Log:
  - Repocopy print/py-reportlab to print/py-reportlab1
    to preserve version 1.x and to update to 3.0
  
    print/py-reportlab:
      - Update print/py-reportlab to 3.0 based on print/py-reportlab2
      - Support STAGEDIR
      - Use PYDISTUTILS_AUTOPLIST
        * Remove pkg-plist, accordingly
      - Set CONFLICTS
      - Add PORTSCOUT
      - Replace tab with a single space after WWW: in pkg-descr
  
    print/py-reportlab1:
      - Support STAGEDIR
      - Add PKGNAMESUFFIX not to duplicate ports with the same name
      - Set CONFLICTS
      - Use PYDISTUTILS_AUTOPLIST
        * Remove pkg-plist, accordingly
      - Make use of PORTDOCS
      - Set OPTIONS_DEFINE explicitly
      - Fix include statement
      - Make docs unconditional to stage
      - Replace tab with a single space after WWW: in pkg-descr
  
    print/py-reportlab2:
      - Update CONFLICTS
      - Set PORTSCOUT
  
    dependent ports:
      - Switch dependency from print/py-reportlab to print/py-reportlab1
        * biology/py-biopython
        * deskutils/gourmet
        * deskutils/griffith
        * games/pythonsudoku
        * misc/pdfmap
        * print/py-trml2pdf
        * www/py-satchmo
  
  PR:		ports/186970
  Submitted by:	tota (myself)
  Approved by:	Muhammad Moinur Rahman (maintainer)

Added:
  head/print/py-reportlab/files/patch-docs-genAll.py   (contents, props changed)
  head/print/py-reportlab/files/patch-docs-userguide-genuserguide.py   (contents, props changed)
  head/print/py-reportlab1/
     - copied from r345570, head/print/py-reportlab/
Deleted:
  head/print/py-reportlab/files/patch-rl_config.py
  head/print/py-reportlab/pkg-message
  head/print/py-reportlab/pkg-plist
  head/print/py-reportlab1/pkg-plist
Modified:
  head/biology/py-biopython/Makefile
  head/deskutils/gourmet/Makefile
  head/deskutils/griffith/Makefile
  head/games/pythonsudoku/Makefile
  head/misc/pdfmap/Makefile
  head/print/Makefile
  head/print/py-reportlab/Makefile
  head/print/py-reportlab/distinfo
  head/print/py-reportlab/files/patch-setup.py
  head/print/py-reportlab/pkg-descr
  head/print/py-reportlab1/Makefile
  head/print/py-reportlab1/pkg-descr
  head/print/py-reportlab2/Makefile
  head/print/py-trml2pdf/Makefile
  head/www/py-satchmo/Makefile

Modified: head/biology/py-biopython/Makefile
==============================================================================
--- head/biology/py-biopython/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/biology/py-biopython/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -3,7 +3,7 @@
 
 PORTNAME=	biopython
 PORTVERSION=	1.60
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology python
 MASTER_SITES=	http://www.biopython.org/DIST/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ USE_PYDISTUTILS=	easy_install
 PYEASYINSTALL_ARCHDEP=	yes
 
 .if !defined(WITHOUT_REPORTLAB)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab>0:${PORTSDIR}/print/py-reportlab
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab1>0:${PORTSDIR}/print/py-reportlab1
 .endif
 
 NO_STAGE=	yes

Modified: head/deskutils/gourmet/Makefile
==============================================================================
--- head/deskutils/gourmet/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/deskutils/gourmet/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gourmet
 PORTVERSION=	0.16.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	https://launchpadlibrarian.net/133161899/
 
@@ -17,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_PKGNAMEPREFIX}poppler>=0:${PORTSDIR}/graphics/py-poppler \
 		${PYTHON_PKGNAMEPREFIX}rtf>=0:${PORTSDIR}/print/py-rtf \
-		${PYTHON_PKGNAMEPREFIX}reportlab>=0:${PORTSDIR}/print/py-reportlab \
+		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1 \
 		${PYTHON_PKGNAMEPREFIX}elib.intl>0:${PORTSDIR}/textproc/py-elib.intl
 
 MAN1=		gourmet.1

Modified: head/deskutils/griffith/Makefile
==============================================================================
--- head/deskutils/griffith/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/deskutils/griffith/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -3,6 +3,7 @@
 
 PORTNAME=	griffith
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpadlibrarian.net/87859599/
 
@@ -43,7 +44,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxm
 .if ${PORT_OPTIONS:MREPORTLAB2}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab2>=2:${PORTSDIR}/print/py-reportlab2
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab>=1.19:${PORTSDIR}/print/py-reportlab
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:${PORTSDIR}/print/py-reportlab1
 .endif
 
 .if ${PORT_OPTIONS:MCHARDET}

Modified: head/games/pythonsudoku/Makefile
==============================================================================
--- head/games/pythonsudoku/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/games/pythonsudoku/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pythonsudoku
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/Python%20Sudoku/${PORTVERSION}/ \
 		SF/nemysisfreebsdp/games/:icons
@@ -19,7 +20,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
 RUN_DEPENDS=	${PYGAME} \
 		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
-		${PYTHON_PKGNAMEPREFIX}reportlab>=0:${PORTSDIR}/print/py-reportlab
+		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1
 
 USE_BZIP2=	yes
 USES=		desktop-file-utils

Modified: head/misc/pdfmap/Makefile
==============================================================================
--- head/misc/pdfmap/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/misc/pdfmap/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdfmap
 PORTVERSION=	2.00
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -12,7 +12,7 @@ COMMENT=	Generate maps in PDF format and
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaxml>=3.01:${PORTSDIR}/textproc/py-jaxml \
 		${PYTHON_SITELIBDIR}/PIL/Image.py:${PORTSDIR}/graphics/py-imaging
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/pdfgen/canvas.py:${PORTSDIR}/print/py-reportlab \
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/pdfgen/canvas.py:${PORTSDIR}/print/py-reportlab1 \
 		${PYTHON_SITELIBDIR}/PIL/Image.py:${PORTSDIR}/graphics/py-imaging
 
 USE_PYTHON=	yes

Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/print/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -253,6 +253,7 @@
     SUBDIR += py-pyscript
     SUBDIR += py-relatorio
     SUBDIR += py-reportlab
+    SUBDIR += py-reportlab1
     SUBDIR += py-reportlab2
     SUBDIR += py-rtf
     SUBDIR += py-trml2pdf

Modified: head/print/py-reportlab/Makefile
==============================================================================
--- head/print/py-reportlab/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/print/py-reportlab/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -2,48 +2,75 @@
 # $FreeBSD$
 
 PORTNAME=	reportlab
-PORTVERSION=	1.21.2
-PORTREVISION=	3
+PORTVERSION=	3.0
 CATEGORIES=	print python
-MASTER_SITES=	http://www.reportlab.com/ftp/ \
-		${MASTER_SITE_LOCAL:S/$/:accel/} \
-		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/:accel
-MASTER_SITE_SUBDIR=	erwin/:accel
+MASTER_SITES=	CHEESESHOP \
+		http://www.reportlab.com/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	reportlab-${PORTVERSION}.tar.gz \
-		rl_accel-3004.tgz:accel
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${PFBFER}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Library to create PDF documents using the Python language
 
-PORTSCOUT=	ignore:1	# Last version of 1.X branch
+LICENSE=	BSD
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	Reportlab
+PYDISTUTILS_AUTOPLIST=	yes
+
+CONFLICTS=	py*-reportlab[^3]-[^3].* \
+		py*-reportlab-[^3].*
+
+PORTSCOUT=	limit:^3\.0\.
+
+PFBFER_VERSION=	20070710
+PFBFER=	pfbfer-${PFBFER_VERSION}.zip
 
-WRKSRC=		${WRKDIR}/reportlab_${PORTVERSION:S/./_/g}/reportlab
 MAKE_ENV=	PACKAGE_PATH="${REPORTLABDIR}"
 
 REPORTLABDIR=	${PYTHONPREFIX_SITELIBDIR}/reportlab
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-DOCS=	RML_UserGuide.pdf RML_UserGuide_1_0.pdf diagradoc.pdf graphguide.pdf \
-	graphics_reference.pdf reference.pdf userguide.pdf
+DOCS=		reportlab-userguide.pdf
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/rl_config.py
-	@${REINPLACE_CMD} -e 's#with#with26#g' ${WRKSRC}/lib/PyFontify.py
+OPTIONS_DEFINE=	CJK FREETYPE DOCS
+OPTIONS_DEFAULT=	CJK FREETYPE
+CJK_DESC=	Adobe CMaps
+
+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "sparc64"
+BROKEN=	Does not install on sparc64
+.endif
+
+.if ${PORT_OPTIONS:MCJK}
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:${PORTSDIR}/print/adobe-cmaps
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%DISTDIR%%|${DISTDIR}|' \
+			  -e 's|%%PFBFER%%|${PFBFER}|' \
+				${WRKSRC}/setup.py
+.if ${PORT_OPTIONS:MDOCS}
+.for f in genAll.py userguide/genuserguide.py
+	@${REINPLACE_CMD} -e 's|%%STAGEDIR%%|${STAGEDIR}|' \
+			  -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' \
+				${WRKSRC}/docs/${f}
+.endfor
+.endif
+
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@cd ${WRKSRC}/docs && ${PYTHON_CMD} genAll.py
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
-	${CP} ${WRKSRC}/docs/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Modified: head/print/py-reportlab/distinfo
==============================================================================
--- head/print/py-reportlab/distinfo	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/print/py-reportlab/distinfo	Tue Feb 25 12:44:10 2014	(r345987)
@@ -1,4 +1,4 @@
-SHA256 (reportlab-1.21.2.tar.gz) = dbefc02b43ee72484f95b82b21c0a8fe874d7facc9f5fbcacdde82c2b15b5d30
-SIZE (reportlab-1.21.2.tar.gz) = 3464482
-SHA256 (rl_accel-3004.tgz) = a2ac1b7dbf5f37e98c5f5a80cd364fa682d830561a9694328460430a04baf20d
-SIZE (rl_accel-3004.tgz) = 58569
+SHA256 (reportlab-3.0.tar.gz) = a8a75186a9f2cc219c9fee5ec52ae4e18084783906b6345109770ff933bed86f
+SIZE (reportlab-3.0.tar.gz) = 1936012
+SHA256 (pfbfer-20070710.zip) = fb1462ff6ce8efae58a0c496f0537c5ac16d4895c68f1640c2973db574ddb376
+SIZE (pfbfer-20070710.zip) = 677333

Added: head/print/py-reportlab/files/patch-docs-genAll.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/py-reportlab/files/patch-docs-genAll.py	Tue Feb 25 12:44:10 2014	(r345987)
@@ -0,0 +1,11 @@
+--- docs/genAll.py.orig	2014-02-14 23:22:37.000000000 +0900
++++ docs/genAll.py	2014-02-16 16:20:21.000000000 +0900
+@@ -1,6 +1,7 @@
+ #!/bin/env python
+-import os, sys, traceback
++import os, sys, traceback, site
+ def _genAll(verbose=1):
++    site.addsitedir("%%STAGEDIR%%%%PYTHON_SITELIBDIR%%")
+     from reportlab.lib.testutils import setOutDir
+     setOutDir(__name__)
+     from reportlab.lib.testutils import testsFolder

Added: head/print/py-reportlab/files/patch-docs-userguide-genuserguide.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/py-reportlab/files/patch-docs-userguide-genuserguide.py	Tue Feb 25 12:44:10 2014	(r345987)
@@ -0,0 +1,12 @@
+--- docs/userguide/genuserguide.py.orig	2014-02-14 23:22:37.000000000 +0900
++++ docs/userguide/genuserguide.py	2014-02-16 16:15:05.000000000 +0900
+@@ -8,7 +8,8 @@
+ """
+ 
+ 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
+     cwd = os.getcwd()
+     docsDir=os.path.dirname(os.path.dirname(sys.argv[0]) or cwd)

Modified: head/print/py-reportlab/files/patch-setup.py
==============================================================================
--- head/print/py-reportlab/files/patch-setup.py	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/print/py-reportlab/files/patch-setup.py	Tue Feb 25 12:44:10 2014	(r345987)
@@ -1,11 +1,29 @@
---- setup.py.orig	Fri Nov 26 00:12:20 2004
-+++ setup.py	Mon Mar 21 03:26:45 2005
-@@ -19,7 +19,7 @@
- isfile = os.path.isfile
- isdir = os.path.isfile
- dirname = os.path.dirname
--package_path = pjoin(package_home(distutils.__dict__), 'site-packages', 'reportlab')
-+package_path = os.environ['PACKAGE_PATH']
+--- setup.py.orig	2014-02-14 23:22:37.000000000 +0900
++++ setup.py	2014-02-16 00:48:02.000000000 +0900
+@@ -241,11 +241,7 @@
+         ]
  
- def get_version():
-     #determine Version
+ def get_fonts(PACKAGE_DIR, reportlab_files):
+-    import sys, os, os.path, zipfile, io
+-    if isPy3:
+-        import urllib.request as ureq
+-    else:
+-        import urllib2 as ureq
++    import sys, os, os.path, zipfile
+     rl_dir = PACKAGE_DIR['reportlab']
+     if not [x for x in reportlab_files if not os.path.isfile(pjoin(rl_dir,x))]:
+         infoline("Standard T1 font curves already downloaded")
+@@ -254,12 +250,7 @@
+         infoline('not downloading T1 font curve files')
+         return
+     try:
+-        infoline("Downloading standard T1 font curves")
+-
+-        remotehandle = ureq.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
+-        zipdata = io.BytesIO(remotehandle.read())
+-        remotehandle.close()
+-        archive = zipfile.ZipFile(zipdata)
++        archive = zipfile.ZipFile("%%DISTDIR%%/%%PFBFER%%")
+         dst = pjoin(rl_dir, 'fonts')
+ 
+         for name in archive.namelist():

Modified: head/print/py-reportlab/pkg-descr
==============================================================================
--- head/print/py-reportlab/pkg-descr	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/print/py-reportlab/pkg-descr	Tue Feb 25 12:44:10 2014	(r345987)
@@ -19,4 +19,4 @@ following contexts:
   scientific papers
 - Going from XML to PDF in one step!
 
-WWW:	http://www.reportlab.org/rl_toolkit.html
+WWW: http://www.reportlab.org/rl_toolkit.html

Modified: head/print/py-reportlab1/Makefile
==============================================================================
--- head/print/py-reportlab/Makefile	Sat Feb 22 06:28:32 2014	(r345570)
+++ head/print/py-reportlab1/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -10,40 +10,42 @@ MASTER_SITES=	http://www.reportlab.com/f
 		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/:accel
 MASTER_SITE_SUBDIR=	erwin/:accel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	1
 DISTFILES=	reportlab-${PORTVERSION}.tar.gz \
 		rl_accel-3004.tgz:accel
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Library to create PDF documents using the Python language
 
+CONFLICTS=	py*-reportlab[^1]-[^1].* \
+		py*-reportlab-[^1].*
+
 PORTSCOUT=	ignore:1	# Last version of 1.X branch
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	Reportlab
 
 WRKSRC=		${WRKDIR}/reportlab_${PORTVERSION:S/./_/g}/reportlab
 MAKE_ENV=	PACKAGE_PATH="${REPORTLABDIR}"
 
 REPORTLABDIR=	${PYTHONPREFIX_SITELIBDIR}/reportlab
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-DOCS=	RML_UserGuide.pdf RML_UserGuide_1_0.pdf diagradoc.pdf graphguide.pdf \
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PORTDOCS=	RML_UserGuide.pdf RML_UserGuide_1_0.pdf diagradoc.pdf graphguide.pdf \
 	graphics_reference.pdf reference.pdf userguide.pdf
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/rl_config.py
 	@${REINPLACE_CMD} -e 's#with#with26#g' ${WRKSRC}/lib/PyFontify.py
 
-.include <bsd.port.pre.mk>
-
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	${CP} ${WRKSRC}/docs/${i} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	${CP} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/print/py-reportlab1/pkg-descr
==============================================================================
--- head/print/py-reportlab/pkg-descr	Sat Feb 22 06:28:32 2014	(r345570)
+++ head/print/py-reportlab1/pkg-descr	Tue Feb 25 12:44:10 2014	(r345987)
@@ -19,4 +19,4 @@ following contexts:
   scientific papers
 - Going from XML to PDF in one step!
 
-WWW:	http://www.reportlab.org/rl_toolkit.html
+WWW: http://www.reportlab.org/rl_toolkit.html

Modified: head/print/py-reportlab2/Makefile
==============================================================================
--- head/print/py-reportlab2/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/print/py-reportlab2/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -22,7 +22,10 @@ CJK_DESC=	Adobe CMaps
 
 WRKSRC=		${WRKDIR}/reportlab-${PORTVERSION}
 
-CONFLICTS=	py2[0-9]-reportlab-[0-9]*
+CONFLICTS=	py*-reportlab[^2]-[^2].* \
+		py*-reportlab-[^2].*
+
+PORTSCOUT=	limit:^2\.
 
 PFBFER_VERSION=	20070710
 

Modified: head/print/py-trml2pdf/Makefile
==============================================================================
--- head/print/py-trml2pdf/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/print/py-trml2pdf/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -3,7 +3,7 @@
 
 PORTNAME=	trml2pdf
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print python
 MASTER_SITES=	SF/kraft/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ MAINTAINER=	ports@caomhin.org
 COMMENT=	Tiny RML2PDF easily creates PDF documents.
 
 RUN_DEPENDS=	${LOCALBASE}/bin/pildriver.py:${PORTSDIR}/graphics/py-imaging \
-		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab
+		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1
 
 NO_BUILD=	yes
 

Modified: head/www/py-satchmo/Makefile
==============================================================================
--- head/www/py-satchmo/Makefile	Tue Feb 25 12:41:48 2014	(r345986)
+++ head/www/py-satchmo/Makefile	Tue Feb 25 12:44:10 2014	(r345987)
@@ -3,6 +3,7 @@
 
 PORTNAME=	satchmo
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://www.caomhin.org/ports/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE=	BSD
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.2.3:${PORTSDIR}/www/py-django \
 				${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
-				${PYTHON_PKGNAMEPREFIX}reportlab>=0:${PORTSDIR}/print/py-reportlab \
+				${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1 \
 				${PYTHON_PKGNAMEPREFIX}trml2pdf>=0:${PORTSDIR}/print/py-trml2pdf \
 				${PYTHON_PKGNAMEPREFIX}django-registration>=0.8:${PORTSDIR}/www/py-django-registration \
 				${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \



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