cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Python 2.7.2 to 2.7.3.

Browse Source 
ok mpi@, gonzalo@. tested in a bulk build by landry@.
This commit is contained in:
rpointel 2012-04-27 08:18:59 +00:00
parent fa5e146cc5
commit 58f0310490
12 changed files with 72 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lang/python/2.7/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.18 2012/04/23 17:15:18 espie Exp $
# $OpenBSD: Makefile,v 1.19 2012/04/27 08:18:59 rpointel Exp $
VERSION = 2.7
PATCHLEVEL = .2
PATCHLEVEL = .3
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
REVISION = 0
AUTOCONF_VERSION = 2.68
AUTOCONF_VERSION = 2.67
CONFIGURE_ARGS += --with-cxx_main \
--with-system-expat

10
lang/python/2.7/distinfo
View File

@ -1,5 +1,5 @@
MD5 (Python-2.7.2.tgz) = Dd/iZfGz0KjCRZ9b9miUxw==
RMD160 (Python-2.7.2.tgz) = HdgHP3CLkrtXttOsqRS1T4HxBxw=
SHA1 (Python-2.7.2.tgz) = WnTB2ubCpMI9D5rqs09sskd03PM=
SHA256 (Python-2.7.2.tgz) = HVS3CWwXkCw/QP/OfluE4ActAUQCQYT/8YSoTVY6u7M=
SIZE (Python-2.7.2.tgz) = 14091337
MD5 (Python-2.7.3.tgz) = LPZBcyrCOxjROb4He9kGzQ==
RMD160 (Python-2.7.3.tgz) = Ze33KmJ+bXsebyVn63Xbx0pGZh4=
SHA1 (Python-2.7.3.tgz) = 2+SG3RUCLtMuu6xOZyJeKAupPDs=
SHA256 (Python-2.7.3.tgz) = 1MIPK1+vlZmf1f7LP30yBxsIIFFiJKbStykyq0ehy44=
SIZE (Python-2.7.3.tgz) = 14135620

13
lang/python/2.7/patches/patch-Lib_test_test_fcntl_py
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-Lib_test_test_fcntl_py,v 1.3 2012/02/27 19:30:46 rpointel Exp $
--- Lib/test/test_fcntl.py.orig Wed Jul 6 15:47:34 2011
+++ Lib/test/test_fcntl.py Wed Jul 6 15:47:52 2011
@@ -32,7 +32,8 @@ def get_lockdata():
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
'freebsd6', 'freebsd7', 'freebsd8',
'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
+ 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4',
+ 'openbsd5'):
if struct.calcsize('l') == 8:
off_t = 'l'
pid_t = 'i'

8
lang/python/2.7/patches/patch-Lib_test_test_tempfile_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Lib_test_test_tempfile_py,v 1.1 2011/07/07 21:32:39 jasper Exp $
--- Lib/test/test_tempfile.py.orig Wed Jul 6 15:48:23 2011
+++ Lib/test/test_tempfile.py Wed Jul 6 15:48:31 2011
@@ -23,7 +23,7 @@ has_spawnl = hasattr(os, 'spawnl')
$OpenBSD: patch-Lib_test_test_tempfile_py,v 1.2 2012/04/27 08:18:59 rpointel Exp $
--- Lib/test/test_tempfile.py.orig Tue Apr 10 01:07:32 2012
+++ Lib/test/test_tempfile.py Fri Apr 13 07:45:43 2012
@@ -24,7 +24,7 @@ has_spawnl = hasattr(os, 'spawnl')
# TEST_FILES may need to be tweaked for systems depending on the maximum
# number of files that can be opened at one time (see ulimit -n)

28
lang/python/2.7/patches/patch-Makefile_pre_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.3 2012/02/27 19:30:46 rpointel Exp $
--- Makefile.pre.in.orig Sat Jun 11 17:46:26 2011
+++ Makefile.pre.in Sun Feb 19 19:10:29 2012
@@ -363,6 +363,8 @@ LIBRARY_OBJS= \
$OpenBSD: patch-Makefile_pre_in,v 1.4 2012/04/27 08:18:59 rpointel Exp $
--- Makefile.pre.in.orig Tue Apr 10 01:07:33 2012
+++ Makefile.pre.in Fri Apr 13 07:49:16 2012
@@ -364,6 +364,8 @@ LIBRARY_OBJS= \
#########################################################################
# Rules
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.3 2012/02/27 19:30:46 rpointel Exp $
# Default target
all: build_all
build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
@@ -398,7 +400,7 @@ coverage:
@@ -399,7 +401,7 @@ coverage:
$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \
@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.3 2012/02/27 19:30:46 rpointel Exp $
platform: $(BUILDPYTHON)
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
@@ -447,8 +449,12 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
@@ -448,8 +450,12 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
@ -33,15 +33,17 @@ $OpenBSD: patch-Makefile_pre_in,v 1.3 2012/02/27 19:30:46 rpointel Exp $
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
# minimal framework (not including the Lib directory and such) in the current
# directory.
@@ -792,7 +798,6 @@ bininstall: altbininstall
@@ -795,9 +801,6 @@ bininstall: altbininstall
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
- -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
-rm -f $(DESTDIR)$(BINDIR)/python2-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
-rm -f $(DESTDIR)$(BINDIR)/python-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
@@ -802,7 +807,7 @@ bininstall: altbininstall
@@ -811,7 +814,7 @@ bininstall: altbininstall
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
altbininstall: $(BUILDPYTHON)
@ -50,7 +52,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.3 2012/02/27 19:30:46 rpointel Exp $
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
@@ -818,7 +823,8 @@ altbininstall: $(BUILDPYTHON)
@@ -827,7 +830,8 @@ altbininstall: $(BUILDPYTHON)
$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
if test $(LDLIBRARY) != $(INSTSONAME); then \
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
@ -60,7 +62,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.3 2012/02/27 19:30:46 rpointel Exp $
fi; \
else true; \
fi
@@ -947,8 +953,8 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@@ -960,8 +964,8 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdi
./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
# Create the PLATDIR source directory, if one wasn't distributed..

16
lang/python/2.7/patches/patch-Modules_ossaudiodev_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_ossaudiodev_c,v 1.1.1.1 2011/04/24 09:31:44 rpointel Exp $
--- Modules/ossaudiodev.c.orig Mon Jun 9 14:58:54 2008
+++ Modules/ossaudiodev.c Mon Aug 25 08:48:37 2008
$OpenBSD: patch-Modules_ossaudiodev_c,v 1.2 2012/04/27 08:18:59 rpointel Exp $
--- Modules/ossaudiodev.c.orig Tue Apr 10 01:07:34 2012
+++ Modules/ossaudiodev.c Fri Apr 13 07:45:43 2012
@@ -30,7 +30,7 @@
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_ossaudiodev_c,v 1.1.1.1 2011/04/24 09:31:44 rpointel Exp
#if defined(linux)
@@ -1040,6 +1040,7 @@ initossaudiodev(void)
@@ -1046,6 +1046,7 @@ initossaudiodev(void)
/* Expose all the ioctl numbers for masochists who like to do this
stuff directly. */
@ -18,7 +18,7 @@ $OpenBSD: patch-Modules_ossaudiodev_c,v 1.1.1.1 2011/04/24 09:31:44 rpointel Exp
_EXPORT_INT(m, SNDCTL_COPR_HALT);
_EXPORT_INT(m, SNDCTL_COPR_LOAD);
_EXPORT_INT(m, SNDCTL_COPR_RCODE);
@@ -1050,6 +1051,7 @@ initossaudiodev(void)
@@ -1056,6 +1057,7 @@ initossaudiodev(void)
_EXPORT_INT(m, SNDCTL_COPR_SENDMSG);
_EXPORT_INT(m, SNDCTL_COPR_WCODE);
_EXPORT_INT(m, SNDCTL_COPR_WDATA);
@ -26,7 +26,7 @@ $OpenBSD: patch-Modules_ossaudiodev_c,v 1.1.1.1 2011/04/24 09:31:44 rpointel Exp
#ifdef SNDCTL_DSP_BIND_CHANNEL
_EXPORT_INT(m, SNDCTL_DSP_BIND_CHANNEL);
#endif
@@ -1092,18 +1094,25 @@ initossaudiodev(void)
@@ -1098,18 +1100,25 @@ initossaudiodev(void)
_EXPORT_INT(m, SNDCTL_DSP_STEREO);
_EXPORT_INT(m, SNDCTL_DSP_SUBDIVIDE);
_EXPORT_INT(m, SNDCTL_DSP_SYNC);
@ -52,7 +52,7 @@ $OpenBSD: patch-Modules_ossaudiodev_c,v 1.1.1.1 2011/04/24 09:31:44 rpointel Exp
_EXPORT_INT(m, SNDCTL_SEQ_NRMIDIS);
_EXPORT_INT(m, SNDCTL_SEQ_NRSYNTHS);
_EXPORT_INT(m, SNDCTL_SEQ_OUTOFBAND);
@@ -1114,17 +1123,21 @@ initossaudiodev(void)
@@ -1120,17 +1129,21 @@ initossaudiodev(void)
_EXPORT_INT(m, SNDCTL_SEQ_SYNC);
_EXPORT_INT(m, SNDCTL_SEQ_TESTMIDI);
_EXPORT_INT(m, SNDCTL_SEQ_THRESHOLD);
@ -74,7 +74,7 @@ $OpenBSD: patch-Modules_ossaudiodev_c,v 1.1.1.1 2011/04/24 09:31:44 rpointel Exp
_EXPORT_INT(m, SNDCTL_TMR_CONTINUE);
_EXPORT_INT(m, SNDCTL_TMR_METRONOME);
_EXPORT_INT(m, SNDCTL_TMR_SELECT);
@@ -1133,4 +1146,5 @@ initossaudiodev(void)
@@ -1139,4 +1152,5 @@ initossaudiodev(void)
_EXPORT_INT(m, SNDCTL_TMR_STOP);
_EXPORT_INT(m, SNDCTL_TMR_TEMPO);
_EXPORT_INT(m, SNDCTL_TMR_TIMEBASE);

12
lang/python/2.7/patches/patch-Modules_selectmodule_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_selectmodule_c,v 1.2 2011/06/08 08:02:54 rpointel Exp $
--- Modules/selectmodule.c.orig Wed Nov 3 13:27:33 2010
+++ Modules/selectmodule.c Thu Jun 2 00:40:37 2011
@@ -1215,6 +1215,7 @@ static PyTypeObject kqueue_queue_Type;
$OpenBSD: patch-Modules_selectmodule_c,v 1.3 2012/04/27 08:18:59 rpointel Exp $
--- Modules/selectmodule.c.orig Tue Apr 10 01:07:34 2012
+++ Modules/selectmodule.c Fri Apr 13 07:45:44 2012
@@ -1208,6 +1208,7 @@ static PyTypeObject kqueue_queue_Type;
*/
#define KQ_OFF(x) offsetof(kqueue_event_Object, x)
@ -9,7 +9,7 @@ $OpenBSD: patch-Modules_selectmodule_c,v 1.2 2011/06/08 08:02:54 rpointel Exp $
static struct PyMemberDef kqueue_event_members[] = {
{"ident", T_UINTPTRT, KQ_OFF(e.ident)},
{"filter", T_SHORT, KQ_OFF(e.filter)},
@@ -1224,6 +1225,19 @@ static struct PyMemberDef kqueue_event_members[] = {
@@ -1217,6 +1218,19 @@ static struct PyMemberDef kqueue_event_members[] = {
{"udata", T_UINTPTRT, KQ_OFF(e.udata)},
{NULL} /* Sentinel */
};
@ -29,7 +29,7 @@ $OpenBSD: patch-Modules_selectmodule_c,v 1.2 2011/06/08 08:02:54 rpointel Exp $
#undef KQ_OFF
static PyObject *
@@ -1285,10 +1299,10 @@ kqueue_event_richcompare(kqueue_event_Object *s, kqueu
@@ -1278,10 +1292,10 @@ kqueue_event_richcompare(kqueue_event_Object *s, kqueu
Py_TYPE(s)->tp_name, Py_TYPE(o)->tp_name);
return NULL;
}

17
lang/python/2.7/patches/patch-configure_in
View File

@ -1,19 +1,10 @@
$OpenBSD: patch-configure_in,v 1.7 2012/02/27 19:30:46 rpointel Exp $
$OpenBSD: patch-configure_in,v 1.8 2012/04/27 08:18:59 rpointel Exp $
Wrong value of LDSHARED in sysconfig, cf http://bugs.python.org/issue10547
--- configure.in.orig Sat Jun 11 17:46:28 2011
+++ configure.in Sun Feb 19 19:10:29 2012
@@ -324,7 +324,7 @@ case $ac_sys_system/$ac_sys_release in
# As this has a different meaning on Linux, only define it on OpenBSD
AC_DEFINE(_BSD_SOURCE, 1, [Define on OpenBSD to activate all library features])
;;
- OpenBSD/4.@<:@789@:>@)
+ OpenBSD/4.@<:@789@:>@ | OpenBSD/5.*)
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
# also defined. This can be overridden by defining _BSD_SOURCE
# As this has a different meaning on Linux, only define it on OpenBSD
@@ -2049,9 +2049,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-U
--- configure.in.orig Tue Apr 10 01:07:36 2012
+++ configure.in Fri Apr 13 07:45:44 2012
@@ -2057,9 +2057,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-U
# only check for sem_init if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then

12
lang/python/2.7/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2012/02/27 19:30:46 rpointel Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2012/04/27 08:18:59 rpointel Exp $
@option no-default-conflict
@conflict python->=2.7,<2.8
@conflict python-bz2->=2.7,<2.8
@ -10,6 +10,7 @@
@comment bin/pydoc
bin/pydoc2.7
@comment bin/python-config
@comment bin/python2-config
@bin bin/python2.7
bin/python2.7-2to3
bin/python2.7-config
@ -109,6 +110,7 @@ include/python2.7/weakrefobject.h
@lib lib/libpython2.7.so.${LIBpython2.7_VERSION}
lib/pkgconfig/python-2.7.pc
lib/pkgconfig/python.pc
lib/pkgconfig/python2.pc
lib/python2.7/
lib/python2.7/BaseHTTPServer.py
lib/python2.7/BaseHTTPServer.pyc
@ -454,6 +456,7 @@ lib/python2.7/distutils/command/upload.pyo
@comment lib/python2.7/distutils/command/wininst-6.0.exe
@comment lib/python2.7/distutils/command/wininst-7.1.exe
@comment lib/python2.7/distutils/command/wininst-8.0.exe
@comment lib/python2.7/distutils/command/wininst-9.0-${MACHINE_ARCH}.exe
@comment lib/python2.7/distutils/command/wininst-9.0.exe
lib/python2.7/distutils/config.py
lib/python2.7/distutils/config.pyc
@ -640,6 +643,7 @@ lib/python2.7/distutils/tests/test_version.pyo
lib/python2.7/distutils/tests/test_versionpredicate.py
lib/python2.7/distutils/tests/test_versionpredicate.pyc
lib/python2.7/distutils/tests/test_versionpredicate.pyo
lib/python2.7/distutils/tests/xxmodule.c
lib/python2.7/distutils/text_file.py
lib/python2.7/distutils/text_file.pyc
lib/python2.7/distutils/text_file.pyo
@ -1335,7 +1339,7 @@ lib/python2.7/keyword.py
lib/python2.7/keyword.pyc
lib/python2.7/keyword.pyo
lib/python2.7/lib-dynload/
lib/python2.7/lib-dynload/Python-2.7.2-py2.7.egg-info
lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info
lib/python2.7/lib-dynload/_bisect.so
lib/python2.7/lib-dynload/_codecs_cn.so
lib/python2.7/lib-dynload/_codecs_hk.so
@ -1397,9 +1401,9 @@ lib/python2.7/lib-dynload/unicodedata.so
lib/python2.7/lib-dynload/zlib.so
lib/python2.7/lib2to3/
lib/python2.7/lib2to3/Grammar.txt
lib/python2.7/lib2to3/Grammar2.7.2.final.0.pickle
lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle
lib/python2.7/lib2to3/PatternGrammar.txt
lib/python2.7/lib2to3/PatternGrammar2.7.2.final.0.pickle
lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle
lib/python2.7/lib2to3/__init__.py
lib/python2.7/lib2to3/__init__.pyc
lib/python2.7/lib2to3/__init__.pyo

17
lang/python/2.7/pkg/PLIST-tests
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tests,v 1.2 2012/02/27 19:30:46 rpointel Exp $
@comment $OpenBSD: PLIST-tests,v 1.3 2012/04/27 08:18:59 rpointel Exp $
@option no-default-conflict
@conflict python-tests->=2.7,<2.8
lib/python2.7/test/
@ -49,6 +49,10 @@ lib/python2.7/test/cjkencodings/gbk-utf8.txt
lib/python2.7/test/cjkencodings/gbk.txt
lib/python2.7/test/cjkencodings/hz-utf8.txt
lib/python2.7/test/cjkencodings/hz.txt
lib/python2.7/test/cjkencodings/iso2022_jp-utf8.txt
lib/python2.7/test/cjkencodings/iso2022_jp.txt
lib/python2.7/test/cjkencodings/iso2022_kr-utf8.txt
lib/python2.7/test/cjkencodings/iso2022_kr.txt
lib/python2.7/test/cjkencodings/johab-utf8.txt
lib/python2.7/test/cjkencodings/johab.txt
lib/python2.7/test/cjkencodings/shift_jis-utf8.txt
@ -244,6 +248,7 @@ lib/python2.7/test/mapping_tests.py
lib/python2.7/test/mapping_tests.pyc
lib/python2.7/test/mapping_tests.pyo
lib/python2.7/test/math_testcases.txt
lib/python2.7/test/nokia.pem
lib/python2.7/test/nullcert.pem
lib/python2.7/test/outstanding_bugs.py
lib/python2.7/test/outstanding_bugs.pyc
@ -272,9 +277,6 @@ lib/python2.7/test/randv3.pck
lib/python2.7/test/re_tests.py
lib/python2.7/test/re_tests.pyc
lib/python2.7/test/re_tests.pyo
lib/python2.7/test/regex_tests.py
lib/python2.7/test/regex_tests.pyc
lib/python2.7/test/regex_tests.pyo
lib/python2.7/test/regrtest.py
lib/python2.7/test/regrtest.pyc
lib/python2.7/test/regrtest.pyo
@ -307,7 +309,6 @@ lib/python2.7/test/subprocessdata/
lib/python2.7/test/subprocessdata/sigchild_ignore.py
lib/python2.7/test/subprocessdata/sigchild_ignore.pyc
lib/python2.7/test/subprocessdata/sigchild_ignore.pyo
lib/python2.7/test/svn_python_org_https_cert.pem
lib/python2.7/test/test_MimeWriter.py
lib/python2.7/test/test_MimeWriter.pyc
lib/python2.7/test/test_MimeWriter.pyo
@ -476,6 +477,9 @@ lib/python2.7/test/test_codecencodings_cn.pyo
lib/python2.7/test/test_codecencodings_hk.py
lib/python2.7/test/test_codecencodings_hk.pyc
lib/python2.7/test/test_codecencodings_hk.pyo
lib/python2.7/test/test_codecencodings_iso2022.py
lib/python2.7/test/test_codecencodings_iso2022.pyc
lib/python2.7/test/test_codecencodings_iso2022.pyo
lib/python2.7/test/test_codecencodings_jp.py
lib/python2.7/test/test_codecencodings_jp.pyc
lib/python2.7/test/test_codecencodings_jp.pyo
@ -1105,6 +1109,9 @@ lib/python2.7/test/test_pwd.pyo
lib/python2.7/test/test_py3kwarn.py
lib/python2.7/test/test_py3kwarn.pyc
lib/python2.7/test/test_py3kwarn.pyo
lib/python2.7/test/test_py_compile.py
lib/python2.7/test/test_py_compile.pyc
lib/python2.7/test/test_py_compile.pyo
lib/python2.7/test/test_pyclbr.py
lib/python2.7/test/test_pyclbr.pyc
lib/python2.7/test/test_pyclbr.pyo

6
lang/python/2.7/pkg/PLIST-tools
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-tools,v 1.2 2012/02/27 19:30:46 rpointel Exp $
@comment $OpenBSD: PLIST-tools,v 1.3 2012/04/27 08:18:59 rpointel Exp $
@option no-default-conflict
@conflict python-tools->=2.7,<2.8
lib/python2.7/Tools/
@ -34,6 +34,10 @@ lib/python2.7/Tools/buildbot/README.tcltk-AMD64
@comment lib/python2.7/Tools/buildbot/external-${MACHINE_ARCH}.bat
@comment lib/python2.7/Tools/buildbot/test-${MACHINE_ARCH}.bat
@comment lib/python2.7/Tools/buildbot/build-${MACHINE_ARCH}.bat
@comment lib/python2.7/Tools/buildbot/clean-${MACHINE_ARCH}.bat
@comment lib/python2.7/Tools/buildbot/external-${MACHINE_ARCH}.bat
@comment lib/python2.7/Tools/buildbot/test-${MACHINE_ARCH}.bat
@comment lib/python2.7/Tools/buildbot/build-${MACHINE_ARCH}.bat
@comment lib/python2.7/Tools/buildbot/build.bat
@comment lib/python2.7/Tools/buildbot/buildmsi.bat
@comment lib/python2.7/Tools/buildbot/clean-${MACHINE_ARCH}.bat

3
lang/python/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.90 2012/04/23 17:15:18 espie Exp $
# $OpenBSD: Makefile.inc,v 1.91 2012/04/27 08:18:59 rpointel Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -130,6 +130,7 @@ CONFIGURE_ENV+= OPT='${CFLAGS} -DTHREAD_STACK_SIZE=${THREAD_STACK_SIZE} -fPIC' \
MAKE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
.if ${VERSION} < 3.2
MAKE_FLAGS+= LDLIBRARY=libpython${VERSION}.so.${LIBpython${VERSION}_VERSION}
MAKE_FLAGS+= INSTSONAME=libpython${VERSION}.so.${LIBpython${VERSION}_VERSION}
.endif
MAKE_FLAGS+= LD_LIBRARY_PATH=${WRKSRC} PATH="${WRKDIST}:${PORTPATH}"
MAKE_FLAGS+= LDFLAGS='-L${WRKSRC}'