From d525cf8d948bf445b88254b53ceeeda1b2a95231 Mon Sep 17 00:00:00 2001 From: crees Date: Mon, 21 May 2012 16:49:31 +0000 Subject: Stop installing freeswitch.xml to ETCDIR; it conflicts with the configuration ports --- net/freeswitch-core-devel/Makefile | 4 +--- net/freeswitch-core-devel/pkg-plist | 1 - 2 files changed, 1 insertion(+), 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 -- cgit