On Sat, 11 Jun 2011 10:29:46 +0000 (UTC)
Stuart Henderson <[email protected]> wrote:
> On 2011-06-11, Nigel Taylor <[email protected]> wrote:
> > The port had the python2.6 flavor removed. The PLIST contains a line
> > %%python2.6%% which has not been updated. There is also a
> > PFRAG.python2.6 but no PFRAG.python2.7. Patch below fixes the build,
> > take a closer look as may not be correct, PFRAG.python2.7 guess this
> > should now be python2.6 so pkg_add -u works when upgrading from OpenBSD
> > 4.9 to 5.0 py-mxDateTime-3.1.2p4-python2.6 updates to
> > py-mxDateTime-3.x.x-python2.7, I have no system to check this works.
>
> That's basically right but we want it to work for python2.5 too;
> this seems a good opportunity to use the new shiny @pkgpath notation.
> I'm not in a position to test this for a couple of days, if it works
> for anyone feel free to commit it :)
Thanks Stuart, seems to be good for me.
I added ${MODPY_WANTLIB} and bump revision.
Nigel, are you ok with this diff ?
If yes, I will commit it.
Thanks for your report,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-mxDateTime/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 10 Jun 2011 05:52:06 -0000 1.31
+++ Makefile 11 Jun 2011 10:45:16 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY = Yes
COMMENT = date and time types for Python
MODPY_EGG_VERSION = 3.1.3
-REVISION = 2
+REVISION = 3
DISTNAME = egenix-mx-base-${MODPY_EGG_VERSION}
PKGNAME = py-mxDateTime-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -23,7 +23,7 @@ MASTER_SITES = http://www.lemburg.com/fi
FLAVORS = python2.4 python2.7 # 2.4 needed for Zope, e.g.
FLAVOR ?= python2.7
-WANTLIB += m
+WANTLIB += m ${MODPY_WANTLIB}
.if !${FLAVOR} || ${FLAVOR:L:Npython?.?}
ERRORS += "Fatal: You must select one version: ${FLAVORS}"
Index: pkg/PFRAG.python2.6
===================================================================
RCS file: pkg/PFRAG.python2.6
diff -N pkg/PFRAG.python2.6
--- pkg/PFRAG.python2.6 4 Sep 2010 19:44:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.python2.6,v 1.1 2010/09/04 19:44:46 ajacoutot Exp $
-@pkgpath devel/py-mxDateTime,python2.5
Index: pkg/PFRAG.python2.7
===================================================================
RCS file: pkg/PFRAG.python2.7
diff -N pkg/PFRAG.python2.7
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.python2.7 11 Jun 2011 10:45:16 -0000
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+@pkgpath devel/py-mxDateTime[,python2.5][,python2.6]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-mxDateTime/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 15 May 2011 19:48:59 -0000 1.14
+++ pkg/PLIST 11 Jun 2011 10:45:17 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.14 2011/05/15 19:48:59 rpointel Exp $
@option no-default-conflict
@conflict py-mxDateTime-*-python${MODPY_VERSION}
-%%python2.6%%
+%%python2.7%%
!%%python2.4%%
lib/python${MODPY_VERSION}/site-packages/mx/
lib/python${MODPY_VERSION}/site-packages/mx/BeeBase/
