2 files changed, 39 insertions, 34 deletions

diff --git a/audio/freeswitch-music/Makefile b/audio/freeswitch-music/Makefile
index 1b718b2e0876..dd11866be054 100644
--- a/audio/freeswitch-music/Makefile
+++ b/audio/freeswitch-music/Makefile
@@ -24,35 +24,40 @@ SHAREOWN=	${USERS}
 SHAREGRP=	${SHAREOWN}
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
-OPTIONS=	8K           "Install 8000Hz Music" on \
-		16K          "Install 16000Hz Music" on \
-		32K          "Install 32000Hz Music" on \
-		48K          "Install 48000Hz Music" on
+OPTIONS_DEFINE=	8K 16K 32K 48K
+
+8K_DESC=	8000Hz Music
+16K_DESC=	16000Hz Music
+32K_DESC=	32000Hz Music
+48K_DESC=	48000Hz Music
+
+OPTIONS_DEFAULT=	8K 16K
+NO_OPTIONS_SORT=	yes
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_8K)
+.if ${PORT_OPTIONS:M8K}
 DISTFILES+=	freeswitch-sounds-music-8000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
-.if defined(WITH_16K)
+.if ${PORT_OPTIONS:M16K}
 DISTFILES+=	freeswitch-sounds-music-16000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
-.if defined(WITH_32K)
+.if ${PORT_OPTIONS:M32K}
 DISTFILES+=	freeswitch-sounds-music-32000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
-.if defined(WITH_48K)
+.if ${PORT_OPTIONS:M48K}
 DISTFILES+=	freeswitch-sounds-music-48000-${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
-.for i in 8K 16K 32K 48K
-.  if !defined(WITH_${i})
-PLIST_SUB+=	WITH_${i}="@comment "
-.  else
-PLIST_SUB+=	WITH_${i}=""
-.  endif
+.for opt in ${ALL_OPTIONS}
+.if $(PORT_OPTIONS:M${opt})
+PLIST_SUB+=	${opt}=""
+.else
+PLIST_SUB+=	${opt}="@comment "
+.endif
 .endfor
 
 do-install:
diff --git a/audio/freeswitch-music/pkg-plist b/audio/freeswitch-music/pkg-plist
index 45f5f83cdad1..2330014ebdb2 100644
--- a/audio/freeswitch-music/pkg-plist
+++ b/audio/freeswitch-music/pkg-plist
@@ -1,24 +1,24 @@
 %%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
+%%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
+%%8K%%%%DATADIR%%/sounds/music/8000/suite-espanola-op-47-leyenda.wav
+%%8K%%%%DATADIR%%/sounds/music/8000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%16K%%%%DATADIR%%/sounds/music/16000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%16K%%%%DATADIR%%/sounds/music/16000/ponce-preludio-in-e-major.wav
+%%16K%%%%DATADIR%%/sounds/music/16000/suite-espanola-op-47-leyenda.wav
+%%16K%%%%DATADIR%%/sounds/music/16000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%32K%%%%DATADIR%%/sounds/music/32000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%32K%%%%DATADIR%%/sounds/music/32000/ponce-preludio-in-e-major.wav
+%%32K%%%%DATADIR%%/sounds/music/32000/suite-espanola-op-47-leyenda.wav
+%%32K%%%%DATADIR%%/sounds/music/32000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%48K%%%%DATADIR%%/sounds/music/48000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
+%%48K%%%%DATADIR%%/sounds/music/48000/ponce-preludio-in-e-major.wav
+%%48K%%%%DATADIR%%/sounds/music/48000/suite-espanola-op-47-leyenda.wav
+%%48K%%%%DATADIR%%/sounds/music/48000/danza-espanola-op-37-h-142-xii-arabesca.wav
+%%8K%%@dirrm %%DATADIR%%/sounds/music/8000
+%%16K%%@dirrm %%DATADIR%%/sounds/music/16000
+%%32K%%@dirrm %%DATADIR%%/sounds/music/32000
+%%48K%%@dirrm %%DATADIR%%/sounds/music/48000
 @dirrm %%DATADIR%%/sounds/music
 @dirrmtry %%DATADIR%%/sounds
 @dirrmtry %%DATADIR%%