[88868] trunk/dports
jmr at macports.org
jmr at macports.org
Fri Jan 13 16:55:52 PST 2012
Revision: 88868
http://trac.macports.org/changeset/88868
Author: jmr at macports.org
Date: 2012-01-13 16:55:49 -0800 (Fri, 13 Jan 2012)
Log Message:
-----------
move gdbm out of python* and into separate py*-gdbm ports (#32687)
Modified Paths:
--------------
trunk/dports/lang/python25/Portfile
trunk/dports/lang/python26/Portfile
trunk/dports/lang/python27/Portfile
trunk/dports/lang/python31/Portfile
trunk/dports/lang/python32/Portfile
trunk/dports/net/avahi/Portfile
trunk/dports/python/py-gdbm/Portfile
Added Paths:
-----------
trunk/dports/lang/python25/files/patch-setup.py-disabled_modules.diff
trunk/dports/lang/python26/files/patch-setup.py-disabled_modules.diff
trunk/dports/lang/python27/files/patch-setup.py-disabled_modules.diff
trunk/dports/lang/python31/files/patch-setup.py-disabled_modules.diff
trunk/dports/lang/python32/files/patch-setup.py-disabled_modules.diff
trunk/dports/python/py-gdbm/files/setup-py3k.py
Removed Paths:
-------------
trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff
trunk/dports/lang/python26/files/patch-setup_no_tkinter.py.diff
trunk/dports/lang/python27/files/patch-setup_no_tkinter.py.diff
trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff
trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff
trunk/dports/python/py25-gdbm/
Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python25/Portfile 2012-01-14 00:55:49 UTC (rev 88868)
@@ -6,7 +6,7 @@
name python25
version 2.5.6
-revision 3
+revision 4
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -36,14 +36,14 @@
patch-setup.py.diff \
patch-configure.diff \
patch-64bit.diff \
- patch-setup_no_tkinter.py.diff \
+ patch-setup.py-disabled_modules.diff \
patch-mac_ver.diff \
patch-libedit.diff \
patch-fwrapv.diff
depends_lib port:gettext port:zlib port:openssl \
port:sqlite3 port:db46 port:bzip2 \
- port:gdbm port:libedit port:ncurses
+ port:libedit port:ncurses
depends_run port:python_select
configure.args --enable-shared \
Copied: trunk/dports/lang/python25/files/patch-setup.py-disabled_modules.diff (from rev 88860, trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff)
===================================================================
--- trunk/dports/lang/python25/files/patch-setup.py-disabled_modules.diff (rev 0)
+++ trunk/dports/lang/python25/files/patch-setup.py-disabled_modules.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -0,0 +1,11 @@
+--- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
++++ setup.py 2009-09-17 00:33:12.000000000 -0600
+@@ -17,7 +17,7 @@
+ from distutils.command.install_lib import install_lib
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter", "gdbm"]
+
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
Deleted: trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python25/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -1,11 +0,0 @@
---- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
-+++ setup.py 2009-09-17 00:33:12.000000000 -0600
-@@ -17,7 +17,7 @@
- from distutils.command.install_lib import install_lib
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_tkinter"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python26/Portfile 2012-01-14 00:55:49 UTC (rev 88868)
@@ -5,9 +5,9 @@
PortGroup select 1.0
name python26
-# Remember to keep py26-tkinter's version sync'd with this
+# Remember to keep py26-tkinter and py26-gdbm's versions sync'd with this
version 2.6.7
-revision 3
+revision 4
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -44,11 +44,11 @@
patch-Mac-Tools-Doc-setup.py.diff \
patch-setup.py-db46.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
- patch-setup_no_tkinter.py.diff \
+ patch-setup.py-disabled_modules.diff \
patch-libedit.diff
depends_lib port:gettext port:zlib port:openssl \
- port:sqlite3 port:db46 port:ncurses port:gdbm \
+ port:sqlite3 port:db46 port:ncurses \
port:bzip2 port:libedit
depends_run port:python_select
Copied: trunk/dports/lang/python26/files/patch-setup.py-disabled_modules.diff (from rev 88860, trunk/dports/lang/python26/files/patch-setup_no_tkinter.py.diff)
===================================================================
--- trunk/dports/lang/python26/files/patch-setup.py-disabled_modules.diff (rev 0)
+++ trunk/dports/lang/python26/files/patch-setup.py-disabled_modules.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -0,0 +1,11 @@
+--- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
++++ setup.py 2009-09-17 00:33:12.000000000 -0600
+@@ -17,7 +17,7 @@
+ from distutils.command.install_lib import install_lib
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter", "gdbm"]
+
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
Deleted: trunk/dports/lang/python26/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python26/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -1,11 +0,0 @@
---- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
-+++ setup.py 2009-09-17 00:33:12.000000000 -0600
-@@ -17,7 +17,7 @@
- from distutils.command.install_lib import install_lib
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_tkinter"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
Modified: trunk/dports/lang/python27/Portfile
===================================================================
--- trunk/dports/lang/python27/Portfile 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python27/Portfile 2012-01-14 00:55:49 UTC (rev 88868)
@@ -6,9 +6,9 @@
name python27
epoch 2
-# Remember to keep py27-tkinter's version sync'd with this
+# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
version 2.7.2
-revision 3
+revision 4
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -27,6 +27,7 @@
ftp://ftp.python.org/pub/python/${version}/
distname Python-${version}
+# consider changing to xz with next release
use_bzip2 yes
checksums md5 ba7b2f11ffdbf195ee0d111b9455a5bd \
@@ -37,7 +38,7 @@
# <http://bugs.python.org/issue5833>
patchfiles patch-Makefile.pre.in.diff \
patch-setup.py.diff \
- patch-setup_no_tkinter.py.diff \
+ patch-setup.py-disabled_modules.diff \
patch-Lib-cgi.py.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-configure.diff \
@@ -50,7 +51,6 @@
port:sqlite3 \
port:db46 \
port:ncurses \
- port:gdbm \
port:bzip2 \
port:libedit
depends_run port:python_select
Copied: trunk/dports/lang/python27/files/patch-setup.py-disabled_modules.diff (from rev 88860, trunk/dports/lang/python27/files/patch-setup_no_tkinter.py.diff)
===================================================================
--- trunk/dports/lang/python27/files/patch-setup.py-disabled_modules.diff (rev 0)
+++ trunk/dports/lang/python27/files/patch-setup.py-disabled_modules.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -0,0 +1,11 @@
+--- setup.py.orig 2010-12-23 09:49:57.000000000 -0500
++++ setup.py 2010-12-23 09:50:13.000000000 -0500
+@@ -21,7 +21,7 @@
+ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter", "gdbm"]
+
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
Deleted: trunk/dports/lang/python27/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python27/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -1,11 +0,0 @@
---- setup.py.orig 2010-12-23 09:49:57.000000000 -0500
-+++ setup.py 2010-12-23 09:50:13.000000000 -0500
-@@ -21,7 +21,7 @@
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_tkinter"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python31/Portfile 2012-01-14 00:55:49 UTC (rev 88868)
@@ -6,9 +6,9 @@
name python31
epoch 1
-# Remember to keep py31-tkinter's version sync'd with this
+# Remember to keep py31-tkinter and py31-gdbm's versions sync'd with this
version 3.1.4
-revision 2
+revision 3
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -33,11 +33,11 @@
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-Lib-distutils-dist.py.diff \
- patch-setup_no_tkinter.py.diff \
+ patch-setup.py-disabled_modules.diff \
patch-libedit.diff
depends_lib port:zlib port:openssl \
- port:sqlite3 port:ncurses port:gdbm \
+ port:sqlite3 port:ncurses \
port:bzip2 port:libedit port:gettext
depends_run port:python_select
Copied: trunk/dports/lang/python31/files/patch-setup.py-disabled_modules.diff (from rev 88860, trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff)
===================================================================
--- trunk/dports/lang/python31/files/patch-setup.py-disabled_modules.diff (rev 0)
+++ trunk/dports/lang/python31/files/patch-setup.py-disabled_modules.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -0,0 +1,11 @@
+--- setup.py.orig 2011-06-12 01:48:52.000000000 +1000
++++ setup.py 2011-07-05 20:35:54.000000000 +1000
+@@ -17,7 +17,7 @@
+ from distutils.spawn import find_executable
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter", "_gdbm"]
+
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
Deleted: trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -1,11 +0,0 @@
---- setup.py.orig 2011-06-12 01:48:52.000000000 +1000
-+++ setup.py 2011-07-05 20:35:54.000000000 +1000
-@@ -17,7 +17,7 @@
- from distutils.spawn import find_executable
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_tkinter"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
Modified: trunk/dports/lang/python32/Portfile
===================================================================
--- trunk/dports/lang/python32/Portfile 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python32/Portfile 2012-01-14 00:55:49 UTC (rev 88868)
@@ -6,9 +6,9 @@
name python32
epoch 20110904
-# Remember to keep py32-tkinter's version sync'd with this
+# Remember to keep py32-tkinter and py32-gdbm's versions sync'd with this
version 3.2.2
-revision 1
+revision 2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -36,11 +36,11 @@
patch-Lib-cgi.py.diff \
patch-Lib-distutils-dist.py.diff \
patch-configure.diff \
- patch-setup_no_tkinter.py.diff \
+ patch-setup.py-disabled_modules.diff \
patch-libedit.diff
depends_lib port:zlib port:openssl \
- port:sqlite3 port:ncurses port:gdbm \
+ port:sqlite3 port:ncurses \
port:bzip2 port:libedit port:gettext
depends_run port:python_select
Copied: trunk/dports/lang/python32/files/patch-setup.py-disabled_modules.diff (from rev 88860, trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff)
===================================================================
--- trunk/dports/lang/python32/files/patch-setup.py-disabled_modules.diff (rev 0)
+++ trunk/dports/lang/python32/files/patch-setup.py-disabled_modules.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -0,0 +1,11 @@
+--- setup.py.orig 2011-07-09 16:58:56.000000000 +1000
++++ setup.py 2011-07-13 20:50:12.000000000 +1000
+@@ -21,7 +21,7 @@
+ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter", "_gdbm"]
+
+ # File which contains the directory for shared mods (for sys.path fixup
+ # when running from the build dir, see Modules/getpath.c)
Deleted: trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/lang/python32/files/patch-setup_no_tkinter.py.diff 2012-01-14 00:55:49 UTC (rev 88868)
@@ -1,11 +0,0 @@
---- setup.py.orig 2011-07-09 16:58:56.000000000 +1000
-+++ setup.py 2011-07-13 20:50:12.000000000 +1000
-@@ -21,7 +21,7 @@
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_tkinter"]
-
- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
Modified: trunk/dports/net/avahi/Portfile
===================================================================
--- trunk/dports/net/avahi/Portfile 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/net/avahi/Portfile 2012-01-14 00:55:49 UTC (rev 88868)
@@ -66,6 +66,7 @@
depends_lib-append port:dbus-python25 \
port:py25-gtk \
+ port:py25-gdbm
}
variant python26 conflicts python25 python27 description {Use python 2.6} {
@@ -73,6 +74,7 @@
depends_lib-append port:dbus-python26 \
port:py26-gtk \
+ port:py26-gdbm
}
variant python27 conflicts python25 python26 description {Use python 2.7} {
@@ -80,6 +82,7 @@
depends_lib-append port:dbus-python27 \
port:py27-gtk \
+ port:py27-gdbm
}
if {![variant_isset python25] && ![variant_isset python26]} {
Modified: trunk/dports/python/py-gdbm/Portfile
===================================================================
--- trunk/dports/python/py-gdbm/Portfile 2012-01-14 00:32:42 UTC (rev 88867)
+++ trunk/dports/python/py-gdbm/Portfile 2012-01-14 00:55:49 UTC (rev 88868)
@@ -2,39 +2,91 @@
# $Id$
PortSystem 1.0
-PortGroup python24 1.0
+PortGroup python 1.0
name py-gdbm
version 2.4.6
-revision 1
categories python databases
platforms darwin
maintainers nomaintainer
description Python bindings to the GNU dbm library
long_description ${description}
-homepage http://www.python.org/doc/current/lib/module-gdbm.html
+homepage http://docs.python.org/library/gdbm.html
+
+python.versions 24 25 26 27 31 32
+
+set setup_py "setup.py"
+set cfile "gdbmmodule.c"
+subport py24-gdbm {
+ use_bzip2 yes
+ checksums sha1 cb1972a554a458f6a26d3e047b359251865d7c96 \
+ rmd160 0687989193dec2ac108142759281be7ddcf7f31e
+ livecheck.regex Python (2.4.\[0-9\]+)
+}
+subport py25-gdbm {
+ version 2.5.6
+ use_bzip2 yes
+ checksums sha1 29f6dd41bf09c5e04311b367cbb7604fa016e699 \
+ rmd160 92f0a955971f187a7d50c6422168202ec551bf22
+ livecheck.regex Python (2.5.\[0-9\]+)
+}
+subport py26-gdbm {
+ version 2.6.7
+ use_bzip2 yes
+ checksums sha1 5d35eb746e85fb3deaff8518448137c9b9fb6daa \
+ rmd160 513e84a7cb76ca876e3803bb03ed558bd0378063
+ livecheck.regex Python (2.6.\[0-9\]+)
+}
+subport py27-gdbm {
+ version 2.7.2
+ # consider changing to xz with next release (in sync with python27)
+ use_bzip2 yes
+ checksums sha1 417bdeea77abfaf1b9257fc6b4a04aaa209f4547 \
+ rmd160 c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
+ livecheck.regex Python (2.7.\[0-9\]+)
+}
+subport py31-gdbm {
+ version 3.1.4
+ use_xz yes
+ checksums sha1 e5767a4fc92433816451de75c8721f2e1a81f6ea \
+ rmd160 beb24a2a1227aa2bc036263b4c808daa72fa3e02
+ set setup_py "setup-py3k.py"
+ set cfile "_gdbmmodule.c"
+ livecheck.regex Python (3.1.\[0-9\]+)
+}
+subport py32-gdbm {
+ version 3.2.2
+ # consider changing to xz with next release (in sync with python32)
+ use_bzip2 yes
+ checksums sha1 3be9287068c9b4c3e5f46f03ccb0f365b56ed56d \
+ rmd160 029d7ae5fbfaad6fc9ab3fea4ddd53943159976e
+ set setup_py "setup-py3k.py"
+ set cfile "_gdbmmodule.c"
+ livecheck.regex Python (3.2.\[0-9\]+)
+}
+
+distname Python-${version}
master_sites http://www.python.org/ftp/python/${version}/
-distname Python-${version}
-dist_subdir python24
-checksums sha1 cb1972a554a458f6a26d3e047b359251865d7c96
-use_bzip2 yes
-depends_lib-append port:gdbm
+if {$subport != $name} {
+ depends_lib-append port:gdbm
-worksrcdir ${worksrcdir}/Modules
+ dist_subdir python${python.version}
-extract.post_args "| tar -xf - ${distname}/Modules/gdbmmodule.c"
-post-extract {
- file copy ${filespath}/setup.py ${worksrcpath}
-}
+ worksrcdir ${worksrcdir}/Modules
-patch {
- reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
- reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
+ extract.post_args "| tar -xf - ${distname}/Modules/${cfile}"
+ post-extract {
+ file copy ${filespath}/${setup_py} ${worksrcpath}/setup.py
+ }
+
+ patch {
+ reinplace "s|__VERSION__|${version}|g" ${worksrcpath}/setup.py
+ reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
+ }
}
livecheck.type regex
livecheck.url http://www.python.org/download/releases/
-livecheck.regex Python (2.4.\[0-9\]+)
Copied: trunk/dports/python/py-gdbm/files/setup-py3k.py (from rev 88860, trunk/dports/python/py-gdbm/files/setup.py)
===================================================================
--- trunk/dports/python/py-gdbm/files/setup-py3k.py (rev 0)
+++ trunk/dports/python/py-gdbm/files/setup-py3k.py 2012-01-14 00:55:49 UTC (rev 88868)
@@ -0,0 +1,22 @@
+try:
+ import distutils
+ from distutils import sysconfig
+ from distutils.command.install import install
+ from distutils.core import setup, Extension
+except:
+ raise SystemExit("Distutils problem")
+
+prefix = "__PREFIX__"
+inc_dirs = [prefix + "/include"]
+lib_dirs = [prefix + "/lib"]
+libs = ["gdbm"]
+
+setup(name = "gdbm",
+ version = "__VERSION__",
+ description = "GDBM Extension to Python",
+
+ ext_modules = [Extension('_gdbm', ['_gdbmmodule.c'],
+ include_dirs = inc_dirs,
+ libraries = libs,
+ library_dirs = lib_dirs)]
+ )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120113/4863ab35/attachment-0001.html>
More information about the macports-changes
mailing list