[51955] trunk/dports

arthurk at macports.org arthurk at macports.org
Sun Jun 7 03:04:13 PDT 2009


Revision: 51955
          http://trac.macports.org/changeset/51955
Author:   arthurk at macports.org
Date:     2009-06-07 03:04:10 -0700 (Sun, 07 Jun 2009)
Log Message:
-----------
Compile core modules with python25; mark old core module ports as stubs; remove deps on stubs

Modified Paths:
--------------
    trunk/dports/audio/lastfmsubmitd/Portfile
    trunk/dports/audio/lastmp/Portfile
    trunk/dports/audio/xmms2/Portfile
    trunk/dports/devel/PIDA/Portfile
    trunk/dports/devel/buildbot/Portfile
    trunk/dports/devel/bzr/Portfile
    trunk/dports/devel/bzr-svn/Portfile
    trunk/dports/devel/cvs2svn/Portfile
    trunk/dports/devel/iso-codes/Portfile
    trunk/dports/devel/scons/Portfile
    trunk/dports/devel/subversion-python25bindings/Portfile
    trunk/dports/devel/svndumptool/Portfile
    trunk/dports/devel/unsermake/Portfile
    trunk/dports/fuse/gmailfs/Portfile
    trunk/dports/gnome/gnome-doc-utils/Portfile
    trunk/dports/gnome/gramps/Portfile
    trunk/dports/lang/python25/Portfile
    trunk/dports/mail/mailman/Portfile
    trunk/dports/mail/offlineimap/Portfile
    trunk/dports/net/avahi/Portfile
    trunk/dports/net/deluge/Portfile
    trunk/dports/net/gajim/Portfile
    trunk/dports/net/gajim-devel/Portfile
    trunk/dports/net/nmap/Portfile
    trunk/dports/net/umit/Portfile
    trunk/dports/news/xpn/Portfile
    trunk/dports/python/py25-bsddb/Portfile
    trunk/dports/python/py25-bz2/Portfile
    trunk/dports/python/py25-clientcookie/Portfile
    trunk/dports/python/py25-clientform/Portfile
    trunk/dports/python/py25-curses/Portfile
    trunk/dports/python/py25-cython/Portfile
    trunk/dports/python/py25-formencode/Portfile
    trunk/dports/python/py25-gdata/Portfile
    trunk/dports/python/py25-gdbm/Portfile
    trunk/dports/python/py25-hashlib/Portfile
    trunk/dports/python/py25-ipython/Portfile
    trunk/dports/python/py25-lxml/Portfile
    trunk/dports/python/py25-matplotlib/Portfile
    trunk/dports/python/py25-mutagen/Portfile
    trunk/dports/python/py25-numpy/Portfile
    trunk/dports/python/py25-opengl/Portfile
    trunk/dports/python/py25-pmw/Portfile
    trunk/dports/python/py25-pydicom/Portfile
    trunk/dports/python/py25-pygments/Portfile
    trunk/dports/python/py25-pyobjc2-cocoa/Portfile
    trunk/dports/python/py25-pyrex/Portfile
    trunk/dports/python/py25-pyx/Portfile
    trunk/dports/python/py25-readline/Portfile
    trunk/dports/python/py25-scipy/Portfile
    trunk/dports/python/py25-setuptools/Portfile
    trunk/dports/python/py25-smisk/Portfile
    trunk/dports/python/py25-socket-ssl/Portfile
    trunk/dports/python/py25-sqlite3/Portfile
    trunk/dports/python/py25-tkinter/Portfile
    trunk/dports/python/py25-yum-metadata-parser/Portfile
    trunk/dports/python/py25-zlib/Portfile
    trunk/dports/python/rdiff-backup/Portfile
    trunk/dports/python/rdiff-backup-devel/Portfile
    trunk/dports/science/bkchem/Portfile
    trunk/dports/science/glue/Portfile
    trunk/dports/science/lscsoft-deps/Portfile
    trunk/dports/security/kedpm/Portfile
    trunk/dports/sysutils/duplicity/Portfile
    trunk/dports/www/linkchecker/Portfile

Modified: trunk/dports/audio/lastfmsubmitd/Portfile
===================================================================
--- trunk/dports/audio/lastfmsubmitd/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/audio/lastfmsubmitd/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,8 +22,6 @@
                 sha1 98fb020a54f8e49b16090fb1af07912a12351d8f \
                 rmd160 c6a06aa3931b823ee8de2e863812b1a8542ffa47
 
-depends_lib-append  port:py25-hashlib
-
 set dirs { /var/spool/lastfm /var/run/lastfm /var/log/lastfm }
 set conf lastfmsubmitd.conf.sample
 set user "lastfm"

Modified: trunk/dports/audio/lastmp/Portfile
===================================================================
--- trunk/dports/audio/lastmp/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/audio/lastmp/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,7 +22,6 @@
                 rmd160 c6a06aa3931b823ee8de2e863812b1a8542ffa47
 
 depends_lib-append  port:py25-mpdclient2 \
-                    port:py25-hashlib \
                     port:lastfmsubmitd
 
 set conf lastmp.conf.sample

Modified: trunk/dports/audio/xmms2/Portfile
===================================================================
--- trunk/dports/audio/xmms2/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/audio/xmms2/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -20,8 +20,6 @@
 
 set my_python           ${prefix}/bin/python2.5
 depends_build           port:python25 \
-                        port:py25-hashlib \
-                        port:py25-zlib \
                         port:pkgconfig
 depends_lib             port:glib2 \
                         port:gettext \

Modified: trunk/dports/devel/PIDA/Portfile
===================================================================
--- trunk/dports/devel/PIDA/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/PIDA/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -16,7 +16,6 @@
 checksums	md5 d24bbdc2c07172062cf55dffe58c85f6
 depends_lib     port:py25-gtk \
                 port:py25-gnome \
-                port:py25-zlib \
                 port:kiwi \
                 port:librsvg \
                 port:vte \

Modified: trunk/dports/devel/buildbot/Portfile
===================================================================
--- trunk/dports/devel/buildbot/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/buildbot/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -18,7 +18,7 @@
                         sha1    799bf66cf4d6f8b9f94c0b167ac14b1198afdb7d \
                         rmd160  bdd9a8d6daf9e947e52784ee6d5fb30285f8d8b6
 
-depends_lib-append	port:py25-twisted port:py25-hashlib port:py25-zlib port:py25-bz2
+depends_lib-append	port:py25-twisted
 
 post-destroot   {
         xinstall -m 644 ${worksrcpath}/README \

Modified: trunk/dports/devel/bzr/Portfile
===================================================================
--- trunk/dports/devel/bzr/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/bzr/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -30,14 +30,9 @@
 
 depends_lib-append  port:py25-paramiko \
                     port:py25-crypto \
-                    port:py25-hashlib \
-                    port:py25-zlib \
-                    port:py25-bz2 \
-                    port:py25-socket-ssl \
                     port:py25-curl \
                     port:py25-docutils \
-                    port:py25-pyrex \
-                    port:py25-curses
+                    port:py25-pyrex
 
 test.run      yes
 test.cmd      make

Modified: trunk/dports/devel/bzr-svn/Portfile
===================================================================
--- trunk/dports/devel/bzr-svn/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/bzr-svn/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -26,7 +26,6 @@
 
 depends_lib-append  port:bzr \
                     port:bzr-rebase \
-                    port:py25-sqlite3 \
                     port:py25-subvertpy
 
 universal_variant   no

Modified: trunk/dports/devel/cvs2svn/Portfile
===================================================================
--- trunk/dports/devel/cvs2svn/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/cvs2svn/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -26,9 +26,6 @@
 test.cmd		${prefix}/bin/python2.5
 test.target		run-tests.py
 
-depends_lib-append	port:py25-bsddb port:py25-hashlib \
-			port:py25-zlib
-
 post-destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} BUGS CHANGES COMMITTERS COPYING \

Modified: trunk/dports/devel/iso-codes/Portfile
===================================================================
--- trunk/dports/devel/iso-codes/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/iso-codes/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,8 +22,7 @@
                     rmd160  e5199e5c3dda31b9163397fb905c1b1204a68847
 
 depends_build       port:gettext \
-                    port:python25 \
-                    port:py25-hashlib
+                    port:python25
 
 post-patch {
     reinplace "s|#!/usr/bin/env python|#!${prefix}/bin/python2.5|g" \

Modified: trunk/dports/devel/scons/Portfile
===================================================================
--- trunk/dports/devel/scons/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/scons/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -20,8 +20,6 @@
 homepage			http://www.scons.org/
 master_sites		sourceforge
 
-depends_lib-append  port:py25-hashlib
-
 checksums           md5     53b6aa7281811717a57598e319441cf7 \
                     sha1    cd6be8698a384ea2ac4f5191cef94f57b2f84bbb \
                     rmd160  69c1fcc7c3af55c801f26fc7370dd01a17dc2327

Modified: trunk/dports/devel/subversion-python25bindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-python25bindings/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/subversion-python25bindings/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -28,7 +28,7 @@
 			port:apr port:apr-util \
 			port:db46 port:subversion \
 			port:python25 \
-			port:py25-bsddb port:sqlite3 \
+			port:sqlite3 \
 			port:gettext port:libiconv \
 			port:serf port:cyrus-sasl2
 
@@ -77,7 +77,7 @@
 			}
 
 variant no_bdb description {Build without support for BerkeleyDB repositories} {
-			depends_lib-delete	port:db46 port:py25-bsddb
+			depends_lib-delete	port:db46
 			configure.args-delete 	--with-berkeley-db=yes
 			configure.args-append	--without-berkeley-db
 			}

Modified: trunk/dports/devel/svndumptool/Portfile
===================================================================
--- trunk/dports/devel/svndumptool/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/svndumptool/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -30,9 +30,6 @@
     sha1    54ecbb4d4c870a082141ffb1104fd4dfade2add9 \
     rmd160  6b32ba863719ac63d22eb6f401b42869055f569b
 
-depends_lib-append \
-    port:py25-hashlib
-
 livecheck.check         regex
 livecheck.url           ${homepage}
 livecheck.regex         ${name}-(\[0-9.\]+)\\.tar

Modified: trunk/dports/devel/unsermake/Portfile
===================================================================
--- trunk/dports/devel/unsermake/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/devel/unsermake/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -20,8 +20,7 @@
 checksums       md5 b794f83bdc3f6205d1fd731da4e96d89
 worksrcdir      ${name}
 
-depends_run     port:py25-zlib \
-                port:python25
+depends_run     port:python25
 
 patch {
     reinplace "s|exec python|exec ${prefix}/bin/python2.5|" ${worksrcpath}/unsermake

Modified: trunk/dports/fuse/gmailfs/Portfile
===================================================================
--- trunk/dports/fuse/gmailfs/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/fuse/gmailfs/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,8 +22,6 @@
 
 depends_run     port:macfuse \
                 port:python25 \
-                port:py25-hashlib \
-                port:py25-socket-ssl \
                 port:py25-openssl \
                 port:py25-libgmail \
                 port:fuse-bindings-python25

Modified: trunk/dports/gnome/gnome-doc-utils/Portfile
===================================================================
--- trunk/dports/gnome/gnome-doc-utils/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/gnome/gnome-doc-utils/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -34,7 +34,6 @@
     port:libiconv \
     port:libxml2 \
     port:libxslt \
-    port:py25-hashlib \
     port:py25-libxml2 \
     port:python25
 

Modified: trunk/dports/gnome/gramps/Portfile
===================================================================
--- trunk/dports/gnome/gramps/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/gnome/gramps/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -42,9 +42,6 @@
 depends_lib			bin:update-mime-database:shared-mime-info \
 				port:py25-gtk \
 				port:py25-gnome \
-				port:py25-bsddb \
-				port:py25-hashlib \
-				port:py25-zlib \
 				port:gtkspell2 \
 				port:aspell-dict-en \
 				port:gnome-python-extras

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/lang/python25/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,7 +5,7 @@
 
 name                    python25
 version                 2.5.4
-revision                3
+revision                4
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
 platforms               darwin
@@ -28,17 +28,16 @@
 # patch-Lib-distutils-dist.py.diff comes from
 # <http://bugs.python.org/issue1180>
 patchfiles              patch-Makefile.pre.in.diff \
-                        patch-setup.py.diff \
                         patch-Lib-cgi.py.diff \
                         patch-Lib-distutils-dist.py.diff
 
-depends_lib             port:gettext
+depends_lib             port:gettext port:zlib port:openssl port:tk \
+                        port:sqlite3 port:db46 port:bzip2 \
+                        port:gdbm port:readline port:ncurses
 
 configure.args          --enable-shared \
                         --enable-framework=${frameworks_dir} \
                         --mandir=${prefix}/share/man \
-                        --without-readline \
-                        --disable-tk \
                         --enable-ipv6
 
 use_parallel_build      no

Modified: trunk/dports/mail/mailman/Portfile
===================================================================
--- trunk/dports/mail/mailman/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/mail/mailman/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -24,7 +24,7 @@
 
 platforms		darwin
 
-depends_lib		port:python25 port:py25-hashlib
+depends_lib		port:python25
 
 # Create a startupitem
 startupitem.create	yes

Modified: trunk/dports/mail/offlineimap/Portfile
===================================================================
--- trunk/dports/mail/offlineimap/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/mail/offlineimap/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -37,8 +37,6 @@
 worksrcdir		${name}
 checksums		md5 0c81d33e123c3d5b6645a68a809bcaef
 
-depends_lib-append	port:py25-hashlib port:py25-socket-ssl
-
 destroot.target		install --no-compile
 
 post-destroot {

Modified: trunk/dports/net/avahi/Portfile
===================================================================
--- trunk/dports/net/avahi/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/net/avahi/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -52,7 +52,6 @@
                 port:dbus-python25 \
                 port:expat \
                 port:gdbm \
-                port:py25-gdbm \
                 port:py25-gtk \
                 port:gettext \
                 port:libiconv

Modified: trunk/dports/net/deluge/Portfile
===================================================================
--- trunk/dports/net/deluge/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/net/deluge/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -27,10 +27,8 @@
 	port:gettext \
 	port:librsvg \
 	port:py25-gtk \
-	port:py25-hashlib \
 	port:py25-setuptools \
 	port:py25-xdg \
-	port:py25-zlib \
 	port:boost
 
 #patchfiles  patch-setup.py.diff

Modified: trunk/dports/net/gajim/Portfile
===================================================================
--- trunk/dports/net/gajim/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/net/gajim/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -42,8 +42,6 @@
                     port:py25-gtk \
                     port:py25-gobject \
                     port:py25-docutils \
-                    port:py25-sqlite3 \
-                    port:py25-socket-ssl \
                     port:dbus-python25
 
 configure.args      --disable-trayicon \

Modified: trunk/dports/net/gajim-devel/Portfile
===================================================================
--- trunk/dports/net/gajim-devel/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/net/gajim-devel/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -39,9 +39,7 @@
                     port:py25-gtk \
                     port:py25-gobject \
                     port:py25-docutils \
-                    port:py25-sqlite3 \
                     port:py25-openssl \
-                    port:py25-zlib \
                     port:Growl
 
 post-patch {

Modified: trunk/dports/net/nmap/Portfile
===================================================================
--- trunk/dports/net/nmap/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/net/nmap/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -61,5 +61,5 @@
 
 variant zenmap description {build zenmap in addition to nmap} {
 			configure.args-delete --without-zenmap
-			depends_lib-append port:py25-gtk port:py25-sqlite3
+			depends_lib-append port:py25-gtk
 		}

Modified: trunk/dports/net/umit/Portfile
===================================================================
--- trunk/dports/net/umit/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/net/umit/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -23,8 +23,7 @@
 
 depends_lib	port:coreutils\
 		port:nmap \
-		port:py25-gtk\
-		port:py25-sqlite3
+		port:py25-gtk
 
 use_bzip2	yes
 

Modified: trunk/dports/news/xpn/Portfile
===================================================================
--- trunk/dports/news/xpn/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/news/xpn/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -19,8 +19,7 @@
 checksums       md5     6b77345290a27406e411ea0ffa54780f \
                 sha1    929a8e809121f3e286d5f36a76a0db5e2fa2875e \
                 rmd160  672bb8cd22d8e4d03b98cf34701451225f35a9b7
-depends_lib     port:py25-gtk \
-                port:py25-sqlite3
+depends_lib     port:py25-gtk
 use_configure   no
 universal_variant no
 build           {}

Modified: trunk/dports/python/py25-bsddb/Portfile
===================================================================
--- trunk/dports/python/py25-bsddb/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-bsddb/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,37 +5,21 @@
 
 name			py25-bsddb
 version			2.5.4
+revision        1
 categories		python databases
 platforms		darwin
-maintainers		mww
-description		Python bindings to the db46 library
+maintainers		nomaintainer
+description		This is a stub. bsddb is now build with python25
 long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-dbm.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-worksrcdir		${worksrcdir}/Modules
+build			{ }
+distfiles
 
-extract.post_args	"| tar -xf - ${distname}/Modules/bsddbmodule.c \
-				${distname}/Modules/_bsddb.c"
-post-extract {
-	file copy	${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-set libdir ${prefix}/lib/db46
-set incdir ${prefix}/include/db46
-depends_lib-append	port:db46
-
-configure	{
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__LIBDIR__|${libdir}|g" ${worksrcpath}/setup.py
-	reinplace "s|__INCDIR__|${incdir}|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-bz2/Portfile
===================================================================
--- trunk/dports/python/py25-bz2/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-bz2/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,37 +5,21 @@
 
 name			py25-bz2
 version			2.5.4
+revision        1
 categories		python
 platforms		darwin
-maintainers		mww
-description		Python bindings to bzip2
+maintainers		nomaintainer
+description		This is a stub. bz2 is now build with python25
 long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-bz2.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-worksrcdir		${worksrcdir}/Modules
+build			{ }
+distfiles
 
-extract.post_args	"| tar -xf - ${distname}/Modules/bz2module.c"
-post-extract {
-	file copy	${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-set libdir ${prefix}/lib/
-set incdir ${prefix}/include/
-depends_lib-append	port:bzip2
-depends_lib		port:python25 port:bzip2
-
-configure	{
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__LIBDIR__|${libdir}|g" ${worksrcpath}/setup.py
-	reinplace "s|__INCDIR__|${incdir}|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-clientcookie/Portfile
===================================================================
--- trunk/dports/python/py25-clientcookie/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-clientcookie/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,8 +22,7 @@
 			sha1    fc54adb762618d3a9fdeca9ed45b982c2bde940c \
 			rmd160  0c557c11efee3ada975235ed72252176c059e5d2
 
-depends_lib-append	port:py25-setuptools \
-                        port:py25-bsddb
+depends_lib-append	port:py25-setuptools
 
 test.run		yes
 test.cmd		${python.bin}

Modified: trunk/dports/python/py25-clientform/Portfile
===================================================================
--- trunk/dports/python/py25-clientform/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-clientform/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,9 +22,6 @@
                     sha1 ab07cf5bc293ffa1676bb7f4c5c756cb2907d782 \
                     rmd160 f82975f171ef3c673d78fa08f7ade3205a0cc87a
 
-depends_lib-append  port:py25-hashlib \
-                    port:py25-zlib
-
 test.run            yes
 test.cmd            ${python.bin}
 test.target         test.py

Modified: trunk/dports/python/py25-curses/Portfile
===================================================================
--- trunk/dports/python/py25-curses/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-curses/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,36 +5,21 @@
 
 name			py25-curses
 version			2.5.4
-revision		1
+revision		2
 categories		python
 platforms		darwin
-maintainers		mww
-description		Python bindings to ncurses
-long_description	Python modules curses and curses-panel
+maintainers		nomaintainer
+description		This is a stub. curses is now build with python25
+long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-curses.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-worksrcdir		${worksrcdir}/Modules
+build			{ }
+distfiles
 
-extract.post_args	"| tar -xf - ${distname}/Modules/_cursesmodule.c \
-			${distname}/Modules/_curses_panel.c"
-post-extract {
-	file copy	${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-depends_lib-append	port:ncursesw
-
-configure	{
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__LIBDIR__|${prefix}/lib|g" ${worksrcpath}/setup.py
-	reinplace "s|__INCDIR__|${prefix}/include|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-cython/Portfile
===================================================================
--- trunk/dports/python/py25-cython/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-cython/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -23,8 +23,6 @@
                     sha1 0066194ec056bfe90ef8358b06501a5250e7f10f \
                     rmd160 84e2d4ae5f092494ebdf8a8f50b9643535693568
 
-depends_lib         port:py25-hashlib
-
 post-destroot {
     xinstall -m 644 -W ${worksrcpath}/Doc About.html FAQ.html \
         extension_types.html index.html overview.html primes.c sharing.html \

Modified: trunk/dports/python/py25-formencode/Portfile
===================================================================
--- trunk/dports/python/py25-formencode/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-formencode/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -17,8 +17,7 @@
 checksums		md5     da23d54af521d1feab12b4caf30e3111 \
 				sha1    573359ec15934be9b1e74c11e1796b8df872c677 \
 				rmd160  e829668f767ff47a5b62416d8ee2ea282fa633bd
-depends_lib		port:py25-hashlib \
-			port:py25-setuptools
+depends_lib		port:py25-setuptools
 
 post-destroot {
 	xinstall -m 644 -W ${worksrcpath}/docs community.txt index.txt news.txt \

Modified: trunk/dports/python/py25-gdata/Portfile
===================================================================
--- trunk/dports/python/py25-gdata/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-gdata/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -23,8 +23,7 @@
                     rmd160 f7e752b1aaa65d123965ca691d75ac17ebf6bc53
 
 depends_lib         port:py25-setuptools \
-                    port:py25-elementtree \
-                    port:py25-socket-ssl
+                    port:py25-elementtree
 
 post-destroot {
 

Modified: trunk/dports/python/py25-gdbm/Portfile
===================================================================
--- trunk/dports/python/py25-gdbm/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-gdbm/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,33 +5,21 @@
 
 name			py25-gdbm
 version			2.5.4
+revision        1
 categories		python databases
 platforms		darwin
-maintainers		mww
-description		Python bindings to the GNU dbm library
+maintainers		nomaintainer
+description		This is a stub. gdbm is now build with python25
 long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-gdbm.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-depends_lib-append	port:gdbm
+build			{ }
+distfiles
 
-worksrcdir	${worksrcdir}/Modules
-
-extract.post_args	"| tar -xf - ${distname}/Modules/gdbmmodule.c"
-post-extract {
-	file copy	${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-patch {
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-hashlib/Portfile
===================================================================
--- trunk/dports/python/py25-hashlib/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-hashlib/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,34 +5,19 @@
 
 name			py25-hashlib
 version			2.5.4
-categories		python
+revision        1
 platforms		darwin
-maintainers		mww
-description		Python secure hash and message digest module
-long_description	Python secure hash and message digest module MD5, SHA1, \
-				SHA224, SHA256, SHA384, SHA512
+maintainers		nomaintainer
+description		This is a stub. hashlib is now build with python25
+long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-hashlib.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
+distfiles
 
-depends_lib-append	port:openssl
-
-worksrcdir		${worksrcdir}/Modules
-
-extract.post_args	"| tar -xf - ${distname}/Modules/_hashopenssl.c"
-post-extract {
-	file copy ${filespath}/setup.py ${worksrcpath}
+build           { }       
+destroot {
+    xinstall -d ${destroot}${prefix}/share/doc/${name}
+    system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-configure {
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-ipython/Portfile
===================================================================
--- trunk/dports/python/py25-ipython/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-ipython/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -26,9 +26,6 @@
 
 use_parallel_build      yes
 
-depends_run-append      port:py25-readline \
-                        port:py25-hashlib
-
 test.run                no
 
 post-destroot {

Modified: trunk/dports/python/py25-lxml/Portfile
===================================================================
--- trunk/dports/python/py25-lxml/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-lxml/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -23,7 +23,7 @@
                   sha1    746ff9e165fc911a34a25936b6ed122f37241504 \
                   rmd160  fd884d36b68391b3093d6ab1a949155b52909b9d
 distname          lxml-${version}
-depends_lib-append port:libxml2 port:libxslt port:py25-hashlib port:py25-setuptools port:py25-zlib
+depends_lib-append port:libxml2 port:libxslt port:py25-setuptools
 
 livecheck.check regex
 livecheck.url   ${master_sites}

Modified: trunk/dports/python/py25-matplotlib/Portfile
===================================================================
--- trunk/dports/python/py25-matplotlib/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-matplotlib/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -83,7 +83,6 @@
 }
 
 variant tkinter description "Enable tkAgg backend" {
-  depends_lib-append port:py25-tkinter
   post-patch {
     reinplace "s|^tkagg=False|tkagg=True|" ${worksrcpath}/setup.cfg
   }

Modified: trunk/dports/python/py25-mutagen/Portfile
===================================================================
--- trunk/dports/python/py25-mutagen/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-mutagen/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -26,7 +26,6 @@
                     sha1    831e618f6f0778a5cc285332d3d1e363dd31d652 \
                     rmd160  2763d311941e8408d800d929a731a89f443c66b6
 
-depends_lib     port:py25-zlib
 livecheck.check		regex
 livecheck.url		http://code.google.com/p/quodlibet/downloads/list
 livecheck.regex "mutagen-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-numpy/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -23,7 +23,6 @@
                     patch-f2py_setup.py.diff
 
 depends_lib-append  port:fftw-3 \
-                    port:py25-hashlib \
                     port:py25-nose
 
 post-patch {

Modified: trunk/dports/python/py25-opengl/Portfile
===================================================================
--- trunk/dports/python/py25-opengl/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-opengl/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -25,7 +25,7 @@
                     rmd160  9ee8598410fb0384ded76b691b8cb89914ea95c7
 
 depends_build-append port:py25-setuptools
-depends_lib-append   port:py25-tkinter port:py25-pil port:py25-numpy
+depends_lib-append   port:py25-pil port:py25-numpy
 
 test.run             yes
 

Modified: trunk/dports/python/py25-pmw/Portfile
===================================================================
--- trunk/dports/python/py25-pmw/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-pmw/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,5 +22,3 @@
                     rmd160 ad3fca73405a8c8a7e2ec81096b00665e2937964
 
 worksrcdir          ${distname}/src
-
-depends_lib-append  port:py25-tkinter

Modified: trunk/dports/python/py25-pydicom/Portfile
===================================================================
--- trunk/dports/python/py25-pydicom/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-pydicom/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -26,5 +26,4 @@
                     sha1 d6a7c91e7408e513690d67284f9347d739ebacea \
                     rmd160 53e2b5177d3a2b44d9f3150016ff25023905b5b2
 
-depends_lib-append  port:py25-numpy \
-                    port:py25-zlib
+depends_lib-append  port:py25-numpy

Modified: trunk/dports/python/py25-pygments/Portfile
===================================================================
--- trunk/dports/python/py25-pygments/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-pygments/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -20,7 +20,7 @@
 master_sites        http://pypi.python.org/packages/source/P/Pygments
 distname            Pygments-${version}
 
-depends_lib         port:py25-setuptools port:py25-hashlib
+depends_lib         port:py25-setuptools
 
 checksums           md5     70c40ff5331460cabfcb24f86a8d451d \
                     sha1    b71e33147fc402e361227b30e1f589eecafd42a7 \

Modified: trunk/dports/python/py25-pyobjc2-cocoa/Portfile
===================================================================
--- trunk/dports/python/py25-pyobjc2-cocoa/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-pyobjc2-cocoa/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -16,9 +16,7 @@
 
 homepage        http://pyobjc.sourceforge.net/
 
-depends_lib-append     port:py25-pyobjc2 \
-                port:py25-hashlib \
-                port:py25-zlib
+depends_lib-append     port:py25-pyobjc2
 
 fetch.type      svn
 svn.url         http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-framework-Cocoa/

Modified: trunk/dports/python/py25-pyrex/Portfile
===================================================================
--- trunk/dports/python/py25-pyrex/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-pyrex/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,8 +22,6 @@
                   sha1 8ee6fa87bae48a74f58e8328316aff4863ef7c05 \
                   rmd160 ff79e39956afecf354bbe71d9f1e15cf9abf153d
 
-depends_lib-append  port:py25-hashlib
-
 post-destroot {
   xinstall -m 644 -W ${worksrcpath}/Doc About.html FAQ.html \
     index.html primes.c ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/python/py25-pyx/Portfile
===================================================================
--- trunk/dports/python/py25-pyx/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-pyx/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,7 +22,7 @@
 distname		PyX-${version}
 checksums		sha1 e8a9219192daff9fd8eb479d5987cbc7e37b0188
 
-depends_lib-append	bin:tex:texlive port:py25-zlib
+depends_lib-append	bin:tex:texlive
 
 post-destroot {
 	xinstall -m 644 -W ${worksrcpath} AUTHORS CHANGES INSTALL LICENSE \

Modified: trunk/dports/python/py25-readline/Portfile
===================================================================
--- trunk/dports/python/py25-readline/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-readline/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,33 +5,21 @@
 
 name			py25-readline
 version			2.5.4
+revision        1
 categories		python
 platforms		darwin
-maintainers		mww
-description		readline extension for Python
+maintainers		nomaintainer
+description		This is a stub. readline is now build with python25
 long_description	${description}
 
 homepage		http://www.python.org/
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-depends_lib-append	port:readline
+build			{ }
+distfiles
 
-worksrcdir		${worksrcdir}/Modules
-
-extract.post_args	"| tar -xf - ${distname}/Modules/readline.c"
-post-extract {
-	file copy ${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-configure {
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-scipy/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,7 +22,6 @@
 
 depends_lib-append      port:py25-numpy \
                         port:py25-nose \
-                        port:py25-zlib \
                         port:SuiteSparse \
                         port:swig
 

Modified: trunk/dports/python/py25-setuptools/Portfile
===================================================================
--- trunk/dports/python/py25-setuptools/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-setuptools/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -19,10 +19,6 @@
 master_sites		http://cheeseshop.python.org/packages/source/s/setuptools/
 distname			setuptools-${version}
 
-depends_build			port:py25-hashlib
-
-depends_lib-append		port:py25-zlib
-
 checksums           md5     3864c01d9c719c8924c455714492295e \
                     sha1    79086433b341f0c1df45e10d586a7d3cc25089f1 \
                     rmd160  bc0ee3821e76b57fd13425b16c4419dbccf95ed9

Modified: trunk/dports/python/py25-smisk/Portfile
===================================================================
--- trunk/dports/python/py25-smisk/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-smisk/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -21,7 +21,6 @@
 
 depends_lib-append  port:fcgi \
                     port:py25-setuptools \
-                    port:py25-readline \
                     port:py25-elixir \
                     port:py25-mako \
                     port:py25-cjson \
@@ -31,8 +30,7 @@
   # Smisk will tell the user when she is trying to use a part of Smisk which
   # requires a certain module which is not available, thus no extra
   # configuration is required.
-  depends_lib-delete  port:py25-readline \
-                      port:py25-elixir \
+  depends_lib-delete  port:py25-elixir \
                       port:py25-mako \
                       port:py25-cjson \
                       port:py25-yaml

Modified: trunk/dports/python/py25-socket-ssl/Portfile
===================================================================
--- trunk/dports/python/py25-socket-ssl/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-socket-ssl/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,33 +5,21 @@
 
 name			py25-socket-ssl
 version			2.5.4
+revision        1
 categories		python
 platforms		darwin
-maintainers		mww
-description		Python secure sockets via OpenSSL
+maintainers		nomaintainer
+description		This is a stub. socket-ssl is now build with python25
 long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/ssl-objects.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-depends_lib-append	port:openssl
+build			{ }
+distfiles
 
-worksrcdir		${worksrcdir}/Modules
-
-extract.post_args	"| tar -xf - ${distname}/Modules/_ssl.c ${distname}/Modules/socketmodule.h"
-post-extract {
-	file copy ${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-configure {
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-sqlite3/Portfile
===================================================================
--- trunk/dports/python/py25-sqlite3/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-sqlite3/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,36 +5,21 @@
 
 name			py25-sqlite3
 version			2.5.4
+revision        1
 categories		python databases
 platforms		darwin
-maintainers		mww
-description		Python bindings to sqlite3
+maintainers		nomaintainer
+description		This is a stub. sqlite3 is now build with python25
 long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-sqlite3.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-worksrcdir		${worksrcdir}/Modules
+build			{ }
+distfiles
 
-extract.post_args	"| tar -xf - ${distname}/Modules/_sqlite"
-post-extract {
-	file copy	${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-set libdir ${prefix}/lib/
-set incdir ${prefix}/include/
-depends_lib-append	port:sqlite3
-
-configure	{
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__LIBDIR__|${libdir}|g" ${worksrcpath}/setup.py
-	reinplace "s|__INCDIR__|${incdir}|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-tkinter/Portfile
===================================================================
--- trunk/dports/python/py25-tkinter/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-tkinter/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,34 +5,21 @@
 
 name			py25-tkinter
 version			2.5.4
+revision        1
 categories		python graphics
 platforms		darwin
-maintainers		mww
-description		Python bindings to the Tk widget set
+maintainers		nomaintainer
+description		This is a stub. tkinter is now build with python25
 long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-Tkinter.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-depends_lib-append	port:tcl port:tk
+build			{ }
+distfiles
 
-worksrcdir		${worksrcdir}/Modules
-
-extract.post_args	"| tar -xf - ${distname}/Modules/_tkinter.c \
-				${distname}/Modules/tkappinit.c"
-post-extract {
-	file copy	${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-configure {
-	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
-	reinplace "s|__TK-VERSION__|8.5|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/py25-yum-metadata-parser/Portfile
===================================================================
--- trunk/dports/python/py25-yum-metadata-parser/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-yum-metadata-parser/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -16,7 +16,7 @@
 distname		yum-metadata-parser-${version}
 checksums		md5 13df226ef004ea78eebc59022720b536
 
-depends_lib-append	port:py25-sqlite3 port:glib2 port:libxml2 port:sqlite3
+depends_lib-append	port:glib2 port:libxml2 port:sqlite3
 depends_build-append	port:pkgconfig
 
 livecheck.check regex

Modified: trunk/dports/python/py25-zlib/Portfile
===================================================================
--- trunk/dports/python/py25-zlib/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/py25-zlib/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -5,34 +5,20 @@
 
 name			py25-zlib
 version			2.5.4
-categories		python
+revision        1
 platforms		darwin
-maintainers		mww
-description		Python bindings to zlib
+maintainers		nomaintainer
+description		This is a stub. zlib is now built with python25
 long_description	${description}
 
 homepage		http://www.python.org/doc/current/lib/module-zlib.html
-master_sites	http://www.python.org/ftp/python/${version}/
-distname		Python-${version}
-dist_subdir		python25
-checksums		sha1 0f2e819d6381f72f26c734e00a6780b3933ea404
-use_bzip2		yes
 
-worksrcdir		${worksrcdir}/Modules
+build			{ }
+distfiles
 
-extract.post_args	"| tar -xf - ${distname}/Modules/zlibmodule.c"
-post-extract {
-	file copy	${filespath}/setup.py ${worksrcpath}
+destroot {
+	xinstall -d ${destroot}${prefix}/share/doc/${name}
+	system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-depends_lib-append	port:zlib
-
-configure {
-	reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
-	reinplace "s|__LIBDIR__|${prefix}/lib|g" ${worksrcpath}/setup.py
-	reinplace "s|__INCDIR__|${prefix}/include|g" ${worksrcpath}/setup.py
-}
-
-livecheck.check	regex
-livecheck.url	http://www.python.org/download/releases/
-livecheck.regex	Python (2.5\[0-9\.\]+)
+livecheck.check	none

Modified: trunk/dports/python/rdiff-backup/Portfile
===================================================================
--- trunk/dports/python/rdiff-backup/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/rdiff-backup/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -31,9 +31,7 @@
 platforms       darwin
 
 depends_lib-append  port:librsync \
-                    port:py25-hashlib \
-                    port:py25-xattr \
-                    port:py25-zlib
+                    port:py25-xattr
 
 patchfiles      patch-setup.py \
                 patch-rdiff-backup.1

Modified: trunk/dports/python/rdiff-backup-devel/Portfile
===================================================================
--- trunk/dports/python/rdiff-backup-devel/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/python/rdiff-backup-devel/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -35,9 +35,7 @@
 platforms		darwin
 
 depends_lib-append	lib:librsync:librsync \
-			port:py25-hashlib \
-			port:py25-xattr \
-			port:py25-zlib
+			port:py25-xattr
 
 patchfiles		patch-setup.py.diff \
 			patch-rdiff-backup.1.diff

Modified: trunk/dports/science/bkchem/Portfile
===================================================================
--- trunk/dports/science/bkchem/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/science/bkchem/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -18,8 +18,6 @@
                     sha1 0a3ea20ef4aa1348553a0ae2eded2cfc01180f8e \
                     rmd160 3489f9c39171befa4d89df54667becef61f9657c
 
-depends_lib-append  port:py25-tkinter
-
 patchfiles          patch-setup.py.diff
 
 post-patch {

Modified: trunk/dports/science/glue/Portfile
===================================================================
--- trunk/dports/science/glue/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/science/glue/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -24,9 +24,7 @@
 
 depends_lib-append port:py25-numpy \
                    port:py25-pyrxp \
-                   port:py25-socket-ssl \
                    port:py25-m2crypto \
-                   port:py25-sqlite3 \
                    port:py25-cjson
 
 livecheck.check  regex

Modified: trunk/dports/science/lscsoft-deps/Portfile
===================================================================
--- trunk/dports/science/lscsoft-deps/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/science/lscsoft-deps/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -22,9 +22,7 @@
               port:python_select \
               port:py25-numpy \
               port:py25-pyrxp \
-              port:py25-socket-ssl \
               port:py25-m2crypto \
-              port:py25-sqlite3 \
               port:py25-cjson \
               port:pkgconfig \
               port:fftw-3 \

Modified: trunk/dports/security/kedpm/Portfile
===================================================================
--- trunk/dports/security/kedpm/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/security/kedpm/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -25,8 +25,7 @@
 use_bzip2	    yes
 checksums           sha1 7319b45efced4995d85fba0bceefb5c5f0313852
 
-depends_lib	    port:python25 port:py25-crypto port:py25-hashlib \
-		    port:py25-gtk port:py25-readline port:libglade2
+depends_lib	    port:python25 port:py25-crypto port:py25-gtk port:libglade2
 
 use_configure	    no
 # use_build doesn't seem to exist

Modified: trunk/dports/sysutils/duplicity/Portfile
===================================================================
--- trunk/dports/sysutils/duplicity/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/sysutils/duplicity/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -31,8 +31,6 @@
 
 depends_run-append  port:py25-gnupg \
                     port:py25-boto \
-                    port:py25-zlib \
-                    port:py25-hashlib \
                     port:ncftp
 
 build.cmd-append    --librsync-dir=${prefix}

Modified: trunk/dports/www/linkchecker/Portfile
===================================================================
--- trunk/dports/www/linkchecker/Portfile	2009-06-07 09:54:16 UTC (rev 51954)
+++ trunk/dports/www/linkchecker/Portfile	2009-06-07 10:04:10 UTC (rev 51955)
@@ -23,7 +23,6 @@
 master_sites	sourceforge
 checksums		sha1 392d7e21ea1319b4a81616dad06cf4d0d1ad77a6
 distname		LinkChecker-${version}
-depends_lib-append	port:py25-zlib
 
 livecheck.check	freshmeat
 livecheck.version	5.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090607/7cd8dd31/attachment-0001.html>


More information about the macports-changes mailing list