11 files changed, 64 insertions, 117 deletions

diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 2da6e746d05f..b9c015bb336c 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTVERSION=	1.2.7.1
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz\
-		asterisk124_codec_negotiation-20060202_2-${BRIVER}.diff.gz
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	fjoe/
-PATCH_DIST_STRIP=	-p1
+PATCHFILES=	asterisk127_codec_negotiation-20060419.diff.gz
+PATCH_SITES=	http://unofficial.portaone.com/~bamby/public/
+
+#		${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff
+#		${MASTER_SITE_LOCAL:S,$,:bristuff,}
+#PATCH_SITE_SUBDIR=	fjoe/:bristuff
+#BRIVER=		bristuff-0.3.0-PRE-1l
 
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-FORBIDDEN=	http://vuxml.freebsd.org/8b683bea-d49c-11da-a672-000e0c2e438a.html
-
 BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 LIB_DEPENDS=	speex.3:${PORTSDIR}/audio/speex \
 		newt.51:${PORTSDIR}/devel/newt \
@@ -33,7 +32,6 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 ONLY_FOR_ARCHS=	i386 sparc64 amd64
 
-BRIVER=		bristuff-0.3.0-PRE-1l
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
@@ -43,18 +41,15 @@ USE_REINPLACE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${PWLIBDIR} \
-		OPENH323DIR=${OPENH323DIR} \
+		PWLIBDIR=${LOCALBASE}/share/pwlib \
+		OPENH323DIR=${LOCALBASE}/share/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
-
+PLIST_SUB=	BRISTUFF="@comment "
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
-
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
 WITHOUT_ZAPTEL=	1
@@ -63,8 +58,8 @@ WITHOUT_ZAPTEL=	1
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
+LIB_DEPENDS+=	pt_r.1:${PORTSDIR}/devel/pwlib\
+		h323_r.1:${PORTSDIR}/net/openh323
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index f2d5ef781f4a..fbeab4a4f4c6 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,9 +1,6 @@
-MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d
-SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c
-SIZE (asterisk-1.2.4.tar.gz) = 10536366
-MD5 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 72a17e513b085d868c638503857d2512
-SHA256 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 5e42e611c9e123a6d8513ab59a56a157976e7a7544e86ee1775e018f47d629f8
-SIZE (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 94989
-MD5 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = df6de1135788f06d72f94b8ec42676e7
-SHA256 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 6f25be043ab518cd876afd7750951ec7dd4870f5d293871965b097250557f17f
-SIZE (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 28577
+MD5 (asterisk-1.2.7.1.tar.gz) = 5c4b473eee2fbc2cb9e346f0564ef970
+SHA256 (asterisk-1.2.7.1.tar.gz) = c561ec886a779a59c78cbeffda457f2a07535ddceb371561c54adc6ee60d984a
+SIZE (asterisk-1.2.7.1.tar.gz) = 10554037
+MD5 (asterisk127_codec_negotiation-20060419.diff.gz) = c5838975a6bea1799da9cc021a2ce8f0
+SHA256 (asterisk127_codec_negotiation-20060419.diff.gz) = df16f36a87e6b539d038ac466504d317d61666eec94ffa96549921458d8c489c
+SIZE (asterisk127_codec_negotiation-20060419.diff.gz) = 32475
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index 708a356041a3..61a2c51190b5 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -160,15 +160,6 @@ $FreeBSD$
    ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
  endif
  
-@@ -323,7 +320,7 @@
-     ASTERISKVERSIONNUM=999999
-     ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
-   else
--    ASTERISKVERSIONNUM=000000
-+    ASTERISKVERSIONNUM?=000000
-   endif
- endif
- 
 @@ -388,10 +385,10 @@
  endif
  
@@ -221,6 +212,21 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
    include .depend
+@@ -470,10 +467,10 @@
+ 
+ manpage: asterisk.8
+ 
+-asterisk.8: asterisk.sgml
+-	rm -f asterisk.8
+-	docbook2man asterisk.sgml
+-	mv ./*.8 asterisk.8
++#asterisk.8: asterisk.sgml
++#	rm -f asterisk.8
++#	docbook2man asterisk.sgml
++#	mv ./*.8 asterisk.8
+ 
+ asterisk.pdf: asterisk.sgml
+ 	docbook2pdf asterisk.sgml
 @@ -510,14 +507,14 @@
  cygwin_a:
  	$(MAKE) -C cygwin all
@@ -241,7 +247,7 @@ $FreeBSD$
 @@ -539,38 +536,38 @@
  
  datafiles: all
- 	if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ 	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 +	$(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
@@ -310,7 +316,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d .svn ]; then \
-@@ -618,75 +615,53 @@
+@@ -618,73 +615,51 @@
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  bininstall: all
@@ -359,7 +365,6 @@ $FreeBSD$
  	if [ -n "$(OLDHEADERS)" ]; then \
  		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
  	fi
- 	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
@@ -392,7 +397,6 @@ $FreeBSD$
  	else \
  		echo "You need to do cvs update -d not just cvs update" ; \
  	fi 
- 	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
 -	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
diff --git a/net/asterisk16/files/patch-agi::Makefile b/net/asterisk16/files/patch-agi::Makefile
index 82b11dbfde30..4615eef8ec94 100644
--- a/net/asterisk16/files/patch-agi::Makefile
+++ b/net/asterisk16/files/patch-agi::Makefile
@@ -4,8 +4,8 @@
  # the GNU General Public License
  #
  
--AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test
-+AGIS_BIN=eagi-test eagi-sphinx-test xagi-test
+-AGIS=agi-test.agi eagi-test eagi-sphinx-test
++AGIS_BIN=eagi-test eagi-sphinx-test
 +AGIS_SCR=agi-test.agi
 +AGIS=$(AGIS_SCR) $(AGIS_BIN)
  
diff --git a/net/asterisk16/files/patch-apps::Makefile b/net/asterisk16/files/patch-apps::Makefile
index ee7d560bed69..2b0de4d3381c 100644
--- a/net/asterisk16/files/patch-apps::Makefile
+++ b/net/asterisk16/files/patch-apps::Makefile
@@ -61,7 +61,7 @@ $FreeBSD$
 +endif
 +
  app_sql_postgres.o: app_sql_postgres.c
--	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+-	$(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
 +	$(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
  
  app_sql_postgres.so: app_sql_postgres.o
diff --git a/net/asterisk16/files/patch-cdr::Makefile b/net/asterisk16/files/patch-cdr::Makefile
index da16b609d5f2..506db2fedcf9 100644
--- a/net/asterisk16/files/patch-cdr::Makefile
+++ b/net/asterisk16/files/patch-cdr::Makefile
@@ -26,14 +26,14 @@ $FreeBSD$
  #
  # FreeTDS stuff...
  #
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),)
--  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h),)
-+  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.63),1)
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+-  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
++  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
      CFLAGS += -DFREETDS_0_63
    else
--	ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1)
-+	ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.62),1)
+-	ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
++	ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
        CFLAGS += -DFREETDS_0_62
      else
        CFLAGS += -DFREETDS_PRE_0_62
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
index edca9b1e7694..872026dfdca2 100644
--- a/net/asterisk16/files/patch-channels::Makefile
+++ b/net/asterisk16/files/patch-channels::Makefile
@@ -3,19 +3,17 @@ $FreeBSD$
 
 --- channels/Makefile.orig
 +++ channels/Makefile
-@@ -48,9 +48,9 @@
+@@ -48,8 +48,8 @@
  endif
  
  ifeq (${OSARCH},FreeBSD)
 -  PTLIB=-lpt_FreeBSD_x86_r
 -  H323LIB=-lh323_FreeBSD_x86_r
--  CHANH323LIB=-pthread
-+  PTLIB=-lpt_FreeBSD_x86_r_s
-+  H323LIB=-lh323_FreeBSD_x86_r_s
-+  CHANH323LIB=
++  PTLIB=-lpt_r
++  H323LIB=-lh323_r
+   CHANH323LIB=-pthread
  endif
  
- ifeq (${OSARCH},NetBSD)
 @@ -73,11 +73,11 @@
    SOLINK+=-lrt
  endif
diff --git a/net/asterisk16/files/patch-channels::h323::ast_h323.cpp b/net/asterisk16/files/patch-channels::h323::ast_h323.cpp
deleted file mode 100644
index feb79e586e91..000000000000
--- a/net/asterisk16/files/patch-channels::h323::ast_h323.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/ast_h323.cpp.orig	Thu Jan 12 18:16:08 2006
-+++ channels/h323/ast_h323.cpp	Thu Jan 12 18:16:35 2006
-@@ -953,8 +953,8 @@ BOOL MyH323Connection::OnReceivedCapabil
- H323Channel * MyH323Connection::CreateRealTimeLogicalChannel(const H323Capability & capability,	
- 								   H323Channel::Directions dir,
- 								   unsigned sessionID,
--		 					           const H245_H2250LogicalChannelParameters * /*param*/,
--								   RTP_QOS * /*param*/ )
-+		 					           const H245_H2250LogicalChannelParameters * /*param*/ /*,
-+								   RTP_QOS * */ /*param*/ )
- {
- 	return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID);
- }
diff --git a/net/asterisk16/files/patch-channels::h323::ast_h323.h b/net/asterisk16/files/patch-channels::h323::ast_h323.h
deleted file mode 100644
index 606bb0123173..000000000000
--- a/net/asterisk16/files/patch-channels::h323::ast_h323.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/ast_h323.h.orig	Thu Jan 12 18:14:49 2006
-+++ channels/h323/ast_h323.h	Thu Jan 12 18:15:02 2006
-@@ -155,8 +155,8 @@ class MyH323Connection : public H323Conn
- 	H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, 
- 						   H323Channel::Directions, 
- 					 	   unsigned, 
--						   const H245_H2250LogicalChannelParameters *,
--						   RTP_QOS *);
-+						   const H245_H2250LogicalChannelParameters * /* ,
-+						   RTP_QOS * */);
- 	H323Connection::AnswerCallResponse OnAnswerCall(const PString &, 
- 							const H323SignalPDU &, 
- 							H323SignalPDU &);
diff --git a/net/asterisk16/files/patch-res-res_watchdog.c b/net/asterisk16/files/patch-res-res_watchdog.c
deleted file mode 100644
index 8372764ed3e4..000000000000
--- a/net/asterisk16/files/patch-res-res_watchdog.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- res/res_watchdog.c.orig	Mon Jan 23 23:55:25 2006
-+++ res/res_watchdog.c	Mon Jan 23 23:55:10 2006
-@@ -37,6 +37,10 @@
- #include <asterisk/utils.h>
- #include <asterisk/adsi.h>
- 
-+#if defined(__FreeBSD__) && !defined(O_SYNC)
-+#define O_SYNC O_FSYNC
-+#endif
-+
- static struct watchdog_pvt *watchdogs = NULL;
- 
- STANDARD_LOCAL_USER;
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index ad61ad74f72f..429b336528a4 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -19,9 +19,9 @@ 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
 @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf
-@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi
-etc/asterisk/capi.conf-dist
-@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf
+%%BRISTUFF%%@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi
+%%BRISTUFF%%etc/asterisk/capi.conf-dist
+%%BRISTUFF%%@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf
 @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
 @exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf
@@ -142,9 +142,9 @@ 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
 @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf
-@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi
-etc/asterisk/watchdog.conf-dist
-@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf
+%%BRISTUFF%%@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi
+%%BRISTUFF%%etc/asterisk/watchdog.conf-dist
+%%BRISTUFF%%@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf
 @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
 @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
@@ -163,8 +163,8 @@ include/asterisk/build.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
-include/asterisk/chan_capi.h
-include/asterisk/chan_capi_app.h
+%%BRISTUFF%%include/asterisk/chan_capi.h
+%%BRISTUFF%%include/asterisk/chan_capi_app.h
 include/asterisk/channel.h
 include/asterisk/chanspy.h
 include/asterisk/chanvars.h
@@ -222,11 +222,11 @@ include/asterisk/unaligned.h
 include/asterisk/utils.h
 include/asterisk/version.h
 include/asterisk/vmodem.h
-include/asterisk/xlaw.h
+%%BRISTUFF%%include/asterisk/xlaw.h
 lib/asterisk/modules/app_adsiprog.so
 lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_callingpres.so
+%%BRISTUFF%%lib/asterisk/modules/app_callingpres.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
 lib/asterisk/modules/app_chanspy.so
@@ -234,7 +234,7 @@ lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_curl.so
 lib/asterisk/modules/app_cut.so
 lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_devstate.so
+%%BRISTUFF%%lib/asterisk/modules/app_devstate.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_dictate.so
 lib/asterisk/modules/app_directed_pickup.so
@@ -266,7 +266,7 @@ lib/asterisk/modules/app_mp3.so
 lib/asterisk/modules/app_nbscat.so
 %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so
 lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_pickup.so
+%%BRISTUFF%%lib/asterisk/modules/app_pickup.so
 lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_privacy.so
 lib/asterisk/modules/app_queue.so
@@ -277,7 +277,7 @@ lib/asterisk/modules/app_realtime.so
 lib/asterisk/modules/app_record.so
 %%WITH_FAX%%lib/asterisk/modules/app_rxfax.so
 lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_segfault.so
+%%BRISTUFF%%lib/asterisk/modules/app_segfault.so
 lib/asterisk/modules/app_senddtmf.so
 lib/asterisk/modules/app_sendtext.so
 lib/asterisk/modules/app_setcallerid.so
@@ -362,7 +362,7 @@ lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
 lib/asterisk/modules/res_odbc.so
-lib/asterisk/modules/res_watchdog.so
+%%BRISTUFF%%lib/asterisk/modules/res_watchdog.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
@@ -375,7 +375,7 @@ sbin/streamplayer
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
 %%DATADIR%%/agi-bin/eagi-test
-%%DATADIR%%/agi-bin/xagi-test
+%%BRISTUFF%%%%DATADIR%%/agi-bin/xagi-test
 %%DATADIR%%/firmware/iax/iaxy.bin
 %%DATADIR%%/images/asterisk-intro.jpg
 %%DATADIR%%/keys/freeworlddialup.pub
@@ -731,7 +731,6 @@ sbin/streamplayer
 %%DATADIR%%/sounds/vm-unknown-caller.gsm
 %%DATADIR%%/sounds/vm-whichbox.gsm
 %%DATADIR%%/sounds/vm-youhave.gsm
-%%DATADIR%%/sounds/voicemail
 @dirrm %%DATADIR%%/sounds/priv-callerintros
 @dirrm %%DATADIR%%/sounds/phonetic
 @dirrm %%DATADIR%%/sounds/letters
@@ -749,7 +748,6 @@ sbin/streamplayer
 @dirrm lib/asterisk
 @dirrm include/asterisk
 @dirrm etc/asterisk
-@unexec rm -f %D/%%DATADIR%%/astdb
 @cwd /var
 spool/asterisk/voicemail/default/1234/busy.gsm
 spool/asterisk/voicemail/default/1234/unavail.gsm