svn commit: r335817 - head/audio/freeswitch-music
Antoine Brodin
antoine at FreeBSD.org
Sat Dec 7 09:07:41 UTC 2013
Author: antoine
Date: Sat Dec 7 09:07:40 2013
New Revision: 335817
URL: http://svnweb.freebsd.org/changeset/ports/335817
Log:
- Fix leftovers, NO_WRKSUBDIR and * do not play well together
- Stage support
- Use OPTIONS helpers
Modified:
head/audio/freeswitch-music/Makefile
head/audio/freeswitch-music/pkg-plist
Modified: head/audio/freeswitch-music/Makefile
==============================================================================
--- head/audio/freeswitch-music/Makefile Sat Dec 7 09:01:11 2013 (r335816)
+++ head/audio/freeswitch-music/Makefile Sat Dec 7 09:07:40 2013 (r335817)
@@ -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>
Modified: head/audio/freeswitch-music/pkg-plist
==============================================================================
--- head/audio/freeswitch-music/pkg-plist Sat Dec 7 09:01:11 2013 (r335816)
+++ head/audio/freeswitch-music/pkg-plist Sat Dec 7 09:07:40 2013 (r335817)
@@ -1,3 +1,5 @@
+ at owner freeswitch
+ at 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
+ at owner
+ at group
@dirrmtry %%DATADIR%%
More information about the svn-ports-head
mailing list