Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Jul 2010 15:23:17 GMT
From:      Richard Neese <r.neese@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/148760: update for freeswitch-music
Message-ID:  <201007191523.o6JFNHgr038898@www.freebsd.org>
Resent-Message-ID: <201007191530.o6JFU1fE066860@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         148760
>Category:       ports
>Synopsis:       update for freeswitch-music
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 19 15:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Richard Neese
>Release:        8.1-rc2
>Organization:
>Environment:
FreeBSD daemonswitch.homeip.net 8.1-RC2 FreeBSD 8.1-RC2 #2: Wed Jul 14 20:44:20 EDT 2010     root@daemonswitch.homeip.net:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
update to fix freeswitch-music to work with meta port
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

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	19 Jul 2010 14:25:05 -0000
@@ -5,19 +5,22 @@
 # $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@secure-computing.net
 COMMENT=	FreeSwitch Music - All Bitrates
 
+RUN_DEPENDS+=	${LOCALBASE}/bin/freeswitch:${PORTSDIR}/net/freeswitch-core
+
 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 +28,22 @@
 
 .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
-
 do-install:
 	@${ECHO_MSG} "Installing files..."
-	${MKDIR} ${PREFIX}/share/${PORTNAME}/sounds
-	(cd ${WRKDIR} &&${COPYTREE_SHARE} \* ${DATADIR}/sounds/)
+	${TOUCH} ${PREFIX}share/${BASE_PORTNAME}/sounds/.freeswitch-music
+	@cd ${WRKSRC}/tmp; ${FIND} . \
+		| ${CPIO} -pdm -R freeswitch:freeswitch ${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	19 Jul 2010 14:25:05 -0000
@@ -1,3 +1,4 @@
+%%DATADIR%%/sounds/.freeswitch-music
 %%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


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007191523.o6JFNHgr038898>