Index: head/lang/diveintopython/Makefile =================================================================== --- head/lang/diveintopython/Makefile (revision 47415) +++ head/lang/diveintopython/Makefile (revision 47416) @@ -1,58 +1,49 @@ # New ports collection makefile for: py-diveintopython # Date created: 15 March 2001 # Whom: Johann Visagie # # $FreeBSD$ # PORTNAME= diveintopython -PORTVERSION= 3.5 +PORTVERSION= 3.6 CATEGORIES= lang python MASTER_SITES= http://diveintopython.org/download/ DISTNAME= ${PORTNAME} -DISTFILES= ${DISTNAME}-html-${VERSIONSTR}.tgz \ - ${DISTNAME}-html-flat-${VERSIONSTR}.tgz \ - ${DISTNAME}-pdf-${VERSIONSTR}.tgz \ - ${DISTNAME}-text-${VERSIONSTR}.tgz \ - ${DISTNAME}-xml-${VERSIONSTR}.tgz \ - ${DISTNAME}-examples-${VERSIONSTR}.tgz +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}.tgz \ - ${DISTNAME}-html-flat-${VERSIONSTR}.tgz \ - ${DISTNAME}-pdf-${VERSIONSTR}.tgz \ - ${DISTNAME}-text-${VERSIONSTR}.tgz +EXTRACT_ONLY= ${DISTNAME}-html-${VERSIONSTR}${EXTRACT_SUFX} MAINTAINER= wjv@FreeBSD.org NO_BUILD= YES -DIPDIR= ${PREFIX}/share/doc/diveintopython -DIPDLDIR= ${DIPDIR}/download +USE_ZIP= YES +WRKSRC= ${WRKDIR}/html +DIPDLDIR= ${DOCSDIR}/download CPIO= cpio --quiet -pdum -R VERSIONSTR= ${PORTVERSION}-1 post-patch: @ ${PERL} -pi.orig -e \ - 's#]*>(Windows|Mac ?OS)##g; \ - s#UNIX#compressed#g;s#for UNIX \(#(#g; \ - s#(.(?!))*(Microsoft Word|Windows Help)(.(?!))*.##g; \ - s#(.(?!))*cn/(.(?!))*.##g; \ - s#zip#tgz#g' ${WRKSRC}/index.html + 's#]*>(.(?!]*>))*(Microsoft|Windows)(.(?!))*.##g; \ + s#(.(?!))*(cn/|fr/[a-z]*\.html)(.(?!))*.##g' \ + ${WRKSRC}/index.html @ ${PERL} -pi -e \ - 's#http[^>]*(download/${PORTNAME}-examples-${VERSIONSTR}.tgz)#$$1#' \ + 's#http[^>]*(download/${PORTNAME}-examples-${VERSIONSTR}.zip)#$$1#' \ ${WRKSRC}/*.html do-install: @ ${MKDIR} ${DIPDLDIR} @ cd ${WRKSRC} && find *.html *.css images \ - | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DIPDIR} -.for format in html pdf txt - @ ${INSTALL_DATA} ${WRKSRC}/${format}/${PORTNAME}.${format} \ - ${DIPDLDIR} -.endfor -.for format in html html-flat pdf text xml examples + | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} +.for format in html html-flat pdf text examples @ ${INSTALL_DATA} \ - ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${format}-${VERSIONSTR}.tgz \ + ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${format}-${VERSIONSTR}.zip \ ${DIPDLDIR} .endfor .include Property changes on: head/lang/diveintopython/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/lang/diveintopython/distinfo =================================================================== --- head/lang/diveintopython/distinfo (revision 47415) +++ head/lang/diveintopython/distinfo (revision 47416) @@ -1,6 +1,5 @@ -MD5 (diveintopython/diveintopython-html-3.5-1.tgz) = e12053f26e661152d1af77ad5626591b -MD5 (diveintopython/diveintopython-html-flat-3.5-1.tgz) = 6dcf5c824e41299e0ad945025f829cb9 -MD5 (diveintopython/diveintopython-pdf-3.5-1.tgz) = e6c945ca945abdb6af68eef188b76591 -MD5 (diveintopython/diveintopython-text-3.5-1.tgz) = d4c3257b89310ac544f2c83bae2d8766 -MD5 (diveintopython/diveintopython-xml-3.5-1.tgz) = 25c58b362521a9e7742da136651b1fb1 -MD5 (diveintopython/diveintopython-examples-3.5-1.tgz) = bb6ccadb3c02f5d82c691e90ed725f9c +MD5 (diveintopython/diveintopython-html-3.6-1.zip) = 732609d4b9db085b4ddd70439e787015 +MD5 (diveintopython/diveintopython-html-flat-3.6-1.zip) = 06e631f6e4effa63d1314682e41b7ed8 +MD5 (diveintopython/diveintopython-pdf-3.6-1.zip) = d84eb988895f5c22bc807228ba8ae19c +MD5 (diveintopython/diveintopython-text-3.6-1.zip) = d8f401ea297627bd3e4bfd057f6c0db3 +MD5 (diveintopython/diveintopython-examples-3.6-1.zip) = ad09c6ed21fdf2357489a2dd77b2628d Property changes on: head/lang/diveintopython/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/lang/diveintopython/pkg-descr =================================================================== --- head/lang/diveintopython/pkg-descr (revision 47415) +++ head/lang/diveintopython/pkg-descr (revision 47416) @@ -1,10 +1,10 @@ "Dive Into Python" is a Python tutorial for experienced programmers. -The book is published under the GNU Free Documentation License, and is +The book is published under the GNU Free Documentation License and is available in a variety of formats. It is currently being translated into a number of languages. Author: Mark Pilgrim WWW: http://diveintopython.org/ --- Johann Visagie +-- Johann Visagie Property changes on: head/lang/diveintopython/pkg-descr ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/lang/diveintopython/pkg-plist =================================================================== --- head/lang/diveintopython/pkg-plist (revision 47415) +++ head/lang/diveintopython/pkg-plist (revision 47416) @@ -1,122 +1,122 @@ share/doc/diveintopython/about.html share/doc/diveintopython/abstracts.html share/doc/diveintopython/apihelper_alltogether.html share/doc/diveintopython/apihelper_andor.html share/doc/diveintopython/apihelper_builtin.html share/doc/diveintopython/apihelper_divein.html share/doc/diveintopython/apihelper_filter.html share/doc/diveintopython/apihelper_getattr.html 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 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/dialect_summary.html share/doc/diveintopython/diveintopython.css -share/doc/diveintopython/download/diveintopython-examples-3.5-1.tgz -share/doc/diveintopython/download/diveintopython-html-3.5-1.tgz -share/doc/diveintopython/download/diveintopython-html-flat-3.5-1.tgz -share/doc/diveintopython/download/diveintopython-pdf-3.5-1.tgz -share/doc/diveintopython/download/diveintopython-text-3.5-1.tgz -share/doc/diveintopython/download/diveintopython-xml-3.5-1.tgz -share/doc/diveintopython/download/diveintopython.html -share/doc/diveintopython/download/diveintopython.pdf -share/doc/diveintopython/download/diveintopython.txt +share/doc/diveintopython/download/diveintopython-examples-3.6-1.zip +share/doc/diveintopython/download/diveintopython-html-3.6-1.zip +share/doc/diveintopython/download/diveintopython-html-flat-3.6-1.zip +share/doc/diveintopython/download/diveintopython-pdf-3.6-1.zip +share/doc/diveintopython/download/diveintopython-text-3.6-1.zip share/doc/diveintopython/examples.html share/doc/diveintopython/fdl.html share/doc/diveintopython/fdl_aggregation.html share/doc/diveintopython/fdl_applicability.html share/doc/diveintopython/fdl_collections.html share/doc/diveintopython/fdl_combining.html share/doc/diveintopython/fdl_copying.html share/doc/diveintopython/fdl_copyinginquantity.html share/doc/diveintopython/fdl_future.html share/doc/diveintopython/fdl_howto.html share/doc/diveintopython/fdl_modifications.html share/doc/diveintopython/fdl_termination.html share/doc/diveintopython/fdl_translation.html share/doc/diveintopython/fileinfo_alltogether.html share/doc/diveintopython/fileinfo_class.html share/doc/diveintopython/fileinfo_classattributes.html share/doc/diveintopython/fileinfo_divein.html share/doc/diveintopython/fileinfo_exception.html share/doc/diveintopython/fileinfo_files.html share/doc/diveintopython/fileinfo_for.html share/doc/diveintopython/fileinfo_fromimport.html share/doc/diveintopython/fileinfo_instantiation.html share/doc/diveintopython/fileinfo_modules.html share/doc/diveintopython/fileinfo_morespecial.html share/doc/diveintopython/fileinfo_os.html share/doc/diveintopython/fileinfo_private.html share/doc/diveintopython/fileinfo_specialmethods.html share/doc/diveintopython/fileinfo_summary.html share/doc/diveintopython/fileinfo_userdict.html share/doc/diveintopython/fudd.html share/doc/diveintopython/furtherreading.html -share/doc/diveintopython/gpl.html -share/doc/diveintopython/gpl_howto.html -share/doc/diveintopython/gpl_terms.html share/doc/diveintopython/history.html share/doc/diveintopython/images/callouts/1.png share/doc/diveintopython/images/callouts/10.png share/doc/diveintopython/images/callouts/2.png share/doc/diveintopython/images/callouts/3.png share/doc/diveintopython/images/callouts/4.png share/doc/diveintopython/images/callouts/5.png share/doc/diveintopython/images/callouts/6.png share/doc/diveintopython/images/callouts/7.png share/doc/diveintopython/images/callouts/8.png share/doc/diveintopython/images/callouts/9.png share/doc/diveintopython/images/caution.png share/doc/diveintopython/images/dot.png share/doc/diveintopython/images/important.png 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_divein.html +share/doc/diveintopython/kgp_dtd.html +share/doc/diveintopython/license.html +share/doc/diveintopython/license_terms.html share/doc/diveintopython/odbchelper_dict.html share/doc/diveintopython/odbchelper_divein.html share/doc/diveintopython/odbchelper_docstring.html share/doc/diveintopython/odbchelper_funcdef.html share/doc/diveintopython/odbchelper_indenting.html share/doc/diveintopython/odbchelper_join.html share/doc/diveintopython/odbchelper_list.html share/doc/diveintopython/odbchelper_map.html share/doc/diveintopython/odbchelper_multiassign.html share/doc/diveintopython/odbchelper_objects.html share/doc/diveintopython/odbchelper_stringformatting.html share/doc/diveintopython/odbchelper_summary.html share/doc/diveintopython/odbchelper_testing.html share/doc/diveintopython/odbchelper_tuple.html share/doc/diveintopython/odbchelper_vardef.html share/doc/diveintopython/olde.html share/doc/diveintopython/preface.html +share/doc/diveintopython/regression_divein.html +share/doc/diveintopython/regression_path.html share/doc/diveintopython/roman_bugs.html share/doc/diveintopython/roman_change.html share/doc/diveintopython/roman_divein.html share/doc/diveintopython/roman_failure.html -share/doc/diveintopython/roman_getopt.html +share/doc/diveintopython/roman_postscript.html share/doc/diveintopython/roman_refactoring.html share/doc/diveintopython/roman_romantest.html share/doc/diveintopython/roman_sanity.html share/doc/diveintopython/roman_stage1.html share/doc/diveintopython/roman_stage2.html share/doc/diveintopython/roman_stage3.html share/doc/diveintopython/roman_stage4.html share/doc/diveintopython/roman_stage5.html share/doc/diveintopython/roman_success.html share/doc/diveintopython/roman_summary.html share/doc/diveintopython/tips.html share/doc/diveintopython/toc.html @dirrm share/doc/diveintopython/images/callouts @dirrm share/doc/diveintopython/images @dirrm share/doc/diveintopython/download @dirrm share/doc/diveintopython Property changes on: head/lang/diveintopython/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property