On Sun, Nov 14, 2010 at 03:35:21PM +0000, Stuart Henderson wrote:
> Most of our ports have already been moved to the newer Tcl/Tk,
> so on many systems python-tkinter is the only reason for having the
> old one around. Diff below moves to using the x11/tk/tk.port.mk
> module and bumps the Tk version to 8.5. Ok?
Diff reads fine. If it compiles and packages sure.
f.-
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/lang/python/Makefile.inc,v
> retrieving revision 1.69
> diff -u -p -r1.69 Makefile.inc
> --- Makefile.inc 7 Nov 2010 19:12:42 -0000 1.69
> +++ Makefile.inc 14 Nov 2010 15:32:40 -0000
> @@ -68,9 +68,10 @@ LIB_DEPENDS-gdbm = ::databases/gdbm
> WANTLIB-gdbm = gdbm.>=3
> RUN_DEPENDS-idle = ${RUN_DEPENDS} \
> ::lang/python/${VERSION},-tkinter
> -LIB_DEPENDS-tkinter = :tcl->=8.4,<8.5:lang/tcl/8.4 \
> - :tk->=8.4,<8.5:x11/tk/8.4
> -WANTLIB-tkinter = X11 tcl84 tk84
> +# XXX Tcl/Tk version number handled in patch-setup_py
> +MODULES += x11/tk
> +LIB_DEPENDS-tkinter = ${MODTK_LIB_DEPENDS}
> +WANTLIB-tkinter = X11 ${MODTK_WANTLIB}
>
> .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
> ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
> Index: 2.4/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/python/2.4/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- 2.4/Makefile 28 Oct 2010 08:22:11 -0000 1.32
> +++ 2.4/Makefile 14 Nov 2010 15:32:40 -0000
> @@ -2,7 +2,7 @@
>
> VERSION= 2.4
> PATCHLEVEL= .6
> -REVISION= 4
> +REVISION= 5
> SHARED_LIBS= python2.4 1.0
>
> ALL_TARGET?= all ${WRKSRC}/Lib/plat-openbsd4
> Index: 2.4/patches/patch-setup_py
> ===================================================================
> RCS file: /cvs/ports/lang/python/2.4/patches/patch-setup_py,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-setup_py
> --- 2.4/patches/patch-setup_py 1 Jan 2009 21:03:27 -0000 1.4
> +++ 2.4/patches/patch-setup_py 14 Nov 2010 15:32:40 -0000
> @@ -126,7 +126,7 @@ $OpenBSD: patch-setup_py,v 1.4 2009/01/0
> tcllib = tklib = tcl_includes = tk_includes = None
> - for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
> - '82', '8.1', '81', '8.0', '80']:
> -+ for version in ['84']:
> ++ for version in ['85']:
> tklib = self.compiler.find_library_file(lib_dirs, 'tk' +
> version)
> tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' +
> version)
> if tklib and tcllib:
> Index: 2.5/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/python/2.5/Makefile,v
> retrieving revision 1.42
> diff -u -p -r1.42 Makefile
> --- 2.5/Makefile 28 Oct 2010 08:22:11 -0000 1.42
> +++ 2.5/Makefile 14 Nov 2010 15:32:40 -0000
> @@ -2,7 +2,7 @@
>
> VERSION= 2.5
> PATCHLEVEL= .4
> -REVISION= 6
> +REVISION= 7
> SHARED_LIBS= python2.5 1.0
>
> CONFIGURE_ARGS+= --with-cxx_main
> Index: 2.5/patches/patch-setup_py
> ===================================================================
> RCS file: /cvs/ports/lang/python/2.5/patches/patch-setup_py,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-setup_py
> --- 2.5/patches/patch-setup_py 1 Jan 2009 21:03:27 -0000 1.5
> +++ 2.5/patches/patch-setup_py 14 Nov 2010 15:32:40 -0000
> @@ -154,7 +154,7 @@ $OpenBSD: patch-setup_py,v 1.5 2009/01/0
> tcllib = tklib = tcl_includes = tk_includes = None
> - for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
> - '82', '8.1', '81', '8.0', '80']:
> -+ for version in ['84']:
> ++ for version in ['85']:
> tklib = self.compiler.find_library_file(lib_dirs, 'tk' +
> version)
> tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' +
> version)
> if tklib and tcllib:
> Index: 2.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/python/2.6/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- 2.6/Makefile 28 Oct 2010 08:22:11 -0000 1.21
> +++ 2.6/Makefile 14 Nov 2010 15:32:40 -0000
> @@ -2,6 +2,7 @@
>
> VERSION = 2.6
> PATCHLEVEL = .6
> +REVISION = 0
> SHARED_LIBS = python2.6 1.0
>
> CONFIGURE_ARGS += --with-cxx_main
> Index: 2.6/patches/patch-setup_py
> ===================================================================
> RCS file: /cvs/ports/lang/python/2.6/patches/patch-setup_py,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-setup_py
> --- 2.6/patches/patch-setup_py 16 Sep 2010 22:36:08 -0000 1.6
> +++ 2.6/patches/patch-setup_py 14 Nov 2010 15:32:40 -0000
> @@ -154,7 +154,7 @@ $OpenBSD: patch-setup_py,v 1.6 2010/09/1
> tcllib = tklib = tcl_includes = tk_includes = None
> - for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
> - '82', '8.1', '81', '8.0', '80']:
> -+ for version in ['84']:
> ++ for version in ['85']:
> tklib = self.compiler.find_library_file(lib_dirs, 'tk' +
> version)
> tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' +
> version)
> if tklib and tcllib:
>
