summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2005-01-23 20:41:45 +0000
committerrecht <recht@pkgsrc.org>2005-01-23 20:41:45 +0000
commit367eed19feed744dba7b8ab45ae14c8d83feaf5b (patch)
treec91b08fba110acac23e0418c231e8fe8945c54ed /lang
parent94cb047c113c1a3825b0b6d61de053bd5b007853 (diff)
downloadpkgsrc-367eed19feed744dba7b8ab45ae14c8d83feaf5b.tar.gz
Build Python with thread support by default and turn the existing
python*-pth packages into meta-packages which will install the non-pth packages. Bump PKGREVISIONs on the non-pth versions to propagate the thread change, but leave the *-pth versions untouched to not affect existing installations. Sync all PYTHON_VERSIONS_AFFECTED lines in package Makefiles.
Diffstat (limited to 'lang')
-rw-r--r--lang/py-funge/Makefile4
-rw-r--r--lang/py-psyco/Makefile4
-rw-r--r--lang/py-pyrex/Makefile4
-rw-r--r--lang/python/pyversion.mk81
-rw-r--r--lang/python/srcdist.mk10
-rw-r--r--lang/python21-pth/Makefile27
-rw-r--r--lang/python21-pth/PLIST2
-rw-r--r--lang/python21-pth/buildlink3.mk27
-rw-r--r--lang/python21-pth/distinfo17
-rw-r--r--lang/python21-pth/patches/patch-aa17
-rw-r--r--lang/python21-pth/patches/patch-ab10
-rw-r--r--lang/python21-pth/patches/patch-ac108
-rw-r--r--lang/python21-pth/patches/patch-ad23
-rw-r--r--lang/python21-pth/patches/patch-ae13
-rw-r--r--lang/python21-pth/patches/patch-af31
-rw-r--r--lang/python21-pth/patches/patch-ag13
-rw-r--r--lang/python21-pth/patches/patch-ah75
-rw-r--r--lang/python21-pth/patches/patch-ai20
-rw-r--r--lang/python21-pth/patches/patch-aj13
-rw-r--r--lang/python21-pth/patches/patch-ba32
-rw-r--r--lang/python21-pth/patches/patch-bb18
-rw-r--r--lang/python21-pth/patches/patch-bc33
-rw-r--r--lang/python21/Makefile66
-rw-r--r--lang/python21/Makefile.common59
-rw-r--r--lang/python22-pth/Makefile27
-rw-r--r--lang/python22-pth/PLIST2
-rw-r--r--lang/python22-pth/buildlink3.mk27
-rw-r--r--lang/python22-pth/distinfo15
-rw-r--r--lang/python22-pth/patches/patch-aa172
-rw-r--r--lang/python22-pth/patches/patch-ab10
-rw-r--r--lang/python22-pth/patches/patch-ae23
-rw-r--r--lang/python22-pth/patches/patch-af88
-rw-r--r--lang/python22-pth/patches/patch-ag13
-rw-r--r--lang/python22-pth/patches/patch-ah12
-rw-r--r--lang/python22-pth/patches/patch-ai31
-rw-r--r--lang/python22-pth/patches/patch-aj12
-rw-r--r--lang/python22-pth/patches/patch-ba32
-rw-r--r--lang/python22-pth/patches/patch-bb18
-rw-r--r--lang/python22-pth/patches/patch-bc33
-rw-r--r--lang/python22/Makefile58
-rw-r--r--lang/python22/Makefile.common51
-rw-r--r--lang/python23-pth/Makefile28
-rw-r--r--lang/python23-pth/PLIST2
-rw-r--r--lang/python23-pth/buildlink3.mk28
-rw-r--r--lang/python23-pth/distinfo19
-rw-r--r--lang/python23-pth/patches/patch-aa13
-rw-r--r--lang/python23-pth/patches/patch-ab26
-rw-r--r--lang/python23-pth/patches/patch-ad23
-rw-r--r--lang/python23-pth/patches/patch-ae13
-rw-r--r--lang/python23-pth/patches/patch-af19
-rw-r--r--lang/python23-pth/patches/patch-ah55
-rw-r--r--lang/python23-pth/patches/patch-al91
-rw-r--r--lang/python23-pth/patches/patch-am350
-rw-r--r--lang/python23-pth/patches/patch-ba86
-rw-r--r--lang/python23-pth/patches/patch-bb34
-rw-r--r--lang/python23-pth/patches/patch-ca54
-rw-r--r--lang/python23-pth/patches/patch-cb24
-rw-r--r--lang/python23-pth/patches/patch-da17
-rw-r--r--lang/python23-pth/patches/patch-db35
-rw-r--r--lang/python23-pth/patches/patch-dc20
-rw-r--r--lang/python23/Makefile3
-rw-r--r--lang/python23/Makefile.common3
-rw-r--r--lang/python24-pth/Makefile27
-rw-r--r--lang/python24-pth/PLIST2
-rw-r--r--lang/python24-pth/buildlink3.mk27
-rw-r--r--lang/python24-pth/distinfo18
-rw-r--r--lang/python24-pth/patches/patch-aa26
-rw-r--r--lang/python24-pth/patches/patch-ab22
-rw-r--r--lang/python24-pth/patches/patch-ac13
-rw-r--r--lang/python24-pth/patches/patch-ad31
-rw-r--r--lang/python24-pth/patches/patch-ae18
-rw-r--r--lang/python24-pth/patches/patch-af46
-rw-r--r--lang/python24-pth/patches/patch-ag17
-rw-r--r--lang/python24-pth/patches/patch-ah86
-rw-r--r--lang/python24-pth/patches/patch-ai15
-rw-r--r--lang/python24-pth/patches/patch-aj15
-rw-r--r--lang/python24-pth/patches/patch-ak22
-rw-r--r--lang/python24-pth/patches/patch-al95
-rw-r--r--lang/python24-pth/patches/patch-am268
-rw-r--r--lang/python24-pth/patches/patch-ba11
-rw-r--r--lang/python24/Makefile118
-rw-r--r--lang/python24/Makefile.common110
-rw-r--r--lang/python24/PLIST.Darwin1
-rw-r--r--lang/python24/PLIST.common_end1
84 files changed, 338 insertions, 2925 deletions
diff --git a/lang/py-funge/Makefile b/lang/py-funge/Makefile
index b58b466d319..8b4a63e19b4 100644
--- a/lang/py-funge/Makefile
+++ b/lang/py-funge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/16 17:11:00 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/23 20:41:46 recht Exp $
DISTNAME= pyfunge-0.2-beta1
PKGNAME= ${PYPKGPREFIX}-funge-0.2beta1
@@ -13,7 +13,7 @@ NO_BUILD= yes
NO_CONFIGURE= yes
USE_BUILDLINK3= yes
-PYTHON_VERSIONS_ACCEPTED?= 23 23pth
+PYTHON_VERSIONS_ACCEPTED?= 23
WRKSRC?= ${WRKDIR}/PyFunge
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
diff --git a/lang/py-psyco/Makefile b/lang/py-psyco/Makefile
index e9d00bcbb62..010a2593a60 100644
--- a/lang/py-psyco/Makefile
+++ b/lang/py-psyco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/22 09:16:02 recht Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/23 20:41:46 recht Exp $
DISTNAME= psyco-1.2-src
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-src//}
@@ -16,7 +16,7 @@ PYBINMODULE= YES
PY_PATCHPLIST= YES
ONLY_FOR_PLATFORM= *-*-i386
-PYTHON_VERSIONS_ACCEPTED= 23 23pth 22 22pth 21 21pth
+PYTHON_VERSIONS_ACCEPTED= 23 22 21
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-pyrex/Makefile b/lang/py-pyrex/Makefile
index 11763baacee..4e234eed39e 100644
--- a/lang/py-pyrex/Makefile
+++ b/lang/py-pyrex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/19 20:44:31 recht Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/23 20:41:46 recht Exp $
DISTNAME= Pyrex-0.9.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/P/p/}
@@ -9,7 +9,7 @@ MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/
COMMENT= A Language for Writing Python Extension Modules
-PYTHON_VERSIONS_ACCEPTED= 23 23pth 22 22pth
+PYTHON_VERSIONS_ACCEPTED= 23 22
PYDISTUTILSPKG= yes
USE_BUILDLINK3= yes
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index c0b50eb9cbd..d24736f9642 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.30 2004/12/05 23:39:03 recht Exp $
+# $NetBSD: pyversion.mk,v 1.31 2005/01/23 20:41:46 recht Exp $
.if !defined(PYTHON_PYVERSION_MK)
PYTHON_PYVERSION_MK= defined
@@ -7,23 +7,17 @@ PYTHON_PYVERSION_MK= defined
PYTHON_VERSION_DEFAULT?= 23
.if ${OPSYS} == "Darwin"
-PYTHON_VERSIONS_INCOMPATIBLE+= 23 22 21 21pth 20 15
-BUILDLINK_DEPENDS.python22-pth?= python22-pth>=2.2.3nb2
-BUILDLINK_DEPENDS.python23-pth?= python23-pth>=2.3.3nb3
+PYTHON_VERSIONS_INCOMPATIBLE+= 23 22 21 20 15
.endif
-PYTHON_VERSIONS_ACCEPTED?= 24 24pth 23 23pth 22 22pth 21 21pth 20
+PYTHON_VERSIONS_ACCEPTED?= 24 23 22 21 20
PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
BUILDLINK_DEPENDS.python15?= python15>=1.5
BUILDLINK_DEPENDS.python20?= python20>=2.0
BUILDLINK_DEPENDS.python21?= python21>=2.1
-BUILDLINK_DEPENDS.python21-pth?= python21-pth>=2.1
BUILDLINK_DEPENDS.python22?= python22>=2.2
-BUILDLINK_DEPENDS.python22-pth?= python22-pth>=2.2
BUILDLINK_DEPENDS.python23?= python23>=2.3
-BUILDLINK_DEPENDS.python23-pth?= python23-pth>=2.3
BUILDLINK_DEPENDS.python24?= python24>=2.4
-BUILDLINK_DEPENDS.python24-pth?= python24-pth>=2.4
# transform the list into individual variables
.for pv in ${PYTHON_VERSIONS_ACCEPTED}
@@ -36,27 +30,15 @@ _PYTHON_VERSION_${pv}_OK= yes
.if exists(${LOCALBASE}/bin/python2.4)
_PYTHON_VERSION_24_INSTALLED= yes
.endif
-.if exists(${LOCALBASE}/bin/python2p4)
-_PYTHON_VERSION_24pth_INSTALLED=yes
-.endif
.if exists(${LOCALBASE}/bin/python2.3)
_PYTHON_VERSION_23_INSTALLED= yes
.endif
-.if exists(${LOCALBASE}/bin/python2p3)
-_PYTHON_VERSION_23pth_INSTALLED=yes
-.endif
.if exists(${LOCALBASE}/bin/python2.2)
_PYTHON_VERSION_22_INSTALLED= yes
.endif
-.if exists(${LOCALBASE}/bin/python2p2)
-_PYTHON_VERSION_22pth_INSTALLED=yes
-.endif
.if exists(${LOCALBASE}/bin/python2.1)
_PYTHON_VERSION_21_INSTALLED= yes
.endif
-.if exists(${LOCALBASE}/bin/python2p1)
-_PYTHON_VERSION_21pth_INSTALLED=yes
-.endif
.if exists(${LOCALBASE}/bin/python2.0)
_PYTHON_VERSION_20_INSTALLED= yes
.endif
@@ -117,76 +99,24 @@ PYDEPENDENCY= ${BUILDLINK_DEPENDS.python24}:${PYPKGSRCDIR}
PYPACKAGE= python24
PYVERSSUFFIX= 2.4
PYPKGPREFIX= py24
-.elif ${_PYTHON_VERSION} == "24pth"
-PYPKGSRCDIR= ../../lang/python24-pth
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python24-pth}:${PYPKGSRCDIR}
-PYPACKAGE= python24-pth
-PYVERSSUFFIX= 2p4
-PYPKGPREFIX= py24pth
-. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
-PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink3.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink3.mk"
-. endif
-. endif
.elif ${_PYTHON_VERSION} == "23"
PYPKGSRCDIR= ../../lang/python23
PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23}:${PYPKGSRCDIR}
PYPACKAGE= python23
PYVERSSUFFIX= 2.3
PYPKGPREFIX= py23
-.elif ${_PYTHON_VERSION} == "23pth"
-PYPKGSRCDIR= ../../lang/python23-pth
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23-pth}:${PYPKGSRCDIR}
-PYPACKAGE= python23-pth
-PYVERSSUFFIX= 2p3
-PYPKGPREFIX= py23pth
-. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
-PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink3.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink3.mk"
-. endif
-. endif
.elif ${_PYTHON_VERSION} == "22"
PYPKGSRCDIR= ../../lang/python22
PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22}:${PYPKGSRCDIR}
PYPACKAGE= python22
PYVERSSUFFIX= 2.2
PYPKGPREFIX= py22
-.elif ${_PYTHON_VERSION} == "22pth"
-PYPKGSRCDIR= ../../lang/python22-pth
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22-pth}:${PYPKGSRCDIR}
-PYPACKAGE= python22-pth
-PYVERSSUFFIX= 2p2
-PYPKGPREFIX= py22pth
-. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
-PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink3.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink3.mk"
-. endif
-. endif
.elif ${_PYTHON_VERSION} == "21"
PYPKGSRCDIR= ../../lang/python21
PYPACKAGE= python21
PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21}:${PYPKGSRCDIR}
PYVERSSUFFIX= 2.1
PYPKGPREFIX= py21
-.elif ${_PYTHON_VERSION} == "21pth"
-PYPKGSRCDIR= ../../lang/python21-pth
-PYPACKAGE= python21-pth
-PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21-pth}:${PYPKGSRCDIR}
-PYVERSSUFFIX= 2p1
-PYPKGPREFIX= py21pth
-. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
-PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink3.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink3.mk"
-. endif
-. endif
.elif ${_PYTHON_VERSION} == "20"
PYPKGSRCDIR= ../../lang/python20
PYPACKAGE= python20
@@ -208,6 +138,11 @@ BUILD_DEPENDS+= py15-distutils-*:../../devel/py-distutils
.endif
.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
+PTHREAD_OPTS= require
+. include "../../mk/pthread.buildlink3.mk"
+. if ${PTHREAD_TYPE} == "pth"
+. include "../../devel/pth/buildlink3.mk"
+. endif
. if defined(PYTHON_FOR_BUILD_ONLY)
BUILD_DEPMETHOD.python?= build
. endif
diff --git a/lang/python/srcdist.mk b/lang/python/srcdist.mk
index 2947ea3272a..1b611230e50 100644
--- a/lang/python/srcdist.mk
+++ b/lang/python/srcdist.mk
@@ -1,8 +1,8 @@
-# $NetBSD: srcdist.mk,v 1.12 2004/12/05 23:39:03 recht Exp $
+# $NetBSD: srcdist.mk,v 1.13 2005/01/23 20:41:46 recht Exp $
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == "24" || ${_PYTHON_VERSION} == "24pth"
+.if ${_PYTHON_VERSION} == "24"
DISTNAME= Python-2.4
EXTRACT_SUFX= .tar.bz2
@@ -12,7 +12,7 @@ PYSUBDIR= Python-2.4
WRKSRC= ${WRKDIR}/${PYSUBDIR}
MASTER_SITES= ftp://ftp.python.org/pub/python/2.4/
-.elif ${_PYTHON_VERSION} == "23" || ${_PYTHON_VERSION} == "23pth"
+.elif ${_PYTHON_VERSION} == "23"
DISTNAME= Python-2.3.4
EXTRACT_SUFX= .tgz
@@ -22,7 +22,7 @@ PYSUBDIR= Python-2.3.4
WRKSRC= ${WRKDIR}/${PYSUBDIR}
MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.4/
-.elif ${_PYTHON_VERSION} == "22" || ${_PYTHON_VERSION} == "22pth"
+.elif ${_PYTHON_VERSION} == "22"
DISTNAME= Python-2.2.3
EXTRACT_SUFX= .tgz
@@ -32,7 +32,7 @@ PYSUBDIR= Python-2.2.3
WRKSRC= ${WRKDIR}/${PYSUBDIR}
MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/
-.elif ${_PYTHON_VERSION} == "21" || ${_PYTHON_VERSION} == "21pth"
+.elif ${_PYTHON_VERSION} == "21"
DISTNAME= Python-2.1.3
EXTRACT_SUFX= .tgz
diff --git a/lang/python21-pth/Makefile b/lang/python21-pth/Makefile
index 70ec9dcfb51..27531a5cb4f 100644
--- a/lang/python21-pth/Makefile
+++ b/lang/python21-pth/Makefile
@@ -1,15 +1,26 @@
-# $NetBSD: Makefile,v 1.14 2004/08/29 10:44:19 recht Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/23 20:41:46 recht Exp $
#
+DISTNAME= Python-2.1.3
PKGNAME= python21-pth-2.1.3
PKGREVISION= 6
+CATEGORIES= lang python
+MASTER_SITES= # empty
+DISTFILES= # empty
-PTHREAD_OPTS= require
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "pth"
-CONFIGURE_ARGS+= --with-pth
-.endif
+MAINTAINER= tech-pkg@NetBSD.org
+HOMEPAGE= http://www.python.org/
+COMMENT= Interpreted, interactive, object-oriented programming language
-PY_VER_SUFFIX= 2p1
+DEPENDS+= python21>=2.1.3:../../lang/python21
-.include "../../lang/python21/Makefile.common"
+EXTRACT_ONLY= # empty
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_BUILDLINK= yes
+NO_MTREE= yes
+
+do-install: # empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python21-pth/PLIST b/lang/python21-pth/PLIST
new file mode 100644
index 00000000000..db0b189f5e1
--- /dev/null
+++ b/lang/python21-pth/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.4 2005/01/23 20:41:46 recht Exp $
+@comment this plist intentionally left empty
diff --git a/lang/python21-pth/buildlink3.mk b/lang/python21-pth/buildlink3.mk
deleted file mode 100644
index 0daeadc96e9..00000000000
--- a/lang/python21-pth/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PYTHON21_PTH_BUILDLINK3_MK:= ${PYTHON21_PTH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= python21-pth
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython21-pth}
-BUILDLINK_PACKAGES+= python21-pth
-
-.if !empty(PYTHON21_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python21-pth+= python21-pth>=2.1.3nb2
-BUILDLINK_PKGSRCDIR.python21-pth?= ../../lang/python21-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python21pth?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_INCDIRS.python21-pth+= include/python2p1
-BUILDLINK_LIBDIRS.python21-pth+= lib/python2p1/config
-BUILDLINK_TRANSFORM+= l:python:python2p1
-
-.endif # PYTHON21_PTH_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python21-pth/distinfo b/lang/python21-pth/distinfo
deleted file mode 100644
index f2e810aaa11..00000000000
--- a/lang/python21-pth/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.9 2004/08/29 10:44:19 recht Exp $
-
-SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
-Size (Python-2.1.3.tgz) = 6194432 bytes
-SHA1 (patch-aa) = d87aebf7b89a559e83c13a039fbdb98b39835211
-SHA1 (patch-ab) = e39bbe1e46bfc535dc887eeb9059e0c500c393db
-SHA1 (patch-ac) = 4da78f997fb45365eee6d266c73bc129fe865d12
-SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
-SHA1 (patch-ae) = 079cd208ba57755a7e0f3ac03b6ba59d622be5db
-SHA1 (patch-af) = 4e446bd88334dbee441f6a8dc41e7eaeb771e773
-SHA1 (patch-ag) = fa9a5f13072d9137182675394f04cd9b163d3a5c
-SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
-SHA1 (patch-ai) = 6420f2994109b8cce55674ea14d7a974f9e039c6
-SHA1 (patch-aj) = ca232f769b57f617496f5c8701a0a32fe55f1fd9
-SHA1 (patch-ba) = 5e47b2e75ea40682216e42fbf8b971432836afdc
-SHA1 (patch-bb) = dea4f69c7b5152c02b903b08e1cf505e5f0fdc6b
-SHA1 (patch-bc) = d1a9b636c736a625c920fb013b07a1a41e824720
diff --git a/lang/python21-pth/patches/patch-aa b/lang/python21-pth/patches/patch-aa
deleted file mode 100644
index eb3c0208577..00000000000
--- a/lang/python21-pth/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/09/04 14:25:18 drochner Exp $
-
---- Misc/Makefile.pre.in.orig Thu Aug 22 15:36:50 2002
-+++ Misc/Makefile.pre.in Thu Aug 22 15:36:55 2002
-@@ -92,10 +92,10 @@
- TARGET= python
-
- # Installed python binary (used only by boot target)
--PYTHON= python
-+PYTHON= python2p1
-
- # Add more -I and -D options here
--CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
-+CFLAGS+= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
-
- # These two variables can be set in Setup to merge extensions.
- # See example[23].
diff --git a/lang/python21-pth/patches/patch-ab b/lang/python21-pth/patches/patch-ab
deleted file mode 100644
index f9d81388f5b..00000000000
--- a/lang/python21-pth/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
-
---- Tools/scripts/pydoc2p1.orig Tue Aug 20 20:49:53 2002
-+++ Tools/scripts/pydoc2p1 Tue Aug 20 20:50:25 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2p1
-
- import pydoc
- pydoc.cli()
diff --git a/lang/python21-pth/patches/patch-ac b/lang/python21-pth/patches/patch-ac
deleted file mode 100644
index 6f252fb856e..00000000000
--- a/lang/python21-pth/patches/patch-ac
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/05/16 20:01:59 minskim Exp $
-
---- setup.py.orig 2001-12-27 15:51:02.000000000 -0600
-+++ setup.py
-@@ -145,12 +145,6 @@ class PyBuildExt(build_ext):
- return platform
-
- def detect_modules(self):
-- # Ensure that /usr/local is always used
-- if '/usr/local/lib' not in self.compiler.library_dirs:
-- self.compiler.library_dirs.insert(0, '/usr/local/lib')
-- if '/usr/local/include' not in self.compiler.include_dirs:
-- self.compiler.include_dirs.insert(0, '/usr/local/include' )
--
- # lib_dirs and inc_dirs are used to search for files;
- # if a file is found in one of those directories, it can
- # be assumed that no additional -I,-L directives are needed.
-@@ -265,13 +259,13 @@ class PyBuildExt(build_ext):
- # These represent audio samples or images as strings:
-
- # Disabled on 64-bit platforms
-- if sys.maxint != 9223372036854775807L:
-+# if sys.maxint != 9223372036854775807L:
- # Operations on audio samples
-- exts.append( Extension('audioop', ['audioop.c']) )
-+# exts.append( Extension('audioop', ['audioop.c']) )
- # Operations on images
-- exts.append( Extension('imageop', ['imageop.c']) )
-+# exts.append( Extension('imageop', ['imageop.c']) )
- # Read SGI RGB image files (but coded portably)
-- exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
-+# exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
-
- # readline
- if self.compiler.find_library_file(lib_dirs, 'readline'):
-@@ -296,14 +290,10 @@ class PyBuildExt(build_ext):
- # socket(2)
- # Detect SSL support for the socket module
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-- ['/usr/local/ssl/include',
-- '/usr/contrib/ssl/include/'
-- ]
-+ []
- )
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-- ] )
-+ [] )
-
- if (ssl_incs is not None and
- ssl_libs is not None):
-@@ -408,8 +398,8 @@ class PyBuildExt(build_ext):
-
- if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
- curses_libs = ['ncurses']
-- exts.append( Extension('_curses', ['_cursesmodule.c'],
-- libraries = curses_libs) )
-+# exts.append( Extension('_curses', ['_cursesmodule.c'],
-+# libraries = curses_libs) )
- elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform[:6] != 'darwin':
- # OSX has an old Berkeley curses, not good enough for the _curses module.
- if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-@@ -417,8 +407,8 @@ class PyBuildExt(build_ext):
- else:
- curses_libs = ['curses', 'termcap']
-
-- exts.append( Extension('_curses', ['_cursesmodule.c'],
-- libraries = curses_libs) )
-+# exts.append( Extension('_curses', ['_cursesmodule.c'],
-+# libraries = curses_libs) )
-
- # If the curses module is enabled, check for the panel module
- if (os.path.exists('Modules/_curses_panel.c') and
-@@ -451,23 +441,7 @@ class PyBuildExt(build_ext):
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.cdrom.com/pub/infozip/zlib/
-- zlib_inc = find_file('zlib.h', [], inc_dirs)
-- if zlib_inc is not None:
-- zlib_h = zlib_inc[0] + '/zlib.h'
-- version = '"0.0.0"'
-- version_req = '"1.1.3"'
-- fp = open(zlib_h)
-- while 1:
-- line = fp.readline()
-- if not line:
-- break
-- if line.find('#define ZLIB_VERSION', 0) == 0:
-- version = line.split()[2]
-- break
-- if version >= version_req:
-- if (self.compiler.find_library_file(lib_dirs, 'z')):
-- exts.append( Extension('zlib', ['zlibmodule.c'],
-- libraries = ['z']) )
-+ exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
-
- # Interface to the Expat XML parser
- #
-@@ -609,7 +583,7 @@ def main():
- ext_modules=[Extension('struct', ['structmodule.c'])],
-
- # Scripts to install
-- scripts = ['Tools/scripts/pydoc']
-+ scripts = ['Tools/scripts/pydoc2p1']
- )
-
- # --install-platlib
diff --git a/lang/python21-pth/patches/patch-ad b/lang/python21-pth/patches/patch-ad
deleted file mode 100644
index 1cb554c8981..00000000000
--- a/lang/python21-pth/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
-
---- Lib/distutils/command/build_ext.py.orig Sat Mar 17 15:15:41 2001
-+++ Lib/distutils/command/build_ext.py
-@@ -461,8 +461,18 @@
- # 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,
diff --git a/lang/python21-pth/patches/patch-ae b/lang/python21-pth/patches/patch-ae
deleted file mode 100644
index d1826b0d782..00000000000
--- a/lang/python21-pth/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/09/04 14:25:18 drochner Exp $
-
---- configure.orig Thu Dec 27 22:55:46 2001
-+++ configure Tue Aug 20 20:12:59 2002
-@@ -569,7 +569,7 @@
-
- # Set VERSION so we only need to edit in one place (i.e., here)
-
--VERSION=2.1
-+VERSION=2p1
-
- # Arguments passed to configure.
-
diff --git a/lang/python21-pth/patches/patch-af b/lang/python21-pth/patches/patch-af
deleted file mode 100644
index bbfb868e892..00000000000
--- a/lang/python21-pth/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/06/06 18:14:12 drochner Exp $
-
---- Makefile.pre.in.orig 2001-07-19 15:21:05.000000000 +0200
-+++ Makefile.pre.in 2003-06-06 19:35:30.000000000 +0200
-@@ -55,7 +55,7 @@
- # Compiler options
- OPT= @OPT@
- DEFS= @DEFS@
--CFLAGS= $(OPT) -I. -I$(srcdir)/Include $(DEFS)
-+CFLAGS= @CFLAGS@ $(OPT) -I. -I$(srcdir)/Include $(DEFS)
- LDFLAGS= @LDFLAGS@
- LDLAST= @LDLAST@
- SGI_ABI= @SGI_ABI@
-@@ -274,7 +274,7 @@
- $(PYTHON): Modules/$(MAINOBJ) $(LDLIBRARY)
- $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
- Modules/$(MAINOBJ) \
-- $(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+ $(LDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
-
- platform: $(PYTHON)
- ./$(PYTHON) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -386,7 +386,7 @@
- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-
- $(PGEN): $(PGENOBJS)
-- $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
-+ $(CC) $(LDFLAGS) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
-
- Parser/grammar.o: $(srcdir)/Parser/grammar.c \
- $(srcdir)/Parser/assert.h \
diff --git a/lang/python21-pth/patches/patch-ag b/lang/python21-pth/patches/patch-ag
deleted file mode 100644
index 87feda9e327..00000000000
--- a/lang/python21-pth/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/08/20 19:58:58 drochner Exp $
-
---- Include/patchlevel.h.orig Tue Aug 20 19:53:31 2002
-+++ Include/patchlevel.h Tue Aug 20 19:54:05 2002
-@@ -26,7 +26,7 @@
- #define PY_RELEASE_SERIAL 0
-
- /* Version as a string */
--#define PY_VERSION "2.1.3"
-+#define PY_VERSION "2p1.3"
-
- /* Historic */
- #define PATCHLEVEL "2.1.3"
diff --git a/lang/python21-pth/patches/patch-ah b/lang/python21-pth/patches/patch-ah
deleted file mode 100644
index 8b34ad969e4..00000000000
--- a/lang/python21-pth/patches/patch-ah
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/01/22 17:05:34 drochner Exp $
-
---- Lib/os.py.orig Wed Jan 22 17:27:56 2003
-+++ Lib/os.py Wed Jan 22 17:30:02 2003
-@@ -291,7 +291,7 @@
- _execvpe(file, args)
-
- def execvpe(file, args, env):
-- """execv(file, args, env)
-+ """execvpe(file, args, env)
-
- Execute the executable file (which is searched for along $PATH)
- with argument list args and environment env , replacing the
-@@ -301,8 +301,9 @@
-
- __all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"])
-
--_notfound = None
- def _execvpe(file, args, env=None):
-+ from errno import ENOENT, ENOTDIR
-+
- if env is not None:
- func = execve
- argrest = (args, env)
-@@ -310,7 +311,7 @@
- func = execv
- argrest = (args,)
- env = environ
-- global _notfound
-+
- head, tail = path.split(file)
- if head:
- apply(func, (file,) + argrest)
-@@ -320,30 +321,21 @@
- else:
- envpath = defpath
- PATH = envpath.split(pathsep)
-- if not _notfound:
-- if sys.platform[:4] == 'beos':
-- # Process handling (fork, wait) under BeOS (up to 5.0)
-- # doesn't interoperate reliably with the thread interlocking
-- # that happens during an import. The actual error we need
-- # is the same on BeOS for posix.open() et al., ENOENT.
-- try: unlink('/_#.# ## #.#')
-- except error, _notfound: pass
-- else:
-- import tempfile
-- t = tempfile.mktemp()
-- # Exec a file that is guaranteed not to exist
-- try: execv(t, ('blah',))
-- except error, _notfound: pass
-- exc, arg = error, _notfound
-+ saved_exc = None
-+ saved_tb = None
- for dir in PATH:
- fullname = path.join(dir, file)
- try:
- apply(func, (fullname,) + argrest)
-- except error, (errno, msg):
-- if errno != arg[0]:
-- exc, arg = error, (errno, msg)
-- raise exc, arg
--
-+ except error, e:
-+ tb = sys.exc_info()[2]
-+ if (e.errno != ENOENT and e.errno != ENOTDIR
-+ and saved_exc is None):
-+ saved_exc = e
-+ saved_tb = tb
-+ if saved_exc:
-+ raise error, saved_exc, saved_tb
-+ raise error, e, tb
-
- # Change environ to automatically call putenv() if it exists
- try:
diff --git a/lang/python21-pth/patches/patch-ai b/lang/python21-pth/patches/patch-ai
deleted file mode 100644
index 1cd11d1786c..00000000000
--- a/lang/python21-pth/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/01/22 17:05:34 drochner Exp $
-
---- Modules/Setup.dist.orig Wed Jan 22 17:37:38 2003
-+++ Modules/Setup.dist Wed Jan 22 17:39:03 2003
-@@ -97,6 +97,7 @@
- # setup.py script in the root of the Python source tree.
-
- posix posixmodule.c # posix (UNIX) system calls
-+errno errnomodule.c # posix (UNIX) errno values
- _sre _sre.c # Fredrik Lundh's new regular expressions
-
- # The rest of the modules listed in this file are all commented out by
-@@ -162,7 +163,6 @@
- #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
- #select selectmodule.c # select(2); not on ancient System V
-
- # Memory-mapped files (also works on Win32).
diff --git a/lang/python21-pth/patches/patch-aj b/lang/python21-pth/patches/patch-aj
deleted file mode 100644
index 05c6b6fbb72..00000000000
--- a/lang/python21-pth/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/02/11 17:52:51 drochner Exp $
-
---- Lib/test/test_popen.py.orig Tue Feb 11 17:23:42 2003
-+++ Lib/test/test_popen.py Tue Feb 11 17:26:22 2003
-@@ -15,7 +15,7 @@
- # This results in Python being spawned and printing the sys.argv list.
- # We can then eval() the result of this, and see what each argv was.
- def _do_test_commandline(cmdline, expected):
-- cmd = 'python -c "import sys;print sys.argv" %s' % (cmdline,)
-+ cmd = '%s -c "import sys;print sys.argv" %s' % (sys.executable,cmdline)
- data = popen(cmd).read()
- got = eval(data)[1:] # strip off argv[0]
- if got != expected:
diff --git a/lang/python21-pth/patches/patch-ba b/lang/python21-pth/patches/patch-ba
deleted file mode 100644
index a5e7941b3a5..00000000000
--- a/lang/python21-pth/patches/patch-ba
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2002/09/06 17:01:08 drochner Exp $
-
---- Python/thread_pth.h.orig Thu Oct 12 22:58:32 2000
-+++ Python/thread_pth.h Fri Sep 6 18:34:12 2002
-@@ -30,6 +30,8 @@
-
- #define CHECK_STATUS(name) if (status == -1) { printf("%d ", status); perror(name); error = 1; }
-
-+pth_attr_t PyThread_attr;
-+
- /*
- * Initialization.
- */
-@@ -37,6 +39,9 @@
- static void PyThread__init_thread(void)
- {
- pth_init();
-+ PyThread_attr = pth_attr_new();
-+ pth_attr_set(PyThread_attr, PTH_ATTR_STACK_SIZE, 1<<18);
-+ pth_attr_set(PyThread_attr, PTH_ATTR_JOINABLE, FALSE);
- }
-
- /*
-@@ -51,7 +56,7 @@
- if (!initialized)
- PyThread_init_thread();
-
-- th = pth_spawn(PTH_ATTR_DEFAULT,
-+ th = pth_spawn(PyThread_attr,
- (void* (*)(void *))func,
- (void *)arg
- );
diff --git a/lang/python21-pth/patches/patch-bb b/lang/python21-pth/patches/patch-bb
deleted file mode 100644
index 7d973f185bd..00000000000
--- a/lang/python21-pth/patches/patch-bb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $
-
---- Lib/test/test_fcntl.py.orig 2001-04-11 22:58:20.000000000 +0200
-+++ Lib/test/test_fcntl.py 2004-08-28 12:12:17.000000000 +0200
-@@ -16,11 +16,11 @@
- if verbose:
- print 'Status from fnctl with O_NONBLOCK: ', rv
-
--if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin1',
-+if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin1',
- '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', 'unixware7']:
- lockdata = struct.pack('hhlllii', FCNTL.F_WRLCK, 0, 0, 0, 0, 0, 0)
- else:
diff --git a/lang/python21-pth/patches/patch-bc b/lang/python21-pth/patches/patch-bc
deleted file mode 100644
index 502596ebdd9..00000000000
--- a/lang/python21-pth/patches/patch-bc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
-
---- Lib/posixfile.py.orig 2001-04-10 17:44:33.000000000 +0200
-+++ Lib/posixfile.py 2004-08-28 12:10:29.000000000 +0200
-@@ -171,11 +171,11 @@
- # Hack by davem@magnet.com to get locking to go on freebsd;
- # additions for AIX by Vladimir.Marangozov@imag.fr
- import sys, os
-- if sys.platform in ('netbsd1',
-+ 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', \
-@@ -187,12 +187,12 @@
- flock = fcntl.fcntl(self._file_.fileno(), cmd, flock)
-
- if '?' in how:
-- if sys.platform in ('netbsd1',
-+ 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/python21/Makefile b/lang/python21/Makefile
index ba5f95871c2..d41d3a925f2 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,11 +1,69 @@
-# $NetBSD: Makefile,v 1.16 2004/08/29 10:44:19 recht Exp $
+# $NetBSD: Makefile,v 1.17 2005/01/23 20:41:46 recht Exp $
#
+DISTNAME= Python-2.1.3
PKGNAME= python21-2.1.3
-PKGREVISION= 4
+PKGREVISION= 5
+CATEGORIES= lang python
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/
+EXTRACT_SUFX= .tgz
-CONFIGURE_ARGS+= --without-threads
+MAINTAINER= tech-pkg@NetBSD.org
+HOMEPAGE= http://www.python.org/
+COMMENT= Interpreted, interactive, object-oriented programming language
+
+USE_LANGUAGES= c c++
+USE_BUILDLINK3= YES
+GNU_CONFIGURE= YES
+
+PTHREAD_OPTS= require
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+= --with-pth
+.endif
PY_VER_SUFFIX= 2.1
-.include "../../lang/python21/Makefile.common"
+INSTALL_TARGET= altinstall
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC= ${.CURDIR}/../../lang/python21/PLIST.common
+.if exists(${.CURDIR}/../../lang/python21/PLIST.${OPSYS})
+PLIST_SRC+= ${.CURDIR}/../../lang/python21/PLIST.${OPSYS}
+.endif
+PLIST_SRC+= ${.CURDIR}/../../lang/python21/PLIST.common_end
+
+.if ${OPSYS} == "Darwin"
+PY_PLATNAME= ${LOWER_OPSYS}
+.elif ${OPSYS} == "IRIX"
+PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
+.elif ${OPSYS} == "SunOS"
+PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
+.else
+PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
+.endif
+PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
+
+# bsddb.so is not built on Solaris (or IRIX?)
+BSDDB=
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
+BSDDB= "@comment "
+.endif
+PLIST_SUBST+= BSDDB=${BSDDB}
+
+PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
+
+post-extract:
+ ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+
+# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
+# set earlier in the environment (last definition wins).
+#
+.if ${OBJECT_FMT} == "a.out"
+MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}"
+.endif
diff --git a/lang/python21/Makefile.common b/lang/python21/Makefile.common
deleted file mode 100644
index 7f09c1146f2..00000000000
--- a/lang/python21/Makefile.common
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2004/12/19 05:34:07 grant Exp $
-#
-
-DISTNAME= Python-2.1.3
-CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.python.org/
-COMMENT= Interpreted, interactive, object-oriented programming language
-
-USE_LANGUAGES= c c++
-USE_BUILDLINK3= YES
-GNU_CONFIGURE= YES
-
-INSTALL_TARGET= altinstall
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC= ${.CURDIR}/../../lang/python21/PLIST.common
-.if exists(${.CURDIR}/../../lang/python21/PLIST.${OPSYS})
-PLIST_SRC+= ${.CURDIR}/../../lang/python21/PLIST.${OPSYS}
-.endif
-PLIST_SRC+= ${.CURDIR}/../../lang/python21/PLIST.common_end
-
-.if ${OPSYS} == "Darwin"
-PY_PLATNAME= ${LOWER_OPSYS}
-.elif ${OPSYS} == "IRIX"
-PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
-.elif ${OPSYS} == "SunOS"
-PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
-.else
-PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
-.endif
-PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
-
-# bsddb.so is not built on Solaris (or IRIX?)
-BSDDB=
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
-BSDDB= "@comment "
-.endif
-PLIST_SUBST+= BSDDB=${BSDDB}
-
-PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
-
-post-extract:
- ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
-# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
-# set earlier in the environment (last definition wins).
-#
-.if ${OBJECT_FMT} == "a.out"
-MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}"
-.endif
diff --git a/lang/python22-pth/Makefile b/lang/python22-pth/Makefile
index 009527bcdd7..5612fbdabf2 100644
--- a/lang/python22-pth/Makefile
+++ b/lang/python22-pth/Makefile
@@ -1,15 +1,26 @@
-# $NetBSD: Makefile,v 1.14 2004/08/29 10:44:19 recht Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/23 20:41:47 recht Exp $
#
+DISTNAME= Python-2.2.3
PKGNAME= python22-pth-2.2.3
PKGREVISION= 3
+CATEGORIES= lang python
+MASTER_SITES= # empty
+DISTFILES= # empty
-PTHREAD_OPTS= require
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "pth"
-CONFIGURE_ARGS+= --with-pth
-.endif
+MAINTAINER= tech-pkg@NetBSD.org
+HOMEPAGE= http://www.python.org/
+COMMENT= Interpreted, interactive, object-oriented programming language
-PY_VER_SUFFIX= 2p2
+DEPENDS+= python22>=2.2.3:../../lang/python22
-.include "../../lang/python22/Makefile.common"
+EXTRACT_ONLY= # empty
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_BUILDLINK= yes
+NO_MTREE= yes
+
+do-install: # empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python22-pth/PLIST b/lang/python22-pth/PLIST
new file mode 100644
index 00000000000..1fca9173c92
--- /dev/null
+++ b/lang/python22-pth/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2005/01/23 20:41:47 recht Exp $
+@comment this plist intentionally left empty
diff --git a/lang/python22-pth/buildlink3.mk b/lang/python22-pth/buildlink3.mk
deleted file mode 100644
index 26fa57ccba5..00000000000
--- a/lang/python22-pth/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PYTHON22_PTH_BUILDLINK3_MK:= ${PYTHON22_PTH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= python22-pth
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython22-pth}
-BUILDLINK_PACKAGES+= python22-pth
-
-.if !empty(PYTHON22_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python22-pth+= python22-pth>=2.2.2nb1
-BUILDLINK_PKGSRCDIR.python22-pth?= ../../lang/python22-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python22-pth?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_INCDIRS.python22-pth+= include/python2p2
-BUILDLINK_LIBDIRS.python22-pth+= lib/python2p2/config
-BUILDLINK_TRANSFORM+= l:python:python2p2
-
-.endif # PYTHON22_PTH_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python22-pth/distinfo b/lang/python22-pth/distinfo
deleted file mode 100644
index 58d7cb6588d..00000000000
--- a/lang/python22-pth/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.6 2004/08/29 10:44:19 recht Exp $
-
-SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
-Size (Python-2.2.3.tgz) = 6709556 bytes
-SHA1 (patch-aa) = d88a764938bba189e8ac509f370cc2c8525047a4
-SHA1 (patch-ab) = e5f86717b067a80dd76f14b8d7df4a943eb533e3
-SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e
-SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
-SHA1 (patch-ag) = 46ce7c0e3dfdeb971a253bdcbbdd19b10a78c6c2
-SHA1 (patch-ah) = b1ef2e68cc8037f38e46007c6c65389e91a429fd
-SHA1 (patch-ai) = ae1d8a7886604f9e973f4430f9c673a575452170
-SHA1 (patch-aj) = ccf82a79c38f848d31f5193b561be5a44481fedc
-SHA1 (patch-ba) = 5e47b2e75ea40682216e42fbf8b971432836afdc
-SHA1 (patch-bb) = 389c439e8031257ca997455e10c8bd327b14638a
-SHA1 (patch-bc) = 9fbe77ff35519a290ef1f70fcaa72a60009a36a1
diff --git a/lang/python22-pth/patches/patch-aa b/lang/python22-pth/patches/patch-aa
deleted file mode 100644
index 639176ea37f..00000000000
--- a/lang/python22-pth/patches/patch-aa
+++ /dev/null
@@ -1,172 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/05/16 20:01:59 minskim Exp $
-
---- setup.py.orig 2003-05-22 12:36:54.000000000 -0500
-+++ setup.py
-@@ -210,11 +210,15 @@ class PyBuildExt(build_ext):
- return platform
-
- def detect_modules(self):
-- # Ensure that /usr/local is always used
-- if '/usr/local/lib' not in self.compiler.library_dirs:
-- self.compiler.library_dirs.insert(0, '/usr/local/lib')
-- if '/usr/local/include' not in self.compiler.include_dirs:
-- self.compiler.include_dirs.insert(0, '/usr/local/include' )
-+ # Add the buildlink directories for pkgsrc
-+ if os.environ.has_key('BUILDLINK_DIR'):
-+ dir = os.environ['BUILDLINK_DIR']
-+ libdir = dir + '/lib'
-+ incdir = dir + '/include'
-+ if libdir not in self.compiler.library_dirs:
-+ self.compiler.library_dirs.insert(0, libdir)
-+ if incdir not in self.compiler.include_dirs:
-+ self.compiler.include_dirs.insert(0, incdir)
-
- try:
- have_unicode = unicode
-@@ -274,7 +278,7 @@ class PyBuildExt(build_ext):
- if have_unicode:
- exts.append( Extension('unicodedata', ['unicodedata.c']) )
- # access to ISO C locale support
-- exts.append( Extension('_locale', ['_localemodule.c']) )
-+# exts.append( Extension('_locale', ['_localemodule.c']) )
-
- # Modules with some UNIX dependencies -- on by default:
- # (If you have a really backward UNIX, select and socket may not be
-@@ -330,16 +334,16 @@ class PyBuildExt(build_ext):
- # These represent audio samples or images as strings:
-
- # Disabled on 64-bit platforms
-- if sys.maxint != 9223372036854775807L:
-+# if sys.maxint != 9223372036854775807L:
- # Operations on audio samples
-- exts.append( Extension('audioop', ['audioop.c']) )
-+# exts.append( Extension('audioop', ['audioop.c']) )
- # Operations on images
-- exts.append( Extension('imageop', ['imageop.c']) )
-+# exts.append( Extension('imageop', ['imageop.c']) )
- # Read SGI RGB image files (but coded portably)
-- exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
-+# exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
-
- # readline
-- if self.compiler.find_library_file(lib_dirs, 'readline'):
-+ if 0 and self.compiler.find_library_file(lib_dirs, 'readline'):
- readline_libs = ['readline']
- if self.compiler.find_library_file(lib_dirs,
- 'ncurses'):
-@@ -363,14 +367,10 @@ class PyBuildExt(build_ext):
- # socket(2)
- # Detect SSL support for the socket module
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-- ['/usr/local/ssl/include',
-- '/usr/contrib/ssl/include/'
-- ]
-+ []
- )
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-- ] )
-+ [] )
-
- if ssl_incs is not None:
- krb5_h = find_file('krb5.h', inc_dirs,
-@@ -413,9 +413,9 @@ class PyBuildExt(build_ext):
- exts.append( Extension('dbm', ['dbmmodule.c']) )
-
- # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
-- if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
-- exts.append( Extension('gdbm', ['gdbmmodule.c'],
-- libraries = ['gdbm'] ) )
-+ #if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
-+ # exts.append( Extension('gdbm', ['gdbmmodule.c'],
-+ # libraries = ['gdbm'] ) )
-
- # Berkeley DB interface.
- #
-@@ -469,9 +469,9 @@ class PyBuildExt(build_ext):
- # FTP archive sites. One URL for it is:
- # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
-
-- if (self.compiler.find_library_file(lib_dirs, 'gmp')):
-- exts.append( Extension('mpz', ['mpzmodule.c'],
-- libraries = ['gmp'] ) )
-+ #if (self.compiler.find_library_file(lib_dirs, 'gmp')):
-+ # exts.append( Extension('mpz', ['mpzmodule.c'],
-+ # libraries = ['gmp'] ) )
-
-
- # Unix-only modules
-@@ -498,8 +498,8 @@ class PyBuildExt(build_ext):
-
- if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
- curses_libs = ['ncurses']
-- exts.append( Extension('_curses', ['_cursesmodule.c'],
-- libraries = curses_libs) )
-+# exts.append( Extension('_curses', ['_cursesmodule.c'],
-+# libraries = curses_libs) )
- elif (self.compiler.find_library_file(lib_dirs, 'curses')
- and platform != 'darwin'):
- # OSX has an old Berkeley curses, not good enough for
-@@ -509,8 +509,8 @@ class PyBuildExt(build_ext):
- else:
- curses_libs = ['curses', 'termcap']
-
-- exts.append( Extension('_curses', ['_cursesmodule.c'],
-- libraries = curses_libs) )
-+# exts.append( Extension('_curses', ['_cursesmodule.c'],
-+# libraries = curses_libs) )
-
- # If the curses module is enabled, check for the panel module
- if (module_enabled(exts, '_curses') and
-@@ -544,23 +544,7 @@ class PyBuildExt(build_ext):
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.cdrom.com/pub/infozip/zlib/
-- zlib_inc = find_file('zlib.h', [], inc_dirs)
-- if zlib_inc is not None:
-- zlib_h = zlib_inc[0] + '/zlib.h'
-- version = '"0.0.0"'
-- version_req = '"1.1.3"'
-- fp = open(zlib_h)
-- while 1:
-- line = fp.readline()
-- if not line:
-- break
-- if line.find('#define ZLIB_VERSION', 0) == 0:
-- version = line.split()[2]
-- break
-- if version >= version_req:
-- if (self.compiler.find_library_file(lib_dirs, 'z')):
-- exts.append( Extension('zlib', ['zlibmodule.c'],
-- libraries = ['z']) )
-+ exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
-
- # Interface to the Expat XML parser
- #
-@@ -581,11 +565,11 @@ class PyBuildExt(build_ext):
- else:
- expat_incs = find_file('xmlparse.h', inc_dirs, [])
-
-- if (expat_incs is not None and
-- self.compiler.find_library_file(lib_dirs, 'expat')):
-- exts.append( Extension('pyexpat', ['pyexpat.c'],
-- define_macros = expat_defs,
-- libraries = ['expat']) )
-+ #if (expat_incs is not None and
-+ # self.compiler.find_library_file(lib_dirs, 'expat')):
-+ # exts.append( Extension('pyexpat', ['pyexpat.c'],
-+ # define_macros = expat_defs,
-+ # libraries = ['expat']) )
-
- # Platform-specific libraries
- if platform == 'linux2':
-@@ -808,7 +792,7 @@ def main():
- ext_modules=[Extension('struct', ['structmodule.c'])],
-
- # Scripts to install
-- scripts = ['Tools/scripts/pydoc']
-+ scripts = ['Tools/scripts/pydoc2p2']
- )
-
- # --install-platlib
diff --git a/lang/python22-pth/patches/patch-ab b/lang/python22-pth/patches/patch-ab
deleted file mode 100644
index 97df59eaeb0..00000000000
--- a/lang/python22-pth/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
-
---- Tools/scripts/pydoc2p2.orig Tue Jan 15 17:56:59 2002
-+++ Tools/scripts/pydoc2p2 Tue Jan 15 17:57:25 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2p2
-
- import pydoc
- pydoc.cli()
diff --git a/lang/python22-pth/patches/patch-ae b/lang/python22-pth/patches/patch-ae
deleted file mode 100644
index 9b8b4a250c8..00000000000
--- a/lang/python22-pth/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
-
---- Lib/distutils/command/build_ext.py.orig Thu Dec 6 17:59:54 2001
-+++ Lib/distutils/command/build_ext.py
-@@ -472,8 +472,18 @@
- # 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,
diff --git a/lang/python22-pth/patches/patch-af b/lang/python22-pth/patches/patch-af
deleted file mode 100644
index 540c1f79ce1..00000000000
--- a/lang/python22-pth/patches/patch-af
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
-
-Unofficial patch to support Basic Auth for XML-RPC.
-
---- Lib/xmlrpclib.py.orig Tue Oct 15 18:52:10 2002
-+++ Lib/xmlrpclib.py Wed Oct 16 11:44:47 2002
-@@ -852,20 +852,55 @@
-
- return self.parse_response(h.getfile())
-
-+ ##
-+ # Get authorization info from host parameter
-+ # Host may be a string, or a (host, x509-dict) tuple; if a string,
-+ # it is checked for a 'user:pw@host' format, and a "Basic Auth"
-+ # header is created from the 'user:pw' info.
-+ #
-+ # @return A tuple of: (actual host, base64-encoded Authorization
-+ # header or None, x509 info or empty dictionary)
-+
-+ def get_host_info(self, host):
-+
-+ x509 = {}
-+ if isinstance(host,tuple):
-+ host, x509 = host
-+
-+ import urllib
-+ auth, host = urllib.splituser(host)
-+
-+ if auth:
-+ auth='Basic %s' % auth.encode('base64').strip()
-+ else:
-+ auth=None
-+
-+ return host, auth, x509
-+
- def getparser(self):
- # get parser and unmarshaller
- return getparser()
-
- def make_connection(self, host):
- # create a HTTP connection object from a host descriptor
-+ host, auth, x509 = self.get_host_info(host)
- import httplib
- return httplib.HTTP(host)
-
- def send_request(self, connection, handler, request_body):
- connection.putrequest("POST", handler)
-
-+ ##
-+ # Send host name (and authorization, if any)
-+ #
-+ # @param connection Connection handle.
-+ # @param host Host object (per get_host_info).
-+
- def send_host(self, connection, host):
-+ host, auth, x509 = self.get_host_info(host)
- connection.putheader("Host", host)
-+ if auth:
-+ connection.putheader("Authorization", auth)
-
- def send_user_agent(self, connection):
- connection.putheader("User-Agent", self.user_agent)
-@@ -901,11 +936,10 @@
- def make_connection(self, host):
- # create a HTTPS connection object from a host descriptor
- # host may be a string, or a (host, x509-dict) tuple
-+
- import httplib
-- if isinstance(host, TupleType):
-- host, x509 = host
-- else:
-- x509 = {}
-+ host, auth, x509 = self.get_host_info(host)
-+
- try:
- HTTPS = httplib.HTTPS
- except AttributeError:
-@@ -914,10 +948,6 @@
- else:
- return apply(HTTPS, (host, None), x509)
-
-- def send_host(self, connection, host):
-- if isinstance(host, TupleType):
-- host, x509 = host
-- connection.putheader("Host", host)
-
- class ServerProxy:
- """uri [,options] -> a logical connection to an XML-RPC server
diff --git a/lang/python22-pth/patches/patch-ag b/lang/python22-pth/patches/patch-ag
deleted file mode 100644
index 12fac81925d..00000000000
--- a/lang/python22-pth/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
-
---- configure.orig Tue Oct 22 22:44:05 2002
-+++ configure Tue Oct 22 22:44:42 2002
-@@ -572,7 +572,7 @@
-
- # Set VERSION so we only need to edit in one place (i.e., here)
-
--VERSION=2.2
-+VERSION=2p2
-
- # Arguments passed to configure.
-
diff --git a/lang/python22-pth/patches/patch-ah b/lang/python22-pth/patches/patch-ah
deleted file mode 100644
index d52ef1db3ad..00000000000
--- a/lang/python22-pth/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/06/07 14:37:02 cjep Exp $
---- Include/patchlevel.h.orig 2003-05-30 15:41:07.000000000 +0200
-+++ Include/patchlevel.h 2003-06-02 20:04:34.000000000 +0200
-@@ -26,7 +26,7 @@
- #define PY_RELEASE_SERIAL 0
-
- /* Version as a string */
--#define PY_VERSION "2.2.3"
-+#define PY_VERSION "2p2.3"
-
- /* 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 --git a/lang/python22-pth/patches/patch-ai b/lang/python22-pth/patches/patch-ai
deleted file mode 100644
index 4352431195a..00000000000
--- a/lang/python22-pth/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/06/06 17:31:20 drochner Exp $
-
---- Makefile.pre.in.orig 2003-01-20 03:13:45.000000000 +0100
-+++ Makefile.pre.in 2003-06-06 19:17:56.000000000 +0200
-@@ -56,7 +56,7 @@
- OPT= @OPT@
- DEFS= @DEFS@
- CFLAGS= $(OPT)
--CPPFLAGS= -I. -I$(srcdir)/Include $(DEFS)
-+CPPFLAGS+= -I. -I$(srcdir)/Include $(DEFS)
- LDFLAGS= @LDFLAGS@
- LDLAST= @LDLAST@
- SGI_ABI= @SGI_ABI@
-@@ -294,7 +294,7 @@
- $(BUILDPYTHON): Modules/$(MAINOBJ) $(LDLIBRARY)
- $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
- Modules/$(MAINOBJ) \
-- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
-
- platform: $(BUILDPYTHON)
- ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -407,7 +407,7 @@
- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-
- $(PGEN): $(PGENOBJS)
-- $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
-+ $(CC) $(LDFLAGS) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
-
- Parser/grammar.o: $(srcdir)/Parser/grammar.c \
- $(srcdir)/Include/token.h \
diff --git a/lang/python22-pth/patches/patch-aj b/lang/python22-pth/patches/patch-aj
deleted file mode 100644
index 4b6aa1fe4d9..00000000000
--- a/lang/python22-pth/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/04/08 18:42:40 drochner Exp $
-
---- Python/thread.c.orig 2003-04-08 20:30:53.000000000 +0200
-+++ Python/thread.c 2003-04-08 20:33:45.000000000 +0200
-@@ -107,6 +107,7 @@
-
- #ifdef HAVE_PTH
- #include "thread_pth.h"
-+#undef _POSIX_THREADS
- #endif
-
- #ifdef _POSIX_THREADS
diff --git a/lang/python22-pth/patches/patch-ba b/lang/python22-pth/patches/patch-ba
deleted file mode 100644
index a8a35b78d85..00000000000
--- a/lang/python22-pth/patches/patch-ba
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $
-
---- Python/thread_pth.h.orig Thu Oct 12 22:58:32 2000
-+++ Python/thread_pth.h Fri Sep 6 18:34:12 2002
-@@ -30,6 +30,8 @@
-
- #define CHECK_STATUS(name) if (status == -1) { printf("%d ", status); perror(name); error = 1; }
-
-+pth_attr_t PyThread_attr;
-+
- /*
- * Initialization.
- */
-@@ -37,6 +39,9 @@
- static void PyThread__init_thread(void)
- {
- pth_init();
-+ PyThread_attr = pth_attr_new();
-+ pth_attr_set(PyThread_attr, PTH_ATTR_STACK_SIZE, 1<<18);
-+ pth_attr_set(PyThread_attr, PTH_ATTR_JOINABLE, FALSE);
- }
-
- /*
-@@ -51,7 +56,7 @@
- if (!initialized)
- PyThread_init_thread();
-
-- th = pth_spawn(PTH_ATTR_DEFAULT,
-+ th = pth_spawn(PyThread_attr,
- (void* (*)(void *))func,
- (void *)arg
- );
diff --git a/lang/python22-pth/patches/patch-bb b/lang/python22-pth/patches/patch-bb
deleted file mode 100644
index 23b069f7509..00000000000
--- a/lang/python22-pth/patches/patch-bb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2004/08/29 10:44:19 recht Exp $
-
---- Lib/test/test_fcntl.py.orig 2002-08-23 18:06:46.000000000 +0200
-+++ Lib/test/test_fcntl.py 2004-08-28 12:01:15.000000000 +0200
-@@ -16,11 +16,11 @@
- else:
- 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)
- else:
diff --git a/lang/python22-pth/patches/patch-bc b/lang/python22-pth/patches/patch-bc
deleted file mode 100644
index 2f292e310a4..00000000000
--- a/lang/python22-pth/patches/patch-bc
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
-
---- Lib/posixfile.py.orig 2001-10-25 00:03:35.000000000 +0200
-+++ Lib/posixfile.py 2004-08-28 12:02:35.000000000 +0200
-@@ -182,11 +182,11 @@
- # Hack by davem@magnet.com to get locking to go on freebsd;
- # additions for AIX by Vladimir.Marangozov@imag.fr
- import sys, os
-- if sys.platform in ('netbsd1',
-+ 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', \
-@@ -198,12 +198,12 @@
- flock = fcntl.fcntl(self._file_.fileno(), cmd, flock)
-
- if '?' in how:
-- if sys.platform in ('netbsd1',
-+ 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/python22/Makefile b/lang/python22/Makefile
index 678e1ffe4a4..71909a71db1 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,11 +1,61 @@
-# $NetBSD: Makefile,v 1.22 2004/08/29 10:44:19 recht Exp $
+# $NetBSD: Makefile,v 1.23 2005/01/23 20:41:47 recht Exp $
#
+DISTNAME= Python-2.2.3
PKGNAME= python22-2.2.3
-PKGREVISION= 2
+PKGREVISION= 3
+CATEGORIES= lang python
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/
+EXTRACT_SUFX= .tgz
-CONFIGURE_ARGS+= --without-threads
+MAINTAINER= tech-pkg@NetBSD.org
+HOMEPAGE= http://www.python.org/
+COMMENT= Interpreted, interactive, object-oriented programming language
+
+USE_LANGUAGES= c c++
+USE_BUILDLINK3= YES
+GNU_CONFIGURE= YES
+
+PTHREAD_OPTS= require
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+= --with-pth
+.endif
PY_VER_SUFFIX= 2.2
-.include "../../lang/python22/Makefile.common"
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC= ${.CURDIR}/../../lang/python22/PLIST.common
+.if exists(${.CURDIR}/../../lang/python22/PLIST.${OPSYS})
+PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.${OPSYS}
+.endif
+PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.common_end
+
+.if ${OPSYS} == "Darwin"
+PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}
+.elif ${OPSYS} == "IRIX"
+PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
+.elif ${OPSYS} == "SunOS"
+PLIST_SUBST+= PY_PLATNAME=sunos${OS_VERSION:C/\..*//}
+.else
+PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
+.endif
+
+PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
+
+INSTALL_TARGET= altinstall
+
+post-extract:
+ ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+
+# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
+# set earlier in the environment (last definition wins).
+#
+.if ${OBJECT_FMT} == "a.out"
+MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}"
+.endif
diff --git a/lang/python22/Makefile.common b/lang/python22/Makefile.common
deleted file mode 100644
index 743af848285..00000000000
--- a/lang/python22/Makefile.common
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2004/12/19 05:34:07 grant Exp $
-#
-
-DISTNAME= Python-2.2.3
-CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.python.org/
-COMMENT= Interpreted, interactive, object-oriented programming language
-
-USE_LANGUAGES= c c++
-USE_BUILDLINK3= YES
-GNU_CONFIGURE= YES
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC= ${.CURDIR}/../../lang/python22/PLIST.common
-.if exists(${.CURDIR}/../../lang/python22/PLIST.${OPSYS})
-PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.${OPSYS}
-.endif
-PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.common_end
-
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}
-.elif ${OPSYS} == "IRIX"
-PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
-.elif ${OPSYS} == "SunOS"
-PLIST_SUBST+= PY_PLATNAME=sunos${OS_VERSION:C/\..*//}
-.else
-PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
-.endif
-
-PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
-
-INSTALL_TARGET= altinstall
-
-post-extract:
- ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
-# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
-# set earlier in the environment (last definition wins).
-#
-.if ${OBJECT_FMT} == "a.out"
-MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}"
-.endif
diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile
index 55e3261b418..1484462429a 100644
--- a/lang/python23-pth/Makefile
+++ b/lang/python23-pth/Makefile
@@ -1,16 +1,26 @@
-# $NetBSD: Makefile,v 1.26 2004/06/15 14:26:34 grant Exp $
+# $NetBSD: Makefile,v 1.27 2005/01/23 20:41:47 recht Exp $
#
+DISTNAME= Python-2.3.4
PKGNAME= python23-pth-2.3.4
+PKGREVISION= 3
+CATEGORIES= lang python
+MASTER_SITES= # empty
+DISTFILES= # empty
-#PKG_INSTALLATION_TYPES= overwrite pkgviews
+MAINTAINER= recht@NetBSD.org
+HOMEPAGE= http://www.python.org/
+COMMENT= Interpreted, interactive, object-oriented programming language
-PTHREAD_OPTS= require
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "pth"
-CONFIGURE_ARGS+= --with-pth
-.endif
+DEPENDS+= python23>=2.3.4:../../lang/python23
-PY_VER_SUFFIX= 2p3
+EXTRACT_ONLY= # empty
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_BUILDLINK= yes
+NO_MTREE= yes
-.include "../../lang/python23/Makefile.common"
+do-install: # empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python23-pth/PLIST b/lang/python23-pth/PLIST
new file mode 100644
index 00000000000..3aeb8abf5f9
--- /dev/null
+++ b/lang/python23-pth/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.4 2005/01/23 20:41:47 recht Exp $
+@comment this plist intentionally left empty
diff --git a/lang/python23-pth/buildlink3.mk b/lang/python23-pth/buildlink3.mk
deleted file mode 100644
index d1a6a968dd8..00000000000
--- a/lang/python23-pth/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/26 02:27:43 wiz Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PYTHON23_PTH_BUILDLINK3_MK:= ${PYTHON23_PTH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= python23-pth
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython23-pth}
-BUILDLINK_PACKAGES+= python23-pth
-
-.if !empty(PYTHON23_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python23-pth+= python23-pth>=2.3
-BUILDLINK_RECOMMENDED.python23-pth?= python23-pth>=2.3.3nb2
-BUILDLINK_PKGSRCDIR.python23-pth?= ../../lang/python23-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python23pth?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_INCDIRS.python23-pth+= include/python2p3
-BUILDLINK_LIBDIRS.python23-pth+= lib/python2p3/config
-BUILDLINK_TRANSFORM+= l:python:python2p3
-
-.endif # PYTHON23_PTH_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo
deleted file mode 100644
index ec11f057e46..00000000000
--- a/lang/python23-pth/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.20 2004/12/30 21:56:21 minskim Exp $
-
-SHA1 (Python-2.3.4.tgz) = 7d47431febec704e766b57f12a1a5030bb2d03c3
-Size (Python-2.3.4.tgz) = 8502738 bytes
-SHA1 (patch-aa) = a0fcef6a91ec4724f0aed0fdebce55ba139d3700
-SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
-SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
-SHA1 (patch-ae) = 35d27825ea4f3930cce651761e192a7302696eba
-SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
-SHA1 (patch-ah) = f9a46bfe82acec594cf44afd43f359a5248edadb
-SHA1 (patch-al) = 3e01ac0b4fb8843fc3191a830fbac35728d2f6f1
-SHA1 (patch-am) = eda4c6161b4237e1281cc6b82b26c5195444dcff
-SHA1 (patch-ba) = dd8f89952d7f40c9a979e362758775f093e047bc
-SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
-SHA1 (patch-ca) = 95f5a515fe3dafd75d077e0591e88a34447152ff
-SHA1 (patch-cb) = 301205b29db1ca60f06b2dc0423f5f911eabcd18
-SHA1 (patch-da) = b082eff79571726701aab53c37d8d53a8115e204
-SHA1 (patch-db) = ac37d14f55c165fee1d8225304d6c3c8ec203fec
-SHA1 (patch-dc) = 151159e0bafd248040ab57e5c05152a91fe44ac6
diff --git a/lang/python23-pth/patches/patch-aa b/lang/python23-pth/patches/patch-aa
deleted file mode 100644
index c477532f835..00000000000
--- a/lang/python23-pth/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/06/02 12:29:28 recht Exp $
-
---- Include/patchlevel.h.orig 2004-05-19 05:14:27.000000000 +0200
-+++ Include/patchlevel.h 2004-06-02 14:00:51.000000000 +0200
-@@ -26,7 +26,7 @@
- #define PY_RELEASE_SERIAL 0
-
- /* Version as a string */
--#define PY_VERSION "2.3.4"
-+#define PY_VERSION "2p3.4"
-
- /* 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 --git a/lang/python23-pth/patches/patch-ab b/lang/python23-pth/patches/patch-ab
deleted file mode 100644
index b3c51270615..00000000000
--- a/lang/python23-pth/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/12/08 21:13:56 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 --git a/lang/python23-pth/patches/patch-ad b/lang/python23-pth/patches/patch-ad
deleted file mode 100644
index e1730705004..00000000000
--- a/lang/python23-pth/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/12/08 21:13:56 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 --git a/lang/python23-pth/patches/patch-ae b/lang/python23-pth/patches/patch-ae
deleted file mode 100644
index d0731e391f0..00000000000
--- a/lang/python23-pth/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/06/02 12:29:28 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 --git a/lang/python23-pth/patches/patch-af b/lang/python23-pth/patches/patch-af
deleted file mode 100644
index f37eb2a88cc..00000000000
--- a/lang/python23-pth/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/06/10 10:13:06 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 --git a/lang/python23-pth/patches/patch-ah b/lang/python23-pth/patches/patch-ah
deleted file mode 100644
index c673c5e6e73..00000000000
--- a/lang/python23-pth/patches/patch-ah
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2004/11/28 13:33:20 recht Exp $
-
---- Makefile.pre.in.orig Tue Nov 18 20:54:00 2003
-+++ Makefile.pre.in Thu Nov 11 18:54:35 2004
-@@ -56,7 +56,7 @@
- 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@
-@@ -305,7 +305,7 @@
- $(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
-@@ -345,7 +345,7 @@
-
- libpython$(VERSION).so: $(LIBRARY_OBJS)
- if test $(INSTSONAME) != $(LDLIBRARY); then \
-- $(LDSHARED) -Wl,-soname=$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-+ $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
- $(LN) -f $(INSTSONAME) $@; \
- else\
- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -354,6 +354,9 @@
- 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.
-@@ -613,7 +616,12 @@
- (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 --git a/lang/python23-pth/patches/patch-al b/lang/python23-pth/patches/patch-al
deleted file mode 100644
index 22e980e2508..00000000000
--- a/lang/python23-pth/patches/patch-al
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-al,v 1.9 2004/12/30 21:56:21 minskim Exp $
-
---- configure.orig 2004-05-07 14:13:40.000000000 -0500
-+++ configure
-@@ -1318,7 +1318,7 @@ rm confdefs.h
- mv confdefs.h.new confdefs.h
-
-
--VERSION=2.3
-+VERSION=2p3
-
-
- SOVERSION=1.0
-@@ -1440,6 +1440,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)
-@@ -3603,7 +3605,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}
-@@ -3624,6 +3626,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
-@@ -4021,7 +4031,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
- ;;
-@@ -10082,7 +10097,7 @@ then
- LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
- else
- # No framework. Ignore undefined symbols, assuming they come from Python
-- LDSHARED="$LDSHARED -undefined suppress"
-+ LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
- fi ;;
- Darwin/*)
- LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10091,10 +10106,10 @@ then
- LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
- else
- # No framework, use the Python app as bundle-loader
-- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
-- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
-+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- fi ;;
-- Linux*|GNU*) LDSHARED='$(CC) -shared';;
-+ Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
- dgux*) LDSHARED="ld -G";;
- BSD/OS*/4*) LDSHARED="gcc -shared";;
- OpenBSD*|FreeBSD*)
-@@ -13855,6 +13870,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/lang/python23-pth/patches/patch-am b/lang/python23-pth/patches/patch-am
deleted file mode 100644
index e61b77b82ab..00000000000
--- a/lang/python23-pth/patches/patch-am
+++ /dev/null
@@ -1,350 +0,0 @@
-$NetBSD: patch-am,v 1.5 2004/04/13 22:48:42 recht Exp $
-
---- setup.py.orig 2003-10-21 15:01:21.000000000 -0500
-+++ setup.py
-@@ -15,7 +15,7 @@ from distutils.command.install import in
- from distutils.command.install_lib import install_lib
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_tkinter", "gdbm", "mpz", "pyexpat", "readline"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -240,9 +240,15 @@ class PyBuildExt(build_ext):
- return sys.platform
-
- def detect_modules(self):
-- # Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+ # Add the buildlink directories for pkgsrc
-+ if os.environ.has_key('BUILDLINK_DIR'):
-+ dir = os.environ['BUILDLINK_DIR']
-+ libdir = dir + '/lib'
-+ incdir = dir + '/include'
-+ if libdir not in self.compiler.library_dirs:
-+ self.compiler.library_dirs.insert(0, libdir)
-+ if incdir not in self.compiler.include_dirs:
-+ self.compiler.include_dirs.insert(0, incdir)
-
- # fink installs lots of goodies in /sw/... - make sure we
- # check there
-@@ -436,9 +442,7 @@ class PyBuildExt(build_ext):
- depends = ['socketmodule.h']) )
- # Detect SSL support for the socket module (via _ssl)
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-- ['/usr/local/ssl/include',
-- '/usr/contrib/ssl/include/'
-- ]
-+ []
- )
- if ssl_incs is not None:
- krb5_h = find_file('krb5.h', inc_dirs,
-@@ -446,9 +450,7 @@ class PyBuildExt(build_ext):
- if krb5_h:
- ssl_incs += krb5_h
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-- ] )
-+ [] )
-
- if (ssl_incs is not None and
- ssl_libs is not None):
-@@ -479,116 +481,162 @@ class PyBuildExt(build_ext):
-
- # when sorted in reverse order, keys for this dict must appear in the
- # order you wish to search - e.g., search for db4 before db3
-- db_try_this = {
-- 'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
-- 'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
-- '/usr/local/BerkeleyDB.4.1/lib',
-- '/usr/local/BerkeleyDB.4.0/lib',
-- '/usr/local/lib',
-- '/opt/sfw',
-- '/sw/lib',
-- ),
-- 'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
-- '/usr/local/include/db42',
-- '/usr/local/BerkeleyDB.4.1/include',
-- '/usr/local/include/db41',
-- '/usr/local/BerkeleyDB.4.0/include',
-- '/usr/local/include/db4',
-- '/opt/sfw/include/db4',
-- '/sw/include/db4',
-- '/usr/include/db4',
-- )},
-- 'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
-- 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
-- '/usr/local/BerkeleyDB.3.2/lib',
-- '/usr/local/BerkeleyDB.3.1/lib',
-- '/usr/local/lib',
-- '/opt/sfw/lib',
-- '/sw/lib',
-- ),
-- 'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
-- '/usr/local/BerkeleyDB.3.2/include',
-- '/usr/local/BerkeleyDB.3.1/include',
-- '/usr/local/include/db3',
-- '/opt/sfw/include/db3',
-- '/sw/include/db3',
-- '/usr/include/db3',
-- )},
-- }
--
-- db_search_order = db_try_this.keys()
-- db_search_order.sort()
-- db_search_order.reverse()
-+ #db_try_this = {
-+ #'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
-+ #'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
-+ #'/usr/local/BerkeleyDB.4.1/lib',
-+ #'/usr/local/BerkeleyDB.4.0/lib',
-+ #'/usr/local/lib',
-+ #'/opt/sfw',
-+ #'/sw/lib',
-+ #),
-+ #'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
-+ #'/usr/local/include/db42',
-+ #'/usr/local/BerkeleyDB.4.1/include',
-+ #'/usr/local/include/db41',
-+ #'/usr/local/BerkeleyDB.4.0/include',
-+ #'/usr/local/include/db4',
-+ #'/opt/sfw/include/db4',
-+ #'/sw/include/db4',
-+ #'/usr/include/db4',
-+ #)},
-+ #'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
-+ #'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
-+ #'/usr/local/BerkeleyDB.3.2/lib',
-+ #'/usr/local/BerkeleyDB.3.1/lib',
-+ #'/usr/local/lib',
-+ #'/opt/sfw/lib',
-+ #'/sw/lib',
-+ #),
-+ #'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
-+ #'/usr/local/BerkeleyDB.3.2/include',
-+ #'/usr/local/BerkeleyDB.3.1/include',
-+ #'/usr/local/include/db3',
-+ #'/opt/sfw/include/db3',
-+ #'/sw/include/db3',
-+ #'/usr/include/db3',
-+ #)},
-+ #}
-+
-+ #db_search_order = db_try_this.keys()
-+ #db_search_order.sort()
-+ #db_search_order.reverse()
-+
-+ #class found(Exception): pass
-+ #try:
-+ ## See whether there is a Sleepycat header in the standard
-+ ## search path.
-+ #std_dbinc = None
-+ #for d in inc_dirs:
-+ #f = os.path.join(d, "db.h")
-+ #if os.path.exists(f):
-+ #f = open(f).read()
-+ #m = re.search(r"#define\WDB_VERSION_MAJOR\W([1-9]+)", f)
-+ #if m:
-+ #std_dbinc = 'db' + m.group(1)
-+ #for dbkey in db_search_order:
-+ #dbd = db_try_this[dbkey]
-+ #for dblib in dbd['libs']:
-+ ## Prefer version-specific includes over standard
-+ ## include locations.
-+ #db_incs = find_file('db.h', [], dbd['incdirs'])
-+ #dblib_dir = find_library_file(self.compiler,
-+ #dblib,
-+ #lib_dirs,
-+ #list(dbd['libdirs']))
-+ #if (db_incs or dbkey == std_dbinc) and \
-+ #dblib_dir is not None:
-+ #dblibs = [dblib]
-+ #raise found
-+ #except found:
-+ #dblibs = [dblib]
-+ ## A default source build puts Berkeley DB in something like
-+ ## /usr/local/Berkeley.3.3 and the lib dir under that isn't
-+ ## normally on ld.so's search path, unless the sysadmin has hacked
-+ ## /etc/ld.so.conf. We add the directory to runtime_library_dirs
-+ ## so the proper -R/--rpath flags get passed to the linker. This
-+ ## is usually correct and most trouble free, but may cause problems
-+ ## in some unusual system configurations (e.g. the directory is on
-+ ## an NFS server that goes away).
-+ #exts.append(Extension('_bsddb', ['_bsddb.c'],
-+ #library_dirs=dblib_dir,
-+ #runtime_library_dirs=dblib_dir,
-+ #include_dirs=db_incs,
-+ #libraries=dblibs))
-+ #else:
-+ #db_incs = None
-+ #dblibs = []
-+ #dblib_dir = None
-
-- class found(Exception): pass
-+ # Look for Berkeley db 1.85. Note that it is built as a different
-+ # module name so it can be included even when later versions are
-+ # available. A very restrictive search is performed to avoid
-+ # accidentally building this module with a later version of the
-+ # underlying db library. May BSD-ish Unixes incorporate db 1.85
-+ # symbols into libc and place the include file in /usr/include.
-+ #f = "/usr/include/db.h"
-+ #if os.path.exists(f):
-+ #data = open(f).read()
-+ #m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-+ #if m is not None:
-+ ## bingo - old version used hash file format version 2
-+ #### XXX this should be fixed to not be platform-dependent
-+ #### but I don't have direct access to an osf1 platform and
-+ #### seemed to be muffing the search somehow
-+ #libraries = platform == "osf1" and ['db'] or None
-+ #if libraries is not None:
-+ #exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-+ #libraries=libraries))
-+ #else:
-+ #exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-+
-+ # rely on pkgsrc for Berkeley DB
-+ class NotFound(Exception): pass
- try:
-- # See whether there is a Sleepycat header in the standard
-- # search path.
-- std_dbinc = None
-- for d in inc_dirs:
-- f = os.path.join(d, "db.h")
-+ bdb_type = os.environ['PY_BDB_TYPE']
-+ db_incs = [os.environ['PY_BDB_INCDIRS']]
-+ dblib_dir = None
-+ dblibs = None
-+
-+ # check if need to use the db_185.h compat header
-+ bsddb185_define_macros=[]
-+ if bdb_type == "db2" or bdb_type == "db3" or bdb_type == "db4":
-+ bsddb185_define_macros=[('HAVE_DB_185_H',1)]
-+ dblib_dir = [os.environ['PY_BDB_LIBDIRS']]
-+
-+ else:
-+ # check if db_incs/db.h really is db 1.85
-+ f = "%s/db.h" % db_incs[0]
-+
- if os.path.exists(f):
-- f = open(f).read()
-- m = re.search(r"#define\WDB_VERSION_MAJOR\W([1-9]+)", f)
-- if m:
-- std_dbinc = 'db' + m.group(1)
-- for dbkey in db_search_order:
-- dbd = db_try_this[dbkey]
-- for dblib in dbd['libs']:
-- # Prefer version-specific includes over standard
-- # include locations.
-- db_incs = find_file('db.h', [], dbd['incdirs'])
-- dblib_dir = find_library_file(self.compiler,
-- dblib,
-- lib_dirs,
-- list(dbd['libdirs']))
-- if (db_incs or dbkey == std_dbinc) and \
-- dblib_dir is not None:
-- dblibs = [dblib]
-- raise found
-- except found:
-- dblibs = [dblib]
-- # A default source build puts Berkeley DB in something like
-- # /usr/local/Berkeley.3.3 and the lib dir under that isn't
-- # normally on ld.so's search path, unless the sysadmin has hacked
-- # /etc/ld.so.conf. We add the directory to runtime_library_dirs
-- # so the proper -R/--rpath flags get passed to the linker. This
-- # is usually correct and most trouble free, but may cause problems
-- # in some unusual system configurations (e.g. the directory is on
-- # an NFS server that goes away).
-- exts.append(Extension('_bsddb', ['_bsddb.c'],
-+ data = open(f).read()
-+ m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-+ if m is None:
-+ # check for 1.85 compat header
-+ if os.path.exists("%s/db_185.h" % db_incs[0]):
-+ bsddb185_define_macros=[('HAVE_DB_185_H',1)]
-+ else:
-+ raise NotFound
-+ try:
-+ bltransform = os.environ['PY_BDB_TRANSFORM']
-+ m = re.search(r"l:db:(db.)\s*", bltransform)
-+ if m is not None and m.group(1) is not None:
-+ dblibs = [m.group(1)]
-+ except:
-+ pass
-+
-+ # build the bsddb185 extension module
-+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
- library_dirs=dblib_dir,
- runtime_library_dirs=dblib_dir,
- include_dirs=db_incs,
-+ define_macros=bsddb185_define_macros,
- libraries=dblibs))
-- else:
-+ except:
- db_incs = None
- dblibs = []
-- dblib_dir = None
--
--
-- # Look for Berkeley db 1.85. Note that it is built as a different
-- # module name so it can be included even when later versions are
-- # available. A very restrictive search is performed to avoid
-- # accidentally building this module with a later version of the
-- # underlying db library. May BSD-ish Unixes incorporate db 1.85
-- # symbols into libc and place the include file in /usr/include.
-- f = "/usr/include/db.h"
-- if os.path.exists(f):
-- data = open(f).read()
-- m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-- if m is not None:
-- # bingo - old version used hash file format version 2
-- ### XXX this should be fixed to not be platform-dependent
-- ### but I don't have direct access to an osf1 platform and
-- ### seemed to be muffing the search somehow
-- libraries = platform == "osf1" and ['db'] or None
-- if libraries is not None:
-- exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-- libraries=libraries))
-- else:
-- exts.append(Extension('bsddb185', ['bsddbmodule.c']))
--
-+ dblib_dir = None
-+
- # The standard Unix dbm module:
- if platform not in ['cygwin']:
- if find_file("ndbm.h", inc_dirs, []) is not None:
-@@ -600,6 +648,13 @@ class PyBuildExt(build_ext):
- exts.append( Extension('dbm', ['dbmmodule.c'],
- define_macros=[('HAVE_NDBM_H',None)],
- libraries = ndbm_libs ) )
-+ elif find_file("ndbm.h", db_incs, []) is not None:
-+ exts.append( Extension('dbm', ['dbmmodule.c'],
-+ library_dirs=dblib_dir,
-+ runtime_library_dirs=dblib_dir,
-+ include_dirs=db_incs,
-+ define_macros=[('HAVE_NDBM_H',None)],
-+ libraries=dblibs))
- elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
- exts.append( Extension('dbm', ['dbmmodule.c'],
-@@ -770,7 +825,7 @@ class PyBuildExt(build_ext):
- # Linux-specific modules
- exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-
-- if platform in ('linux2', 'freebsd4'):
-+ if platform in ('linux2', 'freebsd4', 'freebsd5'):
- exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-
- if platform == 'sunos5':
-@@ -1140,7 +1195,7 @@ def main():
- ext_modules=[Extension('struct', ['structmodule.c'])],
-
- # Scripts to install
-- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle']
-+ scripts = ['Tools/scripts/pydoc2p3']
- )
-
- # --install-platlib
diff --git a/lang/python23-pth/patches/patch-ba b/lang/python23-pth/patches/patch-ba
deleted file mode 100644
index c9e18e47ed2..00000000000
--- a/lang/python23-pth/patches/patch-ba
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2004/04/09 23:10:36 recht Exp $
-
---- Modules/_cursesmodule.c.orig 2002-11-21 15:17:51.000000000 +0100
-+++ Modules/_cursesmodule.c 2004-04-09 12:45:06.000000000 +0200
-@@ -313,17 +313,9 @@
- Window_OneArgNoReturnFunction(wattrset, attr_t, "l;attr")
- Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -784,11 +776,7 @@
- } else if (rtn<=255)
- return Py_BuildValue("c", rtn);
- else
--#if defined(__NetBSD__)
-- return PyString_FromString(unctrl(rtn));
--#else
- return PyString_FromString((char *)keyname(rtn));
--#endif
- }
-
- static PyObject *
-@@ -1946,7 +1934,6 @@
- return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
- }
-
--#if !defined(__NetBSD__)
- static PyObject *
- PyCurses_KeyName(PyObject *self, PyObject *args)
- {
-@@ -1965,7 +1952,6 @@
-
- return PyString_FromString((knp == NULL) ? "" : (char *)knp);
- }
--#endif
-
- static PyObject *
- PyCurses_KillChar(PyObject *self)
-@@ -2392,9 +2378,7 @@
- {"initscr", (PyCFunction)PyCurses_InitScr, METH_NOARGS},
- {"intrflush", (PyCFunction)PyCurses_IntrFlush, METH_VARARGS},
- {"isendwin", (PyCFunction)PyCurses_isendwin, METH_NOARGS},
--#if !defined(__NetBSD__)
- {"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS},
--#endif
- {"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
- {"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
- {"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2490,9 +2474,7 @@
- SetDictInt("A_DIM", A_DIM);
- SetDictInt("A_BOLD", A_BOLD);
- SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
--#if !defined(__NetBSD__)
- SetDictInt("A_INVIS", A_INVIS);
--#endif
- SetDictInt("A_PROTECT", A_PROTECT);
- SetDictInt("A_CHARTEXT", A_CHARTEXT);
- SetDictInt("A_COLOR", A_COLOR);
-@@ -2564,7 +2546,6 @@
- int key;
- char *key_n;
- char *key_n2;
--#if !defined(__NetBSD__)
- for (key=KEY_MIN;key < KEY_MAX; key++) {
- key_n = (char *)keyname(key);
- if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2588,7 +2569,6 @@
- if (key_n2 != key_n)
- free(key_n2);
- }
--#endif
- SetDictInt("KEY_MIN", KEY_MIN);
- SetDictInt("KEY_MAX", KEY_MAX);
- }
diff --git a/lang/python23-pth/patches/patch-bb b/lang/python23-pth/patches/patch-bb
deleted file mode 100644
index 6f620c14436..00000000000
--- a/lang/python23-pth/patches/patch-bb
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2004/06/10 10:13:06 recht Exp $
-
---- Lib/posixfile.py.orig 2004-06-07 16:19:35.000000000 +0200
-+++ Lib/posixfile.py
-@@ -182,11 +182,11 @@ class _posixfile_:
- # Hack by davem@magnet.com to get locking to go on freebsd;
- # additions for AIX by Vladimir.Marangozov@imag.fr
- import sys, os
-- if sys.platform in ('netbsd1',
-+ 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', \
-@@ -198,12 +198,12 @@ class _posixfile_:
- flock = fcntl.fcntl(self._file_.fileno(), cmd, flock)
-
- if '?' in how:
-- if sys.platform in ('netbsd1',
-+ 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/python23-pth/patches/patch-ca b/lang/python23-pth/patches/patch-ca
deleted file mode 100644
index 337d046d66c..00000000000
--- a/lang/python23-pth/patches/patch-ca
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2004/06/14 02:31:13 lukem Exp $
-
---- Python/pythonrun.c.orig 2004-03-23 07:41:47.000000000 +1100
-+++ Python/pythonrun.c
-@@ -1581,13 +1581,13 @@ initsigs(void)
- {
- #ifdef HAVE_SIGNAL_H
- #ifdef SIGPIPE
-- signal(SIGPIPE, SIG_IGN);
-+ PyOS_setsig(SIGPIPE, SIG_IGN);
- #endif
- #ifdef SIGXFZ
-- signal(SIGXFZ, SIG_IGN);
-+ PyOS_setsig(SIGXFZ, SIG_IGN);
- #endif
- #ifdef SIGXFSZ
-- signal(SIGXFSZ, SIG_IGN);
-+ PyOS_setsig(SIGXFSZ, SIG_IGN);
- #endif
- #endif /* HAVE_SIGNAL_H */
- PyOS_InitInterrupts(); /* May imply initsignal() */
-@@ -1684,20 +1684,19 @@ PyOS_sighandler_t
- PyOS_setsig(int sig, PyOS_sighandler_t handler)
- {
- #ifdef HAVE_SIGACTION
-- struct sigaction context;
-- PyOS_sighandler_t oldhandler;
-- /* Initialize context.sa_handler to SIG_ERR which makes about as
-- * much sense as anything else. It should get overwritten if
-- * sigaction actually succeeds and otherwise we avoid an
-- * uninitialized memory read.
-- */
-- context.sa_handler = SIG_ERR;
-- sigaction(sig, NULL, &context);
-- oldhandler = context.sa_handler;
-+ struct sigaction context, ocontext;
- context.sa_handler = handler;
-- sigaction(sig, &context, NULL);
-- return oldhandler;
-+ sigemptyset(&context.sa_mask);
-+ context.sa_flags = 0;
-+ if (sigaction(sig, &context, &ocontext) == -1)
-+ return SIG_ERR;
-+ return ocontext.sa_handler;
- #else
-- return signal(sig, handler);
-+ PyOS_sighandler_t oldhandler;
-+ oldhandler = signal(sig, handler);
-+#ifdef HAVE_SIGINTERRUPT
-+ siginterrupt(sig, 1);
-+#endif
-+ return oldhandler;
- #endif
- }
diff --git a/lang/python23-pth/patches/patch-cb b/lang/python23-pth/patches/patch-cb
deleted file mode 100644
index 53944cda97e..00000000000
--- a/lang/python23-pth/patches/patch-cb
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2004/06/14 02:31:13 lukem Exp $
-
---- Modules/signalmodule.c.orig 2003-03-14 00:56:53.000000000 +1100
-+++ Modules/signalmodule.c
-@@ -137,9 +137,6 @@ signal_handler(int sig_num)
- return;
- }
- #endif
--#ifdef HAVE_SIGINTERRUPT
-- siginterrupt(sig_num, 1);
--#endif
- PyOS_setsig(sig_num, signal_handler);
- }
-
-@@ -217,9 +214,6 @@ signal_signal(PyObject *self, PyObject *
- }
- else
- func = signal_handler;
--#ifdef HAVE_SIGINTERRUPT
-- siginterrupt(sig_num, 1);
--#endif
- if (PyOS_setsig(sig_num, func) == SIG_ERR) {
- PyErr_SetFromErrno(PyExc_RuntimeError);
- return NULL;
diff --git a/lang/python23-pth/patches/patch-da b/lang/python23-pth/patches/patch-da
deleted file mode 100644
index a94d625a5b5..00000000000
--- a/lang/python23-pth/patches/patch-da
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-da,v 1.1 2004/11/28 13:33:20 recht Exp $
-
---- Misc/setuid-prog.c.orig Thu Nov 25 13:11:28 2004
-+++ Misc/setuid-prog.c Thu Nov 25 13:11:27 2004
-@@ -70,6 +70,12 @@
- #define environ _environ
- #endif
-
-+#if defined(__APPLE__)
-+# include <sys/time.h>
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#endif /* __APPLE__ */
-+
- /* don't change def_IFS */
- char def_IFS[] = "IFS= \t\n";
- /* you may want to change def_PATH, but you should really change it in */
diff --git a/lang/python23-pth/patches/patch-db b/lang/python23-pth/patches/patch-db
deleted file mode 100644
index c5e271cafaa..00000000000
--- a/lang/python23-pth/patches/patch-db
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-db,v 1.1 2004/11/28 13:33:20 recht Exp $
-
---- Modules/getpath.c.orig Thu Nov 11 18:08:55 2004
-+++ Modules/getpath.c Thu Nov 11 18:10:13 2004
-@@ -374,6 +374,9 @@
- #ifdef WITH_NEXT_FRAMEWORK
- NSModule pythonModule;
- #endif
-+#ifdef __APPLE__
-+ unsigned long nsexeclength = MAXPATHLEN;
-+#endif
-
- /* If there is no slash in the argv0 path, then we have to
- * assume python is on the user's $PATH, since there's no
-@@ -382,6 +385,20 @@
- */
- if (strchr(prog, SEP))
- strncpy(progpath, prog, MAXPATHLEN);
-+#ifdef __APPLE__
-+ /* On Mac OS X, if a script uses an interpreter of the form
-+ * "#!/opt/python2.3/bin/python", the kernel only passes "python"
-+ * as argv[0], which falls through to the $PATH search below.
-+ * If /opt/python2.3/bin isn't in your path, or is near the end,
-+ * this algorithm may incorrectly find /usr/bin/python. To work
-+ * around this, we can use _NSGetExecutablePath to get a better
-+ * hint of what the intended interpreter was, although this
-+ * will fail if a relative path was used. but in that case,
-+ * absolutize() should help us out below
-+ */
-+ else if(0 == _NSGetExecutablePath(progpath, &nsexeclength) && progpath[0] == SEP)
-+ ;
-+#endif // __APPLE__
- else if (path) {
- while (1) {
- char *delim = strchr(path, DELIM);
diff --git a/lang/python23-pth/patches/patch-dc b/lang/python23-pth/patches/patch-dc
deleted file mode 100644
index 077ed6d0587..00000000000
--- a/lang/python23-pth/patches/patch-dc
+++ /dev/null
@@ -1,20 +0,0 @@
---- Modules/posixmodule.c.orig Thu Nov 25 12:56:28 2004
-+++ Modules/posixmodule.c Thu Nov 25 12:57:24 2004
-@@ -304,7 +304,7 @@
- #endif
-
- /* Return a dictionary corresponding to the POSIX environment table */
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -322,7 +322,7 @@
- d = PyDict_New();
- if (d == NULL)
- return NULL;
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- if (environ == NULL)
- environ = *_NSGetEnviron();
- #endif
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 6de96e73963..caea29fbacf 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/06/15 14:26:34 grant Exp $
+# $NetBSD: Makefile,v 1.23 2005/01/23 20:41:47 recht Exp $
#
PKGNAME= python23-2.3.4
+PKGREVISION= 4
#PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index a0535beaf8e..ca5ddf51827 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.23 2005/01/21 02:01:37 tv Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/01/23 20:41:47 recht Exp $
#
DISTNAME= Python-2.3.4
-PKGREVISION= 3
CATEGORIES= lang python
MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.4/
EXTRACT_SUFX= .tgz
diff --git a/lang/python24-pth/Makefile b/lang/python24-pth/Makefile
index d28f4f3f165..f3f5992749a 100644
--- a/lang/python24-pth/Makefile
+++ b/lang/python24-pth/Makefile
@@ -1,14 +1,25 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/05 23:28:53 recht Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/23 20:41:48 recht Exp $
#
+DISTNAME= Python-2.4
PKGNAME= python24-pth-2.4
+CATEGORIES= lang python
+MASTER_SITES= # empty
+DISTFILES= # empty
-PTHREAD_OPTS= require
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "pth"
-CONFIGURE_ARGS+= --with-pth
-.endif
+MAINTAINER= recht@NetBSD.org
+HOMEPAGE= http://www.python.org/
+COMMENT= Interpreted, interactive, object-oriented programming language
-PY_VER_SUFFIX= 2p4
+DEPENDS+= python24>=2.4:../../lang/python24
-.include "../../lang/python24/Makefile.common"
+EXTRACT_ONLY= # empty
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
+NO_BUILDLINK= yes
+NO_MTREE= yes
+
+do-install: # empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python24-pth/PLIST b/lang/python24-pth/PLIST
new file mode 100644
index 00000000000..d39e6c8a9ff
--- /dev/null
+++ b/lang/python24-pth/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2005/01/23 20:41:48 recht Exp $
+@comment this plist intentionally left empty
diff --git a/lang/python24-pth/buildlink3.mk b/lang/python24-pth/buildlink3.mk
deleted file mode 100644
index 124600195b4..00000000000
--- a/lang/python24-pth/buildlink3.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/05 23:28:53 recht Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PYTHON24_PTH_BUILDLINK3_MK:= ${PYTHON24_PTH_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= python24-pth
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython24-pth}
-BUILDLINK_PACKAGES+= python24-pth
-
-.if !empty(PYTHON24_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python24-pth+= python24-pth>=2.4
-BUILDLINK_PKGSRCDIR.python24-pth?= ../../lang/python24-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python24pth?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_INCDIRS.python24-pth+= include/python2p4
-BUILDLINK_LIBDIRS.python24-pth+= lib/python2p4/config
-BUILDLINK_TRANSFORM+= l:python:python2p4
-
-.endif # PYTHON24_PTH_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python24-pth/distinfo b/lang/python24-pth/distinfo
deleted file mode 100644
index b6b813d9004..00000000000
--- a/lang/python24-pth/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.2 2004/12/30 21:56:21 minskim Exp $
-
-SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e
-Size (Python-2.4.tar.bz2) = 7840762 bytes
-SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5
-SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5
-SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24
-SHA1 (patch-ad) = 0fa1c66fa0ad9ce345c44b13fd3897975837c72e
-SHA1 (patch-ae) = 7232b64cc3d201daf0bc00476eb58aa694a6df2a
-SHA1 (patch-af) = 82486cc06585a05a0151b3508e5bbcb3c7281681
-SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
-SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
-SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
-SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
-SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = 1a48a02ea72b99b4f942abc6c91ceab8fc2ba879
-SHA1 (patch-am) = ecb78cf1097531447af7b7fd60166b84b8aef1b4
-SHA1 (patch-ba) = d0f9d225bd3de0a7af098fef05d5b09f8319ce7f
diff --git a/lang/python24-pth/patches/patch-aa b/lang/python24-pth/patches/patch-aa
deleted file mode 100644
index 60297492da1..00000000000
--- a/lang/python24-pth/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
-
---- Include/py_curses.h.orig Sun Jun 29 17:46:21 2003
-+++ 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 --git a/lang/python24-pth/patches/patch-ab b/lang/python24-pth/patches/patch-ab
deleted file mode 100644
index fac547c7a0a..00000000000
--- a/lang/python24-pth/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/12/05 23:28:55 recht Exp $
-
---- Lib/distutils/command/build_ext.py.orig Sun Dec 5 22:03:11 2004
-+++ Lib/distutils/command/build_ext.py Sun Dec 5 22:03:25 2004
-@@ -485,7 +485,17 @@
- # 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 --git a/lang/python24-pth/patches/patch-ac b/lang/python24-pth/patches/patch-ac
deleted file mode 100644
index 0ced298bca6..00000000000
--- a/lang/python24-pth/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/12/05 23:28:55 recht Exp $
-
---- Lib/distutils/command/build_scripts.py.orig Sun Dec 5 22:05:11 2004
-+++ Lib/distutils/command/build_scripts.py Sun Dec 5 22:05:34 2004
-@@ -104,7 +104,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 --git a/lang/python24-pth/patches/patch-ad b/lang/python24-pth/patches/patch-ad
deleted file mode 100644
index a0a3e49d2fc..00000000000
--- a/lang/python24-pth/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/12/05 23:28:55 recht Exp $
-
---- Lib/posixfile.py.orig Wed Aug 18 17:13:40 2004
-+++ Lib/posixfile.py
-@@ -183,10 +183,11 @@ class _posixfile_:
- # additions for AIX by Vladimir.Marangozov@imag.fr
- import sys, os
- if sys.platform in ('netbsd1',
-+ 'netbsd2',
- 'openbsd2',
- 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
- 'freebsd6', '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', \
-@@ -199,11 +200,12 @@ class _posixfile_:
-
- 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/python24-pth/patches/patch-ae b/lang/python24-pth/patches/patch-ae
deleted file mode 100644
index 8e1b8158598..00000000000
--- a/lang/python24-pth/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/12/05 23:28:55 recht Exp $
-
---- Lib/test/test_fcntl.py.orig Wed Aug 18 17:13:41 2004
-+++ 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', 'freebsd6',
- '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 --git a/lang/python24-pth/patches/patch-af b/lang/python24-pth/patches/patch-af
deleted file mode 100644
index e28d9d285ee..00000000000
--- a/lang/python24-pth/patches/patch-af
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/12/05 23:28:55 recht Exp $
-
---- Makefile.pre.in.orig Sun Sep 26 19:26:55 2004
-+++ 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@
-@@ -311,7 +311,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
-@@ -360,6 +360,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.4.0 -compatibility_version 2.4 -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.
-@@ -625,7 +628,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 --git a/lang/python24-pth/patches/patch-ag b/lang/python24-pth/patches/patch-ag
deleted file mode 100644
index 22ee67215b5..00000000000
--- a/lang/python24-pth/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/12/05 23:28:55 recht Exp $
-
---- Misc/setuid-prog.c.orig Thu Sep 10 22:18:09 1998
-+++ Misc/setuid-prog.c
-@@ -70,6 +70,12 @@
- #define environ _environ
- #endif
-
-+#if defined(__APPLE__)
-+# include <sys/time.h>
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#endif /* __APPLE__ */
-+
- /* don't change def_IFS */
- char def_IFS[] = "IFS= \t\n";
- /* you may want to change def_PATH, but you should really change it in */
diff --git a/lang/python24-pth/patches/patch-ah b/lang/python24-pth/patches/patch-ah
deleted file mode 100644
index e045acdf3ae..00000000000
--- a/lang/python24-pth/patches/patch-ah
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
-
---- Modules/_cursesmodule.c.orig Wed Aug 4 16:33:28 2004
-+++ Modules/_cursesmodule.c
-@@ -313,17 +313,9 @@ Window_OneArgNoReturnFunction(wattroff,
- Window_OneArgNoReturnFunction(wattrset, attr_t, "l;attr")
- Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
--#if defined(__NetBSD__)
--Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
--#else
- Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
--#endif
- Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
- Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -784,11 +776,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
- } else if (rtn<=255)
- return Py_BuildValue("c", rtn);
- else
--#if defined(__NetBSD__)
-- return PyString_FromString(unctrl(rtn));
--#else
- return PyString_FromString((char *)keyname(rtn));
--#endif
- }
-
- static PyObject *
-@@ -1946,7 +1934,6 @@ PyCurses_IntrFlush(PyObject *self, PyObj
- return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
- }
-
--#if !defined(__NetBSD__)
- static PyObject *
- PyCurses_KeyName(PyObject *self, PyObject *args)
- {
-@@ -1965,7 +1952,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
-
- return PyString_FromString((knp == NULL) ? "" : (char *)knp);
- }
--#endif
-
- static PyObject *
- PyCurses_KillChar(PyObject *self)
-@@ -2410,9 +2396,7 @@ static PyMethodDef PyCurses_methods[] =
- {"initscr", (PyCFunction)PyCurses_InitScr, METH_NOARGS},
- {"intrflush", (PyCFunction)PyCurses_IntrFlush, METH_VARARGS},
- {"isendwin", (PyCFunction)PyCurses_isendwin, METH_NOARGS},
--#if !defined(__NetBSD__)
- {"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS},
--#endif
- {"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
- {"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
- {"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2511,9 +2495,7 @@ init_curses(void)
- SetDictInt("A_DIM", A_DIM);
- SetDictInt("A_BOLD", A_BOLD);
- SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
--#if !defined(__NetBSD__)
- SetDictInt("A_INVIS", A_INVIS);
--#endif
- SetDictInt("A_PROTECT", A_PROTECT);
- SetDictInt("A_CHARTEXT", A_CHARTEXT);
- SetDictInt("A_COLOR", A_COLOR);
-@@ -2585,7 +2567,6 @@ init_curses(void)
- int key;
- char *key_n;
- char *key_n2;
--#if !defined(__NetBSD__)
- for (key=KEY_MIN;key < KEY_MAX; key++) {
- key_n = (char *)keyname(key);
- if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2609,7 +2590,6 @@ init_curses(void)
- if (key_n2 != key_n)
- free(key_n2);
- }
--#endif
- SetDictInt("KEY_MIN", KEY_MIN);
- SetDictInt("KEY_MAX", KEY_MAX);
- }
diff --git a/lang/python24-pth/patches/patch-ai b/lang/python24-pth/patches/patch-ai
deleted file mode 100644
index 80d527eba1f..00000000000
--- a/lang/python24-pth/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
-
---- Modules/_ssl.c.orig Wed Aug 4 16:59:00 2004
-+++ Modules/_ssl.c
-@@ -7,6 +7,10 @@
-
- */
-
-+#ifdef __sgi
-+#include <sys/types.h>
-+#endif
-+
- #include "Python.h"
- enum py_ssl_error {
- /* these mirror ssl.h */
diff --git a/lang/python24-pth/patches/patch-aj b/lang/python24-pth/patches/patch-aj
deleted file mode 100644
index 0c3c330c0da..00000000000
--- a/lang/python24-pth/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
-
---- Modules/bsddbmodule.c.orig Tue May 6 22:38:52 2003
-+++ Modules/bsddbmodule.c
-@@ -13,6 +13,10 @@
- www.nightmare.com/software.html
- */
-
-+#if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI
-+#define _BSD_TYPES
-+#endif
-+
- #include "Python.h"
- #ifdef WITH_THREAD
- #include "pythread.h"
diff --git a/lang/python24-pth/patches/patch-ak b/lang/python24-pth/patches/patch-ak
deleted file mode 100644
index 082add7a4de..00000000000
--- a/lang/python24-pth/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/12/05 23:28:56 recht Exp $
-
---- Modules/posixmodule.c.orig Wed Oct 13 17:30:56 2004
-+++ Modules/posixmodule.c
-@@ -298,7 +298,7 @@ extern int lstat(const char *, struct st
- #endif
-
- /* Return a dictionary corresponding to the POSIX environment table */
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -316,7 +316,7 @@ convertenviron(void)
- d = PyDict_New();
- if (d == NULL)
- return NULL;
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- if (environ == NULL)
- environ = *_NSGetEnviron();
- #endif
diff --git a/lang/python24-pth/patches/patch-al b/lang/python24-pth/patches/patch-al
deleted file mode 100644
index de8abeaeea3..00000000000
--- a/lang/python24-pth/patches/patch-al
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-al,v 1.2 2004/12/30 21:56:21 minskim Exp $
-
---- configure.orig 2004-11-06 19:24:12.000000000 -0600
-+++ configure
-@@ -1349,7 +1349,7 @@ rm confdefs.h
- mv confdefs.h.new confdefs.h
-
-
--VERSION=2.4
-+VERSION=2p4
-
-
- SOVERSION=1.0
-@@ -1479,6 +1479,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.[0123456])
- 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)
-@@ -3418,6 +3420,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
- else # shared is disabled
- case $ac_sys_system in
-@@ -3816,7 +3826,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
- ;;
-@@ -10295,7 +10310,7 @@ then
- LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(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'
-@@ -10305,8 +10320,8 @@ then
- LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
- else
- # No framework, use the Python app as bundle-loader
-- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
-- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
-+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- fi ;;
- Darwin/*)
- # Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -10324,12 +10339,12 @@ then
- LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
- else
- # No framework, use the Python app as bundle-loader
-- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
-- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
-+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
-+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
- fi
- fi
- ;;
-- Linux*|GNU*) LDSHARED='$(CC) -shared';;
-+ Linux*|GNU*) LDSHARED='$(CC) -shared ${LDFLAGS}';;
- BSD/OS*/4*) LDSHARED="gcc -shared";;
- OpenBSD*|FreeBSD*)
- if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-@@ -14297,6 +14312,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/lang/python24-pth/patches/patch-am b/lang/python24-pth/patches/patch-am
deleted file mode 100644
index c2ea5501c66..00000000000
--- a/lang/python24-pth/patches/patch-am
+++ /dev/null
@@ -1,268 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/12/05 23:28:55 recht Exp $
-
---- setup.py.orig Sat Nov 13 12:13:34 2004
-+++ setup.py
-@@ -15,7 +15,7 @@ from distutils.command.install import in
- from distutils.command.install_lib import install_lib
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_tkinter", "gdbm", "mpz", "pyexpat", "readline"]
-
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -238,9 +238,15 @@ class PyBuildExt(build_ext):
- return sys.platform
-
- def detect_modules(self):
-- # Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+ # Add the buildlink directories for pkgsrc
-+ if os.environ.has_key('BUILDLINK_DIR'):
-+ dir = os.environ['BUILDLINK_DIR']
-+ libdir = dir + '/lib'
-+ incdir = dir + '/include'
-+ if libdir not in self.compiler.library_dirs:
-+ self.compiler.library_dirs.insert(0, libdir)
-+ if incdir not in self.compiler.include_dirs:
-+ self.compiler.include_dirs.insert(0, incdir)
-
- # Add paths to popular package managers on OS X/darwin
- if sys.platform == "darwin":
-@@ -452,9 +458,7 @@ class PyBuildExt(build_ext):
- depends = ['socketmodule.h']) )
- # Detect SSL support for the socket module (via _ssl)
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
-- ['/usr/local/ssl/include',
-- '/usr/contrib/ssl/include/'
-- ]
-+ []
- )
- if ssl_incs is not None:
- krb5_h = find_file('krb5.h', inc_dirs,
-@@ -462,9 +466,7 @@ class PyBuildExt(build_ext):
- if krb5_h:
- ssl_incs += krb5_h
- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
-- ['/usr/local/ssl/lib',
-- '/usr/contrib/ssl/lib/'
-- ] )
-+ [] )
-
- if (ssl_incs is not None and
- ssl_libs is not None):
-@@ -491,113 +493,90 @@ class PyBuildExt(build_ext):
-
- # when sorted in reverse order, keys for this dict must appear in the
- # order you wish to search - e.g., search for db4 before db3
-- db_try_this = {
-- 'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
-- 'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
-- '/usr/local/BerkeleyDB.4.1/lib',
-- '/usr/local/BerkeleyDB.4.0/lib',
-- '/usr/local/lib',
-- '/opt/sfw',
-- '/sw/lib',
-- ),
-- 'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
-- '/usr/local/include/db42',
-- '/usr/local/BerkeleyDB.4.1/include',
-- '/usr/local/include/db41',
-- '/usr/local/BerkeleyDB.4.0/include',
-- '/usr/local/include/db4',
-- '/opt/sfw/include/db4',
-- '/sw/include/db4',
-- '/usr/include/db4',
-- )},
-- 'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',),
-- 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
-- '/usr/local/BerkeleyDB.3.2/lib',
-- '/usr/local/lib',
-- '/opt/sfw/lib',
-- '/sw/lib',
-- ),
-- 'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
-- '/usr/local/BerkeleyDB.3.2/include',
-- '/usr/local/include/db3',
-- '/opt/sfw/include/db3',
-- '/sw/include/db3',
-- '/usr/include/db3',
-- )},
-- }
--
-- db_search_order = db_try_this.keys()
-- db_search_order.sort()
-- db_search_order.reverse()
-+ #db_try_this = {
-+ #'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
-+ #'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
-+ #'/usr/local/BerkeleyDB.4.1/lib',
-+ #'/usr/local/BerkeleyDB.4.0/lib',
-+ #'/usr/local/lib',
-+ #'/opt/sfw',
-+ #'/sw/lib',
-+ #),
-+ #'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
-+ #'/usr/local/include/db42',
-+ #'/usr/local/BerkeleyDB.4.1/include',
-+ #'/usr/local/include/db41',
-+ #'/usr/local/BerkeleyDB.4.0/include',
-+ #'/usr/local/include/db4',
-+ #'/opt/sfw/include/db4',
-+ #'/sw/include/db4',
-+ #'/usr/include/db4',
-+ #)},
-+ #'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',),
-+ #'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
-+ #'/usr/local/BerkeleyDB.3.2/lib',
-+ #'/usr/local/lib',
-+ #'/opt/sfw/lib',
-+ #'/sw/lib',
-+ #),
-+ #'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
-+ #'/usr/local/BerkeleyDB.3.2/include',
-+ #'/usr/local/include/db3',
-+ #'/opt/sfw/include/db3',
-+ #'/sw/include/db3',
-+ #'/usr/include/db3',
-+ #)},
-+ #}
-+
-+ #db_search_order = db_try_this.keys()
-+ #db_search_order.sort()
-+ #db_search_order.reverse()
-
-- class found(Exception): pass
-+ class NotFound(Exception): pass
- try:
-- # See whether there is a Sleepycat header in the standard
-- # search path.
-- std_dbinc = None
-- for d in inc_dirs:
-- f = os.path.join(d, "db.h")
-+ bdb_type = os.environ['PY_BDB_TYPE']
-+ db_incs = [os.environ['PY_BDB_INCDIRS']]
-+ dblib_dir = None
-+ dblibs = None
-+
-+ # check if need to use the db_185.h compat header
-+ bsddb185_define_macros=[]
-+ if bdb_type == "db2" or bdb_type == "db3" or bdb_type == "db4":
-+ bsddb185_define_macros=[('HAVE_DB_185_H',1)]
-+ dblib_dir = [os.environ['PY_BDB_LIBDIRS']]
-+
-+ else:
-+ # check if db_incs/db.h really is db 1.85
-+ f = "%s/db.h" % db_incs[0]
-+
- if os.path.exists(f):
-- f = open(f).read()
-- m = re.search(r"#define\WDB_VERSION_MAJOR\W([1-9]+)", f)
-- if m:
-- std_dbinc = 'db' + m.group(1)
-- for dbkey in db_search_order:
-- dbd = db_try_this[dbkey]
-- for dblib in dbd['libs']:
-- # Prefer version-specific includes over standard
-- # include locations.
-- db_incs = find_file('db.h', [], dbd['incdirs'])
-- dblib_dir = find_library_file(self.compiler,
-- dblib,
-- lib_dirs,
-- list(dbd['libdirs']))
-- if (db_incs or dbkey == std_dbinc) and \
-- dblib_dir is not None:
-- dblibs = [dblib]
-- raise found
-- except found:
-- dblibs = [dblib]
-- # A default source build puts Berkeley DB in something like
-- # /usr/local/Berkeley.3.3 and the lib dir under that isn't
-- # normally on ld.so's search path, unless the sysadmin has hacked
-- # /etc/ld.so.conf. We add the directory to runtime_library_dirs
-- # so the proper -R/--rpath flags get passed to the linker. This
-- # is usually correct and most trouble free, but may cause problems
-- # in some unusual system configurations (e.g. the directory is on
-- # an NFS server that goes away).
-- exts.append(Extension('_bsddb', ['_bsddb.c'],
-+ data = open(f).read()
-+ m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-+ if m is None:
-+ # check for 1.85 compat header
-+ if os.path.exists("%s/db_185.h" % db_incs[0]):
-+ bsddb185_define_macros=[('HAVE_DB_185_H',1)]
-+ else:
-+ raise NotFound
-+ try:
-+ bltransform = os.environ['PY_BDB_TRANSFORM']
-+ m = re.search(r"l:db:(db.)\s*", bltransform)
-+ if m is not None and m.group(1) is not None:
-+ dblibs = [m.group(1)]
-+ except:
-+ pass
-+
-+ # build the bsddb185 extension module
-+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
- library_dirs=dblib_dir,
- runtime_library_dirs=dblib_dir,
- include_dirs=db_incs,
-+ define_macros=bsddb185_define_macros,
- libraries=dblibs))
-- else:
-+ except:
- db_incs = None
- dblibs = []
-- dblib_dir = None
--
--
-- # Look for Berkeley db 1.85. Note that it is built as a different
-- # module name so it can be included even when later versions are
-- # available. A very restrictive search is performed to avoid
-- # accidentally building this module with a later version of the
-- # underlying db library. May BSD-ish Unixes incorporate db 1.85
-- # symbols into libc and place the include file in /usr/include.
-- f = "/usr/include/db.h"
-- if os.path.exists(f):
-- data = open(f).read()
-- m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
-- if m is not None:
-- # bingo - old version used hash file format version 2
-- ### XXX this should be fixed to not be platform-dependent
-- ### but I don't have direct access to an osf1 platform and
-- ### seemed to be muffing the search somehow
-- libraries = platform == "osf1" and ['db'] or None
-- if libraries is not None:
-- exts.append(Extension('bsddb185', ['bsddbmodule.c'],
-- libraries=libraries))
-- else:
-- exts.append(Extension('bsddb185', ['bsddbmodule.c']))
-+ dblib_dir = None
-
- # The standard Unix dbm module:
- if platform not in ['cygwin']:
-@@ -610,6 +589,13 @@ class PyBuildExt(build_ext):
- exts.append( Extension('dbm', ['dbmmodule.c'],
- define_macros=[('HAVE_NDBM_H',None)],
- libraries = ndbm_libs ) )
-+ elif find_file("ndbm.h", db_incs, []) is not None:
-+ exts.append( Extension('dbm', ['dbmmodule.c'],
-+ library_dirs=dblib_dir,
-+ runtime_library_dirs=dblib_dir,
-+ include_dirs=db_incs,
-+ define_macros=[('HAVE_NDBM_H',None)],
-+ libraries=dblibs))
- elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
- exts.append( Extension('dbm', ['dbmmodule.c'],
-@@ -1148,8 +1134,8 @@ def main():
- ext_modules=[Extension('struct', ['structmodule.c'])],
-
- # Scripts to install
-- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-- 'Lib/smtpd.py']
-+ scripts = ['Tools/scripts/pydoc2p4',
-+ 'Lib/smtpd2p4.py']
- )
-
- # --install-platlib
diff --git a/lang/python24-pth/patches/patch-ba b/lang/python24-pth/patches/patch-ba
deleted file mode 100644
index 4e6731b4620..00000000000
--- a/lang/python24-pth/patches/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
---- Include/patchlevel.h.orig Sun Dec 5 21:33:50 2004
-+++ Include/patchlevel.h Sun Dec 5 21:34:01 2004
-@@ -26,7 +26,7 @@
- #define PY_RELEASE_SERIAL 0
-
- /* Version as a string */
--#define PY_VERSION "2.4"
-+#define PY_VERSION "2p4"
-
- /* 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 --git a/lang/python24/Makefile b/lang/python24/Makefile
index 8861edead69..2d8ebcc9710 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,10 +1,120 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/23 20:41:47 recht Exp $
#
+DISTNAME= Python-2.4
PKGNAME= python24-2.4
+PKGREVISION= 2
+CATEGORIES= lang python
+MASTER_SITES= ftp://ftp.python.org/pub/python/2.4/
+EXTRACT_SUFX= .tar.bz2
-CONFIGURE_ARGS+= --without-threads
+MAINTAINER= recht@NetBSD.org
+HOMEPAGE= http://www.python.org/
+COMMENT= Interpreted, interactive, object-oriented programming language
-PY_VER_SUFFIX= 2.4
+USE_LANGUAGES= c c++
+USE_BUILDLINK3= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= OPT="${CFLAGS}"
-.include "../../lang/python24/Makefile.common"
+PTHREAD_OPTS= require
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+= --with-pth
+.endif
+
+# fdatasync()
+LIBS.SunOS= -lrt
+
+PY_VER_SUFFIX= 2.4
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC= ${.CURDIR}/../../lang/python24/PLIST.common
+.if exists(${.CURDIR}/../../lang/python24/PLIST.${OPSYS})
+PLIST_SRC+= ${.CURDIR}/../../lang/python24/PLIST.${OPSYS}
+.endif
+PLIST_SRC+= ${.CURDIR}/../../lang/python24/PLIST.common_end
+
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
+PY_PLATNAME= ${LOWER_OPSYS}
+.elif ${OPSYS} == "IRIX"
+PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
+.elif ${OPSYS} == "SunOS"
+PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
+.else
+PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
+.endif
+PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
+
+# the dl module isn't built for 64 bit archs and Darwin
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
+ || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64" \
+ || ${OPSYS} == "Darwin" || ( ${OPSYS} == "IRIX" && ${ABI} == "64" )
+PLIST_SUBST+= DLMODULE="@comment "
+.else
+PLIST_SUBST+= DLMODULE=
+.endif
+
+EXTRA_SO_SUBST= "@comment "
+OSSAUDIODEV_SUBST= "@comment "
+
+# activate extra modules
+.if ${MACHINE_ARCH} == "i386"
+EXTRA_SO_SUBST=
+# ossaudiodev is only available on x86 for the following platforms
+. if ${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" \
+ || ${PY_PLATNAME} == "freebsd5"
+OSSAUDIODEV_SUBST=
+. endif
+.elif ${OPSYS} == "SunOS" || ( ${OPSYS} == "IRIX" && ${ABI} != "64" ) \
+ || ${OPSYS} == "Darwin"
+EXTRA_SO_SUBST=
+.endif
+
+PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST}
+PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST}
+
+# Make sure python modules can link correctly
+.if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED= yes
+.endif
+
+.if ${OPSYS} == "IRIX"
+. if ${ABI} == "64"
+PLIST_SUBST+= NISMODULE="@comment "
+. else
+PLIST_SUBST+= NISMODULE=
+. endif
+PLIST_SUBST+= BSDDBMODULE="@comment "
+PLIST_SUBST+= NOSHLIB="@comment "
+.else
+. include "../../mk/bdb.buildlink3.mk"
+MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
+MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
+MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
+PLIST_SUBST+= BSDDBMODULE=
+PLIST_SUBST+= NOSHLIB=
+PLIST_SUBST+= NISMODULE=
+.endif
+
+.if defined(BUILDLINK_TRANSFORM)
+MAKE_ENV+= PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}"
+.endif
+
+PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
+
+TEST_TARGET= test
+INSTALL_TARGET= altinstall
+
+post-extract:
+ ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
+ ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python24/Makefile.common b/lang/python24/Makefile.common
deleted file mode 100644
index 2f1eb9ecca8..00000000000
--- a/lang/python24/Makefile.common
+++ /dev/null
@@ -1,110 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2004/12/20 13:16:02 grant Exp $
-#
-
-DISTNAME= Python-2.4
-CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.4/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= recht@NetBSD.org
-HOMEPAGE= http://www.python.org/
-COMMENT= Interpreted, interactive, object-oriented programming language
-
-USE_LANGUAGES= c c++
-USE_BUILDLINK3= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= OPT="${CFLAGS}"
-
-# fdatasync()
-LIBS.SunOS= -lrt
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC= ${.CURDIR}/../../lang/python24/PLIST.common
-.if exists(${.CURDIR}/../../lang/python24/PLIST.${OPSYS})
-PLIST_SRC+= ${.CURDIR}/../../lang/python24/PLIST.${OPSYS}
-.endif
-PLIST_SRC+= ${.CURDIR}/../../lang/python24/PLIST.common_end
-
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
-PY_PLATNAME= ${LOWER_OPSYS}
-.elif ${OPSYS} == "IRIX"
-PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
-.elif ${OPSYS} == "SunOS"
-PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
-.else
-PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
-.endif
-PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME}
-
-# the dl module isn't built for 64 bit archs and Darwin
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
- || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64" \
- || ${OPSYS} == "Darwin" || ( ${OPSYS} == "IRIX" && ${ABI} == "64" )
-PLIST_SUBST+= DLMODULE="@comment "
-.else
-PLIST_SUBST+= DLMODULE=
-.endif
-
-EXTRA_SO_SUBST= "@comment "
-OSSAUDIODEV_SUBST= "@comment "
-
-# activate extra modules
-.if ${MACHINE_ARCH} == "i386"
-EXTRA_SO_SUBST=
-# ossaudiodev is only available on x86 for the following platforms
-. if ${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" \
- || ${PY_PLATNAME} == "freebsd5"
-OSSAUDIODEV_SUBST=
-. endif
-.elif ${OPSYS} == "SunOS" || ( ${OPSYS} == "IRIX" && ${ABI} != "64" ) \
- || ${OPSYS} == "Darwin"
-EXTRA_SO_SUBST=
-.endif
-
-PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST}
-PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST}
-
-# Make sure python modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED= yes
-.endif
-
-.if ${OPSYS} == "IRIX"
-. if ${ABI} == "64"
-PLIST_SUBST+= NISMODULE="@comment "
-. else
-PLIST_SUBST+= NISMODULE=
-. endif
-PLIST_SUBST+= BSDDBMODULE="@comment "
-PLIST_SUBST+= NOSHLIB="@comment "
-.else
-. include "../../mk/bdb.buildlink3.mk"
-MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
-MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
-MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
-PLIST_SUBST+= BSDDBMODULE=
-PLIST_SUBST+= NOSHLIB=
-PLIST_SUBST+= NISMODULE=
-.endif
-
-.if defined(BUILDLINK_TRANSFORM)
-MAKE_ENV+= PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}"
-.endif
-
-PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX}
-
-TEST_TARGET= test
-INSTALL_TARGET= altinstall
-
-post-extract:
- ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
- ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python24/PLIST.Darwin b/lang/python24/PLIST.Darwin
index 5b9d6c22b4e..8ff58a10f72 100644
--- a/lang/python24/PLIST.Darwin
+++ b/lang/python24/PLIST.Darwin
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST.Darwin,v 1.2 2005/01/23 20:41:47 recht Exp $
lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so
lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
lib/python${PY_VER_SUFFIX}/lib-dynload/autoGIL.so
diff --git a/lang/python24/PLIST.common_end b/lang/python24/PLIST.common_end
index 703b181b948..053f04fdbe1 100644
--- a/lang/python24/PLIST.common_end
+++ b/lang/python24/PLIST.common_end
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST.common_end,v 1.2 2005/01/23 20:41:48 recht Exp $
@dirrm lib/python${PY_VER_SUFFIX}/xml/sax
@dirrm lib/python${PY_VER_SUFFIX}/xml/parsers
@dirrm lib/python${PY_VER_SUFFIX}/xml/dom