Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 May 2002 23:45:26 -0400
From:      Alan E <alane@geeksrus.net>
To:        FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org
Cc:        Alan Eldridge <ports@geeksrus.net>
Subject:   Re: ports/37974: lang/diveintopython: update to 4.0.2, leave download files on web site
Message-ID:  <20020512034526.GA53731@wwweasel.geeksrus.net>
In-Reply-To: <200205120330.g4C3U2V01395@freefall.freebsd.org>
References:  <200205120329.g4C3T7fU052668@wwweasel.geeksrus.net> <200205120330.g4C3U2V01395@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Oops. I screwed that up. We have to muck with the HTML a bit to leave
the other formats on the web site.

This patch supercedes the original one:

==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
Index: lang/diveintopython/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/diveintopython/Makefile,v
retrieving revision 1.13
diff -u -3 -r1.13 Makefile
--- lang/diveintopython/Makefile	8 Jan 2002 10:40:03 -0000	1.13
+++ lang/diveintopython/Makefile	12 May 2002 03:44:09 -0000
@@ -6,50 +6,32 @@
 #
 
 PORTNAME=	diveintopython
-PORTVERSION=	3.9.1
-PORTREVISION=	1
+PORTVERSION=	4.0.2
+#PORTREVISION=	1
 CATEGORIES=	lang python
-MASTER_SITES=	http://diveintopython.org/download/
-DISTNAME=	${PORTNAME}
-DISTFILES=	${DISTNAME}-html-${VERSIONSTR}${EXTRACT_SUFX} \
-		${DISTNAME}-html-flat-${VERSIONSTR}${EXTRACT_SUFX} \
-		${DISTNAME}-pdf-${VERSIONSTR}${EXTRACT_SUFX} \
-		${DISTNAME}-text-${VERSIONSTR}${EXTRACT_SUFX} \
-		${DISTNAME}-examples-${VERSIONSTR}${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${DISTNAME}-html-${VERSIONSTR}${EXTRACT_SUFX}
+MASTER_SITES=	${AUTHOR_SITE}
+DISTNAME=	${PORTNAME}-html-${VERSIONSTR}
 
 MAINTAINER=	wjv@FreeBSD.org
 
 NO_BUILD=	YES
 USE_ZIP=	YES
 WRKSRC=		${WRKDIR}/html
-DIPDLDIR=	${DOCSDIR}/download
 CPIO=		cpio --quiet -pdum -R
 VERSIONSTR=	${PORTVERSION:C|\.([^.]*)$|-\1|}
 PLIST_SUB+=	VERSION=${VERSIONSTR}
+AUTHOR_SITE=	http://diveintopython.org/download/
 
 post-patch:
-	@ ${PERL} -pi.orig -e \
-	  's#<div class="selfad"(.(?!</div>))*.</div>##; \
-	   s#<tr[^>]*>(.(?!<tr[^>]*>))*(Microsoft|Windows)(.(?!</tr>))*.</tr>##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#' \
-	  ${WRKSRC}/*.html
+	@ ${PERL} -pi -e 's@href="download/@href="${AUTHOR_SITE}@g' \
+		${WRKSRC}/index.html
 
 do-install:
-	@ ${MKDIR} ${DIPDLDIR}
+	@ ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	@ cd ${WRKSRC} && find *.html *.css images \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	@ cd ${WRKDIR}/py && find * \
 	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
-.for format in html html-flat pdf text examples
-	@ ${INSTALL_DATA} \
-	  ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${format}-${VERSIONSTR}.zip \
-	  ${DIPDLDIR}
-.endfor
 
 post-install:
 	@ ${CHMOD} -R ${SHAREMODE} ${DOCSDIR} ${EXAMPLESDIR}
Index: lang/diveintopython/distinfo
===================================================================
RCS file: /home/ncvs/ports/lang/diveintopython/distinfo,v
retrieving revision 1.11
diff -u -3 -r1.11 distinfo
--- lang/diveintopython/distinfo	7 Jan 2002 14:28:38 -0000	1.11
+++ lang/diveintopython/distinfo	12 May 2002 03:18:08 -0000
@@ -1,5 +1 @@
-MD5 (diveintopython/diveintopython-html-3.9-1.zip) = e514afe1866b921cd29c4e36e4d2b721
-MD5 (diveintopython/diveintopython-html-flat-3.9-1.zip) = 6fefa9ea15be355d1e07ce9efe65c480
-MD5 (diveintopython/diveintopython-pdf-3.9-1.zip) = 23c4d62ac33c637635dfbc0b31a07ef3
-MD5 (diveintopython/diveintopython-text-3.9-1.zip) = 6d3be27455568708705ba1d22cce1781
-MD5 (diveintopython/diveintopython-examples-3.9-1.zip) = 1b6cd7c2dbc8dea106f4ed58e43dc8a6
+MD5 (diveintopython-html-4.0-2.zip) = 3b90bb586d8d1abdf946fd79ec4f1de6
Index: lang/diveintopython/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/lang/diveintopython/pkg-plist,v
retrieving revision 1.12
diff -u -3 -r1.12 pkg-plist
--- lang/diveintopython/pkg-plist	8 Jan 2002 10:40:03 -0000	1.12
+++ lang/diveintopython/pkg-plist	12 May 2002 03:19:07 -0000
@@ -22,11 +22,6 @@
 share/doc/diveintopython/dialect_sgmllib.html
 share/doc/diveintopython/dialect_summary.html
 share/doc/diveintopython/diveintopython.css
-share/doc/diveintopython/download/diveintopython-examples-%%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/examples.html
 share/doc/diveintopython/fdl.html
 share/doc/diveintopython/fdl_aggregation.html
@@ -70,6 +65,7 @@
 share/doc/diveintopython/images/callouts/8.png
 share/doc/diveintopython/images/callouts/9.png
 share/doc/diveintopython/images/caution.png
+share/doc/diveintopython/images/diveintopython.png
 share/doc/diveintopython/images/dot.png
 share/doc/diveintopython/images/important.png
 share/doc/diveintopython/images/note.png
@@ -153,6 +149,9 @@
 share/examples/diveintopython/makerealworddoc.py
 share/examples/diveintopython/odbchelper.py
 share/examples/diveintopython/odbchelpertest.py
+share/examples/diveintopython/parsephone.py
+share/examples/diveintopython/piglatin.py
+share/examples/diveintopython/plural.py
 share/examples/diveintopython/pyfontify.py
 share/examples/diveintopython/regression.py
 share/examples/diveintopython/roman.py
@@ -199,5 +198,4 @@
 @dirrm share/examples/diveintopython
 @dirrm share/doc/diveintopython/images/callouts
 @dirrm share/doc/diveintopython/images
-@dirrm share/doc/diveintopython/download
 @dirrm share/doc/diveintopython
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==

-- 
AlanE

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020512034526.GA53731>