summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorChris Rees <crees@FreeBSD.org>2012-05-21 16:49:31 +0000
committerChris Rees <crees@FreeBSD.org>2012-05-21 16:49:31 +0000
commit22c3702d66660c0b8b9f636022c60a71c4ca4d2d (patch)
tree3db034b6c8b09a1d27a69ceb1a4a1d4b42a5cd9f /net
parent- inspircd 1.2.9 is not vulnerable (diff)
Stop installing freeswitch.xml to ETCDIR; it conflicts with the
configuration ports
Notes
Notes: svn path=/head/; revision=297128
Diffstat (limited to 'net')
-rw-r--r--net/freeswitch-core-devel/Makefile4
-rw-r--r--net/freeswitch-core-devel/pkg-plist1
2 files changed, 1 insertions, 4 deletions
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index e9c6da4c7681..e4f97bc069f8 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= freeswitch
DISTVERSION= 1.2.rc2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://files.freeswitch.org/ \
http://files.freeswitch.org/downloads/libs/:2 \
@@ -344,9 +345,6 @@ post-install:
@${FIND} ${ETCDIR}/. -type d | ${XARGS} ${CHMOD} 770
@${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
@${CHMOD} -R 770 ${PREFIX}/share/${BASE_PORTNAME}
- @${INSTALL} -o ${FREESWITCH_USER} -g ${FREESWITCH_GROUP} -m 664 ${WRKSRC}/conf/freeswitch.xml ${ETCDIR}/conf/freeswitch.xml.sample
- @for i in $$(${FIND} ${ETCDIR}/conf/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
-# @for i in $$(${FIND} ${WWWDIR}/htdocs/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
@${FIND} ${ETCDIR}/. -type f | ${XARGS} ${CHMOD} 660
@${FIND} ${WWWDIR}/. -type f | ${XARGS} ${CHMOD} 660
diff --git a/net/freeswitch-core-devel/pkg-plist b/net/freeswitch-core-devel/pkg-plist
index 272a41cbd697..9004e00bb061 100644
--- a/net/freeswitch-core-devel/pkg-plist
+++ b/net/freeswitch-core-devel/pkg-plist
@@ -6,7 +6,6 @@ bin/fs_ivrd
bin/fsxs
bin/gentls_cert
bin/tone2wav
-%%ETCDIR%%/conf/freeswitch.xml.sample
%%MODFREETDM%%%%ETCDIR%%/conf/autoload_configs/freetdm.conf.xml.sample
%%MODFREETDM%%%%ETCDIR%%/conf/freetdm.conf.sample
%%MODFREETDM%%%%ETCDIR%%/conf/pika.conf.sample