- Add dependency on net/freeswitch-core

- Use PKGNAMESUFFIX instead of PORTNAME; update DIST_SUBDIR

PR:		ports/167873
Submitted by:	Rich Neese (maintainer)

- Use DATADIR
- Don't try to remove shared folders on deinstall

3 files changed, 52 insertions, 47 deletions

diff --git a/audio/freeswitch-music/Makefile b/audio/freeswitch-music/Makefile
index e06e5963fb59..32050d1493f0 100644
--- a/audio/freeswitch-music/Makefile
+++ b/audio/freeswitch-music/Makefile
@@ -5,20 +5,23 @@
 # $FreeBSD$
 #
 
-PORTNAME=	freeswitch-music
+PORTNAME=	freeswitch
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://files.freeswitch.org/
-DIST_SUBDIR=	freeswitch-music
+PKGNAMESUFFIX=	-music
+DIST_SUBDIR=	freeswitch
 
 MAINTAINER=	r.neese@gmail.com
 COMMENT=	FreeSwitch Music - All Bitrates
 
+RUN_DEPENDS=	${LOCALBASE}/bin/freeswitch:${PORTSDIR}/net/freeswitch-core
+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-
-BASE_PORTNAME=	freeswitch
+SHAREOWN=	${PORTNAME}
+SHAREGRP=	${SHAREOWN}
 
 OPTIONS=	8K           "Install 8000Hz Music" on \
 		16K          "Install 16000Hz Music" on \
@@ -26,31 +29,35 @@ OPTIONS=	8K           "Install 8000Hz Music" on \
 		48K          "Install 48000Hz Music" on
 
 .include <bsd.port.options.mk>
+
 .if defined(WITH_8K)
-DISTFILES+=	freeswitch-sounds-music-8000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-8000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
+
 .if defined(WITH_16K)
-DISTFILES+=	freeswitch-sounds-music-16000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-16000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
+
 .if defined(WITH_32K)
-DISTFILES+=	freeswitch-sounds-music-32000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-32000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
+
 .if defined(WITH_48K)
-DISTFILES+=	freeswitch-sounds-music-48000-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES+=	freeswitch-sounds-music-48000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
 .for i in 8K 16K 32K 48K
-.if !defined(WITH_${i})
+.  if !defined(WITH_${i})
 PLIST_SUB+=	WITH_${i}="@comment "
-.else
+.  else
 PLIST_SUB+=	WITH_${i}=""
-.endif
+.  endif
 .endfor
 
 do-install:
 	@${ECHO_MSG} "Installing files..."
-	${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
-	${TOUCH} ${PREFIX}/share/${BASE_PORTNAME}/sounds/.freeswitch-music
-	(cd ${WRKSRC} &&${COPYTREE_SHARE} \* ${PREFIX}/share/${BASE_PORTNAME}/sounds/)
+	${MKDIR} ${DATADIR}/sounds
+	${TOUCH} ${DATADIR}/sounds/.freeswitch-music
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR}/sounds/)
 
 .include <bsd.port.mk>
diff --git a/audio/freeswitch-music/distinfo b/audio/freeswitch-music/distinfo
index bd8d0b0dd4d2..2261f2460e61 100644
--- a/audio/freeswitch-music/distinfo
+++ b/audio/freeswitch-music/distinfo
@@ -1,8 +1,8 @@
-SHA256 (freeswitch-music/freeswitch-sounds-music-8000-1.0.8.tar.gz) = 02de6a0a4617c36b3ae3b8ad4f8d78aa39d5856d153d7da54cfd1fa6792a8837
-SIZE (freeswitch-music/freeswitch-sounds-music-8000-1.0.8.tar.gz) = 14122644
-SHA256 (freeswitch-music/freeswitch-sounds-music-16000-1.0.8.tar.gz) = d1e1dbaec323691f7630f834e5bddc3683303f297bdbbc3694dd2d51430f58d2
-SIZE (freeswitch-music/freeswitch-sounds-music-16000-1.0.8.tar.gz) = 27233654
-SHA256 (freeswitch-music/freeswitch-sounds-music-32000-1.0.8.tar.gz) = 68c7b1e8254438e622dbce7db321009a68b3c1620241354655440a0904423e12
-SIZE (freeswitch-music/freeswitch-sounds-music-32000-1.0.8.tar.gz) = 52284585
-SHA256 (freeswitch-music/freeswitch-sounds-music-48000-1.0.8.tar.gz) = ebca40460bcbe4ec6e17a62a9b4dbde5b8facfaf5ae66575484f33c5d09dde6a
-SIZE (freeswitch-music/freeswitch-sounds-music-48000-1.0.8.tar.gz) = 75215628
+SHA256 (freeswitch/freeswitch-sounds-music-8000-1.0.8.tar.gz) = 02de6a0a4617c36b3ae3b8ad4f8d78aa39d5856d153d7da54cfd1fa6792a8837
+SIZE (freeswitch/freeswitch-sounds-music-8000-1.0.8.tar.gz) = 14122644
+SHA256 (freeswitch/freeswitch-sounds-music-16000-1.0.8.tar.gz) = d1e1dbaec323691f7630f834e5bddc3683303f297bdbbc3694dd2d51430f58d2
+SIZE (freeswitch/freeswitch-sounds-music-16000-1.0.8.tar.gz) = 27233654
+SHA256 (freeswitch/freeswitch-sounds-music-32000-1.0.8.tar.gz) = 68c7b1e8254438e622dbce7db321009a68b3c1620241354655440a0904423e12
+SIZE (freeswitch/freeswitch-sounds-music-32000-1.0.8.tar.gz) = 52284585
+SHA256 (freeswitch/freeswitch-sounds-music-48000-1.0.8.tar.gz) = ebca40460bcbe4ec6e17a62a9b4dbde5b8facfaf5ae66575484f33c5d09dde6a
+SIZE (freeswitch/freeswitch-sounds-music-48000-1.0.8.tar.gz) = 75215628
diff --git a/audio/freeswitch-music/pkg-plist b/audio/freeswitch-music/pkg-plist
index df6c82221749..56402b090dcb 100644
--- a/audio/freeswitch-music/pkg-plist
+++ b/audio/freeswitch-music/pkg-plist
@@ -1,24 +1,22 @@
-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
+%%DATADIR%%/sounds/.freeswitch-music
+%%WITH_8K%%%%DATADIR%%/sounds/music/8000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_8K%%%%DATADIR%%/sounds/music/8000/ponce-preludio-in-e-major.wav
+%%WITH_8K%%%%DATADIR%%/sounds/music/8000/suite-espanola-op-47-leyenda.wav
+%%WITH_8K%%%%DATADIR%%/sounds/music/8000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_16K%%%%DATADIR%%/sounds/music/16000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_16K%%%%DATADIR%%/sounds/music/16000/ponce-preludio-in-e-major.wav
+%%WITH_16K%%%%DATADIR%%/sounds/music/16000/suite-espanola-op-47-leyenda.wav
+%%WITH_16K%%%%DATADIR%%/sounds/music/16000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_16K%%%%DATADIR%%/sounds/music/32000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_32K%%%%DATADIR%%/sounds/music/32000/ponce-preludio-in-e-major.wav
+%%WITH_32K%%%%DATADIR%%/sounds/music/32000/suite-espanola-op-47-leyenda.wav
+%%WITH_32K%%%%DATADIR%%/sounds/music/32000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_48K%%%%DATADIR%%/sounds/music/48000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%WITH_48K%%%%DATADIR%%/sounds/music/48000/ponce-preludio-in-e-major.wav
+%%WITH_48K%%%%DATADIR%%/sounds/music/48000/suite-espanola-op-47-leyenda.wav
+%%WITH_48K%%%%DATADIR%%/sounds/music/48000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%WITH_8K%%@dirrm %%DATADIR%%/sounds/music/8000
+%%WITH_16K%%@dirrm %%DATADIR%%/sounds/music/16000
+%%WITH_32K%%@dirrm %%DATADIR%%/sounds/music/32000
+%%WITH_48K%%@dirrm %%DATADIR%%/sounds/music/48000
+@dirrm %%DATADIR%%/sounds/music