pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: thor
Date: Thu Apr 29 23:30:16 UTC 2021
Modified Files:
pkgsrc/audio/ardour: Makefile
pkgsrc/audio/liblastfm: Makefile buildlink3.mk
pkgsrc/audio/lmms: Makefile
pkgsrc/audio/speex: Makefile options.mk
pkgsrc/games/powder-toy: Makefile options.mk
pkgsrc/graphics/luminance-hdr: Makefile
pkgsrc/graphics/pfstools: Makefile
pkgsrc/graphics/rawtherapee: Makefile
pkgsrc/ham/gnuradio-channels: Makefile
pkgsrc/ham/gnuradio-companion: Makefile
pkgsrc/ham/gnuradio-core: Makefile Makefile.common
pkgsrc/ham/gnuradio-ctrlport: Makefile
pkgsrc/ham/gnuradio-digital: Makefile
pkgsrc/ham/gnuradio-doxygen: Makefile
pkgsrc/ham/gnuradio-dtv: Makefile
pkgsrc/ham/gnuradio-fec: Makefile
pkgsrc/ham/gnuradio-network: Makefile
pkgsrc/ham/gnuradio-qtgui: Makefile
pkgsrc/ham/gnuradio-trellis: Makefile
pkgsrc/ham/gnuradio-uhd: Makefile
pkgsrc/ham/gnuradio-utils: Makefile
pkgsrc/ham/gnuradio-video-sdl: Makefile
pkgsrc/ham/gnuradio-vocoder: Makefile
pkgsrc/ham/gnuradio-wavelet: Makefile
pkgsrc/ham/gnuradio-zeromq: Makefile
pkgsrc/ham/hackrf: Makefile
pkgsrc/math/fftw: Makefile PLIST buildlink3.mk options.mk
pkgsrc/math/octave: Makefile
Removed Files:
pkgsrc/math/fftw: Makefile.common
Log Message:
math/fftw and dependents: merge math/fftwf backin and add MPI and OpenMP
This yields one common package to provide libfftw3 (double) and libfftw3f
(single) by default and optionally the Fortran bindings as well as
OpenMP and MPI variants, and those with long double or quad precision.
This changes all packages depending on fftwf in the same commit to minimize
the time of inconsistency. Soon, math/fftwf will disappear.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/audio/ardour/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/liblastfm/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/audio/liblastfm/buildlink3.mk
cvs rdiff -u -r1.72 -r1.73 pkgsrc/audio/lmms/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/audio/speex/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/speex/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/powder-toy/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/powder-toy/options.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/luminance-hdr/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/graphics/pfstools/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/rawtherapee/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/ham/gnuradio-channels/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/ham/gnuradio-companion/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/ham/gnuradio-core/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/ham/gnuradio-core/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/ham/gnuradio-ctrlport/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/ham/gnuradio-digital/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/ham/gnuradio-doxygen/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/ham/gnuradio-dtv/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/ham/gnuradio-fec/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/ham/gnuradio-network/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/ham/gnuradio-qtgui/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/ham/gnuradio-trellis/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/ham/gnuradio-uhd/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/ham/gnuradio-utils/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/ham/gnuradio-video-sdl/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/ham/gnuradio-vocoder/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/ham/gnuradio-wavelet/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/ham/gnuradio-zeromq/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/ham/hackrf/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/math/fftw/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/math/fftw/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/fftw/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/fftw/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/fftw/options.mk
cvs rdiff -u -r1.217 -r1.218 pkgsrc/math/octave/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/ardour/Makefile
diff -u pkgsrc/audio/ardour/Makefile:1.48 pkgsrc/audio/ardour/Makefile:1.49
--- pkgsrc/audio/ardour/Makefile:1.48 Wed Apr 21 13:24:20 2021
+++ pkgsrc/audio/ardour/Makefile Thu Apr 29 23:30:12 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2021/04/21 13:24:20 adam Exp $
+# $NetBSD: Makefile,v 1.49 2021/04/29 23:30:12 thor Exp $
DISTNAME= Ardour-5.12.0
PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= audio
# currently, distfiles must be downloaded by hand from ardour.org
# and uploaded using `make upload-distfiles`.
@@ -109,7 +109,7 @@ post-install:
.include "../../devel/libusb1/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../lang/python/tool.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/liblrdf/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
Index: pkgsrc/audio/liblastfm/Makefile
diff -u pkgsrc/audio/liblastfm/Makefile:1.39 pkgsrc/audio/liblastfm/Makefile:1.40
--- pkgsrc/audio/liblastfm/Makefile:1.39 Tue Aug 18 17:57:25 2020
+++ pkgsrc/audio/liblastfm/Makefile Thu Apr 29 23:30:13 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2020/08/18 17:57:25 leot Exp $
+# $NetBSD: Makefile,v 1.40 2021/04/29 23:30:13 thor Exp $
#
DISTNAME= mxcl-liblastfm-0.3.3-0-gf0b3239
PKGNAME= liblastfm-0.3.3
-PKGREVISION= 28
+PKGREVISION= 29
CATEGORIES= audio net
MASTER_SITES= http://download.github.com/
@@ -40,7 +40,7 @@ pre-configure:
.include "../../lang/ruby/replace.mk"
BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
.include "../../lang/ruby/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/liblastfm/buildlink3.mk
diff -u pkgsrc/audio/liblastfm/buildlink3.mk:1.30 pkgsrc/audio/liblastfm/buildlink3.mk:1.31
--- pkgsrc/audio/liblastfm/buildlink3.mk:1.30 Tue Aug 18 17:57:25 2020
+++ pkgsrc/audio/liblastfm/buildlink3.mk Thu Apr 29 23:30:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2020/08/18 17:57:25 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2021/04/29 23:30:13 thor Exp $
BUILDLINK_TREE+= liblastfm
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.liblastfm+= liblas
BUILDLINK_PKGSRCDIR.liblastfm?= ../../audio/liblastfm
.include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-tools/buildlink3.mk"
.endif # LIBLASTFM_BUILDLINK3_MK
Index: pkgsrc/audio/lmms/Makefile
diff -u pkgsrc/audio/lmms/Makefile:1.72 pkgsrc/audio/lmms/Makefile:1.73
--- pkgsrc/audio/lmms/Makefile:1.72 Wed Apr 21 11:40:59 2021
+++ pkgsrc/audio/lmms/Makefile Thu Apr 29 23:30:13 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2021/04/21 11:40:59 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/04/29 23:30:13 thor Exp $
DISTNAME= lmms_1.2.2
PKGNAME= ${DISTNAME:S/_/-/1}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=LMMS/}
GITHUB_PROJECT= lmms
@@ -50,7 +50,7 @@ CHECK_PORTABILITY_SKIP+= cmake/linux/pac
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/fltk13/buildlink3.mk" # used for zynaddsubfx
Index: pkgsrc/audio/speex/Makefile
diff -u pkgsrc/audio/speex/Makefile:1.36 pkgsrc/audio/speex/Makefile:1.37
--- pkgsrc/audio/speex/Makefile:1.36 Thu Mar 12 23:01:43 2020
+++ pkgsrc/audio/speex/Makefile Thu Apr 29 23:30:13 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2020/03/12 23:01:43 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2021/04/29 23:30:13 thor Exp $
DISTNAME= speex-1.2.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://downloads.us.xiph.org/releases/speex/
Index: pkgsrc/audio/speex/options.mk
diff -u pkgsrc/audio/speex/options.mk:1.3 pkgsrc/audio/speex/options.mk:1.4
--- pkgsrc/audio/speex/options.mk:1.3 Thu Jul 7 12:26:45 2011
+++ pkgsrc/audio/speex/options.mk Thu Apr 29 23:30:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/07/07 12:26:45 obache Exp $
+# $NetBSD: options.mk,v 1.4 2021/04/29 23:30:13 thor Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.speex
@@ -28,5 +28,5 @@ CONFIGURE_ARGS+= --enable-sse
.if !empty(PKG_OPTIONS:Mfftw)
CONFIGURE_ARGS+= --with-fft=gpl-fftw3
-. include "../../math/fftwf/buildlink3.mk"
+. include "../../math/fftw/buildlink3.mk"
.endif
Index: pkgsrc/games/powder-toy/Makefile
diff -u pkgsrc/games/powder-toy/Makefile:1.8 pkgsrc/games/powder-toy/Makefile:1.9
--- pkgsrc/games/powder-toy/Makefile:1.8 Wed Apr 21 13:24:42 2021
+++ pkgsrc/games/powder-toy/Makefile Thu Apr 29 23:30:13 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/04/21 13:24:42 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/04/29 23:30:13 thor Exp $
DISTNAME= powder-toy-95.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=ThePowderToy/}
GITHUB_PROJECT= The-Powder-Toy
Index: pkgsrc/games/powder-toy/options.mk
diff -u pkgsrc/games/powder-toy/options.mk:1.1 pkgsrc/games/powder-toy/options.mk:1.2
--- pkgsrc/games/powder-toy/options.mk:1.1 Sat Apr 13 12:08:04 2019
+++ pkgsrc/games/powder-toy/options.mk Thu Apr 29 23:30:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/04/13 12:08:04 nia Exp $
+# $NetBSD: options.mk,v 1.2 2021/04/29 23:30:13 thor Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.powder-toy
PKG_SUPPORTED_OPTIONS= debug fftw lua
@@ -23,7 +23,7 @@ SCONS_ARGS+= --release
.endif
.if !empty(PKG_OPTIONS:Mfftw)
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.else
SCONS_ARGS+= --nofft
.endif
Index: pkgsrc/graphics/luminance-hdr/Makefile
diff -u pkgsrc/graphics/luminance-hdr/Makefile:1.54 pkgsrc/graphics/luminance-hdr/Makefile:1.55
--- pkgsrc/graphics/luminance-hdr/Makefile:1.54 Wed Apr 21 13:24:49 2021
+++ pkgsrc/graphics/luminance-hdr/Makefile Thu Apr 29 23:30:13 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2021/04/21 13:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.55 2021/04/29 23:30:13 thor Exp $
DISTNAME= luminance-hdr-2.6.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
EXTRACT_SUFX= .tar.bz2
@@ -25,7 +25,7 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../math/eigen3/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../parallel/openmp/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/graphics/pfstools/Makefile
diff -u pkgsrc/graphics/pfstools/Makefile:1.72 pkgsrc/graphics/pfstools/Makefile:1.73
--- pkgsrc/graphics/pfstools/Makefile:1.72 Wed Apr 21 13:24:49 2021
+++ pkgsrc/graphics/pfstools/Makefile Thu Apr 29 23:30:13 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2021/04/21 13:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/04/29 23:30:13 thor Exp $
DISTNAME= pfstools-2.1.0
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/}
EXTRACT_SUFX= .tgz
@@ -42,6 +42,6 @@ SUBST_SED.perl= -e 's,@PERL_PATH@,${PER
.include "../../graphics/netpbm/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/rawtherapee/Makefile
diff -u pkgsrc/graphics/rawtherapee/Makefile:1.18 pkgsrc/graphics/rawtherapee/Makefile:1.19
--- pkgsrc/graphics/rawtherapee/Makefile:1.18 Wed Apr 21 11:41:57 2021
+++ pkgsrc/graphics/rawtherapee/Makefile Thu Apr 29 23:30:13 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2021/04/21 11:41:57 adam Exp $
+# $NetBSD: Makefile,v 1.19 2021/04/29 23:30:13 thor Exp $
DISTNAME= rawtherapee-5.6
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://rawtherapee.com/shared/source/
EXTRACT_SUFX= .tar.xz
@@ -28,7 +28,7 @@ pre-configure:
.include "../../graphics/libiptcdata/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/gtkmm3/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
Index: pkgsrc/ham/gnuradio-channels/Makefile
diff -u pkgsrc/ham/gnuradio-channels/Makefile:1.25 pkgsrc/ham/gnuradio-channels/Makefile:1.26
--- pkgsrc/ham/gnuradio-channels/Makefile:1.25 Wed Apr 21 13:24:50 2021
+++ pkgsrc/ham/gnuradio-channels/Makefile Thu Apr 29 23:30:13 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/04/29 23:30:13 thor Exp $
PKGNAME= gnuradio-channels-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Signal processing blocks to simulate channel models of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-companion/Makefile
diff -u pkgsrc/ham/gnuradio-companion/Makefile:1.44 pkgsrc/ham/gnuradio-companion/Makefile:1.45
--- pkgsrc/ham/gnuradio-companion/Makefile:1.44 Wed Apr 21 13:24:50 2021
+++ pkgsrc/ham/gnuradio-companion/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-companion-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= User interface entry of GNU Radio
#CONF_FILES+= ${EGDIR}/grc.conf ${PKG_SYSCONFDIR}/grc.conf
Index: pkgsrc/ham/gnuradio-core/Makefile
diff -u pkgsrc/ham/gnuradio-core/Makefile:1.80 pkgsrc/ham/gnuradio-core/Makefile:1.81
--- pkgsrc/ham/gnuradio-core/Makefile:1.80 Wed Apr 21 13:24:50 2021
+++ pkgsrc/ham/gnuradio-core/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.81 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-core-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Core part of GNU Radio, all others need this
PLIST_MINUS= # empty
Index: pkgsrc/ham/gnuradio-core/Makefile.common
diff -u pkgsrc/ham/gnuradio-core/Makefile.common:1.32 pkgsrc/ham/gnuradio-core/Makefile.common:1.33
--- pkgsrc/ham/gnuradio-core/Makefile.common:1.32 Wed Apr 7 16:14:07 2021
+++ pkgsrc/ham/gnuradio-core/Makefile.common Thu Apr 29 23:30:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2021/04/07 16:14:07 tnn Exp $
+# $NetBSD: Makefile.common,v 1.33 2021/04/29 23:30:14 thor Exp $
# This Makefile fragment is included in the package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
# settings).
@@ -143,7 +143,7 @@ BUILDLINK_API_DEPENDS.py-pybind11+= ${PY
.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../math/py-numpy/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../math/volk/buildlink3.mk"
.include "../../textproc/log4cpp/buildlink3.mk"
Index: pkgsrc/ham/gnuradio-ctrlport/Makefile
diff -u pkgsrc/ham/gnuradio-ctrlport/Makefile:1.26 pkgsrc/ham/gnuradio-ctrlport/Makefile:1.27
--- pkgsrc/ham/gnuradio-ctrlport/Makefile:1.26 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-ctrlport/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-ctrlport-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= New set of hooks into GNU Radio to allow a remote client to attach
.include "../../ham/gnuradio-core/Makefile.common"
.include "../../ham/gnuradio-core/Nocore.mk"
Index: pkgsrc/ham/gnuradio-digital/Makefile
diff -u pkgsrc/ham/gnuradio-digital/Makefile:1.26 pkgsrc/ham/gnuradio-digital/Makefile:1.27
--- pkgsrc/ham/gnuradio-digital/Makefile:1.26 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-digital/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-digital-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Digital related algorithms for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-doxygen/Makefile
diff -u pkgsrc/ham/gnuradio-doxygen/Makefile:1.41 pkgsrc/ham/gnuradio-doxygen/Makefile:1.42
--- pkgsrc/ham/gnuradio-doxygen/Makefile:1.41 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-doxygen/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.42 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-doxygen-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Doxygen documentation of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-dtv/Makefile
diff -u pkgsrc/ham/gnuradio-dtv/Makefile:1.28 pkgsrc/ham/gnuradio-dtv/Makefile:1.29
--- pkgsrc/ham/gnuradio-dtv/Makefile:1.28 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-dtv/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.29 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-dtv-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Various digital television standards of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-fec/Makefile
diff -u pkgsrc/ham/gnuradio-fec/Makefile:1.27 pkgsrc/ham/gnuradio-fec/Makefile:1.28
--- pkgsrc/ham/gnuradio-fec/Makefile:1.27 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-fec/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.28 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-fec-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Forward Error Correction blocks, utilities, & examples of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-network/Makefile
diff -u pkgsrc/ham/gnuradio-network/Makefile:1.3 pkgsrc/ham/gnuradio-network/Makefile:1.4
--- pkgsrc/ham/gnuradio-network/Makefile:1.3 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-network/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-network-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Network blocks for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-qtgui/Makefile
diff -u pkgsrc/ham/gnuradio-qtgui/Makefile:1.36 pkgsrc/ham/gnuradio-qtgui/Makefile:1.37
--- pkgsrc/ham/gnuradio-qtgui/Makefile:1.36 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-qtgui/Makefile Thu Apr 29 23:30:14 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.37 2021/04/29 23:30:14 thor Exp $
PKGNAME= gnuradio-qtgui-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Qt GUI module of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-trellis/Makefile
diff -u pkgsrc/ham/gnuradio-trellis/Makefile:1.44 pkgsrc/ham/gnuradio-trellis/Makefile:1.45
--- pkgsrc/ham/gnuradio-trellis/Makefile:1.44 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-trellis/Makefile Thu Apr 29 23:30:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/29 23:30:15 thor Exp $
PKGNAME= gnuradio-trellis-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Trellis-based encoding and decoding algorithms for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-uhd/Makefile
diff -u pkgsrc/ham/gnuradio-uhd/Makefile:1.27 pkgsrc/ham/gnuradio-uhd/Makefile:1.28
--- pkgsrc/ham/gnuradio-uhd/Makefile:1.27 Wed Apr 21 13:24:51 2021
+++ pkgsrc/ham/gnuradio-uhd/Makefile Thu Apr 29 23:30:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.28 2021/04/29 23:30:15 thor Exp $
PKGNAME= gnuradio-uhd-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Uhd-based encoding and decoding algorithms for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-utils/Makefile
diff -u pkgsrc/ham/gnuradio-utils/Makefile:1.28 pkgsrc/ham/gnuradio-utils/Makefile:1.29
--- pkgsrc/ham/gnuradio-utils/Makefile:1.28 Wed Apr 21 13:24:52 2021
+++ pkgsrc/ham/gnuradio-utils/Makefile Thu Apr 29 23:30:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.29 2021/04/29 23:30:15 thor Exp $
PKGNAME= gnuradio-utils-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Utilities in GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-video-sdl/Makefile
diff -u pkgsrc/ham/gnuradio-video-sdl/Makefile:1.41 pkgsrc/ham/gnuradio-video-sdl/Makefile:1.42
--- pkgsrc/ham/gnuradio-video-sdl/Makefile:1.41 Wed Apr 21 13:24:52 2021
+++ pkgsrc/ham/gnuradio-video-sdl/Makefile Thu Apr 29 23:30:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.42 2021/04/29 23:30:15 thor Exp $
PKGNAME= gnuradio-video-sdl-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= SDL (Simple DirectMedia Layer) bindings for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-vocoder/Makefile
diff -u pkgsrc/ham/gnuradio-vocoder/Makefile:1.26 pkgsrc/ham/gnuradio-vocoder/Makefile:1.27
--- pkgsrc/ham/gnuradio-vocoder/Makefile:1.26 Wed Apr 21 13:24:52 2021
+++ pkgsrc/ham/gnuradio-vocoder/Makefile Thu Apr 29 23:30:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:15 thor Exp $
PKGNAME= gnuradio-vocoder-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= All available vocoders in GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-wavelet/Makefile
diff -u pkgsrc/ham/gnuradio-wavelet/Makefile:1.25 pkgsrc/ham/gnuradio-wavelet/Makefile:1.26
--- pkgsrc/ham/gnuradio-wavelet/Makefile:1.25 Wed Apr 21 13:24:52 2021
+++ pkgsrc/ham/gnuradio-wavelet/Makefile Thu Apr 29 23:30:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/04/29 23:30:15 thor Exp $
PKGNAME= gnuradio-wavelet-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Wavelet transform of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Index: pkgsrc/ham/gnuradio-zeromq/Makefile
diff -u pkgsrc/ham/gnuradio-zeromq/Makefile:1.28 pkgsrc/ham/gnuradio-zeromq/Makefile:1.29
--- pkgsrc/ham/gnuradio-zeromq/Makefile:1.28 Wed Apr 21 13:24:52 2021
+++ pkgsrc/ham/gnuradio-zeromq/Makefile Thu Apr 29 23:30:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2021/04/21 13:24:52 adam Exp $
+# $NetBSD: Makefile,v 1.29 2021/04/29 23:30:15 thor Exp $
PKGNAME= gnuradio-zeromq-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= All of the zeromq blocks, utilities, and examples
# zmq.hpp: No such file or directory
Index: pkgsrc/ham/hackrf/Makefile
diff -u pkgsrc/ham/hackrf/Makefile:1.10 pkgsrc/ham/hackrf/Makefile:1.11
--- pkgsrc/ham/hackrf/Makefile:1.10 Mon Apr 5 12:49:22 2021
+++ pkgsrc/ham/hackrf/Makefile Thu Apr 29 23:30:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/04/05 12:49:22 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/29 23:30:15 thor Exp $
DISTNAME= hackrf-2021.03.1
CATEGORIES= ham
@@ -40,5 +40,5 @@ post-install:
.include "../../lang/python/application.mk"
.include "../../devel/libusb1/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/fftw/Makefile
diff -u pkgsrc/math/fftw/Makefile:1.61 pkgsrc/math/fftw/Makefile:1.62
--- pkgsrc/math/fftw/Makefile:1.61 Mon Aug 31 18:10:11 2020
+++ pkgsrc/math/fftw/Makefile Thu Apr 29 23:30:15 2021
@@ -1,14 +1,69 @@
-# $NetBSD: Makefile,v 1.61 2020/08/31 18:10:11 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2021/04/29 23:30:15 thor Exp $
-.include "Makefile.common"
-
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Collection of fast C routines to compute DFTs
+DISTNAME= fftw-3.3.9
+CATEGORIES= math
+MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/
+MASTER_SITES+= http://www.fftw.org/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.fftw.org/
+LICENSE= gnu-gpl-v2
+
+SUPERSEDES= fftwf
+CONFLICTS+= fftwf-[0-9]*
+
+USE_LANGUAGES= c
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-shared
+TEST_TARGET= check
+
+.include "../../mk/bsd.prefs.mk"
+
PKGCONFIG_OVERRIDE+= fftw.pc.in
INFO_FILES= yes
+# The standard precision is double. We always build at least
+# single in addition. Others enabled by options.
+FFTW_PRECISION= double float
.include "options.mk"
+# Test will only use the default build.
+.if defined(PKGSRC_RUN_TEST) && !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
+USE_TOOLS+= perl
+.endif
+
+PLIST_VARS+= pthreads
+PTHREAD_OPTS= native
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "native"
+CONFIGURE_ARGS+= --enable-threads
+PLIST.pthreads= yes
+.endif
+
+CONFIGURE_SCRIPT= ./configure
+.for p in ${FFTW_PRECISION}
+CONFIGURE_DIRS+= build/${p}
+MAKE_DIRS+= build/${p}
+.endfor
+
+pre-configure:
+.for d in ${CONFIGURE_DIRS}
+ mkdir -p ${WRKSRC:Q}/${d}
+.if ${d} == "build/quad-precision"
+ printf '#!/bin/sh\nexec ../../configure "$$@" --enable-${d:S,build/,,} --disable-mpi\n' \
+ > ${WRKSRC:Q}/${d}/configure
+.else
+ printf '#!/bin/sh\nexec ../../configure "$$@" --enable-${d:S,build/,,}\n' \
+ > ${WRKSRC:Q}/${d}/configure
+.endif
+ chmod +x ${WRKSRC:Q}/${d}/configure
+.endfor
+
.include "../../mk/bsd.pkg.mk"
+
Index: pkgsrc/math/fftw/PLIST
diff -u pkgsrc/math/fftw/PLIST:1.13 pkgsrc/math/fftw/PLIST:1.14
--- pkgsrc/math/fftw/PLIST:1.13 Thu Nov 23 20:24:13 2017
+++ pkgsrc/math/fftw/PLIST Thu Apr 29 23:30:15 2021
@@ -1,16 +1,47 @@
-@comment $NetBSD: PLIST,v 1.13 2017/11/23 20:24:13 wiz Exp $
-bin/fftw-wisdom
+@comment $NetBSD: PLIST,v 1.14 2021/04/29 23:30:15 thor Exp $
bin/fftw-wisdom-to-conf
+bin/fftw-wisdom
+bin/fftwf-wisdom
+${PLIST.long}bin/fftwl-wisdom
+${PLIST.quad}bin/fftwq-wisdom
include/fftw3.f
include/fftw3.f03
include/fftw3.h
+${PLIST.mpi}include/fftw3-mpi.h
include/fftw3l.f03
include/fftw3q.f03
info/fftw3.info
lib/cmake/fftw3/FFTW3Config.cmake
lib/cmake/fftw3/FFTW3ConfigVersion.cmake
+lib/cmake/fftw3/FFTW3fConfig.cmake
+lib/cmake/fftw3/FFTW3fConfigVersion.cmake
+${PLIST.long}lib/cmake/fftw3/FFTW3lConfig.cmake
+${PLIST.long}lib/cmake/fftw3/FFTW3lConfigVersion.cmake
+${PLIST.quad}lib/cmake/fftw3/FFTW3qConfig.cmake
+${PLIST.quad}lib/cmake/fftw3/FFTW3qConfigVersion.cmake
lib/libfftw3.la
+lib/libfftw3f.la
+${PLIST.long}lib/libfftw3l.la
+${PLIST.quad}lib/libfftw3q.la
${PLIST.pthreads}lib/libfftw3_threads.la
+${PLIST.pthreads}lib/libfftw3f_threads.la
+${PLIST.pthreads}${PLIST.long}lib/libfftw3l_threads.la
+${PLIST.pthreads}${PLIST.quad}lib/libfftw3q_threads.la
+${PLIST.omp}lib/libfftw3_omp.la
+${PLIST.omp}lib/libfftw3f_omp.la
+${PLIST.omp}${PLIST.long}lib/libfftw3l_omp.la
+${PLIST.omp}${PLIST.quad}lib/libfftw3q_omp.la
+${PLIST.mpi}lib/libfftw3_mpi.la
+${PLIST.mpi}lib/libfftw3f_mpi.la
+${PLIST.mpi}${PLIST.long}lib/libfftw3l_mpi.la
+${PLIST.mpi}include/fftw3l-mpi.f03
+${PLIST.mpi}include/fftw3-mpi.f03
lib/pkgconfig/fftw3.pc
+lib/pkgconfig/fftw3f.pc
+${PLIST.long}lib/pkgconfig/fftw3l.pc
+${PLIST.quad}lib/pkgconfig/fftw3q.pc
man/man1/fftw-wisdom-to-conf.1
man/man1/fftw-wisdom.1
+man/man1/fftwf-wisdom.1
+${PLIST.long}man/man1/fftwl-wisdom.1
+${PLIST.quad}man/man1/fftwq-wisdom.1
Index: pkgsrc/math/fftw/buildlink3.mk
diff -u pkgsrc/math/fftw/buildlink3.mk:1.8 pkgsrc/math/fftw/buildlink3.mk:1.9
--- pkgsrc/math/fftw/buildlink3.mk:1.8 Fri Mar 20 19:24:56 2009
+++ pkgsrc/math/fftw/buildlink3.mk Thu Apr 29 23:30:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2021/04/29 23:30:15 thor Exp $
BUILDLINK_TREE+= fftw
@@ -8,6 +8,13 @@ FFTW_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.fftw+= fftw>=3.0
BUILDLINK_ABI_DEPENDS.fftw+= fftw>=3.1nb1
BUILDLINK_PKGSRCDIR.fftw?= ../../math/fftw
+
+pkgbase := fftw
+.include "../../mk/pkg-build-options.mk"
+.if ${PKG_BUILD_OPTIONS.fftw:Mmpi}
+.include "../../mk/mpi.buildlink3.mk"
+.endif
+
.endif # FFTW_BUILDLINK3_MK
BUILDLINK_TREE+= -fftw
Index: pkgsrc/math/fftw/options.mk
diff -u pkgsrc/math/fftw/options.mk:1.3 pkgsrc/math/fftw/options.mk:1.4
--- pkgsrc/math/fftw/options.mk:1.3 Wed May 30 06:45:58 2018
+++ pkgsrc/math/fftw/options.mk Thu Apr 29 23:30:15 2021
@@ -1,7 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2018/05/30 06:45:58 adam Exp $
+# $NetBSD: options.mk,v 1.4 2021/04/29 23:30:15 thor Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.fftw
-PKG_SUPPORTED_OPTIONS= fftw-fortran
+# fftw (double) and fftwf (single) are always built, you can add
+# fftwl (long) and fftwq (quad).
+PKG_SUPPORTED_OPTIONS= fftw-fortran openmp mpi fftw-long fftw-quad
# Enable fortran support by default on platforms supported by lang/g95.
.if (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \
!empty(MACHINE_ARCH:Mia64) || !empty(MACHINE_ARCH:Mpowerpc*) || \
@@ -18,3 +20,28 @@ USE_LANGUAGES+= fortran77
.else
CONFIGURE_ARGS+= --disable-fortran
.endif
+
+PLIST_VARS+= omp
+.if !empty(PKG_OPTIONS:Mopenmp)
+PLIST.omp= yes
+CONFIGURE_ARGS+= --enable-openmp
+.endif
+
+PLIST_VARS+= mpi
+.if !empty(PKG_OPTIONS:Mmpi)
+PLIST.mpi= yes
+CONFIGURE_ARGS+= --enable-mpi
+.include "../../mk/mpi.buildlink3.mk"
+.endif
+
+PLIST_VARS+= long quad
+
+.if !empty(PKG_OPTIONS:Mfftw-long)
+FFTW_PRECISION+= long-double
+PLIST.long= yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mfftw-quad)
+FFTW_PRECISION+= quad-precision
+PLIST.quad= yes
+.endif
Index: pkgsrc/math/octave/Makefile
diff -u pkgsrc/math/octave/Makefile:1.217 pkgsrc/math/octave/Makefile:1.218
--- pkgsrc/math/octave/Makefile:1.217 Wed Apr 21 13:25:00 2021
+++ pkgsrc/math/octave/Makefile Thu Apr 29 23:30:16 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.217 2021/04/21 13:25:00 adam Exp $
+# $NetBSD: Makefile,v 1.218 2021/04/29 23:30:16 thor Exp $
DISTNAME= octave-5.2.0
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=octave/}
EXTRACT_SUFX= .tar.xz
@@ -108,7 +108,6 @@ post-install:
.include "../../math/arpack-ng/buildlink3.mk"
.include "../../mk/blas.buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../x11/fltk13/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index