audio/musescore

- Bump PORTREVISION for dependency change
- Fix portaudio2 dependency due to recent commit
- Use the new format for LIB_DEPENDS
- Support STAGEDIR and add OPTIONS_SUB
- Add DOCS and Option

audio/zynaddsubfx

- Bump PORTREVISION for dependency change
- Fix portaudio2 dependency due to recent commit
- Use the new format for LIB_DEPENDS
- Add DOCS and EXAMPLES Options
- Change DOCS
- Support STAGEDIR and add OPTIONS_SUB
- Change pkg-plist, remove DOCS and EXAMPLES

games/glob2

- Simplify master sites
- Bump PORTREVISION for dependency change
- Fix portaudio2 dependency due to recent commit
- Change comment
- Use the new format for LIB_DEPENDS
- Add DOCS and Option
- Change icons
- Use REINPLACE_CMD instead of files/patch-src_VoiceRecorder.cpp
- Adjust patches
- Change pkg-message

Approved by:	pawel / wg (mentors, implicit)

3 files changed, 72 insertions, 94 deletions

diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 8259ca246e70..e1e7915a2369 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -3,8 +3,9 @@
 
 PORTNAME=	musescore
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	SF/mscore/mscore/MuseScore-${PORTVERSION}
+MASTER_SITES=	SF/mscore/mscore/MuseScore-${PORTVERSION}/
 DISTNAME=	mscore-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,14 +14,10 @@ COMMENT=	Free music composition & notation software
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerator
-LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 RUN_DEPENDS=	qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerator
 
-OPTIONS_DEFINE=	JACK PORTAUDIO
-OPTIONS_DEFAULT=PORTAUDIO
-
 USE_BZIP2=	yes
-NO_STAGE=	yes
 USES=		cmake:outsource
 USE_QT4=	corelib designer gui network script scripttools svg webkit xml \
 		linguist_build moc_build qmake_build rcc_build uic_build
@@ -31,22 +28,21 @@ MAKE_JOBS_UNSAFE=	yes
 
 DATADIR=	${PREFIX}/share/mscore-${PORTVERSION}
 
-.include <bsd.port.options.mk>
+PORTDOCS=	ChangeLog NEWS README README.scripts
+
+OPTIONS_DEFINE=	DOCS JACK PORTAUDIO
+OPTIONS_DEFAULT=PORTAUDIO
+
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
-CMAKE_ARGS+=	-DBUILD_JACK:BOOL=ON
-.else
-CMAKE_ARGS+=	-DBUILD_JACK:BOOL=OFF
-.endif
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_CMAKE_ON=		-DBUILD_JACK:BOOL=ON
+JACK_CMAKE_OFF=		-DBUILD_JACK:BOOL=OFF
 
-.if ${PORT_OPTIONS:MPORTAUDIO}
-BUILD_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
-RUN_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
-CMAKE_ARGS+=	-DBUILD_PORTAUDIO:BOOL=ON
-.else
-CMAKE_ARGS+=	-DBUILD_PORTAUDIO:BOOL=OFF
-.endif
+PORTAUDIO_BUILD_DEPENDS=portaudio2>=0:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_RUN_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_CMAKE_ON=	-DBUILD_PORTAUDIO:BOOL=ON
+PORTAUDIO_CMAKE_OFF=	-DBUILD_PORTAUDIO:BOOL=OFF
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \
@@ -58,4 +54,8 @@ post-patch:
 	@${ECHO_CMD} >> ${WRKSRC}/mscore/mscore/${file}
 .endfor
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/mscore/|} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 1e433aec9abb..0f109eb5fa93 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zynaddsubfx
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 DISTNAME=	ZynAddSubFX-${PORTVERSION}
@@ -15,8 +16,11 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		mxml:${PORTSDIR}/textproc/mxml
 
-OPTIONS_DEFINE=	GUI LASH LO JACK PORTAUDIO DOCS EXAMPLES
-OPTIONS_DEFAULT=	GUI
+USE_BZIP2=	yes
+USES=		cmake pkgconfig
+
+OPTIONS_DEFINE=	DOCS EXAMPLES GUI LASH LO JACK PORTAUDIO
+OPTIONS_DEFAULT=	GUI PORTAUDIO
 OPTIONS_RADIO=		AUDIO
 OPTIONS_RADIO_AUDIO=	ALSAMIDI DSSI
 OPTIONS_SUB=		yes
@@ -25,32 +29,50 @@ ALSAMIDI_DESC=	MIDI input through ALSA
 DSSI_DESC=	DSSI Plugin
 LO_DESC=	Open Sound Control support via LibLO
 
+ALSAMIDI_LIB_DEPENDS=		libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSAMIDI_CMAKE_OFF=		-DAlsaEnable:BOOL=OFF
-ALSAMIDI_LIB_DEPENDS=		asound:${PORTSDIR}/audio/alsa-lib
+
+DSSI_LIB_DEPENDS=		libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat
 DSSI_BUILD_DEPENDS=		dssi>0:${PORTSDIR}/audio/dssi
+DSSI_RUN_DEPENDS=		dssi>0:${PORTSDIR}/audio/dssi
 DSSI_CFLAGS=			-I${LOCALBASE}/include/dssi
 DSSI_CMAKE_OFF=			-DDssiEnable:BOOL=OFF
-DSSI_LIB_DEPENDS=		dssialsacompat:${PORTSDIR}/audio/libdssialsacompat
-DSSI_RUN_DEPENDS=		dssi>0:${PORTSDIR}/audio/dssi
-GUI_CMAKE_OFF=			-DGuiModule:STRING=OFF
-GUI_LIB_DEPENDS=		fltk:${PORTSDIR}/x11-toolkits/fltk
+
+GUI_LIB_DEPENDS=		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 GUI_ON=				-DGuiModule:STRING=fltk
-JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
-JACK_LIB_DEPENDS=		jack:${PORTSDIR}/audio/jack
-LASH_CMAKE_OFF=			-DLashEnabe:BOOL=OFF
-LASH_LIB_DEPENDS=		lash:${PORTSDIR}/audio/lash
+GUI_CMAKE_OFF=			-DGuiModule:STRING=OFF
+
+LO_LIB_DEPENDS=			liblo.so:${PORTSDIR}/audio/liblo
 LO_CMAKE_OFF=			-DLibloEnable:BOOL=OFF
-LO_LIB_DEPENDS=			lo:${PORTSDIR}/audio/liblo
-PORTAUDIO_BUILD_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
+
+LASH_LIB_DEPENDS=		liblash.so:${PORTSDIR}/audio/lash
+LASH_CMAKE_OFF=			-DLashEnabe:BOOL=OFF
+
+JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
+
+PORTAUDIO_BUILD_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_RUN_DEPENDS=		portaudio2>=0:${PORTSDIR}/audio/portaudio2
 PORTAUDIO_CFLAGS=		-I${LOCALBASE}/include/portaudio2
 PORTAUDIO_CMAKE_OFF=		-DPaEnabe:BOOL=OFF
 PORTAUDIO_LDFLAGS=		${LOCALBASE}/lib/portaudio2/libportaudio.so
-PORTAUDIO_RUN_DEPENDS=		portaudio>=19:${PORTSDIR}/audio/portaudio2
 
-USE_BZIP2=	yes
-USES=		cmake pkgconfig
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	AUTHORS.txt ChangeLog FAQ.txt HISTORY.txt README.txt
+
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	adsynth.txt controller.txt envelope.txt filter.txt intro.txt \
+		lfo.txt mididefaults.txt nrpn.txt saving.txt zynaddsubfx.txt
+
+DOCSRCDIR3=	${WRKSRC}/doc/images
+DOCSDIR3=	${DOCSDIR}/doc/images
+DOC_FILES3=	*.png *.jpg
+
+PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
@@ -72,19 +94,23 @@ post-patch:
 		 /-g #/d ; \
 		 /pthread/d ; \
 		 s|lib64|lib|' ${WRKSRC}/src/CMakeLists.txt
-	@${REINPLACE_CMD} -e \
-		's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/Misc/Config.cpp
+	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src/Misc/Config.cpp
+	@${REINPLACE_CMD} -e 's|portaudio.h|portaudio2/portaudio.h|' ${WRKSRC}/src/Nio/PaEngine.h
+
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/banks
 	(cd ${WRKDIR}/${DISTNAME}/instruments/banks \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/banks)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in AUTHORS.txt FAQ.txt HISTORY.txt README.txt
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
-.endfor
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKDIR}/${DISTNAME}/instruments/examples \
-		&& ${INSTALL_DATA} * ${STAGEDIR}${EXAMPLESDIR})
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR3}
+	${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3}
+
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/instruments/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.post.mk>
diff --git a/audio/zynaddsubfx/pkg-plist b/audio/zynaddsubfx/pkg-plist
index cb2066ab590b..057f49add14f 100644
--- a/audio/zynaddsubfx/pkg-plist
+++ b/audio/zynaddsubfx/pkg-plist
@@ -451,52 +451,6 @@ bin/zynaddsubfx
 %%DATADIR%%/banks/SynthPiano/0069-Synth Piano 3 det.xiz
 %%DATADIR%%/banks/SynthPiano/0070-Synth Piano 4.xiz
 %%DATADIR%%/banks/SynthPiano/0071-Synth Piano 5.xiz
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/0km.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 3.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 4.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 5.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio 6.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Dist 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Dist 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Flange 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Arpeggio Flange 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Choir Reeds.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Choir Strings SynthBrass.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dist Guitar Strings 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dist Guitar Strings 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Drop.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Fantasy 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Fantasy 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Glass Choir.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HighPass Saw Strings.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Ice Rhodes Strings.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/JI12.xsz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Legatto 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Legatto 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Legatto Strings.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Octave Strings.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Organ Choir Strings.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Saw.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Space 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Space 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Split_keyboard.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/String Reverb.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strings Reeds 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strings Reeds 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Struck String Big Reverb 1.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Struck String Big Reverb 2.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Supersaw.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Synth Bells Choir Reverb.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Synth Piano Reverb.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Synth.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bent_synth.xmz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/photons.xmz
 @dirrm %%DATADIR%%/banks/SynthPiano
 @dirrm %%DATADIR%%/banks/Synth
 @dirrm %%DATADIR%%/banks/Strings
@@ -519,5 +473,3 @@ bin/zynaddsubfx
 @dirrm %%DATADIR%%/banks/Arpeggios
 @dirrm %%DATADIR%%/banks
 @dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%