CVS commit: pkgsrc/math/fftw

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb  2 23:14:54 UTC 2026

Modified Files:
        pkgsrc/math/fftw: Makefile PLIST options.mk

Log Message:
fftw: enable avx by default on NetBSD 11/x86_64

Bump PKGREVISION.

Fix pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/math/fftw/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/fftw/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/fftw/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/fftw/Makefile
diff -u pkgsrc/math/fftw/Makefile:1.80 pkgsrc/math/fftw/Makefile:1.81
--- pkgsrc/math/fftw/Makefile:1.80      Mon Jan 19 13:47:13 2026
+++ pkgsrc/math/fftw/Makefile   Mon Feb  2 23:14:54 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2026/01/19 13:47:13 mef Exp $
+# $NetBSD: Makefile,v 1.81 2026/02/02 23:14:54 wiz Exp $
 
 COMMENT=       Fast C routines to compute DFTs (single and double precision)
-PKGREVISION=   3
+PKGREVISION=   4
 
 SUPERSEDES=    fftwf-[0-9]*
 CONFLICTS+=    fftwf-[0-9]*

Index: pkgsrc/math/fftw/PLIST
diff -u pkgsrc/math/fftw/PLIST:1.17 pkgsrc/math/fftw/PLIST:1.18
--- pkgsrc/math/fftw/PLIST:1.17 Thu Mar 14 19:33:04 2024
+++ pkgsrc/math/fftw/PLIST      Mon Feb  2 23:14:54 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2024/03/14 19:33:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.18 2026/02/02 23:14:54 wiz Exp $
 bin/fftw-wisdom
 bin/fftw-wisdom-to-conf
 bin/fftwf-wisdom
@@ -13,9 +13,9 @@ include/fftw3q.f03
 info/fftw3.info
 lib/cmake/fftw3/FFTW3Config.cmake
 lib/cmake/fftw3/FFTW3ConfigVersion.cmake
+lib/cmake/fftw3/FFTW3LibraryDepends.cmake
 lib/cmake/fftw3/FFTW3fConfig.cmake
 lib/cmake/fftw3/FFTW3fConfigVersion.cmake
-lib/cmake/fftw3/FFTW3LibraryDepends.cmake
 lib/libfftw3.la
 ${PLIST.mpi}lib/libfftw3_mpi.la
 ${PLIST.omp}lib/libfftw3_omp.la

Index: pkgsrc/math/fftw/options.mk
diff -u pkgsrc/math/fftw/options.mk:1.13 pkgsrc/math/fftw/options.mk:1.14
--- pkgsrc/math/fftw/options.mk:1.13    Mon Jan 19 13:47:13 2026
+++ pkgsrc/math/fftw/options.mk Mon Feb  2 23:14:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2026/01/19 13:47:13 mef Exp $
+# $NetBSD: options.mk,v 1.14 2026/02/02 23:14:54 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fftw
 PKG_SUPPORTED_OPTIONS= fftw-fortran openmp mpi simd
@@ -9,6 +9,9 @@ PKG_SUGGESTED_OPTIONS=  fftw-fortran
 .if !empty(PKGSRC_COMPILER:M*gcc*) || !empty(PKGSRC_COMPILER:M*clang*)
 .  if ${MACHINE_ARCH} == "x86_64"
 PKG_SUPPORTED_OPTIONS+=        avx
+.    if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 110000
+PKG_SUGGESTED_OPTIONS+=        avx
+.    endif
 .  endif
 PKG_SUGGESTED_OPTIONS+=        simd
 .endif
@@ -24,7 +27,7 @@ FFTW_DOUBLE_OPTS+=    --enable-${opt}
 .endif
 
 .if !empty(PKG_OPTIONS:Msimd)
-.  if !empty(MACHINE_ARCH:Mpowerpc*)
+.  if ${MACHINE_ARCH:Mpowerpc*}
 FFTW_FLOAT_OPTS+=      --enable-altivec
 .  endif
 .  if ${MACHINE_ARCH} == "x86_64"