Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Dec 2009 02:31:34 GMT
From:      "Alexander V. Chernikov" <melifaro@ipfw.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/141791: [maintainer update] net/callweaver fix
Message-ID:  <200912200231.nBK2VYvt088574@www.freebsd.org>
Resent-Message-ID: <200912200240.nBK2e3Dq062874@freefall.freebsd.org>

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

>Number:         141791
>Category:       ports
>Synopsis:       [maintainer update] net/callweaver fix
>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:   Sun Dec 20 02:40:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Alexander V. Chernikov
>Release:        FreeBSD 9.0-CURRENT
>Organization:
>Environment:
FreeBSD ws.ipfw.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Fri Oct 23 22:14:57 MSD 2009     root@ws.ipfw.ru:/var/ports_tmp/usj/obj/usr/src/sys/WS  amd64
>Description:
* Move pidfile to /var/run/callweaver
* Add AEL, SCCP, RTP2 config options
* Remove unnecessary . from rc.d script
* Make port always install .sample config files
* Simplify pkg-plist
* Bump PORTREVISION

First 3 points inspired by Max Clements
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN callweaver.orig/Makefile callweaver/Makefile
--- callweaver.orig/Makefile	2009-09-18 02:29:25.000000000 +0400
+++ callweaver/Makefile	2009-12-20 05:06:35.000000000 +0300
@@ -6,6 +6,7 @@
 
 PORTNAME=	callweaver
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://devs.callweaver.org/release/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -32,9 +33,12 @@
 OPTIONS=	SIPTCP		"Enable SIP TCP/TLS support" on \
 		POSTGRES	"Enable PostgreSQL support" off \
 		MYSQL		"Enable MySQL support" off \
+		AEL		"Enable AEL parser (experimantal)" off \
 		EXTUDP		"Enable extented UDP support for multi-homed" off \
 		ZAPTEL		"Enable Zapata Telefony" off \
 		FAX		"Enable audio/T.38 app_fax/chan_fax/FaxGateway/etc" on \
+		SCCP		"Enable chan_sccp" off \
+		RTP2		"Enable G.726 broken RTP handling" off \
 		SPEEX		"Build  speex codec" on \
 		VORBIS		"Enable VORBIS/Vorbis format support" on \
 		MEETME		"Build  app_meetme (requires ZAPTEL)" off \
@@ -44,6 +48,8 @@
 
 .include <bsd.port.pre.mk>
 
+CONFIGS=adsi.conf adtranvofr.conf agents.conf amd.conf callweaver.adsi callweaver.conf cdr.conf cdr_custom.conf cdr_manager.conf cdr_tds.conf chan_dahdi.conf chan_fax.conf codecs.conf db-memcached.conf dnsmgr.conf dundi.conf enum.conf extconfig.conf extensions.ael extensions.conf features.conf iax.conf indications.conf logger.conf manager.conf meetme.conf mgcp.conf modem.conf modules.conf musiconhold.conf muted.conf osp.conf privacy.conf queues.conf res_snmp.conf rtp.conf sccp.conf sip.conf sip_notify.conf udptl.conf voicemail.conf woomera.conf
+
 .if !defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--with-man-pages
 .else
@@ -76,6 +82,14 @@
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
+.if defined(WITH_AEL)
+CONFIGURE_ARGS+=	--with-ael
+PLIST_SUB+=		AEL=""
+.else
+CONFIGURE_ARGS+=	--without-ael
+PLIST_SUB+=		AEL="@comment "
+.endif
+
 .if defined(WITH_EXTUDP)
 CONFIGURE_ARGS+=	--enable-udpfromto
 .endif
@@ -118,6 +132,36 @@
 #CONFIGURE_ARGS+=	--disable-odbc
 #.endif
 
+.if defined(WITH_SCCP)
+CONFIGURE_ARGS+=	--with-chan_sccp
+PLIST_SUB+=		SCCP=""
+.else
+CONFIGURE_ARGS+=	--without-chan_sccp
+PLIST_SUB+=		SCCP="@comment "
+.endif
+
+.if defined(WITH_RTP2)
+CONFIGURE_ARGS+=	--enable-rtp-payload-2
+.else
+CONFIGURE_ARGS+=	--disable-rtp-payload-2
+.endif
+
+#.if defined(WITH_UNICALL)
+#CONFIGURE_ARGS+=	--with-chan_unicall
+#PLIST_SUB+=		UNICALL=""
+#.else
+#CONFIGURE_ARGS+=	--without-chan_unicall
+#PLIST_SUB+=		UNICALL="@comment "
+#.endif
+#
+#.if defined(WITH_BLUETOOTH)
+#CONFIGURE_ARGS+=	--with-chan_bluetooth
+#PLIST_SUB+=		BLUETOOTH=""
+#.else
+#CONFIGURE_ARGS+=	--without-chan_bluetooth
+#PLIST_SUB+=		BLUETOOTH="@comment "
+#.endif
+
 .if defined(WITH_SPEEX)
 CONFIGURE_ARGS+=	--with-codec_speex
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
@@ -158,10 +202,24 @@
 CONFIGURE_ARGS+=	--disable-optimization --enable-debug
 .endif
 
+.for i in ${CONFIGS}
+PLIST_FILES+=	etc/${PORTNAME}/${i}.sample
+.endfor
+
+PLIST_SUB+=	CONFIGS="${CONFIGS}"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's?/callweaver.pid?callweaver/callweaver.pid?' ${WRKSRC}/configure
+#.if defined(WITH_BLUETOOTH)
+#	@${REINPLACE_CMD} -e 's?bluetooth/bluetooth.h?bluetooth.h?' ${WRKSRC}/configure
+#.endif
+
 post-install:
+	@${MKDIR} /var/run/${PORTNAME}
+	@${CHOWN} ${USERS}:${GROUPS} /var/run/${PORTNAME}
 .if defined(WITH_FAX)
 	@${MKDIR} ${FAXDEV_PATH}
-	@${CHOWN} ${CWUSER}:${CWGROUP} ${FAXDEV_PATH}
+	@${CHOWN} ${USERS}:${GROUPS} ${FAXDEV_PATH}
 	@${REINPLACE_CMD} -i "" -e 's?/dev/fax/?${FAXDEV_PATH}?' ${PREFIX}/etc/${PORTNAME}/chan_fax.conf*
 .endif
 
diff -ruN callweaver.orig/files/callweaver.in callweaver/files/callweaver.in
--- callweaver.orig/files/callweaver.in	2009-09-18 02:29:25.000000000 +0400
+++ callweaver/files/callweaver.in	2009-12-19 18:29:19.000000000 +0300
@@ -9,7 +9,7 @@
 # callweaver_enable="YES"
 #
 
-. . %%RC_SUBR%%
+. %%RC_SUBR%%
 
 stop_precmd=callweaver_shutdown
 sig_stop=KILL
@@ -18,7 +18,7 @@
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/${name}
-pidfile=${callweaver_pidfile:-"/var/run/${name}.pid"}
+pidfile=${callweaver_pidfile:-"/var/run/${name}/${name}.pid"}
 
 load_rc_config $name
 
diff -ruN callweaver.orig/files/patch-doc_makefile callweaver/files/patch-doc_makefile
--- callweaver.orig/files/patch-doc_makefile	1970-01-01 03:00:00.000000000 +0300
+++ callweaver/files/patch-doc_makefile	2009-12-20 04:50:51.000000000 +0300
@@ -0,0 +1,11 @@
+--- configs/Makefile.in.orig	2009-12-20 04:47:46.000000000 +0300
++++ configs/Makefile.in	2009-12-20 04:48:55.000000000 +0300
+@@ -530,6 +530,8 @@
+ 				chown ${cwrunuser}:${cwrungroup} $(DESTDIR)${cwconfdir}/$${configfile}; \
+ 				chown ${cwrunuser}:${cwrungroup} $(DESTDIR)${cwconfdir}/$${samplefile}; \
+ 			fi; \
++		else \
++			$(INSTALL) -m 0640 $${samplefile} $(DESTDIR)${cwconfdir}/$${samplefile}; \
+ 		fi; \
+ 	done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -ruN callweaver.orig/pkg-plist callweaver/pkg-plist
--- callweaver.orig/pkg-plist	2009-09-18 02:29:25.000000000 +0400
+++ callweaver/pkg-plist	2009-12-20 05:03:28.000000000 +0300
@@ -2,135 +2,7 @@
 bin/safe_callweaver
 bin/smsq
 bin/streamplayer
-@unexec if cmp -s %D/%%ETCDIR%%/adsi.conf.sample %D/%%ETCDIR%%/adsi.conf; then rm -f %D/%%ETCDIR%%/adsi.conf; fi
-%%ETCDIR%%/adsi.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/adsi.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/adsi.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/adtranvofr.conf.sample %D/%%ETCDIR%%/adtranvofr.conf; then rm -f %D/%%ETCDIR%%/adtranvofr.conf; fi
-%%ETCDIR%%/adtranvofr.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/adtranvofr.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/adtranvofr.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/agents.conf.sample %D/%%ETCDIR%%/agents.conf; then rm -f %D/%%ETCDIR%%/agents.conf; fi
-%%ETCDIR%%/agents.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/agents.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/agents.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/amd.conf.sample %D/%%ETCDIR%%/amd.conf; then rm -f %D/%%ETCDIR%%/amd.conf; fi
-%%ETCDIR%%/amd.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/amd.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/amd.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/callweaver.adsi.sample %D/%%ETCDIR%%/callweaver.adsi; then rm -f %D/%%ETCDIR%%/callweaver.adsi; fi
-%%ETCDIR%%/callweaver.adsi.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/callweaver.adsi ] ; then cp -p %D/%F %B/%%ETCDIR%%/callweaver.adsi; fi
-@unexec if cmp -s %D/%%ETCDIR%%/callweaver.conf.sample %D/%%ETCDIR%%/callweaver.conf; then rm -f %D/%%ETCDIR%%/callweaver.conf; fi
-%%ETCDIR%%/callweaver.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/callweaver.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/callweaver.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/cdr.conf.sample %D/%%ETCDIR%%/cdr.conf; then rm -f %D/%%ETCDIR%%/cdr.conf; fi
-%%ETCDIR%%/cdr.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/cdr.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/cdr.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/cdr_custom.conf.sample %D/%%ETCDIR%%/cdr_custom.conf; then rm -f %D/%%ETCDIR%%/cdr_custom.conf; fi
-%%ETCDIR%%/cdr_custom.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/cdr_custom.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/cdr_custom.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/cdr_manager.conf.sample %D/%%ETCDIR%%/cdr_manager.conf; then rm -f %D/%%ETCDIR%%/cdr_manager.conf; fi
-%%ETCDIR%%/cdr_manager.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/cdr_manager.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/cdr_manager.conf; fi
-%%MYSQL%%@unexec if cmp -s %D/%%ETCDIR%%/cdr_mysql.conf.sample %D/%%ETCDIR%%/cdr_mysql.conf; then rm -f %D/%%ETCDIR%%/cdr_mysql.conf; fi
-%%MYSQL%%%%ETCDIR%%/cdr_mysql.conf.sample
-%%MYSQL%%@exec if [ ! -f %D/etc/%%ETCDIR%%/cdr_mysql.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/cdr_mysql.conf; fi
-%%PGSQL%%@unexec if cmp -s %D/%%ETCDIR%%/cdr_pgsql.conf.sample %D/%%ETCDIR%%/cdr_pgsql.conf; then rm -f %D/%%ETCDIR%%/cdr_pgsql.conf; fi
-%%PGSQL%%%%ETCDIR%%/cdr_pgsql.conf.sample
-%%PGSQL%%@exec if [ ! -f %D/etc/%%ETCDIR%%/cdr_pgsql.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/cdr_pgsql.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/cdr_tds.conf.sample %D/%%ETCDIR%%/cdr_tds.conf; then rm -f %D/%%ETCDIR%%/cdr_tds.conf; fi
-%%ETCDIR%%/cdr_tds.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/cdr_tds.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/cdr_tds.conf; fi
-%%ZAPTEL%%@unexec if cmp -s %D/%%ETCDIR%%/chan_dahdi.conf.sample %D/%%ETCDIR%%/chan_dahdi.conf; then rm -f %D/%%ETCDIR%%/chan_dahdi.conf; fi
-%%ZAPTEL%%%%ETCDIR%%/chan_dahdi.conf.sample
-%%ZAPTEL%%@exec if [ ! -f %D/etc/%%ETCDIR%%/chan_dahdi.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/chan_dahdi.conf; fi
-%%FAX%%@unexec if cmp -s %D/%%ETCDIR%%/chan_fax.conf.sample %D/%%ETCDIR%%/chan_fax.conf; then rm -f %D/%%ETCDIR%%/chan_fax.conf; fi
-%%FAX%%%%ETCDIR%%/chan_fax.conf.sample
-%%FAX%%@exec if [ ! -f %D/etc/%%ETCDIR%%/chan_fax.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/chan_fax.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/codecs.conf.sample %D/%%ETCDIR%%/codecs.conf; then rm -f %D/%%ETCDIR%%/codecs.conf; fi
-%%ETCDIR%%/codecs.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/codecs.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/codecs.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/db-memcached.conf.sample %D/%%ETCDIR%%/db-memcached.conf; then rm -f %D/%%ETCDIR%%/db-memcached.conf; fi
-%%ETCDIR%%/db-memcached.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/db-memcached.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/db-memcached.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/dnsmgr.conf.sample %D/%%ETCDIR%%/dnsmgr.conf; then rm -f %D/%%ETCDIR%%/dnsmgr.conf; fi
-%%ETCDIR%%/dnsmgr.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/dnsmgr.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/dnsmgr.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/dundi.conf.sample %D/%%ETCDIR%%/dundi.conf; then rm -f %D/%%ETCDIR%%/dundi.conf; fi
-%%ETCDIR%%/dundi.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/dundi.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/dundi.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/enum.conf.sample %D/%%ETCDIR%%/enum.conf; then rm -f %D/%%ETCDIR%%/enum.conf; fi
-%%ETCDIR%%/enum.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/enum.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/enum.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/extconfig.conf.sample %D/%%ETCDIR%%/extconfig.conf; then rm -f %D/%%ETCDIR%%/extconfig.conf; fi
-%%ETCDIR%%/extconfig.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/extconfig.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/extconfig.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/extensions.ael.sample %D/%%ETCDIR%%/extensions.ael; then rm -f %D/%%ETCDIR%%/extensions.ael; fi
-%%ETCDIR%%/extensions.ael.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/extensions.ael ] ; then cp -p %D/%F %B/%%ETCDIR%%/extensions.ael; fi
-@unexec if cmp -s %D/%%ETCDIR%%/extensions.conf.sample %D/%%ETCDIR%%/extensions.conf; then rm -f %D/%%ETCDIR%%/extensions.conf; fi
-%%ETCDIR%%/extensions.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/extensions.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/extensions.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/features.conf.sample %D/%%ETCDIR%%/features.conf; then rm -f %D/%%ETCDIR%%/features.conf; fi
-%%ETCDIR%%/features.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/features.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/features.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/iax.conf.sample %D/%%ETCDIR%%/iax.conf; then rm -f %D/%%ETCDIR%%/iax.conf; fi
-%%ETCDIR%%/iax.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/iax.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/iax.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/indications.conf.sample %D/%%ETCDIR%%/indications.conf; then rm -f %D/%%ETCDIR%%/indications.conf; fi
-%%ETCDIR%%/indications.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/indications.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/indications.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/logger.conf.sample %D/%%ETCDIR%%/logger.conf; then rm -f %D/%%ETCDIR%%/logger.conf; fi
-%%ETCDIR%%/logger.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/logger.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/logger.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/manager.conf.sample %D/%%ETCDIR%%/manager.conf; then rm -f %D/%%ETCDIR%%/manager.conf; fi
-%%ETCDIR%%/manager.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/manager.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/manager.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/meetme.conf.sample %D/%%ETCDIR%%/meetme.conf; then rm -f %D/%%ETCDIR%%/meetme.conf; fi
-%%ETCDIR%%/meetme.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/meetme.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/meetme.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/mgcp.conf.sample %D/%%ETCDIR%%/mgcp.conf; then rm -f %D/%%ETCDIR%%/mgcp.conf; fi
-%%ETCDIR%%/mgcp.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/mgcp.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/mgcp.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/modem.conf.sample %D/%%ETCDIR%%/modem.conf; then rm -f %D/%%ETCDIR%%/modem.conf; fi
-%%ETCDIR%%/modem.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/modem.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/modem.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/modules.conf.sample %D/%%ETCDIR%%/modules.conf; then rm -f %D/%%ETCDIR%%/modules.conf; fi
-%%ETCDIR%%/modules.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/modules.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/modules.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/musiconhold.conf.sample %D/%%ETCDIR%%/musiconhold.conf; then rm -f %D/%%ETCDIR%%/musiconhold.conf; fi
-%%ETCDIR%%/musiconhold.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/musiconhold.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/musiconhold.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/muted.conf.sample %D/%%ETCDIR%%/muted.conf; then rm -f %D/%%ETCDIR%%/muted.conf; fi
-%%ETCDIR%%/muted.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/muted.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/muted.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/osp.conf.sample %D/%%ETCDIR%%/osp.conf; then rm -f %D/%%ETCDIR%%/osp.conf; fi
-%%ETCDIR%%/osp.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/osp.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/osp.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/privacy.conf.sample %D/%%ETCDIR%%/privacy.conf; then rm -f %D/%%ETCDIR%%/privacy.conf; fi
-%%ETCDIR%%/privacy.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/privacy.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/privacy.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/queues.conf.sample %D/%%ETCDIR%%/queues.conf; then rm -f %D/%%ETCDIR%%/queues.conf; fi
-%%ETCDIR%%/queues.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/queues.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/queues.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/res_snmp.conf.sample %D/%%ETCDIR%%/res_snmp.conf; then rm -f %D/%%ETCDIR%%/res_snmp.conf; fi
-%%ETCDIR%%/res_snmp.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/res_snmp.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/res_snmp.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/rtp.conf.sample %D/%%ETCDIR%%/rtp.conf; then rm -f %D/%%ETCDIR%%/rtp.conf; fi
-%%ETCDIR%%/rtp.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/rtp.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/rtp.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/sip.conf.sample %D/%%ETCDIR%%/sip.conf; then rm -f %D/%%ETCDIR%%/sip.conf; fi
-%%ETCDIR%%/sip.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/sip.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/sip.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/sip_notify.conf.sample %D/%%ETCDIR%%/sip_notify.conf; then rm -f %D/%%ETCDIR%%/sip_notify.conf; fi
-%%ETCDIR%%/sip_notify.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/sip_notify.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/sip_notify.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/udptl.conf.sample %D/%%ETCDIR%%/udptl.conf; then rm -f %D/%%ETCDIR%%/udptl.conf; fi
-%%ETCDIR%%/udptl.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/udptl.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/udptl.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/voicemail.conf.sample %D/%%ETCDIR%%/voicemail.conf; then rm -f %D/%%ETCDIR%%/voicemail.conf; fi
-%%ETCDIR%%/voicemail.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/voicemail.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/voicemail.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/woomera.conf.sample %D/%%ETCDIR%%/woomera.conf; then rm -f %D/%%ETCDIR%%/woomera.conf; fi
-%%ETCDIR%%/woomera.conf.sample
-@exec if [ ! -f %D/etc/%%ETCDIR%%/woomera.conf ] ; then cp -p %D/%F %B/%%ETCDIR%%/woomera.conf; fi
+@unexec for i in %%CONFIGS%% ; do if cmp -s %D/%%ETCDIR%%/$i.sample %D/%%ETCDIR%%/$i ; then rm -f %D/%%ETCDIR%%/$i; fi; done
 include/callweaver/acl.h
 include/callweaver/adsi.h
 include/callweaver/aes.h
@@ -372,6 +244,8 @@
 lib/callweaver/modules/chan_local.so
 lib/callweaver/modules/chan_mgcp.la
 lib/callweaver/modules/chan_mgcp.so
+%%SCCP%%lib/callweaver/modules/chan_sccp.la
+%%SCCP%%lib/callweaver/modules/chan_sccp.so
 lib/callweaver/modules/chan_sip.la
 lib/callweaver/modules/chan_sip.so
 lib/callweaver/modules/chan_woomera.la
@@ -516,5 +390,6 @@
 @cwd /
 %%FAX%%@dirrm var/run/fax
 %%FAX%%@dirrm var/log/callweaver
+@dirrm var/run/callweaver
 @dirrm var/lib/callweaver/core
 @dirrm var/lib/callweaver


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



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