On 2020/12/29 23:45, Kurt Mosiejczuk wrote: > On Tue, Dec 29, 2020 at 07:40:41PM -0500, Daniel Dickman wrote: > > Here's an update for swig that I've been running with for some time. It > > will likely benefit from going through a bulk. > > I've just kicked off a sparc64 bulk build with this swig update in it. > Builds are taking a bit over 3 days currently. (So someone with an amd64 > cluster may beat me to results if they try).
devel/subversion doesn't like swig 4.x: configure: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0 stsp, do you need py2 svn bindings for anything? If not I propose to remove them and cvs2svn. cvs2svn does not really seem maintained any more, and it doesn't seem worth the trouble of maintaining multiple versions of swig (and making devel/subversion even more fiddly than it already is). If anything comes of https://github.com/mhagger/cvs2svn/issues/9 we can always bring it back again later. The py2 bindings used to be needed for trac but I've now switched that over to the 1.5 devel branch (which is not all that far off 1.6 now) using py3. Update path works, e.g. py-subversion-1.14.0p1+trac-1.4.2p0->py3-subversion-1.14.0p2+trac-1.5.2: Index: Makefile =================================================================== RCS file: /cvs/ports/devel/Makefile,v retrieving revision 1.2046 diff -u -p -r1.2046 Makefile --- Makefile 30 Dec 2020 15:55:16 -0000 1.2046 +++ Makefile 30 Dec 2020 21:19:02 -0000 @@ -103,7 +103,6 @@ SUBDIR += cvs20hg SUBDIR += cvs2cl SUBDIR += cvs2gitdump - SUBDIR += cvs2svn SUBDIR += cvsgraph SUBDIR += cvslock SUBDIR += cvsplot Index: quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1114 diff -u -p -r1.1114 Makefile --- quirks/Makefile 29 Dec 2020 15:23:42 -0000 1.1114 +++ quirks/Makefile 30 Dec 2020 21:19:02 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.503 +PKGNAME = quirks-3.504 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1131 diff -u -p -r1.1131 Quirks.pm --- quirks/files/Quirks.pm 29 Dec 2020 15:23:42 -0000 1.1131 +++ quirks/files/Quirks.pm 30 Dec 2020 21:51:43 -0000 @@ -2020,6 +2020,7 @@ my $obsolete_reason = { 'libxml++3' => 5, 'orage' => 3, 'xfce4-statusnotifier' => 3, + 'cvs2svn' => 3, }; # reasons for obsolete packages Index: subversion/Makefile =================================================================== RCS file: /cvs/ports/devel/subversion/Makefile,v retrieving revision 1.182 diff -u -p -r1.182 Makefile --- subversion/Makefile 3 Jul 2020 21:12:53 -0000 1.182 +++ subversion/Makefile 30 Dec 2020 21:19:02 -0000 @@ -9,19 +9,14 @@ COMMENT-gnome-keyring= GNOME keyring sup VERSION= 1.14.0 REVISION= 0 -REVISION-python= 1 +REVISION-python= 2 DISTNAME= subversion-${VERSION:S/rc/-rc/} PKGNAME-main= subversion-${VERSION} -FULLPKGNAME-main= subversion-${VERSION}${FLAVOR_EXT:S/-python3//} -FULLPKGPATH-main= devel/subversion,-main${FLAVOR_EXT:S/-python3//:S/-/,/g} -FULLPKGNAME-perl= p5-SVN-${VERSION} -FULLPKGPATH-perl= devel/subversion,-perl -FULLPKGNAME-ruby= ruby${MODRUBY_BINREV}-subversion-${VERSION} -FULLPKGPATH-ruby= devel/subversion,-ruby -FULLPKGNAME-ap2= ap2-subversion-${VERSION} -FULLPKGPATH-ap2= devel/subversion,-ap2 -FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION} -FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring +PKGNAME-perl= p5-SVN-${VERSION} +PKGNAME-python= py-subversion-${VERSION} +PKGNAME-ruby= ruby${MODRUBY_BINREV}-subversion-${VERSION} +PKGNAME-ap2= ap2-subversion-${VERSION} +PKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION} MODRUBY_REV ?= 2.7 # Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module @@ -55,25 +50,14 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=subv EXTRACT_SUFX= .tar.bz2 PSEUDO_FLAVORS= no_bindings no_ap2 no_perl no_python no_ruby no_gnome-keyring -FLAVORS= maintainer_mode python3 +FLAVORS= maintainer_mode FLAVOR?= .if ${FLAVOR:Mno_bindings} FLAVOR += no_perl no_python no_ruby .endif -.if ${FLAVOR:Mpython3} -FULLPKGNAME-python= py3-subversion-${VERSION} -FULLPKGPATH-python= devel/subversion,python3,-python -# py-subversion and py3-subversion both install libsvn_swig_py-1; -# conflict with the other flavour -PY_CONFLICT= py-subversion-* -.else -FULLPKGNAME-python= py-subversion-${VERSION} -FULLPKGPATH-python= devel/subversion,-python -PY_CONFLICT= py3-subversion-* -.endif - MODULES= lang/python +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} WANTLIB= expat iconv intl lz4 m pthread z Index: subversion/pkg/PLIST-python =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-python,v retrieving revision 1.12 diff -u -p -r1.12 PLIST-python --- subversion/pkg/PLIST-python 31 May 2020 19:29:32 -0000 1.12 +++ subversion/pkg/PLIST-python 30 Dec 2020 21:19:02 -0000 @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST-python,v 1.12 2020/05/31 19:29:32 sthen Exp $ -@conflict ${PY_CONFLICT} +@conflict py-subversion-* @pkgpath devel/subversion,-python,gnome_keyring +@pkgpath devel/subversion,python3,-python @static-lib lib/libsvn_swig_py-1.a lib/libsvn_swig_py-1.la @lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION}
