[82270] trunk/dports/lang

eborisch at macports.org eborisch at macports.org
Thu Aug 11 14:12:56 PDT 2011


Revision: 82270
          http://trac.macports.org/changeset/82270
Author:   eborisch at macports.org
Date:     2011-08-11 14:12:56 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
py-htmldocs: new unified port; Replaces python2[567]-doc

Modified Paths:
--------------
    trunk/dports/lang/py-htmldocs/Portfile
    trunk/dports/lang/python25-doc/Portfile
    trunk/dports/lang/python26-doc/Portfile
    trunk/dports/lang/python27-doc/Portfile

Added Paths:
-----------
    trunk/dports/lang/py-htmldocs/

Removed Paths:
-------------
    trunk/dports/lang/python25-doc/files/
    trunk/dports/lang/python26-doc/files/

Modified: trunk/dports/lang/py-htmldocs/Portfile
===================================================================
--- trunk/dports/lang/python27-doc/Portfile	2011-08-11 20:03:26 UTC (rev 82258)
+++ trunk/dports/lang/py-htmldocs/Portfile	2011-08-11 21:12:56 UTC (rev 82270)
@@ -1,40 +1,65 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
+name                py-htmldocs
+PortGroup           python 1.0
+python.versions     25 26 27
+python.default_version 27
 
-name                python27-doc
-version             2.7.2
+if {${python.version} == 25} {
+    version             2.5.4
+}
+if {${python.version} == 26} {
+    version             2.6.7
+}
+if {${python.version} == 27} {
+    version             2.7.2
+}
+
 categories          lang
 platforms           darwin
 maintainers         eborisch \
                     openmaintainer
 supported_archs     noarch
 
-description         HTML documentation for Python ${version}
-long_description    HTML documentation for Python ${version}. Accessible at \
-                    file://${prefix}/share/doc/${name}/index.html
+use_bzip2           yes
+use_configure       no
 
-homepage            http://www.python.org/
-master_sites        http://www.python.org/ftp/python/doc/${version}/
-distname            python-${version}-docs-html
+if {${name} != ${subport}} {
+    description         HTML documentation for Python ${version}
+    long_description    HTML documentation for Python ${version}. Accessible at \
+                        file://${prefix}/share/doc/${subport}/index.html
 
-checksums           md5     40f0bd51b221662cae14fb0c6b6f622b \
-                    sha1    0886850a5bcf3e14e903cd33d51d1a8b664cfe36 \
-                    rmd160  d898264a2f0da8be8722396d25149c987e3614f8
-                                        
-use_bzip2           yes
+    homepage            http://www.python.org/
+    master_sites        http://www.python.org/ftp/python/doc/${version}/
+    distname            python-${version}-docs-html
+    set extractname     ${distname}
 
-use_configure       no
+    if {${python.version} == 25} {
+        checksums           md5     b4041ec1faf9b6070aad451eeb5ab487 \
+                            sha1    f547228fbabc9b259ca4c4b32daffc813cfe5455 \
+                            rmd160  78cf1d55bc50b9c4535d1519a11a0a4e1a47a12e
+        distname            html-${version}
+        set extractname     Python-Docs-2.5.4
+    }
+    if {${python.version} == 26} {
+        checksums           md5     a2fc12049840d5c66262c546cdf241fd \
+                            sha1    8cf151a4fd80f6a636d2292d340cd20858a58132 \
+                            rmd160  f8ac90c6e97888f1bb0f0207994c0c05d27b83ac
+    }
+    if {${python.version} == 27} {
+        checksums           md5     40f0bd51b221662cae14fb0c6b6f622b \
+                            sha1    0886850a5bcf3e14e903cd33d51d1a8b664cfe36 \
+                            rmd160  d898264a2f0da8be8722396d25149c987e3614f8
+    }
 
-build {}
+    build {}
 
-destroot {
-    file mkdir ${destroot}${prefix}/share/doc/
-    file copy ${worksrcpath}/ ${destroot}${prefix}/share/doc/${name}
+    destroot {
+        file mkdir ${destroot}${prefix}/share/doc/
+        file copy ${workpath}/${extractname} ${destroot}${prefix}/share/doc/python${python.version}-doc
+    }
 }
 
-livecheck.type    regex
-livecheck.url   ${homepage}download/releases/
-livecheck.regex {Python (2\.7(?:\.\d+)*)}
 

Modified: trunk/dports/lang/python25-doc/Portfile
===================================================================
--- trunk/dports/lang/python25-doc/Portfile	2011-08-11 21:07:08 UTC (rev 82269)
+++ trunk/dports/lang/python25-doc/Portfile	2011-08-11 21:12:56 UTC (rev 82270)
@@ -1,76 +1,24 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
+name                python25-doc
+version             2.5.2
+categories          lang
+platforms           darwin
+maintainers         nomaintainer
 
-name			python25-doc
-version			2.5.2
-categories		lang
-platforms		darwin
-maintainers		nomaintainer
+replaced_by         py25-htmldocs
+revision            1
+distfiles     
 
-description		HTML documentation for Python 2.5
-long_description	HTML documentation for Python 2.5. Use by running \
-			'pydoc2.5 TOPIC', e.g. 'pydoc2.5 NUMBERS'.
+description         HTML documentation for Python 2.5
 
-homepage		http://www.python.org/
-master_sites		${homepage}/ftp/python/${version}/ \
-			ftp://ftp.python.org/pub/python/${version}/ \
-			ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
-			ftp://ftp.python.jp/pub/python/${version}/
+homepage            http://www.python.org/
 
-dist_subdir		[lindex [split $name -] 0]
-distname		Python-${version}
-extract.suffix          .tgz
-
-checksums       md5 3f7ca8aa86c6bd275426d63b46e07992 \
-                sha1 7a835c93a904ae4ecb2d23b5183e94d3b92f8305 \
-                rmd160 a6e2e81910639a362f265af2e3814e7b47e2110a
-
-depends_lib     port:gettext port:python25 port:latex2html
-
-patchfiles      patch-configure.diff \
-                patch-Makefile.pre.in.diff \
-                patch-Misc-setuid-prog.c.diff \
-                patch-Modules-posixmodule.c.diff \
-                patch-setup.py.diff \
-                patch-Lib-cgi.py.diff
-
-configure.args	--enable-shared \
-			--mandir=${prefix}/share/man \
-			--disable-framework
-
-post-patch {
-    reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
+livecheck.type      none
+pre-configure {
+    ui_error "Please do not install this port since it has been replaced by 'py25-htmldocs'."
+    return -code error
 }
 
-build.target	html
-build.cmd	{ cd Doc && make }
-
-destroot {
-	file mkdir ${destroot}${prefix}/share/doc/
-	file copy $worksrcpath/Doc/html ${destroot}${prefix}/share/doc/${name}
-}
-
-platform darwin 8 {
-	configure.args-append 	--with-cxx=/usr/bin/g++-4.0
-}
-
-platform darwin 9 {
-	configure.cppflags-append	-D__DARWIN_UNIX03
-	configure.args-append 	--with-cxx=/usr/bin/g++-4.0
-}
-
-variant universal {
-    configure.args-append   --enable-universalsdk
-}
-
-# for w/o quicktime sdk, etc. (be prepared for framework build, though)
-platform puredarwin {
-#	configure.args-delete	--enable-framework=${prefix}/Library/Frameworks
-	configure.args-append	--disable-toolbox-glue --disable-framework
-}
-
-livecheck.type	regex
-livecheck.url   ${homepage}download/releases/
-livecheck.regex {Python (2\.5(?:\.\d+)*)}
-

Modified: trunk/dports/lang/python26-doc/Portfile
===================================================================
--- trunk/dports/lang/python26-doc/Portfile	2011-08-11 21:07:08 UTC (rev 82269)
+++ trunk/dports/lang/python26-doc/Portfile	2011-08-11 21:12:56 UTC (rev 82270)
@@ -1,73 +1,25 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
+name			    python26-doc
+version			    2.6.4
+categories		    lang
+platforms		    darwin
+maintainers		    nomaintainer
 
-name			python26-doc
-version			2.6.4
-categories		lang
-platforms		darwin
-maintainers		nomaintainer
+replaced_by         py26-htmldocs
+revision            1
+distfiles     
 
-description		HTML documentation for Python 2.6
-long_description	HTML documentation for Python 2.6. Use by running \
-			'pydoc2.6 TOPIC', e.g. 'pydoc2.6 NUMBERS'.
+description		    HTML documentation for Python 2.6
 
-homepage		http://www.python.org/
-master_sites		${homepage}/ftp/python/${version}/ \
-			ftp://ftp.python.org/pub/python/${version}/ \
-			ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
-			ftp://ftp.python.jp/pub/python/${version}/
+homepage		    http://www.python.org/
 
-dist_subdir		[lindex [split $name -] 0]
-distname		Python-${version}
-extract.suffix          .tgz
-
-checksums       md5 17dcac33e4f3adb69a57c2607b6de246
-
-depends_lib     port:gettext port:python26 port:latex2html
-
-patchfiles      patch-Makefile.pre.in.diff \
-                patch-Misc-setuid-prog.c.diff \
-                patch-Modules-posixmodule.c.diff \
-                patch-setup.py.diff \
-                patch-Lib-cgi.py.diff
-
-configure.args	--enable-shared \
-			--mandir=${prefix}/share/man \
-			--disable-framework
-
-post-patch {
-    reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
+livecheck.type      none
+pre-configure {
+    ui_error "Please do not install this port since it has been replaced by 'py26-htmldocs'."
+    return -code error
 }
 
-build.target	html
-build.cmd	{ cd Doc && make }
 
-destroot {
-	file mkdir ${destroot}${prefix}/share/doc/
-	file copy $worksrcpath/Doc/build/html ${destroot}${prefix}/share/doc/${name}
-}
-
-platform darwin 8 {
-	configure.args-append 	--with-cxx=/usr/bin/g++-4.0
-}
-
-platform darwin 9 {
-	configure.cppflags-append	-D__DARWIN_UNIX03
-	configure.args-append 	--with-cxx=/usr/bin/g++-4.0
-}
-
-variant universal {
-    configure.args-append   --enable-universalsdk=/
-}
-
-# for w/o quicktime sdk, etc. (be prepared for framework build, though)
-platform puredarwin {
-#	configure.args-delete	--enable-framework=${prefix}/Library/Frameworks
-	configure.args-append	--disable-toolbox-glue --disable-framework
-}
-
-livecheck.type	regex
-livecheck.url   ${homepage}download/releases/
-livecheck.regex {Python (2\.6(?:\.\d+)*)}
-

Modified: trunk/dports/lang/python27-doc/Portfile
===================================================================
--- trunk/dports/lang/python27-doc/Portfile	2011-08-11 21:07:08 UTC (rev 82269)
+++ trunk/dports/lang/python27-doc/Portfile	2011-08-11 21:12:56 UTC (rev 82270)
@@ -1,40 +1,26 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
+name		        python27-doc
+version			    2.7.2
+categories		    lang
+platforms		    darwin
+maintainers		    nomaintainer
 
-name                python27-doc
-version             2.7.2
-categories          lang
-platforms           darwin
-maintainers         eborisch \
-                    openmaintainer
-supported_archs     noarch
+replaced_by         py27-htmldocs
+revision            1
+distfiles     
 
-description         HTML documentation for Python ${version}
-long_description    HTML documentation for Python ${version}. Accessible at \
-                    file://${prefix}/share/doc/${name}/index.html
+description		    HTML documentation for Python 2.7
 
-homepage            http://www.python.org/
-master_sites        http://www.python.org/ftp/python/doc/${version}/
-distname            python-${version}-docs-html
+homepage		    http://www.python.org/
 
-checksums           md5     40f0bd51b221662cae14fb0c6b6f622b \
-                    sha1    0886850a5bcf3e14e903cd33d51d1a8b664cfe36 \
-                    rmd160  d898264a2f0da8be8722396d25149c987e3614f8
-                                        
-use_bzip2           yes
-
-use_configure       no
-
-build {}
-
-destroot {
-    file mkdir ${destroot}${prefix}/share/doc/
-    file copy ${worksrcpath}/ ${destroot}${prefix}/share/doc/${name}
+livecheck.type      none
+pre-configure {
+    ui_error "Please do not install this port since it has been replaced by 'py27-htmldocs'."
+    return -code error
 }
 
-livecheck.type    regex
-livecheck.url   ${homepage}download/releases/
-livecheck.regex {Python (2\.7(?:\.\d+)*)}
 
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110811/5cae75bd/attachment-0001.html>


More information about the macports-changes mailing list