From 7c66b0b5778b5138352ec240a550198570d61cc3 Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 7 Dec 2013 09:07:40 +0000
Subject: [PATCH] - Fix leftovers, NO_WRKSUBDIR and * do not play well together
 - Stage support - Use OPTIONS helpers

---
 audio/freeswitch-music/Makefile  | 38 +++++++-------------------------
 audio/freeswitch-music/pkg-plist |  4 ++++
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/audio/freeswitch-music/Makefile b/audio/freeswitch-music/Makefile
index bd79b86032d4..9d4ca26d64d7 100644
--- a/audio/freeswitch-music/Makefile
+++ b/audio/freeswitch-music/Makefile
@@ -15,10 +15,7 @@ COMMENT=	FreeSwitch Music - All Bitrates
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USERS=		${PORTNAME}
-NO_STAGE=	yes
 GROUPS=		${USERS}
-SHAREOWN=	${USERS}
-SHAREGRP=	${SHAREOWN}
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=	8K 16K 32K 48K
@@ -31,36 +28,17 @@ OPTIONS_DEFINE=	8K 16K 32K 48K
 OPTIONS_DEFAULT=	8K 16K
 NO_OPTIONS_SORT=	yes
 
-.include <bsd.port.options.mk>
+8K_DISTFILES=	freeswitch-sounds-music-8000-${DISTVERSION}${EXTRACT_SUFX}
+16K_DISTFILES=	freeswitch-sounds-music-16000-${DISTVERSION}${EXTRACT_SUFX}
+32K_DISTFILES=	freeswitch-sounds-music-32000-${DISTVERSION}${EXTRACT_SUFX}
+48K_DISTFILES=	freeswitch-sounds-music-48000-${DISTVERSION}${EXTRACT_SUFX}
 
-.if ${PORT_OPTIONS:M8K}
-DISTFILES+=	freeswitch-sounds-music-8000-${DISTVERSION}${EXTRACT_SUFX}
-.endif
-
-.if ${PORT_OPTIONS:M16K}
-DISTFILES+=	freeswitch-sounds-music-16000-${DISTVERSION}${EXTRACT_SUFX}
-.endif
-
-.if ${PORT_OPTIONS:M32K}
-DISTFILES+=	freeswitch-sounds-music-32000-${DISTVERSION}${EXTRACT_SUFX}
-.endif
-
-.if ${PORT_OPTIONS:M48K}
-DISTFILES+=	freeswitch-sounds-music-48000-${DISTVERSION}${EXTRACT_SUFX}
-.endif
-
-.for opt in ${ALL_OPTIONS}
-.if ${PORT_OPTIONS:M${opt}}
-PLIST_SUB+=	${opt}=""
-.else
-PLIST_SUB+=	${opt}="@comment "
-.endif
-.endfor
+OPTIONS_SUB=	yes
 
 do-install:
 	@${ECHO_MSG} "Installing files..."
-	${MKDIR} ${DATADIR}/sounds
-	${TOUCH} ${DATADIR}/sounds/.freeswitch-music
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR}/sounds/)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/sounds
+	${TOUCH} ${STAGEDIR}${DATADIR}/sounds/.freeswitch-music
+	cd ${WRKSRC} && ${COPYTREE_SHARE} music ${STAGEDIR}${DATADIR}/sounds
 
 .include <bsd.port.mk>
diff --git a/audio/freeswitch-music/pkg-plist b/audio/freeswitch-music/pkg-plist
index 2330014ebdb2..17c9de64cba5 100644
--- a/audio/freeswitch-music/pkg-plist
+++ b/audio/freeswitch-music/pkg-plist
@@ -1,3 +1,5 @@
+@owner freeswitch
+@group freeswitch
 %%DATADIR%%/sounds/.freeswitch-music
 %%8K%%%%DATADIR%%/sounds/music/8000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
 %%8K%%%%DATADIR%%/sounds/music/8000/ponce-preludio-in-e-major.wav
@@ -21,4 +23,6 @@
 %%48K%%@dirrm %%DATADIR%%/sounds/music/48000
 @dirrm %%DATADIR%%/sounds/music
 @dirrmtry %%DATADIR%%/sounds
+@owner
+@group
 @dirrmtry %%DATADIR%%