On Sat, Apr 16, 2022 at 03:01:39PM +0200, Volker Schlecht wrote:
> Works for me!
>
> On 4/15/22 22:41, Martin Reindl wrote:
> > On Fri, Apr 15, 2022 at 06:14:46PM +0200, Volker Schlecht wrote:
> > > Just give the word - I have both a patch and a new package ready to go.
> > >
> > > On 4/15/22 15:47, Stuart Henderson wrote:
> > > > You can't really @conflict between two ports which are build
> > > > dependencies of other ports.
> > > >
> >
> > I cleaned up your diff and attached the new arpack-ng port.
> > As an alternative I propose this strategy:
> >
> > - commit new arpack-ng port, dont't hook up yet
> > - more tests with dependencies, iron out possible issues on other archs
> > - switch the other ports to arpack-ng, add quirks, unhook old arpack, hook
> > up arpack-ng
> > - move arpack to attic
> >
> > Is this the way to go?
> >
Tests run OK on amd64, arm64, armv7 and i386.
Anyone can test on sparc64?
OK to import arpack-ng?
Diff for the switch from arpack to arpack-ng at a later point:
Index: math/Makefile
===================================================================
RCS file: /cvs/ports/math/Makefile,v
retrieving revision 1.211
diff -u -p -u -p -r1.211 Makefile
--- math/Makefile 9 Mar 2022 16:18:05 -0000 1.211
+++ math/Makefile 16 Apr 2022 15:03:48 -0000
@@ -3,7 +3,8 @@
SUBDIR += R
SUBDIR += aamath
SUBDIR += armadillo
- SUBDIR += arpack
+ SUBDIR += arpack-ng
+ SUBDIR += arpack-ng,mpi
SUBDIR += bc-gh
SUBDIR += bcal
SUBDIR += blas
Index: math/armadillo/Makefile
===================================================================
RCS file: /cvs/ports/math/armadillo/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- math/armadillo/Makefile 11 Mar 2022 19:36:11 -0000 1.7
+++ math/armadillo/Makefile 16 Apr 2022 15:03:48 -0000
@@ -4,6 +4,7 @@ SHARED_LIBS = armadillo 3.1 # 9.900.4
CATEGORIES = math
HOMEPAGE = http://arma.sourceforge.net/
MAINTAINER = Marc Espie <es...@openbsd.org>
+REVISION = 0
# MPL v2
PERMIT_PACKAGE = Yes
@@ -16,7 +17,7 @@ EXTRACT_SUFX= .tar.xz
COMPILER = base-clang ports-gcc
MODULES += devel/cmake
-LIB_DEPENDS += math/arpack \
+LIB_DEPENDS += math/arpack-ng \
math/hdf5
CONFIGURE_STYLE = cmake
Index: math/igraph/Makefile
===================================================================
RCS file: /cvs/ports/math/igraph/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- math/igraph/Makefile 11 Mar 2022 19:36:17 -0000 1.2
+++ math/igraph/Makefile 16 Apr 2022 15:03:48 -0000
@@ -1,6 +1,7 @@
COMMENT = C graph library
V = 0.9.5
DISTNAME = igraph-$V
+REVISION = 0
SHARED_LIBS = igraph 0.0 # 0.0
@@ -21,7 +22,7 @@ MODULES = devel/cmake
LIB_DEPENDS = devel/glpk \
devel/gmp \
- math/arpack \
+ math/arpack-ng \
math/blas \
math/suitesparse \
textproc/libxml
Index: math/octave/Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- math/octave/Makefile 31 Mar 2022 17:16:30 -0000 1.127
+++ math/octave/Makefile 16 Apr 2022 15:03:48 -0000
@@ -2,7 +2,7 @@ COMMENT = high-level language for numeri
VERSION = 5.2.0
DISTNAME = octave-${VERSION}
-REVISION = 5
+REVISION = 6
CATEGORIES = math
SHARED_LIBS += octave 13.0
@@ -42,7 +42,7 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
devel/readline \
editors/qscintilla \
graphics/GraphicsMagick \
- math/arpack \
+ math/arpack-ng \
math/fftw3 \
math/fftw3,float \
math/hdf5 \
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1376
diff -u -p -u -p -r1.1376 Makefile
--- devel/quirks/Makefile 16 Apr 2022 06:49:10 -0000 1.1376
+++ devel/quirks/Makefile 16 Apr 2022 15:03:48 -0000
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-5.14
+PKGNAME = quirks-5.15
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1389
diff -u -p -u -p -r1.1389 Quirks.pm
--- devel/quirks/files/Quirks.pm 16 Apr 2022 06:49:10 -0000 1.1389
+++ devel/quirks/files/Quirks.pm 16 Apr 2022 15:03:49 -0000
@@ -724,6 +724,7 @@ my $stem_extensions = {
'tracker-miners' => 'tracker3-miners',
'tracker' => 'tracker3',
'libgweather' => 'libgweather4',
+ 'arpack' => 'arpack-ng',
};
my $obsolete_reason = {};
