2 files changed, 29 insertions, 11 deletions

diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index b3ca245a668f..3479a7c4f285 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -30,24 +30,24 @@ DOCFORMAT?=	html
 
 .if ${PYTHON_REL} < 260
 .if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "postscript-a4" && ${DOCFORMAT} != "postscript-letter"
-.BEGIN:
-	@${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
-	@${ECHO} "Possible values are:  html, pdf-a4, pdf-letter,"
-	@${ECHO} "postscript-a4, postscript-letter."
-	@${FALSE}
+IGNORE=	invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: html, pdf-a4, pdf-letter, postscript-a4, postscript-letter
 .endif
 .else # ${PYTHON_REL} >= 260
-.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter"
-.BEGIN:
-	@${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
-	@${ECHO} "Possible values are:  html, pdf-a4, pdf-letter."
-	@${FALSE}
+.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "text"
+IGNORE=	invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: text, html, pdf-a4, pdf-letter
 .endif
 
+.if ${PYTHON_REL} < 260
 DISTNAME=	python-docs-${DOCFORMAT}
+.else
+DISTNAME=	python-${PORTVERSION}-docs-${DOCFORMAT}
+.endif
 DIST_SUBDIR=	python${PYTHON_REL}
+
 .if ${DOCFORMAT} == "html"
 WRKSRC=		${WRKDIR}/${DISTNAME}
+.elif ${DOCFORMAT} == "text"
+WRKSRC=		${WRKDIR}/${DISTNAME}
 .else
 WRKSRC=		${WRKDIR}/docs-pdf
 .endif # ${DOCSFORMAT} == "html"
@@ -64,6 +64,6 @@ pre-install:
 
 do-install:
 	@${MKDIR} ${DOCDIR}
-	@${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${DOCDIR} -xf - 
+	@${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${DOCDIR} -xf -
 
 .include <bsd.port.post.mk>
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index c3130e2004c5..131598080ca1 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -117,9 +117,15 @@ MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf
 MD5 (python260/python-docs-html.tar.bz2) = cfcd4b9b00ba1e7496b5d823692370a4
 MD5 (python260/python-docs-pdf-a4.tar.bz2) = d5e1fd4e178887d2b42a619da15bfcbd
 MD5 (python260/python-docs-pdf-letter.tar.bz2) = 7b7ee0c4fe014eaa14862a1a4c71701e
+MD5 (python260/python-docs-text.tar.bz2) = e2d4dea9a16b150327f5e80413dbc41e
 MD5 (python261/python-docs-html.tar.bz2) = 269233817c4275f32c4163fa5883514b
 MD5 (python261/python-docs-pdf-a4.tar.bz2) = 7b5359211bf6fc986b0b6ed42c8a15e5
 MD5 (python261/python-docs-pdf-letter.tar.bz2) = 3519a319ab0b14df186991ac101b246c
+MD5 (python261/python-docs-text.tar.bz2) = 0786ef8140a2a0f4a22aef2fa7e53ad1
+MD5 (python262/python-2.6.2-docs-html.tar.bz2) = 15a2dac727692e4ff8fe92958d4e633c
+MD5 (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = 42a2cccfea5b8623ddd210a95fa5f6fa
+MD5 (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = b3b522bbd2d5c3330814fabc66c76f75
+MD5 (python262/python-2.6.2-docs-text.tar.bz2) = 86630b32c2df6af25d9cb03678e2d8d1
 SHA256 (python/html-2.0.1.tar.bz2) = d42308dda686cc3a27f11d93bdb05c400f4754f51c8e9734435a3b600ea0689e
 SHA256 (python/html-2.0.tar.bz2) = 0462f3ba3cea3867be268232e974e2de3b641a6408045ee7bfe94b790c973e1b
 SHA256 (python/html-2.1.1.tar.bz2) = 4694db0306f86b76a1a9fd92c20abf896950c3334e6ca736bb37e6cdb624fb96
@@ -239,9 +245,15 @@ SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d4
 SHA256 (python260/python-docs-html.tar.bz2) = e9c39e51fc19c6ec367f41cd47c0831bc1e4f4c6d615dccfd37337cd7843ae0a
 SHA256 (python260/python-docs-pdf-a4.tar.bz2) = efddc99e33933c6ca898551db9252592fd0a3f18904f53a5b0c0d41d4de393a4
 SHA256 (python260/python-docs-pdf-letter.tar.bz2) = a3bc9b18b2a77fdd73c2779632324e6c83e5c56472dfd80ba60714073b963887
+SHA256 (python260/python-docs-text.tar.bz2) = 72607230bbb1e4cabb171a469031abcc8251384324d22e1c077008505f77983b
 SHA256 (python261/python-docs-html.tar.bz2) = 941015c02b15a9e94f228f4c9df745a00295d6a3e05362ed4b39f45f771756bc
 SHA256 (python261/python-docs-pdf-a4.tar.bz2) = dc7c505509a26e03f276b8b5602fe488a37a02529ccc1cc75305fc611934883d
 SHA256 (python261/python-docs-pdf-letter.tar.bz2) = f61492f6064efadc06c1fcbb2e8c96036fc6c41d892720bc40b28d1bf271eb19
+SHA256 (python261/python-docs-text.tar.bz2) = ada6830413c1aca87d6c1b87c1aa2704f80b49b5ebfe28a499ec84ec661ea4f7
+SHA256 (python262/python-2.6.2-docs-html.tar.bz2) = 63f844a24155536eaeb2cede72bba5a4b4a404d790e52e210e374360840817aa
+SHA256 (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = a40d6ffb0ffbe9f3ace1d28559a96beb19218f2e5fa366c66dd42520b18bdc27
+SHA256 (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 20409bd1e33930be17b1a0d7fb5e098641be10c252b68bcac3205efa5aa21ef2
+SHA256 (python262/python-2.6.2-docs-text.tar.bz2) = f7d8c6aaece010bfaf374322cc782816fffe232f7fb440f34f585adfd6e94b04
 SIZE (python/html-2.0.1.tar.bz2) = 704567
 SIZE (python/html-2.0.tar.bz2) = 699404
 SIZE (python/html-2.1.1.tar.bz2) = 792096
@@ -360,6 +372,12 @@ SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655
 SIZE (python260/python-docs-html.tar.bz2) = 3445776
 SIZE (python260/python-docs-pdf-a4.tar.bz2) = 8804548
 SIZE (python260/python-docs-pdf-letter.tar.bz2) = 8847332
+SIZE (python260/python-docs-text.tar.bz2) = 1212751
 SIZE (python261/python-docs-html.tar.bz2) = 3669921
 SIZE (python261/python-docs-pdf-a4.tar.bz2) = 8599690
 SIZE (python261/python-docs-pdf-letter.tar.bz2) = 8644103
+SIZE (python261/python-docs-text.tar.bz2) = 1275822
+SIZE (python262/python-2.6.2-docs-html.tar.bz2) = 3660453
+SIZE (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = 8589380
+SIZE (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 8626189
+SIZE (python262/python-2.6.2-docs-text.tar.bz2) = 1297095