[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

UPDATE: lang/python



Hi

Here goes lang/python update.  Please test and comment.  Thanks.

- Update python/2.4 to 2.4.2
- Build expat subpacakge for python/2.4
- Add missing "flavors" (no_tools and no_tests)
  from Dominique Jacquel <dom_(_at_)_dcoded_(_dot_)_local>
- Better pkg/DESCR 
  From Ian Darwin <ian_(_at_)_darwinsys_(_dot_)_com>

Alek
-- 
UNIX was not designed to stop you from doing stupid things, because that
would also stop you from doing clever things.
 -- Doug Gwyn
diff -xCVS -urN python.orig/2.4/Makefile python/2.4/Makefile
--- python.orig/2.4/Makefile	Wed Oct 12 04:41:41 2005
+++ python/2.4/Makefile	Fri Nov 11 10:29:16 2005
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.3 2005/10/12 02:41:41 fgsch Exp $
 
 VERSION=		2.4
-PATCHLEVEL=		.1
-PKG_PATCHLEVEL=		p1
+PATCHLEVEL=		.2
+#PKG_PATCHLEVEL=		p1
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
 PATCH_LIST=		patch-* sup64-*
diff -xCVS -urN python.orig/2.4/distinfo python/2.4/distinfo
--- python.orig/2.4/distinfo	Tue Jun  7 03:12:54 2005
+++ python/2.4/distinfo	Fri Nov 11 10:42:40 2005
@@ -1,4 +1,4 @@
-MD5 (Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba
-RMD160 (Python-2.4.1.tgz) = 76c53419981e38b9d93f4eafc16e29253b9472e1
-SHA1 (Python-2.4.1.tgz) = 60113695b9efe8163a2ccd7cc068da8bb0a70f50
-SIZE (Python-2.4.1.tgz) = 9219882
+MD5 (Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875
+RMD160 (Python-2.4.2.tgz) = f247e322bcb5e989e267657ca70afb6210bc2f28
+SHA1 (Python-2.4.2.tgz) = 373b0954f2a5adb02ba905b51e14ed98ff1c7b7b
+SIZE (Python-2.4.2.tgz) = 9239975
diff -xCVS -urN python.orig/2.4/patches/patch-Lib_test_test_fcntl_py python/2.4/patches/patch-Lib_test_test_fcntl_py
--- python.orig/2.4/patches/patch-Lib_test_test_fcntl_py	Tue Jun  7 03:12:58 2005
+++ python/2.4/patches/patch-Lib_test_test_fcntl_py	Fri Nov 11 12:09:11 2005
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Lib_test_test_fcntl_py,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
---- Lib/test/test_fcntl.py.orig	Wed Aug 18 17:13:41 2004
-+++ Lib/test/test_fcntl.py	Thu Dec 30 22:52:45 2004
-@@ -22,9 +22,13 @@ if sys.platform.startswith('atheos'):
- 
- if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin',
-                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6',
--                    'bsdos2', 'bsdos3', 'bsdos4',
--                    'openbsd', 'openbsd2', 'openbsd3'):
-+                    'bsdos2', 'bsdos3', 'bsdos4'):
-     lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
-+elif sys.platform in ['openbsd', 'openbsd2', 'openbsd3']:
-+    if sys.maxint == 2147483647:
-+        lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
-+    else:
-+        lockdata = struct.pack('ixxxxixxxxihh', 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']:
diff -xCVS -urN python.orig/2.4/pkg/DESCR-expat python/2.4/pkg/DESCR-expat
--- python.orig/2.4/pkg/DESCR-expat	Thu Jan  1 01:00:00 1970
+++ python/2.4/pkg/DESCR-expat	Fri Nov 11 15:33:15 2005
@@ -0,0 +1 @@
+This package contains support for the expat XML parser.
diff -xCVS -urN python.orig/2.4/pkg/MESSAGE python/2.4/pkg/MESSAGE
--- python.orig/2.4/pkg/MESSAGE	Tue Jun  7 03:12:55 2005
+++ python/2.4/pkg/MESSAGE	Fri Nov 11 12:05:43 2005
@@ -1,3 +1,4 @@
-If you want to use this package as your default system python, make
-${PREFIX}/bin/python a symlink to ${PREFIX}/bin/python2.4 and
-${PREFIX}/bin/pydoc a symlink to ${PREFIX}/bin/pydoc2.4.
+If you want to use this package as your default system python, create
+symbolic links like so:
+ln -s ${PREFIX}/bin/python2.4 ${PREFIX}/bin/python
+ln -s ${PREFIX}/bin/pydoc2.4  ${PREFIX}/bin/pydoc
diff -xCVS -urN python.orig/2.4/pkg/MESSAGE-idle python/2.4/pkg/MESSAGE-idle
--- python.orig/2.4/pkg/MESSAGE-idle	Tue Jun  7 03:12:57 2005
+++ python/2.4/pkg/MESSAGE-idle	Fri Nov 11 12:05:43 2005
@@ -1,2 +1,3 @@
-If you want to use this package as your system default idle, make
-${PREFIX}/bin/idle a symlink to ${PREFIX}/bin/idle2.4.
+If you want to use this package as your system default idle, create
+symbolic links like so:
+ln -s ${PREFIX}/bin/idle2.4 ${PREFIX}/bin/idle
diff -xCVS -urN python.orig/2.4/pkg/PFRAG.shared python/2.4/pkg/PFRAG.shared
--- python.orig/2.4/pkg/PFRAG.shared	Tue Jun  7 03:12:55 2005
+++ python/2.4/pkg/PFRAG.shared	Fri Nov 11 13:50:19 2005
@@ -38,7 +38,6 @@
 lib/python2.4/lib-dynload/fpetestmodule.so
 lib/python2.4/lib-dynload/grpmodule.so
 lib/python2.4/lib-dynload/itertools.so
-_(_at_)_comment lib/python2.4/lib-dynload/itertools_failed.so
 lib/python2.4/lib-dynload/mathmodule.so
 lib/python2.4/lib-dynload/md5module.so
 lib/python2.4/lib-dynload/mmapmodule.so
@@ -46,7 +45,6 @@
 lib/python2.4/lib-dynload/operator.so
 lib/python2.4/lib-dynload/parsermodule.so
 lib/python2.4/lib-dynload/pwdmodule.so
-lib/python2.4/lib-dynload/pyexpat.so
 lib/python2.4/lib-dynload/readline.so
 lib/python2.4/lib-dynload/regex.so
 lib/python2.4/lib-dynload/resource.so
diff -xCVS -urN python.orig/2.4/pkg/PLIST-expat python/2.4/pkg/PLIST-expat
--- python.orig/2.4/pkg/PLIST-expat	Thu Jan  1 01:00:00 1970
+++ python/2.4/pkg/PLIST-expat	Fri Nov 11 13:12:40 2005
@@ -0,0 +1,4 @@
+_(_at_)_comment $OpenBSD$
+_(_at_)_option no-default-conflict
+_(_at_)_conflict python-expat->=2.4,<2.5
+lib/python2.4/lib-dynload/pyexpat.so
diff -xCVS -urN python.orig/2.4/pkg/PLIST-tools python/2.4/pkg/PLIST-tools
--- python.orig/2.4/pkg/PLIST-tools	Tue Jun  7 03:12:57 2005
+++ python/2.4/pkg/PLIST-tools	Fri Nov 11 11:28:24 2005
@@ -185,7 +185,7 @@
 lib/python2.4/Tools/scripts/pindent.py
 lib/python2.4/Tools/scripts/ptags.py
 lib/python2.4/Tools/scripts/pydoc
-lib/python2.4/Tools/scripts/pydoc.orig
+_(_at_)_comment lib/python2.4/Tools/scripts/pydoc.orig
 lib/python2.4/Tools/scripts/pydocgui.pyw
 lib/python2.4/Tools/scripts/redemo.py
 lib/python2.4/Tools/scripts/reindent.py
diff -xCVS -urN python.orig/Makefile.inc python/Makefile.inc
--- python.orig/Makefile.inc	Fri Nov 11 10:45:29 2005
+++ python/Makefile.inc	Fri Nov 11 15:57:07 2005
@@ -34,19 +34,28 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FLAVORS+=	no_expat no_gdbm no_idle no_mpz no_tkinter no_bsddb
+FLAVORS=	no_expat no_gdbm no_idle no_mpz no_tkinter no_bsddb \
+		no_tests no_tools
 FLAVOR?=
 
-MULTI_PACKAGES=	-tests -tools
+MULTI_PACKAGES?=
 SUBPACKAGE?=
 
+.if empty(FLAVOR:L:Mno_tests)
+MULTI_PACKAGES+=-tests
+.endif
+
+.if empty(FLAVOR:L:Mno_tools)
+MULTI_PACKAGES+=-tools
+.endif
+
 LIB_DEPENDS=	bz2::archivers/bzip2
 
 # All subpackages depend on the main python package.
 
 .if defined(PACKAGING)
 .  if !empty(SUBPACKAGE)
-RUN_DEPENDS=	::lang/python/${VERSION}
+RUN_DEPENDS=	:python-${VERSION}${PATCHLEVEL}:lang/python/${VERSION}
 LIB_DEPENDS=
 .  else
 WANTLIB=	ssl curses termcap panel m crypto c util z readline pthread \
@@ -130,17 +139,19 @@
 LIB_DEPENDS=		gmp::devel/gmp
 .endif
 
-.if empty(FLAVOR:L:Mno_expat) && ${VERSION} == "2.3"
+.if empty(FLAVOR:L:Mno_expat)
+.  if ${VERSION} == "2.3"
 BUILD_DEPENDS+=		::textproc/expat
 SETUP_LOCAL+=		Setup.expat
+.  endif
 .  if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
 MULTI_PACKAGES+= 	-expat
-.  else
+.  else if ${VERSION} == "2.3"
 LIB_DEPENDS+=		expat.4.0:expat->=1.95.6:textproc/expat
 .  endif
 .endif
 
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-expat"
+.if defined(PACKAGING) && ${SUBPACKAGE} == "-expat" && ${VERSION} == "2.3"
 LIB_DEPENDS=		expat.4.0:expat->=1.95.6:textproc/expat
 .endif
 
@@ -148,7 +159,7 @@
 # building the "monster" Python for platforms without shared libraries.
 
 .if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
-FULLPKGNAME=${PKGNAME}${FLAVOR_EXT:S/-no_bsddb//:S/-no_expat//:S/-no_gdbm//:S/-no_idle//:S/-no_mpz//:S/-no_tkinter//}
+FULLPKGNAME=${PKGNAME}${FLAVOR_EXT:S/-no_bsddb//:S/-no_expat//:S/-no_gdbm//:S/-no_idle//:S/-no_mpz//:S/-no_tkinter//:S/-no_tools//:S/-no_tests//}
 .endif
 
 FULLPKGNAME-expat=	python-expat-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}