- Fixes for python 2.4

- Replace WRKSRC with WRKDIST as WRKSRC shouldn't be there
- Bump PKGNAME

textproc/py-HappyDoc/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2005/09/23 19:41:45 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.11 2005/11/22 22:13:23 alek Exp $
 
 COMMENT=	"Python tool for generate Python API documents"
 
 DISTNAME=	HappyDoc_r2_1
-PKGNAME=	py-HappyDoc-2.1
+PKGNAME=	py-HappyDoc-2.1p0
 CATEGORIES=    	textproc
 
 HOMEPAGE=	http://happydoc.sf.net/
@@ -18,6 +18,6 @@ PERMIT_DISTFILES_FTP=	Yes
 MODULES=	lang/python
 
 NO_REGRESS=	Yes
-WRKSRC=		${WRKDIR}/HappyDoc-r2_1
+WRKDIST=	${WRKDIR}/HappyDoc-r2_1
 
 .include <bsd.port.mk>

textproc/py-HappyDoc/patches/patch-happydoclib_docstring_StructuredText_STDOM_py

@@ -0,0 +1,53 @@
+$OpenBSD: patch-happydoclib_docstring_StructuredText_STDOM_py,v 1.1 2005/11/22 22:13:23 alek Exp $
+--- happydoclib/docstring/StructuredText/STDOM.py.orig	Tue Nov 22 22:35:29 2005
++++ happydoclib/docstring/StructuredText/STDOM.py	Tue Nov 22 22:49:18 2005
+@@ -171,7 +171,7 @@ class NodeWrapper(ParentNode):
+                           type=type,
+                           st=type(''),
+                           getattr=getattr,
+-                          None=None):
++                          none=None):
+ 
+       """
+       The node immediately preceding this node.  If
+@@ -182,10 +182,10 @@ class NodeWrapper(ParentNode):
+       if not children:
+          return None
+ 
+-      index=getattr(self, '_DOMIndex', None)
+-      if index is None:
++      index=getattr(self, '_DOMIndex', none)
++      if index is none:
+          index=self._getDOMIndex(children)
+-         if index is None: return None
++         if index is none: return None
+ 
+       index=index-1
+       if index < 0: return None
+@@ -243,7 +243,7 @@ class NodeWrapper(ParentNode):
+                           type=type,
+                           st=type(''),
+                           getattr=getattr,
+-                          None=None):
++                          none=None):
+ 
+       return self.getPreviousSibling(type,st,getattr,None)
+       
+@@ -292,7 +292,7 @@ class Node(ParentNode):
+                           type=type,
+                           st=type(''),
+                           getattr=getattr,
+-                          None=None):
++                          none=None):
+       """
+       The node immediately preceding this node.  If
+       there is no such node, this returns None.
+@@ -346,7 +346,7 @@ class Node(ParentNode):
+                           type=type,
+                           st=type(''),
+                           getattr=getattr,
+-                          None=None):
++                          none=None):
+       
+       return self.getPreviousSibling(type,st,getattr,None)
+       

textproc/py-HappyDoc/patches/patch-srcdocs_HappyDoc-r2_1_happydoclib_docstring_StructuredText_STDOM_NodeWrapper_html

@@ -0,0 +1,28 @@
+$OpenBSD: patch-srcdocs_HappyDoc-r2_1_happydoclib_docstring_StructuredText_STDOM_NodeWrapper_html,v 1.1 2005/11/22 22:13:23 alek Exp $
+--- srcdocs/HappyDoc-r2_1/happydoclib/docstring/StructuredText/STDOM/NodeWrapper.html.orig	Tue Nov 22 22:35:45 2005
++++ srcdocs/HappyDoc-r2_1/happydoclib/docstring/StructuredText/STDOM/NodeWrapper.html	Tue Nov 22 22:49:56 2005
+@@ -336,7 +336,7 @@ _get_PreviousSibling (
+         type=type,
+         st=type( '' ),
+         getattr=getattr,
+-        None=None,
++        none=None,
+         )
+ 
+ </pre></font>
+@@ -459,7 +459,7 @@ getPreviousSibling (
+         type=type,
+         st=type( '' ),
+         getattr=getattr,
+-        None=None,
++        none=None,
+         )
+ 
+ </pre></font>
+@@ -485,4 +485,4 @@ getPreviousSibling (
+         
+         </body>
+         </html>
+-        
+\ No newline at end of file
++        

textproc/py-HappyDoc/patches/patch-srcdocs_HappyDoc-r2_1_happydoclib_docstring_StructuredText_STDOM_Node_html

@@ -0,0 +1,28 @@
+$OpenBSD: patch-srcdocs_HappyDoc-r2_1_happydoclib_docstring_StructuredText_STDOM_Node_html,v 1.1 2005/11/22 22:13:23 alek Exp $
+--- srcdocs/HappyDoc-r2_1/happydoclib/docstring/StructuredText/STDOM/Node.html.orig	Tue Nov 22 22:35:38 2005
++++ srcdocs/HappyDoc-r2_1/happydoclib/docstring/StructuredText/STDOM/Node.html	Tue Nov 22 22:49:29 2005
+@@ -358,7 +358,7 @@ _get_PreviousSibling (
+         type=type,
+         st=type( '' ),
+         getattr=getattr,
+-        None=None,
++        none=None,
+         )
+ 
+ </pre></font>
+@@ -621,7 +621,7 @@ getPreviousSibling (
+         type=type,
+         st=type( '' ),
+         getattr=getattr,
+-        None=None,
++        none=None,
+         )
+ 
+ </pre></font>
+@@ -676,4 +676,4 @@ hasChildNodes ( self )
+         
+         </body>
+         </html>
+-        
+\ No newline at end of file
++