Update port to fit better with net/freeswitch metaport

PR:	ports/149527
Submitted by:	Eric F Crist <ecrist@secure-computing.net>

2 files changed, 41 insertions, 32 deletions

diff --git a/audio/freeswitch-music/Makefile b/audio/freeswitch-music/Makefile
index 86bc64a90e80..366e1f777a7d 100644
--- a/audio/freeswitch-music/Makefile
+++ b/audio/freeswitch-music/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	freeswitch
+PORTNAME=	freeswitch-music
 PORTVERSION=	1.0.8
 CATEGORIES=	audio
 MASTER_SITES=	http://files.freeswitch.org/
-PKGNAMESUFFIX=	-music
 DIST_SUBDIR=	freeswitch-music
 
 MAINTAINER=	ecrist@secure-computing.net
@@ -18,6 +17,8 @@ COMMENT=	FreeSwitch Music - All Bitrates
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
+BASE_PORTNAME=	freeswitch
+
 OPTIONS=	8K           "Install 8000Hz Music" on \
 		16K          "Install 16000Hz Music" on \
 		32K          "Install 32000Hz Music" on \
@@ -25,23 +26,30 @@ OPTIONS=	8K           "Install 8000Hz Music" on \
 
 .include <bsd.port.options.mk>
 .if defined(WITH_8K)
-DISTFILES+=	${PORTNAME}-sounds${PKGNAMESUFFIX}-8000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-8000-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 .if defined(WITH_16K)
-DISTFILES+=	${PORTNAME}-sounds${PKGNAMESUFFIX}-16000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-16000-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 .if defined(WITH_32K)
-DISTFILES+=	${PORTNAME}-sounds${PKGNAMESUFFIX}-32000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-32000-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 .if defined(WITH_48K)
-DISTFILES+=	${PORTNAME}-sounds${PKGNAMESUFFIX}-48000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-48000-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
-#RUN_DEPENDS+= freeswitch:${PORTSDIR}/net/freeswitch-core
+.for i in 8K 16K 32K 48K
+.if !defined(WITH_${i})
+PLIST_SUB+=	WITH_${i}="@comment "
+.else
+PLIST_SUB+=	WITH_${i}=""
+.endif
+.endfor
 
 do-install:
 	@${ECHO_MSG} "Installing files..."
-	${MKDIR} ${PREFIX}/share/${PORTNAME}/sounds
-	(cd ${WRKDIR} &&${COPYTREE_SHARE} \* ${DATADIR}/sounds/)
+	${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
+	${TOUCH} ${PREFIX}/share/${BASE_PORTNAME}/sounds/.freeswitch-music
+	(cd ${WRKSRC} &&${COPYTREE_SHARE} \* ${PREFIX}/share/${BASE_PORTNAME}/sounds/)
 
 .include <bsd.port.mk>
diff --git a/audio/freeswitch-music/pkg-plist b/audio/freeswitch-music/pkg-plist
index a1c29ec3f257..df6c82221749 100644
--- a/audio/freeswitch-music/pkg-plist
+++ b/audio/freeswitch-music/pkg-plist
@@ -1,23 +1,24 @@
-%%DATADIR%%/sounds/music/8000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
-%%DATADIR%%/sounds/music/8000/ponce-preludio-in-e-major.wav
-%%DATADIR%%/sounds/music/8000/suite-espanola-op-47-leyenda.wav
-%%DATADIR%%/sounds/music/8000/danza-espanola-op-37-h-142-xii-arabesca.wav
-%%DATADIR%%/sounds/music/16000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
-%%DATADIR%%/sounds/music/16000/ponce-preludio-in-e-major.wav
-%%DATADIR%%/sounds/music/16000/suite-espanola-op-47-leyenda.wav
-%%DATADIR%%/sounds/music/16000/danza-espanola-op-37-h-142-xii-arabesca.wav
-%%DATADIR%%/sounds/music/32000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
-%%DATADIR%%/sounds/music/32000/ponce-preludio-in-e-major.wav
-%%DATADIR%%/sounds/music/32000/suite-espanola-op-47-leyenda.wav
-%%DATADIR%%/sounds/music/32000/danza-espanola-op-37-h-142-xii-arabesca.wav
-%%DATADIR%%/sounds/music/48000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
-%%DATADIR%%/sounds/music/48000/ponce-preludio-in-e-major.wav
-%%DATADIR%%/sounds/music/48000/suite-espanola-op-47-leyenda.wav
-%%DATADIR%%/sounds/music/48000/danza-espanola-op-37-h-142-xii-arabesca.wav
-@dirrm %%DATADIR%%/sounds/music/8000
-@dirrm %%DATADIR%%/sounds/music/16000
-@dirrm %%DATADIR%%/sounds/music/32000
-@dirrm %%DATADIR%%/sounds/music/48000
-@dirrm %%DATADIR%%/sounds/music
-@dirrmtry %%DATADIR%%/sounds
-@dirrmtry %%DATADIR%%
+share/freeswitch/sounds/.freeswitch-music
+%%WITH_8K%%share/freeswitch/sounds/music/8000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_8K%%share/freeswitch/sounds/music/8000/ponce-preludio-in-e-major.wav
+%%WITH_8K%%share/freeswitch/sounds/music/8000/suite-espanola-op-47-leyenda.wav
+%%WITH_8K%%share/freeswitch/sounds/music/8000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_16K%%share/freeswitch/sounds/music/16000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_16K%%share/freeswitch/sounds/music/16000/ponce-preludio-in-e-major.wav
+%%WITH_16K%%share/freeswitch/sounds/music/16000/suite-espanola-op-47-leyenda.wav
+%%WITH_16K%%share/freeswitch/sounds/music/16000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_16K%%share/freeswitch/sounds/music/32000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_32K%%share/freeswitch/sounds/music/32000/ponce-preludio-in-e-major.wav
+%%WITH_32K%%share/freeswitch/sounds/music/32000/suite-espanola-op-47-leyenda.wav
+%%WITH_32K%%share/freeswitch/sounds/music/32000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_48K%%share/freeswitch/sounds/music/48000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_48K%%share/freeswitch/sounds/music/48000/ponce-preludio-in-e-major.wav
+%%WITH_48K%%share/freeswitch/sounds/music/48000/suite-espanola-op-47-leyenda.wav
+%%WITH_48K%%share/freeswitch/sounds/music/48000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_8K%%@dirrm share/freeswitch/sounds/music/8000
+%%WITH_16K%%@dirrm share/freeswitch/sounds/music/16000
+%%WITH_32K%%@dirrm share/freeswitch/sounds/music/32000
+%%WITH_48K%%@dirrm share/freeswitch/sounds/music/48000
+@dirrm share/freeswitch/sounds/music
+@dirrmtry share/freeswitch/sounds
+@dirrmtry share/freeswitch