Upgrade to version 3.2.1

PR: 27175
Submitted by: MAINTAINER

3 files changed, 21 insertions, 15 deletions

diff --git a/lang/diveintopython/Makefile b/lang/diveintopython/Makefile
index d9e719b9c5e6..eba5b6324fdb 100644
--- a/lang/diveintopython/Makefile
+++ b/lang/diveintopython/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	diveintopython
-PORTVERSION=	3.1.1
+PORTVERSION=	3.2.1
 CATEGORIES=	lang python
 MASTER_SITES=	http://diveintopython.org/download/
 DISTNAME=	${PORTNAME}
@@ -14,7 +14,8 @@ DISTFILES=	${DISTNAME}-html-${VERSIONSTR}.tgz \
 		${DISTNAME}-html-flat-${VERSIONSTR}.tgz \
 		${DISTNAME}-pdf-${VERSIONSTR}.tgz \
 		${DISTNAME}-text-${VERSIONSTR}.tgz \
-		${DISTNAME}-xml-${VERSIONSTR}.tgz
+		${DISTNAME}-xml-${VERSIONSTR}.tgz \
+		${DISTNAME}-examples-${VERSIONSTR}.tgz
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}-html-${VERSIONSTR}.tgz \
 		${DISTNAME}-html-flat-${VERSIONSTR}.tgz \
@@ -38,6 +39,9 @@ post-patch:
 	   s#<tr>(.(?!<tr>))*(Microsoft Word|Windows Help)(.(?!</tr>))*.</tr>##g; \
 	   s#<td>(.(?!<td>))*cn/(.(?!</td>))*.</td>##g' \
 	  ${WRKSRC}/index.html
+	@ ${PERL} -pi.orig -e \
+	  's#http[^>]*(download/${PORTNAME}-examples-${VERSIONSTR}.tgz)#$$1#' \
+	  ${WRKSRC}/odbchelper_divein.html
 
 do-install:
 	@ ${MKDIR} ${DIPDLDIR}
@@ -47,11 +51,10 @@ do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/${format}/${PORTNAME}.${format} \
 	  ${DIPDLDIR}
 .endfor
-.for format in html html-flat pdf text xml
+.for format in html html-flat pdf text xml examples
 	@ ${INSTALL_DATA} \
 	  ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${format}-${VERSIONSTR}.tgz \
 	  ${DIPDLDIR}
 .endfor
-	@ cd ${WRKDIR} && ${TAR} czf ${DIPDLDIR}/examples.tgz py/*
 
 .include <bsd.port.mk>
diff --git a/lang/diveintopython/distinfo b/lang/diveintopython/distinfo
index 731f4bd2d11c..7eb60c0c19c9 100644
--- a/lang/diveintopython/distinfo
+++ b/lang/diveintopython/distinfo
@@ -1,5 +1,6 @@
-MD5 (diveintopython/diveintopython-html-3.1-1.tgz) = 890cf0eb6bee40ccb684c6dd4f0f3fed
-MD5 (diveintopython/diveintopython-html-flat-3.1-1.tgz) = 528f495e346141b8994cc5a44d128309
-MD5 (diveintopython/diveintopython-pdf-3.1-1.tgz) = 1dbe0ce9acf7c43783dffcc78cafce80
-MD5 (diveintopython/diveintopython-text-3.1-1.tgz) = fe67aefdc47b36dc6aedf15fff0c8d0a
-MD5 (diveintopython/diveintopython-xml-3.1-1.tgz) = bb42e4facedcd79df6796a1a4bc3c86d
+MD5 (diveintopython/diveintopython-html-3.2-1.tgz) = 5686f2c7e96596a480b14f6408f5567e
+MD5 (diveintopython/diveintopython-html-flat-3.2-1.tgz) = 500005f3bd900edb69e6488841c97a74
+MD5 (diveintopython/diveintopython-pdf-3.2-1.tgz) = dc2a23540265f62c987aff5cff04c854
+MD5 (diveintopython/diveintopython-text-3.2-1.tgz) = e8739159e1588c125a7e7b2c40c2a41c
+MD5 (diveintopython/diveintopython-xml-3.2-1.tgz) = 8572f5f5035ac4983ad22908150c4c72
+MD5 (diveintopython/diveintopython-examples-3.2-1.tgz) = 23e291fbf6d06dd1dffe2bfa71a4a08d
diff --git a/lang/diveintopython/pkg-plist b/lang/diveintopython/pkg-plist
index 8683d9f6de73..149e848f86f9 100644
--- a/lang/diveintopython/pkg-plist
+++ b/lang/diveintopython/pkg-plist
@@ -10,6 +10,7 @@ share/doc/diveintopython/apihelper_lambda.html
 share/doc/diveintopython/apihelper_optional.html
 share/doc/diveintopython/apihelper_summary.html
 share/doc/diveintopython/chef.html
+share/doc/diveintopython/dialect_alltogether.html
 share/doc/diveintopython/dialect_basehtml.html
 share/doc/diveintopython/dialect_dialectizer.html
 share/doc/diveintopython/dialect_dictsub.html
@@ -17,17 +18,18 @@ share/doc/diveintopython/dialect_divein.html
 share/doc/diveintopython/dialect_extract.html
 share/doc/diveintopython/dialect_locals.html
 share/doc/diveintopython/dialect_quoting.html
+share/doc/diveintopython/dialect_re.html
 share/doc/diveintopython/dialect_sgmllib.html
 share/doc/diveintopython/diveintopython.css
-share/doc/diveintopython/download/diveintopython-html-3.1-1.tgz
-share/doc/diveintopython/download/diveintopython-html-flat-3.1-1.tgz
-share/doc/diveintopython/download/diveintopython-pdf-3.1-1.tgz
-share/doc/diveintopython/download/diveintopython-text-3.1-1.tgz
-share/doc/diveintopython/download/diveintopython-xml-3.1-1.tgz
+share/doc/diveintopython/download/diveintopython-examples-3.2-1.tgz
+share/doc/diveintopython/download/diveintopython-html-3.2-1.tgz
+share/doc/diveintopython/download/diveintopython-html-flat-3.2-1.tgz
+share/doc/diveintopython/download/diveintopython-pdf-3.2-1.tgz
+share/doc/diveintopython/download/diveintopython-text-3.2-1.tgz
+share/doc/diveintopython/download/diveintopython-xml-3.2-1.tgz
 share/doc/diveintopython/download/diveintopython.html
 share/doc/diveintopython/download/diveintopython.pdf
 share/doc/diveintopython/download/diveintopython.txt
-share/doc/diveintopython/download/examples.tgz
 share/doc/diveintopython/examples.html
 share/doc/diveintopython/fdl.html
 share/doc/diveintopython/fdl_aggregation.html