Stuart Henderson: > Oh, just register the conflict and @pkgpath. Yes that would work > through a pkg_add -u upgrade, I'm happy with that.
I tried the patch below (@conflict, @pkgpath, gcj listed as obsolete in quirks), but pkg_add chokes if gcj-4.9.4 is installed: Detected loop, merging sets ok | g++-4.9.4p18+gcc-libs-4.9.4p18->g++-8.3.0p0+gcc-libs-8.3.0p0 | gcc-8.3.0p0 g++-4.9.4p18+gcc-4.9.4p18+gcc-libs-4.9.4p18->g++-8.3.0p0+gcc-8.3.0p0+gcc-libs-8.3.0p0 forward dependencies: | Dependencies of gcj-4.9.4p18 on gcc->=4.9,<4.10 don't match | Dependencies of g95-4.9.4p18 on gcc->=4.9,<4.10 don't match | Dependencies of gnat-4.9.4p18 on gcc->=4.9,<4.10 don't match | Dependencies of gobjc-4.9.4p18 on gcc->=4.9,<4.10 don't match Merging gcj-4.9.4p18->4.9.4p18 (ok) Merging g95-4.9.4p18->8.3.0p0 (ok) Merging gnat-4.9.4p18->8.3.0p0 (ok) Merging gobjc-4.9.4p18->8.3.0p0 (ok) [gcj-4.9.4p18]g++-4.9.4p18+g95-4.9.4p18+gcc-4.9.4p18+gcc-libs-4.9.4p18+gnat-4.9.4p18+gobjc-4.9.4p18->g++-8.3.0p0+g95-8.3.0p0+gcc-8.3.0p0+gcc-libs-8.3.0p0+gnat-8.3.0p0+gobjc-8.3.0p0 forward dependencies: | Dependencies of gcj-4.9.4p18 on gcc->=4.9,<4.10 don't match Proceed with update anyway ? [y/N/a] y Can't install [gcj-4.9.4p18]g++-4.9.4p18+g95-4.9.4p18+gcc-4.9.4p18+gcc-libs-4.9.4p18+gnat-4.9.4p18+gobjc-4.9.4p18->g++-8.3.0p0+g95-8.3.0p0+gcc-8.3.0p0+gcc-libs-8.3.0p0+gnat-8.3.0p0+gobjc-8.3.0p0: can't resolve gcc->=4.9,<4.10 Couldn't find updates for g++-4.9.4p18 g95-4.9.4p18 gcc-4.9.4p18 gcc-libs-4.9.4p18 gnat-4.9.4p18 gobjc-4.9.4p18 Couldn't install g++-8.3.0p0 g95-8.3.0p0 gcc-8.3.0p0 gcc-libs-8.3.0p0 gnat-8.3.0p0 gobjc-8.3.0p0 Any ideas? Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.732 diff -u -p -r1.732 Makefile --- devel/quirks/Makefile 17 Apr 2019 13:19:49 -0000 1.732 +++ devel/quirks/Makefile 19 Apr 2019 20:29:34 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.125 +PKGNAME = quirks-3.126 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.749 diff -u -p -r1.749 Quirks.pm --- devel/quirks/files/Quirks.pm 17 Apr 2019 13:19:49 -0000 1.749 +++ devel/quirks/files/Quirks.pm 19 Apr 2019 20:31:06 -0000 @@ -1206,6 +1206,8 @@ my $obsolete_reason = { 'dclock' => 3, 'xfishtank' => 3, 'mpeg_play' => 6, +# 6.6 + 'gcj' => 5, }; # reasons for obsolete packages Index: lang/gcc/8/Makefile =================================================================== RCS file: /cvs/ports/lang/gcc/8/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- lang/gcc/8/Makefile 25 Mar 2019 20:17:46 -0000 1.9 +++ lang/gcc/8/Makefile 19 Apr 2019 20:13:37 -0000 @@ -11,6 +11,7 @@ ONLY_FOR_ARCHS-ada = amd64 hppa i386 mip DPB_PROPERTIES = parallel V = 8.3.0 +REVISION = 0 FULL_VERSION = $V FULL_PKGVERSION = $V Index: lang/gcc/8/pkg/PLIST-ada =================================================================== RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-ada,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST-ada --- lang/gcc/8/pkg/PLIST-ada 4 Jan 2019 15:50:40 -0000 1.1.1.1 +++ lang/gcc/8/pkg/PLIST-ada 19 Apr 2019 20:24:05 -0000 @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST-ada,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $ @option is-branch +@conflict gnat-<9 +@pkgpath lang/gcc/4.9,-ada @bin bin/gnat @bin bin/gnatbind @bin bin/gnatchop Index: lang/gcc/8/pkg/PLIST-c++ =================================================================== RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-c++,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST-c++ --- lang/gcc/8/pkg/PLIST-c++ 4 Jan 2019 15:50:40 -0000 1.1.1.1 +++ lang/gcc/8/pkg/PLIST-c++ 19 Apr 2019 20:26:02 -0000 @@ -1,6 +1,8 @@ @comment $OpenBSD: PLIST-c++,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $ @option is-branch @conflict gcc-libs->=9 +@conflict g++-<9 +@pkgpath lang/gcc/4.9,-c++ @bin bin/ec++ @bin bin/eg++ @bin bin/${CONFIG}-ec++ Index: lang/gcc/8/pkg/PLIST-f95 =================================================================== RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-f95,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST-f95 --- lang/gcc/8/pkg/PLIST-f95 4 Jan 2019 15:50:40 -0000 1.1.1.1 +++ lang/gcc/8/pkg/PLIST-f95 19 Apr 2019 20:27:13 -0000 @@ -2,6 +2,8 @@ @option is-branch @conflict gfortran-* @conflict libgfortran-* +@conflict g95-<9 +@pkgpath lang/gcc/4.9,-f95 @bin bin/egfortran @bin bin/${CONFIG}-egfortran @info info/gfortran.info Index: lang/gcc/8/pkg/PLIST-libs =================================================================== RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-libs,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST-libs --- lang/gcc/8/pkg/PLIST-libs 4 Jan 2019 15:50:40 -0000 1.1.1.1 +++ lang/gcc/8/pkg/PLIST-libs 19 Apr 2019 20:27:40 -0000 @@ -1,7 +1,8 @@ @comment $OpenBSD: PLIST-libs,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $ @option no-default-conflict @option is-branch -@conflict gcc-libs->=8,<9 +@conflict gcc-libs-<9 +@pkgpath lang/gcc/4.9,-libs lib/libatomic.la @lib lib/libatomic.so.${LIBatomic_VERSION} lib/libestdc++.la Index: lang/gcc/8/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-main,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST-main --- lang/gcc/8/pkg/PLIST-main 4 Jan 2019 15:50:40 -0000 1.1.1.1 +++ lang/gcc/8/pkg/PLIST-main 19 Apr 2019 20:28:05 -0000 @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST-main,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $ @option is-branch +@conflict gcc-<9 +@pkgpath lang/gcc/4.9,-main @bin bin/ecpp @bin bin/egcc @bin bin/egcc-ar Index: lang/gcc/8/pkg/PLIST-objc =================================================================== RCS file: /cvs/ports/lang/gcc/8/pkg/PLIST-objc,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST-objc --- lang/gcc/8/pkg/PLIST-objc 4 Jan 2019 15:50:40 -0000 1.1.1.1 +++ lang/gcc/8/pkg/PLIST-objc 19 Apr 2019 20:28:50 -0000 @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST-objc,v 1.1.1.1 2019/01/04 15:50:40 pascal Exp $ @option is-branch +@conflict gobjc-<9 +@pkgpath lang/gcc/4.9,-objc lib/gcc/${CONFIG}/${V}/include/objc/ lib/gcc/${CONFIG}/${V}/include/objc/NXConstStr.h lib/gcc/${CONFIG}/${V}/include/objc/Object.h -- Christian "naddy" Weisgerber [email protected]
