- Update to 1.1.1

PR:		164148
Submitted by:	Ports Fury

3 files changed, 53 insertions, 30 deletions

diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 0875c29e94b9..401aaed0f8a5 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -6,36 +6,60 @@
 #
 
 PORTNAME=	dssi
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for audio processing plugins
 
+LICENSE=	BSD LGPL21
+LICENSE_COMB=	multi
+
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 LIB_DEPENDS=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \
 		lo.7:${PORTSDIR}/audio/liblo \
-		jack.0:${PORTSDIR}/audio/jack \
+		samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+		jack.0:${PORTSDIR}/audio/jack
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
-GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-USE_GMAKE=	yes
+OPTIONS=	QT "Enable Qt4 support" off
+
 USE_GNOME=	gnomehack
-MAN1=		dssi_osc_send.1 dssi_osc_update.1 jack-dssi-host.1 \
-		dssi_analyse_plugin.1 dssi_list_plugins.1
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+MAN1=		dssi_analyse_plugin.1 dssi_list_plugins.1 dssi_osc_send.1 \
+		dssi_osc_update.1 jack-dssi-host.1
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_QT)
-USE_QT_VER=	3
-PLIST_SUB=	WITH_QT=""
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui
+QT_NONSTANDARD=	yes
+PLIST_SUB=	QT=""
 .else
-PLIST_SUB=	WITH_QT="@comment "
+PLIST_SUB=	QT="@comment "
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -e 's#-ldl##g' ${WRKSRC}/examples/Makefile.in
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^lts_uidir/s|^|@HAVE_QT_TRUE@| ; \
+		 /^trivial_sampler_uidir/s|^|@HAVE_QT_TRUE@| ; \
+		 s|-ldl$$||' ${WRKSRC}/examples/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-ldl$$||' ${WRKSRC}/jack-dssi-host/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/alsa >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
+.if !defined(WITH_QT)
+	@${REINPLACE_CMD} -e \
+		'/QtCore >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/dssi/distinfo b/audio/dssi/distinfo
index 4193aa964510..1a5f38659c24 100644
--- a/audio/dssi/distinfo
+++ b/audio/dssi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dssi-1.1.0.tar.gz) = cea3c22b34e251372c4ae81dbb7256038b7026184d7598b318a0b69475f69b53
-SIZE (dssi-1.1.0.tar.gz) = 420681
+SHA256 (dssi-1.1.1.tar.gz) = f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e
+SIZE (dssi-1.1.1.tar.gz) = 712038
diff --git a/audio/dssi/pkg-plist b/audio/dssi/pkg-plist
index f64dcc98221f..bccd99304894 100644
--- a/audio/dssi/pkg-plist
+++ b/audio/dssi/pkg-plist
@@ -1,25 +1,24 @@
-bin/jack-dssi-host
 bin/dssi_analyse_plugin
 bin/dssi_list_plugins
 bin/dssi_osc_send
 bin/dssi_osc_update
-bin/trivial_synth
+bin/jack-dssi-host
+bin/karplong
 bin/less_trivial_synth
 bin/trivial_sampler
-bin/karplong
+bin/trivial_synth
 include/dssi.h
-lib/dssi/trivial_synth.so
-lib/dssi/trivial_synth.la
-lib/dssi/less_trivial_synth.so
-lib/dssi/less_trivial_synth.la
-lib/dssi/karplong.so
 lib/dssi/karplong.la
-%%WITH_QT%%lib/dssi/less_trivial_synth/LTS_qt
-lib/dssi/trivial_sampler.so
+lib/dssi/karplong.so
+%%QT%%lib/dssi/less_trivial_synth/LTS_qt
+lib/dssi/less_trivial_synth.la
+lib/dssi/less_trivial_synth.so
+%%QT%%lib/dssi/trivial_sampler/trivial_sampler_qt
 lib/dssi/trivial_sampler.la
-%%WITH_QT%%lib/dssi/trivial_sampler/trivial_sampler_qt
+lib/dssi/trivial_sampler.so
+lib/dssi/trivial_synth.la
+lib/dssi/trivial_synth.so
 libdata/pkgconfig/dssi.pc
-@dirrm libdata/pkgconfig
-@dirrm lib/dssi/trivial_sampler
-@dirrm lib/dssi/less_trivial_synth
+%%QT%%@dirrm lib/dssi/trivial_sampler
+%%QT%%@dirrm lib/dssi/less_trivial_synth
 @dirrm lib/dssi