Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Apr 2007 01:55:13 -0400
From:      "Phillip Neumann" <pneumann@gmail.com>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/111553: [PATCH] net/asterisk
Message-ID:  <1176530113.1485@negro.transtel.cl>
Resent-Message-ID: <200704140600.l3E6092d063549@freefall.freebsd.org>

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

>Number:         111553
>Category:       ports
>Synopsis:       [PATCH] net/asterisk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 14 06:00:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Phillip Neumann
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.2-STABLE #1: Sun Feb 11 18:00:14 CLST 2007
    root@negro.transtel.cl:/usr/obj/usr/src/sys/Negro



>Description:


I meant to send this PR's (and the following) before (just after the repo-copy request), but had some things this week.. :-S

FYI we were doing some stuff in http://code.google.com/p/asterisk-bsd/

This patch merges asterisk14 of the freebsd ports with the one of the project.

About the files/* freebsd-port parches, i really dont understand 100% whats going on, but without them (i.e. *.c and Makefiles) asterisk apear to work just fine. 
Anyway, Ive leave them there except for patch-Makefile wich i dont know whats fixing... and tinderbox could not replace $(MKDIR) $(BSD_INSTALL_SCRIPT).

Changes:
	- Remove mpg123 depends (asterisk has its own mp3 lib)
	- Shrink MAKE_ENV VARs (does it really need it?...)
	- Remove CONFIGURE_ENV (does it reallt need it?...)
	- Delete CONFIGURE_ARGS (Asterisk autotdetect them)
	- Add more OPTION; remove explicit --with/--without; check for WITH instead of WITHOUT
	- Update zaptel.h reference


thanks!


>How-To-Repeat:





>Fix:


--- asterisk14.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/asterisk/Makefile,v
retrieving revision 1.67
diff -u -r1.67 Makefile
--- Makefile	13 Apr 2007 08:55:48 -0000	1.67
+++ Makefile	14 Apr 2007 05:41:29 -0000
@@ -1,12 +1,13 @@
 # New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
+# Date created:				3 March 2007
 # Whom:					Maxim Sobolev <sobomax@portaone.com>
 #
-# $FreeBSD: ports/net/asterisk/Makefile,v 1.67 2007/04/13 08:55:48 sobomax Exp $
+# $FreeBSD: ports/net/asterisk/Makefile,v 1 2007/03/03 09:53:11 mezz Exp $
 #
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.2
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -14,116 +15,122 @@
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
 		newt.51:${PORTSDIR}/devel/newt \
 		curl.4:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 ONLY_FOR_ARCHS=	i386 sparc64 amd64
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --mandir=/usr/local/man
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_RC_SUBR=	asterisk.sh
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
-OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
-		ODBC		"Enable ODBC support" on \
-		POSTGRES	"Enable PostgreSQL support" on \
-		RADIUS		"Enable RADIUS accounting support" on \
-		SNMP		"Enable SNMP support" on \
-		H323		"Enable H.323 support" on
+OPTIONS=	H323	"Enable H323 support" off\
+		GTALK	"Enable Jabber and Gtalk support" on\
+		VORBIS	"Enable Vorbis ogg support" on\
+		PGSQL	"Enable PostgreSQL support" off\
+		SQLITE	"Enable SQLite support" off\
+		ODBC	"Enable ODBC support" off\
+		RADIUS	"Enable RADIUS accounting support" off\
+		SNMP	"Enable SNMP support" off\
+		SAMPLE_CONFIG	"Install sample configuration files" off
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-OPTIONS+=	ZAPTEL		"Enable Zaptel support" on
-.else
-WITHOUT_ZAPTEL=	yes
+OPTIONS+=	ZAPTEL	"Enable Zaptel support" on
 .endif
 
-.if defined(WITHOUT_H323)
-PLIST_SUB+=	WITH_H323="@comment "
-CONFIGURE_ARGS+= --without-h323
-.else
-PLIST_SUB+=	WITH_H323=""
-CONFIGURE_ARGS+= --with-h323
-LIB_DEPENDS+=	pt_r.1:${PORTSDIR}/devel/pwlib \
+.if defined(WITH_H323)
+LIB_DEPENDS+=	pt_r.1:${PORTSDIR}/devel/pwlib\
 		h323_r.1:${PORTSDIR}/net/openh323
+PLIST_SUB+=	H323=""
+.else
+PLIST_SUB+=	H323="@comment "
 .endif
 
-.if defined(WITHOUT_ZAPTEL)
-PLIST_SUB+=	WITH_ZAPTEL="@comment "
-CONFIGURE_ARGS+= --without-zaptel
-.else
-PLIST_SUB+=	WITH_ZAPTEL=""
-CONFIGURE_ARGS+= --with-zaptel
-BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \
-		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
+.if defined(WITH_ZAPTEL)
+BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel \
+		${LOCALBASE}/include/libpri.h:${PORTSDIR}/misc/libpri
+RUN_DEPENDS+=	${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
+PLIST_SUB+=	ZAPTEL=""
+.else
+PLIST_SUB+=	ZAPTEL="@comment "
 .endif
 
-#
-# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV
-# similarly
-.if defined(WITHOUT_ODBC)
-PLIST_SUB+=	WITH_ODBC="@comment "
-CONFIGURE_ARGS+= --without-odbc
-.else
-PLIST_SUB+=	WITH_ODBC=""
-CONFIGURE_ARGS+= --with-odbc
+.if defined(WITH_ODBC)
 LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+USE_AUTOTOOLS=	libltdl:15
+PLIST_SUB+=	ODBC=""
+.else
+PLIST_SUB+=	ODBC="@comment "
 .endif
 
-.if defined(WITHOUT_POSTGRES)
-PLIST_SUB+=	WITH_POSTGRES="@comment "
-CONFIGURE_ARGS+= --without-postgres
+.if defined(WITH_GTALK)
+BUILD_DEPENDS+=	ikslint:${PORTSDIR}/textproc/iksemel
+PLIST_SUB+=	GTALK=""
 .else
-PLIST_SUB+=	WITH_POSTGRES=""
-USE_PGSQL=	yes
-CONFIGURE_ARGS+= --with-postgres
+PLIST_SUB+=	GTALK="@comment "
 .endif
 
-.if defined(WITHOUT_OGGVORBIS)
-PLIST_SUB+=	WITH_OGGVORBIS="@comment "
-CONFIGURE_ARGS+= --without-ogg
-.else
-PLIST_SUB+=	WITH_OGGVORBIS=""
-CONFIGURE_ARGS+= --with-ogg
+.if defined(WITH_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+PLIST_SUB+=	VORBIS=""
+.else
+PLIST_SUB+=	VORBIS="@comment "
 .endif
 
-.if defined(WITHOUT_RADIUS)
-PLIST_SUB+=	WITH_RADIUS="@comment "
-CONFIGURE_ARGS+= --without-radius
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+DEFAULT_PGSQL_VER=	82
+PLIST_SUB+=	PGSQL=""
 .else
-PLIST_SUB+=	WITH_RADIUS=""
-CONFIGURE_ARGS+= --with-radius
-LIB_DEPENDS+=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
+PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITHOUT_SNMP)
-PLIST_SUB+=	WITH_SNMP="@comment "
-CONFIGURE_ARGS+= --without-netsnmp
+.if defined(WITH_SQLITE)
+USE_SQLITE=	2
+PLIST_SUB+=	SQLITE=""
 .else
-PLIST_SUB+=	WITH_SNMP=""
-CONFIGURE_ARGS+= --with-netsnmp
+PLIST_SUB+=	SQLITE="@comment "
+.endif
+
+.if defined(WITH_RADIUS)
+PLIST_SUB+=	RADIUS=""
+LIB_DEPENDS+=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
+.else
+PLIST_SUB+=	RADIUS="@comment "
+.endif
+
+.if defined(WITH_SNMP)
+PLIST_SUB+=	SNMP=""
 LIB_DEPENDS+=	netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
+.else
+PLIST_SUB+=	SNMP="@comment "
+.endif
+
+.if defined(WITH_SAMPLE_CONFIG)
+PLIST_SUB+=	SAMPLE_CONFIG=""
+.else
+PLIST_SUB+=	SAMPLE_CONFIG="@comment "
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+
+pre-install:
+	@${MKDIR} ${PREFIX}/lib/asterisk/modules
+
+post-install:
+.if defined(WITH_SAMPLE_CONFIG)
+		@cd ${WRKSRC} && ${GMAKE} samples
+.endif
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/asterisk/pkg-plist,v
retrieving revision 1.24
diff -u -r1.24 pkg-plist
--- pkg-plist	13 Apr 2007 08:06:05 -0000	1.24
+++ pkg-plist	14 Apr 2007 05:41:31 -0000
@@ -1,127 +1,65 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
-etc/asterisk/alarmreceiver.conf-dist
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi
-etc/asterisk/cdr.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi
-etc/asterisk/cdr_custom.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
-etc/asterisk/cdr_manager.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
-etc/asterisk/cdr_tds.conf-dist
-@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi
-etc/asterisk/codecs.conf-dist
-@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi
-etc/asterisk/dnsmgr.conf-dist
-@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi
-etc/asterisk/dundi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
-etc/asterisk/extconfig.conf-dist
-@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi
-etc/asterisk/extensions.ael-dist
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
-etc/asterisk/features.conf-dist
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
-etc/asterisk/iaxprov.conf-dist
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi
-etc/asterisk/misdn.conf-dist
-@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi
-etc/asterisk/modem.conf-dist
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
-etc/asterisk/osp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
-etc/asterisk/res_odbc.conf-dist
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi
-etc/asterisk/sip_notify.conf-dist
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
-etc/asterisk/zapata.conf-dist
-@unexec if cmp -s %D/etc/asterisk/udptl.conf %D/etc/asterisk/udptl.conf-dist; then rm -f %D/etc/asterisk/udptl.conf; fi
-etc/asterisk/udptl.conf-dist
-@unexec if cmp -s %D/etc/asterisk/users.conf %D/etc/asterisk/users.conf-dist; then rm -f %D/etc/asterisk/users.conf; fi
-etc/asterisk/users.conf-dist
-@unexec if cmp -s %D/etc/asterisk/smdi.conf %D/etc/asterisk/smdi.conf-dist; then rm -f %D/etc/asterisk/smdi.conf; fi
-etc/asterisk/smdi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/sla.conf %D/etc/asterisk/sla.conf-dist; then rm -f %D/etc/asterisk/sla.conf; fi
-etc/asterisk/sla.conf-dist
-@unexec if cmp -s %D/etc/asterisk/say.conf %D/etc/asterisk/say.conf-dist; then rm -f %D/etc/asterisk/say.conf; fi
-etc/asterisk/say.conf-dist
-@unexec if cmp -s %D/etc/asterisk/res_snmp.conf %D/etc/asterisk/res_snmp.conf-dist; then rm -f %D/etc/asterisk/res_snmp.conf; fi
-etc/asterisk/res_snmp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/muted.conf %D/etc/asterisk/muted.conf-dist; then rm -f %D/etc/asterisk/muted.conf; fi
-etc/asterisk/muted.conf-dist
-@unexec if cmp -s %D/etc/asterisk/jabber.conf %D/etc/asterisk/jabber.conf-dist; then rm -f %D/etc/asterisk/jabber.conf; fi
-etc/asterisk/jabber.conf-dist
-@unexec if cmp -s %D/etc/asterisk/http.conf %D/etc/asterisk/http.conf-dist; then rm -f %D/etc/asterisk/http.conf; fi
-etc/asterisk/http.conf-dist
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@unexec if cmp -s %D/etc/asterisk/gtalk.conf %D/etc/asterisk/gtalk.conf-dist; then rm -f %D/etc/asterisk/gtalk.conf; fi
-etc/asterisk/gtalk.conf-dist
-@unexec if cmp -s %D/etc/asterisk/func_odbc.conf %D/etc/asterisk/func_odbc.conf-dist; then rm -f %D/etc/asterisk/func_odbc.conf; fi
-etc/asterisk/func_odbc.conf-dist
-@unexec if cmp -s %D/etc/asterisk/followme.conf %D/etc/asterisk/followme.conf-dist; then rm -f %D/etc/asterisk/followme.conf; fi
-etc/asterisk/followme.conf-dist
-@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi
-etc/asterisk/amd.conf-dist
+%%SAMPLE_CONFIG%%etc/asterisk/asterisk.adsi
+%%SAMPLE_CONFIG%%etc/asterisk/telcordia-1.adsi
+%%SAMPLE_CONFIG%%etc/asterisk/adsi.conf
+%%SAMPLE_CONFIG%%etc/asterisk/adtranvofr.conf
+%%SAMPLE_CONFIG%%etc/asterisk/agents.conf
+%%SAMPLE_CONFIG%%etc/asterisk/alarmreceiver.conf
+%%SAMPLE_CONFIG%%etc/asterisk/alsa.conf
+%%SAMPLE_CONFIG%%etc/asterisk/amd.conf
+%%SAMPLE_CONFIG%%etc/asterisk/cdr.conf
+%%SAMPLE_CONFIG%%etc/asterisk/cdr_custom.conf
+%%SAMPLE_CONFIG%%etc/asterisk/cdr_manager.conf
+%%SAMPLE_CONFIG%%etc/asterisk/cdr_odbc.conf
+%%SAMPLE_CONFIG%%etc/asterisk/cdr_pgsql.conf
+%%SAMPLE_CONFIG%%etc/asterisk/cdr_tds.conf
+%%SAMPLE_CONFIG%%etc/asterisk/codecs.conf
+%%SAMPLE_CONFIG%%etc/asterisk/dnsmgr.conf
+%%SAMPLE_CONFIG%%etc/asterisk/dundi.conf
+%%SAMPLE_CONFIG%%etc/asterisk/enum.conf
+%%SAMPLE_CONFIG%%etc/asterisk/extconfig.conf
+%%SAMPLE_CONFIG%%etc/asterisk/extensions.ael
+%%SAMPLE_CONFIG%%etc/asterisk/extensions.conf
+%%SAMPLE_CONFIG%%etc/asterisk/features.conf
+%%SAMPLE_CONFIG%%etc/asterisk/festival.conf
+%%SAMPLE_CONFIG%%etc/asterisk/followme.conf
+%%SAMPLE_CONFIG%%etc/asterisk/func_odbc.conf
+%%SAMPLE_CONFIG%%etc/asterisk/gtalk.conf
+%%SAMPLE_CONFIG%%etc/asterisk/h323.conf
+%%SAMPLE_CONFIG%%etc/asterisk/http.conf
+%%SAMPLE_CONFIG%%etc/asterisk/iax.conf
+%%SAMPLE_CONFIG%%etc/asterisk/iaxprov.conf
+%%SAMPLE_CONFIG%%etc/asterisk/indications.conf
+%%SAMPLE_CONFIG%%etc/asterisk/jabber.conf
+%%SAMPLE_CONFIG%%etc/asterisk/logger.conf
+%%SAMPLE_CONFIG%%etc/asterisk/manager.conf
+%%SAMPLE_CONFIG%%etc/asterisk/meetme.conf
+%%SAMPLE_CONFIG%%etc/asterisk/mgcp.conf
+%%SAMPLE_CONFIG%%etc/asterisk/misdn.conf
+%%SAMPLE_CONFIG%%etc/asterisk/modem.conf
+%%SAMPLE_CONFIG%%etc/asterisk/modules.conf
+%%SAMPLE_CONFIG%%etc/asterisk/musiconhold.conf
+%%SAMPLE_CONFIG%%etc/asterisk/muted.conf
+%%SAMPLE_CONFIG%%etc/asterisk/osp.conf
+%%SAMPLE_CONFIG%%etc/asterisk/oss.conf
+%%SAMPLE_CONFIG%%etc/asterisk/phone.conf
+%%SAMPLE_CONFIG%%etc/asterisk/privacy.conf
+%%SAMPLE_CONFIG%%etc/asterisk/queues.conf
+%%SAMPLE_CONFIG%%etc/asterisk/res_odbc.conf
+%%SAMPLE_CONFIG%%etc/asterisk/res_snmp.conf
+%%SAMPLE_CONFIG%%etc/asterisk/rpt.conf
+%%SAMPLE_CONFIG%%etc/asterisk/rtp.conf
+%%SAMPLE_CONFIG%%etc/asterisk/say.conf
+%%SAMPLE_CONFIG%%etc/asterisk/sip.conf
+%%SAMPLE_CONFIG%%etc/asterisk/sip_notify.conf
+%%SAMPLE_CONFIG%%etc/asterisk/skinny.conf
+%%SAMPLE_CONFIG%%etc/asterisk/sla.conf
+%%SAMPLE_CONFIG%%etc/asterisk/smdi.conf
+%%SAMPLE_CONFIG%%etc/asterisk/udptl.conf
+%%SAMPLE_CONFIG%%etc/asterisk/users.conf
+%%SAMPLE_CONFIG%%etc/asterisk/voicemail.conf
+%%SAMPLE_CONFIG%%etc/asterisk/vpb.conf
+%%SAMPLE_CONFIG%%etc/asterisk/zapata.conf
+%%SAMPLE_CONFIG%%etc/asterisk/asterisk.conf
 include/asterisk.h
 include/asterisk/abstract_jb.h
 include/asterisk/acl.h
@@ -277,10 +215,21 @@
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_custom.so
 lib/asterisk/modules/cdr_manager.so
-%%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so
-%%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so
+%%PGSQL%%lib/asterisk/modules/cdr_pgsql.so
+%%SQLITE%%lib/asterisk/modules/cdr_sqlite.so
 lib/asterisk/modules/chan_agent.so
 lib/asterisk/modules/chan_features.so
+%%GTALK%%lib/asterisk/modules/chan_gtalk.so
+%%ZAPTEL%%lib/asterisk/modules/app_flash.so
+%%ZAPTEL%%lib/asterisk/modules/app_meetme.so
+%%ZAPTEL%%lib/asterisk/modules/app_page.so
+%%ZAPTEL%%lib/asterisk/modules/app_zapbarge.so
+%%ZAPTEL%%lib/asterisk/modules/app_zapras.so
+%%ZAPTEL%%lib/asterisk/modules/app_zapscan.so
+%%ODBC%%lib/asterisk/modules/cdr_odbc.so
+%%H323%%lib/asterisk/modules/chan_h323.so
+%%ODBC%%lib/asterisk/modules/res_config_odbc.so
+%%ODBC%%lib/asterisk/modules/res_odbc.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
 lib/asterisk/modules/chan_mgcp.so
@@ -304,7 +253,7 @@
 lib/asterisk/modules/format_h264.so
 lib/asterisk/modules/format_ilbc.so
 lib/asterisk/modules/format_jpeg.so
-%%WITH_OGGVORBIS%%lib/asterisk/modules/format_ogg_vorbis.so
+%%VORBIS%%lib/asterisk/modules/format_ogg_vorbis.so
 lib/asterisk/modules/format_pcm.so
 lib/asterisk/modules/format_sln.so
 lib/asterisk/modules/format_vox.so
@@ -326,7 +275,6 @@
 lib/asterisk/modules/func_math.so
 lib/asterisk/modules/func_md5.so
 lib/asterisk/modules/func_moh.so
-%%WITH_ODBC%%lib/asterisk/modules/func_odbc.so
 lib/asterisk/modules/func_rand.so
 lib/asterisk/modules/func_realtime.so
 lib/asterisk/modules/func_sha1.so
@@ -342,15 +290,16 @@
 lib/asterisk/modules/res_adsi.so
 lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_clioriginate.so
-%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
+%%PGSQL%%lib/asterisk/modules/res_config_pgsql.so
 lib/asterisk/modules/res_convert.so
 lib/asterisk/modules/res_crypto.so
 lib/asterisk/modules/res_features.so
 lib/asterisk/modules/res_indications.so
+%%GTALK%%lib/asterisk/modules/res_jabber.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
 lib/asterisk/modules/res_smdi.so
-%%WITH_SNMP%%lib/asterisk/modules/res_snmp.so
+%%SNMP%%lib/asterisk/modules/res_snmp.so
 lib/asterisk/modules/res_speech.so
 sbin/aelparse
 sbin/asterisk
@@ -363,447 +312,413 @@
 sbin/smsq
 sbin/stereorize
 sbin/streamplayer
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/agi-bin/jukebox.agi
-share/asterisk/firmware/iax/iaxy.bin
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/freeworlddialup.pub
-share/asterisk/keys/iaxtel.pub
-share/asterisk/moh/.asterisk-moh-freeplay-wav
-share/asterisk/moh/LICENSE-asterisk-moh-freeplay-wav
-share/asterisk/moh/fpm-calm-river.wav
-share/asterisk/moh/fpm-sunshine.wav
-share/asterisk/moh/fpm-world-mix.wav
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.6
-share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.6
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/beeperr.gsm
-share/asterisk/sounds/conf-adminmenu.gsm
-share/asterisk/sounds/conf-enteringno.gsm
-share/asterisk/sounds/conf-errormenu.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-hasjoin.gsm
-share/asterisk/sounds/conf-hasleft.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-kicked.gsm
-share/asterisk/sounds/conf-leaderhasleft.gsm
-share/asterisk/sounds/conf-locked.gsm
-share/asterisk/sounds/conf-lockednow.gsm
-share/asterisk/sounds/conf-muted.gsm
-share/asterisk/sounds/conf-noempty.gsm
-share/asterisk/sounds/conf-onlyone.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/conf-otherinparty.gsm
-share/asterisk/sounds/conf-placeintoconf.gsm
-share/asterisk/sounds/conf-thereare.gsm
-share/asterisk/sounds/conf-unlockednow.gsm
-share/asterisk/sounds/conf-unmuted.gsm
-share/asterisk/sounds/conf-usermenu.gsm
-share/asterisk/sounds/conf-userswilljoin.gsm
-share/asterisk/sounds/conf-userwilljoin.gsm
-share/asterisk/sounds/conf-waitforleader.gsm
-share/asterisk/sounds/core-sounds-en.txt
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/dictate/both_help.gsm
-share/asterisk/sounds/dictate/enter_filename.gsm
-share/asterisk/sounds/dictate/forhelp.gsm
-share/asterisk/sounds/dictate/pause.gsm
-share/asterisk/sounds/dictate/paused.gsm
-share/asterisk/sounds/dictate/play_help.gsm
-share/asterisk/sounds/dictate/playback.gsm
-share/asterisk/sounds/dictate/playback_mode.gsm
-share/asterisk/sounds/dictate/record.gsm
-share/asterisk/sounds/dictate/record_help.gsm
-share/asterisk/sounds/dictate/record_mode.gsm
-share/asterisk/sounds/dictate/truncating_audio.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/minus.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro-fn.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/followme/call-from.gsm
-share/asterisk/sounds/followme/no-recording.gsm
-share/asterisk/sounds/followme/options.gsm
-share/asterisk/sounds/followme/pls-hold-while-try.gsm
-share/asterisk/sounds/followme/sorry.gsm
-share/asterisk/sounds/followme/status.gsm
-share/asterisk/sounds/hello-world.gsm
-share/asterisk/sounds/hours.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/letters/a.gsm
-share/asterisk/sounds/letters/at.gsm
-share/asterisk/sounds/letters/b.gsm
-share/asterisk/sounds/letters/c.gsm
-share/asterisk/sounds/letters/d.gsm
-share/asterisk/sounds/letters/dash.gsm
-share/asterisk/sounds/letters/dollar.gsm
-share/asterisk/sounds/letters/dot.gsm
-share/asterisk/sounds/letters/e.gsm
-share/asterisk/sounds/letters/equals.gsm
-share/asterisk/sounds/letters/exclaimation-point.gsm
-share/asterisk/sounds/letters/f.gsm
-share/asterisk/sounds/letters/g.gsm
-share/asterisk/sounds/letters/h.gsm
-share/asterisk/sounds/letters/i.gsm
-share/asterisk/sounds/letters/j.gsm
-share/asterisk/sounds/letters/k.gsm
-share/asterisk/sounds/letters/l.gsm
-share/asterisk/sounds/letters/m.gsm
-share/asterisk/sounds/letters/n.gsm
-share/asterisk/sounds/letters/o.gsm
-share/asterisk/sounds/letters/p.gsm
-share/asterisk/sounds/letters/plus.gsm
-share/asterisk/sounds/letters/q.gsm
-share/asterisk/sounds/letters/r.gsm
-share/asterisk/sounds/letters/s.gsm
-share/asterisk/sounds/letters/slash.gsm
-share/asterisk/sounds/letters/space.gsm
-share/asterisk/sounds/letters/t.gsm
-share/asterisk/sounds/letters/u.gsm
-share/asterisk/sounds/letters/v.gsm
-share/asterisk/sounds/letters/w.gsm
-share/asterisk/sounds/letters/x.gsm
-share/asterisk/sounds/letters/y.gsm
-share/asterisk/sounds/letters/z.gsm
-share/asterisk/sounds/letters/zed.gsm
-share/asterisk/sounds/minutes.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/phonetic/9_p.gsm
-share/asterisk/sounds/phonetic/a_p.gsm
-share/asterisk/sounds/phonetic/b_p.gsm
-share/asterisk/sounds/phonetic/c_p.gsm
-share/asterisk/sounds/phonetic/d_p.gsm
-share/asterisk/sounds/phonetic/e_p.gsm
-share/asterisk/sounds/phonetic/f_p.gsm
-share/asterisk/sounds/phonetic/g_p.gsm
-share/asterisk/sounds/phonetic/h_p.gsm
-share/asterisk/sounds/phonetic/i_p.gsm
-share/asterisk/sounds/phonetic/j_p.gsm
-share/asterisk/sounds/phonetic/k_p.gsm
-share/asterisk/sounds/phonetic/l_p.gsm
-share/asterisk/sounds/phonetic/m_p.gsm
-share/asterisk/sounds/phonetic/n_p.gsm
-share/asterisk/sounds/phonetic/o_p.gsm
-share/asterisk/sounds/phonetic/p_p.gsm
-share/asterisk/sounds/phonetic/q_p.gsm
-share/asterisk/sounds/phonetic/r_p.gsm
-share/asterisk/sounds/phonetic/s_p.gsm
-share/asterisk/sounds/phonetic/t_p.gsm
-share/asterisk/sounds/phonetic/u_p.gsm
-share/asterisk/sounds/phonetic/v_p.gsm
-share/asterisk/sounds/phonetic/w_p.gsm
-share/asterisk/sounds/phonetic/x_p.gsm
-share/asterisk/sounds/phonetic/y_p.gsm
-share/asterisk/sounds/phonetic/z_p.gsm
-share/asterisk/sounds/priv-callee-options.gsm
-share/asterisk/sounds/priv-callpending.gsm
-share/asterisk/sounds/priv-introsaved.gsm
-share/asterisk/sounds/priv-recordintro.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/queue-callswaiting.gsm
-share/asterisk/sounds/queue-holdtime.gsm
-share/asterisk/sounds/queue-less-than.gsm
-share/asterisk/sounds/queue-minutes.gsm
-share/asterisk/sounds/queue-periodic-announce.gsm
-share/asterisk/sounds/queue-reporthold.gsm
-share/asterisk/sounds/queue-seconds.gsm
-share/asterisk/sounds/queue-thankyou.gsm
-share/asterisk/sounds/queue-thereare.gsm
-share/asterisk/sounds/queue-youarenext.gsm
-share/asterisk/sounds/screen-callee-options.gsm
-share/asterisk/sounds/seconds.gsm
-share/asterisk/sounds/silence/1.gsm
-share/asterisk/sounds/silence/10.gsm
-share/asterisk/sounds/silence/2.gsm
-share/asterisk/sounds/silence/3.gsm
-share/asterisk/sounds/silence/4.gsm
-share/asterisk/sounds/silence/5.gsm
-share/asterisk/sounds/silence/6.gsm
-share/asterisk/sounds/silence/7.gsm
-share/asterisk/sounds/silence/8.gsm
-share/asterisk/sounds/silence/9.gsm
-share/asterisk/sounds/spy-agent.gsm
-share/asterisk/sounds/spy-h323.gsm
-share/asterisk/sounds/spy-iax.gsm
-share/asterisk/sounds/spy-iax2.gsm
-share/asterisk/sounds/spy-mgcp.gsm
-share/asterisk/sounds/spy-sip.gsm
-share/asterisk/sounds/spy-skinny.gsm
-share/asterisk/sounds/spy-zap.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm-Cust1.gsm
-share/asterisk/sounds/vm-Cust2.gsm
-share/asterisk/sounds/vm-Cust3.gsm
-share/asterisk/sounds/vm-Cust4.gsm
-share/asterisk/sounds/vm-Cust5.gsm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-advopts.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-calldiffnum.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-dialout.gsm
-share/asterisk/sounds/vm-enter-num-to-call.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forward.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-from-extension.gsm
-share/asterisk/sounds/vm-from-phonenumber.gsm
-share/asterisk/sounds/vm-from.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect-mailbox.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-leavemsg.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-minutes.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-newuser.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nobox.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-nonumber.gsm
-share/asterisk/sounds/vm-num-i-have.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-reachoper.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-temp.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-review.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-saveoper.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-star-cancel.gsm
-share/asterisk/sounds/vm-starmain.gsm
-share/asterisk/sounds/vm-tempgreetactive.gsm
-share/asterisk/sounds/vm-tempgreeting.gsm
-share/asterisk/sounds/vm-tempgreeting2.gsm
-share/asterisk/sounds/vm-tempremoved.gsm
-share/asterisk/sounds/vm-then-pound.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tocallback.gsm
-share/asterisk/sounds/vm-tocallnum.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-tocancelmsg.gsm
-share/asterisk/sounds/vm-toenternumber.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-tohearenv.gsm
-share/asterisk/sounds/vm-tomakecall.gsm
-share/asterisk/sounds/vm-tooshort.gsm
-share/asterisk/sounds/vm-toreply.gsm
-share/asterisk/sounds/vm-torerecord.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-unknown-caller.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/sounds/x
-share/asterisk/static-http/ajamdemo.html
-share/asterisk/static-http/astman.css
-share/asterisk/static-http/astman.js
-share/asterisk/static-http/prototype.js
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so
-%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so
-%%WITH_H323%%lib/asterisk/modules/chan_h323.so
-@comment ---NEEDS NEWEST ZAPTEL--- %%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so
-%%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so
-%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so
-@dirrm share/asterisk/static-http
-@dirrm share/asterisk/sounds/silence
-@dirrm share/asterisk/sounds/phonetic
-@dirrm share/asterisk/sounds/letters
-@dirrm share/asterisk/sounds/fr
-@dirrm share/asterisk/sounds/followme
-@dirrm share/asterisk/sounds/es
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds/dictate
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/moh
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/firmware/iax
-@dirrm share/asterisk/firmware
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
+%%DATADIR%%/agi-bin/agi-test.agi
+%%DATADIR%%/agi-bin/eagi-sphinx-test
+%%DATADIR%%/agi-bin/eagi-test
+%%DATADIR%%/agi-bin/jukebox.agi
+%%DATADIR%%/firmware/iax/iaxy.bin
+%%DATADIR%%/images/asterisk-intro.jpg
+%%DATADIR%%/keys/freeworlddialup.pub
+%%DATADIR%%/keys/iaxtel.pub
+%%DATADIR%%/moh/.asterisk-moh-freeplay-wav
+%%DATADIR%%/moh/LICENSE-asterisk-moh-freeplay-wav
+%%DATADIR%%/moh/fpm-calm-river.wav
+%%DATADIR%%/moh/fpm-sunshine.wav
+%%DATADIR%%/moh/fpm-world-mix.wav
+%%DATADIR%%/sounds/.asterisk-core-sounds-en-gsm-1.4.6
+%%DATADIR%%/sounds/CREDITS-asterisk-core-en-1.4.6
+%%DATADIR%%/sounds/agent-alreadyon.gsm
+%%DATADIR%%/sounds/agent-incorrect.gsm
+%%DATADIR%%/sounds/agent-loggedoff.gsm
+%%DATADIR%%/sounds/agent-loginok.gsm
+%%DATADIR%%/sounds/agent-newlocation.gsm
+%%DATADIR%%/sounds/agent-pass.gsm
+%%DATADIR%%/sounds/agent-user.gsm
+%%DATADIR%%/sounds/auth-incorrect.gsm
+%%DATADIR%%/sounds/auth-thankyou.gsm
+%%DATADIR%%/sounds/beep.gsm
+%%DATADIR%%/sounds/beeperr.gsm
+%%DATADIR%%/sounds/conf-adminmenu.gsm
+%%DATADIR%%/sounds/conf-enteringno.gsm
+%%DATADIR%%/sounds/conf-errormenu.gsm
+%%DATADIR%%/sounds/conf-getchannel.gsm
+%%DATADIR%%/sounds/conf-getconfno.gsm
+%%DATADIR%%/sounds/conf-getpin.gsm
+%%DATADIR%%/sounds/conf-hasjoin.gsm
+%%DATADIR%%/sounds/conf-hasleft.gsm
+%%DATADIR%%/sounds/conf-invalid.gsm
+%%DATADIR%%/sounds/conf-invalidpin.gsm
+%%DATADIR%%/sounds/conf-kicked.gsm
+%%DATADIR%%/sounds/conf-leaderhasleft.gsm
+%%DATADIR%%/sounds/conf-locked.gsm
+%%DATADIR%%/sounds/conf-lockednow.gsm
+%%DATADIR%%/sounds/conf-muted.gsm
+%%DATADIR%%/sounds/conf-noempty.gsm
+%%DATADIR%%/sounds/conf-onlyone.gsm
+%%DATADIR%%/sounds/conf-onlyperson.gsm
+%%DATADIR%%/sounds/conf-otherinparty.gsm
+%%DATADIR%%/sounds/conf-placeintoconf.gsm
+%%DATADIR%%/sounds/conf-thereare.gsm
+%%DATADIR%%/sounds/conf-unlockednow.gsm
+%%DATADIR%%/sounds/conf-unmuted.gsm
+%%DATADIR%%/sounds/conf-usermenu.gsm
+%%DATADIR%%/sounds/conf-userswilljoin.gsm
+%%DATADIR%%/sounds/conf-userwilljoin.gsm
+%%DATADIR%%/sounds/conf-waitforleader.gsm
+%%DATADIR%%/sounds/core-sounds-en.txt
+%%DATADIR%%/sounds/demo-abouttotry.gsm
+%%DATADIR%%/sounds/demo-congrats.gsm
+%%DATADIR%%/sounds/demo-echodone.gsm
+%%DATADIR%%/sounds/demo-echotest.gsm
+%%DATADIR%%/sounds/demo-enterkeywords.gsm
+%%DATADIR%%/sounds/demo-instruct.gsm
+%%DATADIR%%/sounds/demo-moreinfo.gsm
+%%DATADIR%%/sounds/demo-nogo.gsm
+%%DATADIR%%/sounds/demo-nomatch.gsm
+%%DATADIR%%/sounds/demo-thanks.gsm
+%%DATADIR%%/sounds/dictate/both_help.gsm
+%%DATADIR%%/sounds/dictate/enter_filename.gsm
+%%DATADIR%%/sounds/dictate/forhelp.gsm
+%%DATADIR%%/sounds/dictate/pause.gsm
+%%DATADIR%%/sounds/dictate/paused.gsm
+%%DATADIR%%/sounds/dictate/play_help.gsm
+%%DATADIR%%/sounds/dictate/playback.gsm
+%%DATADIR%%/sounds/dictate/playback_mode.gsm
+%%DATADIR%%/sounds/dictate/record.gsm
+%%DATADIR%%/sounds/dictate/record_help.gsm
+%%DATADIR%%/sounds/dictate/record_mode.gsm
+%%DATADIR%%/sounds/dictate/truncating_audio.gsm
+%%DATADIR%%/sounds/digits/0.gsm
+%%DATADIR%%/sounds/digits/1.gsm
+%%DATADIR%%/sounds/digits/10.gsm
+%%DATADIR%%/sounds/digits/11.gsm
+%%DATADIR%%/sounds/digits/12.gsm
+%%DATADIR%%/sounds/digits/13.gsm
+%%DATADIR%%/sounds/digits/14.gsm
+%%DATADIR%%/sounds/digits/15.gsm
+%%DATADIR%%/sounds/digits/16.gsm
+%%DATADIR%%/sounds/digits/17.gsm
+%%DATADIR%%/sounds/digits/18.gsm
+%%DATADIR%%/sounds/digits/19.gsm
+%%DATADIR%%/sounds/digits/2.gsm
+%%DATADIR%%/sounds/digits/20.gsm
+%%DATADIR%%/sounds/digits/3.gsm
+%%DATADIR%%/sounds/digits/30.gsm
+%%DATADIR%%/sounds/digits/4.gsm
+%%DATADIR%%/sounds/digits/40.gsm
+%%DATADIR%%/sounds/digits/5.gsm
+%%DATADIR%%/sounds/digits/50.gsm
+%%DATADIR%%/sounds/digits/6.gsm
+%%DATADIR%%/sounds/digits/60.gsm
+%%DATADIR%%/sounds/digits/7.gsm
+%%DATADIR%%/sounds/digits/70.gsm
+%%DATADIR%%/sounds/digits/8.gsm
+%%DATADIR%%/sounds/digits/80.gsm
+%%DATADIR%%/sounds/digits/9.gsm
+%%DATADIR%%/sounds/digits/90.gsm
+%%DATADIR%%/sounds/digits/a-m.gsm
+%%DATADIR%%/sounds/digits/at.gsm
+%%DATADIR%%/sounds/digits/day-0.gsm
+%%DATADIR%%/sounds/digits/day-1.gsm
+%%DATADIR%%/sounds/digits/day-2.gsm
+%%DATADIR%%/sounds/digits/day-3.gsm
+%%DATADIR%%/sounds/digits/day-4.gsm
+%%DATADIR%%/sounds/digits/day-5.gsm
+%%DATADIR%%/sounds/digits/day-6.gsm
+%%DATADIR%%/sounds/digits/dollars.gsm
+%%DATADIR%%/sounds/digits/h-1.gsm
+%%DATADIR%%/sounds/digits/h-10.gsm
+%%DATADIR%%/sounds/digits/h-11.gsm
+%%DATADIR%%/sounds/digits/h-12.gsm
+%%DATADIR%%/sounds/digits/h-13.gsm
+%%DATADIR%%/sounds/digits/h-14.gsm
+%%DATADIR%%/sounds/digits/h-15.gsm
+%%DATADIR%%/sounds/digits/h-16.gsm
+%%DATADIR%%/sounds/digits/h-17.gsm
+%%DATADIR%%/sounds/digits/h-18.gsm
+%%DATADIR%%/sounds/digits/h-19.gsm
+%%DATADIR%%/sounds/digits/h-2.gsm
+%%DATADIR%%/sounds/digits/h-20.gsm
+%%DATADIR%%/sounds/digits/h-3.gsm
+%%DATADIR%%/sounds/digits/h-30.gsm
+%%DATADIR%%/sounds/digits/h-4.gsm
+%%DATADIR%%/sounds/digits/h-5.gsm
+%%DATADIR%%/sounds/digits/h-6.gsm
+%%DATADIR%%/sounds/digits/h-7.gsm
+%%DATADIR%%/sounds/digits/h-8.gsm
+%%DATADIR%%/sounds/digits/h-9.gsm
+%%DATADIR%%/sounds/digits/hundred.gsm
+%%DATADIR%%/sounds/digits/million.gsm
+%%DATADIR%%/sounds/digits/minus.gsm
+%%DATADIR%%/sounds/digits/mon-0.gsm
+%%DATADIR%%/sounds/digits/mon-1.gsm
+%%DATADIR%%/sounds/digits/mon-10.gsm
+%%DATADIR%%/sounds/digits/mon-11.gsm
+%%DATADIR%%/sounds/digits/mon-2.gsm
+%%DATADIR%%/sounds/digits/mon-3.gsm
+%%DATADIR%%/sounds/digits/mon-4.gsm
+%%DATADIR%%/sounds/digits/mon-5.gsm
+%%DATADIR%%/sounds/digits/mon-6.gsm
+%%DATADIR%%/sounds/digits/mon-7.gsm
+%%DATADIR%%/sounds/digits/mon-8.gsm
+%%DATADIR%%/sounds/digits/mon-9.gsm
+%%DATADIR%%/sounds/digits/oclock.gsm
+%%DATADIR%%/sounds/digits/oh.gsm
+%%DATADIR%%/sounds/digits/p-m.gsm
+%%DATADIR%%/sounds/digits/pound.gsm
+%%DATADIR%%/sounds/digits/star.gsm
+%%DATADIR%%/sounds/digits/thousand.gsm
+%%DATADIR%%/sounds/digits/today.gsm
+%%DATADIR%%/sounds/digits/tomorrow.gsm
+%%DATADIR%%/sounds/digits/yesterday.gsm
+%%DATADIR%%/sounds/dir-instr.gsm
+%%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
+%%DATADIR%%/sounds/dir-nomatch.gsm
+%%DATADIR%%/sounds/dir-nomore.gsm
+%%DATADIR%%/sounds/followme/call-from.gsm
+%%DATADIR%%/sounds/followme/no-recording.gsm
+%%DATADIR%%/sounds/followme/options.gsm
+%%DATADIR%%/sounds/followme/pls-hold-while-try.gsm
+%%DATADIR%%/sounds/followme/sorry.gsm
+%%DATADIR%%/sounds/followme/status.gsm
+%%DATADIR%%/sounds/hello-world.gsm
+%%DATADIR%%/sounds/hours.gsm
+%%DATADIR%%/sounds/invalid.gsm
+%%DATADIR%%/sounds/letters/a.gsm
+%%DATADIR%%/sounds/letters/at.gsm
+%%DATADIR%%/sounds/letters/b.gsm
+%%DATADIR%%/sounds/letters/c.gsm
+%%DATADIR%%/sounds/letters/d.gsm
+%%DATADIR%%/sounds/letters/dash.gsm
+%%DATADIR%%/sounds/letters/dollar.gsm
+%%DATADIR%%/sounds/letters/dot.gsm
+%%DATADIR%%/sounds/letters/e.gsm
+%%DATADIR%%/sounds/letters/equals.gsm
+%%DATADIR%%/sounds/letters/exclaimation-point.gsm
+%%DATADIR%%/sounds/letters/f.gsm
+%%DATADIR%%/sounds/letters/g.gsm
+%%DATADIR%%/sounds/letters/h.gsm
+%%DATADIR%%/sounds/letters/i.gsm
+%%DATADIR%%/sounds/letters/j.gsm
+%%DATADIR%%/sounds/letters/k.gsm
+%%DATADIR%%/sounds/letters/l.gsm
+%%DATADIR%%/sounds/letters/m.gsm
+%%DATADIR%%/sounds/letters/n.gsm
+%%DATADIR%%/sounds/letters/o.gsm
+%%DATADIR%%/sounds/letters/p.gsm
+%%DATADIR%%/sounds/letters/plus.gsm
+%%DATADIR%%/sounds/letters/q.gsm
+%%DATADIR%%/sounds/letters/r.gsm
+%%DATADIR%%/sounds/letters/s.gsm
+%%DATADIR%%/sounds/letters/slash.gsm
+%%DATADIR%%/sounds/letters/space.gsm
+%%DATADIR%%/sounds/letters/t.gsm
+%%DATADIR%%/sounds/letters/u.gsm
+%%DATADIR%%/sounds/letters/v.gsm
+%%DATADIR%%/sounds/letters/w.gsm
+%%DATADIR%%/sounds/letters/x.gsm
+%%DATADIR%%/sounds/letters/y.gsm
+%%DATADIR%%/sounds/letters/z.gsm
+%%DATADIR%%/sounds/letters/zed.gsm
+%%DATADIR%%/sounds/minutes.gsm
+%%DATADIR%%/sounds/pbx-invalid.gsm
+%%DATADIR%%/sounds/pbx-invalidpark.gsm
+%%DATADIR%%/sounds/pbx-transfer.gsm
+%%DATADIR%%/sounds/phonetic/9_p.gsm
+%%DATADIR%%/sounds/phonetic/a_p.gsm
+%%DATADIR%%/sounds/phonetic/b_p.gsm
+%%DATADIR%%/sounds/phonetic/c_p.gsm
+%%DATADIR%%/sounds/phonetic/d_p.gsm
+%%DATADIR%%/sounds/phonetic/e_p.gsm
+%%DATADIR%%/sounds/phonetic/f_p.gsm
+%%DATADIR%%/sounds/phonetic/g_p.gsm
+%%DATADIR%%/sounds/phonetic/h_p.gsm
+%%DATADIR%%/sounds/phonetic/i_p.gsm
+%%DATADIR%%/sounds/phonetic/j_p.gsm
+%%DATADIR%%/sounds/phonetic/k_p.gsm
+%%DATADIR%%/sounds/phonetic/l_p.gsm
+%%DATADIR%%/sounds/phonetic/m_p.gsm
+%%DATADIR%%/sounds/phonetic/n_p.gsm
+%%DATADIR%%/sounds/phonetic/o_p.gsm
+%%DATADIR%%/sounds/phonetic/p_p.gsm
+%%DATADIR%%/sounds/phonetic/q_p.gsm
+%%DATADIR%%/sounds/phonetic/r_p.gsm
+%%DATADIR%%/sounds/phonetic/s_p.gsm
+%%DATADIR%%/sounds/phonetic/t_p.gsm
+%%DATADIR%%/sounds/phonetic/u_p.gsm
+%%DATADIR%%/sounds/phonetic/v_p.gsm
+%%DATADIR%%/sounds/phonetic/w_p.gsm
+%%DATADIR%%/sounds/phonetic/x_p.gsm
+%%DATADIR%%/sounds/phonetic/y_p.gsm
+%%DATADIR%%/sounds/phonetic/z_p.gsm
+%%DATADIR%%/sounds/priv-callee-options.gsm
+%%DATADIR%%/sounds/priv-callpending.gsm
+%%DATADIR%%/sounds/priv-introsaved.gsm
+%%DATADIR%%/sounds/priv-recordintro.gsm
+%%DATADIR%%/sounds/privacy-incorrect.gsm
+%%DATADIR%%/sounds/privacy-prompt.gsm
+%%DATADIR%%/sounds/privacy-thankyou.gsm
+%%DATADIR%%/sounds/privacy-unident.gsm
+%%DATADIR%%/sounds/queue-callswaiting.gsm
+%%DATADIR%%/sounds/queue-holdtime.gsm
+%%DATADIR%%/sounds/queue-less-than.gsm
+%%DATADIR%%/sounds/queue-minutes.gsm
+%%DATADIR%%/sounds/queue-periodic-announce.gsm
+%%DATADIR%%/sounds/queue-reporthold.gsm
+%%DATADIR%%/sounds/queue-seconds.gsm
+%%DATADIR%%/sounds/queue-thankyou.gsm
+%%DATADIR%%/sounds/queue-thereare.gsm
+%%DATADIR%%/sounds/queue-youarenext.gsm
+%%DATADIR%%/sounds/screen-callee-options.gsm
+%%DATADIR%%/sounds/seconds.gsm
+%%DATADIR%%/sounds/silence/1.gsm
+%%DATADIR%%/sounds/silence/10.gsm
+%%DATADIR%%/sounds/silence/2.gsm
+%%DATADIR%%/sounds/silence/3.gsm
+%%DATADIR%%/sounds/silence/4.gsm
+%%DATADIR%%/sounds/silence/5.gsm
+%%DATADIR%%/sounds/silence/6.gsm
+%%DATADIR%%/sounds/silence/7.gsm
+%%DATADIR%%/sounds/silence/8.gsm
+%%DATADIR%%/sounds/silence/9.gsm
+%%DATADIR%%/sounds/spy-agent.gsm
+%%DATADIR%%/sounds/spy-h323.gsm
+%%DATADIR%%/sounds/spy-iax.gsm
+%%DATADIR%%/sounds/spy-iax2.gsm
+%%DATADIR%%/sounds/spy-mgcp.gsm
+%%DATADIR%%/sounds/spy-sip.gsm
+%%DATADIR%%/sounds/spy-skinny.gsm
+%%DATADIR%%/sounds/spy-zap.gsm
+%%DATADIR%%/sounds/ss-noservice.gsm
+%%DATADIR%%/sounds/transfer.gsm
+%%DATADIR%%/sounds/tt-allbusy.gsm
+%%DATADIR%%/sounds/tt-monkeys.gsm
+%%DATADIR%%/sounds/tt-monkeysintro.gsm
+%%DATADIR%%/sounds/tt-somethingwrong.gsm
+%%DATADIR%%/sounds/tt-weasels.gsm
+%%DATADIR%%/sounds/vm-Cust1.gsm
+%%DATADIR%%/sounds/vm-Cust2.gsm
+%%DATADIR%%/sounds/vm-Cust3.gsm
+%%DATADIR%%/sounds/vm-Cust4.gsm
+%%DATADIR%%/sounds/vm-Cust5.gsm
+%%DATADIR%%/sounds/vm-Family.gsm
+%%DATADIR%%/sounds/vm-Friends.gsm
+%%DATADIR%%/sounds/vm-INBOX.gsm
+%%DATADIR%%/sounds/vm-Old.gsm
+%%DATADIR%%/sounds/vm-Work.gsm
+%%DATADIR%%/sounds/vm-advopts.gsm
+%%DATADIR%%/sounds/vm-and.gsm
+%%DATADIR%%/sounds/vm-calldiffnum.gsm
+%%DATADIR%%/sounds/vm-changeto.gsm
+%%DATADIR%%/sounds/vm-delete.gsm
+%%DATADIR%%/sounds/vm-deleted.gsm
+%%DATADIR%%/sounds/vm-dialout.gsm
+%%DATADIR%%/sounds/vm-enter-num-to-call.gsm
+%%DATADIR%%/sounds/vm-extension.gsm
+%%DATADIR%%/sounds/vm-first.gsm
+%%DATADIR%%/sounds/vm-for.gsm
+%%DATADIR%%/sounds/vm-forward.gsm
+%%DATADIR%%/sounds/vm-forwardoptions.gsm
+%%DATADIR%%/sounds/vm-from-extension.gsm
+%%DATADIR%%/sounds/vm-from-phonenumber.gsm
+%%DATADIR%%/sounds/vm-from.gsm
+%%DATADIR%%/sounds/vm-goodbye.gsm
+%%DATADIR%%/sounds/vm-helpexit.gsm
+%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
+%%DATADIR%%/sounds/vm-instructions.gsm
+%%DATADIR%%/sounds/vm-intro.gsm
+%%DATADIR%%/sounds/vm-isonphone.gsm
+%%DATADIR%%/sounds/vm-isunavail.gsm
+%%DATADIR%%/sounds/vm-last.gsm
+%%DATADIR%%/sounds/vm-leavemsg.gsm
+%%DATADIR%%/sounds/vm-login.gsm
+%%DATADIR%%/sounds/vm-mailboxfull.gsm
+%%DATADIR%%/sounds/vm-message.gsm
+%%DATADIR%%/sounds/vm-messages.gsm
+%%DATADIR%%/sounds/vm-minutes.gsm
+%%DATADIR%%/sounds/vm-mismatch.gsm
+%%DATADIR%%/sounds/vm-msginstruct.gsm
+%%DATADIR%%/sounds/vm-msgsaved.gsm
+%%DATADIR%%/sounds/vm-newpassword.gsm
+%%DATADIR%%/sounds/vm-newuser.gsm
+%%DATADIR%%/sounds/vm-next.gsm
+%%DATADIR%%/sounds/vm-no.gsm
+%%DATADIR%%/sounds/vm-nobodyavail.gsm
+%%DATADIR%%/sounds/vm-nobox.gsm
+%%DATADIR%%/sounds/vm-nomore.gsm
+%%DATADIR%%/sounds/vm-nonumber.gsm
+%%DATADIR%%/sounds/vm-num-i-have.gsm
+%%DATADIR%%/sounds/vm-onefor.gsm
+%%DATADIR%%/sounds/vm-options.gsm
+%%DATADIR%%/sounds/vm-opts.gsm
+%%DATADIR%%/sounds/vm-passchanged.gsm
+%%DATADIR%%/sounds/vm-password.gsm
+%%DATADIR%%/sounds/vm-press.gsm
+%%DATADIR%%/sounds/vm-prev.gsm
+%%DATADIR%%/sounds/vm-reachoper.gsm
+%%DATADIR%%/sounds/vm-rec-busy.gsm
+%%DATADIR%%/sounds/vm-rec-name.gsm
+%%DATADIR%%/sounds/vm-rec-temp.gsm
+%%DATADIR%%/sounds/vm-rec-unv.gsm
+%%DATADIR%%/sounds/vm-received.gsm
+%%DATADIR%%/sounds/vm-reenterpassword.gsm
+%%DATADIR%%/sounds/vm-repeat.gsm
+%%DATADIR%%/sounds/vm-review.gsm
+%%DATADIR%%/sounds/vm-saved.gsm
+%%DATADIR%%/sounds/vm-savedto.gsm
+%%DATADIR%%/sounds/vm-savefolder.gsm
+%%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
+%%DATADIR%%/sounds/vm-sorry.gsm
+%%DATADIR%%/sounds/vm-star-cancel.gsm
+%%DATADIR%%/sounds/vm-starmain.gsm
+%%DATADIR%%/sounds/vm-tempgreetactive.gsm
+%%DATADIR%%/sounds/vm-tempgreeting.gsm
+%%DATADIR%%/sounds/vm-tempgreeting2.gsm
+%%DATADIR%%/sounds/vm-tempremoved.gsm
+%%DATADIR%%/sounds/vm-then-pound.gsm
+%%DATADIR%%/sounds/vm-theperson.gsm
+%%DATADIR%%/sounds/vm-tocallback.gsm
+%%DATADIR%%/sounds/vm-tocallnum.gsm
+%%DATADIR%%/sounds/vm-tocancel.gsm
+%%DATADIR%%/sounds/vm-tocancelmsg.gsm
+%%DATADIR%%/sounds/vm-toenternumber.gsm
+%%DATADIR%%/sounds/vm-toforward.gsm
+%%DATADIR%%/sounds/vm-tohearenv.gsm
+%%DATADIR%%/sounds/vm-tomakecall.gsm
+%%DATADIR%%/sounds/vm-tooshort.gsm
+%%DATADIR%%/sounds/vm-toreply.gsm
+%%DATADIR%%/sounds/vm-torerecord.gsm
+%%DATADIR%%/sounds/vm-undelete.gsm
+%%DATADIR%%/sounds/vm-undeleted.gsm
+%%DATADIR%%/sounds/vm-unknown-caller.gsm
+%%DATADIR%%/sounds/vm-whichbox.gsm
+%%DATADIR%%/sounds/vm-youhave.gsm
+%%DATADIR%%/sounds/x
+%%DATADIR%%/static-http/ajamdemo.html
+%%DATADIR%%/static-http/astman.css
+%%DATADIR%%/static-http/astman.js
+%%DATADIR%%/static-http/prototype.js
+@dirrm %%DATADIR%%/static-http
+@dirrm %%DATADIR%%/sounds/silence
+@dirrm %%DATADIR%%/sounds/phonetic
+@dirrm %%DATADIR%%/sounds/letters
+@dirrm %%DATADIR%%/sounds/fr
+@dirrm %%DATADIR%%/sounds/followme
+@dirrm %%DATADIR%%/sounds/es
+@dirrm %%DATADIR%%/sounds/digits
+@dirrm %%DATADIR%%/sounds/dictate
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/moh
+@dirrm %%DATADIR%%/keys
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/firmware/iax
+@dirrm %%DATADIR%%/firmware
+@dirrm %%DATADIR%%/agi-bin
+@dirrm %%DATADIR%%
 @dirrm lib/asterisk/modules
 @dirrm lib/asterisk
 @dirrm include/asterisk
-@cwd /var
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/log/asterisk/cdr-custom
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@exec mkdir -p %D/spool/asterisk/dictate
-@exec mkdir -p %D/spool/asterisk/meetme
-@exec mkdir -p %D/spool/asterisk/monitor
-@exec mkdir -p %D/spool/asterisk/system
-@exec mkdir -p %D/spool/asterisk/tmp
-@dirrm spool/asterisk/dictate
-@dirrm spool/asterisk/meetme
-@dirrm spool/asterisk/monitor
-@dirrm spool/asterisk/system
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk/tmp
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk/cdr-custom
-@dirrm log/asterisk
+@dirrm etc/asterisk
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/net/asterisk/files/patch-Makefile,v
retrieving revision 1.18
diff -u -r1.18 patch-Makefile
--- files/patch-Makefile	13 Apr 2007 08:06:05 -0000	1.18
+++ files/patch-Makefile	14 Apr 2007 05:41:31 -0000
@@ -1,217 +0,0 @@
-
-$FreeBSD: ports/net/asterisk/files/patch-Makefile,v 1.18 2007/04/13 08:06:05 sobomax Exp $
-
---- Makefile.orig
-+++ Makefile
-@@ -371,15 +371,15 @@
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail?  There are portions here that *could* be customized but might also be
- # improved a lot.  I'll put it here for now.
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
- 	for x in static-http/*; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/images
- 	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 	$(MAKE) -C sounds install
- 
- update: 
-@@ -400,45 +400,45 @@
- OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
- 
- bininstall: _all
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
--	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
-+	$(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
- 	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
--	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
--	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
- 		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
- 		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
- 	fi
--	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
--	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
--	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	if [ -n "$(OLDHEADERS)" ]; then \
- 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
- 	fi
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
--	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
-+	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_DATA) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
--		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
-+		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
- 	fi
- 
- $(SUBDIRS_INSTALL):
-@@ -465,7 +465,7 @@
- 		echo " WARNING WARNING WARNING" ;\
- 	fi
- 
--install: datafiles bininstall $(SUBDIRS_INSTALL)
-+install: datafiles bininstall $(SUBDIRS_INSTALL) samples
- 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- 	fi
-@@ -495,31 +495,23 @@
- upgrade: bininstall
- 
- adsi:
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
- 		if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
--			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
- 		fi ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
- 	done
- 
- samples: adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
--			if [ "$(OVERWRITE)" = "y" ]; then \
--				if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
--					echo "Config file $$x is unchanged"; \
--					continue; \
--				fi ; \
--				mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
--			else \
--				echo "Skipping config file $$x"; \
--				continue; \
--			fi ;\
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
-+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
- 		fi ; \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
- 	done
--	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+	if true; then \
- 		( \
- 		echo "[directories]" ; \
- 		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -540,20 +532,23 @@
- 		echo ";astctlowner = root" ; \
- 		echo ";astctlgroup = apache" ; \
- 		echo ";astctl = asterisk.ctl" ; \
--		) > $(DESTDIR)$(ASTCONFPATH) ; \
-+		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
-+		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+			cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
-+		fi; \
- 	else \
- 		echo "Skipping asterisk.conf creation"; \
- 	fi
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
- 
- webvmail:
- 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
- 	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- 	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
--	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
-+	$(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
- 	for x in images/*.gif; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
- 	done
- 	@echo " +--------- Asterisk Web Voicemail ----------+"  
- 	@echo " +                                           +"
-@@ -580,10 +575,10 @@
- 
- __rpm: include/asterisk/version.h include/asterisk/buildopts.h spec
- 	rm -rf /tmp/asterisk ; \
--	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
-+	$(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
- 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
- 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
--	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
-+	$(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
- 	cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
- 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
- 
-@@ -594,19 +589,19 @@
- config:
- 	@if [ "${OSARCH}" = "linux-gnu" ]; then \
- 		if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
--			$(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
-+			$(BSD_INSTALL_SCRIPT) contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
- 			/sbin/chkconfig --add asterisk; \
- 		elif [ -f /etc/debian_version ]; then \
--			$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
-+			$(BSD_INSTALL_SCRIPT) contrib/init.d/rc.debian.asterisk /etc/init.d/asterisk; \
- 			/usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; \
- 		elif [ -f /etc/gentoo-release ]; then \
--			$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
-+			$(BSD_INSTALL_SCRIPT) contrib/init.d/rc.gentoo.asterisk /etc/init.d/asterisk; \
- 			/sbin/rc-update add asterisk default; \
- 		elif [ -f /etc/mandrake-release ]; then \
--			$(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
-+			$(BSD_INSTALL_SCRIPT) contrib/init.d/rc.mandrake.asterisk /etc/rc.d/init.d/asterisk; \
- 			/sbin/chkconfig --add asterisk; \
- 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
--			$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
-+			$(BSD_INSTALL_SCRIPT) contrib/init.d/rc.suse.asterisk /etc/init.d/asterisk; \
- 			/sbin/chkconfig --add asterisk; \
- 		elif [ -f /etc/slackware-version ]; then \
- 			echo "Slackware is not currently supported, although an init script does exist for it." \
--- asterisk14.patch ends here ---



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



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