- Pass maintainership to submitter

- Use the new format for LIB_DEPENDS
- Support STAGEDIR and add OPTIONS_SUB
- Add USE_QT4= moc_build
- Add DOCS and EXAMPLES
- Add DOCS and EXAMPLES Options

Approved by:	pawel / wg (mentors, implicit)

2 files changed, 44 insertions, 20 deletions

diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 5cf739888b2d..ae4955cf1dc3 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -7,40 +7,47 @@ PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@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:${PORTSDIR}/audio/liblo \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
+		liblo.so:${PORTSDIR}/audio/liblo \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libjack.so:${PORTSDIR}/audio/jack
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
-OPTIONS_DEFINE=	QT4
-
-NO_STAGE=	yes
 USES=		gmake pathfix pkgconfig
 GNU_CONFIGURE=	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
+PORTDOCS=	ChangeLog README
+
+PORTEXAMPLES=	*
+
+EXAMPLESSRCDIR=		${WRKSRC}/examples
+
+EXAMPLES_FILES1=	dssi_analyse_plugin dssi_list_plugins \
+			dssi_osc_send dssi_osc_update
+
+EXAMPLES_FILES2=	LTS_qt trivial_sampler_qt
+
+OPTIONS_DEFINE=	DOCS EXAMPLES QT4
+OPTIONS_DEFAULT=	QT4
+
+OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4}
-USE_QT4=	corelib gui
+USE_QT4=	corelib gui moc_build
 QT_NONSTANDARD=	yes
-PLIST_SUB=	QT=""
-.else
-PLIST_SUB=	QT="@comment "
 .endif
 
 post-patch:
@@ -52,9 +59,21 @@ post-patch:
 		's|-ldl$$||' ${WRKSRC}/jack-dssi-host/Makefile.in
 	@${REINPLACE_CMD} -e \
 		'/alsa >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
-.if empty(PORT_OPTIONS:MQT4)
+
+.if ! ${PORT_OPTIONS:MQT4}
 	@${REINPLACE_CMD} -e \
 		'/QtCore >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
 .endif
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${EXAMPLES_FILES1:S|^|${EXAMPLESSRCDIR}/|} ${STAGEDIR}${EXAMPLESDIR}
+
+.if ${PORT_OPTIONS:MQT4}
+	${INSTALL_PROGRAM} ${EXAMPLES_FILES2:S|^|${EXAMPLESSRCDIR}/|} ${STAGEDIR}${EXAMPLESDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/audio/dssi/pkg-plist b/audio/dssi/pkg-plist
index bccd99304894..0f31c4358fb5 100644
--- a/audio/dssi/pkg-plist
+++ b/audio/dssi/pkg-plist
@@ -10,15 +10,20 @@ bin/trivial_synth
 include/dssi.h
 lib/dssi/karplong.la
 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
+%%QT4%%lib/dssi/less_trivial_synth/LTS_qt
 lib/dssi/trivial_sampler.la
 lib/dssi/trivial_sampler.so
+%%QT4%%lib/dssi/trivial_sampler/trivial_sampler_qt
 lib/dssi/trivial_synth.la
 lib/dssi/trivial_synth.so
 libdata/pkgconfig/dssi.pc
-%%QT%%@dirrm lib/dssi/trivial_sampler
-%%QT%%@dirrm lib/dssi/less_trivial_synth
+man/man1/dssi_analyse_plugin.1.gz
+man/man1/dssi_list_plugins.1.gz
+man/man1/dssi_osc_send.1.gz
+man/man1/dssi_osc_update.1.gz
+man/man1/jack-dssi-host.1.gz
+%%QT4%%@dirrm lib/dssi/trivial_sampler
+%%QT4%%@dirrm lib/dssi/less_trivial_synth
 @dirrm lib/dssi