Changes 3.0.33:

* Changed license to Apache License 2.0, now completely Open Source
  without any charging. Feel free to continue or for this project.
* Empty cells now collapse

3 files changed, 33 insertions, 27 deletions

diff --git a/print/py-pisa/Makefile b/print/py-pisa/Makefile
index 2ad5be3d84b..5800dec2636 100644
--- a/print/py-pisa/Makefile
+++ b/print/py-pisa/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 15:30:27 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.7 2011/04/15 09:00:57 adam Exp $
 
-DISTNAME=	pisa-3.0.32
+DISTNAME=	pisa-3.0.33
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	textproc print www python
 MASTER_SITES=	http://pypi.python.org/packages/source/p/pisa/
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.htmltopdf.org/
 COMMENT=	HTML2pdf converter
+LICENSE=	apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,5 +16,12 @@ DEPENDS+=	${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
 DEPENDS+=	${PYPKGPREFIX}-reportlab>=2.2:../../print/py-reportlab
 DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 
+# remove CRs: fixes patching on Darwin and stops pkglint from complaining
+pre-patch:
+.for f in css.py cssDOMElementInterface.py
+	${TR} -d '\r' < ${WRKSRC}/sx/w3c/${f} > ${WRKSRC}/sx/w3c/${f}.new
+	${MV} ${WRKSRC}/sx/w3c/${f}.new ${WRKSRC}/sx/w3c/${f}
+.endfor
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-pisa/distinfo b/print/py-pisa/distinfo
index 6f7b54b957e..1b2d0460420 100644
--- a/print/py-pisa/distinfo
+++ b/print/py-pisa/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2010/02/10 15:30:27 joerg Exp $
+$NetBSD: distinfo,v 1.4 2011/04/15 09:00:57 adam Exp $
 
-SHA1 (pisa-3.0.32.tar.gz) = d46519677af2290d298928b8f03a1436695ff90b
-RMD160 (pisa-3.0.32.tar.gz) = 380b0bcc4d00b3ee27205571383c754dd833ceb9
-Size (pisa-3.0.32.tar.gz) = 4517663 bytes
-SHA1 (patch-aa) = d0fd5bd36c204755c271e00cc72445aa6412f6c8
+SHA1 (pisa-3.0.33.tar.gz) = 3d7e644b96b7c8f98bfd5823a163c3badd662209
+RMD160 (pisa-3.0.33.tar.gz) = 1479865d1f0b14f4a37c74fc8aae7e72e9d0efac
+Size (pisa-3.0.33.tar.gz) = 4500555 bytes
+SHA1 (patch-aa) = 39354cac1592787d43622c04ef776f13b39450ca
diff --git a/print/py-pisa/patches/patch-aa b/print/py-pisa/patches/patch-aa
index aaf3e329ee6..cd7fe165604 100644
--- a/print/py-pisa/patches/patch-aa
+++ b/print/py-pisa/patches/patch-aa
@@ -1,25 +1,25 @@
-$NetBSD: patch-aa,v 1.1 2010/02/10 15:30:27 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2011/04/15 09:00:57 adam Exp $
 
---- sx/w3c/css.py.orig	2010-02-10 16:17:54.000000000 +0100
+--- sx/w3c/css.py.orig	2009-03-18 13:02:36.000000000 +0000
 +++ sx/w3c/css.py
-@@ -37,7 +37,10 @@ Dependencies:

- #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

- 

- import copy

--import sets

+@@ -37,7 +37,10 @@ Dependencies:
+ #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ import copy
+-import sets
 +try:
 +    set
 +except NameError:
 +    from sets import Set as set
- import cssParser

- import cssSpecial

- 

+ import cssParser
+ import cssSpecial
+ 
 @@ -526,7 +529,7 @@ class CSSInlineRuleset(CSSRuleset, CSSDe
- class CSSBuilder(cssParser.CSSBuilderAbstract):

-     RulesetFactory = CSSRuleset

-     SelectorFactory = CSSMutableSelector

--    MediumSetFactory = sets.Set

-+    MediumSetFactory = set

-     DeclarationsFactory = CSSDeclarations

-     TermFunctionFactory = CSSTerminalFunction

-     TermOperatorFactory = CSSTerminalOperator

+ class CSSBuilder(cssParser.CSSBuilderAbstract):
+     RulesetFactory = CSSRuleset
+     SelectorFactory = CSSMutableSelector
+-    MediumSetFactory = sets.Set
++    MediumSetFactory = set
+     DeclarationsFactory = CSSDeclarations
+     TermFunctionFactory = CSSTerminalFunction
+     TermOperatorFactory = CSSTerminalOperator