Add configuration ports for freeswitch-devel; vanilla, sbc, insideout and curl

PR:		ports/167877
PR:		ports/167878
PR:		ports/167879
PR:		ports/167881
Submitted by:	Richard Neese (r.neese@gmail.com) (maintainer)

Fix some minor pkg-install script issues in -core-devel

Use a cookie file to install ETCDIR/conf directory structure rather than
@exec mkdir to simplify installation

14 files changed, 146 insertions, 18 deletions

diff --git a/net/Makefile b/net/Makefile
index cce6d91bfda0..60ab904ad58b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -156,6 +156,10 @@
     SUBDIR += freeswitch
     SUBDIR += freeswitch-core
     SUBDIR += freeswitch-core-devel
+    SUBDIR += freeswitch-curl-devel
+    SUBDIR += freeswitch-insideout-devel
+    SUBDIR += freeswitch-sbc-devel
+    SUBDIR += freeswitch-vanilla-devel
     SUBDIR += freevrrpd
     SUBDIR += freewais-sf
     SUBDIR += frickin
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index e4f97bc069f8..50ca78284293 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freeswitch
 DISTVERSION=	1.2.rc2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://files.freeswitch.org/ \
 		http://files.freeswitch.org/downloads/libs/:2 \
@@ -89,8 +89,6 @@ GROUPS=	${FREESWITCH_GROUP}
 SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} \
 		FREESWITCH_GROUP=${FREESWITCH_GROUP}
 
-BASE_PORTNAME=	${FREESWITCH_USER}
-
 VARBASE=	/var
 ETCDIR=	${PREFIX}/etc/${PORTNAME}
 WWWDIR=	${PREFIX}/www/${PORTNAME}
@@ -334,18 +332,20 @@ post-configure:
 pre-install:
 	@${CHMOD} 664 ${WRKSRC}/libs/freetdm/conf/*
 	@${MKDIR} ${ETCDIR}/conf
+	@${TOUCH} ${ETCDIR}/conf/.freeswitch-core-devel
 .if defined(WITH_MODFREETDM)
 	@${MKDIR} ${ETCDIR}/conf/autoload_configs
 .endif
-	@${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/. -type d | ${XARGS} ${CHMOD} 770
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-	    ${SH} ${PKGINSTALL} ${BASE_PORTNAME} POST-INSTALL
-	@${FIND} ${ETCDIR}/. -type d | ${XARGS} ${CHMOD} 770
-	@${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
-	@${CHMOD} -R 770 ${PREFIX}/share/${BASE_PORTNAME}
-	@${FIND} ${ETCDIR}/. -type f | ${XARGS} ${CHMOD} 660
-	@${FIND} ${WWWDIR}/. -type f | ${XARGS} ${CHMOD} 660
+	    ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CHOWN} -R ${USERS}:${GROUPS} ${ETCDIR} ${DATADIR} \
+		${PREFIX}/include/${PORTNAME} \
+		${PREFIX}/lib/${PORTNAME}
+	@${FIND} ${ETCDIR} -type d | ${XARGS} ${CHMOD} 770
+	@${MKDIR} ${DATADIR}/sounds
+	@${CHMOD} -R 770 ${DATADIR}
+	@${FIND} ${ETCDIR} ${WWWDIR} -type f | ${XARGS} ${CHMOD} 660
 
 .include <bsd.port.mk>
diff --git a/net/freeswitch-core-devel/files/pkg-install.in b/net/freeswitch-core-devel/files/pkg-install.in
index 94fd2debd181..8a1e177eb6b9 100644
--- a/net/freeswitch-core-devel/files/pkg-install.in
+++ b/net/freeswitch-core-devel/files/pkg-install.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/net/freeswitch-core-devel/files/pkg-install.in,v 1.1 2012-05-17 21:03:11 crees Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/freeswitch-core-devel/files/pkg-install.in,v 1.2 2012-05-22 19:12:47 crees Exp $
 #
 
 if [ "$2" != "POST-INSTALL" ]; then
@@ -13,17 +13,15 @@ for dir in \
 	do install -d -o %%FREESWITCH_USER%% -g %%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir
 done
 
-for dir in etc/freeswitch include/freeswitch lib/freeswitch share/freeswitch
-	do chown %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir
-done
-
 find ${PKG_PREFIX}/etc/freeswitch/ -type d -exec chmod 770 {} +
 find ${PKG_PREFIX}/etc/freeswitch/ -type f -exec chmod 660 {} +
+/usr/sbin/chown -R %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%% \
+		%%ETCDIR%% %%DATADIR%% \
+                ${PKG_PREFIX}/include/freeswitch \
+                ${PKG_PREFIX}/lib/freeswitch
 
 chmod 775 ${PKG_PREFIX}/share/freeswitch
 
-@cwd /var
-
 for dir in \
     db/freeswitch \
     freeswitch/recordings \
@@ -33,7 +31,7 @@ done
 
 echo "This port chown -R various directories %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%%"
 echo "This port chmod -R 770 various directories"
-echo" This port chmod -R 660 various files"
+echo "This port chmod -R 660 various files"
 echo "This is for security reasons.  In the event something should"
 echo "stop working, please take the time to check the following dirs:"
 echo " /var/log/freeswitch /var/freeswitch"
diff --git a/net/freeswitch-core-devel/pkg-plist b/net/freeswitch-core-devel/pkg-plist
index 9004e00bb061..9639998669be 100644
--- a/net/freeswitch-core-devel/pkg-plist
+++ b/net/freeswitch-core-devel/pkg-plist
@@ -6,6 +6,7 @@ bin/fs_ivrd
 bin/fsxs
 bin/gentls_cert
 bin/tone2wav
+%%ETCDIR%%/conf/.freeswitch-core-devel
 %%MODFREETDM%%%%ETCDIR%%/conf/autoload_configs/freetdm.conf.xml.sample
 %%MODFREETDM%%%%ETCDIR%%/conf/freetdm.conf.sample
 %%MODFREETDM%%%%ETCDIR%%/conf/pika.conf.sample
diff --git a/net/freeswitch-curl-devel/Makefile b/net/freeswitch-curl-devel/Makefile
new file mode 100644
index 000000000000..d2c3c48b9ec0
--- /dev/null
+++ b/net/freeswitch-curl-devel/Makefile
@@ -0,0 +1,12 @@
+# Ports collection makefile for:	net/freeswitch-sbc-devel
+# Date created:				May 11, 2012
+# Whom:					Richard Neese <r.neese@gmail.com>
+#
+# $FreeBSD$
+#
+
+FREESWITCH_CONF_DIST=	curl
+DESCR=			${.CURDIR}/pkg-descr
+MASTERDIR=		${.CURDIR}/../freeswitch-vanilla-devel
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/freeswitch-curl-devel/pkg-descr b/net/freeswitch-curl-devel/pkg-descr
new file mode 100644
index 000000000000..af6ec5e8915f
--- /dev/null
+++ b/net/freeswitch-curl-devel/pkg-descr
@@ -0,0 +1,4 @@
+Session Border Controller dialplan config file 
+for FreeSwitch Voip SoftSwitch & OpenSource PBX
+
+WWW: http://www.freeswitch.org/
diff --git a/net/freeswitch-insideout-devel/Makefile b/net/freeswitch-insideout-devel/Makefile
new file mode 100644
index 000000000000..94925ef6ceb1
--- /dev/null
+++ b/net/freeswitch-insideout-devel/Makefile
@@ -0,0 +1,12 @@
+# Ports collection makefile for:	net/freeswitch-insideout
+# Date created:				May 11, 2012
+# Whom:					Richard Neese <r.neese@gmail.com>
+#
+# $FreeBSD$
+#
+
+FREESWITCH_CONF_DIST=	insideout
+DESCR=			${.CURDIR}/pkg-descr
+MASTERDIR=		${.CURDIR}/../freeswitch-vanilla-devel
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/freeswitch-insideout-devel/pkg-descr b/net/freeswitch-insideout-devel/pkg-descr
new file mode 100644
index 000000000000..5bfb792b8bd5
--- /dev/null
+++ b/net/freeswitch-insideout-devel/pkg-descr
@@ -0,0 +1,4 @@
+Basic inside out dialplan config file for FreeSwitch Voip SoftSwitch &
+OpenSource PBX
+
+WWW: http://www.freeswitch.org/
diff --git a/net/freeswitch-sbc-devel/Makefile b/net/freeswitch-sbc-devel/Makefile
new file mode 100644
index 000000000000..9781ffadead6
--- /dev/null
+++ b/net/freeswitch-sbc-devel/Makefile
@@ -0,0 +1,12 @@
+# Ports collection makefile for:	net/freeswitch-sbc-devel
+# Date created:				May 11, 2012
+# Whom:					Richard Neese <r.neese@gmail.com>
+#
+# $FreeBSD$
+#
+
+FREESWITCH_CONF_DIST=	sbc
+DESCR=			${.CURDIR}/pkg-descr
+MASTERDIR=		${.CURDIR}/../freeswitch-vanilla-devel
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/freeswitch-sbc-devel/pkg-descr b/net/freeswitch-sbc-devel/pkg-descr
new file mode 100644
index 000000000000..af6ec5e8915f
--- /dev/null
+++ b/net/freeswitch-sbc-devel/pkg-descr
@@ -0,0 +1,4 @@
+Session Border Controller dialplan config file 
+for FreeSwitch Voip SoftSwitch & OpenSource PBX
+
+WWW: http://www.freeswitch.org/
diff --git a/net/freeswitch-vanilla-devel/Makefile b/net/freeswitch-vanilla-devel/Makefile
new file mode 100644
index 000000000000..18a195a97895
--- /dev/null
+++ b/net/freeswitch-vanilla-devel/Makefile
@@ -0,0 +1,66 @@
+# Ports collection makefile for:	net/freeswitch-vanilla-devel
+# Date created:				May 11, 2012
+# Whom:					Richard Neese <r.neese@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	freeswitch
+DISTVERSION=	1.2.rc2
+CATEGORIES=	net
+MASTER_SITES=	http://files.freeswitch.org/
+PKGNAMESUFFIX=	-${FREESWITCH_CONF_DIST}-devel
+DIST_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	r.neese@gmail.com
+COMMENT=	FreeSwitch configuration files; ${FREESWITCH_CONF_DIST} variant
+
+RUN_DEPENDS=    freeswitch:${PORTSDIR}/net/freeswitch-core-devel
+
+FREESWITCH_CONF_DIST?=	vanilla
+
+USE_BZIP2=	yes
+NO_BUILD=	yes
+SHAREOWN=	${PORTNAME}
+SHAREGRP=	${SHAREOWN}
+
+PLIST=	${MASTERDIR}/pkg-plist-${FREESWITCH_CONF_DIST}
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}/conf/${FREESWITCH_CONF_DIST}
+
+# Do some checking and conflict on other conf dists
+VALID_DISTS=	vanilla sbc curl insideout
+
+.for d in ${FREESWITCH_CONF_DIST}
+.  if ${VALID_DISTS:M$d}
+CONFLICTS_INSTALL=	${VALID_DISTS:N$d:S/^/freeswitch-/:S/$/-devel-[0-9]*/}
+.  else
+IGNORE=	requires a valid conf distribution in FREESWITCH_CONF_DIST; use a slave port
+.  endif
+.endfor
+
+CONF_EXTENSIONS=	xml ttml tpl conf types yaml FS0
+
+post-patch:
+	@cd ${WRKSRC} && for i in $$(${FIND} . -type f ${CONF_EXTENSIONS:C/.*/-name \*.& -o/} -false); \
+		do [ -f $${i}.sample ] || ${MV} $$i $${i}.sample ; done
+
+do-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${ETCDIR}/conf/
+	${FIND} ${ETCDIR} -type d -exec chmod 770 '{}' \;
+	for i in $$(cd ${WRKSRC} && ${FIND} * \
+	  -type f -name '*.sample' | ${SED} 's|^|${ETCDIR_REL}/conf/|'); \
+	    do	${ECHO_CMD} "@unexec cmp -s %D/$$i %D/$${i%.sample} && ${RM} %D/$${i%.sample} || ${TRUE}" >> ${TMPPLIST}; \
+		${ECHO_CMD} "$$i" >> ${TMPPLIST} ; \
+		${ECHO_CMD} "@exec [ -f %D/$${i%.sample} ] || \
+			${CP} -p %D/%F %D/$${i%.sample}" >> ${TMPPLIST} ; \
+		[ -f ${ETCDIR}/conf/$${i%.sample} ] || ${CP} -p ${PREFIX}/$$i ${PREFIX}/$${i%.sample} ; \
+	done
+	${TOUCH} ${ETCDIR}/conf/.${FREESWITCH_CONF_DIST}
+	${ECHO_CMD} '${ETCDIR_REL}/conf/.${FREESWITCH_CONF_DIST}' >> ${TMPPLIST}
+	for dir in $$(cd ${WRKSRC} && ${FIND} * -type d -not -path directory\* | ${SORT} -r) ; \
+	    do	${ECHO_CMD} "@dirrm ${ETCDIR_REL}/conf/$$dir" >> ${TMPPLIST} ; \
+	done
+
+
+.include <bsd.port.mk>
diff --git a/net/freeswitch-vanilla-devel/distinfo b/net/freeswitch-vanilla-devel/distinfo
new file mode 100644
index 000000000000..8227fb3a529d
--- /dev/null
+++ b/net/freeswitch-vanilla-devel/distinfo
@@ -0,0 +1,2 @@
+SHA256 (freeswitch/freeswitch-1.2.rc2.tar.bz2) = bbf9b3f6e7a7569b9594b5852d1b8a95266ef3276df222776ac84667adb6cc08
+SIZE (freeswitch/freeswitch-1.2.rc2.tar.bz2) = 38075354
diff --git a/net/freeswitch-vanilla-devel/pkg-descr b/net/freeswitch-vanilla-devel/pkg-descr
new file mode 100644
index 000000000000..0557d2d82134
--- /dev/null
+++ b/net/freeswitch-vanilla-devel/pkg-descr
@@ -0,0 +1,3 @@
+Vanilla dialplan config file for FreeSwitch Voip SoftSwitch & OpenSource PBX
+
+WWW: http://www.freeswitch.org/
diff --git a/net/freeswitch-vanilla-devel/pkg-plist-vanilla b/net/freeswitch-vanilla-devel/pkg-plist-vanilla
new file mode 100644
index 000000000000..f7ceaacdba2a
--- /dev/null
+++ b/net/freeswitch-vanilla-devel/pkg-plist-vanilla
@@ -0,0 +1,6 @@
+%%ETCDIR%%/conf/README_IMPORTANT.txt
+%%ETCDIR%%/conf/dialplan/default/tollfreegateway.com.noload
+%%ETCDIR%%/conf/dialplan/default/ideasip.com.noload
+%%ETCDIR%%/conf/dialplan/default/sipphone.com.noload
+%%ETCDIR%%/conf/dialplan/default/pulver.com.noload
+%%ETCDIR%%/conf/dialplan/default/sipbroker.com.noload