- Update to version 4.1

- Add Windows-centric formats
- Change from using ${PERL} to ${REINPLACE_CMD}
- To ease updates, discontinue the extensive modification of home page

3 files changed, 30 insertions, 15 deletions

diff --git a/lang/diveintopython/Makefile b/lang/diveintopython/Makefile
index e17c68c073b8..f50a18183e1a 100644
--- a/lang/diveintopython/Makefile
+++ b/lang/diveintopython/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	diveintopython
-PORTVERSION=	4.0.2
+PORTVERSION=	4.1
 CATEGORIES=	lang python
 MASTER_SITES=	http://diveintopython.org/download/
 DISTNAME=	${PORTNAME}
@@ -14,6 +14,10 @@ DISTFILES=	${DISTNAME}-html-${VERSIONSTR}${EXTRACT_SUFX} \
 		${DISTNAME}-html-flat-${VERSIONSTR}${EXTRACT_SUFX} \
 		${DISTNAME}-pdf-${VERSIONSTR}${EXTRACT_SUFX} \
 		${DISTNAME}-text-${VERSIONSTR}${EXTRACT_SUFX} \
+		${DISTNAME}-word-${VERSIONSTR}${EXTRACT_SUFX} \
+		${DISTNAME}-help-${VERSIONSTR}${EXTRACT_SUFX} \
+		${DISTNAME}-xml-${VERSIONSTR}${EXTRACT_SUFX} \
+		${DISTNAME}-common-${VERSIONSTR}${EXTRACT_SUFX} \
 		${DISTNAME}-examples-${VERSIONSTR}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}-html-${VERSIONSTR}${EXTRACT_SUFX}
@@ -21,21 +25,17 @@ EXTRACT_ONLY=	${DISTNAME}-html-${VERSIONSTR}${EXTRACT_SUFX}
 MAINTAINER=	wjv@FreeBSD.org
 
 NO_BUILD=	YES
+USE_REINPLACE=	YES
 USE_ZIP=	YES
 WRKSRC=		${WRKDIR}/html
 DIPDLDIR=	${DOCSDIR}/download
 CPIO=		cpio --quiet -pdum -R
-VERSIONSTR=	${PORTVERSION:C|\.([^.]*)$|-\1|}
+VERSIONSTR=	${PORTVERSION:C|(\.[^.]*)\.([^.]*)$|\1-\2|}
 PLIST_SUB+=	VERSION=${VERSIONSTR}
 
 post-patch:
-	@ ${PERL} -pi.orig -e \
-	  's#<div class="selfad"(.(?!</div>))*.</div>##; \
-	   s#<li[^>]*>(.(?!<li[^>]*>))*(Microsoft|Windows)(.(?!</li>))*.</li>##g; \
-	   s#<td>(.(?!<td>))*/(cn/|(es|fr)/[^"]|kr/)(.(?!</td>))*.</td>##g' \
-	   ${WRKSRC}/index.html
-	@ ${PERL} -pi -e \
-	  's#http[^>]*(download/${PORTNAME}-examples-${VERSIONSTR}.zip)#$$1#' \
+	@ ${REINPLACE_CMD} \
+	  "s#http[^>]*\(download/${PORTNAME}-examples-${VERSIONSTR}.zip\)#\1#" \
 	  ${WRKSRC}/*.html
 
 do-install:
@@ -44,7 +44,7 @@ do-install:
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	@ cd ${WRKDIR}/py && find * \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
-.for format in html html-flat pdf text examples
+.for format in html html-flat pdf text word help xml common examples
 	@ ${INSTALL_DATA} \
 	  ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${format}-${VERSIONSTR}.zip \
 	  ${DIPDLDIR}
diff --git a/lang/diveintopython/distinfo b/lang/diveintopython/distinfo
index e5a07e96c889..f1c5b1dfd80d 100644
--- a/lang/diveintopython/distinfo
+++ b/lang/diveintopython/distinfo
@@ -1,5 +1,9 @@
-MD5 (diveintopython/diveintopython-html-4.0-2.zip) = 3b90bb586d8d1abdf946fd79ec4f1de6
-MD5 (diveintopython/diveintopython-html-flat-4.0-2.zip) = 672738303b10cf8580b19ed7c09a9a1e
-MD5 (diveintopython/diveintopython-pdf-4.0-2.zip) = 28a6b9f30e0f55edd287f5900313119d
-MD5 (diveintopython/diveintopython-text-4.0-2.zip) = 7617dcea1d4984ae2d5fc5fa86f8fe02
-MD5 (diveintopython/diveintopython-examples-4.0-2.zip) = e2ebc53793aa13bdd4fd01df90a1f228
+MD5 (diveintopython/diveintopython-html-4.1.zip) = 1a96d9a55384853c7b36dd07eaa3c0da
+MD5 (diveintopython/diveintopython-html-flat-4.1.zip) = 627b7238ab5d8efa4f841bcb5e1b5866
+MD5 (diveintopython/diveintopython-pdf-4.1.zip) = ecfd03cf709ffb2516a0a3d354d43bd1
+MD5 (diveintopython/diveintopython-text-4.1.zip) = 1c3bf2fc4a8fa0a2c56a098b72b2a3df
+MD5 (diveintopython/diveintopython-word-4.1.zip) = b47188ee50af8b00f1b51531d2a5b1e7
+MD5 (diveintopython/diveintopython-help-4.1.zip) = e17b05097ab875f86983df60e33e8290
+MD5 (diveintopython/diveintopython-xml-4.1.zip) = f235e6bd2331122e116ab70aee6bddcd
+MD5 (diveintopython/diveintopython-common-4.1.zip) = 02ea32de3f834aa2ef2ef384263374be
+MD5 (diveintopython/diveintopython-examples-4.1.zip) = 442442beb89d729b8fc156eaafc4d9d9
diff --git a/lang/diveintopython/pkg-plist b/lang/diveintopython/pkg-plist
index 4c5bd122f87d..a7028a897476 100644
--- a/lang/diveintopython/pkg-plist
+++ b/lang/diveintopython/pkg-plist
@@ -22,11 +22,15 @@ share/doc/diveintopython/dialect_re.html
 share/doc/diveintopython/dialect_sgmllib.html
 share/doc/diveintopython/dialect_summary.html
 share/doc/diveintopython/diveintopython.css
+share/doc/diveintopython/download/diveintopython-common-%%VERSION%%.zip
 share/doc/diveintopython/download/diveintopython-examples-%%VERSION%%.zip
+share/doc/diveintopython/download/diveintopython-help-%%VERSION%%.zip
 share/doc/diveintopython/download/diveintopython-html-%%VERSION%%.zip
 share/doc/diveintopython/download/diveintopython-html-flat-%%VERSION%%.zip
 share/doc/diveintopython/download/diveintopython-pdf-%%VERSION%%.zip
 share/doc/diveintopython/download/diveintopython-text-%%VERSION%%.zip
+share/doc/diveintopython/download/diveintopython-word-%%VERSION%%.zip
+share/doc/diveintopython/download/diveintopython-xml-%%VERSION%%.zip
 share/doc/diveintopython/examples.html
 share/doc/diveintopython/fdl.html
 share/doc/diveintopython/fdl_aggregation.html
@@ -77,14 +81,19 @@ share/doc/diveintopython/images/note.png
 share/doc/diveintopython/images/tip.png
 share/doc/diveintopython/images/warning.png
 share/doc/diveintopython/index.html
+share/doc/diveintopython/kgp_alltogether.html
 share/doc/diveintopython/kgp_attributes.html
+share/doc/diveintopython/kgp_cache.html
+share/doc/diveintopython/kgp_child.html
 share/doc/diveintopython/kgp_commandline.html
 share/doc/diveintopython/kgp_divein.html
+share/doc/diveintopython/kgp_handler.html
 share/doc/diveintopython/kgp_openanything.html
 share/doc/diveintopython/kgp_packages.html
 share/doc/diveintopython/kgp_parse.html
 share/doc/diveintopython/kgp_search.html
 share/doc/diveintopython/kgp_stdio.html
+share/doc/diveintopython/kgp_summary.html
 share/doc/diveintopython/kgp_unicode.html
 share/doc/diveintopython/license.html
 share/doc/diveintopython/license_terms.html
@@ -132,6 +141,7 @@ share/examples/diveintopython/BaseHTMLProcessor.py
 share/examples/diveintopython/LICENSE.txt
 share/examples/diveintopython/apihelper.py
 share/examples/diveintopython/apihelpertest.py
+share/examples/diveintopython/argecho.py
 share/examples/diveintopython/autosize.py
 share/examples/diveintopython/builddialectexamples.py
 share/examples/diveintopython/colorize.py
@@ -187,6 +197,7 @@ share/examples/diveintopython/roman/stage8/romantest83.py
 share/examples/diveintopython/roman/stage9/roman9.py
 share/examples/diveintopython/roman/stage9/romantest9.py
 share/examples/diveintopython/romantest.py
+share/examples/diveintopython/uncurly.py
 share/examples/diveintopython/unicode2koi8r.py
 share/examples/diveintopython/urllister.py
 @dirrm share/examples/diveintopython/roman/stage9