Mon Jul 14 14:42:51 2008 UTC ()
Always build depend on readline, so that devel/py-readline can pick up
the right config. Bump revision.


(joerg)
diff -r1.36 -r1.37 pkgsrc/lang/python21/Makefile
diff -r1.38 -r1.39 pkgsrc/lang/python23/Makefile
diff -r1.38 -r1.39 pkgsrc/lang/python23/Makefile.common
diff -r1.12 -r1.13 pkgsrc/lang/python23-nth/Makefile
diff -r1.43 -r1.44 pkgsrc/lang/python24/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/python25/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/lang/python21/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python21/Attic/Makefile 2008/07/11 13:17:39 1.36
+++ pkgsrc/lang/python21/Attic/Makefile 2008/07/14 14:42:51 1.37
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.36 2008/07/11 13:17:39 obache Exp $ 1# $NetBSD: Makefile,v 1.37 2008/07/14 14:42:51 joerg Exp $
2# 2#
3 3
4DISTNAME= Python-2.1.3 4DISTNAME= Python-2.1.3
5PKGNAME= python21-2.1.3 5PKGNAME= python21-2.1.3
6PKGREVISION= 15 6PKGREVISION= 16
7CATEGORIES= lang python 7CATEGORIES= lang python
8MASTER_SITES= http://www.python.org/ftp/python/2.1.3/ 8MASTER_SITES= http://www.python.org/ftp/python/2.1.3/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.python.org/ 12HOMEPAGE= http://www.python.org/
13COMMENT= Interpreted, interactive, object-oriented programming language 13COMMENT= Interpreted, interactive, object-oriented programming language
14 14
15CONFLICTS+= python-[0-9]* 15CONFLICTS+= python-[0-9]*
16 16
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19 19
@@ -67,23 +67,27 @@ PLIST.termios= yes @@ -67,23 +67,27 @@ PLIST.termios= yes
67.if ${OPSYS} != "SunOS" && ${OPSYS} != "IRIX" 67.if ${OPSYS} != "SunOS" && ${OPSYS} != "IRIX"
68. include "../../mk/bdb.buildlink3.mk" 68. include "../../mk/bdb.buildlink3.mk"
69PLIST.bsddb= yes 69PLIST.bsddb= yes
70MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q} 70MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q}
71MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}} 71MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
72MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib 72MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
73.endif 73.endif
74 74
75PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 75PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
76 76
77post-extract: 77post-extract:
78 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} 78 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
79 79
 80USE_GNU_READLINE= # defined
 81BUILDLINK_DEPMETHOD.readline= build
 82
 83.include "../../devel/readline/buildlink3.mk"
80.include "../../devel/zlib/buildlink3.mk" 84.include "../../devel/zlib/buildlink3.mk"
81.include "../../mk/dlopen.buildlink3.mk" 85.include "../../mk/dlopen.buildlink3.mk"
82.include "../../mk/bsd.pkg.mk" 86.include "../../mk/bsd.pkg.mk"
83 87
84# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one 88# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
85# set earlier in the environment (last definition wins). 89# set earlier in the environment (last definition wins).
86# 90#
87.if ${OBJECT_FMT} == "a.out" 91.if ${OBJECT_FMT} == "a.out"
88MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}" 92MAKE_ENV+= LDFLAGS="${LDFLAGS:S/-Wl,//}"
89.endif 93.endif
cvs diff -r1.38 -r1.39 pkgsrc/lang/python23/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python23/Attic/Makefile 2008/01/18 05:06:45 1.38
+++ pkgsrc/lang/python23/Attic/Makefile 2008/07/14 14:42:51 1.39
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.38 2008/01/18 05:06:45 tnn Exp $ 1# $NetBSD: Makefile,v 1.39 2008/07/14 14:42:51 joerg Exp $
2# 2#
3 3
4PKGNAME= python23-2.3.5 4PKGNAME= python23-2.3.5
5PKGREVISION= 10 5PKGREVISION= 11
6 6
7CONFLICTS+= python-[0-9]* 7CONFLICTS+= python-[0-9]*
8 8
9#PKG_INSTALLATION_TYPES= overwrite pkgviews 9#PKG_INSTALLATION_TYPES= overwrite pkgviews
10 10
11PTHREAD_OPTS+= require 11PTHREAD_OPTS+= require
12.include "../../mk/pthread.buildlink3.mk" 12.include "../../mk/pthread.buildlink3.mk"
13.if ${PTHREAD_TYPE} == "pth" 13.if ${PTHREAD_TYPE} == "pth"
14CONFIGURE_ARGS+= --with-pth 14CONFIGURE_ARGS+= --with-pth
15.endif 15.endif
16 16
17PY_VER_SUFFIX= 2.3 17PY_VER_SUFFIX= 2.3
18 18
cvs diff -r1.38 -r1.39 pkgsrc/lang/python23/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/python23/Attic/Makefile.common 2008/04/12 22:43:02 1.38
+++ pkgsrc/lang/python23/Attic/Makefile.common 2008/07/14 14:42:51 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.38 2008/04/12 22:43:02 jlam Exp $ 1# $NetBSD: Makefile.common,v 1.39 2008/07/14 14:42:51 joerg Exp $
2# 2#
3 3
4DISTNAME= Python-2.3.5 4DISTNAME= Python-2.3.5
5CATEGORIES= lang python 5CATEGORIES= lang python
6MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.5/ \ 6MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.5/ \
7 http://www.python.org/ftp/python/2.3.5/ 7 http://www.python.org/ftp/python/2.3.5/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= recht@NetBSD.org 10MAINTAINER= recht@NetBSD.org
11HOMEPAGE= http://www.python.org/ 11HOMEPAGE= http://www.python.org/
12COMMENT= Interpreted, interactive, object-oriented programming language 12COMMENT= Interpreted, interactive, object-oriented programming language
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -104,20 +104,24 @@ CONFIGURE_ENV+= ac_cv_header_stropts_h=n @@ -104,20 +104,24 @@ CONFIGURE_ENV+= ac_cv_header_stropts_h=n
104. else 104. else
105PLIST.nis= yes 105PLIST.nis= yes
106. endif 106. endif
107.endif 107.endif
108 108
109PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 109PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
110 110
111TEST_TARGET= test 111TEST_TARGET= test
112INSTALL_TARGET= altinstall 112INSTALL_TARGET= altinstall
113 113
114post-extract: 114post-extract:
115 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} 115 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
116 116
 117USE_GNU_READLINE= # defined
 118BUILDLINK_DEPMETHOD.readline= build
 119
117.include "../../archivers/bzip2/buildlink3.mk" 120.include "../../archivers/bzip2/buildlink3.mk"
118.include "../../devel/gettext-lib/buildlink3.mk" 121.include "../../devel/gettext-lib/buildlink3.mk"
 122.include "../../devel/readline/buildlink3.mk"
119.include "../../devel/zlib/buildlink3.mk" 123.include "../../devel/zlib/buildlink3.mk"
120.include "../../security/openssl/buildlink3.mk" 124.include "../../security/openssl/buildlink3.mk"
121.include "../../mk/dlopen.buildlink3.mk" 125.include "../../mk/dlopen.buildlink3.mk"
122.include "../../mk/oss.buildlink3.mk" 126.include "../../mk/oss.buildlink3.mk"
123.include "../../mk/bsd.pkg.mk" 127.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/lang/python23-nth/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python23-nth/Attic/Makefile 2007/02/22 19:26:39 1.12
+++ pkgsrc/lang/python23-nth/Attic/Makefile 2008/07/14 14:42:51 1.13
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2008/07/14 14:42:51 joerg Exp $
2# 2#
3 3
4PKGNAME= python23-nth-2.3.5 4PKGNAME= python23-nth-2.3.5
5PKGREVISION= 6 5PKGREVISION= 7
6 6
7CONFLICTS+= python-[0-9]* 7CONFLICTS+= python-[0-9]*
8 8
9CONFIGURE_ARGS+= --without-threads 9CONFIGURE_ARGS+= --without-threads
10 10
11PY_VER_SUFFIX= 2n3 11PY_VER_SUFFIX= 2n3
12 12
13DISTINFO_FILE= ${.CURDIR}/../../lang/python23/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../lang/python23/distinfo
14PATCHDIR= ${.CURDIR}/../../lang/python23/patches 14PATCHDIR= ${.CURDIR}/../../lang/python23/patches
15 15
16SUBST_CLASSES+= version 16SUBST_CLASSES+= version
17SUBST_FILES.version= configure Include/patchlevel.h setup.py 17SUBST_FILES.version= configure Include/patchlevel.h setup.py
18SUBST_SED.version+= -e 's,VERSION=2\.3,VERSION=2n3,g' 18SUBST_SED.version+= -e 's,VERSION=2\.3,VERSION=2n3,g'
cvs diff -r1.43 -r1.44 pkgsrc/lang/python24/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python24/Attic/Makefile 2008/04/12 22:43:02 1.43
+++ pkgsrc/lang/python24/Attic/Makefile 2008/07/14 14:42:51 1.44
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.43 2008/04/12 22:43:02 jlam Exp $ 1# $NetBSD: Makefile,v 1.44 2008/07/14 14:42:51 joerg Exp $
2 2
3DISTNAME= Python-2.4.5 3DISTNAME= Python-2.4.5
4PKGNAME= python24-2.4.5 4PKGNAME= python24-2.4.5
 5PKGREVISION= 1
5CATEGORIES= lang python 6CATEGORIES= lang python
6MASTER_SITES= http://www.python.org/ftp/python/2.4.5/ 7MASTER_SITES= http://www.python.org/ftp/python/2.4.5/
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= recht@NetBSD.org 10MAINTAINER= recht@NetBSD.org
10HOMEPAGE= http://www.python.org/ 11HOMEPAGE= http://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 12COMMENT= Interpreted, interactive, object-oriented programming language
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15# Remember to update pkgsrc/lang/python/srcdist.mk when version changes 16# Remember to update pkgsrc/lang/python/srcdist.mk when version changes
16 17
17CONFLICTS+= python-[0-9]* 18CONFLICTS+= python-[0-9]*
@@ -153,20 +154,24 @@ post-build: @@ -153,20 +154,24 @@ post-build:
153 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} libpython2.4.2.dylib 154 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} libpython2.4.2.dylib
154 155
155post-install: 156post-install:
156 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.4.2.dylib \ 157 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.4.2.dylib \
157 ${DESTDIR}${PREFIX}/lib/libpython2.4.dylib 158 ${DESTDIR}${PREFIX}/lib/libpython2.4.dylib
158.endif 159.endif
159 160
160.if ${OPSYS} == "HPUX" 161.if ${OPSYS} == "HPUX"
161post-install: 162post-install:
162 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.4.sl \ 163 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.4.sl \
163 ${DESTDIR}${PREFIX}/lib/libpython2.4.sl.1.0 164 ${DESTDIR}${PREFIX}/lib/libpython2.4.sl.1.0
164.endif 165.endif
165 166
 167USE_GNU_READLINE= # defined
 168BUILDLINK_DEPMETHOD.readline= build
 169
166.include "../../archivers/bzip2/buildlink3.mk" 170.include "../../archivers/bzip2/buildlink3.mk"
167.include "../../devel/gettext-lib/buildlink3.mk" 171.include "../../devel/gettext-lib/buildlink3.mk"
 172.include "../../devel/readline/buildlink3.mk"
168.include "../../devel/zlib/buildlink3.mk" 173.include "../../devel/zlib/buildlink3.mk"
169.include "../../security/openssl/buildlink3.mk" 174.include "../../security/openssl/buildlink3.mk"
170.include "../../mk/dlopen.buildlink3.mk" 175.include "../../mk/dlopen.buildlink3.mk"
171.include "../../mk/oss.buildlink3.mk" 176.include "../../mk/oss.buildlink3.mk"
172.include "../../mk/bsd.pkg.mk" 177.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/lang/python25/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/Makefile 2008/06/27 19:57:49 1.6
+++ pkgsrc/lang/python25/Attic/Makefile 2008/07/14 14:42:51 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2008/06/27 19:57:49 tron Exp $ 1# $NetBSD: Makefile,v 1.7 2008/07/14 14:42:51 joerg Exp $
2 2
3DISTNAME= Python-2.5.2 3DISTNAME= Python-2.5.2
4PKGNAME= python25-2.5.2 4PKGNAME= python25-2.5.2
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= lang python 6CATEGORIES= lang python
7MASTER_SITES= ftp://ftp.python.org/pub/python/2.5.2/ \ 7MASTER_SITES= ftp://ftp.python.org/pub/python/2.5.2/ \
8 http://www.python.org/ftp/python/2.5.2/ 8 http://www.python.org/ftp/python/2.5.2/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= recht@NetBSD.org 11MAINTAINER= recht@NetBSD.org
12HOMEPAGE= http://www.python.org/ 12HOMEPAGE= http://www.python.org/
13COMMENT= Interpreted, interactive, object-oriented programming language 13COMMENT= Interpreted, interactive, object-oriented programming language
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17# Remember to update pkgsrc/lang/python/srcdist.mk when version changes 17# Remember to update pkgsrc/lang/python/srcdist.mk when version changes
18 18
@@ -146,20 +146,24 @@ REPLACE_FILES.py25= Lib/cgi.py # explici @@ -146,20 +146,24 @@ REPLACE_FILES.py25= Lib/cgi.py # explici
146REPLACE_FILES.py25+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py 146REPLACE_FILES.py25+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py
147REPLACE_FILES.py25+= Lib/test/test_largefile.py Lib/test/test_optparse.py 147REPLACE_FILES.py25+= Lib/test/test_largefile.py Lib/test/test_optparse.py
148 148
149post-extract: 149post-extract:
150 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py 150 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
151 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} 151 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
152 152
153.if ${OPSYS} == "HPUX" 153.if ${OPSYS} == "HPUX"
154post-install: 154post-install:
155 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.5.sl \ 155 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.5.sl \
156 ${DESTDIR}${PREFIX}/lib/libpython2.5.sl.1.0 156 ${DESTDIR}${PREFIX}/lib/libpython2.5.sl.1.0
157.endif 157.endif
158 158
 159USE_GNU_READLINE= # defined
 160BUILDLINK_DEPMETHOD.readline= build
 161
159.include "../../archivers/bzip2/buildlink3.mk" 162.include "../../archivers/bzip2/buildlink3.mk"
160.include "../../devel/gettext-lib/buildlink3.mk" 163.include "../../devel/gettext-lib/buildlink3.mk"
 164.include "../../devel/readline/buildlink3.mk"
161.include "../../devel/zlib/buildlink3.mk" 165.include "../../devel/zlib/buildlink3.mk"
162.include "../../security/openssl/buildlink3.mk" 166.include "../../security/openssl/buildlink3.mk"
163.include "../../mk/dlopen.buildlink3.mk" 167.include "../../mk/dlopen.buildlink3.mk"
164.include "../../mk/oss.buildlink3.mk" 168.include "../../mk/oss.buildlink3.mk"
165.include "../../mk/bsd.pkg.mk" 169.include "../../mk/bsd.pkg.mk"