Revision: 12496
http://gar.svn.sourceforge.net/gar/?rev=12496&view=rev
Author: wahwah
Date: 2011-01-11 10:28:19 +0000 (Tue, 11 Jan 2011)
Log Message:
-----------
python-2.7: Fix file collisions
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums
Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
2011-01-11 03:50:39 UTC (rev 12495)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile
2011-01-11 10:28:19 UTC (rev 12496)
@@ -1,7 +1,7 @@
# $Id$
NAME = Python
-VERSION = 2.7
+VERSION = 2.7.1
CATEGORIES = lang
VER = 2.7
DVER = 2-7
@@ -52,8 +52,6 @@
# Test for sunaudiodev fails.
SKIPTEST = 1
-# EXTRA_INC += $(prefix)/bdb47/include
-# EXTRA_LIB += $(prefix)/bdb47/lib
BASECFLAGS = $(CFLAGS)
EXTRA_COMMON_EXPORTS = BASECFLAGS
@@ -70,7 +68,7 @@
# This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses.
# PYCOMPILE = 1
-EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
+EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
# use prototype filters to set the class
PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print
}'
@@ -167,4 +165,16 @@
CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_
CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER)
+# Checkpkg does not understand relocatable packages.
+CHECKPKG_OVERRIDES_CSWpython$(CVER) +=
soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/python2.7/lib-dynload/gdbm.so
+CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm
+
+# To avoid file collisions with CSWpython:
+EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),'
+EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),'
+EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),'
+EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),'
+EXTRA_PAX_ARGS += -s
',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),'
+EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python
+
include gar/category.mk
Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums
2011-01-11 03:50:39 UTC (rev 12495)
+++ csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums
2011-01-11 10:28:19 UTC (rev 12496)
@@ -1 +1 @@
-0e8c9ec32abf5b732bea7d91b38c3339 Python-2.7.tar.bz2
+aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.tar.bz2
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
