[csw-devel] SF.net SVN: gar:[9385] csw/mgar/pkg/python/branches

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Mar 26 17:14:27 CET 2010 

Revision: 9385
          http://gar.svn.sourceforge.net/gar/?rev=9385&view=rev
Author:   wahwah
Date:     2010-03-26 16:14:27 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
python: Upgrade to 2.6.5, using CSW X11, using the right Berkeley DB library path (/opt/csw/bdb47/lib instead of the legacy link /opt/csw/lib)

Modified Paths:
--------------
    csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile
    csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums

Property Changed:
----------------
    csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile

Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile
===================================================================
--- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile	2010-03-26 16:11:33 UTC (rev 9384)
+++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile	2010-03-26 16:14:27 UTC (rev 9385)
@@ -1,5 +1,7 @@
+# $Id$
+
 GARNAME = Python
-GARVERSION = 2.6.4
+GARVERSION = 2.6.5
 CATEGORIES = lang
 
 # Known issues:
@@ -42,16 +44,16 @@
 PATCHFILES += site.diff
 PATCHFILES += python-config-in.diff
 PATCHFILES += setup.diff
-PATCHFILES += getpass.patch
 
-# Fix for Python bug 7242: Forking in a thread raises RuntimeError
-#   http://bugs.python.org/issue7242
-# This shows up in failing tests on Mercurial
-PATCHFILES += patch_2.diff.txt
-
 # Test for sunaudiodev fails.
 SKIPTEST = 1
 
+EXTRA_INC += $(prefix)/X11/include
+EXTRA_LIB += $(prefix)/X11/lib
+EXTRA_LIB += $(prefix)/bdb47/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
 BASECFLAGS = $(CFLAGS)
 EXTRA_COMMON_EXPORTS = BASECFLAGS
 
@@ -74,7 +76,6 @@
 PACKAGES  = CSWidle
 PACKAGES += CSWpython
 PACKAGES += CSWpython-devel
-PACKAGES += CSWpython-rt
 PACKAGES += CSWpython-test
 PACKAGES += CSWpython-tk
 
@@ -88,7 +89,6 @@
 # No idea why would this be in CSWpython, and no good idea for a better package
 # to put it.
 PKGFILES_CSWpython-devel += $(bindir)/smtpd.py
-PKGFILES_CSWpython-rt = non-existing
 PKGFILES_CSWpython-tk  = $(libdir)/.*/lib-tk/.*
 PKGFILES_CSWpython-tk += $(libdir)/.*/lib-dynload/_tkinter.so.*
 PKGFILES_CSWpython-test  = $(libdir)/python/test/.*
@@ -100,46 +100,49 @@
 PKGFILES_CSWpython-test += $(libdir)/python/lib2to3/tests.*
 PKGFILES_CSWpython-test += $(libdir)/python/sqlite3/test.*
 
-ARCHALL_CSWpython-rt   = 1
 ARCHALL_CSWpython-test = 1
 ARCHALL_CSWidle        = 1
 
-RUNTIME_DEP_PKGS_CSWidle         = CSWpython CSWpython-tk
-RUNTIME_DEP_PKGS_CSWpython       = CSWbdb47 CSWbzip2 CSWgdbm CSWggettextrt 
-RUNTIME_DEP_PKGS_CSWpython      += CSWncurses CSWosslrt CSWreadline 
-RUNTIME_DEP_PKGS_CSWpython      += CSWsqlite3rt CSWzlib
-RUNTIME_DEP_PKGS_CSWpython-tk    = CSWpython CSWtcl CSWtk 
-RUNTIME_DEP_PKGS_CSWpython-devel = CSWpython
-RUNTIME_DEP_PKGS_CSWpython-test  = CSWpython
-RUNTIME_DEP_PKGS_CSWpython-rt    = CSWpython
+RUNTIME_DEP_PKGS_CSWidle          = CSWpython CSWpython-tk
+RUNTIME_DEP_PKGS_CSWpython       += CSWbdb47
+RUNTIME_DEP_PKGS_CSWpython       += CSWbzip2
+RUNTIME_DEP_PKGS_CSWpython       += CSWgdbm
+RUNTIME_DEP_PKGS_CSWpython       += CSWggettextrt 
+RUNTIME_DEP_PKGS_CSWpython       += CSWncurses
+RUNTIME_DEP_PKGS_CSWpython       += CSWosslrt
+RUNTIME_DEP_PKGS_CSWpython       += CSWreadline 
+RUNTIME_DEP_PKGS_CSWpython       += CSWsqlite3rt CSWzlib
+RUNTIME_DEP_PKGS_CSWpython-tk    += CSWpython
+RUNTIME_DEP_PKGS_CSWpython-tk    += CSWtcl
+RUNTIME_DEP_PKGS_CSWpython-tk    += CSWtk 
+RUNTIME_DEP_PKGS_CSWpython-tk    += CSWlibx11
+RUNTIME_DEP_PKGS_CSWpython-devel  = CSWpython
+RUNTIME_DEP_PKGS_CSWpython-test  += CSWpython
 
-CATALOGNAME_CSWidle = idle
-CATALOGNAME_CSWpython = python
+CATALOGNAME_CSWidle         = idle
+CATALOGNAME_CSWpython       = python
 CATALOGNAME_CSWpython-devel = python_devel
-CATALOGNAME_CSWpython-rt = python_rt
-CATALOGNAME_CSWpython-tk = python_tk
-CATALOGNAME_CSWpython-test = python_test
+CATALOGNAME_CSWpython-tk    = python_tk
+CATALOGNAME_CSWpython-test  = python_test
 
-SPKG_DESC_CSWidle = Python IDE
-SPKG_DESC_CSWpython = A high-level scripting language.
+SPKG_DESC_CSWidle         = Python IDE
+SPKG_DESC_CSWpython       = A high-level scripting language.
 SPKG_DESC_CSWpython-devel = Development Files for Python
-SPKG_DESC_CSWpython-rt = An empty, obsolete package
-SPKG_DESC_CSWpython-tk = Python Tk Interface (TkInter)
-SPKG_DESC_CSWpython-test = Python Test modules
+SPKG_DESC_CSWpython-tk    = Python Tk Interface (TkInter)
+SPKG_DESC_CSWpython-test  = Python Test modules
 
 LICENSE = LICENSE
 
-# Checkpkg should be able to guess that, perhaps symlink information is
-# missing?
-CHECKPKG_OVERRIDES_CSWpython       += missing-dependency|CSWbdb
-CHECKPKG_OVERRIDES_CSWpython       += symbol-not-found|_curses_panel.so
-CHECKPKG_OVERRIDES_CSWpython       += symbol-not-found|_cursesmodule.so
-CHECKPKG_OVERRIDES_CSWpython       += symbol-not-found|xxsubtype.so
-CHECKPKG_OVERRIDES_CSWpython-devel  = symbol-not-found|python.o
+# Need to adjust the RPATH:
+# CHECKPKG_OVERRIDES_CSWpython       += missing-dependency|CSWbdb
+# CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWbdb47
 
-# Dago: This override line doesn't make it to the override file.  Can you look
-# into it?
-CHECKPKG_OVERRIDES_CSWpython-rt     = action-class-only-in-pkginfo|cswpycompile
+# These won't be fixed.
+CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/lib/libpython2.5.so.1.0
+CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/lib/libpython2.5.so.1.0
+# Amusingly, now the overrides file contains the bad data.
+CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/python
+CHECKPKG_OVERRIDES_CSWpython += file-with-bad-content|/opt/build|root/opt/csw/share/checkpkg/overrides/python
 
 include gar/category.mk
 


Property changes on: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums
===================================================================
--- csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums	2010-03-26 16:11:33 UTC (rev 9384)
+++ csw/mgar/pkg/python/branches/python-2.6.4+patch7242/checksums	2010-03-26 16:14:27 UTC (rev 9385)
@@ -1,12 +1,10 @@
-fee5408634a54e721a93531aba37f8c1  Python-2.6.4.tar.bz2
+6bef0417e71a1a1737ccf5750420fdb3  Python-2.6.5.tar.bz2
 42dd6523beb94a805d5764ae1276091c  faqwiz.diff
-88e213f865894051cdd8d3247502d612  getpass.patch
 5664b3970307d7d39d8d4061e7dccbb0  libpython2.5.so.1.0-isa-i386
 a87896c48b2f61b32053e6d02b07b022  libpython2.5.so.1.0-isa-sparcv8
 33f4094ee46ce865d3973a197f3fb4a0  makesetup.diff
 22c5f741b1744213eaef0818ab280ad5  modules.diff
 afcc79a94e2f8a576c7906a9700e35a0  multiprocess.diff
-851c64bcab0b4d91d2c14f7f63d53500  patch_2.diff.txt
 05724da367b025ce525de2bb704af6e3  pyport.diff
 a1d114e8a20870675649aeef007a9cac  python-config-in.diff
 1d2763e140ff30a491b3ce11d1a44f97  setup.diff


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list