Sat Apr 23 10:39:01 2011 UTC ()
Correct path to Python interpreter in all ".py" files to fix build
with revision 1.26 of "pkgsrc/mk/check/check-interpreter.mk".

Bump package revision because the binary package changed.


(tron)
diff -r1.37 -r1.38 pkgsrc/lang/python26/Makefile
cvs diff -r1.37 -r1.38 pkgsrc/lang/python26/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/Makefile 2011/04/23 01:41:36 1.37
+++ pkgsrc/lang/python26/Attic/Makefile 2011/04/23 10:39:01 1.38
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.37 2011/04/23 01:41:36 obache Exp $ 1# $NetBSD: Makefile,v 1.38 2011/04/23 10:39:01 tron Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python26-${PY_DISTVERSION} 5PKGNAME= python26-${PY_DISTVERSION}
6PKGREVISION= 8 6PKGREVISION= 9
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.python.org/ 10HOMEPAGE= http://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS+= python-[0-9]* 16CONFLICTS+= python-[0-9]*
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --with-threads 19CONFIGURE_ARGS+= --with-threads
@@ -132,36 +132,27 @@ CONFIGURE_ARGS+= --disable-ipv6 @@ -132,36 +132,27 @@ CONFIGURE_ARGS+= --disable-ipv6
132 132
133.if defined(BUILDLINK_TRANSFORM) 133.if defined(BUILDLINK_TRANSFORM)
134MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 134MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
135.endif 135.endif
136 136
137PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 137PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
138 138
139TEST_TARGET= test 139TEST_TARGET= test
140INSTALL_TARGET= altinstall 140INSTALL_TARGET= altinstall
141 141
142REPLACE_INTERPRETER+= py26 142REPLACE_INTERPRETER+= py26
143REPLACE.py26.old= .*python[^ ]* 143REPLACE.py26.old= .*python[^ ]*
144REPLACE.py26.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 144REPLACE.py26.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
145REPLACE_FILES.py26= Lib/cgi.py # explicitly demanded to be patched 145REPLACE_FILES.py26= Lib/*.py Lib/*/*.py Lib/*/*/*.py
146REPLACE_FILES.py26+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py 
147REPLACE_FILES.py26+= Lib/test/test_largefile.py Lib/test/test_optparse.py 
148REPLACE_FILES.py26+= Lib/*.py 
149REPLACE_FILES.py26+= Lib/test/*.py 
150REPLACE_FILES.py26+= Lib/bsddb/test/test_dbtables.py 
151REPLACE_FILES.py26+= Lib/encodings/rot_13.py 
152REPLACE_FILES.py26+= Lib/idlelib/PyShell.py 
153REPLACE_FILES.py26+= Lib/lib2to3/pgen2/token.py 
154REPLACE_FILES.py26+= Lib/lib2to3/tests/pytree_idempotency.py 
155 146
156SUBST_CLASSES+= findlib 147SUBST_CLASSES+= findlib
157SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. 148SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin.
158SUBST_STAGE.findlib= pre-configure 149SUBST_STAGE.findlib= pre-configure
159SUBST_FILES.findlib= Lib/distutils/unixccompiler.py 150SUBST_FILES.findlib= Lib/distutils/unixccompiler.py
160SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' 151SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
161 152
162post-extract: 153post-extract:
163 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py 154 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
164 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} 155 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
165 ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX} 156 ${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
166 157
167.if ${OPSYS} == "HPUX" 158.if ${OPSYS} == "HPUX"