ports/149527: audio/freeswitch-music: Makefile Updates
Eric F Crist
ecrist at secure-computing.net
Wed Aug 11 14:00:20 UTC 2010
>Number: 149527
>Category: ports
>Synopsis: audio/freeswitch-music: Makefile Updates
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 11 14:00:20 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Eric F Crist
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
Secure Computing Networks
>Environment:
System: FreeBSD cartman.secure-computing.net 9.0-CURRENT FreeBSD 9.0-CURRENT #2: Mon Apr 12 12:46:23 CDT 2010 root at cartman.secure-computing.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
This update allows freeswitch-music to fit in with the schema for use with our meta port.
>How-To-Repeat:
>Fix:
--- fs-music.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/freeswitch-music/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 16 Jun 2010 15:03:57 -0000 1.2
+++ Makefile 11 Aug 2010 13:11:53 -0000
@@ -5,11 +5,10 @@
# $FreeBSD: ports/audio/freeswitch-music/Makefile,v 1.2 2010/06/16 15:03:57 jpaetzel Exp $
#
-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 at secure-computing.net
@@ -18,6 +17,8 @@
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 @@
.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>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/freeswitch-music/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 11 Jun 2010 22:30:12 -0000 1.1
+++ pkg-plist 11 Aug 2010 12:44:13 -0000
@@ -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
- at dirrm %%DATADIR%%/sounds/music/8000
- at dirrm %%DATADIR%%/sounds/music/16000
- at dirrm %%DATADIR%%/sounds/music/32000
- at dirrm %%DATADIR%%/sounds/music/48000
- at dirrm %%DATADIR%%/sounds/music
- at dirrmtry %%DATADIR%%/sounds
- at 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
+ at dirrm share/freeswitch/sounds/music
+ at dirrmtry share/freeswitch/sounds
+ at dirrmtry share/freeswitch
--- fs-music.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list