Fix the subpackaging: The *.cmake files are not shared between the flavors;

move them from -common to the flavored -main packages.  ok sthen@
This commit is contained in:
naddy 2019-10-03 16:49:10 +00:00
parent 238db832a7
commit 68bf37dbfb
4 changed files with 11 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2019/07/12 20:47:40 sthen Exp $ # $OpenBSD: Makefile,v 1.37 2019/10/03 16:49:10 naddy Exp $
COMMENT-main= C routines for computing the Discrete Fourier Transform COMMENT-main= C routines for computing the Discrete Fourier Transform
COMMENT-common= common files for the fftw3 packages COMMENT-common= common files for the fftw3 packages
@ -16,8 +16,7 @@ SHARED_LIBS= fftw3 7.1 \
fftw3f_threads 1.1 fftw3f_threads 1.1
CATEGORIES= math CATEGORIES= math
REVISION-main= 0 REVISION= 1
REVISION-common= 0
HOMEPAGE= http://www.fftw.org/ HOMEPAGE= http://www.fftw.org/

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PFRAG.double-main,v 1.4 2016/03/23 21:14:58 naddy Exp $ @comment $OpenBSD: PFRAG.double-main,v 1.5 2019/10/03 16:49:11 naddy Exp $
@pkgpath math/fftw3 @pkgpath math/fftw3
@pkgpath math/fftw3,double @pkgpath math/fftw3,double
@bin bin/fftw-wisdom @bin bin/fftw-wisdom
lib/cmake/fftw3/FFTW3Config.cmake
lib/cmake/fftw3/FFTW3ConfigVersion.cmake
lib/libfftw3.a lib/libfftw3.a
lib/libfftw3.la lib/libfftw3.la
@lib lib/libfftw3.so.${LIBfftw3_VERSION} @lib lib/libfftw3.so.${LIBfftw3_VERSION}

View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PFRAG.float-main,v 1.4 2016/03/23 21:14:58 naddy Exp $ @comment $OpenBSD: PFRAG.float-main,v 1.5 2019/10/03 16:49:11 naddy Exp $
@pkgpath math/fftw3,float @pkgpath math/fftw3,float
@bin bin/fftwf-wisdom @bin bin/fftwf-wisdom
lib/cmake/fftw3/FFTW3fConfig.cmake
lib/cmake/fftw3/FFTW3fConfigVersion.cmake
lib/libfftw3f.a lib/libfftw3f.a
lib/libfftw3f.la lib/libfftw3f.la
@lib lib/libfftw3f.so.${LIBfftw3f_VERSION} @lib lib/libfftw3f.so.${LIBfftw3f_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-common,v 1.4 2019/04/18 15:11:55 rsadowski Exp $ @comment $OpenBSD: PLIST-common,v 1.5 2019/10/03 16:49:11 naddy Exp $
@pkgpath math/fftw3,-common,double @pkgpath math/fftw3,-common,double
@pkgpath math/fftw3,-common,float @pkgpath math/fftw3,-common,float
bin/fftw-wisdom-to-conf bin/fftw-wisdom-to-conf
@ -8,10 +8,8 @@ include/fftw3.h
include/fftw3l.f03 include/fftw3l.f03
include/fftw3q.f03 include/fftw3q.f03
@info info/fftw3.info @info info/fftw3.info
lib/cmake/
lib/cmake/fftw3/
@man man/man1/fftw-wisdom-to-conf.1 @man man/man1/fftw-wisdom-to-conf.1
share/doc/fftw3/ share/doc/fftw3/
share/doc/fftw3/fftw3.pdf share/doc/fftw3/fftw3.pdf
lib/cmake/
lib/cmake/fftw3/
lib/cmake/fftw3/FFTW3Config.cmake
lib/cmake/fftw3/FFTW3ConfigVersion.cmake