6 files changed, 54 insertions, 43 deletions

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 17f793ca68f2..1c9a5b8597da 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -6,12 +6,16 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.5
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
+PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	fjoe
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
@@ -22,6 +26,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql
 
 ONLY_FOR_ARCHS=	i386 sparc64
 
+BRIVER=		bristuff-0.2.0-RC7f
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
@@ -57,6 +62,7 @@ PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITHOUT_ZAPTEL=1
 PLIST_SUB+=	WITH_ZAPTEL="@comment "
 .else
+LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri
 BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 PLIST_SUB+=	WITH_ZAPTEL=""
diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
index a0719a9a3de2..8af7e7d777c9 100644
--- a/net/asterisk/distinfo
+++ b/net/asterisk/distinfo
@@ -1,2 +1,4 @@
-MD5 (asterisk-1.0.3.tar.gz) = 20a77d71efb670eb395314d52218fc7c
-SIZE (asterisk-1.0.3.tar.gz) = 9564612
+MD5 (asterisk-1.0.5.tar.gz) = efabd43ac70ada3bdc97a57027c670a3
+SIZE (asterisk-1.0.5.tar.gz) = 9586778
+MD5 (asterisk-1.0.5-bristuff-0.2.0-RC7f.patch.gz) = c4b3de9bffec5b474ce0881dda5825a2
+SIZE (asterisk-1.0.5-bristuff-0.2.0-RC7f.patch.gz) = 38556
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
index 77acd5fecf7d..312cbe904760 100644
--- a/net/asterisk/files/patch-Makefile
+++ b/net/asterisk/files/patch-Makefile
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
-@@ -44,6 +44,15 @@
+--- Makefile.orig	Fri Jan 21 11:18:35 2005
++++ Makefile	Mon Feb 28 00:19:37 2005
+@@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
  
@@ -12,14 +9,14 @@ $FreeBSD$
 +PROC=ultrasparc
 +OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi)
 +OPTIONS+=$(shell if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v9"; fi)
-+OPTIONS+=-fomit-frame-pointerendif
++OPTIONS+=-fomit-frame-pointer
 +endif
 +endif
 +
  # Pentium Pro Optimize
  #PROC=i686
  
-@@ -62,10 +71,10 @@
+@@ -63,10 +72,10 @@
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the asterisk's code
@@ -32,7 +29,7 @@ $FreeBSD$
  
  # If you are running a radio application, define RADIO_RELAX so that the DTMF
  # will be received more reliably
-@@ -90,7 +99,7 @@
+@@ -91,7 +100,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
-@@ -110,23 +119,23 @@
+@@ -111,23 +120,23 @@
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
@@ -75,7 +72,7 @@ $FreeBSD$
  CFLAGS+=$(OPTIMIZE)
  
  ifneq ($(PROC),ultrasparc)
-@@ -137,11 +146,8 @@
+@@ -138,12 +147,8 @@
  CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi)
  
  ifeq (${OSARCH},FreeBSD)
@@ -84,12 +81,13 @@ $FreeBSD$
 -LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 -INCLUDE+=-I/usr/local/include
 -CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
+-MPG123TARG=freebsd
 +CFLAGS+=$(PTHREAD_CFLAGS)
 +LIBS+=$(PTHREAD_LIBS)
  endif # FreeBSD
  
  ifeq (${OSARCH},NetBSD)
-@@ -157,7 +163,10 @@
+@@ -160,7 +165,10 @@
  #CFLAGS+=-DOLD_DSP_ROUTINES
  
  CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
@@ -101,7 +99,7 @@ $FreeBSD$
  
  LIBEDIT=editline/libedit.a
  
-@@ -219,7 +228,7 @@
+@@ -222,7 +230,7 @@
  SOLINK=-shared -Xlinker -x
  endif
  
@@ -110,7 +108,7 @@ $FreeBSD$
  INSTALL=install
  
  _all: all
-@@ -231,7 +240,7 @@
+@@ -234,7 +242,7 @@
  	@echo " +               $(MAKE) install                +"  
  	@echo " +-------------------------------------------+"  
  
@@ -119,7 +117,7 @@ $FreeBSD$
  
  editline/config.h:
  	cd editline && unset CFLAGS LIBS && ./configure ; \
-@@ -240,13 +249,13 @@
+@@ -243,13 +251,13 @@
  	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
  	$(MAKE) -C editline libedit.a
  
@@ -140,7 +138,7 @@ $FreeBSD$
  
  ifneq ($(wildcard .depend),)
  include .depend
-@@ -268,13 +277,10 @@
+@@ -271,13 +279,10 @@
  
  asterisk.o: asterisk.c build.h
  
@@ -157,7 +155,7 @@ $FreeBSD$
  
  ifneq ($(strip $(ASTERISKVERSION)),)
  build.h: .version
-@@ -292,8 +298,8 @@
+@@ -295,8 +300,8 @@
  		exit 1; \
  	fi
  
@@ -168,7 +166,7 @@ $FreeBSD$
  
  muted: muted.o
  	$(CC) -o muted muted.o
-@@ -312,28 +318,28 @@
+@@ -315,28 +320,28 @@
  	$(MAKE) -C stdtime clean
  
  datafiles: all
@@ -203,7 +201,7 @@ $FreeBSD$
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -341,18 +347,18 @@
+@@ -344,18 +349,18 @@
  	done
  	for x in 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-*; do \
  		if grep -q "^%`basename $$x`%" sounds.txt; then \
@@ -227,7 +225,7 @@ $FreeBSD$
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -364,111 +370,86 @@
+@@ -367,113 +372,88 @@
  	fi
  
  bininstall: all
@@ -296,7 +294,7 @@ $FreeBSD$
  	fi 
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
 -	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
--	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
+-	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 -	@echo " +---- Asterisk Installation Complete -------+"  
 -	@echo " +                                           +"
 -	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -358,6 +356,8 @@ $FreeBSD$
 -	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
 -	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
 -	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
+-	echo "[options]" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
+-	echo "uniquename = asterisk" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
 +	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
 +	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
 +	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
@@ -366,6 +366,8 @@ $FreeBSD$
 +	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
 +	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
 +	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
++	echo "[options]" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
++	echo "uniquename = asterisk" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist
 +	if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
 +		$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \
 +	fi
@@ -388,7 +390,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 ; \
-@@ -483,7 +464,7 @@
+@@ -486,7 +466,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -397,7 +399,7 @@ $FreeBSD$
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -503,10 +484,10 @@
+@@ -506,10 +486,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk/files/patch-channels::Makefile b/net/asterisk/files/patch-channels::Makefile
index e82a0299756d..82896f15e951 100644
--- a/net/asterisk/files/patch-channels::Makefile
+++ b/net/asterisk/files/patch-channels::Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig
-+++ channels/Makefile
+--- channels/Makefile.orig	Tue Aug 31 23:33:00 2004
++++ channels/Makefile	Mon Feb 28 00:48:27 2005
 @@ -57,10 +57,10 @@
  
  endif
@@ -18,7 +15,7 @@ $FreeBSD$
  endif
  ifeq (${OSARCH},NetBSD)
  PTLIB=-lpt_NetBSD_x86_r
-@@ -72,8 +72,10 @@
+@@ -72,19 +72,21 @@
  endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
@@ -31,8 +28,13 @@ $FreeBSD$
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -84,7 +86,7 @@
- ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so")
+-CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
++CFLAGS+=$(shell [ -f $(LOCALBASE)/lib/libpri.so.1 ] && echo " -DZAPATA_PRI")
+ CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2")
+ CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+-ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
++ZAPPRI=$(shell [ -f $(LOCALBASE)/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
  CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
 -CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
diff --git a/net/asterisk/files/patch-codecs::Makefile b/net/asterisk/files/patch-codecs::Makefile
index de9aff4c34fe..353c6dd1e62e 100644
--- a/net/asterisk/files/patch-codecs::Makefile
+++ b/net/asterisk/files/patch-codecs::Makefile
@@ -1,15 +1,12 @@
-
-$FreeBSD$
-
---- codecs/Makefile.orig	Mon Jul 19 18:52:57 2004
-+++ codecs/Makefile	Sun Oct 10 15:28:35 2004
-@@ -17,23 +17,23 @@
+--- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
++++ codecs/Makefile	Sun Feb 27 23:53:30 2005
+@@ -17,24 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -17,6 +14,7 @@ $FreeBSD$
 +MODILBC=codec_ilbc.so
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
+-CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -34,7 +32,7 @@ $FreeBSD$
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -91,7 +91,7 @@
+@@ -92,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index 08f63abf01e7..ecc2a5bf5f50 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -587,6 +587,7 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm