Attachment 103966 Details for Bug 144065 – file.diff

[patch] file.diff

file.diff (text/plain), 17.53 KB, created by Tom Judge on 2010-02-18 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Judge

Created: 2010-02-18 16:40:01 UTC

Size: 17.53 KB

patch

obsolete

>Index: ports/mintel-7-1-mysql-5-0-51/net/asterisk16/distinfo
>===================================================================
>--- ports/mintel-7-1-mysql-5-0-51/net/asterisk16/distinfo	(revision 847)
>+++ ports/mintel-7-1-mysql-5-0-51/net/asterisk16/distinfo	(revision 848)
>@@ -1,3 +1,3 @@
>-MD5 (asterisk-1.6.0.21.tar.gz) = a172fb030adab50bdff6ae3b5e765283
>-SHA256 (asterisk-1.6.0.21.tar.gz) = 0d41a9033934640992da29ee03ae96a208eb3ff8a46440e388920d471ecbbaff
>-SIZE (asterisk-1.6.0.21.tar.gz) = 23145584
>+MD5 (asterisk-1.6.2.2.tar.gz) = 92489f55d06b3debf6d1e5e1c44b1631
>+SHA256 (asterisk-1.6.2.2.tar.gz) = 1aa026a99c2f830426489abead8e1fdd83bf2a6a3ec92f2d684344c61dcf7877
>+SIZE (asterisk-1.6.2.2.tar.gz) = 23177043
>Index: ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/patch-channels::chan_sip.c
>===================================================================
>--- ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/patch-channels::chan_sip.c	(revision 847)
>+++ ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/patch-channels::chan_sip.c	(revision 848)
>@@ -1,14 +1,11 @@
>-
>-$FreeBSD: ports/net/asterisk16/files/patch-channels::chan_sip.c,v 1.13 2009/08/02 19:34:55 mezz Exp $
>-
>---- channels/chan_sip.c
>-+++ channels/chan_sip.c
>-@@ -611,7 +611,7 @@
>- #define DEFAULT_MOHINTERPRET    "default"
>+--- 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 */
>  #define DEFAULT_MOHSUGGEST      ""
>- #define DEFAULT_VMEXTEN 	"asterisk"
>--#define DEFAULT_CALLERID 	"asterisk"
>-+#define DEFAULT_CALLERID 	"Unknown"
>+ #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_CALLCOUNTER	FALSE
>+ #define DEFAULT_RTPKEEPALIVE	0		/*!< Default RTPkeepalive setting */
>Index: ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/nocodecnego-patch-Makefile
>===================================================================
>--- ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/nocodecnego-patch-Makefile	(revision 847)
>+++ ports/mintel-7-1-mysql-5-0-51/net/asterisk16/files/nocodecnego-patch-Makefile	(revision 848)
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2009-11-03 12:00:27.000000000 -0800
>-+++ Makefile	2009-11-20 13:13:06.000000000 -0800
>-@@ -118,7 +118,7 @@
>+--- 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)
>@@ -9,7 +9,7 @@
>  
>  
>  # Define standard directories for various platforms
>-@@ -148,7 +148,7 @@
>+@@ -151,7 +151,7 @@
>    ASTMANDIR=$(mandir)
>  ifneq ($(findstring BSD,$(OSARCH)),)
>    ASTVARLIBDIR=$(prefix)/share/asterisk
>@@ -18,19 +18,22 @@
>    ASTDBDIR=$(localstatedir)/db/asterisk
>  else
>    ASTVARLIBDIR=$(localstatedir)/lib/asterisk
>-@@ -248,9 +248,11 @@
>+@@ -250,12 +250,13 @@
>+ ifneq ($(findstring BSD,$(OSARCH)),)
>    _ASTCFLAGS+=-isystem /usr/local/include
>  endif
>- 
>+-
> +ifneq ($(OSARCH),FreeBSD)
>- 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)
>+ 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
>-@@ -258,7 +260,7 @@
>+@@ -263,7 +264,7 @@
>  
>  ifeq ($(OSARCH),FreeBSD)
>    # -V is understood by BSD Make, not by GNU make.
>@@ -39,7 +42,7 @@
>    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
>  endif
>  
>-@@ -467,21 +469,21 @@
>+@@ -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.
>@@ -67,8 +70,8 @@
> +	$(MKDIR) $(DESTDIR)$(AGI_DIR)
>  	$(MAKE) -C sounds install
>  
>- update: 
>-@@ -505,47 +507,47 @@
>+ 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:
>@@ -107,7 +110,7 @@
> -		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;\
>++		${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)
>@@ -118,24 +121,32 @@
>  	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
>@@ -148,7 +159,7 @@
>  	fi
>  
>  $(SUBDIRS_INSTALL):
>-@@ -579,7 +581,7 @@
>+@@ -616,7 +617,7 @@
>  	@exit 1
>  endif
>  
>@@ -157,7 +168,7 @@
>  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
>  		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
>  	fi
>-@@ -611,38 +613,25 @@
>+@@ -650,38 +651,25 @@
>  # XXX why *.adsi is installed first ?
>  adsi:
>  	@echo Installing adsi config files...
>@@ -204,7 +215,7 @@
>  		echo "Creating asterisk.conf"; \
>  		( \
>  		echo "[directories](!) ; remove the (!) to enable this" ; \
>-@@ -698,13 +687,16 @@
>+@@ -740,13 +728,16 @@
>  		echo "pbx_realtime=1.6" ; \
>  		echo "res_agi=1.6" ; \
>  		echo "app_set=1.6" ; \
>@@ -224,7 +235,7 @@
>  	@for x in phoneprov/*; do \
>  		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
>  		if [ -f $${dst} ]; then \
>-@@ -720,14 +712,14 @@
>+@@ -762,14 +753,14 @@
>  			fi ;\
>  		fi ; \
>  		echo "Installing file $$x"; \
>Index: ports/mintel-7-1-mysql-5-0-51/net/asterisk16/pkg-plist
>===================================================================
>--- ports/mintel-7-1-mysql-5-0-51/net/asterisk16/pkg-plist	(revision 847)
>+++ ports/mintel-7-1-mysql-5-0-51/net/asterisk16/pkg-plist	(revision 848)
>@@ -1,3 +1,5 @@
>+@unexec if cmp -s %D/etc/asterisk/ais.conf %D/etc/asterisk/ais.conf-dist; then rm -f %D/etc/asterisk/ais.conf; fi
>+etc/asterisk/ais.conf-dist
> @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
> etc/asterisk/cdr_adaptive_odbc.conf-dist
> @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
>@@ -4,8 +6,16 @@
> etc/asterisk/cdr_sqlite3_custom.conf-dist
> @unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi
> etc/asterisk/cli.conf-dist
>+@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
>+etc/asterisk/cli_aliases.conf-dist
>+@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
>+etc/asterisk/cli_permissions.conf-dist
> @unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi
> etc/asterisk/console.conf-dist
>+@unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi
>+etc/asterisk/dbsep.conf-dist
>+@unexec if cmp -s %D/etc/asterisk/dsp.conf %D/etc/asterisk/dsp.conf-dist; then rm -f %D/etc/asterisk/dsp.conf; fi
>+etc/asterisk/dsp.conf-dist
> @unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi
> etc/asterisk/extensions.lua-dist
> @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
>@@ -146,6 +156,8 @@
> 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
>+@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
>+etc/asterisk/res_config_sqlite.conf-dist
> @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
> @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
> @exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi
>@@ -250,7 +262,11 @@
> include/asterisk/astosp.h
> include/asterisk/audiohook.h
> include/asterisk/autoconfig.h
>+include/asterisk/bridging.h
>+include/asterisk/bridging_features.h
>+include/asterisk/bridging_technology.h
> include/asterisk/build.h
>+include/asterisk/buildinfo.h
> include/asterisk/buildopts.h
> include/asterisk/callerid.h
> include/asterisk/causes.h
>@@ -262,8 +278,10 @@
> include/asterisk/compiler.h
> include/asterisk/config.h
> include/asterisk/crypto.h
>+include/asterisk/datastore.h
> include/asterisk/devicestate.h
> include/asterisk/dial.h
>+include/asterisk/dlinkedlists.h
> include/asterisk/dns.h
> include/asterisk/dnsmgr.h
> include/asterisk/doxyref.h
>@@ -276,6 +294,7 @@
> include/asterisk/frame.h
> include/asterisk/fskmodem.h
> include/asterisk/global_datastores.h
>+include/asterisk/heap.h
> include/asterisk/http.h
> include/asterisk/image.h
> include/asterisk/indications.h
>@@ -304,16 +323,19 @@
> include/asterisk/say.h
> include/asterisk/sched.h
> include/asterisk/sha1.h
>+include/asterisk/slin.h
> include/asterisk/slinfactory.h
> include/asterisk/smdi.h
> include/asterisk/speech.h
> include/asterisk/srv.h
> include/asterisk/stringfields.h
> include/asterisk/strings.h
>+include/asterisk/taskprocessor.h
> include/asterisk/tdd.h
> include/asterisk/term.h
> include/asterisk/threadstorage.h
> include/asterisk/time.h
>+include/asterisk/timing.h
> include/asterisk/transcap.h
> include/asterisk/translate.h
> include/asterisk/udptl.h
>@@ -321,17 +343,30 @@
> include/asterisk/unaligned.h
> include/asterisk/utils.h
> include/asterisk/version.h
>+include/asterisk/xml.h
>+include/asterisk/xmldoc.h
>+lib/asterisk/modules/app_confbridge.so
> lib/asterisk/modules/app_minivm.so
>-lib/asterisk/modules/app_pickupchan.so
>+lib/asterisk/modules/app_originate.so
>+lib/asterisk/modules/app_playtones.so
> lib/asterisk/modules/app_readexten.so
> lib/asterisk/modules/app_waituntil.so
>+lib/asterisk/modules/bridge_builtin_features.so
>+lib/asterisk/modules/bridge_multiplexed.so
>+lib/asterisk/modules/bridge_simple.so
>+lib/asterisk/modules/bridge_softmix.so
> %%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so
> %%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so
>+lib/asterisk/modules/chan_bridge.so
> lib/asterisk/modules/chan_unistim.so
> lib/asterisk/modules/codec_g722.so
> lib/asterisk/modules/format_sln16.so
>+lib/asterisk/modules/format_siren14.so
>+lib/asterisk/modules/format_siren7.so
>+lib/asterisk/modules/func_aes.so
> lib/asterisk/modules/func_audiohookinherit.so
> lib/asterisk/modules/func_blacklist.so
>+lib/asterisk/modules/func_config.so
> lib/asterisk/modules/func_devstate.so
> lib/asterisk/modules/func_dialgroup.so
> lib/asterisk/modules/func_dialplan.so
>@@ -340,17 +375,22 @@
> lib/asterisk/modules/func_lock.so
> lib/asterisk/modules/func_module.so
> lib/asterisk/modules/func_shell.so
>+lib/asterisk/modules/func_speex.so
>+lib/asterisk/modules/func_sprintf.so
> lib/asterisk/modules/func_sysinfo.so
> lib/asterisk/modules/func_version.so
> lib/asterisk/modules/func_vmcount.so
> lib/asterisk/modules/func_volume.so
> lib/asterisk/modules/res_ael_share.so
>+lib/asterisk/modules/res_clialiases.so
>+%%WITH_CURL%%lib/asterisk/modules/res_curl.so
> %%WITH_CURL%%lib/asterisk/modules/res_config_curl.so
> lib/asterisk/modules/res_config_ldap.so
> %%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so
> lib/asterisk/modules/res_limit.so
> lib/asterisk/modules/res_phoneprov.so
> lib/asterisk/modules/res_realtime.so
>+lib/asterisk/modules/res_timing_pthread.so
> lib/asterisk/modules/app_adsiprog.so
> lib/asterisk/modules/app_alarmreceiver.so
> lib/asterisk/modules/app_amd.so
>@@ -481,7 +521,6 @@
> %%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
> lib/asterisk/modules/res_convert.so
> lib/asterisk/modules/res_crypto.so
>-lib/asterisk/modules/res_indications.so
> %%WITH_JABBER%%lib/asterisk/modules/res_jabber.so
> lib/asterisk/modules/res_monitor.so
> lib/asterisk/modules/res_musiconhold.so
>@@ -498,6 +537,7 @@
> sbin/astman
> sbin/autosupport
> sbin/muted
>+sbin/refcounter
> sbin/rasterisk
> sbin/safe_asterisk
> sbin/smsq
>@@ -507,6 +547,8 @@
> share/asterisk/agi-bin/eagi-sphinx-test
> share/asterisk/agi-bin/eagi-test
> share/asterisk/agi-bin/jukebox.agi
>+share/asterisk/documentation/appdocsxml.dtd
>+share/asterisk/documentation/core-en_US.xml
> share/asterisk/keys/freeworlddialup.pub
> share/asterisk/keys/iaxtel.pub
> share/asterisk/moh/.asterisk-moh-opsound-wav
>@@ -522,6 +564,7 @@
> share/asterisk/phoneprov/000000000000-phone.cfg
> share/asterisk/phoneprov/000000000000.cfg
> share/asterisk/phoneprov/polycom.xml
>+share/asterisk/phoneprov/polycom_line.xml
> share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17
> share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17
> share/asterisk/sounds/en/conf-adminmenu-162.gsm
>@@ -990,6 +1033,11 @@
> %%DOCSDIR%%/img3.png
> %%DOCSDIR%%/img4.png
> %%DOCSDIR%%/img5.png
>+%%DOCSDIR%%/img6.png
>+%%DOCSDIR%%/img7.png
>+%%DOCSDIR%%/img8.png
>+%%DOCSDIR%%/img9.png
>+%%DOCSDIR%%/img10.png
> %%DOCSDIR%%/index.html
> %%DOCSDIR%%/internals.pl
> %%DOCSDIR%%/labels.pl
>@@ -1194,6 +1242,7 @@
> %%DOCSDIR%%/node278.html
> %%DOCSDIR%%/node279.html
> %%DOCSDIR%%/node28.html
>+%%DOCSDIR%%/node280.html
> %%DOCSDIR%%/node29.html
> %%DOCSDIR%%/node3.html
> %%DOCSDIR%%/node30.html
>@@ -1290,6 +1339,8 @@
> @dirrm share/asterisk/keys
> @dirrm share/asterisk/firmware/iax
> @dirrm share/asterisk/firmware
>+@dirrm share/asterisk/documentation/thirdparty
>+@dirrm share/asterisk/documentation
> @dirrm share/asterisk/agi-bin
> @dirrm share/asterisk
> @dirrm lib/asterisk/modules
>Index: ports/mintel-7-1-mysql-5-0-51/net/asterisk16/Makefile
>===================================================================
>--- ports/mintel-7-1-mysql-5-0-51/net/asterisk16/Makefile	(revision 847)
>+++ ports/mintel-7-1-mysql-5-0-51/net/asterisk16/Makefile	(revision 848)
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=	asterisk
>-PORTVERSION=	1.6.0.21
>-PKGNAMESUFFIX=	16
>+PORTVERSION=	1.6.2.2
>+#PKGNAMESUFFIX=	16
> CATEGORIES=	net
> MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
> 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
>@@ -18,6 +18,9 @@
> LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
> 		newt.51:${PORTSDIR}/devel/newt \
> 		execinfo:${PORTSDIR}/devel/libexecinfo
>+
>+USE_GNOME=	libxml2
>+
> RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
> 
> ONLY_FOR_ARCHS=	i386 sparc64 amd64 powerpc
>@@ -54,9 +57,7 @@
> 		GSM		"Enable GSM codec" on \
> 		CURL		"Enable CURL support" on \
> 		ILBC		"Enable iLBC codec" off \
>-		SPANDSP		"Enable Spandsp faxing support" off \
>-#		CODEC_PATCH	"Apply codec negotiation patch" off \
>-#		MISC_PATCHES	"Apply additional patches" off
>+		SPANDSP		"Enable Spandsp faxing support" off 
> 
> .include <bsd.port.pre.mk>
> 
>@@ -99,7 +100,7 @@
> PLIST_SUB+=	WITH_ODBC=""
> CONFIGURE_ARGS+= --with-odbc --with-ltdl
> LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC \
>-		ltdl.9:${PORTSDIR}/devel/libltdl22
>+		ltdl.4:${PORTSDIR}/devel/libltdl15
> .endif
> 
> .if !defined(WITH_FREETDS)

Actions: View | Diff

Attachments on bug 144065: 103966