upgrade to 3.0.a1

3 files changed, 14 insertions, 199 deletions

diff --git a/devel/happydoc/Makefile b/devel/happydoc/Makefile
index a95cf1361b7d..26ceb21da7bb 100644
--- a/devel/happydoc/Makefile
+++ b/devel/happydoc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	happydoc
-PORTVERSION=	2.1
+PORTVERSION=	3.0.a1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for extracting documentation from Python source code
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_r/-r/}
+WRKSRC=		${WRKDIR}/HappyDoc3-r${PORTVERSION:S/./_/g}
+NO_BUILD=	yes
+PLIST_FILES=	bin/happydoc
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/happydoc ${PREFIX}/bin
+	@${CP} -R ${WRKSRC}/happydoclib ${PYTHON_SITELIBDIR}
+	@${FIND} ${PYTHON_SITELIBDIR}/happydoclib -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${PYTHON_SITELIBDIR}/happydoclib -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/happydoc/distinfo b/devel/happydoc/distinfo
index aba4438e6190..79b1a0cd254c 100644
--- a/devel/happydoc/distinfo
+++ b/devel/happydoc/distinfo
@@ -1,2 +1,2 @@
-MD5 (HappyDoc_r2_1.tar.gz) = 7791988bb7498d4281636ab5f5852e67
-SIZE (HappyDoc_r2_1.tar.gz) = 523968
+MD5 (HappyDoc_r3_0_a1.tar.gz) = 929d040848025d16a029ad014bfdea80
+SIZE (HappyDoc_r3_0_a1.tar.gz) = 234707
diff --git a/devel/happydoc/pkg-plist b/devel/happydoc/pkg-plist
deleted file mode 100644
index 80073a766dc7..000000000000
--- a/devel/happydoc/pkg-plist
+++ /dev/null
@@ -1,194 +0,0 @@
-bin/happydoc
-%%PYTHON_SITELIBDIR%%/happydoclib/CommandLineApp.py
-%%PYTHON_SITELIBDIR%%/happydoclib/CommandLineApp.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/CommandLineApp.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/StreamFlushTest.py
-%%PYTHON_SITELIBDIR%%/happydoclib/StreamFlushTest.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/StreamFlushTest.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/__init__.py
-%%PYTHON_SITELIBDIR%%/happydoclib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/appclass.py
-%%PYTHON_SITELIBDIR%%/happydoclib/appclass.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/appclass.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/cvsversion.py
-%%PYTHON_SITELIBDIR%%/happydoclib/cvsversion.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/cvsversion.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/__init__.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/__init__.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/__init__.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_Dia.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_Dia.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_Dia.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_MultipleFile.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_MultipleFile.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_MultipleFile.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_SingleFile.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_SingleFile.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_SingleFile.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_Stdout.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_Stdout.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_Stdout.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_mstruct.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_mstruct.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/docset_mstruct.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/mstruct_const.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/mstruct_const.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docset/mstruct_const.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/MML.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/MML.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/MML.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ClassicDocumentClass.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ClassicDocumentClass.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ClassicDocumentClass.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ClassicStructuredText.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ClassicStructuredText.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ClassicStructuredText.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocBookClass.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocBookClass.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocBookClass.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocumentClass.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocumentClass.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocumentClass.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocumentWithImages.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocumentWithImages.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/DocumentWithImages.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/HTMLClass.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/HTMLClass.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/HTMLClass.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/HTMLWithImages.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/HTMLWithImages.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/HTMLWithImages.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ST.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ST.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ST.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/STDOM.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/STDOM.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/STDOM.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/STletters.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/STletters.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/STletters.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/StructuredText.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/StructuredText.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/StructuredText.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/Zwiki.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/Zwiki.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/Zwiki.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/__init__.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/__init__.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/__init__.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ts_regex.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ts_regex.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText/ts_regex.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/__init__.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/__init__.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/__init__.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_ClassicStructuredText.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_ClassicStructuredText.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_ClassicStructuredText.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_PlainText.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_PlainText.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_PlainText.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_RawText.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_RawText.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_RawText.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_StructuredText.py
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_StructuredText.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/docstring/docstring_StructuredText.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/OpenOffice/__init__.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/OpenOffice/__init__.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/OpenOffice/__init__.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/__init__.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/__init__.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/__init__.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/fileformatterbase.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/fileformatterbase.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/fileformatterbase.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_Dia.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_Dia.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_Dia.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_DocBook.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_DocBook.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_DocBook.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_DocBookX.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_DocBookX.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_DocBookX.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_HTMLFile.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_HTMLFile.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_HTMLFile.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_Null.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_Null.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_Null.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_TextFile.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_TextFile.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_TextFile.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_XPyDoc.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_XPyDoc.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/formatter_XPyDoc.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/openoffice.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/openoffice.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/openoffice.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/xmlformatterbase.py
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/xmlformatterbase.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/formatter/xmlformatterbase.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/happydocset.py
-%%PYTHON_SITELIBDIR%%/happydoclib/happydocset.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/happydocset.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/happydocstring.py
-%%PYTHON_SITELIBDIR%%/happydoclib/happydocstring.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/happydocstring.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/happydom.py
-%%PYTHON_SITELIBDIR%%/happydoclib/happydom.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/happydom.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/happyformatter.py
-%%PYTHON_SITELIBDIR%%/happydoclib/happyformatter.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/happyformatter.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/indentstring.py
-%%PYTHON_SITELIBDIR%%/happydoclib/indentstring.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/indentstring.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/optiontools.py
-%%PYTHON_SITELIBDIR%%/happydoclib/optiontools.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/optiontools.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parsecomments.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parsecomments.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parsecomments.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/__init__.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/classinfo.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/classinfo.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/classinfo.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/functioninfo.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/functioninfo.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/functioninfo.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/imports.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/imports.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/imports.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/moduleinfo.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/moduleinfo.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/moduleinfo.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/suite.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/suite.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/suite.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/utils.py
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/utils.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/parseinfo/utils.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/path.py
-%%PYTHON_SITELIBDIR%%/happydoclib/path.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/path.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/pluginloader.py
-%%PYTHON_SITELIBDIR%%/happydoclib/pluginloader.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/pluginloader.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/prettyast.py
-%%PYTHON_SITELIBDIR%%/happydoclib/prettyast.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/prettyast.pyo
-%%PYTHON_SITELIBDIR%%/happydoclib/trace.py
-%%PYTHON_SITELIBDIR%%/happydoclib/trace.pyc
-%%PYTHON_SITELIBDIR%%/happydoclib/trace.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/happydoclib/docset
-@dirrm %%PYTHON_SITELIBDIR%%/happydoclib/docstring/StructuredText
-@dirrm %%PYTHON_SITELIBDIR%%/happydoclib/docstring
-@dirrm %%PYTHON_SITELIBDIR%%/happydoclib/formatter/OpenOffice
-@dirrm %%PYTHON_SITELIBDIR%%/happydoclib/formatter
-@dirrm %%PYTHON_SITELIBDIR%%/happydoclib/parseinfo
-@dirrm %%PYTHON_SITELIBDIR%%/happydoclib