On Thu, 1 Jan 2009, Alexander Bluhm wrote:
> On Thu, Jan 01, 2009 at 09:38:26PM +0100, Antoine Jacoutot wrote:
> > On Thu, 1 Jan 2009, Alexander Bluhm wrote:
> > > Replace p5-IO-INET6 with p5-IO-Socket-INET6 as the upstream cpan
> > > package has been renamed. Unfortunately there is no smooth upgrade
> > > path. Packages have to be deleted and added manually.
> >
> > Fair enough.
> > *But*, from where I stand, net/p5-IO-Socket-INET6 needs an @conflict
> > marker anyway.
>
> I am discussing this with sturm@, too. Can you ok this diff?
Well, maybe it could be worth adding a @pkgpath marker too so that one
could upgrade "manually" using pkg_add -r.
The @conlict line looks fine ;-)
The problematic thing here is that PKGNAME changed, which would prevent
smooth update with "pkg_add -u" like you said, indeed. But using
@conflict and @pkgpath, we could ease the upgrade path a bit IMHO.
> Index: Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/net/p5-IO-Socket-INET6/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 1 Jan 2009 14:42:30 -0000 1.1.1.1
> +++ Makefile 1 Jan 2009 17:45:50 -0000
> @@ -3,6 +3,7 @@
> COMMENT = object interface for AF_INET and AF_INET6 domain sockets
>
> DISTNAME = IO-Socket-INET6-2.56
> +PKGNAME = p5-${DISTNAME}p0
>
> CATEGORIES = net
>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/net/p5-IO-Socket-INET6/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 1 Jan 2009 14:42:30 -0000 1.1.1.1
> +++ pkg/PLIST 1 Jan 2009 17:44:23 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/01 14:42:30 bluhm Exp $
> +...@conflict p5-IO-INET6-*
> ${P5SITE}/IO/
> ${P5SITE}/IO/Socket/
> ${P5SITE}/IO/Socket/INET6.pm
>
--
Antoine
