diff options
-rw-r--r-- | lang/python15/Makefile | 17 | ||||
-rw-r--r-- | lang/python15/PLIST | 30 | ||||
-rw-r--r-- | lang/python15/distinfo | 6 | ||||
-rw-r--r-- | lang/python15/patches/patch-ac | 22 | ||||
-rw-r--r-- | lang/python15/patches/patch-ad | 13 | ||||
-rw-r--r-- | lang/python15/patches/patch-ae | 22 | ||||
-rw-r--r-- | lang/python15/patches/patch-af | 13 |
7 files changed, 104 insertions, 19 deletions
diff --git a/lang/python15/Makefile b/lang/python15/Makefile index c1e6d381f00..b7b35967d4d 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2004/06/16 22:57:50 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2004/06/23 15:54:08 minskim Exp $ # DISTNAME= py152 PKGNAME= python15-1.5.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.python.org/ftp/python/src/ EXTRACT_SUFX= .tgz @@ -15,8 +15,19 @@ COMMENT= Interpreted, interactive, object-oriented programming language WRKSRC= ${WRKDIR}/Python-1.5.2 GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-thread -CONFIGURE_ENV+= MACHDEP=${LOWER_OPSYS} INSTALL_TARGET= altinstall +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" || ${OPSYS} == "IRIX" +PY_PLATNAME= ${LOWER_OPSYS} +.else +PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} +.endif +PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME} + +post-patch: + ${RM} -f ${WRKSRC}/Lib/test/test_fcntl.py.orig + .include "../../mk/bsd.pkg.mk" diff --git a/lang/python15/PLIST b/lang/python15/PLIST index eb506de7bc3..f767d6f0f5b 100644 --- a/lang/python15/PLIST +++ b/lang/python15/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2004/06/16 22:57:50 minskim Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/06/23 15:54:08 minskim Exp $ bin/python1.5 include/python1.5/Python.h include/python1.5/abstract.h @@ -462,19 +462,19 @@ lib/python1.5/pickle.pyo lib/python1.5/pipes.py lib/python1.5/pipes.pyc lib/python1.5/pipes.pyo -lib/python1.5/plat-${LOWER_OPSYS}/FCNTL.py -lib/python1.5/plat-${LOWER_OPSYS}/FCNTL.pyc -lib/python1.5/plat-${LOWER_OPSYS}/FCNTL.pyo -lib/python1.5/plat-${LOWER_OPSYS}/IN.py -lib/python1.5/plat-${LOWER_OPSYS}/IN.pyc -lib/python1.5/plat-${LOWER_OPSYS}/IN.pyo -lib/python1.5/plat-${LOWER_OPSYS}/SOCKET.py -lib/python1.5/plat-${LOWER_OPSYS}/SOCKET.pyc -lib/python1.5/plat-${LOWER_OPSYS}/SOCKET.pyo -lib/python1.5/plat-${LOWER_OPSYS}/TERMIOS.py -lib/python1.5/plat-${LOWER_OPSYS}/TERMIOS.pyc -lib/python1.5/plat-${LOWER_OPSYS}/TERMIOS.pyo -lib/python1.5/plat-${LOWER_OPSYS}/regen +lib/python1.5/plat-${PY_PLATNAME}/FCNTL.py +lib/python1.5/plat-${PY_PLATNAME}/FCNTL.pyc +lib/python1.5/plat-${PY_PLATNAME}/FCNTL.pyo +lib/python1.5/plat-${PY_PLATNAME}/IN.py +lib/python1.5/plat-${PY_PLATNAME}/IN.pyc +lib/python1.5/plat-${PY_PLATNAME}/IN.pyo +lib/python1.5/plat-${PY_PLATNAME}/SOCKET.py +lib/python1.5/plat-${PY_PLATNAME}/SOCKET.pyc +lib/python1.5/plat-${PY_PLATNAME}/SOCKET.pyo +lib/python1.5/plat-${PY_PLATNAME}/TERMIOS.py +lib/python1.5/plat-${PY_PLATNAME}/TERMIOS.pyc +lib/python1.5/plat-${PY_PLATNAME}/TERMIOS.pyo +lib/python1.5/plat-${PY_PLATNAME}/regen lib/python1.5/popen2.py lib/python1.5/popen2.pyc lib/python1.5/popen2.pyo @@ -934,7 +934,7 @@ lib/python1.5/xmllib.pyc lib/python1.5/xmllib.pyo @dirrm lib/python1.5/test/output @dirrm lib/python1.5/test -@dirrm lib/python1.5/plat-${LOWER_OPSYS} +@dirrm lib/python1.5/plat-${PY_PLATNAME} @dirrm lib/python1.5/lib-tk @dirrm lib/python1.5/lib-stdwin @exec ${MKDIR} %D/lib/python1.5/lib-dynload diff --git a/lang/python15/distinfo b/lang/python15/distinfo index 8a2a989a71e..eaea4079e60 100644 --- a/lang/python15/distinfo +++ b/lang/python15/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.3 2003/06/16 16:33:34 drochner Exp $ +$NetBSD: distinfo,v 1.4 2004/06/23 15:54:08 minskim Exp $ SHA1 (py152.tgz) = 2d648d07b1aa1aab32a3a24851c33715141779b9 Size (py152.tgz) = 2533053 bytes SHA1 (patch-aa) = d8ad652ad5900da9f5384a1d577626e0d16b51ce SHA1 (patch-ab) = 7cbbae8a41e9e0d530561c80009c20bb838ebc15 +SHA1 (patch-ac) = 1cd8d555b70527f52c4f762b84a1d1d4464aeb47 +SHA1 (patch-ad) = 6207499c945b31e2da43ecc2dd2dd5fef195ad5b +SHA1 (patch-ae) = 276541b325e23dbff94b306726583dab8e951884 +SHA1 (patch-af) = ffb0d78274d711c26fd92f5342b95b0365c68efb diff --git a/lang/python15/patches/patch-ac b/lang/python15/patches/patch-ac new file mode 100644 index 00000000000..eb6f79b3cbc --- /dev/null +++ b/lang/python15/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2004/06/23 15:54:08 minskim Exp $ + +--- Lib/dos-8x3/posixfil.py.orig 1999-04-08 15:27:43.000000000 -0500 ++++ Lib/dos-8x3/posixfil.py +@@ -177,7 +177,7 @@ 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', + 'freebsd2', 'freebsd3', + 'bsdos2', 'bsdos3', 'bsdos4'): + flock = struct.pack('lxxxxlxxxxlhh', \ +@@ -192,7 +192,7 @@ class _posixfile_: + flock = fcntl.fcntl(self._file_.fileno(), cmd, flock) + + if '?' in how: +- if sys.platform in ('netbsd1', ++ if sys.platform in ('netbsd1', 'netbsd2', + 'freebsd2', 'freebsd3', + 'bsdos2', 'bsdos3', 'bsdos4'): + l_start, l_len, l_pid, l_type, l_whence = \ diff --git a/lang/python15/patches/patch-ad b/lang/python15/patches/patch-ad new file mode 100644 index 00000000000..1a5aedc3ecd --- /dev/null +++ b/lang/python15/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2004/06/23 15:54:08 minskim Exp $ + +--- Lib/dos-8x3/test_fcn.py.orig 1999-04-08 15:27:46.000000000 -0500 ++++ Lib/dos-8x3/test_fcn.py +@@ -16,7 +16,7 @@ rv = fcntl.fcntl(f.fileno(), FCNTL.F_SET + if verbose: + print 'Status from fnctl with O_NONBLOCK: ', rv + +-if sys.platform in ('netbsd1', ++if sys.platform in ('netbsd1', 'netbsd2', + 'freebsd2', 'freebsd3', + 'bsdos2', 'bsdos3', 'bsdos4'): + lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, FCNTL.F_WRLCK, 0) diff --git a/lang/python15/patches/patch-ae b/lang/python15/patches/patch-ae new file mode 100644 index 00000000000..fbd4a473fdb --- /dev/null +++ b/lang/python15/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1 2004/06/23 15:54:08 minskim Exp $ + +--- ./Lib/posixfile.py.orig 1999-02-22 22:14:32.000000000 -0600 ++++ ./Lib/posixfile.py +@@ -177,7 +177,7 @@ 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', + 'freebsd2', 'freebsd3', + 'bsdos2', 'bsdos3', 'bsdos4'): + flock = struct.pack('lxxxxlxxxxlhh', \ +@@ -192,7 +192,7 @@ class _posixfile_: + flock = fcntl.fcntl(self._file_.fileno(), cmd, flock) + + if '?' in how: +- if sys.platform in ('netbsd1', ++ if sys.platform in ('netbsd1', 'netbsd2', + 'freebsd2', 'freebsd3', + 'bsdos2', 'bsdos3', 'bsdos4'): + l_start, l_len, l_pid, l_type, l_whence = \ diff --git a/lang/python15/patches/patch-af b/lang/python15/patches/patch-af new file mode 100644 index 00000000000..845b25b3b22 --- /dev/null +++ b/lang/python15/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2004/06/23 15:54:08 minskim Exp $ + +--- ./Lib/test/test_fcntl.py.orig 1999-02-22 22:13:37.000000000 -0600 ++++ ./Lib/test/test_fcntl.py +@@ -16,7 +16,7 @@ rv = fcntl.fcntl(f.fileno(), FCNTL.F_SET + if verbose: + print 'Status from fnctl with O_NONBLOCK: ', rv + +-if sys.platform in ('netbsd1', ++if sys.platform in ('netbsd1', 'netbsd2', + 'freebsd2', 'freebsd3', + 'bsdos2', 'bsdos3', 'bsdos4'): + lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, FCNTL.F_WRLCK, 0) |