diff options
73 files changed, 180 insertions, 147 deletions
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index ca6ff18965d0..481743332e5e 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -6,7 +6,7 @@ PORTNAME= boinc-astropulse PORTVERSION= 5.06 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= astropulse-svn-868 diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile index 952568749d8a..2e00f932ae33 100644 --- a/astro/boinc-setiathome-enhanced/Makefile +++ b/astro/boinc-setiathome-enhanced/Makefile @@ -6,7 +6,7 @@ PORTNAME= boinc-setiathome-enhanced PORTVERSION= 6.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= setiathome-svn-1008 diff --git a/audio/aacplusenc/Makefile b/audio/aacplusenc/Makefile index 78b9de8d10ec..1877af4166d3 100644 --- a/audio/aacplusenc/Makefile +++ b/audio/aacplusenc/Makefile @@ -7,6 +7,7 @@ PORTNAME= aacplusenc PORTVERSION= 0.17.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://teknoraver.net/software/mp4tools/ @@ -25,8 +26,8 @@ PLIST_FILES= bin/aacplusenc .if defined(WITHOUT_FFTW3) MAKE_ARGS+= NOFFTW3=1 .else -LIB_DEPENDS+= fftw3f.5:${PORTSDIR}/math/fftw3-float \ - fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= fftw3f:${PORTSDIR}/math/fftw3-float \ + fftw3:${PORTSDIR}/math/fftw3 CFLAGS+= -I${LOCALBASE}/include .endif diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index 383fb00952eb..e9c2a323b81e 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -7,7 +7,7 @@ PORTNAME= ardour PORTVERSION= 2.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://freebsd.nsu.ru/distfiles/ \ diff --git a/audio/arss/Makefile b/audio/arss/Makefile index 51fb6b5bda77..d43a34f53974 100644 --- a/audio/arss/Makefile +++ b/audio/arss/Makefile @@ -7,6 +7,7 @@ PORTNAME= arss PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= beyert@cs.ucr.edu COMMENT= Additive Image Synthesizer (convert audio to images, images to audio) -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 WRKSRC= ${WRKDIR}/${DISTNAME}/src diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile index 7f480947780c..a4c670b1417a 100644 --- a/audio/aubio/Makefile +++ b/audio/aubio/Makefile @@ -7,7 +7,7 @@ PORTNAME= aubio PORTVERSION= 0.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://aubio.org/pub/ diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index 5085749ccb4f..3359534cd6ad 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -7,7 +7,7 @@ PORTNAME= denemo PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= GNU @@ -19,7 +19,7 @@ LIB_DEPENDS= aubio.3:${PORTSDIR}/audio/aubio \ fluidsynth.4:${PORTSDIR}/audio/fluidsynth \ jack.0:${PORTSDIR}/audio/jack \ guile.21:${PORTSDIR}/lang/guile \ - fftw3.5:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 RUN_DEPENDS= portaudio>=19:${PORTSDIR}/audio/portaudio2 OPTIONS+= LILYPOND "Install LilyPond (Printing)" off diff --git a/audio/extace/Makefile b/audio/extace/Makefile index bcd95fcf6fed..e21296b0e0d7 100644 --- a/audio/extace/Makefile +++ b/audio/extace/Makefile @@ -7,14 +7,14 @@ PORTNAME= extace PORTVERSION= 1.9.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/eXtace/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= An Audio Visualization plugin for the X Window System -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 USE_GNOME= esound gnomehack gnomehier gtk20 GNU_CONFIGURE= yes diff --git a/audio/fdmf/Makefile b/audio/fdmf/Makefile index 8c116c604a64..65837232f861 100644 --- a/audio/fdmf/Makefile +++ b/audio/fdmf/Makefile @@ -7,7 +7,7 @@ PORTNAME= fdmf DISTVERSION= 0.0.9s -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://w140.com/audio/ CENKES @@ -16,7 +16,7 @@ COMMENT= Find similar music by perceptual hashing LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm \ plot.4:${PORTSDIR}/graphics/plotutils \ - fftw3.5:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \ mpg123:${PORTSDIR}/audio/mpg123 \ ogg123:${PORTSDIR}/audio/vorbis-tools \ diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile index 4a56a28e191f..ae45a19e1ea0 100644 --- a/audio/fmit/Makefile +++ b/audio/fmit/Makefile @@ -7,6 +7,7 @@ PORTNAME= fmit PORTVERSION= 0.99.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://download.gna.org/fmit/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source @@ -18,7 +19,7 @@ LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \ - fftw3.5:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 BROKEN= does not configure diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile index efea49ade964..e154e6456860 100644 --- a/audio/gkrellmss2/Makefile +++ b/audio/gkrellmss2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gkrellmss PORTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellmss/ @@ -14,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A plugin for GKrellM with a VU meter showing left/right channel audio BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_XORG= x11 diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile index 35b7987db817..678fa9ca59fc 100644 --- a/audio/gstreamer-plugins-moodbar/Makefile +++ b/audio/gstreamer-plugins-moodbar/Makefile @@ -7,7 +7,7 @@ PORTNAME= gstreamer-plugins-moodbar PORTVERSION= 0.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://pwsp.net/~qbob/ \ http://redundancy.redundancy.org/mirror/ diff --git a/audio/jamin/Makefile b/audio/jamin/Makefile index 7e61cc3f3eb2..b38be852fbb0 100644 --- a/audio/jamin/Makefile +++ b/audio/jamin/Makefile @@ -7,7 +7,7 @@ PORTNAME= jamin PORTVERSION= 0.95.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile index 0409ddd80489..e8c5a4dca6df 100644 --- a/audio/last.fm/Makefile +++ b/audio/last.fm/Makefile @@ -7,7 +7,7 @@ PORTNAME= last.fm PORTVERSION= 1.4.2.58240 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio net MASTER_SITES= http://cdn.last.fm/client/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -19,7 +19,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash LIB_DEPENDS= gpod.7:${PORTSDIR}/audio/libgpod \ mad.2:${PORTSDIR}/audio/libmad \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ - fftw3f.5:${PORTSDIR}/math/fftw3-float + fftw3f:${PORTSDIR}/math/fftw3-float LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile index bbeec691d976..12a8a2b3a750 100644 --- a/audio/libaacplus/Makefile +++ b/audio/libaacplus/Makefile @@ -7,6 +7,7 @@ PORTNAME= libaacplus PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://tipok.org.ua/downloads/media/aac+/libaacplus/:site1\ http://217.20.164.161/~tipok/aacplus/:site1\ diff --git a/audio/libconvolve/Makefile b/audio/libconvolve/Makefile index 98f37ce6bec0..0575e3e30b71 100644 --- a/audio/libconvolve/Makefile +++ b/audio/libconvolve/Makefile @@ -7,7 +7,7 @@ PORTNAME= libconvolve PORTVERSION= 0.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/heaven/Audio%20Applications/Jack%20Related/jack_convolve/ EXTRACT_SUFX= .tgz @@ -18,7 +18,7 @@ COMMENT= Simple C library for partitioned convolution LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -LIB_DEPENDS= fftw3f.5:${PORTSDIR}/math/fftw3-float \ +LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ sndfile.1:${PORTSDIR}/audio/libsndfile diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile index 4647c47228f2..54a65c7ba893 100644 --- a/audio/liblastfm/Makefile +++ b/audio/liblastfm/Makefile @@ -7,7 +7,7 @@ PORTNAME= liblastfm PORTVERSION= 0.3.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= swills @@ -17,7 +17,7 @@ MAINTAINER= datahead4@gmail.com COMMENT= Collection of libraries to help integrate Last.fm services LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ - fftw3f.5:${PORTSDIR}/math/fftw3-float + fftw3f:${PORTSDIR}/math/fftw3-float USE_RUBY= yes USE_GMAKE= yes diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile index 3d939d6dfac3..d234a29c5bfe 100644 --- a/audio/libofa/Makefile +++ b/audio/libofa/Makefile @@ -7,14 +7,14 @@ PORTNAME= libofa PORTVERSION= 0.9.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE MAINTAINER= bsdkaffee@gmail.com COMMENT= The Open Fingerprint Architecture Library -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 \ +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ expat.6:${PORTSDIR}/textproc/expat2 \ curl.6:${PORTSDIR}/ftp/curl diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile index 9061cbc923bb..ac6099291e19 100644 --- a/audio/libsamplerate/Makefile +++ b/audio/libsamplerate/Makefile @@ -7,7 +7,7 @@ PORTNAME= libsamplerate PORTVERSION= 0.1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.mega-nerd.com/SRC/ @@ -18,7 +18,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile \ - fftw3.5:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 USE_GNOME= gnomehack pkgconfig USE_AUTOTOOLS= libtool diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index a292bf7601e0..12f61435f187 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -7,7 +7,7 @@ PORTNAME= lmms PORTVERSION= 0.4.6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= SF @@ -21,7 +21,7 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ sndfile.1:${PORTSDIR}/audio/libsndfile \ vorbis.4:${PORTSDIR}/audio/libvorbis \ - fftw3f.5:${PORTSDIR}/math/fftw3-float + fftw3f:${PORTSDIR}/math/fftw3-float RUN_DEPENDS:= ${BUILD_DEPENDS} \ ${LOCALBASE}/share/ladspa/rdf/caps.rdf:${PORTSDIR}/audio/caps-plugins \ ${LOCALBASE}/lib/ladspa/cmt.so:${PORTSDIR}/audio/cmt \ diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile index 3715edc3064c..43fe3dad3d26 100644 --- a/audio/mythplugin-mythmusic/Makefile +++ b/audio/mythplugin-mythmusic/Makefile @@ -7,7 +7,7 @@ PORTNAME= mythmusic PORTVERSION= 0.24.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ http://ftp.osuosl.org/pub/mythtv/old_releases/ \ diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index 92b4b64b52f0..8b2dde14cd6d 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -7,6 +7,7 @@ PORTNAME= ncmpcpp PORTVERSION= 0.5.8 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://unkart.ovh.org/ncmpcpp/ \ http://mirror.mcx2.org/ @@ -15,7 +16,7 @@ MAINTAINER= dhn@FreeBSD.org COMMENT= A ncurses mpd client, clone of ncmpc with some new features LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient \ - fftw3.5:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/audio/pure-audio/Makefile b/audio/pure-audio/Makefile index f37e812fa525..1807b9314e87 100644 --- a/audio/pure-audio/Makefile +++ b/audio/pure-audio/Makefile @@ -7,6 +7,7 @@ PORTNAME= pure-audio PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://pure-lang.googlecode.com/files/ diff --git a/audio/q-audio/Makefile b/audio/q-audio/Makefile index 281a5263842c..f6eb138c7af5 100644 --- a/audio/q-audio/Makefile +++ b/audio/q-audio/Makefile @@ -7,7 +7,7 @@ PORTNAME= audio PORTVERSION= 2.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= SF/q-lang/q-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= q- @@ -19,7 +19,7 @@ COMMENT= Q-Audio -- digital audio interface for the Q language LIB_DEPENDS= q.8:${PORTSDIR}/lang/q \ jack.0:${PORTSDIR}/audio/jack \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ - fftw3.5:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 BUILD_DEPENDS= ${LOCALBASE}/lib/portaudio2/libportaudio.so.2:${PORTSDIR}/audio/portaudio2 RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index b039c6ced9a8..40eea9f72fae 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -7,6 +7,7 @@ PORTNAME= rosegarden PORTVERSION= 11.06 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ @@ -20,8 +21,8 @@ BUILD_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \ RUN_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \ lilypond:${PORTSDIR}/print/lilypond LIB_DEPENDS+= lrdf.2:${PORTSDIR}/textproc/liblrdf \ - fftw3.5:${PORTSDIR}/math/fftw3 \ - fftw3f.5:${PORTSDIR}/math/fftw3-float \ + fftw3:${PORTSDIR}/math/fftw3 \ + fftw3f:${PORTSDIR}/math/fftw3-float \ asound.2:${PORTSDIR}/audio/alsa-lib \ lirc_client:${PORTSDIR}/comms/lirc diff --git a/audio/snd/Makefile b/audio/snd/Makefile index f9c3ba6a801a..c29e88275272 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -7,6 +7,7 @@ PORTNAME= snd PORTVERSION= 12.5 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \ http://mirror.mcx2.org/ @@ -49,7 +50,7 @@ CONFIGURE_ARGS+= --with-esd .endif .if !defined(WITHOUT_FFTW3) -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 .else CONFIGURE_ARGS+= --without-fftw .endif diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile index 4ac8098ce809..e1415dfaa8b7 100644 --- a/audio/swhplugins/Makefile +++ b/audio/swhplugins/Makefile @@ -6,7 +6,7 @@ PORTNAME= swhplugins PORTVERSION= 0.4.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://plugin.org.uk/releases/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= Steve Harris' huge Collection of LADSPA Plugins BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \ ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 -LIB_DEPENDS= fftw3f.5:${PORTSDIR}/math/fftw3-float +LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float # includes assembler code ONLY_FOR_ARCHS= i386 amd64 diff --git a/audio/waon/Makefile b/audio/waon/Makefile index db951714008f..9dd67e11b175 100644 --- a/audio/waon/Makefile +++ b/audio/waon/Makefile @@ -7,14 +7,14 @@ PORTNAME= waon PORTVERSION= 0.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= SF MAINTAINER= kichiki@users.sourceforge.net COMMENT= A Wave-to-Notes transcriber and some utility tools -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 \ +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ ao.4:${PORTSDIR}/audio/libao \ sndfile.1:${PORTSDIR}/audio/libsndfile \ samplerate.1:${PORTSDIR}/audio/libsamplerate diff --git a/audio/whysynth/Makefile b/audio/whysynth/Makefile index 307d6746099c..82bb05a33392 100644 --- a/audio/whysynth/Makefile +++ b/audio/whysynth/Makefile @@ -7,6 +7,7 @@ PORTNAME= whysynth PORTVERSION= 20100922 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://smbolton.com/whysynth/ @@ -18,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi \ LIB_DEPENDS= dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \ lo.7:${PORTSDIR}/audio/liblo \ jack.0:${PORTSDIR}/audio/jack \ - fftw3f.5:${PORTSDIR}/math/fftw3-float + fftw3f:${PORTSDIR}/math/fftw3-float LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index 3e03efbf0064..5ea1a239975c 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -329,7 +329,7 @@ PLIST_SUB+= VISUAL="@comment " .endif .if !defined(WITHOUT_VOCODER) -LIB_DEPENDS+= fftw3f.5:${PORTSDIR}/math/fftw3-float +LIB_DEPENDS+= fftw3f:${PORTSDIR}/math/fftw3-float LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate PLIST_SUB+= VOCODER="" .else diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile index ec05cf7ccc9b..ce846daa06c1 100644 --- a/audio/zynaddsubfx/Makefile +++ b/audio/zynaddsubfx/Makefile @@ -7,6 +7,7 @@ PORTNAME= zynaddsubfx PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF DISTNAME= ZynAddSubFX-${PORTVERSION} @@ -15,7 +16,7 @@ MAINTAINER= mva@FreeBSD.org COMMENT= A realtime software synthesizer LIB_DEPENDS= dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \ - fftw3.5:${PORTSDIR}/math/fftw3 \ + fftw3:${PORTSDIR}/math/fftw3 \ expat.6:${PORTSDIR}/textproc/expat2 BUILD_DEPENDS= ${LOCALBASE}/include/mxml.h:${PORTSDIR}/textproc/mxml diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index e61af00fa1da..a2ef66a6122f 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnuradio PORTVERSION= 3.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms astro hamradio MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gnuradio diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile index 00739dfc3d47..dbcbadd50035 100644 --- a/comms/linpsk/Makefile +++ b/comms/linpsk/Makefile @@ -7,7 +7,7 @@ PORTNAME= linpsk PORTVERSION= 0.8.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile index 6c1473eb3f3a..f65029c4ef91 100644 --- a/comms/wsjt/Makefile +++ b/comms/wsjt/Makefile @@ -7,7 +7,7 @@ PORTNAME= wsjt PORTVERSION= 7.04 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= db diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile index b9a382f83192..73ea579da3a1 100644 --- a/comms/wspr/Makefile +++ b/comms/wspr/Makefile @@ -7,7 +7,7 @@ PORTNAME= wspr PORTVERSION= 2.00 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms hamradio MASTER_SITES= http://www.physics.princeton.edu/pulsar/K1JT/ MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/databases/grass/Makefile b/databases/grass/Makefile index bd665b4fe0dc..4bde492639bf 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -7,7 +7,7 @@ PORTNAME= grass PORTVERSION= 6.4.0 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= databases geography MASTER_SITES= http://grass.itc.it/grass64/source/ \ @@ -38,7 +38,7 @@ RUN_DEPENDS= proj:${PORTSDIR}/graphics/proj \ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.6:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ - fftw3.5:${PORTSDIR}/math/fftw3 \ + fftw3:${PORTSDIR}/math/fftw3 \ freetype.9:${PORTSDIR}/print/freetype2 USE_GMAKE= yes diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 45ce20baa3d9..85b8008a08fc 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/ @@ -36,7 +36,7 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ freetype.9:${PORTSDIR}/print/freetype2 \ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - fftw3.5:${PORTSDIR}/math/fftw3 \ + fftw3:${PORTSDIR}/math/fftw3 \ dcmdata.3:${PORTSDIR}/devel/dcmtk \ okularcore.1:${PORTSDIR}/graphics/okular RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30 diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 45ce20baa3d9..85b8008a08fc 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/ @@ -36,7 +36,7 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ freetype.9:${PORTSDIR}/print/freetype2 \ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - fftw3.5:${PORTSDIR}/math/fftw3 \ + fftw3:${PORTSDIR}/math/fftw3 \ dcmdata.3:${PORTSDIR}/devel/dcmtk \ okularcore.1:${PORTSDIR}/graphics/okular RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30 diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile index 137d5ad70c4a..c287d23cb49b 100644 --- a/games/dangerdeep/Makefile +++ b/games/dangerdeep/Makefile @@ -7,7 +7,7 @@ PORTNAME= dangerdeep PORTVERSION= 0.3.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/danger_from_the_deep-src/${PORTVERSION} DIST_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Open source World War II German submarine simulation BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 \ +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ execinfo.1:${PORTSDIR}/devel/libexecinfo RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/maps/default.xml:${PORTSDIR}/games/dangerdeep-data diff --git a/games/quantumminigolf/Makefile b/games/quantumminigolf/Makefile index e38a168903b0..1782a07c6adc 100644 --- a/games/quantumminigolf/Makefile +++ b/games/quantumminigolf/Makefile @@ -7,6 +7,7 @@ PORTNAME= quantumminigolf PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}.src diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index d0c45aee3332..5cd24525318e 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= scorched3d PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}/ DISTNAME= Scorched3D-${SCORCH_VERSION}-src diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index c5bc8dbda22d..3525961a2126 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -7,6 +7,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.7.3-0 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \ http://image_magick.veidrodis.com/image_magick/ \ @@ -220,7 +221,7 @@ CONFIGURE_ARGS+= --without-lqr .if !defined(WITHOUT_IMAGEMAGICK_FFTW) CONFIGURE_ARGS+= --with-fftw -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 .else CONFIGURE_ARGS+= --without-fftw .endif diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile index ea1a891e61f3..78a949236f6f 100644 --- a/graphics/ale/Makefile +++ b/graphics/ale/Makefile @@ -8,7 +8,7 @@ PORTNAME= ale PORTVERSION= 0.8.11.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://auricle.dyndns.org/ALE/download/ @@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --with-colors=double --with-coords=double .if defined(WITHOUT_FFTW3) CONFIGURE_ARGS+= --without-fftw3 .else -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 .endif .if defined(WITHOUT_IMAGEMAGICK) diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index ca808577cc03..38f64887f1a8 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -6,6 +6,7 @@ PORTNAME= blender PORTVERSION= 2.59 +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -88,7 +89,7 @@ CMAKE_ARGS+= -DWITH_CODEC_FFMPEG:BOOL=ON .endif .if defined(WITH_FFTW3) -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 CMAKE_ARGS+= -DWITH_FFTW3:BOOL=ON .else CMAKE_ARGS+= -DWITH_FFTW3:BOOL=OFF diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 796e589919f0..a7d780896f23 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -7,6 +7,7 @@ PORTNAME= cimg PORTVERSION= 1.4.9 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME} \ diff --git a/graphics/gimp-focusblur-plugin/Makefile b/graphics/gimp-focusblur-plugin/Makefile index ae3a1f320e53..d884f1f19c60 100644 --- a/graphics/gimp-focusblur-plugin/Makefile +++ b/graphics/gimp-focusblur-plugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= focusblur PORTVERSION= 3.2.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://registry.gimp.org/files/ PKGNAMEPREFIX= gimp- @@ -15,7 +16,7 @@ PKGNAMESUFFIX= -plugin MAINTAINER= ports@FreeBSD.org COMMENT= Gimp realistic focus blur plugin -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 \ +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ gimp-2.0:${PORTSDIR}/graphics/gimp-app LICENSE= GPLv2 diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index fb1205362c4d..54a19fefaf5d 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmic PORTVERSION= 1.5.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/old @@ -22,7 +22,7 @@ LIB_DEPENDS= GraphicsMagick++.6:${PORTSDIR}/graphics/GraphicsMagick13 \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ Magick++.5:${PORTSDIR}/graphics/ImageMagick \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ - fftw3.5:${PORTSDIR}/math/fftw3 \ + fftw3:${PORTSDIR}/math/fftw3 \ gimp-2.0:${PORTSDIR}/graphics/gimp-app OPTIONS= BASH "Install programmable completions for Bash" off diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile index 4883c75f6205..a0487e71f509 100644 --- a/graphics/luminance/Makefile +++ b/graphics/luminance/Makefile @@ -7,7 +7,7 @@ PORTNAME= luminance DISTVERSION= 2.0.1-1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION:S/-1//}/ DISTNAME= ${PORTNAME}-v${DISTVERSION} @@ -22,7 +22,7 @@ LIB_DEPENDS= exiv2.10:${PORTSDIR}/graphics/exiv2 \ jpeg.11:${PORTSDIR}/graphics/jpeg \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ tiff.4:${PORTSDIR}/graphics/tiff \ - fftw3f.5:${PORTSDIR}/math/fftw3-float \ + fftw3f:${PORTSDIR}/math/fftw3-float \ gsl.16:${PORTSDIR}/math/gsl USE_QT_VER= 4 diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile index be76d741ba7f..3a8e416dc233 100644 --- a/graphics/pfstmo/Makefile +++ b/graphics/pfstmo/Makefile @@ -34,7 +34,7 @@ MAN1= pfstmo_pattanaik00.1 \ .include <bsd.port.pre.mk> .if defined(WITH_FFTW3F) -LIB_DEPENDS+= fftw3f.5:${PORTSDIR}/math/fftw3-float +LIB_DEPENDS+= fftw3f:${PORTSDIR}/math/fftw3-float .endif .include <bsd.port.post.mk> diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile index 928815070799..4bceac6585a4 100644 --- a/graphics/rawstudio/Makefile +++ b/graphics/rawstudio/Makefile @@ -7,6 +7,7 @@ PORTNAME= rawstudio PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://rawstudio.org/files/release/ diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile index b550d7170309..337fdfbb0ffc 100644 --- a/graphics/swftools/Makefile +++ b/graphics/swftools/Makefile @@ -8,7 +8,7 @@ PORTNAME= swftools PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.swftools.org/ \ http://www.c-s.li/ports/ @@ -19,7 +19,7 @@ COMMENT= SWF manipulation and generation utilities LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ jpeg.11:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ - fftw3.5:${PORTSDIR}/math/fftw3 \ + fftw3:${PORTSDIR}/math/fftw3 \ freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index b70dcd06b143..9aa8c3360d2f 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -11,7 +11,7 @@ PORTNAME= vigra PORTVERSION= 1.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 57e45df2de5c..5e57460fee94 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -7,7 +7,7 @@ PORTNAME= vips PORTVERSION= 7.26.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index e5251f01f65a..4f7583d5d698 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmorph PORTVERSION= 2006.08.17 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/20060817 DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g} MAINTAINER= ports@FreeBSD.org COMMENT= A digital image warping program -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g} diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units index 24d3656a2e90..4601c8a72cf9 100644 --- a/lang/fpc/Makefile.units +++ b/lang/fpc/Makefile.units @@ -68,7 +68,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd .if ${PKGNAMESUFFIX} == "-fftw" . if defined(WITH_FFTW) -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 . endif .endif diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 04b9d01f236c..65a98de00c0a 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -7,7 +7,7 @@ PORTNAME= asymptote PORTVERSION= 2.04 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ SF/${PORTNAME}/${PORTNAME}/old/${PORTVERSION} @@ -21,7 +21,7 @@ COMMENT= A powerful script-based vector graphics language LIB_DEPENDS+= gsl.16:${PORTSDIR}/math/gsl .endif .if defined(WITH_FFTW) -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 .endif BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ dvips:${PORTSDIR}/print/dvipsk-tetex \ diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile index c1885d028ca3..8131a2b797ef 100644 --- a/math/digitizer/Makefile +++ b/math/digitizer/Makefile @@ -7,7 +7,7 @@ PORTNAME= digitizer PORTVERSION= 4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= math graphics MASTER_SITES= SF/${PORTNAME}/Engauge%20Digitizer/${PORTNAME}-${PORTVERSION} DISTNAME= digit-src-${PORTVERSION:S/./_/} @@ -16,7 +16,7 @@ MAINTAINER= thierry@FreeBSD.org COMMENT= Engauge Digitizer - Digitizing software to convert graphs into numbers BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 WRKSRC= ${WRKDIR}/engauge diff --git a/math/fftw3-float/Makefile b/math/fftw3-float/Makefile index 635c48f48055..ad3329b43333 100644 --- a/math/fftw3-float/Makefile +++ b/math/fftw3-float/Makefile @@ -5,9 +5,7 @@ # $FreeBSD$ # $MCom: ports-experimental/math/fftw3-float/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $ -PORTREVISION= 2 - -COMMENT= Fast C routines (Single Precision) +COMMENT= Fast Discrete Fourier Transform (Single Precision C Routines) FFTW3_FLAVOR= float MASTERDIR= ${.CURDIR}/../../math/fftw3 diff --git a/math/fftw3-long/Makefile b/math/fftw3-long/Makefile index ab90ea52f28d..f8d676ff94f1 100644 --- a/math/fftw3-long/Makefile +++ b/math/fftw3-long/Makefile @@ -5,9 +5,7 @@ # $FreeBSD$ # $MCom: ports-experimental/math/fftw3-long/Makefile,v 1.1 2006/03/28 00:08:58 ahze Exp $ -PORTREVISION= 1 - -COMMENT= Fast C routines (Long Double Precision) +COMMENT= Fast Discrete Fourier Transform (Long Double Precision C Routines) FFTW3_FLAVOR= long MASTERDIR= ${.CURDIR}/../../math/fftw3 diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 1a2f79e8011c..e911ace117d5 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -6,8 +6,7 @@ # $MCom: ports-experimental/math/fftw3/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $ PORTNAME= fftw3 -PORTVERSION= 3.2.2 -PORTREVISION?= 1 +PORTVERSION= 3.3 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.fftw.org/pub/fftw/old/ @@ -26,19 +25,23 @@ USE_GNOME= gnomehack pkgconfig USE_PERL5_BUILD=yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-shared --enable-threads -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CONFIGURE_ARGS = --enable-openmp --enable-shared --enable-threads \ + --disable-fortran +CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" .if ${FFTW3_FLAVOR} == "default" MAN1= fftw-wisdom-to-conf.1 fftw-wisdom.1 INFO= fftw3 .else +#For non-default flavors, only build and install the flavor-dependent components, +#so that these flavors may coexist with the default flavor MAN1= fftw${FFTW3_SUFX}-wisdom.1 INSTALL_TARGET= install-pkgconfigDATA install-libLTLIBRARIES install-exec .endif -OPTIONS= OPTIMIZED_CFLAGS "Enable optimized CFLAGS" off +OPTIONS= G77_WRAPPERS "Alter Fortran wrappers for use with g77" off \ + OPTIMIZED_CFLAGS "Enable optimized CFLAGS" on .include <bsd.port.pre.mk> @@ -47,34 +50,27 @@ CFLAGS+= -O3 -ffast-math -fstrict-aliasing . if !defined(WITH_DEBUG) CFLAGS+= -fomit-frame-pointer . endif -. if empty(CC:Mclang) -CODELET_OPTIM += -fno-schedule-insns -fno-web -fno-loop-optimize \ - --param inline-unit-growth=1000 \ - --param large-function-growth=1000 -. endif . if ${ARCH} == "i386" CFLAGS+= -malign-double -CODELET_OPTIM += -O . endif -CONFIGURE_ENV += CODELET_OPTIM="${CODELET_OPTIM}" WITHOUT_NO_STRICT_ALIASING= yes -. if !empty(MACHINE_CPU:Msse2) && ${FFTW3_FLAVOR} == "default" -CONFIGURE_ARGS+=--enable-sse2 -. elif ${FFTW3_FLAVOR} == "float" -. if !empty(MACHINE_CPU:Msse) -CONFIGURE_ARGS+=--enable-sse -. elif !empty(ARCH:Mpowerpc*) -#users should set ALTIVEC_ARG to be empty if sysctl hw.altivec = 0 on the target machine -ALTIVEC_ARG?= --enable-altivec -CONFIGURE_ARGS+= ${ALTIVEC_ARG} -. endif -. endif .endif # end WITH_OPTIMIZED_CFLAGS -.if ${FFTW3_FLAVOR} == "float" +.if ${FFTW3_FLAVOR} == "default" +. if !empty(MACHINE_CPU:Msse2) +CONFIGURE_ARGS+=--enable-sse2 +. endif +.elif ${FFTW3_FLAVOR} == "float" FFTW3_SUFX= f FFTW3_PKGNAMESUFFIX= -float CONFIGURE_ARGS+=--enable-float +. if !empty(MACHINE_CPU:Msse) +CONFIGURE_ARGS+=--enable-sse +#Unfortunately, the user must add altivec to MACHINE_CPU when desired, +#because this is not currently done in bsd.cpu.mk +. elif !empty(ARCH:Mpowerpc*) && !empty(MACHINE_CPU:Maltivec) +CONFIGURE_ARGS+=--enable-altivec +. endif .elif ${FFTW3_FLAVOR} == "long" . if ${OSVERSION} < 800000 ONLY_FOR_ARCHS = i386 sparc64 @@ -83,6 +79,12 @@ LIB_DEPENDS+= ml.0:${PORTSDIR}/math/ldouble FFTW3_SUFX= l FFTW3_PKGNAMESUFFIX= -long CONFIGURE_ARGS+=--enable-long-double +.elif ${FFTW3_FLAVOR} == "quad" +FFTW3_SUFX= q +FFTW3_PKGNAMESUFFIX= -quad +CONFIGURE_ARGS+=--enable-quad-precision +ONLY_FOR_ARCHS = i386 amd64 +USE_GCC= 4.6+ .endif .if ${FFTW3_FLAVOR} == "default" @@ -102,30 +104,41 @@ post-patch: ${WRKSRC}/tools/* @${FIND} ${WRKSRC} -name \*.bak -type f -exec ${RM} -f {} \; .if ${FFTW3_FLAVOR} != "default" - @${REINPLACE_CMD} -e \ - 's|EXTRA_DIST = fftw-wisdom-to-conf.in||; \ - s|fftw-wisdom-to-conf.in||; \ - s|fftw-wisdom-to-conf: $(top_builddir)/config.status||; \ - s|bin_SCRIPTS = fftw-wisdom-to-conf||' \ + @${REINPLACE_CMD} -E -e \ + '/(DIST_COMMON|bin_SCRIPTS|BUILT_SOURCES|EXTRA_DIST) =/,\ + /[^\]$$/s/[^[:blank:]]*fftw-wisdom-to-conf[^[:blank:]]*//' \ ${WRKSRC}/tools/Makefile.in . if ${FFTW3_FLAVOR} == "long" && ${OSVERSION} < 800000 @${REINPLACE_CMD} -e 's|cosl sinl tanl||' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e \ - 's|@LIBS@|-lml @LIBS@|' + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@LIBS@|-L${LOCALBASE}/lib -lml &|' . endif .endif post-configure: - @echo "#define F77_FUNC(name,NAME) name ## _" >>${WRKSRC}/config.h - @echo "#define F77_FUNC_(name,NAME) name ## _" >>${WRKSRC}/config.h - @echo "#define F77_FUNC_EQUIV 1" >>${WRKSRC}/config.h +#After issuing --disable-fortran in order to avoid using a Fortran compiler +#during configuration, edit config.h to provide Fortran wrappers appropriate for +#gfortran, with ac_cv_f77_mangling="lower case, underscore, no extra underscore" + @${REINPLACE_CMD} -e '/DISABLE_FORTRAN/d' ${WRKSRC}/config.h + @${ECHO_CMD} "#define F77_FUNC(name,NAME) name ## _" >> ${WRKSRC}/config.h + @${ECHO_CMD} "#define F77_FUNC_(name,NAME) name ## _" >> ${WRKSRC}/config.h + @${ECHO_CMD} "#define F77_FUNC_EQUIV 1" >> ${WRKSRC}/config.h +.if defined(WITH_G77_WRAPPERS) + @${ECHO_CMD} "#define WITH_G77_WRAPPERS 1" >> ${WRKSRC}/config.h +.endif .if ${FFTW3_FLAVOR} != "default" post-install: @${INSTALL_MAN} ${WRKSRC}/tools/fftw${FFTW3_SUFX}-wisdom.1 ${PREFIX}/man/man1 .endif -check regression-test test: build - @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} smallcheck +regression-test test: smallcheck + +.for t in bigcheck check exhaustive-check paranoid-check smallcheck +${t}: build + @cd ${WRKSRC}/tests; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ + ${MAKE_ARGS} ${t} + +.endfor .include <bsd.port.post.mk> diff --git a/math/fftw3/distinfo b/math/fftw3/distinfo index def3668d1380..c8b925f8fb69 100644 --- a/math/fftw3/distinfo +++ b/math/fftw3/distinfo @@ -1,2 +1,2 @@ -SHA256 (fftw-3.2.2.tar.gz) = 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f -SIZE (fftw-3.2.2.tar.gz) = 3495117 +SHA256 (fftw-3.3.tar.gz) = d25a98521a13933e678ce19319d03ddc915826764e1e59abd12d172c239b6aea +SIZE (fftw-3.3.tar.gz) = 3965713 diff --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist index 4b7967b27056..06ac6afadfa1 100644 --- a/math/fftw3/pkg-plist +++ b/math/fftw3/pkg-plist @@ -1,13 +1,18 @@ bin/fftw%%FFTW3_SUFX%%-wisdom %%DEF%%bin/fftw-wisdom-to-conf %%DEF%%include/fftw3.f +%%DEF%%include/fftw3.f03 %%DEF%%include/fftw3.h lib/libfftw3%%FFTW3_SUFX%%.a lib/libfftw3%%FFTW3_SUFX%%.la lib/libfftw3%%FFTW3_SUFX%%.so -lib/libfftw3%%FFTW3_SUFX%%.so.5 +lib/libfftw3%%FFTW3_SUFX%%.so.6 +lib/libfftw3%%FFTW3_SUFX%%_omp.a +lib/libfftw3%%FFTW3_SUFX%%_omp.la +lib/libfftw3%%FFTW3_SUFX%%_omp.so +lib/libfftw3%%FFTW3_SUFX%%_omp.so.6 lib/libfftw3%%FFTW3_SUFX%%_threads.a lib/libfftw3%%FFTW3_SUFX%%_threads.la lib/libfftw3%%FFTW3_SUFX%%_threads.so -lib/libfftw3%%FFTW3_SUFX%%_threads.so.5 +lib/libfftw3%%FFTW3_SUFX%%_threads.so.6 libdata/pkgconfig/fftw3%%FFTW3_SUFX%%.pc diff --git a/math/freemat/Makefile b/math/freemat/Makefile index 1fd0a783a65f..2a61f0605ed4 100644 --- a/math/freemat/Makefile +++ b/math/freemat/Makefile @@ -8,7 +8,7 @@ PORTNAME= FreeMat PORTVERSION= 4.0 DISTVERSIONSUFFIX= -Source -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math science MASTER_SITES= SF MASTER_SITE_SUBDIR= freemat/FreeMat4 @@ -46,8 +46,8 @@ SLAVEDIRS= math/freemat-mpi DATADIR+= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} .if !defined(WITHOUT_FFTW) -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 \ - fftw3f.5:${PORTSDIR}/math/fftw3-float +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 \ + fftw3f:${PORTSDIR}/math/fftw3-float .endif .if !defined(WITHOUT_ARPACK) diff --git a/math/gretl/Makefile b/math/gretl/Makefile index d75efd05662c..9336eb5c9c20 100644 --- a/math/gretl/Makefile +++ b/math/gretl/Makefile @@ -8,14 +8,14 @@ PORTNAME= gretl PORTVERSION= 1.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math finance MASTER_SITES= SF MAINTAINER= bf@FreeBSD.org COMMENT= GNU Regression, Econometrics and Time-series Library -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 2ea79f03f9c7..d265ba4783e6 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= LabPlot PORTVERSION= 1.6.0.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= math kde MASTER_SITES= SF @@ -18,7 +18,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ jasper.4:${PORTSDIR}/graphics/jasper \ MagickWand.5:${PORTSDIR}/graphics/ImageMagick \ gsl.16:${PORTSDIR}/math/gsl \ - fftw3.5:${PORTSDIR}/math/fftw3 \ + fftw3:${PORTSDIR}/math/fftw3 \ qwtplot3d.0:${PORTSDIR}/math/qwtplot3d \ origin.0:${PORTSDIR}/math/liborigin diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile index 05677b52ad25..e25a7cfe5e67 100644 --- a/math/octave-devel/Makefile +++ b/math/octave-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= octave PORTVERSION= 3.3.50 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/\ @@ -24,7 +24,7 @@ BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot \ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ gsed:${PORTSDIR}/textproc/gsed LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ - glpk.30:${PORTSDIR}/math/glpk \ + glpk.32:${PORTSDIR}/math/glpk \ hdf5:${PORTSDIR}/science/hdf5 \ umfpack.1:${PORTSDIR}/math/suitesparse \ qhull.5:${PORTSDIR}/math/qhull5 diff --git a/math/octave/Makefile b/math/octave/Makefile index 836db212414b..50c46539d74c 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -7,7 +7,7 @@ PORTNAME= octave PORTVERSION= 3.4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= ftp://ftp.gnu.org/gnu/octave/ \ ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ @@ -35,7 +35,7 @@ LIB_DEPENDS= GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \ qhull.5:${PORTSDIR}/math/qhull5 \ qrupdate:${PORTSDIR}/math/qrupdate \ umfpack.1:${PORTSDIR}/math/suitesparse \ - glpk.30:${PORTSDIR}/math/glpk + glpk.32:${PORTSDIR}/math/glpk USE_BZIP2= yes USE_PERL5_BUILD=yes diff --git a/math/ruby-fftw3/Makefile b/math/ruby-fftw3/Makefile index acc4939cf356..038ab1944246 100644 --- a/math/ruby-fftw3/Makefile +++ b/math/ruby-fftw3/Makefile @@ -7,7 +7,7 @@ PORTNAME= fftw3 PORTVERSION= 0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math ruby MASTER_SITES= http://ruby.gfd-dennou.org/products/ruby-fftw3/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -18,7 +18,7 @@ MAINTAINER= murashin@gfd-dennou.org COMMENT= A Ruby interface to the FFTW ver.3 BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 8f0f1c808c38..3b03dcbc038c 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -7,6 +7,7 @@ PORTNAME= scilab PORTVERSION= 5.3.3 +PORTREVISION= 1 CATEGORIES= math cad parallel java MASTER_SITES= http://www.scilab.org/download/${PORTVERSION}/:scilab \ http://www.predatorlabs.net/dl/:jgraphx \ @@ -146,7 +147,7 @@ ALL_TARGET= all doc .if defined(WITHOUT_FFTW) CONFIGURE_ARGS+= --without-fftw .else -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 .endif .if defined(WITHOUT_PVM) diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index fedf4cad9c58..6a6e857dae7c 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION} .if defined(BUILD_PYTHON_MODULE) @@ -105,8 +105,8 @@ BROKEN= Does not build with ancient binutils WITH_FFTW3= yes .endif .if defined(WITH_FFTW3) -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 \ - fftw3f.5:${PORTSDIR}/math/fftw3-float +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 \ + fftw3f:${PORTSDIR}/math/fftw3-float CONFIGURE_ARGS+=--with-fftw=${LOCALBASE} .endif diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index 082a3db57a72..b8c8c6fcb601 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -7,6 +7,7 @@ PORTNAME= gromacs PORTVERSION= 4.5.5 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ @@ -48,9 +49,9 @@ IGNORE= cannot build with MPICH and OpenMPI support. Run 'make config' again an .if !defined(WITHOUT_FFTW3) CONFIGURE_ARGS+= --with-fft=fftw3 . if defined(WITH_FLOAT) -LIB_DEPENDS+= fftw3f.5:${PORTSDIR}/math/fftw3-float +LIB_DEPENDS+= fftw3f:${PORTSDIR}/math/fftw3-float . else -LIB_DEPENDS+= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS+= fftw3:${PORTSDIR}/math/fftw3 . endif .else . if defined(WITH_FFTW2) diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile index 1e06debdb169..78129ea21c7b 100644 --- a/science/gwyddion/Makefile +++ b/science/gwyddion/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwyddion PORTVERSION= 2.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science graphics MASTER_SITES= SF @@ -18,7 +18,7 @@ MAINTAINER= yeti@gwyddion.net COMMENT= A gtk2 based SPM data visualization and analysis tool LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \ - fftw3.5:${PORTSDIR}/math/fftw3 + fftw3:${PORTSDIR}/math/fftw3 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile index 32894da17ba1..06ed638f07cb 100644 --- a/science/py-scipy/Makefile +++ b/science/py-scipy/Makefile @@ -7,7 +7,7 @@ PORTNAME= scipy PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science python MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ COMMENT= Scientific tools for Python BUILD_DEPENDS+= ${PYNUMPY} \ ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft -LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 LATEST_LINK= py-${PORTNAME} OPTIONSFILE= ${PORT_DBDIR}/py-numpy/options |