diff -ruN --exclude=CVS /usr/ports/lang/python/Makefile /space/portstrees/FreeBSD/ports/lang/python/Makefile --- /usr/ports/lang/python/Makefile Thu Jul 28 08:23:56 2005 +++ /space/portstrees/FreeBSD/ports/lang/python/Makefile Wed Sep 28 20:22:57 2005 @@ -6,8 +6,7 @@ # PORTNAME= python -PORTVERSION= 2.4.1 -PORTREVISION= 3 +PORTVERSION= 2.4.2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff -ruN --exclude=CVS /usr/ports/lang/python/distinfo /space/portstrees/FreeBSD/ports/lang/python/distinfo --- /usr/ports/lang/python/distinfo Thu Jul 28 10:30:36 2005 +++ /space/portstrees/FreeBSD/ports/lang/python/distinfo Wed Sep 28 19:25:30 2005 @@ -19,6 +19,8 @@ SIZE (python/Python-2.4.tgz) = 9198035 MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba SIZE (python/Python-2.4.1.tgz) = 9219882 +MD5 (python/Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875 +SIZE (python/Python-2.4.2.tgz) = 9239975 MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3 diff -ruN --exclude=CVS /usr/ports/lang/python/files/patch-Lib::test::test_fcntl.py /space/portstrees/FreeBSD/ports/lang/python/files/patch-Lib::test::test_fcntl.py --- /usr/ports/lang/python/files/patch-Lib::test::test_fcntl.py Sun Apr 3 15:55:44 2005 +++ /space/portstrees/FreeBSD/ports/lang/python/files/patch-Lib::test::test_fcntl.py Thu Jan 1 01:00:00 1970 @@ -1,17 +0,0 @@ ---- Lib/test/test_fcntl.py.orig Sun Apr 3 22:45:13 2005 -+++ Lib/test/test_fcntl.py Sun Apr 3 22:45:19 2005 -@@ -24,7 +24,13 @@ - 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6', - 'bsdos2', 'bsdos3', 'bsdos4', - 'openbsd', 'openbsd2', 'openbsd3'): -- lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0) -+ if struct.calcsize('l') == 8: -+ off_t = 'l' -+ pid_t = 'i' -+ else: -+ off_t = 'lxxxx' -+ pid_t = 'l' -+ lockdata = struct.pack(off_t+off_t+pid_t+'hh', 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']: