pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/python23-nth Change python23-nth to use the patch...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8a1ceb200d86
branches: trunk
changeset: 505974:8a1ceb200d86
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Jan 09 23:26:09 2006 +0000
description:
Change python23-nth to use the patches and distinfo of python23.
Use the SUBST framework to replace the version numbers as before.
OK recht@
diffstat:
lang/python23-nth/Makefile | 12 +-
lang/python23-nth/distinfo | 22 --
lang/python23-nth/patches/patch-aa | 13 -
lang/python23-nth/patches/patch-ab | 26 --
lang/python23-nth/patches/patch-ad | 23 --
lang/python23-nth/patches/patch-ae | 13 -
lang/python23-nth/patches/patch-af | 19 --
lang/python23-nth/patches/patch-ah | 46 ----
lang/python23-nth/patches/patch-al | 105 -----------
lang/python23-nth/patches/patch-am | 350 -------------------------------------
lang/python23-nth/patches/patch-ba | 86 ---------
lang/python23-nth/patches/patch-bb | 34 ---
lang/python23-nth/patches/patch-ca | 54 -----
lang/python23-nth/patches/patch-cb | 24 --
lang/python23-nth/patches/patch-da | 17 -
lang/python23-nth/patches/patch-dc | 22 --
lang/python23-nth/patches/patch-ea | 12 -
lang/python23-nth/patches/patch-eb | 19 --
lang/python23-nth/patches/patch-ec | 69 -------
19 files changed, 11 insertions(+), 955 deletions(-)
diffs (truncated from 1050 to 300 lines):
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/Makefile
--- a/lang/python23-nth/Makefile Mon Jan 09 23:14:45 2006 +0000
+++ b/lang/python23-nth/Makefile Mon Jan 09 23:26:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/08 09:52:15 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/09 23:26:09 joerg Exp $
#
PKGNAME= python23-nth-2.3.5
@@ -10,4 +10,14 @@
PY_VER_SUFFIX= 2n3
+DISTINFO_FILE= ${.CURDIR}/../../lang/python23/distinfo
+PATCHDIR= ${.CURDIR}/../../lang/python23/patches
+
+SUBST_CLASSES+= version
+SUBST_FILES.version= configure Include/patchlevel.h setup.py
+SUBST_SED.version+= -e 's,VERSION=2\.3,VERSION=2n3,g'
+SUBST_SED.version+= -e 's,\(PY_VERSION.*\)2\.3,\12n3,g'
+SUBST_SED.version+= -e 's,pydoc2\.3,pydoc2n3,g'
+SUBST_STAGE.version= pre-configure
+
.include "../../lang/python23/Makefile.common"
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/distinfo
--- a/lang/python23-nth/distinfo Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/10/01 19:36:01 recht Exp $
-
-SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
-RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
-Size (Python-2.3.5.tgz) = 8535749 bytes
-SHA1 (patch-aa) = a4dce2e265c08750d7c4f7ad55b0e05053a337b4
-SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
-SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
-SHA1 (patch-ae) = 35d27825ea4f3930cce651761e192a7302696eba
-SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
-SHA1 (patch-ah) = da362d3e2e46077c3177796f0c926661b0f751d4
-SHA1 (patch-al) = 653c7930f3708b418ccfe202a25c1a8eef70da48
-SHA1 (patch-am) = 6d5d24b5a58bd577e8b88527793b27e624455643
-SHA1 (patch-ba) = dd8f89952d7f40c9a979e362758775f093e047bc
-SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
-SHA1 (patch-ca) = 95f5a515fe3dafd75d077e0591e88a34447152ff
-SHA1 (patch-cb) = 301205b29db1ca60f06b2dc0423f5f911eabcd18
-SHA1 (patch-da) = b082eff79571726701aab53c37d8d53a8115e204
-SHA1 (patch-dc) = 3f2f9c37ae7ee35550669a3e517833e68dc0ab61
-SHA1 (patch-ea) = babfed4a0e5ae599441423a06622d4820ab237b1
-SHA1 (patch-eb) = b72694d414b55d11e324cc76d6ed03b7c8e7630c
-SHA1 (patch-ec) = 9bec8cc75868ca785810b92ffe60406117bdc3fd
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/patches/patch-aa
--- a/lang/python23-nth/patches/patch-aa Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/02/15 12:25:07 drochner Exp $
-
---- Include/patchlevel.h.orig 2005-02-08 12:37:01.000000000 +0100
-+++ Include/patchlevel.h
-@@ -26,7 +26,7 @@
- #define PY_RELEASE_SERIAL 0
-
- /* Version as a string */
--#define PY_VERSION "2.3.5"
-+#define PY_VERSION "2n3.5"
-
- /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
- Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/patches/patch-ab
--- a/lang/python23-nth/patches/patch-ab Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/01/23 22:57:19 recht Exp $
-
---- Include/py_curses.h.orig 2003-06-29 17:46:21.000000000 +0200
-+++ Include/py_curses.h
-@@ -39,6 +39,21 @@
- #endif
- #endif
-
-+#ifdef __NetBSD__
-+/*
-+** On NetBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-+** against multiple definition of wchar_t and wint_t.
-+*/
-+#ifdef _XOPEN_SOURCE_EXTENDED
-+#ifndef _WCHAR_T
-+#define _WCHAR_T
-+#endif
-+#ifndef _WINT_T
-+#define _WINT_T
-+#endif
-+#endif
-+#endif
-+
- #ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/patches/patch-ad
--- a/lang/python23-nth/patches/patch-ad Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/01/23 22:57:19 recht Exp $
-
---- Lib/distutils/command/build_ext.py.orig 2002-11-19 14:12:28.000000000 +0100
-+++ Lib/distutils/command/build_ext.py
-@@ -475,8 +475,18 @@ class build_ext (Command):
- # that go into the mix.
- if ext.extra_objects:
- objects.extend(ext.extra_objects)
-+
-+ # Two possible sources for extra linker arguments:
-+ # - 'extra_link_args' in Extension object
-+ # - LDFLAGS environment variable
-+ # The environment variable should take precedence, and
-+ # any sensible compiler will give precedence to later
-+ # command line args. Hence we combine them in order:
- extra_args = ext.extra_link_args or []
-
-+ if os.environ.has_key('LDFLAGS'):
-+ extra_args.extend(string.split(os.environ['LDFLAGS']))
-+
- # Detect target language, if not provided
- language = ext.language or self.compiler.detect_language(sources)
-
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/patches/patch-ae
--- a/lang/python23-nth/patches/patch-ae Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/01/23 22:57:19 recht Exp $
-
---- Lib/distutils/command/build_scripts.py.orig 2004-04-01 05:56:46.000000000 +0200
-+++ Lib/distutils/command/build_scripts.py 2004-06-02 13:58:52.000000000 +0200
-@@ -101,7 +101,7 @@
- outf.write("#!%s%s\n" %
- (os.path.join(
- sysconfig.get_config_var("BINDIR"),
-- "python" + sysconfig.get_config_var("EXE")),
-+ "python%s" % sys.version[:3] + sysconfig.get_config_var("EXE")),
- post_interp))
- outf.writelines(f.readlines())
- outf.close()
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/patches/patch-af
--- a/lang/python23-nth/patches/patch-af Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/01/23 22:57:20 recht Exp $
-
---- Lib/test/test_fcntl.py.orig 2002-07-23 21:03:51.000000000 +0200
-+++ Lib/test/test_fcntl.py
-@@ -20,11 +20,11 @@ else:
- if sys.platform.startswith('atheos'):
- start_len = "qq"
-
--if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin',
-+if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin',
- 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
- 'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3'):
-- lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
-+ lockdata = struct.pack('qqihh', 0, 0, 0, fcntl.F_WRLCK, 0)
- elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
- lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
- elif sys.platform in ['os2emx']:
-
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/patches/patch-ah
--- a/lang/python23-nth/patches/patch-ah Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/02/15 12:25:07 drochner Exp $
-
---- Makefile.pre.in.orig 2005-01-11 14:48:52.000000000 +0100
-+++ Makefile.pre.in
-@@ -56,7 +56,7 @@ MAKESETUP= $(srcdir)/Modules/makese
- OPT= @OPT@
- BASECFLAGS= @BASECFLAGS@
- CFLAGS= $(BASECFLAGS) $(OPT)
--CPPFLAGS= -I. -I$(srcdir)/Include
-+CPPFLAGS+= @CPPFLAGS@ -I. -I$(srcdir)/Include
- LDFLAGS= @LDFLAGS@
- LDLAST= @LDLAST@
- SGI_ABI= @SGI_ABI@
-@@ -308,7 +308,7 @@ all: $(BUILDPYTHON) oldsharedmods share
- $(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
- $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
- Modules/$(MAINOBJ) \
-- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
-
- platform: $(BUILDPYTHON)
- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -357,6 +357,9 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
- libpython$(VERSION).sl: $(LIBRARY_OBJS)
- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
-
-+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
-+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.3.4 -compatibility_version 2.3 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
-+
- # 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.
-@@ -616,7 +619,12 @@ altbininstall: $(BUILDPYTHON)
- (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
- fi \
- fi; \
-- else true; \
-+ else \
-+ if test -f libpython$(VERSION).dylib; then \
-+ $(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR)/libpython$(VERSION).dylib; \
-+ else \
-+ true; \
-+ fi \
- fi
-
- # Install the manual page
diff -r 71de46313a0b -r 8a1ceb200d86 lang/python23-nth/patches/patch-al
--- a/lang/python23-nth/patches/patch-al Mon Jan 09 23:14:45 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-$NetBSD: patch-al,v 1.3 2005/06/30 03:12:42 minskim Exp $
-
---- configure.orig 2005-01-11 07:48:52.000000000 -0600
-+++ configure
-@@ -1351,7 +1351,7 @@ rm confdefs.h
- mv confdefs.h.new confdefs.h
-
-
--VERSION=2.3
-+VERSION=2n3
-
-
- SOVERSION=1.0
-@@ -1481,6 +1481,8 @@ case $ac_sys_system/$ac_sys_release in
- # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
- OpenBSD/2.* | OpenBSD/3.[01234])
- define_xopen_source=no;;
-+ NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S])
-+ define_xopen_source=no;;
- # On Solaris 2.6, sys/wait.h is inconsistent in the usage
- # of union __?sigval. Reported by Stuart Bishop.
- SunOS/5.6)
-@@ -1505,6 +1507,11 @@ case $ac_sys_system/$ac_sys_release in
- # has another value. By not (re)defining it, the defaults come in place.
- AIX/4)
- define_xopen_source=no;;
-+ # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
-+ # disables platform specific features beyond repair.
-+ Darwin/8.*)
-+ define_xopen_source=no
-+ ;;
- esac
-
- if test $define_xopen_source = yes
-@@ -3733,7 +3740,7 @@ _ACEOF
- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- INSTSONAME="$LDLIBRARY".$SOVERSION
- ;;
-- Linux*|GNU*|NetBSD*)
-+ Linux*|GNU*|NetBSD*|FreeBSD*)
- LDLIBRARY='libpython$(VERSION).so'
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -3754,6 +3761,14 @@ _ACEOF
- BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- ;;
-+ Darwin*)
-+ if test -z "$enable_framework"; then
-+ LDLIBRARY='libpython$(VERSION).dylib'
-+ BLDLIBRARY='-L. -lpython$(VERSION)'
-+ RUNSHARED=DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}
-+ fi
-+ ;;
-+
- esac
- # DG/UX requires some fancy ld contortions to produce a .so from an .a
- case $MACHDEP in
-@@ -4152,7 +4167,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
- ;;
- # is there any other compiler on Darwin besides gcc?
- Darwin*)
-- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
-+ if [[ `/usr/bin/arch` = 'ppc' ]]
-+ then
-+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
-+ else
-+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
-+ fi
- ;;
- esac
- ;;
-@@ -10979,7 +10999,7 @@ then
- LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- else
- # No framework. Ignore undefined symbols, assuming they come from Python
-- LDSHARED="$LDSHARED -undefined suppress"
-+ LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
- fi ;;
- Darwin/1.4*|Darwin/5.*|Darwin/6.*)
- LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -11009,12 +11029,12 @@ then
Home |
Main Index |
Thread Index |
Old Index