- Add back bristuff 0.3.0-p1 after repocopy.

- Take maintainership. Sponsored by: Ethon Technologies
svn path=/head/; revision=164296
2006-06-03 15:08:57 +00:00 · 2006-06-03 15:08:57 +00:00 · 2ad0512caf · 2021-03-31 03:12:20 +00:00
commit 2ad0512caf
parent ac2c14f932
7 changed files with 71 additions and 77 deletions
--- a/net/Makefile
+++ b/net/Makefile
@ -30,6 +30,7 @@
    SUBDIR += aslookup
    SUBDIR += asterisk
    SUBDIR += asterisk-addons
+    SUBDIR += asterisk-bristuff
    SUBDIR += asterisk-devel
    SUBDIR += asterisk-oh323
    SUBDIR += atmsupport
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@ -11,15 +11,15 @@ CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/

-PATCHFILES=	asterisk127_codec_negotiation-20060419.diff.gz
-PATCH_SITES=	http://unofficial.portaone.com/~bamby/public/
+PKGNAMESUFFIX=	-bristuff
+PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	fjoe
+PATCH_DIST_STRIP=	-p1
+BRIVER=		bristuff-0.3.0-PRE-1p
+CONFLICTS=	asterisk-[0-9]*

-#		${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
+MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit

 BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
@ -42,7 +42,6 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		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>
@ -65,9 +64,8 @@ MAKE_ENV+=	WITH_H323=1
 PLIST_SUB+=	WITH_ZAPTEL="@comment "
 MAKE_ENV+=	WITHOUT_ZAPTEL=1
 .else
-BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \
-		${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
-LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri
+BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
+LIB_DEPENDS+=	pri-bristuff.1:${PORTSDIR}/misc/libpri-bristuff
 RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 PLIST_SUB+=	WITH_ZAPTEL=""
 MAKE_ENV+=	WITH_ZAPTEL=1
@ -100,5 +98,7 @@ PLIST_SUB+=	NEWGCC="@comment "

 post-patch:
 	${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+	${REINPLACE_CMD} -e 's,^#include <libpri\.h>,#include <libpri-bristuff.h>,' ${WRKSRC}/channels/chan_zap.c
+	${REINPLACE_CMD} -e 's,-lpri,-lpri-bristuff,' ${WRKSRC}/channels/Makefile

 .include <bsd.port.post.mk>
--- a/net/asterisk-bristuff/distinfo
+++ b/net/asterisk-bristuff/distinfo
@ -1,6 +1,6 @@
 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
+MD5 (asterisk-1.2.7.1-bristuff-0.3.0-PRE-1p.patch.gz) = d6351c368f76cb8adf9ff2467f56b160
+SHA256 (asterisk-1.2.7.1-bristuff-0.3.0-PRE-1p.patch.gz) = 470c880cd2b856963871c40e2bbf7a52b2a2fa8c76dff03c9e40a3b282965cce
+SIZE (asterisk-1.2.7.1-bristuff-0.3.0-PRE-1p.patch.gz) = 101554
--- a/net/asterisk-bristuff/files/patch-Makefile
+++ b/net/asterisk-bristuff/files/patch-Makefile
@ -1,8 +1,5 @@
-
-$FreeBSD$
-
--- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Sat Jun  3 21:34:08 2006
+++ Makefile	Sat Jun  3 21:38:40 2006
@@ -19,8 +19,8 @@
 # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
 # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
@ -14,7 +11,7 @@ $FreeBSD$
 # CROSS_ARCH=Linux
 # CROSS_PROC=arm
 # SUB_PROC=xscale # or maverick
-@@ -44,14 +44,14 @@
+@@ -46,14 +46,14 @@
 #K6OPT  = -DK6OPT
 
 #Tell gcc to optimize the code
@ -32,7 +29,7 @@ $FreeBSD$
 
 #Set NOCRYPTO to yes if you do not want to have crypto support or 
 #dependencies
-@@ -83,7 +83,7 @@
+@@ -85,7 +85,7 @@
 
 # Where to install asterisk after compiling
 # Default -> leave empty
@ -41,7 +38,7 @@ $FreeBSD$
 
 # Staging directory
 # Files are copied here temporarily during the install process
-@@ -106,17 +106,17 @@
+@@ -108,17 +108,17 @@
 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
 ifneq ($(OSARCH),SunOS)
@ -68,7 +65,7 @@ $FreeBSD$
   MODULES_DIR=$(ASTLIBDIR)/modules
   AGI_DIR=$(ASTVARLIBDIR)/agi-bin
 else
-@@ -218,25 +218,25 @@
+@@ -221,25 +221,25 @@
 endif
 
 INCLUDE+=-Iinclude -I../include
@ -100,7 +97,7 @@ $FreeBSD$
 else
   ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
     ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
-@@ -245,27 +245,24 @@
+@@ -248,27 +248,24 @@
 
 ifeq ($(OSARCH),FreeBSD)
   BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
@ -142,7 +139,7 @@ $FreeBSD$
 
 endif # FreeBSD
 
-@@ -281,7 +278,7 @@
+@@ -284,7 +281,7 @@
 
 ifeq ($(OSARCH),SunOS)
   ASTCFLAGS+=-Wcast-align -DSOLARIS
@ -151,7 +148,7 @@ $FreeBSD$
 endif
 
 ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-@@ -296,7 +293,7 @@
+@@ -299,7 +296,7 @@
 
 ifndef WITHOUT_ZAPTEL
 
@ -160,7 +157,7 @@ $FreeBSD$
   ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
 endif
 
-@@ -388,10 +385,10 @@
+@@ -391,10 +388,10 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
@ -173,7 +170,7 @@ $FreeBSD$
 endif
 
 ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-@@ -399,7 +396,7 @@
+@@ -402,7 +399,7 @@
 endif
 
 # This is used when generating the doxygen documentation
@ -182,7 +179,7 @@ $FreeBSD$
   HAVEDOT=yes
 else
   HAVEDOT=no
-@@ -418,7 +415,7 @@
+@@ -421,7 +418,7 @@
 	@echo " +               $(MAKE) install                +"  
 	@echo " +-------------------------------------------+"  
 
@ -191,7 +188,7 @@ $FreeBSD$
 
 #ifneq ($(wildcard tags),)
 ctags: tags
-@@ -437,13 +434,13 @@
+@@ -440,13 +437,13 @@
 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
 	$(MAKE) -C editline libedit.a
 
@ -227,7 +224,7 @@ $FreeBSD$
 
 asterisk.pdf: asterisk.sgml
 	docbook2pdf asterisk.sgml
-@@ -510,14 +507,14 @@
+@@ -513,14 +510,14 @@
 cygwin_a:
 	$(MAKE) -C cygwin all
 
@ -244,7 +241,7 @@ $FreeBSD$
 
 muted: muted.o
 	$(CC) $(AUDIO_LIBS) -o muted muted.o
-@@ -539,38 +536,38 @@
+@@ -542,38 +539,38 @@
 
 datafiles: all
 	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@ -292,7 +289,7 @@ $FreeBSD$
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
-@@ -578,18 +575,18 @@
+@@ -581,18 +578,18 @@
 	done
 	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@ -316,7 +313,7 @@ $FreeBSD$
 
 update: 
 	@if [ -d .svn ]; then \
-@@ -618,73 +615,51 @@
+@@ -621,73 +618,51 @@
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
 bininstall: all
@ -422,7 +419,7 @@ $FreeBSD$
 	@$(MAKE) -s oldmodcheck
 
 NEWMODS=$(notdir $(wildcard */*.so))
-@@ -710,7 +685,7 @@
+@@ -711,7 +686,7 @@
 		echo " WARNING WARNING WARNING" ;\
 	fi
 
@ -431,7 +428,7 @@ $FreeBSD$
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
-@@ -718,16 +693,19 @@
+@@ -719,16 +694,19 @@
 upgrade: all bininstall
 
 adsi:
@ -454,7 +451,7 @@ $FreeBSD$
 		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
 			if [ "$(OVERWRITE)" = "y" ]; then \
 				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
-@@ -740,7 +718,7 @@
+@@ -741,7 +719,7 @@
 				continue; \
 			fi ;\
 		fi ; \
@ -463,10 +460,10 @@ $FreeBSD$
 	done
 	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
 		( \
-@@ -800,25 +778,25 @@
- 		echo "; Default: strict"; \
- 		echo ";"; \
- 		echo ";translation_algorithm = strict"; \
+@@ -763,25 +741,25 @@
+ 		echo "[options]" ; \
+ 		echo "uniquename = asterisk" ;\
+ 		echo "silence_suppression = yes" ;\
 -		) > $(DESTDIR)$(ASTCONFPATH) ; \
 +		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
 	else \
@ -495,7 +492,7 @@ $FreeBSD$
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -832,7 +810,7 @@
+@@ -795,7 +773,7 @@
 	@[ -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
@ -504,7 +501,7 @@ $FreeBSD$
 	for x in images/*.gif; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
 	done
-@@ -861,10 +839,10 @@
+@@ -824,10 +802,10 @@
 
 __rpm: include/asterisk/version.h spec
 	rm -rf /tmp/asterisk ; \
--- a/net/asterisk-bristuff/files/patch-agi::Makefile
+++ b/net/asterisk-bristuff/files/patch-agi::Makefile
@ -1,15 +1,15 @@
--- agi/Makefile.orig	Sun Jan 22 17:53:44 2006
-+++ agi/Makefile	Sun Jan 22 17:55:53 2006
+--- agi/Makefile.orig	Sat Jun  3 21:39:30 2006
+++ agi/Makefile	Sat Jun  3 21:41:37 2006
@@ -11,7 +11,9 @@
 # the GNU General Public License
 #
 
-AGIS=agi-test.agi eagi-test eagi-sphinx-test
-+AGIS_BIN=eagi-test eagi-sphinx-test
+-AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test
+AGIS_BIN=eagi-test eagi-sphinx-test xagi-test
 +AGIS_SCR=agi-test.agi
 +AGIS=$(AGIS_SCR) $(AGIS_BIN)
 
- CFLAGS+=
+ CFLAGS+=-DNO_AST_MM
 
@@ -27,8 +29,9 @@
 all: depend $(AGIS)
--- a/net/asterisk-bristuff/files/patch-channels::chan_sip.c
+++ b/net/asterisk-bristuff/files/patch-channels::chan_sip.c
@ -1,9 +1,6 @@
-
-$FreeBSD$
-
--- channels/chan_sip.c.orig	Tue Jan 24 16:25:53 2006
-+++ channels/chan_sip.c	Tue Jan 24 16:30:44 2006
-@@ -337,7 +337,7 @@ static char global_vmexten[AST_MAX_EXTEN
+--- channels/chan_sip.c.orig	Sat Jun  3 21:41:59 2006
+++ channels/chan_sip.c	Sat Jun  3 21:43:40 2006
+@@ -337,7 +337,7 @@
 
 static char default_language[MAX_LANGUAGE] = "";
 
@ -12,7 +9,7 @@ $FreeBSD$
 static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID;
 
 static char default_fromdomain[AST_MAX_EXTENSION] = "";
-@@ -475,6 +475,7 @@ struct sip_invite_param {
+@@ -475,6 +475,7 @@
 
 struct sip_route {
 	struct sip_route *next;
@ -20,7 +17,7 @@ $FreeBSD$
 	char hop[0];
 };
 
-@@ -6015,6 +6016,7 @@ static void build_route(struct sip_pvt *
+@@ -6048,6 +6049,7 @@
 			/* Make a struct route */
 			thishop = malloc(sizeof(*thishop) + len);
 			if (thishop) {
@ -28,7 +25,7 @@ $FreeBSD$
 				ast_copy_string(thishop->hop, rr, len);
 				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
 				/* Link in */
-@@ -6040,31 +6042,41 @@ static void build_route(struct sip_pvt *
+@@ -6073,31 +6075,41 @@
 
 	/* Only append the contact if we are dealing with a strict router */
 	if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) {
@ -94,7 +91,7 @@ $FreeBSD$
 			}
 		}
 	}
-@@ -10352,7 +10364,11 @@ static int handle_request_invite(struct 
+@@ -10440,7 +10452,11 @@
 		gotdest = get_destination(p, NULL);
 
 		get_rdnis(p, NULL);
@ -107,7 +104,7 @@ $FreeBSD$
 		build_contact(p);
 
 		if (gotdest) {
-@@ -10380,7 +10396,6 @@ static int handle_request_invite(struct 
+@@ -10468,7 +10484,6 @@
 			c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
 			*recount = 1;
 			/* Save Record-Route for any later requests we make on this dialogue */
@ -115,11 +112,10 @@ $FreeBSD$
 			if (c) {
 				/* Pre-lock the call */
 				ast_mutex_lock(&c->lock);
-@@ -10466,7 +10481,12 @@ static int handle_request_invite(struct 
+@@ -10554,6 +10569,12 @@
 			transmit_response(p, "180 Ringing", req);
 			break;
 		case AST_STATE_UP:
-                        /* Here we have reINVITE request - try to renegotiate codecs with */
 +			/* Assuming this to be reinvite, process new SDP portion */
 +			if (!ast_strlen_zero(get_header(req, "Content-Type"))) {
 +				process_sdp(p, req);
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/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
-%%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/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
@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
-%%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/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
@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
-%%BRISTUFF%%include/asterisk/chan_capi.h
-%%BRISTUFF%%include/asterisk/chan_capi_app.h
+include/asterisk/chan_capi.h
+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
-%%BRISTUFF%%include/asterisk/xlaw.h
+include/asterisk/xlaw.h
 lib/asterisk/modules/app_adsiprog.so
 lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
-%%BRISTUFF%%lib/asterisk/modules/app_callingpres.so
+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
-%%BRISTUFF%%lib/asterisk/modules/app_devstate.so
+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
-%%BRISTUFF%%lib/asterisk/modules/app_pickup.so
+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
-%%BRISTUFF%%lib/asterisk/modules/app_segfault.so
+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
-%%BRISTUFF%%lib/asterisk/modules/res_watchdog.so
+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
-%%BRISTUFF%%%%DATADIR%%/agi-bin/xagi-test
+%%DATADIR%%/agi-bin/xagi-test
 %%DATADIR%%/firmware/iax/iaxy.bin
 %%DATADIR%%/images/asterisk-intro.jpg
 %%DATADIR%%/keys/freeworlddialup.pub