6 files changed, 36 insertions, 109 deletions

diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 18b6892ba16f..e3dcc36645a2 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -5,28 +5,25 @@
 # $FreeBSD$
 
 PORTNAME=		swhplugins
-PORTVERSION=		0.3.3
+PORTVERSION=		0.3.6
 CATEGORIES=		audio
 MASTER_SITES=		http://plugin.org.uk/releases/${PORTVERSION}/
 DISTNAME=		swh-plugins-${PORTVERSION}
 
-MAINTAINER=		arved@FreeBSD.org
+MAINTAINER=		ports@FreeBSD.org
 
 BUILD_DEPENDS=		${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=		fftw.2:${PORTSDIR}/math/fftw
 
-USE_AUTOMAKE_VER=	14
-AUTOMAKE_ARGS=		--add-missing --foreign
+GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
 USE_REINPLACE=		yes
 USE_GMAKE=		yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
-pre-extract:
-	@${ECHO_CMD} "NOTE: This port does not build all \
-			Plugins, due to missing lrintf() function on FreeBSD"
 post-patch:
-	${REINPLACE_CMD} -e 's,Bsymbolic,Bsymbolic -L${LOCALBASE}/lib,' ${WRKSRC}/Makefile.am
+		${REINPLACE_CMD} -e "s,-O6,," ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/swhplugins/distinfo b/audio/swhplugins/distinfo
index 04fd012470f4..df9f0df44813 100644
--- a/audio/swhplugins/distinfo
+++ b/audio/swhplugins/distinfo
@@ -1 +1 @@
-MD5 (swh-plugins-0.3.3.tar.gz) = 211318807010c2e1041cb405af578977
+MD5 (swh-plugins-0.3.6.tar.gz) = 35737aee36c32539d30bc2d80e6d716e
diff --git a/audio/swhplugins/files/patch-Makefile.am b/audio/swhplugins/files/patch-Makefile.am
deleted file mode 100644
index acf973512dbf..000000000000
--- a/audio/swhplugins/files/patch-Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.am.orig	Wed Jan  1 20:30:03 2003
-+++ Makefile.am	Wed Jan  1 20:29:32 2003
-@@ -1,28 +1,26 @@
- VERSION = @VERSION@
- 
- SOBS =	amp_1181.so debug_1184.so diode_1185.so \
--	divider_1186.so shaper_1187.so ringmod_1188.so comb_1190.so \
-+	divider_1186.so shaper_1187.so comb_1190.so \
- 	declip_1195.so foverdrive_1196.so sinus_wavewrapper_1198.so \
--	hermes_filter_1200.so multivoice_chorus_1201.so flanger_1191.so \
-+	hermes_filter_1200.so \
- 	decimator_1202.so single_para_1203.so triple_para_1204.so \
- 	transient_1206.so fad_delay_1192.so \
- 	dc_remove_1207.so retro_flange_1208.so valve_1209.so \
--	sifter_1210.so tape_delay_1211.so step_muxer_1212.so \
--	foldover_1213.so svf_1214.so gsm_1215.so gverb_1216.so \
--	phasers_1217.so harmonic_gen_1220.so surround_encoder_1401.so \
--	delayorama_1402.so dyson_compress_1403.so crossover_dist_1404.so \
-+	step_muxer_1212.so \
-+	foldover_1213.so \
-+	harmonic_gen_1220.so surround_encoder_1401.so \
-+	dyson_compress_1403.so crossover_dist_1404.so \
- 	valve_rect_1405.so split_1406.so alias_1407.so \
--	satan_maximiser_1408.so karaoke_1409.so gate_1410.so \
-+	karaoke_1409.so\
- 	comb_splitter_1411.so wave_terrain_1412.so \
--	hard_limiter_1413.so smooth_decimate_1414.so fm_osc_1415.so \
--	analogue_osc_1416.so rate_shifter_1417.so freq_tracker_1418.so \
--	mod_delay_1419.so matrix_st_ms_1420.so matrix_ms_st_1421.so \
--	matrix_spatialiser_1422.so plate_1423.so gong_1424.so \
--	sc1_1425.so sc2_1426.so sc3_1427.so zm1_1428.so inv_1429.so \
--	chebstortion_1430.so bode_shifter_1431.so bode_shifter_cv_1432.so \
--	am_pitchshift_1433.so \
--	mbeq_1197.so pitch_scale_1193.so pitch_scale_1194.so imp_1199.so
--
-+	hard_limiter_1413.so smooth_decimate_1414.so\
-+	rate_shifter_1417.so freq_tracker_1418.so \
-+	matrix_st_ms_1420.so matrix_ms_st_1421.so \
-+	plate_1423.so gong_1424.so \
-+	zm1_1428.so inv_1429.so \
-+	chebstortion_1430.so \
-+	mbeq_1197.so pitch_scale_1193.so pitch_scale_1194.so
- SUBDIRS = util gsm gverb metadata
- 
- # Wacky stuff to stop automake getting confused
-@@ -41,17 +39,6 @@
- pitch_scale_1194_so_SOURCES = pitch_scale_1194.so.c
- mbeq_1197_so_LDADD = $(FFTLIBS)
- mbeq_1197_so_SOURCES = mbeq_1197.so.c
--imp_1199_so_LDADD = $(FFTLIBS)
--imp_1199_so_DEPENDENCIES = impulses/*
--fm_osc_1415_so_DEPENDENCIES = util/blo.h
--fm_osc_1415_so_SOURCES = fm_osc_1415.so.c util/blo.c
--analogue_osc_1416_so_DEPENDENCIES = util/blo.h
--analogue_osc_1416_so_LDADD = util/libblo.a
--sc1_1425_so_LDADD = util/libdb.a util/librms.a
--sc2_1426_so_LDADD = util/libdb.a util/librms.a
--sc3_1427_so_LDADD = util/libdb.a util/librms.a
--gsm_1215_so_LDADD = gsm/libgsm.a
--gverb_1216_so_LDADD = gverb/libgverb.a
- 
- # Rule to build .c files from XML source
- %.so.c:	%.xml
diff --git a/audio/swhplugins/files/patch-aclocal.m4 b/audio/swhplugins/files/patch-aclocal.m4
deleted file mode 100644
index 75cc1d76cf1c..000000000000
--- a/audio/swhplugins/files/patch-aclocal.m4
+++ /dev/null
@@ -1,17 +0,0 @@
---- aclocal.m4.orig	Fri Nov  1 21:13:15 2002
-+++ aclocal.m4	Thu Dec 12 11:25:52 2002
-@@ -59,10 +59,10 @@
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal14, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf213, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake14, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader213, $missing_dir)
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
- 
diff --git a/audio/swhplugins/files/patch-configure.in b/audio/swhplugins/files/patch-configure.in
deleted file mode 100644
index dafb6e452410..000000000000
--- a/audio/swhplugins/files/patch-configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	Fri Dec  6 19:02:05 2002
-+++ configure.in	Wed Jan  1 19:53:58 2003
-@@ -15,7 +15,8 @@
- AC_REQUIRE_CPP
- dnl AC_CHECK_HEADER(ladspa.h, [], [AC_MSG_ERROR([Cannot find ladspa.h, please install the LADSPA_SDK, or put ladspa.h somewhere it can be found]);])
- 
--CFLAGS="-lm"
-+CFLAGS="-I/usr/local/include"
-+LDFLAGS="-lm -L/usr/local/lib"
- 
- AC_CHECK_LIB(sfftw,fftw_one,
-     [
-@@ -43,7 +44,6 @@
- dnl For gcc use:
- MACHINE="-mcpu=${build_cpu} -march=${build_cpu}"
- if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
--CFLAGS="-Wall -O6 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fmove-all-movables -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE}"
- 
- dnl For Intel's C compiler use:
- dnl CC="icc"
diff --git a/audio/swhplugins/pkg-plist b/audio/swhplugins/pkg-plist
index 5f61e8785f6a..9a811ed69773 100644
--- a/audio/swhplugins/pkg-plist
+++ b/audio/swhplugins/pkg-plist
@@ -1,5 +1,9 @@
 lib/ladspa/alias_1407.so
+lib/ladspa/am_pitchshift_1433.so
+lib/ladspa/analogue_osc_1416.so
 lib/ladspa/amp_1181.so
+lib/ladspa/bode_shifter_1431.so
+lib/ladspa/bode_shifter_cv_1432.so
 lib/ladspa/chebstortion_1430.so
 lib/ladspa/comb_1190.so
 lib/ladspa/comb_splitter_1411.so
@@ -8,24 +12,48 @@ lib/ladspa/dc_remove_1207.so
 lib/ladspa/debug_1184.so
 lib/ladspa/decimator_1202.so
 lib/ladspa/declip_1195.so
+lib/ladspa/delayorama_1402.so
 lib/ladspa/diode_1185.so
 lib/ladspa/divider_1186.so
+lib/ladspa/dj_flanger_1438.so
 lib/ladspa/dyson_compress_1403.so
 lib/ladspa/fad_delay_1192.so
+lib/ladspa/flanger_1191.so
+lib/ladspa/fm_osc_1415.so
 lib/ladspa/foldover_1213.so
 lib/ladspa/foverdrive_1196.so
+lib/ladspa/gate_1410.so
+lib/ladspa/giant_flange_1437.so
+lib/ladspa/gsm_1215.so
+lib/ladspa/gverb_1216.so
 lib/ladspa/hard_limiter_1413.so
 lib/ladspa/harmonic_gen_1220.so
 lib/ladspa/hermes_filter_1200.so
+lib/ladspa/imp_1199.so
 lib/ladspa/karaoke_1409.so
+lib/ladspa/lcr_delay_1436.so
+lib/ladspa/lookahead_limiter_1435.so
+lib/ladspa/matrix_spatialiser_1422.so
+lib/ladspa/mod_delay_1419.so
+lib/ladspa/multivoice_chorus_1201.so
+lib/ladspa/phasers_1217.so
 lib/ladspa/retro_flange_1208.so
+lib/ladspa/ringmod_1188.so
+lib/ladspa/satan_maximiser_1408.so
+lib/ladspa/sc1_1425.so
+lib/ladspa/sc2_1426.so
+lib/ladspa/sc3_1427.so
+lib/ladspa/sc4_1434.so
 lib/ladspa/shaper_1187.so
+lib/ladspa/sifter_1210.so
 lib/ladspa/single_para_1203.so
 lib/ladspa/sinus_wavewrapper_1198.so
 lib/ladspa/smooth_decimate_1414.so
 lib/ladspa/split_1406.so
 lib/ladspa/step_muxer_1212.so
 lib/ladspa/surround_encoder_1401.so
+lib/ladspa/svf_1214.so
+lib/ladspa/tape_delay_1211.so
 lib/ladspa/transient_1206.so
 lib/ladspa/triple_para_1204.so
 lib/ladspa/valve_1209.so
@@ -42,3 +70,5 @@ lib/ladspa/pitch_scale_1193.so
 lib/ladspa/pitch_scale_1194.so
 lib/ladspa/zm1_1428.so
 lib/ladspa/inv_1429.so
+share/ladspa/rdf/swh-plugins.rdf
+@dirrm share/ladspa/rdf