5 files changed, 19 insertions, 28 deletions

diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index 510d03fab2ce..5e5d9b874a34 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spiralsynthmodular
-PORTVERSION=	0.2.1
+PORTVERSION=	0.2.2a
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	spiralmodular
@@ -16,19 +16,23 @@ MAINTAINER=	dyeske@yahoo.com
 COMMENT=	An object orientated modular softsynth / sequencer / sampler
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
+		sndfile.1:${PORTSDIR}/audio/libsndfile
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	FLTK_CONFIG="${FLTK_CONFIG}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LIBS="${LIBS} -L${LOCALBASE}/lib"
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
 .endif
 
+WRKSRC=	${WRKDIR}/spiralmodular-0.2.2
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@@ -43,22 +47,29 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's@(-O3|-ffast-math)@@g; \
+		s|-Wall||; \
 		s|CFLAGS="-pipe|CFLAGS="\$$\{CFLAGS\} ${PTHREAD_CFLAGS}|; \
-		s|CXXFLAGS="-pipe|CXXFLAGS="\$$\{CXXFLAGS\} ${PTHREAD_CFLAGS}|' \
+		s|CXXFLAGS="-pipe|CXXFLAGS="\$$\{CXXFLAGS\} ${PTHREAD_CFLAGS}|; \
+		s|^SpiralSound/Plugins/MidiPlugin/Makefile||; \
+		s|MidiPlugin||' \
 			${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 	@${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include -I${X11BASE}/include|' \
 		${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in
+
 	@${REINPLACE_CMD} -e 's|O_SYNC|O_FSYNC|' \
 		${WRKSRC}/SpiralSound/Midi.C
+
 	@${REINPLACE_CMD} -e \
 		's|True|true|; s|False|false|' \
 		${WRKSRC}/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
+
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|-ldl||; \
 		s|^CC[[:space:]]*=.+$$|CC=${CC}|; \
 		s|^CXX[[:space:]]*=.+$$|CXX=${CXX}|; \
 		s|g\+\+|${CXX}|; \
-		s,@FLTK_(C|CXX)FLAGS@,-I${X11BASE}/include,; \
+		s,@FLTK_(C|CXX)FLAGS@,-I${X11BASE}/include -I${LOCALBASE}/include,; \
 		s|-lpthread|${PTHREAD_LIBS}|g'
 
 .include <bsd.port.post.mk>
diff --git a/audio/spiralsynthmodular/distinfo b/audio/spiralsynthmodular/distinfo
index e7a9b2f45e09..df6a7a0a7c57 100644
--- a/audio/spiralsynthmodular/distinfo
+++ b/audio/spiralsynthmodular/distinfo
@@ -1,2 +1,2 @@
-MD5 (spiralmodular-0.2.1.tar.gz) = 93e7cedd214751224f7d82ac3a08d111
-SIZE (spiralmodular-0.2.1.tar.gz) = 512050
+MD5 (spiralmodular-0.2.2a.tar.gz) = bf1b692c378b2c7d3b9ee4905d56854f
+SIZE (spiralmodular-0.2.2a.tar.gz) = 490530
diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound::Midi.h b/audio/spiralsynthmodular/files/patch-SpiralSound::Midi.h
deleted file mode 100644
index 88ffa80e99e0..000000000000
--- a/audio/spiralsynthmodular/files/patch-SpiralSound::Midi.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- SpiralSound/Midi.h.orig	Thu Nov  7 23:07:00 2002
-+++ SpiralSound/Midi.h	Thu Nov  7 23:07:20 2002
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <iostream>
- #include <limits.h>
-+#include <pthread.h>
- #include <queue>
- #include <string>
- 
diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound::Plugins::DiskWriterPlugin.C b/audio/spiralsynthmodular/files/patch-SpiralSound::Plugins::DiskWriterPlugin.C
deleted file mode 100644
index fae61fd271ec..000000000000
--- a/audio/spiralsynthmodular/files/patch-SpiralSound::Plugins::DiskWriterPlugin.C
+++ /dev/null
@@ -1,10 +0,0 @@
---- SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C.orig	Tue Jan  7 01:20:23 2003
-+++ SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C	Tue Jan  7 01:21:15 2003
-@@ -20,6 +20,7 @@
- #define	_ISOC9X_SOURCE	1
- #define _ISOC99_SOURCE	1
- #include  <math.h>
-+#define lrintf(flt)             ((int) (flt))
- 
- #include <sys/types.h>
- #include <stdio.h>
diff --git a/audio/spiralsynthmodular/pkg-plist b/audio/spiralsynthmodular/pkg-plist
index 43a798f3cd06..e8c5032fc6bf 100644
--- a/audio/spiralsynthmodular/pkg-plist
+++ b/audio/spiralsynthmodular/pkg-plist
@@ -20,7 +20,6 @@ lib/SpiralPlugins/LogicPlugin.so
 lib/SpiralPlugins/MasherPlugin.so
 lib/SpiralPlugins/MatrixPlugin.so
 lib/SpiralPlugins/MeterPlugin.so
-lib/SpiralPlugins/MidiPlugin.so
 lib/SpiralPlugins/MixerPlugin.so
 lib/SpiralPlugins/MixSwitchPlugin.so
 lib/SpiralPlugins/MoogFilterPlugin.so
@@ -42,6 +41,7 @@ lib/SpiralPlugins/SplitterPlugin.so
 lib/SpiralPlugins/StereoMixerPlugin.so
 lib/SpiralPlugins/StreamPlugin.so
 lib/SpiralPlugins/SwitchPlugin.so
+lib/SpiralPlugins/TransposePlugin.so
 lib/SpiralPlugins/TrigPlugin.so
 lib/SpiralPlugins/WaveShaperPlugin.so
 lib/SpiralPlugins/WaveTablePlugin.so