Sat Apr 23 17:31:40 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.32 -r1.33 pkgsrc/lang/python25/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/lang/python25/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/Makefile 2011/04/22 13:41:58 1.32
+++ pkgsrc/lang/python25/Attic/Makefile 2011/04/23 17:31:40 1.33
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.32 2011/04/22 13:41:58 obache Exp $ 1# $NetBSD: Makefile,v 1.33 2011/04/23 17:31:40 tron Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python25-${PY_DISTVERSION} 5PKGNAME= python25-${PY_DISTVERSION}
6PKGREVISION= 4 6PKGREVISION= 5
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
@@ -137,29 +137,27 @@ CONFIGURE_ARGS+= --disable-ipv6 @@ -137,29 +137,27 @@ CONFIGURE_ARGS+= --disable-ipv6
137 137
138.if defined(BUILDLINK_TRANSFORM) 138.if defined(BUILDLINK_TRANSFORM)
139MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 139MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
140.endif 140.endif
141 141
142PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 142PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
143 143
144TEST_TARGET= test 144TEST_TARGET= test
145INSTALL_TARGET= altinstall 145INSTALL_TARGET= altinstall
146 146
147REPLACE_INTERPRETER+= py25 147REPLACE_INTERPRETER+= py25
148REPLACE.py25.old= .*python[^ ]* 148REPLACE.py25.old= .*python[^ ]*
149REPLACE.py25.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 149REPLACE.py25.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
150REPLACE_FILES.py25= Lib/cgi.py # explicitly demanded to be patched 150REPLACE_FILES.py25= Lib/*.py Lib/*/*.py Lib/*/*/*.py
151REPLACE_FILES.py25+= Lib/bsddb/dbshelve.py Lib/test/test_bz2.py 
152REPLACE_FILES.py25+= Lib/test/test_largefile.py Lib/test/test_optparse.py 
153 151
154post-extract: 152post-extract:
155 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py 153 ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
156 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} 154 ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
157 155
158.if ${OPSYS} == "HPUX" 156.if ${OPSYS} == "HPUX"
159post-install: 157post-install:
160 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.5.sl \ 158 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython2.5.sl \
161 ${DESTDIR}${PREFIX}/lib/libpython2.5.sl.1.0 159 ${DESTDIR}${PREFIX}/lib/libpython2.5.sl.1.0
162.endif 160.endif
163 161
164USE_GNU_READLINE= yes 162USE_GNU_READLINE= yes
165BUILDLINK_DEPMETHOD.readline= build 163BUILDLINK_DEPMETHOD.readline= build