From e3158913d64637e7494d8f53598afebced64b921 Mon Sep 17 00:00:00 2001 From: sturm Date: Sat, 13 Dec 2003 16:03:48 +0000 Subject: [PATCH] cleanup CHANGES.OpenBSD PREFIX -> LOCALBASE in Setup.tkinter set/remove links for pydoc in INSTALL/DEINSTALL --- lang/python/2.1/files/CHANGES.OpenBSD | 24 ++++++++++++++---------- lang/python/2.1/files/Setup.tkinter | 6 +++--- lang/python/2.1/pkg/DEINSTALL | 6 +++++- lang/python/2.1/pkg/INSTALL | 19 +++++++++++++++++-- lang/python/2.2/files/CHANGES.OpenBSD | 23 ++++++++--------------- lang/python/2.2/files/Setup.tkinter | 6 +++--- lang/python/2.2/pkg/DEINSTALL | 6 +++++- lang/python/2.2/pkg/INSTALL | 18 +++++++++++++++++- 8 files changed, 72 insertions(+), 36 deletions(-) diff --git a/lang/python/2.1/files/CHANGES.OpenBSD b/lang/python/2.1/files/CHANGES.OpenBSD index e5fb2926c6b..4dabb575055 100644 --- a/lang/python/2.1/files/CHANGES.OpenBSD +++ b/lang/python/2.1/files/CHANGES.OpenBSD @@ -4,21 +4,25 @@ of changes made to this version of Python for the OpenBSD package. 1. tempfile.py was patched to not try /usr/tmp as a possible tempfile directory. -2. test_fcntl.py was patched to support OpenBSD 3.0 and above. - -3. libpython is created as a shared library, and the pthread stack +2. libpython is created as a shared library, and the pthread stack size was doubled to support this with complex applications such as Zope. -4. OpenBSD threads are used for threading support. +3. OpenBSD threads are used for threading support. -5. The interpreter is called "python2.1", and pydoc "pydoc2.1" in - order to support multiple versions of Python coexisting on the - same system. If no "python" binary exists, a symlink to - "python2.1" is created when the package is installed. +4. The interpreter is called "python2.1" in order to support multiple + versions of Python coexisting on the same system. If no "python" + binary exists, a symlink to "python2.1" is created when package + is installed. + Same process applies to IDLE binary (idle) and pydoc. + +5. os.py: security fixes for _execvpe(). Function taken from Python + 2.2.3 + +6. __va_copy was used where appropriate so python would work on + non-i386 architectures such as powerpc. These changes are available in the OpenBSD CVS repository in ports/lang/python. -$Id: CHANGES.OpenBSD,v 1.1 2002/05/11 21:35:13 matt Exp $ - +$Id: CHANGES.OpenBSD,v 1.2 2003/12/13 16:03:48 sturm Exp $ diff --git a/lang/python/2.1/files/Setup.tkinter b/lang/python/2.1/files/Setup.tkinter index 3f1f72d3a07..a32a2c61908 100644 --- a/lang/python/2.1/files/Setup.tkinter +++ b/lang/python/2.1/files/Setup.tkinter @@ -17,8 +17,8 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ # *** Uncomment and edit to reflect where your Tcl/Tk headers are: - -I${PREFIX}/include/tcl8.3 \ - -I${PREFIX}/include/tk8.3 \ + -I${LOCALBASE}/include/tcl8.3 \ + -I${LOCALBASE}/include/tk8.3 \ # *** Uncomment and edit to reflect where your X11 header files are: -I${X11BASE}/include \ # *** Or uncomment this for Solaris: @@ -32,7 +32,7 @@ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: - -L${PREFIX}/lib \ + -L${LOCALBASE}/lib \ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk83 -ltcl83 \ # *** Uncomment and edit to reflect where your X11 libraries are: diff --git a/lang/python/2.1/pkg/DEINSTALL b/lang/python/2.1/pkg/DEINSTALL index 6790acbe138..de94752a30a 100644 --- a/lang/python/2.1/pkg/DEINSTALL +++ b/lang/python/2.1/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: DEINSTALL,v 1.1 2002/02/15 19:42:18 matt Exp $ +# $OpenBSD: DEINSTALL,v 1.2 2003/12/13 16:03:49 sturm Exp $ # # Clean up python symlink, if it was ours. # @@ -14,3 +14,7 @@ then rm -f ${PREFIX}/bin/python fi +if [ ${PREFIX}/bin/pydoc -ef ${PREFIX}/bin/pydoc2.1 ] +then + rm -f ${PREFIX}/bin/pydoc +fi diff --git a/lang/python/2.1/pkg/INSTALL b/lang/python/2.1/pkg/INSTALL index efb9a0ea985..3b90088e44d 100644 --- a/lang/python/2.1/pkg/INSTALL +++ b/lang/python/2.1/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: INSTALL,v 1.1 2002/02/15 19:42:18 matt Exp $ +# $OpenBSD: INSTALL,v 1.2 2003/12/13 16:03:49 sturm Exp $ # # Set us up as the default python if there is not one already. # @@ -26,5 +26,20 @@ then EOT fi -fi + if [ ! -e ${PREFIX}/bin/pydoc ] + then + cd ${PREFIX}/bin + ln -s pydoc2.1 pydoc + else + cat < in ports/lang/python. -$Id: CHANGES.OpenBSD,v 1.1 2002/05/11 21:35:13 matt Exp $ - +$Id: CHANGES.OpenBSD,v 1.2 2003/12/13 16:03:49 sturm Exp $ diff --git a/lang/python/2.2/files/Setup.tkinter b/lang/python/2.2/files/Setup.tkinter index 3f1f72d3a07..a32a2c61908 100644 --- a/lang/python/2.2/files/Setup.tkinter +++ b/lang/python/2.2/files/Setup.tkinter @@ -17,8 +17,8 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ # *** Uncomment and edit to reflect where your Tcl/Tk headers are: - -I${PREFIX}/include/tcl8.3 \ - -I${PREFIX}/include/tk8.3 \ + -I${LOCALBASE}/include/tcl8.3 \ + -I${LOCALBASE}/include/tk8.3 \ # *** Uncomment and edit to reflect where your X11 header files are: -I${X11BASE}/include \ # *** Or uncomment this for Solaris: @@ -32,7 +32,7 @@ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: - -L${PREFIX}/lib \ + -L${LOCALBASE}/lib \ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk83 -ltcl83 \ # *** Uncomment and edit to reflect where your X11 libraries are: diff --git a/lang/python/2.2/pkg/DEINSTALL b/lang/python/2.2/pkg/DEINSTALL index a8c40e60c68..5952be10318 100644 --- a/lang/python/2.2/pkg/DEINSTALL +++ b/lang/python/2.2/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: DEINSTALL,v 1.1 2002/02/15 19:42:19 matt Exp $ +# $OpenBSD: DEINSTALL,v 1.2 2003/12/13 16:03:49 sturm Exp $ # # Clean up python symlink, if it was ours. # @@ -14,3 +14,7 @@ then rm -f ${PREFIX}/bin/python fi +if [ ${PREFIX}/bin/pydoc -ef ${PREFIX}/bin/pydoc2.2 ] +then + rm -f ${PREFIX}/bin/pydoc +fi diff --git a/lang/python/2.2/pkg/INSTALL b/lang/python/2.2/pkg/INSTALL index 6cd531a47e7..b252cd21810 100644 --- a/lang/python/2.2/pkg/INSTALL +++ b/lang/python/2.2/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: INSTALL,v 1.1 2002/02/15 19:42:19 matt Exp $ +# $OpenBSD: INSTALL,v 1.2 2003/12/13 16:03:49 sturm Exp $ # # Set us up as the default python if there is not one already. # @@ -24,6 +24,22 @@ then | symlink to ${PREFIX}/bin/python2.2. +--------------- +EOT + fi + + if [ ! -e ${PREFIX}/bin/pydoc ] + then + cd ${PREFIX}/bin + ln -s pydoc2.2 pydoc + else + cat <