Currently, if you try to build the "float" flavor of math/fftw3 before
the "double" flavor, packaging will fail. The *.cmake files are in
fact not shared between the flavors; there are separate FFTW3Config and
FFTW3fConfig files. The patch below moves them from -common to the
flavored -main packages.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/fftw3/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile 12 Jul 2019 20:47:40 -0000 1.36
+++ Makefile 3 Oct 2019 13:59:58 -0000
@@ -16,8 +16,7 @@ SHARED_LIBS= fftw3 7.1 \
fftw3f_threads 1.1
CATEGORIES= math
-REVISION-main= 0
-REVISION-common= 0
+REVISION= 1
HOMEPAGE= http://www.fftw.org/
Index: pkg/PFRAG.double-main
===================================================================
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.double-main,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.double-main
--- pkg/PFRAG.double-main 23 Mar 2016 21:14:58 -0000 1.4
+++ pkg/PFRAG.double-main 3 Oct 2019 13:59:58 -0000
@@ -2,6 +2,8 @@
@pkgpath math/fftw3
@pkgpath math/fftw3,double
@bin bin/fftw-wisdom
+lib/cmake/fftw3/FFTW3Config.cmake
+lib/cmake/fftw3/FFTW3ConfigVersion.cmake
lib/libfftw3.a
lib/libfftw3.la
@lib lib/libfftw3.so.${LIBfftw3_VERSION}
Index: pkg/PFRAG.float-main
===================================================================
RCS file: /cvs/ports/math/fftw3/pkg/PFRAG.float-main,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.float-main
--- pkg/PFRAG.float-main 23 Mar 2016 21:14:58 -0000 1.4
+++ pkg/PFRAG.float-main 3 Oct 2019 13:59:58 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PFRAG.float-main,v 1.4 2016/03/23 21:14:58 naddy Exp $
@pkgpath math/fftw3,float
@bin bin/fftwf-wisdom
+lib/cmake/fftw3/FFTW3fConfig.cmake
+lib/cmake/fftw3/FFTW3fConfigVersion.cmake
lib/libfftw3f.a
lib/libfftw3f.la
@lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
Index: pkg/PLIST-common
===================================================================
RCS file: /cvs/ports/math/fftw3/pkg/PLIST-common,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-common
--- pkg/PLIST-common 18 Apr 2019 15:11:55 -0000 1.4
+++ pkg/PLIST-common 3 Oct 2019 13:59:58 -0000
@@ -8,10 +8,8 @@ include/fftw3.h
include/fftw3l.f03
include/fftw3q.f03
@info info/fftw3.info
+lib/cmake/
+lib/cmake/fftw3/
@man man/man1/fftw-wisdom-to-conf.1
share/doc/fftw3/
share/doc/fftw3/fftw3.pdf
-lib/cmake/
-lib/cmake/fftw3/
-lib/cmake/fftw3/FFTW3Config.cmake
-lib/cmake/fftw3/FFTW3ConfigVersion.cmake
--
Christian "naddy" Weisgerber na...@mips.inka.de
