Hi Damien,
Damien Miller wrote on Mon, Dec 29, 2008 at 01:23:55AM +1100:
> On Sun, 28 Dec 2008, Ingo Schwarze wrote:
>> For the case of Python 2.6, i just tested the following diff
>> on i386-current. Note that i also changed
>>
>> @conflict python->=2.6,<2.6
>>
>> because that looks somewhat fishy.
> I have:
>
> @conflict python-bz2->=2.6,<=2.6p0
>
> In my current diff.
Maybe
@conflict python-bz2->=2.6,<=2.7
is even better? Somebody might have built a modified
python-bz2-2.6p1 locally, and then it will only conflict
on the individual file level while installing, not up front.
Regarding 2.4 and 2.5:
The patch-snippets below work for me, just like the one for 2.6.
They apply to what one has after applying your large diff.
While testing, i noticed that Makefile.inc still contains a stray
LIB_DEPENDS-mpz. Also, the now obsolete flavours might be removed
from 2.4/pkg/DESCR-main, 2.5/pkg/DESCR-main, and 2.6/pkg/DESCR-main.
Build, install and update tested in i386 and sparc64 -current;
regression suites are still running.
Yours,
Ingo
Index: Makefile.inc
===================================================================
--- Makefile.inc.djm Sun Dec 28 13:11:46 2008
+++ Makefile.inc Sun Dec 28 16:04:22 2008
@@ -63,7 +63,6 @@
LIB_DEPENDS-tkinter= tcl84:tcl-8.4.*:lang/tcl/8.4 \
tk84:tk-8.4.*:x11/tk/8.4
WANTLIB-tkinter= X11
-LIB_DEPENDS-mpz= gmp::devel/gmp
WANTLIB-expat= expat
FULLPKGNAME-bsddb= python-bsddb-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}
Index: 2.4/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.4/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -r1.1 PLIST-main
--- 2.4/pkg/PLIST-main 24 Nov 2006 20:48:23 -0000 1.1
+++ 2.4/pkg/PLIST-main 28 Dec 2008 15:00:50 -0000
@@ -1,6 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 20:48:23 steven Exp $
@option no-default-conflict
@conflict python->=2.4,<2.5
+...@conflict python-bz2->=2.4,<2.5
+...@conflict python-expat->=2.4,<2.5
@pkgpath lang/python/2.4
+...@pkgpath lang/python/2.4,-bz2
+...@pkgpath lang/python/2.4,-expat
%%mm%%
bin/pydoc2.4
Index: 2.5/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.5/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -r1.8 PLIST-main
--- 2.5/pkg/PLIST-main 18 Oct 2008 12:01:25 -0000 1.8
+++ 2.5/pkg/PLIST-main 28 Dec 2008 15:00:50 -0000
@@ -1,7 +1,13 @@
@comment $OpenBSD: PLIST-main,v 1.8 2008/10/18 12:01:25 djm Exp $
@option no-default-conflict
@conflict python->=2.5,<2.6
+...@conflict python-bz2->=2.5,<2.6
+...@conflict python-expat->=2.5,<2.6
+...@conflict python-sqlite->=2.5,<2.6
@pkgpath lang/python/2.5
+...@pkgpath lang/python/2.5,-bz2
+...@pkgpath lang/python/2.5,-expat
+...@pkgpath lang/python/2.5,-sqlite
bin/pydoc2.5
@comment bin/python-config
@bin bin/python2.5
Index: 2.6/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -r1.1 PLIST-main
--- 2.6/pkg/PLIST-main 18 Oct 2008 12:03:56 -0000 1.1
+++ 2.6/pkg/PLIST-main 28 Dec 2008 15:00:50 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.1 2008/10/18 12:03:56 djm Exp $
@option no-default-conflict
-...@conflict python->=2.6,<2.6
+...@conflict python->=2.6,<2.7
+...@conflict python-bz2->=2.6,<2.7
@pkgpath lang/python/2.6
+...@pkgpath lang/python/2.6,-bz2
bin/2to3
@comment bin/pydoc
bin/pydoc2.6
Index: 2.4/pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/lang/python/2.4/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -r1.1 DESCR-main
--- 2.4/pkg/DESCR-main 24 Nov 2006 20:48:23 -0000 1.1
+++ 2.4/pkg/DESCR-main 28 Dec 2008 15:17:39 -0000
@@ -12,13 +12,3 @@
dynamically loaded. Python is also adaptable as an
extension language for existing applications. See the
internal documentation for hints.
-
-Flavors:
- no_bsddb - do not build bsdb package
- no_expat - do not build expat package
- no_gdbm - do not build gdbm package
- no_idle - do not build idle package
- no_mpz - do not build mpz package
- no_tests - do not build tests package
- no_tkinter - do not build tkinter package
- no_tools - do not build tools package
Index: 2.5/pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/lang/python/2.5/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -r1.1 DESCR-main
--- 2.5/pkg/DESCR-main 24 Nov 2006 20:48:23 -0000 1.1
+++ 2.5/pkg/DESCR-main 28 Dec 2008 15:17:40 -0000
@@ -12,13 +12,3 @@
dynamically loaded. Python is also adaptable as an
extension language for existing applications. See the
internal documentation for hints.
-
-Flavors:
- no_bsddb - do not build bsdb package
- no_expat - do not build expat package
- no_gdbm - do not build gdbm package
- no_idle - do not build idle package
- no_mpz - do not build mpz package
- no_tests - do not build tests package
- no_tkinter - do not build tkinter package
- no_tools - do not build tools package
Index: 2.6/pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/lang/python/2.6/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -r1.1 DESCR-main
--- 2.6/pkg/DESCR-main 18 Oct 2008 12:03:56 -0000 1.1
+++ 2.6/pkg/DESCR-main 28 Dec 2008 15:17:40 -0000
@@ -12,13 +12,3 @@
dynamically loaded. Python is also adaptable as an
extension language for existing applications. See the
internal documentation for hints.
-
-Flavors:
- no_bsddb - do not build bsdb package
- no_expat - do not build expat package
- no_gdbm - do not build gdbm package
- no_idle - do not build idle package
- no_mpz - do not build mpz package
- no_tests - do not build tests package
- no_tkinter - do not build tkinter package
- no_tools - do not build tools package
