Update to upstream version 0.4.2, port cleanup

- Simplify fft handling:
  Only allow single precision fftw3 (recommended by upstream)
  or built-in ooula (fallback)
- Use OPTION helpers
- Add LICENSE_FILE
- Pet portlint

PR:		203239
Submitted by:	tkato432@yahoo.com
Reviewed by:	riggs

4 files changed, 32 insertions, 64 deletions

diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index 07a8e16a6491..b44f51860fe0 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aubio
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	audio
 MASTER_SITES=	http://aubio.org/pub/
 
@@ -10,74 +10,43 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for audio labelling
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	txt2man:${PORTSDIR}/textproc/txt2man
 
 USES=		pkgconfig tar:bzip2 waf
-USE_LDCONFIG=	yes
-
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	COMPLEX DOXYGEN FFMPEG JACK SAMPLERATE SNDFILE
-OPTIONS_DEFAULT=	FFTW JACK SAMPLERATE SNDFILE SINGLE
+OPTIONS_DEFINE=		COMPLEX DOXYGEN FFMPEG FFTW JACK SAMPLERATE SNDFILE
+OPTIONS_DEFAULT=	JACK SAMPLERATE SNDFILE FFTW
+OPTIONS_SUB=		yes
 
-COMPLEX_DESC=	Compile with C99 complex.h
+COMPLEX_DESC=		Compile with C99 complex.h
 COMPLEX_CONFIGURE_ENABLE=	complex
-
-DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
 DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-
-FFMPEG_CONFIGURE_ENABLE=	avcodec
+DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
 FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-
-JACK_CONFIGURE_ENABLE=	jack
+FFMPEG_CONFIGURE_ENABLE=	avcodec
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-
-SAMPLERATE_CONFIGURE_ENABLE=	samplerate
+JACK_CONFIGURE_ENABLE=	jack
 SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-
-SNDFILE_CONFIGURE_ENABLE=	sndfile
+SAMPLERATE_CONFIGURE_ENABLE=	samplerate
+FFTW_DESC=		Use single precision FFTW3 instead of built-in OOURA
+FFTW_CONFIGURE_ENABLE=	fftw3f
+FFTW_BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
+FFTW_LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
 SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-
-OPTIONS_SINGLE=	FFT PRECISION
-OPTIONS_SINGLE_FFT=	FFTW OOURA
-OPTIONS_SINGLE_PRECISION=	DOUBLE SINGLE
-
-FFT_DESC=	FFT implementation
-FFTW_DESC=	FFTW3/FFTW3F (depending on precision)
-OOURA_DESC=	Ooura (last resort)
-
-PRECISION_DESC=	Precision
-DOUBLE_DESC=	Double precision mode
-SINGLE_DESC=	Single precision mode
-DOUBLE_CONFIGURE_ENABLE=	double
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOXYGEN}
-PLIST_SUB+=	DOXYGEN=""
-.else
-PLIST_SUB+=	DOXYGEN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFFTW}
-.  if ${PORT_OPTIONS:MDOUBLE}
-LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3
-.  else
-LIB_DEPENDS+=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
-.  endif
-.endif
+SNDFILE_CONFIGURE_ENABLE=	sndfile
 
 post-patch:
-	@${REINPLACE_CMD} -e '/pkgconfig/s,$${LIBDIR},&data,' \
-		${WRKSRC}/waflib/TaskGen.py
+	@${REINPLACE_CMD} -e \
+		'/pkgconfig/s|$${LIBDIR}|&data|' ${WRKSRC}/waflib/TaskGen.py
 
-.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG) || defined(INSTALL_STRIPPED)
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
-.  for b in mfcc notes onset pitch quiet track
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${b}
-.  endfor
-.endif
+.for b in mfcc notes onset pitch quiet track
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aubio${b}
+.endfor
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaubio.so
 
 .include <bsd.port.mk>
diff --git a/audio/aubio/distinfo b/audio/aubio/distinfo
index 6e2676fc7472..542eabedf58f 100644
--- a/audio/aubio/distinfo
+++ b/audio/aubio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aubio-0.4.1.tar.bz2) = 25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695
-SIZE (aubio-0.4.1.tar.bz2) = 288136
+SHA256 (aubio-0.4.2.tar.bz2) = 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8f1f
+SIZE (aubio-0.4.2.tar.bz2) = 304216
diff --git a/audio/aubio/files/patch-wscript b/audio/aubio/files/patch-wscript
index dcf4d5d2e0f1..a19c1f68ff83 100644
--- a/audio/aubio/files/patch-wscript
+++ b/audio/aubio/files/patch-wscript
@@ -1,16 +1,16 @@
---- wscript.orig	2014-03-12 15:19:28 UTC
+--- wscript.orig	2015-08-01 10:24:35 UTC
 +++ wscript
-@@ -72,6 +72,9 @@ def options(ctx):
-     add_option_enable_disable(ctx, 'double', default = False,
-             help_str = 'compile in double precision mode',
-             help_disable_str = 'compile in single precision mode (default)')
+@@ -75,6 +75,9 @@ def options(ctx):
+     add_option_enable_disable(ctx, 'fat', default = False,
+             help_str = 'build fat binaries (darwin only)',
+             help_disable_str = 'do not build fat binaries (default)')
 +    ctx.add_option('--disable-doxygen', action = 'store_true',
 +            dest = 'disable_doxygen',
 +            help = 'disable doxygen even if found')
  
      ctx.add_option('--with-target-platform', type='string',
              help='set target platform for cross-compilation', dest='target_platform')
-@@ -254,6 +257,9 @@ def configure(ctx):
+@@ -258,6 +261,9 @@ def configure(ctx):
      # check if doxygen is installed, optional
      try:
        ctx.find_program('doxygen', var='DOXYGEN')
@@ -20,7 +20,7 @@
      except ctx.errors.ConfigurationError:
        ctx.to_log('doxygen was not found (ignoring)')
  
-@@ -291,11 +297,11 @@ def build(bld):
+@@ -295,11 +301,11 @@ def build(bld):
          bld( source = bld.path.ant_glob('doc/*.txt') )
  
      # build documentation from source files using doxygen
diff --git a/audio/aubio/pkg-plist b/audio/aubio/pkg-plist
index 3803509439f4..36948d9a938e 100644
--- a/audio/aubio/pkg-plist
+++ b/audio/aubio/pkg-plist
@@ -51,10 +51,9 @@ include/aubio/utils/hist.h
 include/aubio/utils/parameter.h
 include/aubio/utils/scale.h
 include/aubio/vecutils.h
-lib/libaubio.a
 lib/libaubio.so
 lib/libaubio.so.4
-lib/libaubio.so.4.1.1
+lib/libaubio.so.4.2.2
 libdata/pkgconfig/aubio.pc
 man/man1/aubiocut.1.gz
 man/man1/aubiomfcc.1.gz