- Correct dependencies: math/fftw3 is only needed for build (as provider of

  `fftw3.h' header file); actual linking is against math/fftw3-float)
- Cleanup Makefile: utilize CPPFLAGS, drop ABI versions in LIB_DEPENDS, wrap
  overly long lines, standardize header
- Bump port revision due to updated dependencies
- Reformat port description and sort pkg-plist while here

3 files changed, 53 insertions, 54 deletions

diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index 82d8b2eaff76..b10a183b9f33 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -1,32 +1,32 @@
 # New ports collection makefile for:	aubio
-# Date created:		2008-07-21
-# Whom:			Edward Tomasz Napierala <trasz@FreeBSD.org>
+# Date created:				2008-07-21
+# Whom:				Edward Tomasz Napierala <trasz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aubio
 PORTVERSION=	0.3.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://aubio.org/pub/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for audio labelling
 
-LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		jack.0:${PORTSDIR}/audio/jack \
-		fftw3:${PORTSDIR}/math/fftw3 \
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
+		sndfile:${PORTSDIR}/audio/libsndfile \
+		jack:${PORTSDIR}/audio/jack \
 		fftw3f:${PORTSDIR}/math/fftw3-float \
-		lash.2:${PORTSDIR}/audio/lash
+		lash:${PORTSDIR}/audio/lash
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
-# --disable-complex, because it won't compile otherwise
-# due to missing carg(3) et al.
-CONFIGURE_ARGS=	"CFLAGS=${CFLAGS} -I${LOCALBASE}/include" --disable-complex
+CPPFLAGS+=	-I${LOCALBASE}/include
+# --disable-complex: does not compile due to missing carg(3) et al.
+CONFIGURE_ARGS=	--disable-complex
 
 .include <bsd.port.mk>
diff --git a/audio/aubio/pkg-descr b/audio/aubio/pkg-descr
index 961fadf211e4..885cc5a90aa7 100644
--- a/audio/aubio/pkg-descr
+++ b/audio/aubio/pkg-descr
@@ -1,12 +1,11 @@
-aubio is a library for audio labelling.  Its features include
-segmenting a sound file before each of its attacks, performing pitch
-detection, tapping the beat and producing midi streams from live
-audio.  The name aubio comes from 'audio' with a typo: several
-transcription errors are likely to be found in the results too.
+Aubio is a library for audio labelling.  Its features include segmenting a
+sound file before each of its attacks, performing pitch detection, tapping
+the beat, and producing midi streams from live audio.  The name aubio comes
+from 'audio' with a typo: several transcription errors are likely to be
+found in the results too.
 
-The aim of this project is to provide these automatic labelling
-features to other audio softwares.  Functions can be used offline
-in sound editors and software samplers, or online in audio effects
-and virtual instruments.
+The aim of this project is to provide these automatic labelling features to
+other audio software.  Functions can be used offline in sound editors and
+software samplers, or online in audio effects and virtual instruments.
 
-WWW:	http://aubio.org/
+WWW: http://aubio.org/
diff --git a/audio/aubio/pkg-plist b/audio/aubio/pkg-plist
index bc2cdfafa11c..e0fbde34c964 100644
--- a/audio/aubio/pkg-plist
+++ b/audio/aubio/pkg-plist
@@ -1,52 +1,52 @@
+bin/aubionotes
 bin/aubioonset
 bin/aubiotrack
-bin/aubionotes
-include/aubio/config.h
 include/aubio/aubio.h
-include/aubio/types.h
-include/aubio/phasevoc.h
-include/aubio/mathutils.h
+include/aubio/aubioext.h
+include/aubio/beattracking.h
+include/aubio/biquad.h
+include/aubio/config.h
 include/aubio/fft.h
-include/aubio/sample.h
+include/aubio/filter.h
 include/aubio/hist.h
-include/aubio/scale.h
-include/aubio/resample.h
+include/aubio/jackio.h
+include/aubio/mathutils.h
+include/aubio/midi/list.h
+include/aubio/midi/midi.h
+include/aubio/midi/midi_driver.h
+include/aubio/midi/midi_event.h
+include/aubio/midi/midi_file.h
+include/aubio/midi/midi_parser.h
+include/aubio/midi/midi_player.h
+include/aubio/midi/midi_track.h
+include/aubio/midi/timer.h
+include/aubio/onset.h
 include/aubio/onsetdetection.h
-include/aubio/tss.h
 include/aubio/peakpick.h
-include/aubio/biquad.h
+include/aubio/phasevoc.h
 include/aubio/pitchdetection.h
+include/aubio/pitchfcomb.h
 include/aubio/pitchmcomb.h
-include/aubio/pitchyin.h
 include/aubio/pitchschmitt.h
-include/aubio/pitchfcomb.h
+include/aubio/pitchyin.h
 include/aubio/pitchyinfft.h
-include/aubio/beattracking.h
-include/aubio/onset.h
-include/aubio/tempo.h
-include/aubio/filter.h
-include/aubio/aubioext.h
-include/aubio/jackio.h
+include/aubio/resample.h
+include/aubio/sample.h
+include/aubio/scale.h
 include/aubio/sndfileio.h
-include/aubio/midi/midi.h
-include/aubio/midi/list.h
-include/aubio/midi/timer.h
-include/aubio/midi/midi_file.h
-include/aubio/midi/midi_driver.h
-include/aubio/midi/midi_event.h
-include/aubio/midi/midi_track.h
-include/aubio/midi/midi_player.h
-include/aubio/midi/midi_parser.h
+include/aubio/tempo.h
+include/aubio/tss.h
+include/aubio/types.h
 @dirrm include/aubio/midi
 @dirrm include/aubio
-lib/libaubio.so.3
-lib/libaubio.so
-lib/libaubio.la
 lib/libaubio.a
-lib/libaubioext.so.3
-lib/libaubioext.so
-lib/libaubioext.la
+lib/libaubio.la
+lib/libaubio.so
+lib/libaubio.so.3
 lib/libaubioext.a
+lib/libaubioext.la
+lib/libaubioext.so
+lib/libaubioext.so.3
 libdata/pkgconfig/aubio.pc
 share/sounds/aubio/woodblock.aiff
 @dirrm share/sounds/aubio