Update to 1.6.0.15.

Reminded by:	Florian Smeets

6 files changed, 46 insertions, 69 deletions

diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 9dfb4ca9eae5..37a1ecec0698 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.6.0.9
-PORTREVISION=	3
+PORTVERSION=	1.6.0.15
 PKGNAMESUFFIX=	16
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 074f6fc31cb9..9e6bc2b6b19c 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,3 +1,3 @@
-MD5 (asterisk-1.6.0.9.tar.gz) = 9142461a5ae047a5493bcb610963bc42
-SHA256 (asterisk-1.6.0.9.tar.gz) = ee7c1da586041a53884cd82b4411fe48ec585c1cd181fc42afce3f93d293e6fe
-SIZE (asterisk-1.6.0.9.tar.gz) = 13198345
+MD5 (asterisk-1.6.0.15.tar.gz) = d319f52d8d1d70f69583901e56720c30
+SHA256 (asterisk-1.6.0.15.tar.gz) = 159bf2c39ed2926d97f535c8d46bcf6c80853bab1269d596241c6ed30b27b92a
+SIZE (asterisk-1.6.0.15.tar.gz) = 23070325
diff --git a/net/asterisk16/files/nocodecnego-patch-Makefile b/net/asterisk16/files/nocodecnego-patch-Makefile
index 12f4d8a0fe17..0ae29760d4e2 100644
--- a/net/asterisk16/files/nocodecnego-patch-Makefile
+++ b/net/asterisk16/files/nocodecnego-patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2008-12-02 16:53:56.000000000 -0800
-+++ Makefile	2009-02-14 12:36:45.000000000 -0800
-@@ -117,7 +117,7 @@
+--- Makefile.orig	2009-08-04 07:54:00.000000000 -0700
++++ Makefile	2009-09-09 17:10:46.000000000 -0700
+@@ -111,7 +111,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
-@@ -147,7 +147,7 @@
+@@ -141,7 +141,7 @@
    ASTMANDIR=$(mandir)
  ifneq ($(findstring BSD,$(OSARCH)),)
    ASTVARLIBDIR=$(prefix)/share/asterisk
@@ -18,28 +18,28 @@
    ASTDBDIR=$(localstatedir)/db/asterisk
  else
    ASTVARLIBDIR=$(localstatedir)/lib/asterisk
-@@ -242,9 +242,11 @@
-   ASTLDFLAGS+=-L/usr/local/lib
+@@ -241,9 +241,11 @@
+   _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)
+   _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  endif
 +endif
  
  ifeq ($(PROC),ppc)
-   ASTCFLAGS+=-fsigned-char
-@@ -252,7 +254,7 @@
+   _ASTCFLAGS+=-fsigned-char
+@@ -251,7 +253,7 @@
  
  ifeq ($(OSARCH),FreeBSD)
    # -V is understood by BSD Make, not by GNU make.
 -  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
 +  BSDVERSION=$(OSVERSION)
-   ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  endif
  
-@@ -461,21 +463,21 @@
+@@ -458,21 +460,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.
@@ -68,7 +68,7 @@
  	$(MAKE) -C sounds install
  
  update: 
-@@ -499,47 +501,47 @@
+@@ -496,47 +498,47 @@
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  installdirs:
@@ -148,7 +148,7 @@
  	fi
  
  $(SUBDIRS_INSTALL):
-@@ -573,7 +575,7 @@
+@@ -570,7 +572,7 @@
  	@exit 1
  endif
  
@@ -157,7 +157,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
  	fi
-@@ -605,38 +607,25 @@
+@@ -602,38 +604,25 @@
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -204,7 +204,7 @@
  		echo "Creating asterisk.conf"; \
  		( \
  		echo "[directories](!) ; remove the (!) to enable this" ; \
-@@ -692,13 +681,16 @@
+@@ -689,13 +678,16 @@
  		echo "pbx_realtime=1.6" ; \
  		echo "res_agi=1.6" ; \
  		echo "app_set=1.6" ; \
@@ -224,7 +224,7 @@
  	@for x in phoneprov/*; do \
  		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
  		if [ -f $${dst} ]; then \
-@@ -714,14 +706,14 @@
+@@ -711,14 +703,14 @@
  			fi ;\
  		fi ; \
  		echo "Installing file $$x"; \
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
index 6528dae15056..39731fc19d6d 100644
--- a/net/asterisk16/files/patch-channels::Makefile
+++ b/net/asterisk16/files/patch-channels::Makefile
@@ -1,7 +1,7 @@
 
 $FreeBSD$
 
---- channels/Makefile
+--- channels/Makefile.orig
 +++ channels/Makefile
 @@ -27,9 +27,10 @@
  endif
@@ -16,36 +16,17 @@ $FreeBSD$
  endif
  
  ifeq ($(OSARCH),NetBSD)
-@@ -69,12 +70,13 @@
- h323/libchanh323.a h323/Makefile.ast:
- 	$(CMD_PREFIX) $(MAKE) -C h323
- 	$(CMD_PREFIX) rm -f ../main/asterisk
--	$(CMD_PREFIX) echo "***************************************************************"
--	$(CMD_PREFIX) echo
--	$(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********"
--	$(CMD_PREFIX) echo
--	$(CMD_PREFIX) echo "***************************************************************"
--	$(CMD_PREFIX) exit 1
-+	$(MAKE) -C . chan_h323.so
-+#	$(CMD_PREFIX) echo "***************************************************************"
-+#	$(CMD_PREFIX) echo
-+#	$(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********"
-+#	$(CMD_PREFIX) echo
-+#	$(CMD_PREFIX) echo "***************************************************************"
-+#	$(CMD_PREFIX) exit 1
- endif
- 
- dist-clean::
-@@ -89,8 +91,12 @@
+@@ -80,9 +81,13 @@
  else
  chan_h323.so: chan_h323.o h323/libchanh323.a
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 +ifeq ($(OSARCH),FreeBSD)
-+	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
++	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
 +else
  	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
  endif
+ endif
 +endif
  
- chan_misdn.o: ASTCFLAGS+=-Imisdn
+ chan_misdn.o: _ASTCFLAGS+=-Imisdn
  
diff --git a/net/asterisk16/files/patch-main::Makefile b/net/asterisk16/files/patch-main::Makefile
index f9f86415395a..34f320468cbc 100644
--- a/net/asterisk16/files/patch-main::Makefile
+++ b/net/asterisk16/files/patch-main::Makefile
@@ -1,32 +1,25 @@
 
 $FreeBSD$
 
---- main/Makefile
+--- main/Makefile.orig
 +++ main/Makefile
-@@ -110,8 +110,8 @@
- 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(ASTCFLAGS:-Werror=))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
+@@ -101,8 +101,8 @@
+ 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
  	$(MAKE) -C editline libedit.a
  
 -db1-ast/libdb1.a: CHECK_SUBDIR
--	CFLAGS="$(subst $(ASTTOPDIR),../../,$(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
+-	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
 +#db1-ast/libdb1.a: CHECK_SUBDIR
-+#	CFLAGS="$(subst $(ASTTOPDIR),../../,$(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
++#	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
  
  ast_expr2.c ast_expr2.h:
  	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
-@@ -168,13 +168,13 @@
+@@ -159,7 +159,7 @@
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
 -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 +$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
- 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
- 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
- else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
-+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
- endif
- 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
- 
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index 7072a9e18b09..5cc0709634de 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -511,18 +511,21 @@ share/asterisk/images/asterisk-intro.jpg
 share/asterisk/images/kpad2.jpg
 share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/moh/.asterisk-moh-freeplay-wav
-share/asterisk/moh/CHANGES-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/moh/.asterisk-moh-opsound-wav
+share/asterisk/moh/CHANGES-asterisk-moh-opsound-2.01
+share/asterisk/moh/CREDITS-asterisk-moh-opsound-2.01
+share/asterisk/moh/LICENSE-asterisk-moh-opsound-2.01
+share/asterisk/moh/macroform-cold_day.wav
+share/asterisk/moh/macroform-robot_dity.wav
+share/asterisk/moh/macroform-the_simplicity.wav
+share/asterisk/moh/manolo_camp-morning_coffee.wav
+share/asterisk/moh/reno_project-system.wav
 share/asterisk/phoneprov/000000000000-directory.xml
 share/asterisk/phoneprov/000000000000-phone.cfg
 share/asterisk/phoneprov/000000000000.cfg
 share/asterisk/phoneprov/polycom.xml
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.14
-share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.14
+share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.15
+share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.15
 share/asterisk/sounds/en/conf-adminmenu-162.gsm
 share/asterisk/sounds/en/conf-extended.gsm
 share/asterisk/sounds/en/conf-nonextended.gsm
@@ -536,8 +539,8 @@ share/asterisk/sounds/en/vm-marked-urgent.gsm
 share/asterisk/sounds/en/vm-record-prepend.gsm
 share/asterisk/sounds/en/vm-review-nonurgent.gsm
 share/asterisk/sounds/en/vm-review-urgent.gsm
-share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.14
-share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.14
+share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.15
+share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.15
 share/asterisk/sounds/en/dir-usingkeypad.gsm
 share/asterisk/sounds/en/dir-welcome.gsm
 share/asterisk/sounds/en/agent-alreadyon.gsm
@@ -1188,6 +1191,7 @@ share/asterisk/static-http/prototype.js
 %%DOCSDIR%%/node276.html
 %%DOCSDIR%%/node277.html
 %%DOCSDIR%%/node278.html
+%%DOCSDIR%%/node279.html
 %%DOCSDIR%%/node28.html
 %%DOCSDIR%%/node29.html
 %%DOCSDIR%%/node3.html