De-orbit support for python 2.0 and python 2.2 under the "three major

releases is enough" rule of thumb. (python 2.3 was released 5 years ago.)
Keep python 1.5 and 2.1 though, because there are a handful of packages
that still need them.

22 files changed, 0 insertions, 876 deletions

diff --git a/lang/python20/ALTERNATIVES b/lang/python20/ALTERNATIVES
deleted file mode 100644
index 53e68f84033..00000000000
--- a/lang/python20/ALTERNATIVES
+++ /dev/null
@@ -1 +0,0 @@
-bin/python @PREFIX@/bin/python2.0
diff --git a/lang/python20/DESCR b/lang/python20/DESCR
deleted file mode 100644
index 25130675866..00000000000
--- a/lang/python20/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-Python is an interpreted, interactive, object-oriented
-programming language that combines remarkable power with
-very clear syntax. For an introduction to programming in
-Python you are referred to the Python Tutorial. The
-Python Library Reference documents built-in and standard
-types, constants, functions and modules. Finally, the
-Python Reference Manual describes the syntax and semantics
-of the core language in (perhaps too) much detail.
-
-Python's basic power can be extended with your own modules
-written in C or C++. On most systems such modules may be
-dynamically loaded. Python is also adaptable as an exten-
-sion language for existing applications. See the internal
-documentation for hints.
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
deleted file mode 100644
index 57ec228da49..00000000000
--- a/lang/python20/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2008/01/18 05:06:44 tnn Exp $
-#
-
-DISTNAME=	Python-2.0.1
-PKGNAME=	python20-2.0.1
-PKGREVISION=	14
-CATEGORIES=	lang python
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.0.1/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://www.python.org/
-COMMENT=	Interpreted, interactive, object-oriented programming language
-
-CONFLICTS+=	python-[0-9]*
-CONFLICTS+=	python-2.0.*
-
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
-WRKSRC=		${WRKDIR}/Python-2.0.1
-DIST_SUBDIR=	python
-
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--without-threads
-INSTALL_TARGET=	altinstall
-
-# Make sure having environment variable OPT doesn't affect the
-# installed module-building Makefile
-MAKE_ENV+=	'OPT=${CFLAGS}'
-CONFIGURE_ENV+=	'OPT=${CFLAGS}'
-
-SSLFLAGS=	-DUSE_SSL -I${BUILDLINK_PREFIX.openssl}/include/openssl \
-		-L${BUILDLINK_PREFIX.openssl}/lib \
-		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto
-FIX_RPATH+=	SSLFLAGS
-
-# Handle the module setup file:
-#   - disable a few broken modules on 64 bit platforms (nothing important)
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-PRIVILEGED_STAGES+=	clean
-.endif
-
-.if ${OPSYS} == "SunOS"
-ZOULARIS?=	${PREFIX}/bsd
-MODADD=		-I${ZOULARIS}/include -L${ZOULARIS}/lib ${COMPILER_RPATH_FLAG}${ZOULARIS}/lib
-FIX_RPATH+=	MODADD
-.endif
-
-REPLACE_INTERPRETER+=	py
-REPLACE.py.old=		.*python
-REPLACE.py.new=		${PREFIX}/bin/python2.0
-REPLACE_FILES.py=	Lib/cgi.py
-
-post-install:
-	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} lib/python2.0 -type f -print | \
-		${GREP} -v site-packages >>${PLIST_SRC})
-	${ECHO} lib/python2.0/site-packages/README >>${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} include/python2.0 -type f -print \
-		>>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d include/python2.0 -type d -print | \
-		${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d lib/python2.0 -type d -print | \
-		${GREP} -v site-packages | \
-		${GREP} -vx lib/python2.0 | \
-		${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
-	${ECHO} "@dirrm lib/python2.0/site-packages" >>${PLIST_SRC}
-	${ECHO} "@dirrm lib/python2.0" >>${PLIST_SRC}
-	# Reinstall Python binary to get it stripped
-	${RM} ${PREFIX}/bin/python2.0
-	${INSTALL_PROGRAM} ${WRKSRC}/python ${PREFIX}/bin/python2.0
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python20/PLIST.pre b/lang/python20/PLIST.pre
deleted file mode 100644
index f33abad59e5..00000000000
--- a/lang/python20/PLIST.pre
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1.1.1 2002/01/16 18:40:48 drochner Exp $
-bin/python2.0
diff --git a/lang/python20/buildlink3.mk b/lang/python20/buildlink3.mk
deleted file mode 100644
index 33a4c4ca71b..00000000000
--- a/lang/python20/buildlink3.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYTHON20_BUILDLINK3_MK:=	${PYTHON20_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	python20
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython20}
-BUILDLINK_PACKAGES+=	python20
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python20
-
-.if !empty(PYTHON20_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.python20+=	python20>=2.0
-BUILDLINK_ABI_DEPENDS.python20?=	python20>=2.0.1nb7
-BUILDLINK_PKGSRCDIR.python20?=	../../lang/python20
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python20?=	${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_INCDIRS.python20+=	include/python2.0
-BUILDLINK_LIBDIRS.python20+=	lib/python2.0/config
-BUILDLINK_TRANSFORM+=		l:python:python2.0
-
-.endif	# PYTHON20_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
deleted file mode 100644
index da3946cd2d5..00000000000
--- a/lang/python20/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.13 2007/07/24 16:53:20 drochner Exp $
-
-SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab
-RMD160 (python/Python-2.0.1.tgz) = fe663234ff4a8b363f10f6e5589acf1d8b00573f
-Size (python/Python-2.0.1.tgz) = 4097453 bytes
-SHA1 (patch-aa) = 2db263ea719733692536bb4a9990659099583351
-SHA1 (patch-ab) = 6a2bbaafdc21e7dcde84af7f4dbd9acdfde2aaf0
-SHA1 (patch-ac) = 74ff40fc338e8209d91e5da11fdbed497462dd83
-SHA1 (patch-ad) = f545b33bde36eac8737458506f3fdb25c0f39b5d
-SHA1 (patch-ae) = e962dad92260a1f506298ba3ebb059e852c4ccf4
-SHA1 (patch-af) = 9ed51b6868c3c7e24d92b52f0dc260e9c30d99bc
-SHA1 (patch-ag) = 4b1b561832d6a044c6be0372f9f915b09fab4c3c
-SHA1 (patch-ah) = c48beff9fe4d4f61e21c0952f4a7547cae28c0bb
-SHA1 (patch-ai) = 87b430f97ec258d423f7841bf369970223323a6b
-SHA1 (patch-aj) = 56e34352284a0b71fecb9b4abef8825ce4edf6d7
-SHA1 (patch-ak) = 0603b4731413bb098991f34df00c627f0b64e6df
-SHA1 (patch-bb) = adab8436d470acdc07149fdd6eed09c20ebf965e
-SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a
-SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc
diff --git a/lang/python20/files/Setup.config.in b/lang/python20/files/Setup.config.in
deleted file mode 100644
index b0e56951705..00000000000
--- a/lang/python20/files/Setup.config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is transmogrified into Setup.config by config.status.
-
-# The purpose of this file is to conditionally enable certain modules
-# based on configure-time options.  Currently thread support and
-# garbage collection support are the only two modules so enabled.
-
-@USE_THREAD_MODULE@thread threadmodule.c
-
-# Garbage collection enabled with --with-cycle-gc
-@USE_GC_MODULE@gc gcmodule.c
-
-# You may want this to be built as a dynamically loaded module; uncomment
-# the following line in that case:
-
-*shared*
-
-# bsddb module enabled by --with-libdb or presence of db.h
-bsddb bsddbmodule.c @MODADD@
diff --git a/lang/python20/files/Setup.in b/lang/python20/files/Setup.in
deleted file mode 100644
index 08fc3b7682e..00000000000
--- a/lang/python20/files/Setup.in
+++ /dev/null
@@ -1,416 +0,0 @@
-# -*- makefile -*-
-#
-# $NetBSD: Setup.in,v 1.2 2002/01/28 11:51:24 drochner Exp $
-#
-# The file Setup is used by the makesetup script to construct the files
-# Makefile and config.c, from Makefile.pre and config.c.in,
-# respectively.  The file Setup itself is initially copied from
-# Setup.in; once it exists it will not be overwritten, so you can edit
-# Setup to your heart's content.  Note that Makefile.pre is created
-# from Makefile.pre.in by the toplevel configure script.
-
-# (VPATH notes: Setup and Makefile.pre are in the build directory, as
-# are Makefile and config.c; the *.in files are in the source
-# directory.)
-
-# Each line in this file describes one or more optional modules.
-# Comment out lines to suppress modules.
-# Lines have the following structure:
-#
-# <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
-#
-# <sourcefile> is anything ending in .c (.C, .cc, .c++ are C++ files)
-# <cpparg> is anything starting with -I, -D, -U or -C
-# <library> is anything ending in .a or beginning with -l or -L
-# <module> is anything else but should be a valid Python
-# identifier (letters, digits, underscores, beginning with non-digit)
-#
-# (As the makesetup script changes, it may recognize some other
-# arguments as well, e.g. *.so and *.sl as libraries.  See the big
-# case statement in the makesetup script.)
-#
-# Lines can also have the form
-#
-# <name> = <value>
-#
-# which defines a Make variable definition inserted into Makefile.in
-#
-# Finally, if a line contains just the word "*shared*" (without the
-# quotes but with the stars), then the following modules will not be
-# included in the config.c file, nor in the list of objects to be
-# added to the library archive, and their linker options won't be
-# added to the linker options, but rules to create their .o files and
-# their shared libraries will still be added to the Makefile, and
-# their names will be collected in the Make variable SHAREDMODS.  This
-# is used to build modules as shared libraries.  (They can be
-# installed using "make sharedinstall", which is implied by the
-# toplevel "make install" target.)  (For compatibility,
-# *noconfig* has the same effect as *shared*.)
-#
-# In addition, *static* reverses this effect (negating a previous
-# *shared* line).
-
-# NOTE: As a standard policy, as many modules as can be supported by a
-# platform should be present.  The distribution comes with all modules
-# enabled that are supported by most platforms and don't require you
-# to ftp sources from elsewhere.
-
-
-# Some special rules to define PYTHONPATH.
-# Edit the definitions below to indicate which options you are using.
-# Don't add any whitespace or comments!
-
-# Directories where library files get installed.
-# DESTLIB is for Python modules; MACHDESTLIB for shared libraries.
-DESTLIB=$(LIBDEST)
-MACHDESTLIB=$(BINLIBDEST)
-
-# NOTE: all the paths are now relative to the prefix that is computed
-# at run time!
-
-# Standard path -- don't edit.
-# No leading colon since this is the first entry.
-# Empty since this is now just the runtime prefix.
-DESTPATH=
-
-# Site specific path components -- should begin with : if non-empty
-SITEPATH=
-
-# Standard path components for test modules
-TESTPATH=
-
-# Path components for machine- or system-dependent modules and shared libraries
-MACHDEPPATH=:plat-$(MACHDEP)
-
-COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH)
-PYTHONPATH=$(COREPYTHONPATH)
-
-
-# The modules listed here can't be built as shared libraries for
-# various reasons; therefore they are listed here instead of in the
-# normal order.
-
-# Some modules that are normally always on:
-
-regex regexmodule.c regexpr.c	# Regular expressions, GNU Emacs style
-pcre pcremodule.c pypcre.c	# Regular expressions, Perl style (for re.py)
-posix posixmodule.c		# posix (UNIX) system calls
-signal signalmodule.c		# signal(2)
-_sre _sre.c			# Fredrik Lundh's new regular expressions
-
-# The SGI specific GL module:
-
-GLHACK=-Dclear=__GLclear
-#gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11
-
-# Pure module.  Cannot be linked dynamically.
-# -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE
-#WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE
-#PURE_INCLS=-I/usr/local/include
-#PURE_STUBLIBS=-L/usr/local/lib -lpurify_stubs -lquantify_stubs
-#pure puremodule.c $(WHICH_PURE_PRODUCTS) $(PURE_INCLS) $(PURE_STUBLIBS)
-
-# Uncommenting the following line tells makesetup that all following
-# modules are to be built as shared libraries (see above for more
-# detail; also note that *static* reverses this effect):
-
-@NOSHARED@*shared*
-
-# GNU readline.  Unlike previous Python incarnations, GNU readline is
-# now incorporated in an optional module, configured in the Setup file
-# instead of by a configure script switch.  You may have to insert a
-# -L option pointing to the directory where libreadline.* lives,
-# and you may have to change -ltermcap to -ltermlib or perhaps remove
-# it, depending on your system -- see the GNU readline instructions.
-# It's okay for this to be a shared library, too.
-
-#readline readline.c -lreadline -ltermcap
-
-
-# Modules that should always be present (non UNIX dependent):
-
-array arraymodule.c	# array objects
-cmath cmathmodule.c -lm # complex math library functions
-math mathmodule.c -lm # math library functions, e.g. sin()
-strop stropmodule.c	# fast string operations implemented in C
-struct structmodule.c	# binary structure packing/unpacking
-time timemodule.c -lm # time operations and variables
-operator operator.c	# operator.add() and similar goodies
-_codecs _codecsmodule.c	# access to the builtin codecs and codec registry
-
-unicodedata unicodedata.c unicodedatabase.c
-                        # static Unicode character database
-ucnhash ucnhash.c # Unicode Character Name expansion hash table
-
-_locale _localemodule.c  # access to ISO C locale support
-
-
-# Modules with some UNIX dependencies -- on by default:
-# (If you have a really backward UNIX, select and socket may not be
-# supported...)
-
-fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
-pwd pwdmodule.c		# pwd(3) 
-grp grpmodule.c		# grp(3)
-errno errnomodule.c	# posix (UNIX) errno values
-mmap mmapmodule.c       # Memory-mapped files (also works on Win32)
-select selectmodule.c	# select(2); not on ancient System V
-#_socket socketmodule.c	# socket(2)
-
-# Socket module compiled with SSL support; you must edit the SSL variable:
-#SSL=/usr/local/ssl
-#_socket socketmodule.c \
-#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-#	-L$(SSL)/lib -lssl -lcrypto
-_socket socketmodule.c @SSLFLAGS@
-
-# The crypt module is now disabled by default because it breaks builds
-# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
-crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
-
-
-# Some more UNIX dependent modules -- off by default, since these
-# are not supported by all UNIX systems:
-
-nis nismodule.c		# Sun yellow pages -- not everywhere
-termios termios.c	# Steen Lumholt's termios module
-resource resource.c	# Jeremy Hylton's rlimit interface
-
-
-# Multimedia modules -- off by default.
-# These don't work for 64-bit platforms!!!
-# These represent audio samples or images as strings:
-
-#audioop audioop.c	# Operations on audio samples
-#imageop imageop.c	# Operations on images
-#rgbimg rgbimgmodule.c   # Read SGI RGB image files (but coded portably)
-
-
-# The md5 module implements the RSA Data Security, Inc. MD5
-# Message-Digest Algorithm, described in RFC 1321.  The necessary files
-# md5c.c and md5.h are included here.
-
-md5 md5module.c md5c.c
-
-
-# The sha module implements the SHA checksum algorithm.
-# (NIST's Secure Hash Algorithm.)
-sha shamodule.c
-
-
-# The mpz module interfaces to the GNU Multiple Precision library.
-# You need to ftp the GNU MP library.  
-# The GMP variable must point to the GMP source directory.
-# This was originally written and tested against GMP 1.2 and 1.3.2.
-# It has been modified by Rob Hooft to work with 2.0.2 as well, but I
-# haven't tested it recently.
-
-# A compatible MP library unencombered by the GPL also exists.  It was
-# posted to comp.sources.misc in volume 40 and is widely available from
-# FTP archive sites. One URL for it is:
-# ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
-
-#GMP=/ufs/guido/src/gmp
-#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a
-
-
-# SGI IRIX specific modules -- off by default.
-
-# These module work on any SGI machine:
-
-# *** gl must be enabled higher up in this file ***
-#fm fmmodule.c $(GLHACK) -lfm -lgl		# Font Manager
-#sgi sgimodule.c			# sgi.nap() and a few more
-
-# This module requires the header file
-# /usr/people/4Dgifts/iristools/include/izoom.h:
-#imgfile imgfile.c -limage -lgutil -lgl -lm	# Image Processing Utilities
-
-
-# These modules require the Multimedia Development Option (I think):
-
-#al almodule.c -laudio			# Audio Library
-#cd cdmodule.c -lcdaudio -lds -lmediad	# CD Audio Library
-#cl clmodule.c -lcl -lawareaudio	# Compression Library
-#sv svmodule.c yuvconvert.c -lsvideo -lXext -lX11	# Starter Video
-
-
-# The FORMS library, by Mark Overmars, implements user interface
-# components such as dialogs and buttons using SGI's GL and FM
-# libraries.  You must ftp the FORMS library separately from
-# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
-# NOTE: if you want to be able to use FORMS and curses simultaneously
-# (or both link them statically into the same binary), you must
-# compile all of FORMS with the cc option "-Dclear=__GLclear".
-
-# The FORMS variable must point to the FORMS subdirectory of the forms
-# toplevel directory:
-
-#FORMS=/ufs/guido/src/forms/FORMS
-#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl
-
-
-# SunOS specific modules -- off by default:
-
-#sunaudiodev sunaudiodev.c
-
-
-# Linux specific modules -- off by default:
-
-#linuxaudiodev linuxaudiodev.c
-
-
-# George Neville-Neil's timing module:
-
-timing timingmodule.c
-
-
-# The _tkinter module.
-#
-# The TKPATH variable is always enabled, to save you the effort.
-TKPATH=:lib-tk
-
-# The command for _tkinter is long and site specific.  Please
-# uncomment and/or edit those parts as indicated.  If you don't have a
-# specific extension (e.g. Tix or BLT), leave the corresponding line
-# commented out.  (Leave the trailing backslashes in!  If you
-# experience strange errors, you may want to join all uncommented
-# lines and remove the backslashes -- the backslash interpretation is
-# done by the shell's "read" command and it may not be implemented on
-# every system.
-
-# *** Always uncomment this (leave the leading underscore in!):
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
-# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-#	-I/usr/local/include \
-# *** Uncomment and edit to reflect where your X11 header files are:
-#	-I/usr/X11R6/include \
-# *** Or uncomment this for Solaris:
-#	-I/usr/openwin/include \
-# *** Uncomment and edit for Tix extension only:
-#	-DWITH_TIX -ltix4.1.8.0 \
-# *** Uncomment and edit for BLT extension only:
-#	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
-# *** Uncomment and edit for PIL (TkImaging) extension only:
-#	-DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-# *** Uncomment and edit for TOGL extension only:
-#	-DWITH_TOGL togl.c \
-# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
-#	-L/usr/local/lib \
-# *** Uncomment and edit to reflect your Tcl/Tk versions:
-#	-ltk8.0 -ltcl8.0 \
-# *** Uncomment and edit to reflect where your X11 libraries are:
-#	-L/usr/X11R6/lib \
-# *** Or uncomment this for Solaris:
-#	-L/usr/openwin/lib \
-# *** Uncomment these for TOGL extension only:
-#	-lGL -lGLU -lXext -lXmu \
-# *** Uncomment for AIX:
-#	-lld \
-# *** Always uncomment this; X11 libraries to link with:
-#	-lX11
-
-# Lance Ellinghaus's modules:
-
-rotor rotormodule.c		# enigma-inspired encryption
-syslog syslogmodule.c		# syslog daemon interface
-
-
-# Curses support, requring the System V version of curses, often
-# provided by the ncurses library.  e.g. on Linux, link with -lncurses
-# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
-# -L/usr/5lib before -lcurses).
-
-# _curses _cursesmodule.c -lcurses -ltermcap
-
-
-
-# Tommy Burnette's 'new' module (creates new empty objects of certain kinds):
-
-new newmodule.c
-
-
-# Generic (SunOS / SVR4) dynamic loading module.
-# This is not needed for dynamic loading of Python modules --
-# it is a highly experimental and dangerous device for calling
-# *arbitrary* C functions in *arbitrary* shared libraries:
-
-#dl dlmodule.c
-
-
-# Modules that provide persistent dictionary-like semantics.  You will
-# probably want to arrange for at least one of them to be available on
-# your machine, though none are defined by default because of library
-# dependencies.  The Python module anydbm.py provides an
-# implementation independent wrapper for these; dumbdbm.py provides
-# similar functionality (but slower of course) implemented in Python.
-
-# The standard Unix dbm module:
-
-#dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
-
-# Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-
-#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
-
-# David Wayne Williams' soundex module (obsolete -- this will disappear!)
-#soundex soundex.c
-
-# Helper module for various ascii-encoders
-binascii binascii.c
-
-# Fred Drake's interface to the Python parser
-parser parsermodule.c
-
-# Digital Creations' cStringIO and cPickle
-cStringIO cStringIO.c
-cPickle cPickle.c
-
-
-# Lee Busby's SIGFPE modules.
-# The library to link fpectl with is platform specific.
-# Choose *one* of the options below for fpectl:
-
-# For SGI IRIX (tested on 5.3):
-#fpectl fpectlmodule.c -lfpe
-
-# For Solaris with SunPro compiler (tested on Solaris 2.5 with SunPro C 4.2):
-# (Without the compiler you don't have -lsunmath.)
-#fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm
-
-# For other systems: see instructions in fpectlmodule.c.
-#fpectl fpectlmodule.c ...
-
-# Test module for fpectl.  No extra libraries needed.
-#fpetest fpetestmodule.c
-
-# Andrew Kuchling's zlib module.
-# This require zlib 1.1.3 (or later).
-# See http://www.cdrom.com/pub/infozip/zlib/
-zlib zlibmodule.c @MODADD@ -lz
-
-# Interface to the Expat XML parser
-#
-# Expat is written by James Clark and must be downloaded separately
-# (see below).  The pyexpat module was written by Paul Prescod after a
-# prototype by Jack Jansen.
-#
-# The Expat dist includes Windows .lib and .dll files.  Home page is at
-# http://www.jclark.com/xml/expat.html, the current production release is
-# always ftp://ftp.jclark.com/pub/xml/expat.zip.
-#
-# EXPAT_DIR, below, should point to the expat/ directory created by
-# unpacking the Expat source distribution.
-#
-# Note: the expat build process doesn't yet build a libexpat.a; you can
-# do this manually while we try convince the author to add it.  To do so,
-# cd to EXPAT_DIR, run "make" if you have not done so, then run:
-#
-#    ar cr libexpat.a xmltok/*.o xmlparse/*.o
-#
-#EXPAT_DIR=/usr/local/src/expat
-#pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat
-
-
-# Example -- included for reference only:
-# xx xxmodule.c
diff --git a/lang/python20/patches/patch-aa b/lang/python20/patches/patch-aa
deleted file mode 100644
index 70a7de2840e..00000000000
--- a/lang/python20/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/16 18:40:48 drochner Exp $
-
---- Python/dynload_shlib.c.orig	Mon Oct 16 23:49:29 2000
-+++ Python/dynload_shlib.c	Tue Dec  5 15:58:49 2000
-@@ -6,7 +6,9 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
--#if defined(__NetBSD__) && (NetBSD < 199712)
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#if (NetBSD < 199712)
- #include <nlist.h>
- #include <link.h>
- #define dlerror() "error in dynamic linking"
-@@ -15,6 +17,13 @@
- #include <dlfcn.h>
- #endif
- #endif
-+#endif /* __NetBSD__ */
-+
-+#if (defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)
-+#define LEAD_UNDERSCORE "_"
-+#else
-+#define LEAD_UNDERSCORE ""
-+#endif
- 
- #ifndef RTLD_LAZY
- #define RTLD_LAZY 1
-@@ -55,7 +64,7 @@
- 	}
- 
- 	/* ### should there be a leading underscore for some platforms? */
--	sprintf(funcname, "init%.200s", shortname);
-+	sprintf(funcname, LEAD_UNDERSCORE "init%.200s", shortname);
- 
- 	if (fp != NULL) {
- 		int i;
diff --git a/lang/python20/patches/patch-ab b/lang/python20/patches/patch-ab
deleted file mode 100644
index 116938afeec..00000000000
--- a/lang/python20/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/08/19 06:12:09 grant Exp $
-
---- Misc/Makefile.pre.in.orig	2000-07-01 02:03:53.000000000 +1000
-+++ Misc/Makefile.pre.in
-@@ -92,7 +92,7 @@ VPATH=		.
- TARGET=		python
- 
- # Installed python binary (used only by boot target)
--PYTHON=		python
-+PYTHON=		python2.0
- 
- # Add more -I and -D options here
- CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
-@@ -125,8 +125,8 @@ LIBC=		@LIBC@
- RANLIB=		@RANLIB@
- MACHDEP=	@MACHDEP@
- SO=		@SO@
--LDSHARED=	@LDSHARED@
--CCSHARED=	@CCSHARED@
-+LDSHARED=	@LDSHARED@ $(LDFLAGS)
-+CCSHARED=	@CCSHARED@ $(LDFLAGS)
- LINKFORSHARED=	@LINKFORSHARED@
- #@SET_CCC@
- 
diff --git a/lang/python20/patches/patch-ac b/lang/python20/patches/patch-ac
deleted file mode 100644
index b2eb980f313..00000000000
--- a/lang/python20/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/01/28 09:07:25 drochner Exp $
-
---- Modules/readline.c.orig	Mon Oct 16 23:49:34 2000
-+++ Modules/readline.c	Tue Aug  7 17:00:33 2001
-@@ -26,18 +26,6 @@
- #include <unistd.h>
- #else
- #include <readline/readline.h> /* You may need to add an -I option to Setup */
--
--extern int rl_parse_and_bind(char *);
--extern int rl_read_init_file(char *);
--extern int rl_insert_text(char *);
--extern int rl_bind_key(int, Function *);
--extern int rl_bind_key_in_map(int, Function *, Keymap);
--extern int rl_initialize(void);
--extern int add_history(char *);
--extern int read_history(char *);
--extern int write_history(char *);
--extern int history_truncate_file(char *, int);
--extern Function *rl_event_hook;
- #endif
- 
- /* Pointers needed from outside (but not declared in a header file). */
diff --git a/lang/python20/patches/patch-ad b/lang/python20/patches/patch-ad
deleted file mode 100644
index 87e1e8688de..00000000000
--- a/lang/python20/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/08/19 06:12:09 grant Exp $
-
---- Modules/Makefile.pre.in.orig	2000-10-10 03:48:09.000000000 +1100
-+++ Modules/Makefile.pre.in
-@@ -59,8 +59,8 @@ LIBP=		$(LIBDIR)/python$(VERSION)
- 
- # Symbols used for using shared libraries
- SO=		@SO@
--LDSHARED=	@LDSHARED@
--CCSHARED=	@CCSHARED@
-+LDSHARED=	@LDSHARED@ $(LDFLAGS)
-+CCSHARED=	@CCSHARED@ $(LDFLAGS)
- LINKFORSHARED=	@LINKFORSHARED@
- DESTSHARED=	$(BINLIBDEST)/lib-dynload
- 
-@@ -124,7 +124,7 @@ add2lib:	$(OBJS)
- # This target is used by the master Makefile to link the final binary.
- link:		$(MAINOBJ)
- 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(MAINOBJ) \
--		  $(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python$(EXE) $(LDLAST)
-+		  $(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python$(EXE) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
- 		mv python$(EXE) ../python$(EXE)
- 
- clean:
diff --git a/lang/python20/patches/patch-ae b/lang/python20/patches/patch-ae
deleted file mode 100644
index e8a9b6434a8..00000000000
--- a/lang/python20/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/08/19 06:12:09 grant Exp $
-
---- Makefile.in.orig	2000-10-10 06:31:40.000000000 +1100
-+++ Makefile.in
-@@ -81,8 +81,8 @@ LIBP=		$(LIBDIR)/python$(VERSION)
- 
- # Symbols used for using shared libraries
- SO=		@SO@
--LDSHARED=	@LDSHARED@
--CCSHARED=	@CCSHARED@
-+LDSHARED=	@LDSHARED@ $(LDFLAGS)
-+CCSHARED=	@CCSHARED@ $(LDFLAGS)
- LINKFORSHARED=	@LINKFORSHARED@
- DESTSHARED=	$(BINLIBDEST)/lib-dynload
- 
diff --git a/lang/python20/patches/patch-af b/lang/python20/patches/patch-af
deleted file mode 100644
index bf5aaf2d318..00000000000
--- a/lang/python20/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/08/19 06:12:09 grant Exp $
-
---- Parser/Makefile.in.orig	2000-08-31 16:11:48.000000000 +1100
-+++ Parser/Makefile.in
-@@ -14,7 +14,7 @@ RANLIB=		@RANLIB@
- AR=		@AR@
- 
- DEFS=		@DEFS@
--LIBS=		@LIBS@
-+LIBS=		$(LDFLAGS) @LIBS@
- 
- 
- # === Other things that are customizable but not by configure ===
diff --git a/lang/python20/patches/patch-ag b/lang/python20/patches/patch-ag
deleted file mode 100644
index 4bb165d7b69..00000000000
--- a/lang/python20/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/11/16 19:18:58 joerg Exp $
-
---- Modules/makesetup.orig	2000-08-11 15:58:37.000000000 +0200
-+++ Modules/makesetup
-@@ -145,6 +145,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
- 			-rpath)		libs="$libs $arg"; skip=libs;;
- 			--rpath)	libs="$libs $arg"; skip=libs;;
- 			-[A-Zl]*)	libs="$libs $arg";;
-+			-pthread)	libs="$libs $arg";;
- 			*.a)		libs="$libs $arg";;
- 			*.so)		libs="$libs $arg";;
- 			*.sl)		libs="$libs $arg";;
diff --git a/lang/python20/patches/patch-ah b/lang/python20/patches/patch-ah
deleted file mode 100644
index de469ba112e..00000000000
--- a/lang/python20/patches/patch-ah
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/12/06 18:26:49 joerg Exp $
-
---- configure.orig	2005-12-06 18:07:36.000000000 +0000
-+++ configure
-@@ -2689,6 +2689,9 @@ then
- 		else
- 			LDSHARED="ld -Bshareable"
- 		fi;;
-+	DragonFly*)
-+		LDSHARED="cc -shared ${LDFLAGS}"
-+		;;
- 	FreeBSD*)
- 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
- 		then
-@@ -2716,7 +2719,7 @@ then
- 	Linux*) CCSHARED="-fpic";;
- 	BSD/OS*/4*) CCSHARED="-fpic";;
- 	OpenBSD*) CCSHARED="-fpic";;
--	FreeBSD*|NetBSD*) CCSHARED="-fPIC";;
-+	FreeBSD*|NetBSD*|DragonFly*) CCSHARED="-fPIC";;
- 	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
- 	Monterey*) CCSHARED="-G";;
- 	IRIX*/6*)  case $CC in
-@@ -2748,7 +2751,7 @@ then
- 	Darwin/*) LINKFORSHARED="-framework System" ;;
- 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
- 	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
--	FreeBSD*|NetBSD*) 
-+	FreeBSD*|NetBSD*|DragonFly*) 
- 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
- 		then
- 			LINKFORSHARED="-Wl,--export-dynamic"
diff --git a/lang/python20/patches/patch-ai b/lang/python20/patches/patch-ai
deleted file mode 100644
index 2da7cd8dd64..00000000000
--- a/lang/python20/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/04/13 02:26:54 joerg Exp $
-
---- Lib/distutils/util.py.orig	2000-10-14 04:07:39.000000000 +0000
-+++ Lib/distutils/util.py
-@@ -54,6 +54,8 @@ def get_platform ():
-         # fall through to standard osname-release-machine representation
-     elif osname[:4] == "irix":              # could be "irix64"!
-         return "%s-%s" % (osname, release)
-+    elif osname[:9] == "dragonfly":
-+        release = string.split(release, "-")[0]
-             
-     return "%s-%s-%s" % (osname, release, machine)
- 
diff --git a/lang/python20/patches/patch-aj b/lang/python20/patches/patch-aj
deleted file mode 100644
index a7532b6db98..00000000000
--- a/lang/python20/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2007/07/24 16:53:20 drochner Exp $
-
---- Lib/distutils/command/build_scripts.py.orig	2007-07-23 16:04:02.000000000 +0200
-+++ Lib/distutils/command/build_scripts.py
-@@ -78,7 +78,7 @@ class build_scripts (Command):
-                 match = first_line_re.match(first_line)
-                 if match:
-                     adjust = 1
--                    post_interp = match.group(1)
-+                    post_interp = match.group(1) or ''
- 
-             if adjust:
-                 self.announce("copying and adjusting %s -> %s" %
diff --git a/lang/python20/patches/patch-ak b/lang/python20/patches/patch-ak
deleted file mode 100644
index 9ab3054c843..00000000000
--- a/lang/python20/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/07/24 16:53:20 drochner Exp $
-
---- Modules/mmapmodule.c.orig	2001-03-31 15:23:19.000000000 +0200
-+++ Modules/mmapmodule.c
-@@ -390,10 +390,12 @@ mmap_resize_method(mmap_object *self,
- 
- #ifdef MREMAP_MAYMOVE
- 	newmap = mremap(self->data, self->size, new_size, MREMAP_MAYMOVE);
-+#elif defined(__NetBSD__)
-+	newmap = mremap(self->data, self->size, self->data, new_size, 0);
- #else
- 	newmap = mremap(self->data, self->size, new_size, 0);
- #endif
--	if (newmap == (void *)-1) 
-+	if (newmap == MAP_FAILED) 
- 	{
- 		PyErr_SetFromErrno(mmap_module_error);
- 		return NULL;
diff --git a/lang/python20/patches/patch-bb b/lang/python20/patches/patch-bb
deleted file mode 100644
index 38e62362a03..00000000000
--- a/lang/python20/patches/patch-bb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2005/07/29 13:27:26 drochner Exp $
-
---- Lib/test/test_fcntl.py.orig	2004-08-28 19:24:26.000000000 +0200
-+++ Lib/test/test_fcntl.py	2004-08-28 19:25:18.000000000 +0200
-@@ -16,11 +16,11 @@
- if verbose:
-     print 'Status from fnctl with O_NONBLOCK: ', rv
-     
--if sys.platform in ('netbsd1', 'Darwin1.2',
-+if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'Darwin1.2',
-                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                     'bsdos2', 'bsdos3', 'bsdos4',
-                     'openbsd', 'openbsd2'):
--    lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, FCNTL.F_WRLCK, 0)
-+    lockdata = struct.pack('ixxxxixxxxihh', 0, 0, 0, FCNTL.F_WRLCK, 0)
- elif sys.platform in ['aix3', 'aix4', 'hp-uxB']:
-     lockdata = struct.pack('hhlllii', FCNTL.F_WRLCK, 0, 0, 0, 0, 0, 0)
- else:
diff --git a/lang/python20/patches/patch-bc b/lang/python20/patches/patch-bc
deleted file mode 100644
index 6bcea585894..00000000000
--- a/lang/python20/patches/patch-bc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
-
---- Lib/posixfile.py.orig	2004-08-28 19:23:13.000000000 +0200
-+++ Lib/posixfile.py	2004-08-29 12:21:02.000000000 +0200
-@@ -172,10 +172,11 @@
-         # additions for AIX by Vladimir.Marangozov@imag.fr
-         import sys, os
-         if sys.platform in ('netbsd1',
-+                            'netbsd2',
-                             'openbsd2',
-                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                             'bsdos2', 'bsdos3', 'bsdos4'):
--            flock = struct.pack('lxxxxlxxxxlhh', \
-+            flock = struct.pack('qqihh', \
-                   l_start, l_len, os.getpid(), l_type, l_whence) 
-         elif sys.platform in ['aix3', 'aix4']:
-             flock = struct.pack('hhlllii', \
-@@ -188,11 +189,12 @@
- 
-         if '?' in how:
-             if sys.platform in ('netbsd1',
-+                                'netbsd2',
-                                 'openbsd2',
-                                 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                                 'bsdos2', 'bsdos3', 'bsdos4'):
-                 l_start, l_len, l_pid, l_type, l_whence = \
--                    struct.unpack('lxxxxlxxxxlhh', flock)
-+                    struct.unpack('qqihh', flock)
-             elif sys.platform in ['aix3', 'aix4']:
-                 l_type, l_whence, l_start, l_len, l_sysid, l_pid, l_vfs = \
-                     struct.unpack('hhlllii', flock)
diff --git a/lang/python20/patches/patch-cd b/lang/python20/patches/patch-cd
deleted file mode 100644
index 9dbbfb69488..00000000000
--- a/lang/python20/patches/patch-cd
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2003/08/18 09:14:13 drochner Exp $
-
---- Lib/distutils/command/build_ext.py.orig	Sat Mar 31 18:09:32 2001
-+++ Lib/distutils/command/build_ext.py
-@@ -445,8 +445,17 @@ 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']))
- 
-             self.compiler.link_shared_object(
-                 objects, ext_filename,