ports/149767: net/freeswitch: update to meta port, now it actually works!

[Eric F Crist]

>Number:         149767
>Category:       ports
>Synopsis:       net/freeswitch: update to meta port, now it actually works!
>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 18 14:00:04 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:
	update to meta port in line with changes to dependants.  This port should actually work now with everything else that's going on.

>How-To-Repeat:
>Fix:

--- fsm.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	16 Jun 2010 15:03:57 -0000	1.10
+++ Makefile	18 Aug 2010 13:28:52 -0000
@@ -5,32 +5,42 @@
 # $FreeBSD: ports/net/freeswitch/Makefile,v 1.10 2010/06/16 15:03:57 jpaetzel Exp $
 #
 
-PORTNAME=       freeswitch
-PORTVERSION=    1.0.6
-CATEGORIES=     net
-MASTER_SITES=   # none
-DISTFILES=      # none
-EXTRACT_ONLY=   # none
-
-MAINTAINER=     ecrist at secure-computing.net
-COMMENT=        FreeSwitch meta-port to pull in all the components
-
-NO_BUILD=	YES
-SUB_FILES=      pkg-message
-
-OPTIONS=        CORE         "FreeSwitch PBX Software" on \
-		SOUNDS       "Sound files for use with FreeSwitch PBX" on \
-		MUSIC        "Music on hold for use with FreeSwitch PBX" on
+PORTNAME=	freeswitch
+PORTVERSION=	1.0.6
+CATEGORIES=	net
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	ecrist at secure-computing.net
+COMMENT=	FreeSwitch meta-port to pull in all the components
+
+RUN_DEPENDS=	${LOCALBASE}/bin/freeswitch:${PORTSDIR}/net/freeswitch-core
+
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
+
+OPTIONS=	SOUNDS	"Sound files for use with FreeSwitch PBX" on \
+		MUSIC	"Music on hold for use with FreeSwitch PBX" on \
+		PIZZA	"Install Pizza Shop voice demo" off \
+		SCRIPTS	"Install Freeswitch various scripts" off \
 
 .include <bsd.port.options.mk>
-.if defined(WITH_CORE)
-RUN_DEPENDS+= freeswitch:${PORTSDIR}/net/freeswitch-core
-.endif
+
 .if defined(WITH_SOUNDS)
-RUN_DEPENDS+= ${LOCALBASE}/share/freeswitch/sounds/.freeswitch-sounds:${PORTSDIR}/audio/freeswitch-sounds
+RUN_DEPENDS+=	${LOCALBASE}/share/freeswitch/sounds/.freeswitch-sounds:${PORTSDIR}/audio/freeswitch-sounds
 .endif
+
 .if defined(WITH_MUSIC)
-RUN_DEPENDS+= ${LOCALBASE}/share/freeswitch/sounds/music:${PORTSDIR}/audio/freeswitch-music
+RUN_DEPENDS+=	${LOCALBASE}/share/freeswitch/sounds/.freeswitch-music:${PORTSDIR}/audio/freeswitch-music
+.endif
+
+.if defined(WITH_PIZZA)
+RUN_DEPENDS+=	${LOCALBASE}/share/freeswitch/sounds/.pizza:${PORTSDIR}/misc/freeswitch-pizzademo
+.endif
+
+.if defined(WITH_SCRIPTS)
+RUN_DEPENDS+=	${LOCALBASE}/freeswitch/scripts/.scripts:${PORTSDIR}/misc/freeswitch-scripts
 .endif
 
 do-install: build
--- fsm.diff ends here ---


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