4 files changed, 58 insertions, 29 deletions

diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 796a0b9f3b1f..ceec18573d8b 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -4,27 +4,32 @@
 #
 # $FreeBSD$
 
-PORTNAME=		swhplugins
-PORTVERSION=		0.3.6
-CATEGORIES=		audio
-MASTER_SITES=		http://plugin.org.uk/releases/${PORTVERSION}/
-DISTNAME=		swh-plugins-${PORTVERSION}
+PORTNAME=	swhplugins
+PORTVERSION=	0.4.0
+CATEGORIES=	audio
+MASTER_SITES=	http://plugin.org.uk/releases/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
+DISTNAME=	swh-plugins-${PORTVERSION}
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=	This is Steve Harris' huge Collection of LADSPA Plugins
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Steve Harris' huge Collection of LADSPA Plugins
 
-BUILD_DEPENDS=		${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=		fftw.2:${PORTSDIR}/math/fftw
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
+		fftw.2:${PORTSDIR}/math/fftw
 
-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"
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+INSTALLS_SHLIB=	yes
 
 post-patch:
-		${REINPLACE_CMD} -e "s,-O6,," ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
+		 s|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g ; \
+		 s|\\\$${top_builddir}/intl/libintl.a|-lintl|g ' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/swhplugins/distinfo b/audio/swhplugins/distinfo
index df9f0df44813..e3511b7e1f65 100644
--- a/audio/swhplugins/distinfo
+++ b/audio/swhplugins/distinfo
@@ -1 +1 @@
-MD5 (swh-plugins-0.3.6.tar.gz) = 35737aee36c32539d30bc2d80e6d716e
+MD5 (swh-plugins-0.4.0.tar.gz) = 741e5321bdd498ed82e3c6ca7a59eed8
diff --git a/audio/swhplugins/files/patch-Makefile.in b/audio/swhplugins/files/patch-Makefile.in
new file mode 100644
index 000000000000..7c9d0f187a0b
--- /dev/null
+++ b/audio/swhplugins/files/patch-Makefile.in
@@ -0,0 +1,26 @@
+--- Makefile.in.orig	Mon Apr  7 23:57:02 2003
++++ Makefile.in	Fri May  2 00:04:29 2003
+@@ -132,7 +132,7 @@
+ 
+ # Wacky stuff to stop automake getting confused
+ EXTRA_DIST = *.xml *.c *.h *.dtd *.pl *.css impulses/*.h
+-LINK = gcc -nostartfiles -shared -Wl,-Bsymbolic -lc -lm $(INTLLIBS) -o $@
++LINK = $(CC) -nostartfiles -shared -lm $(INTLLIBS) $(LDFLAGS) -o $@
+ pkgbin_PROGRAMS = $(SOBS)
+ pkgbindir = @prefix@/lib/ladspa
+ DESTDIR = $(INSTALL_ROOT)
+@@ -149,11 +149,11 @@
+ imp_1199_so_LDADD = $(FFTLIBS)
+ imp_1199_so_DEPENDENCIES = impulses/*
+ hermes_filter_1200_so_DEPENDENCIES = util/libblo.a
+-hermes_filter_1200_so_LDADD = util/libblo.a -lrt
++hermes_filter_1200_so_LDADD = util/libblo.a
+ fm_osc_1415_so_DEPENDENCIES = util/libblo.a
+-fm_osc_1415_so_LDADD = util/libblo.a -lrt
++fm_osc_1415_so_LDADD = util/libblo.a
+ analogue_osc_1416_so_DEPENDENCIES = util/libblo.a
+-analogue_osc_1416_so_LDADD = util/libblo.a -lrt
++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
diff --git a/audio/swhplugins/pkg-plist b/audio/swhplugins/pkg-plist
index 3e02dda52ee9..75da05b0bcf3 100644
--- a/audio/swhplugins/pkg-plist
+++ b/audio/swhplugins/pkg-plist
@@ -1,6 +1,5 @@
 lib/ladspa/alias_1407.so
 lib/ladspa/am_pitchshift_1433.so
-lib/ladspa/amp.so
 lib/ladspa/amp_1181.so
 lib/ladspa/analogue_osc_1416.so
 lib/ladspa/bode_shifter_1431.so
@@ -10,30 +9,29 @@ lib/ladspa/comb_1190.so
 lib/ladspa/comb_splitter_1411.so
 lib/ladspa/crossover_dist_1404.so
 lib/ladspa/dc_remove_1207.so
-lib/ladspa/debug_1184.so
 lib/ladspa/decimator_1202.so
 lib/ladspa/declip_1195.so
-lib/ladspa/delay.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/filter.so
 lib/ladspa/flanger_1191.so
 lib/ladspa/fm_osc_1415.so
 lib/ladspa/foldover_1213.so
 lib/ladspa/foverdrive_1196.so
 lib/ladspa/freq_tracker_1418.so
-lib/ladspa/gate_1410.so
+lib/ladspa/gate_1921.so
 lib/ladspa/giant_flange_1437.so
 lib/ladspa/gong_1424.so
+lib/ladspa/gong_beater_1439.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/hilbert_1440.so
 lib/ladspa/imp_1199.so
 lib/ladspa/inv_1429.so
 lib/ladspa/karaoke_1409.so
@@ -45,7 +43,6 @@ lib/ladspa/matrix_st_ms_1420.so
 lib/ladspa/mbeq_1197.so
 lib/ladspa/mod_delay_1419.so
 lib/ladspa/multivoice_chorus_1201.so
-lib/ladspa/noise.so
 lib/ladspa/phasers_1217.so
 lib/ladspa/pitch_scale_1193.so
 lib/ladspa/pitch_scale_1194.so
@@ -57,10 +54,10 @@ 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/sc4_1882.so
 lib/ladspa/shaper_1187.so
 lib/ladspa/sifter_1210.so
-lib/ladspa/sine.so
+lib/ladspa/sin_cos_1881.so
 lib/ladspa/single_para_1203.so
 lib/ladspa/sinus_wavewrapper_1198.so
 lib/ladspa/smooth_decimate_1414.so
@@ -76,6 +73,7 @@ lib/ladspa/valve_rect_1405.so
 lib/ladspa/wave_terrain_1412.so
 lib/ladspa/zm1_1428.so
 share/ladspa/rdf/swh-plugins.rdf
-@dirrm lib/ladspa
-@dirrm share/ladspa/rdf
-@dirrm share/ladspa
+share/locale/en_GB/LC_MESSAGES/swh-plugins.mo
+@unexec rmdir %D/share/ladspa/rdf 2>/dev/null || true
+@unexec rmdir %D/share/ladspa 2>/dev/null || true
+@unexec rmdir %D/libladspa 2>/dev/null || true