Attachment #103966 for bug #144065

View | Details | Raw Unified | Return to bug 144065
Collapse All | Expand All

Lines 1-3 Link Here

(-)ports/mintel-7-1-mysql-5-0-51/net/asterisk16/distinfo (-3 / +3 lines)
1	MD5 (asterisk-1.6.0.21.tar.gz) = a172fb030adab50bdff6ae3b5e765283	1	MD5 (asterisk-1.6.2.2.tar.gz) = 92489f55d06b3debf6d1e5e1c44b1631
2	SHA256 (asterisk-1.6.0.21.tar.gz) = 0d41a9033934640992da29ee03ae96a208eb3ff8a46440e388920d471ecbbaff	2	SHA256 (asterisk-1.6.2.2.tar.gz) = 1aa026a99c2f830426489abead8e1fdd83bf2a6a3ec92f2d684344c61dcf7877
3	SIZE (asterisk-1.6.0.21.tar.gz) = 23145584	3	SIZE (asterisk-1.6.2.2.tar.gz) = 23177043




--- channels/chan_sip.c.orig	2010-02-02 19:58:14.000000000 +0000
+++ channels/chan_sip.c	2010-02-18 05:48:04.000000000 +0000
@@ -979,7 +979,7 @@
 #define DEFAULT_MOHINTERPRET    "default"	/*!< The default music class */
+++ channels/chan_sip.c
@@ -611,7 +611,7 @@
 #define DEFAULT_MOHINTERPRET    "default"
 #define DEFAULT_MOHSUGGEST      ""
 #define DEFAULT_VMEXTEN 	"asterisk"	/*!< Default voicemail extension */
-#define DEFAULT_CALLERID 	"asterisk"	/*!< Default caller ID */
+#define DEFAULT_CALLERID 	"Unknown"	/*!< Default caller ID */
 #define DEFAULT_NOTIFYMIME 	"application/simple-message-summary"
 #define DEFAULT_ALLOWGUEST	TRUE
 #define DEFAULT_RTPKEEPALIVE	0		/*!< Default RTPkeepalive setting */




--- Makefile.orig	2009-12-10 21:04:20.000000000 +0000
+++ Makefile	2010-02-18 05:45:20.000000000 +0000
@@ -121,7 +121,7 @@
 OVERWRITE=y
 
 # Include debug and macro symbols in the executables (-g) and profiling info (-pg)

 
 
 # Define standard directories for various platforms
@@ -151,7 +151,7 @@
   ASTMANDIR=$(mandir)
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk

   ASTDBDIR=$(localstatedir)/db/asterisk
 else
   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
@@ -250,12 +250,13 @@
 ifneq ($(findstring BSD,$(OSARCH)),)
   _ASTCFLAGS+=-isystem /usr/local/include
 endif
-
+ifneq ($(OSARCH),FreeBSD)
 ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
   ifneq ($(PROC),ultrasparc)
     _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
   endif
 endif
+endif
 
 ifeq ($(PROC),ppc)
   _ASTCFLAGS+=-fsigned-char
@@ -263,7 +264,7 @@
 
 ifeq ($(OSARCH),FreeBSD)
   # -V is understood by BSD Make, not by GNU make.

   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
 endif
 
@@ -477,21 +478,21 @@
 # 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) $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
 
 doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
@@ -538,51 +539,51 @@
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
 installdirs:

-		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
-		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
+		${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
-	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
-	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)

 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
-	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 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
-	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
-	$(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)$(ASTDATADIR)/documentation
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
+	$(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) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+	$(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8

 	fi
 
 $(SUBDIRS_INSTALL):
@@ -616,7 +617,7 @@
 	@exit 1
 endif
 

 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -650,38 +651,25 @@
 # XXX why *.adsi is installed first ?
 adsi:
 	@echo Installing adsi config files...

 		echo "Creating asterisk.conf"; \
 		( \
 		echo "[directories](!) ; remove the (!) to enable this" ; \
@@ -740,13 +728,16 @@
 		echo "pbx_realtime=1.6" ; \
 		echo "res_agi=1.6" ; \
 		echo "app_set=1.6" ; \

 	@for x in phoneprov/*; do \
 		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
 		if [ -f $${dst} ]; then \
@@ -762,14 +753,14 @@
 			fi ;\
 		fi ; \
 		echo "Installing file $$x"; \

Lines 1-3 Link Here

(-)ports/mintel-7-1-mysql-5-0-51/net/asterisk16/pkg-plist (-2 / +53 lines)
		1	@unexec if cmp -s %D/etc/asterisk/ais.conf %D/etc/asterisk/ais.conf-dist; then rm -f %D/etc/asterisk/ais.conf; fi
		2	etc/asterisk/ais.conf-dist
1	@unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi	3	@unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi
2	etc/asterisk/cdr_adaptive_odbc.conf-dist	4	etc/asterisk/cdr_adaptive_odbc.conf-dist
3	@unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi	5	@unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi
Lines 4-11 Link Here
4	etc/asterisk/cdr_sqlite3_custom.conf-dist	6	etc/asterisk/cdr_sqlite3_custom.conf-dist
5	@unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi	7	@unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi
6	etc/asterisk/cli.conf-dist	8	etc/asterisk/cli.conf-dist
		9	@unexec if cmp -s %D/etc/asterisk/cli_aliases.conf %D/etc/asterisk/cli_aliases.conf-dist; then rm -f %D/etc/asterisk/cli_aliases.conf; fi
		10	etc/asterisk/cli_aliases.conf-dist
		11	@unexec if cmp -s %D/etc/asterisk/cli_permissions.conf %D/etc/asterisk/cli_permissions.conf-dist; then rm -f %D/etc/asterisk/cli_permissions.conf; fi
		12	etc/asterisk/cli_permissions.conf-dist
7	@unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi	13	@unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi
8	etc/asterisk/console.conf-dist	14	etc/asterisk/console.conf-dist
		15	@unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi
		16	etc/asterisk/dbsep.conf-dist
		17	@unexec if cmp -s %D/etc/asterisk/dsp.conf %D/etc/asterisk/dsp.conf-dist; then rm -f %D/etc/asterisk/dsp.conf; fi
		18	etc/asterisk/dsp.conf-dist
9	@unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi	19	@unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi
10	etc/asterisk/extensions.lua-dist	20	etc/asterisk/extensions.lua-dist
11	@unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi	21	@unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi
Lines 146-151 Link Here
146	etc/asterisk/followme.conf-dist	156	etc/asterisk/followme.conf-dist
147	@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi	157	@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi
148	etc/asterisk/amd.conf-dist	158	etc/asterisk/amd.conf-dist
		159	@unexec if cmp -s %D/etc/asterisk/res_config_sqlite.conf %D/etc/asterisk/res_config_sqlite.conf-dist; then rm -f %D/etc/asterisk/res_config_sqlite.conf; fi
		160	etc/asterisk/res_config_sqlite.conf-dist
149	@exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi	161	@exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi
150	@exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi	162	@exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi
151	@exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi	163	@exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi
Lines 250-256 Link Here
250	include/asterisk/astosp.h	262	include/asterisk/astosp.h
251	include/asterisk/audiohook.h	263	include/asterisk/audiohook.h
252	include/asterisk/autoconfig.h	264	include/asterisk/autoconfig.h
		265	include/asterisk/bridging.h
		266	include/asterisk/bridging_features.h
		267	include/asterisk/bridging_technology.h
253	include/asterisk/build.h	268	include/asterisk/build.h
		269	include/asterisk/buildinfo.h
254	include/asterisk/buildopts.h	270	include/asterisk/buildopts.h
255	include/asterisk/callerid.h	271	include/asterisk/callerid.h
256	include/asterisk/causes.h	272	include/asterisk/causes.h
Lines 262-269 Link Here
262	include/asterisk/compiler.h	278	include/asterisk/compiler.h
263	include/asterisk/config.h	279	include/asterisk/config.h
264	include/asterisk/crypto.h	280	include/asterisk/crypto.h
		281	include/asterisk/datastore.h
265	include/asterisk/devicestate.h	282	include/asterisk/devicestate.h
266	include/asterisk/dial.h	283	include/asterisk/dial.h
		284	include/asterisk/dlinkedlists.h
267	include/asterisk/dns.h	285	include/asterisk/dns.h
268	include/asterisk/dnsmgr.h	286	include/asterisk/dnsmgr.h
269	include/asterisk/doxyref.h	287	include/asterisk/doxyref.h
Lines 276-281 Link Here
276	include/asterisk/frame.h	294	include/asterisk/frame.h
277	include/asterisk/fskmodem.h	295	include/asterisk/fskmodem.h
278	include/asterisk/global_datastores.h	296	include/asterisk/global_datastores.h
		297	include/asterisk/heap.h
279	include/asterisk/http.h	298	include/asterisk/http.h
280	include/asterisk/image.h	299	include/asterisk/image.h
281	include/asterisk/indications.h	300	include/asterisk/indications.h
Lines 304-319 Link Here
304	include/asterisk/say.h	323	include/asterisk/say.h
305	include/asterisk/sched.h	324	include/asterisk/sched.h
306	include/asterisk/sha1.h	325	include/asterisk/sha1.h
		326	include/asterisk/slin.h
307	include/asterisk/slinfactory.h	327	include/asterisk/slinfactory.h
308	include/asterisk/smdi.h	328	include/asterisk/smdi.h
309	include/asterisk/speech.h	329	include/asterisk/speech.h
310	include/asterisk/srv.h	330	include/asterisk/srv.h
311	include/asterisk/stringfields.h	331	include/asterisk/stringfields.h
312	include/asterisk/strings.h	332	include/asterisk/strings.h
		333	include/asterisk/taskprocessor.h
313	include/asterisk/tdd.h	334	include/asterisk/tdd.h
314	include/asterisk/term.h	335	include/asterisk/term.h
315	include/asterisk/threadstorage.h	336	include/asterisk/threadstorage.h
316	include/asterisk/time.h	337	include/asterisk/time.h
		338	include/asterisk/timing.h
317	include/asterisk/transcap.h	339	include/asterisk/transcap.h
318	include/asterisk/translate.h	340	include/asterisk/translate.h
319	include/asterisk/udptl.h	341	include/asterisk/udptl.h
Lines 321-337 Link Here
321	include/asterisk/unaligned.h	343	include/asterisk/unaligned.h
322	include/asterisk/utils.h	344	include/asterisk/utils.h
323	include/asterisk/version.h	345	include/asterisk/version.h
		346	include/asterisk/xml.h
		347	include/asterisk/xmldoc.h
		348	lib/asterisk/modules/app_confbridge.so
324	lib/asterisk/modules/app_minivm.so	349	lib/asterisk/modules/app_minivm.so
325	lib/asterisk/modules/app_pickupchan.so	350	lib/asterisk/modules/app_originate.so
		351	lib/asterisk/modules/app_playtones.so
326	lib/asterisk/modules/app_readexten.so	352	lib/asterisk/modules/app_readexten.so
327	lib/asterisk/modules/app_waituntil.so	353	lib/asterisk/modules/app_waituntil.so
		354	lib/asterisk/modules/bridge_builtin_features.so
		355	lib/asterisk/modules/bridge_multiplexed.so
		356	lib/asterisk/modules/bridge_simple.so
		357	lib/asterisk/modules/bridge_softmix.so
328	%%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so	358	%%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so
329	%%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so	359	%%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so
		360	lib/asterisk/modules/chan_bridge.so
330	lib/asterisk/modules/chan_unistim.so	361	lib/asterisk/modules/chan_unistim.so
331	lib/asterisk/modules/codec_g722.so	362	lib/asterisk/modules/codec_g722.so
332	lib/asterisk/modules/format_sln16.so	363	lib/asterisk/modules/format_sln16.so
		364	lib/asterisk/modules/format_siren14.so
		365	lib/asterisk/modules/format_siren7.so
		366	lib/asterisk/modules/func_aes.so
333	lib/asterisk/modules/func_audiohookinherit.so	367	lib/asterisk/modules/func_audiohookinherit.so
334	lib/asterisk/modules/func_blacklist.so	368	lib/asterisk/modules/func_blacklist.so
		369	lib/asterisk/modules/func_config.so
335	lib/asterisk/modules/func_devstate.so	370	lib/asterisk/modules/func_devstate.so
336	lib/asterisk/modules/func_dialgroup.so	371	lib/asterisk/modules/func_dialgroup.so
337	lib/asterisk/modules/func_dialplan.so	372	lib/asterisk/modules/func_dialplan.so
Lines 340-356 Link Here
340	lib/asterisk/modules/func_lock.so	375	lib/asterisk/modules/func_lock.so
341	lib/asterisk/modules/func_module.so	376	lib/asterisk/modules/func_module.so
342	lib/asterisk/modules/func_shell.so	377	lib/asterisk/modules/func_shell.so
		378	lib/asterisk/modules/func_speex.so
		379	lib/asterisk/modules/func_sprintf.so
343	lib/asterisk/modules/func_sysinfo.so	380	lib/asterisk/modules/func_sysinfo.so
344	lib/asterisk/modules/func_version.so	381	lib/asterisk/modules/func_version.so
345	lib/asterisk/modules/func_vmcount.so	382	lib/asterisk/modules/func_vmcount.so
346	lib/asterisk/modules/func_volume.so	383	lib/asterisk/modules/func_volume.so
347	lib/asterisk/modules/res_ael_share.so	384	lib/asterisk/modules/res_ael_share.so
		385	lib/asterisk/modules/res_clialiases.so
		386	%%WITH_CURL%%lib/asterisk/modules/res_curl.so
348	%%WITH_CURL%%lib/asterisk/modules/res_config_curl.so	387	%%WITH_CURL%%lib/asterisk/modules/res_config_curl.so
349	lib/asterisk/modules/res_config_ldap.so	388	lib/asterisk/modules/res_config_ldap.so
350	%%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so	389	%%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so
351	lib/asterisk/modules/res_limit.so	390	lib/asterisk/modules/res_limit.so
352	lib/asterisk/modules/res_phoneprov.so	391	lib/asterisk/modules/res_phoneprov.so
353	lib/asterisk/modules/res_realtime.so	392	lib/asterisk/modules/res_realtime.so
		393	lib/asterisk/modules/res_timing_pthread.so
354	lib/asterisk/modules/app_adsiprog.so	394	lib/asterisk/modules/app_adsiprog.so
355	lib/asterisk/modules/app_alarmreceiver.so	395	lib/asterisk/modules/app_alarmreceiver.so
356	lib/asterisk/modules/app_amd.so	396	lib/asterisk/modules/app_amd.so
Lines 481-487 Link Here
481	%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so	521	%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
482	lib/asterisk/modules/res_convert.so	522	lib/asterisk/modules/res_convert.so
483	lib/asterisk/modules/res_crypto.so	523	lib/asterisk/modules/res_crypto.so
484	lib/asterisk/modules/res_indications.so
485	%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so	524	%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so
486	lib/asterisk/modules/res_monitor.so	525	lib/asterisk/modules/res_monitor.so
487	lib/asterisk/modules/res_musiconhold.so	526	lib/asterisk/modules/res_musiconhold.so
Lines 498-503 Link Here
498	sbin/astman	537	sbin/astman
499	sbin/autosupport	538	sbin/autosupport
500	sbin/muted	539	sbin/muted
		540	sbin/refcounter
501	sbin/rasterisk	541	sbin/rasterisk
502	sbin/safe_asterisk	542	sbin/safe_asterisk
503	sbin/smsq	543	sbin/smsq
Lines 507-512 Link Here
507	share/asterisk/agi-bin/eagi-sphinx-test	547	share/asterisk/agi-bin/eagi-sphinx-test
508	share/asterisk/agi-bin/eagi-test	548	share/asterisk/agi-bin/eagi-test
509	share/asterisk/agi-bin/jukebox.agi	549	share/asterisk/agi-bin/jukebox.agi
		550	share/asterisk/documentation/appdocsxml.dtd
		551	share/asterisk/documentation/core-en_US.xml
510	share/asterisk/keys/freeworlddialup.pub	552	share/asterisk/keys/freeworlddialup.pub
511	share/asterisk/keys/iaxtel.pub	553	share/asterisk/keys/iaxtel.pub
512	share/asterisk/moh/.asterisk-moh-opsound-wav	554	share/asterisk/moh/.asterisk-moh-opsound-wav
Lines 522-527 Link Here
522	share/asterisk/phoneprov/000000000000-phone.cfg	564	share/asterisk/phoneprov/000000000000-phone.cfg
523	share/asterisk/phoneprov/000000000000.cfg	565	share/asterisk/phoneprov/000000000000.cfg
524	share/asterisk/phoneprov/polycom.xml	566	share/asterisk/phoneprov/polycom.xml
		567	share/asterisk/phoneprov/polycom_line.xml
525	share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17	568	share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17
526	share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17	569	share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17
527	share/asterisk/sounds/en/conf-adminmenu-162.gsm	570	share/asterisk/sounds/en/conf-adminmenu-162.gsm
Lines 990-995 Link Here
990	%%DOCSDIR%%/img3.png	1033	%%DOCSDIR%%/img3.png
991	%%DOCSDIR%%/img4.png	1034	%%DOCSDIR%%/img4.png
992	%%DOCSDIR%%/img5.png	1035	%%DOCSDIR%%/img5.png
		1036	%%DOCSDIR%%/img6.png
		1037	%%DOCSDIR%%/img7.png
		1038	%%DOCSDIR%%/img8.png
		1039	%%DOCSDIR%%/img9.png
		1040	%%DOCSDIR%%/img10.png
993	%%DOCSDIR%%/index.html	1041	%%DOCSDIR%%/index.html
994	%%DOCSDIR%%/internals.pl	1042	%%DOCSDIR%%/internals.pl
995	%%DOCSDIR%%/labels.pl	1043	%%DOCSDIR%%/labels.pl
Lines 1194-1199 Link Here
1194	%%DOCSDIR%%/node278.html	1242	%%DOCSDIR%%/node278.html
1195	%%DOCSDIR%%/node279.html	1243	%%DOCSDIR%%/node279.html
1196	%%DOCSDIR%%/node28.html	1244	%%DOCSDIR%%/node28.html
		1245	%%DOCSDIR%%/node280.html
1197	%%DOCSDIR%%/node29.html	1246	%%DOCSDIR%%/node29.html
1198	%%DOCSDIR%%/node3.html	1247	%%DOCSDIR%%/node3.html
1199	%%DOCSDIR%%/node30.html	1248	%%DOCSDIR%%/node30.html
Lines 1290-1295 Link Here
1290	@dirrm share/asterisk/keys	1339	@dirrm share/asterisk/keys
1291	@dirrm share/asterisk/firmware/iax	1340	@dirrm share/asterisk/firmware/iax
1292	@dirrm share/asterisk/firmware	1341	@dirrm share/asterisk/firmware
		1342	@dirrm share/asterisk/documentation/thirdparty
		1343	@dirrm share/asterisk/documentation
1293	@dirrm share/asterisk/agi-bin	1344	@dirrm share/asterisk/agi-bin
1294	@dirrm share/asterisk	1345	@dirrm share/asterisk
1295	@dirrm lib/asterisk/modules	1346	@dirrm lib/asterisk/modules

Lines 6-13 Link Here

(-)ports/mintel-7-1-mysql-5-0-51/net/asterisk16/Makefile (-6 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= asterisk	8	PORTNAME= asterisk
9	PORTVERSION= 1.6.0.21	9	PORTVERSION= 1.6.2.2
10	PKGNAMESUFFIX= 16	10	#PKGNAMESUFFIX= 16
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \	12	MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
13	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/	13	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
Lines 18-23 Link Here
18	LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \	18	LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
19	newt.51:${PORTSDIR}/devel/newt \	19	newt.51:${PORTSDIR}/devel/newt \
20	execinfo:${PORTSDIR}/devel/libexecinfo	20	execinfo:${PORTSDIR}/devel/libexecinfo
		21
		22	USE_GNOME= libxml2
		23
21	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123	24	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
22		25
23	ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc	26	ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc
Lines 54-62 Link Here
54	GSM "Enable GSM codec" on \	57	GSM "Enable GSM codec" on \
55	CURL "Enable CURL support" on \	58	CURL "Enable CURL support" on \
56	ILBC "Enable iLBC codec" off \	59	ILBC "Enable iLBC codec" off \
57	SPANDSP "Enable Spandsp faxing support" off \	60	SPANDSP "Enable Spandsp faxing support" off
58	# CODEC_PATCH "Apply codec negotiation patch" off \
59	# MISC_PATCHES "Apply additional patches" off
60		61
61	.include <bsd.port.pre.mk>	62	.include <bsd.port.pre.mk>
62		63
Lines 99-105 Link Here
99	PLIST_SUB+= WITH_ODBC=""	100	PLIST_SUB+= WITH_ODBC=""
100	CONFIGURE_ARGS+= --with-odbc --with-ltdl	101	CONFIGURE_ARGS+= --with-odbc --with-ltdl
101	LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \	102	LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \
102	ltdl.9:${PORTSDIR}/devel/libltdl22	103	ltdl.4:${PORTSDIR}/devel/libltdl15
103	.endif	104	.endif
104		105
105	.if !defined(WITH_FREETDS)	106	.if !defined(WITH_FREETDS)

Return to bug 144065

Lines 1-14 Link Here

(-)ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/patch-channels::chan_sip.c (-11 / +8 lines)
1		1	--- channels/chan_sip.c.orig 2010-02-02 19:58:14.000000000 +0000
2	$FreeBSD: ports/net/asterisk16/files/patch-channels::chan_sip.c,v 1.13 2009/08/02 19:34:55 mezz Exp $	2	+++ channels/chan_sip.c 2010-02-18 05:48:04.000000000 +0000
3		3	@@ -979,7 +979,7 @@
4	--- channels/chan_sip.c	4	#define DEFAULT_MOHINTERPRET "default" /!< The default music class /
5	+++ channels/chan_sip.c
6	@@ -611,7 +611,7 @@
7	#define DEFAULT_MOHINTERPRET "default"
8	#define DEFAULT_MOHSUGGEST ""	5	#define DEFAULT_MOHSUGGEST ""
9	#define DEFAULT_VMEXTEN "asterisk"	6	#define DEFAULT_VMEXTEN "asterisk" /!< Default voicemail extension /
10	-#define DEFAULT_CALLERID "asterisk"	7	-#define DEFAULT_CALLERID "asterisk" /!< Default caller ID /
11	+#define DEFAULT_CALLERID "Unknown"	8	+#define DEFAULT_CALLERID "Unknown" /!< Default caller ID /
12	#define DEFAULT_NOTIFYMIME "application/simple-message-summary"	9	#define DEFAULT_NOTIFYMIME "application/simple-message-summary"
13	#define DEFAULT_ALLOWGUEST TRUE	10	#define DEFAULT_ALLOWGUEST TRUE
14	#define DEFAULT_CALLCOUNTER FALSE	11	#define DEFAULT_RTPKEEPALIVE 0 /!< Default RTPkeepalive setting /

Lines 1-6 Link Here

(-)ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/nocodecnego-patch-Makefile (-17 / +28 lines)
1	--- Makefile.orig 2009-11-03 12:00:27.000000000 -0800	1	--- Makefile.orig 2009-12-10 21:04:20.000000000 +0000
2	+++ Makefile 2009-11-20 13:13:06.000000000 -0800	2	+++ Makefile 2010-02-18 05:45:20.000000000 +0000
3	@@ -118,7 +118,7 @@	3	@@ -121,7 +121,7 @@
4	OVERWRITE=y	4	OVERWRITE=y
5		5
6	# Include debug and macro symbols in the executables (-g) and profiling info (-pg)	6	# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
Lines 9-15 Link Here
9		9
10		10
11	# Define standard directories for various platforms	11	# Define standard directories for various platforms
12	@@ -148,7 +148,7 @@	12	@@ -151,7 +151,7 @@
13	ASTMANDIR=$(mandir)	13	ASTMANDIR=$(mandir)
14	ifneq ($(findstring BSD,$(OSARCH)),)	14	ifneq ($(findstring BSD,$(OSARCH)),)
15	ASTVARLIBDIR=$(prefix)/share/asterisk	15	ASTVARLIBDIR=$(prefix)/share/asterisk
Lines 18-36 Link Here
18	ASTDBDIR=$(localstatedir)/db/asterisk	18	ASTDBDIR=$(localstatedir)/db/asterisk
19	else	19	else
20	ASTVARLIBDIR=$(localstatedir)/lib/asterisk	20	ASTVARLIBDIR=$(localstatedir)/lib/asterisk
21	@@ -248,9 +248,11 @@	21	@@ -250,12 +250,13 @@
		22	ifneq ($(findstring BSD,$(OSARCH)),)
22	_ASTCFLAGS+=-isystem /usr/local/include	23	_ASTCFLAGS+=-isystem /usr/local/include
23	endif	24	endif
24		25	-
25	+ifneq ($(OSARCH),FreeBSD)	26	+ifneq ($(OSARCH),FreeBSD)
26	ifneq ($(PROC),ultrasparc)	27	ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
27	_ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)	28	ifneq ($(PROC),ultrasparc)
		29	_ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
		30	endif
28	endif	31	endif
29	+endif	32	+endif
30		33
31	ifeq ($(PROC),ppc)	34	ifeq ($(PROC),ppc)
32	_ASTCFLAGS+=-fsigned-char	35	_ASTCFLAGS+=-fsigned-char
33	@@ -258,7 +260,7 @@	36	@@ -263,7 +264,7 @@
34		37
35	ifeq ($(OSARCH),FreeBSD)	38	ifeq ($(OSARCH),FreeBSD)
36	# -V is understood by BSD Make, not by GNU make.	39	# -V is understood by BSD Make, not by GNU make.
Lines 39-45 Link Here
39	_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)	42	_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
40	endif	43	endif
41		44
42	@@ -467,21 +469,21 @@	45	@@ -477,21 +478,21 @@
43	# Should static HTTP be installed during make samples or even with its own target ala	46	# Should static HTTP be installed during make samples or even with its own target ala
44	# webvoicemail? There are portions here that could be customized but might also be	47	# webvoicemail? There are portions here that could be customized but might also be
45	# improved a lot. I'll put it here for now.	48	# improved a lot. I'll put it here for now.
Lines 67-74 Link Here
67	+ $(MKDIR) $(DESTDIR)$(AGI_DIR)	70	+ $(MKDIR) $(DESTDIR)$(AGI_DIR)
68	$(MAKE) -C sounds install	71	$(MAKE) -C sounds install
69		72
70	update:	73	doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/.c $(dir)/.cc 2>/dev/null))
71	@@ -505,47 +507,47 @@	74	@@ -538,51 +539,51 @@
72	OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))	75	OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
73		76
74	installdirs:	77	installdirs:
Lines 107-113 Link Here
107	- cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\	110	- cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
108	- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\	111	- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
109	+ cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > contrib/scripts/safe_asterisk.out;\	112	+ cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > contrib/scripts/safe_asterisk.out;\
110	+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\	113	+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
111	fi	114	fi
112	- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)	115	- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
113	- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)	116	- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
Lines 118-141 Link Here
118	if [ -n "$(OLDHEADERS)" ]; then \	121	if [ -n "$(OLDHEADERS)" ]; then \
119	rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\	122	rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
120	fi	123	fi
		124	- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
		125	- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
121	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv	126	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
122	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom	127	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
123	- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys	128	- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
124	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware	129	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
125	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax	130	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
126	- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8	131	- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
		132	- $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
		133	- $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
127	- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys	134	- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
128	- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys	135	- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
129	- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8	136	- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
130	- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8	137	- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
131	- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8	138	- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
132	- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8	139	- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
		140	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation
		141	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
133	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv	142	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
134	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom	143	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
135	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys	144	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
136	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware	145	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
137	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax	146	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
138	+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8	147	+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
		148	+ $(BSD_INSTALL_DATA) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
		149	+ $(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
139	+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys	150	+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
140	+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys	151	+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
141	+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8	152	+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
Lines 148-154 Link Here
148	fi	159	fi
149		160
150	$(SUBDIRS_INSTALL):	161	$(SUBDIRS_INSTALL):
151	@@ -579,7 +581,7 @@	162	@@ -616,7 +617,7 @@
152	@exit 1	163	@exit 1
153	endif	164	endif
154		165
Lines 157-163 Link Here
157	@if [ -x /usr/sbin/asterisk-post-install ]; then \	168	@if [ -x /usr/sbin/asterisk-post-install ]; then \
158	/usr/sbin/asterisk-post-install $(DESTDIR) . ; \	169	/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
159	fi	170	fi
160	@@ -611,38 +613,25 @@	171	@@ -650,38 +651,25 @@
161	# XXX why *.adsi is installed first ?	172	# XXX why *.adsi is installed first ?
162	adsi:	173	adsi:
163	@echo Installing adsi config files...	174	@echo Installing adsi config files...
Lines 204-210 Link Here
204	echo "Creating asterisk.conf"; \	215	echo "Creating asterisk.conf"; \
205	( \	216	( \
206	echo "[directories](!) ; remove the (!) to enable this" ; \	217	echo "[directories](!) ; remove the (!) to enable this" ; \
207	@@ -698,13 +687,16 @@	218	@@ -740,13 +728,16 @@
208	echo "pbx_realtime=1.6" ; \	219	echo "pbx_realtime=1.6" ; \
209	echo "res_agi=1.6" ; \	220	echo "res_agi=1.6" ; \
210	echo "app_set=1.6" ; \	221	echo "app_set=1.6" ; \
Lines 224-230 Link Here
224	@for x in phoneprov/*; do \	235	@for x in phoneprov/*; do \
225	dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \	236	dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
226	if [ -f $${dst} ]; then \	237	if [ -f $${dst} ]; then \
227	@@ -720,14 +712,14 @@	238	@@ -762,14 +753,14 @@
228	fi ;\	239	fi ;\
229	fi ; \	240	fi ; \
230	echo "Installing file $$x"; \	241	echo "Installing file $$x"; \