Re: pkg/58155: CONFLICTS doesn't work with multi-version packages

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost,campbell+netbsd%mumble.net@localhost
Subject: Re: pkg/58155: CONFLICTS doesn't work with multi-version packages
From: Thomas Klausner <wiz%gatalith.at@localhost>
Date: Thu, 18 Apr 2024 13:45:03 +0000 (UTC)
The following reply was made to PR pkg/58155; it has been noted by GNATS.

From: Thomas Klausner <wiz%gatalith.at@localhost>
To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
Cc: 
Subject: Re: pkg/58155: CONFLICTS doesn't work with multi-version packages
Date: Thu, 18 Apr 2024 15:42:54 +0200

 --s7be3vZb+oI84mkW
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I think after the attached commit all current problems are resolved.
  Thomas
 
 
 --s7be3vZb+oI84mkW
 Content-Type: message/rfc822
 Content-Disposition: inline
 
 Return-Path: <bounces-pkgsrc-changes-owner-wiz=netbsd.org%NetBSD.org@localhost>
 Delivered-To: wiz%gatalith.at@localhost
 Received: from gatalith.at
 	by gatalith.at with LMTP
 	id XnlWBTe5H2bwFAAA4iLUCg
 	(envelope-from <bounces-pkgsrc-changes-owner-wiz=netbsd.org%NetBSD.org@localhost>)
 	for <wiz%gatalith.at@localhost>; Wed, 17 Apr 2024 13:57:43 +0200
 Received: from mail.netbsd.org (mail.NetBSD.org [IPv6:2001:470:a085:999::25])
 	by gatalith.at (Postfix) with ESMTPS id 4A0EF39089C
 	for <wiz%gatalith.at@localhost>; Wed, 17 Apr 2024 13:57:42 +0200 (CEST)
 Received: by mail.netbsd.org (Postfix)
 	id B493484EF0; Wed, 17 Apr 2024 11:57:39 +0000 (UTC)
 Delivered-To: wiz%netbsd.org@localhost
 Received: by mail.netbsd.org (Postfix, from userid 605)
 	id 36FC484EC4; Wed, 17 Apr 2024 11:57:39 +0000 (UTC)
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org;
 	s=20240131; t=1713355059;
 	bh=vGg8Wn+uGdtDLpWx5RX4Vbl7/UqG8p9LSdV+vJ8wCWE=;
 	h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe;
 	b=bOPfIuZOO8FuyARKKsW/0dMYsD8XU7XX7pEdr9e2VdXt7mL/seCZ4CqysZbNhY+6D
 	 +sA4ni0JSHDptC9d5uz8V9qE1znpkfdZAkB1c4uKzHQaDqrBG69uozv7jKsaEJYgG0
 	 NPqg2AFeYO6LWbwyTmfc8PqV5lXgdQjtoc7oCDls=
 Delivered-To: pkgsrc-changes%NetBSD.org@localhost
 Received: from localhost (localhost [127.0.0.1])
 	by mail.netbsd.org (Postfix) with ESMTP id 23AB584EC3
 	for <pkgsrc-changes%NetBSD.org@localhost>; Wed, 17 Apr 2024 11:57:38 +0000 (UTC)
 X-Virus-Scanned: amavisd-new at netbsd.org
 Authentication-Results: mail.netbsd.org (amavisd-new);
 	dkim=pass (1024-bit key) header.d=netbsd.org
 Received: from mail.netbsd.org ([127.0.0.1])
 	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
 	with ESMTP id s4f4ksEC0evL for <pkgsrc-changes%netbsd.org@localhost>;
 	Wed, 17 Apr 2024 11:57:37 +0000 (UTC)
 Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
 	by mail.netbsd.org (Postfix) with ESMTP id 378DB84D01
 	for <pkgsrc-changes%NetBSD.org@localhost>; Wed, 17 Apr 2024 11:57:37 +0000 (UTC)
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org;
 	s=20240131; t=1713355057;
 	bh=vGg8Wn+uGdtDLpWx5RX4Vbl7/UqG8p9LSdV+vJ8wCWE=;
 	h=Date:From:Subject:To:Reply-To;
 	b=aUpP/oyHJPTWmMvHGWauB/7X2A/kct09570USZ/swfld3z8/9dFm8Up57VBln44w8
 	 t9I+DFEJDKMKlVhYTkcCG7jLGimuv6OrF+5yg4t3qOV7A6R6FAeYfh5gABQ14sABsT
 	 izpfUxi7Pf9QGEqkyT2HgyU2kcK0yqKSYB55QD14=
 Received: by cvs.NetBSD.org (Postfix, from userid 500)
 	id 28DB2FA2C; Wed, 17 Apr 2024 11:57:37 +0000 (UTC)
 Content-Transfer-Encoding: 7bit
 Content-Type: multipart/mixed; boundary="_----------=_1713355057108570"
 MIME-Version: 1.0
 Date: Wed, 17 Apr 2024 11:57:37 +0000
 From: "Thomas Klausner" <wiz%netbsd.org@localhost>
 Subject: CVS commit: pkgsrc
 To: pkgsrc-changes%NetBSD.org@localhost
 Reply-To: wiz%netbsd.org@localhost
 X-Mailer: log_accum
 Message-Id: <20240417115737.28DB2FA2C%cvs.NetBSD.org@localhost>
 Sender: pkgsrc-changes-owner%NetBSD.org@localhost
 List-Id: <pkgsrc-changes.NetBSD.org>
 Precedence: bulk
 List-Unsubscribe: <mailto:majordomo%NetBSD.org@localhost?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>
 
 This is a multi-part message in MIME format.
 
 --_----------=_1713355057108570
 Content-Disposition: inline
 Content-Transfer-Encoding: 8bit
 Content-Type: text/plain; charset="US-ASCII"
 
 Module Name:	pkgsrc
 Committed By:	wiz
 Date:		Wed Apr 17 11:57:37 UTC 2024
 
 Modified Files:
 	pkgsrc/devel/py-gobject: Makefile.common
 	pkgsrc/devel/py-gobject3: Makefile.common
 	pkgsrc/devel/ruby-pkg-config: Makefile
 	pkgsrc/math/py-roman: Makefile
 	pkgsrc/net/rabbiter: Makefile
 	pkgsrc/x11/py-gtk2: Makefile
 
 Log Message:
 *: fix some CONFLICTS
 
 Remove some that are for packages more than ten year old,
 fix rest.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-gobject/Makefile.common
 cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-gobject3/Makefile.common
 cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/ruby-pkg-config/Makefile
 cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/py-roman/Makefile
 cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/rabbiter/Makefile
 cvs rdiff -u -r1.144 -r1.145 pkgsrc/x11/py-gtk2/Makefile
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 
 --_----------=_1713355057108570
 Content-Disposition: inline
 Content-Length: 4341
 Content-Transfer-Encoding: binary
 Content-Type: text/x-diff; charset=us-ascii
 
 Modified files:
 
 Index: pkgsrc/devel/py-gobject/Makefile.common
 diff -u pkgsrc/devel/py-gobject/Makefile.common:1.23 pkgsrc/devel/py-gobject/Makefile.common:1.24
 --- pkgsrc/devel/py-gobject/Makefile.common:1.23	Wed Apr 17 10:38:34 2024
 +++ pkgsrc/devel/py-gobject/Makefile.common	Wed Apr 17 11:57:36 2024
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile.common,v 1.23 2024/04/17 10:38:34 wiz Exp $
 +# $NetBSD: Makefile.common,v 1.24 2024/04/17 11:57:36 wiz Exp $
  #
  # used by devel/py-gobject/Makefile
  # used by devel/py-gobject-shared/Makefile
 @@ -25,4 +25,4 @@ DISTINFO_FILE=		${.CURDIR}/../../devel/p
  
  PKGCONFIG_OVERRIDE+=	pygobject-2.0.pc.in
  PY_PATCHPLIST=		yes
 -CONFLICTS+=		py[0-9]*-gtk2<2.8.4
 +CONFLICTS+=		py27-gtk2<2.8.4
 
 Index: pkgsrc/devel/py-gobject3/Makefile.common
 diff -u pkgsrc/devel/py-gobject3/Makefile.common:1.20 pkgsrc/devel/py-gobject3/Makefile.common:1.21
 --- pkgsrc/devel/py-gobject3/Makefile.common:1.20	Wed Apr 17 10:38:34 2024
 +++ pkgsrc/devel/py-gobject3/Makefile.common	Wed Apr 17 11:57:36 2024
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile.common,v 1.20 2024/04/17 10:38:34 wiz Exp $
 +# $NetBSD: Makefile.common,v 1.21 2024/04/17 11:57:36 wiz Exp $
  # used by devel/py-gobject3/Makefile
  # used by devel/py-gobject3-common/Makefile
  
 @@ -17,5 +17,5 @@ USE_TOOLS+=	pkg-config
  DISTINFO_FILE=	../../devel/py-gobject3/distinfo
  #PATCHDIR=	../../devel/py-gobject3/patches
  
 -CONFLICTS+=	py[0-9]*-gtk2<2.8.4
 -CONFLICTS+=	py[0-9]*-gobject<2.28.6nb4
 +CONFLICTS+=	py27-gtk2<2.8.4
 +CONFLICTS+=	py27-gobject<2.28.6nb4
 
 Index: pkgsrc/devel/ruby-pkg-config/Makefile
 diff -u pkgsrc/devel/ruby-pkg-config/Makefile:1.40 pkgsrc/devel/ruby-pkg-config/Makefile:1.41
 --- pkgsrc/devel/ruby-pkg-config/Makefile:1.40	Wed Apr 17 10:38:34 2024
 +++ pkgsrc/devel/ruby-pkg-config/Makefile	Wed Apr 17 11:57:36 2024
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile,v 1.40 2024/04/17 10:38:34 wiz Exp $
 +# $NetBSD: Makefile,v 1.41 2024/04/17 11:57:36 wiz Exp $
  
  DISTNAME=	pkg-config-1.5.6
  CATEGORIES=	devel
 @@ -8,8 +8,6 @@ HOMEPAGE=	https://github.com/ruby-gnome/
  COMMENT=	Pure Ruby implementation of pkg-config
  LICENSE=	gnu-lgpl-v2.1
  
 -CONFLICTS+=	ruby[0-9]*-gnome2-glib<0.90.0
 -
  USE_LANGUAGES=	# none
  
  CONFIGURE_ARGS+=	--siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
 
 Index: pkgsrc/math/py-roman/Makefile
 diff -u pkgsrc/math/py-roman/Makefile:1.17 pkgsrc/math/py-roman/Makefile:1.18
 --- pkgsrc/math/py-roman/Makefile:1.17	Wed Apr 17 10:38:35 2024
 +++ pkgsrc/math/py-roman/Makefile	Wed Apr 17 11:57:36 2024
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile,v 1.17 2024/04/17 10:38:35 wiz Exp $
 +# $NetBSD: Makefile,v 1.18 2024/04/17 11:57:36 wiz Exp $
  
  DISTNAME=	roman-4.1
  PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 @@ -10,8 +10,6 @@ HOMEPAGE=	https://github.com/zopefoundat
  COMMENT=	Integer to Roman numerals converter for Python
  LICENSE=	zpl-2.1
  
 -CONFLICTS+=	py[0-9]*-docutils<=0.7
 -
  USE_LANGUAGES=	# none
  
  PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 Index: pkgsrc/net/rabbiter/Makefile
 diff -u pkgsrc/net/rabbiter/Makefile:1.16 pkgsrc/net/rabbiter/Makefile:1.17
 --- pkgsrc/net/rabbiter/Makefile:1.16	Wed Apr 17 10:38:35 2024
 +++ pkgsrc/net/rabbiter/Makefile	Wed Apr 17 11:57:36 2024
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile,v 1.16 2024/04/17 10:38:35 wiz Exp $
 +# $NetBSD: Makefile,v 1.17 2024/04/17 11:57:36 wiz Exp $
  
  DISTNAME=	rabbiter-2.0.1
  PKGREVISION=	2
 @@ -15,8 +15,6 @@ DEPENDS+=	${RUBY_PKGPREFIX}-rabbit>=2.0.
  DEPENDS+=	${RUBY_PKGPREFIX}-twitter_oauth-[0-9]*:../../security/ruby-twitter_oauth
  DEPENDS+=	${RUBY_PKGPREFIX}-twitter-stream>=0.1.16:../../net/ruby-twitter-stream
  
 -CONFLICTS+=	ruby[0-9]*-rabbit<2.0.0
 -
  USE_RUBY_SETUP=		yes
  USE_RUBY_SETUP_PKG=	yes
  
 
 Index: pkgsrc/x11/py-gtk2/Makefile
 diff -u pkgsrc/x11/py-gtk2/Makefile:1.144 pkgsrc/x11/py-gtk2/Makefile:1.145
 --- pkgsrc/x11/py-gtk2/Makefile:1.144	Wed Apr 17 10:38:36 2024
 +++ pkgsrc/x11/py-gtk2/Makefile	Wed Apr 17 11:57:36 2024
 @@ -1,4 +1,4 @@
 -# $NetBSD: Makefile,v 1.144 2024/04/17 10:38:36 wiz Exp $
 +# $NetBSD: Makefile,v 1.145 2024/04/17 11:57:36 wiz Exp $
  
  DISTNAME=	pygtk-2.24.0
  PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
 @@ -12,7 +12,7 @@ HOMEPAGE=	http://www.pygtk.org/
  COMMENT=	Python bindings for GTK+2
  LICENSE=	gnu-lgpl-v2.1
  
 -CONFLICTS=	py[0-9]*-gtk<0.6.10
 +CONFLICTS=	py27-gtk<0.6.10
  
  # IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
  MAKE_JOBS_SAFE=	no
 
 
 --_----------=_1713355057108570--
 
 
 --s7be3vZb+oI84mkW--
Prev by Date: Re: pkg/58155 (CONFLICTS doesn't work with multi-version packages)
Next by Date: Re: pkg/53144 (python deadlock when building firefox)
Previous by Thread: pkg/58155: CONFLICTS doesn't work with multi-version packages
Next by Thread: Re: pkg/58155 (CONFLICTS doesn't work with multi-version packages)
Indexes:
Home | Main Index | Thread Index | Old Index