summaryrefslogtreecommitdiff
path: root/comms/asterisk10
diff options
context:
space:
mode:
Diffstat (limited to 'comms/asterisk10')
-rw-r--r--comms/asterisk10/Makefile14
-rw-r--r--comms/asterisk10/PLIST4
-rw-r--r--comms/asterisk10/distinfo21
-rw-r--r--comms/asterisk10/patches/patch-Makefile32
-rw-r--r--comms/asterisk10/patches/patch-codecs_lpc10_Makefile34
-rw-r--r--comms/asterisk10/patches/patch-configure19
-rw-r--r--comms/asterisk10/patches/patch-configure.ac15
7 files changed, 60 insertions, 79 deletions
diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile
index a7cca6f5c84..49ab54be848 100644
--- a/comms/asterisk10/Makefile
+++ b/comms/asterisk10/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2012/06/03 23:34:45 jnemeth Exp $
+# $NetBSD: Makefile,v 1.17 2012/06/05 01:39:44 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-10.4.2
+DISTNAME= asterisk-10.5.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
@@ -89,7 +89,7 @@ MAKE_FLAGS+= WRKSRC=${WRKSRC}
MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q}
MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
-MAKE_FLAGS+= OPTIMIZE=
+MAKE_FLAGS+= OPTIMIZE=-O3
.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
BUILDLINK_TRANSFORM+= rm:-march=i386
@@ -179,10 +179,10 @@ CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_U
oss.conf phone.conf phoneprov.conf queuerules.conf queues.conf \
res_config_mysql.conf res_config_sqlite.conf res_curl.conf \
res_fax.conf res_ldap.conf res_odbc.conf res_pgsql.conf \
- res_pktccops.conf res_snmp.conf res_stun_monitor.conf rpt.conf \
- rtp.conf say.conf sip.conf sip_notify.conf skinny.conf sla.conf \
- smdi.conf telcordia-1.adsi udptl.conf unistim.conf \
- usbradio.conf users.conf voicemail.conf vpb.conf
+ res_pktccops.conf res_snmp.conf res_stun_monitor.conf rtp.conf \
+ say.conf sip.conf sip_notify.conf skinny.conf sla.conf \
+ smdi.conf telcordia-1.adsi udptl.conf unistim.conf users.conf \
+ voicemail.conf vpb.conf
CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_USER} ${ASTERISK_GROUP} 0644
.endfor
diff --git a/comms/asterisk10/PLIST b/comms/asterisk10/PLIST
index 73a9e173813..339f514c75b 100644
--- a/comms/asterisk10/PLIST
+++ b/comms/asterisk10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/04/07 20:05:57 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/06/05 01:39:44 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -2800,7 +2800,6 @@ share/examples/asterisk/res_pgsql.conf
share/examples/asterisk/res_pktccops.conf
share/examples/asterisk/res_snmp.conf
share/examples/asterisk/res_stun_monitor.conf
-share/examples/asterisk/rpt.conf
share/examples/asterisk/rtp.conf
share/examples/asterisk/say.conf
share/examples/asterisk/sip.conf
@@ -2811,7 +2810,6 @@ share/examples/asterisk/smdi.conf
share/examples/asterisk/telcordia-1.adsi
share/examples/asterisk/udptl.conf
share/examples/asterisk/unistim.conf
-share/examples/asterisk/usbradio.conf
share/examples/asterisk/users.conf
share/examples/asterisk/voicemail.conf
share/examples/asterisk/vpb.conf
diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo
index 5ff339a08d4..6bd4f6bcdad 100644
--- a/comms/asterisk10/distinfo
+++ b/comms/asterisk10/distinfo
@@ -1,21 +1,20 @@
-$NetBSD: distinfo,v 1.12 2012/06/03 23:34:45 jnemeth Exp $
+$NetBSD: distinfo,v 1.13 2012/06/05 01:39:44 jnemeth Exp $
-SHA1 (asterisk-10.4.2/asterisk-10.4.2.tar.gz) = f22be09eb4ba2643b8d4d9baef593959bfa6b98e
-RMD160 (asterisk-10.4.2/asterisk-10.4.2.tar.gz) = 4f973347c24ad9d9cfd3dbf698890ccd93c90f67
-Size (asterisk-10.4.2/asterisk-10.4.2.tar.gz) = 25009922 bytes
-SHA1 (asterisk-10.4.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-10.4.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-10.4.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (patch-Makefile) = 900252eff84bda22d2cbe09e0f22505531284cbb
+SHA1 (asterisk-10.5.0/asterisk-10.5.0.tar.gz) = 8f44a57c67f8c8e01098b0de61dfd82cdf837c25
+RMD160 (asterisk-10.5.0/asterisk-10.5.0.tar.gz) = cde557a9e2041881e364061bb4f59a165b929acd
+Size (asterisk-10.5.0/asterisk-10.5.0.tar.gz) = 24980521 bytes
+SHA1 (asterisk-10.5.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-10.5.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-10.5.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (patch-Makefile) = 1f351f6b3de49ee32be69cd8b8f88571b7ae9e03
SHA1 (patch-apps_app__dial.c) = 2109ed50406dedc90a300981a3a7500b1397ff3a
SHA1 (patch-apps_app__followme.c) = a0a507986ec9722337d46fdaaac0a79d23a634e4
SHA1 (patch-apps_app__queue.c) = e035995563eb5533d5261568fdb43e8adcf2fe35
SHA1 (patch-apps_app__sms.c) = 8013727b495dc0ac038eb28b84e9d3839d0bc23d
SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
SHA1 (patch-channels_chan__oss.c) = 3a69c29f4106bfabe05f63118d73538e85478e88
-SHA1 (patch-codecs_lpc10_Makefile) = 0c9955e87eb453d70517951114d335d91b3ee73a
-SHA1 (patch-configure) = 60d60281275e15ac88ce9f5fb9d7b6675e6aeb5a
-SHA1 (patch-configure.ac) = 27ac6fd657c490689ec06cddf7cd10e9cc8a7927
+SHA1 (patch-configure) = c3611a024ed1c8ffb0a517289ca473f886179b08
+SHA1 (patch-configure.ac) = 6c8db1d178c2d21afff53f3db72e9c78c9e0a8a3
SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
SHA1 (patch-include_asterisk_autoconfig.h.in) = 7d6e3443ce3f0741c72a5f2178895598e79e83c9
diff --git a/comms/asterisk10/patches/patch-Makefile b/comms/asterisk10/patches/patch-Makefile
index 20b52520b6a..e0c89f42951 100644
--- a/comms/asterisk10/patches/patch-Makefile
+++ b/comms/asterisk10/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.2 2012/06/05 01:39:45 jnemeth Exp $
---- Makefile.orig 2011-12-08 23:20:44.000000000 +0000
+--- Makefile.orig 2012-04-12 15:01:13.000000000 +0000
+++ Makefile
-@@ -128,7 +128,7 @@ DEBUG=-g3
+@@ -127,7 +127,7 @@ DEBUG=-g3
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -11,7 +11,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
MODULES_DIR=$(ASTLIBDIR)/modules
AGI_DIR=$(ASTDATADIR)/agi-bin
-@@ -220,10 +220,6 @@ ifeq ($(AST_DEVMODE),yes)
+@@ -186,10 +186,6 @@ ifeq ($(AST_DEVMODE),yes)
ADDL_TARGETS+=validate-docs
endif
@@ -19,10 +19,10 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
- _ASTCFLAGS+=-isystem /usr/local/include
-endif
-
- ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
- ifneq ($(AST_MARCH_NATIVE),)
- _ASTCFLAGS+=$(AST_MARCH_NATIVE)
-@@ -452,7 +448,6 @@ dist-clean: distclean
+ 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)
+@@ -399,7 +395,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
@@ -30,7 +30,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status config.cache
-@@ -462,7 +457,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+@@ -409,7 +404,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
rm -rf doc/api
rm -f build_tools/menuselect-deps
@@ -39,7 +39,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
# 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
-@@ -533,7 +528,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS) $(
+@@ -480,7 +475,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS) $(
installdirs:
$(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTSBINDIR)"
@@ -48,7 +48,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(ASTVARRUNDIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
-@@ -563,7 +558,7 @@ installdirs:
+@@ -510,7 +505,7 @@ installdirs:
$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
@@ -57,7 +57,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
$(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
-@@ -655,21 +650,21 @@ upgrade: bininstall
+@@ -602,21 +597,21 @@ upgrade: bininstall
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
@@ -83,7 +83,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s "$${dst}" "$$x" ; then \
-@@ -697,9 +692,9 @@ samples: adsi
+@@ -644,9 +639,9 @@ samples: adsi
-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
@@ -96,7 +96,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
fi ; \
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -725,7 +720,7 @@ samples: adsi
+@@ -672,7 +667,7 @@ samples: adsi
webvmail:
@[ -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 )
@@ -105,7 +105,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -879,7 +874,7 @@ uninstall-all: _uninstall
+@@ -826,7 +821,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -114,7 +114,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
-@@ -948,6 +943,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -895,6 +890,7 @@ menuselect-tree: $(foreach dir,$(filter-
@echo "</menu>" >> $@
.PHONY: menuselect
diff --git a/comms/asterisk10/patches/patch-codecs_lpc10_Makefile b/comms/asterisk10/patches/patch-codecs_lpc10_Makefile
deleted file mode 100644
index 4fbb7ff9cbf..00000000000
--- a/comms/asterisk10/patches/patch-codecs_lpc10_Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-codecs_lpc10_Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
-
---- codecs/lpc10/Makefile.orig 2011-03-11 15:09:23.000000000 +0000
-+++ codecs/lpc10/Makefile
-@@ -35,19 +35,21 @@ ifeq ($(findstring -march,$(_ASTCFLAGS)
- ifneq ($(OSARCH),Darwin)
- ifneq ($(findstring BSD,${OSARCH}),BSD)
- ifneq ($(PROC),ppc)
-- ifneq ($(PROC),x86_64)
-- ifneq ($(PROC),alpha)
-+ ifneq ($(PROC),powerpc)
-+ ifneq ($(PROC),x86_64)
-+ ifneq ($(PROC),alpha)
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
- #So we go lowest common available by gcc and go a step down, still a step up from
- #the default as we now have a better instruction set to work with. - Belgarath
-- ifeq ($(PROC),ultrasparc)
-- CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
-- else
-- ifneq ($(OSARCH),SunOS)
-- ifneq ($(OSARCH),arm)
-- # CFLAGS+= -march=$(PROC)
-+ ifeq ($(PROC),ultrasparc)
-+ CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
-+ else
-+ ifneq ($(OSARCH),SunOS)
-+ ifneq ($(OSARCH),arm)
-+ # CFLAGS+= -march=$(PROC)
-+ endif
- endif
- endif
- endif
diff --git a/comms/asterisk10/patches/patch-configure b/comms/asterisk10/patches/patch-configure
index 0ffd376c370..50fa93d06d0 100644
--- a/comms/asterisk10/patches/patch-configure
+++ b/comms/asterisk10/patches/patch-configure
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure,v 1.4 2012/05/03 06:23:37 jnemeth Exp $
+$NetBSD: patch-configure,v 1.5 2012/06/05 01:39:45 jnemeth Exp $
---- configure.orig 2012-03-27 14:35:40.000000000 +0000
+--- configure.orig 2012-04-12 15:01:13.000000000 +0000
+++ configure
-@@ -16444,6 +16444,148 @@ fi
+@@ -15988,7 +15988,7 @@ $as_echo "user CFLAGS present" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- AST_NATIVE_ARCH=
++ AST_NATIVE_ARCH=0
+ fi
+
+
+@@ -16448,6 +16448,148 @@ fi
@@ -151,7 +160,7 @@ $NetBSD: patch-configure,v 1.4 2012/05/03 06:23:37 jnemeth Exp $
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -17569,6 +17711,8 @@ $as_echo_n "checking if \"struct ifaddrs
+@@ -17562,6 +17704,8 @@ $as_echo_n "checking if \"struct ifaddrs
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -160,7 +169,7 @@ $NetBSD: patch-configure,v 1.4 2012/05/03 06:23:37 jnemeth Exp $
#include <ifaddrs.h>
int
main ()
-@@ -28961,10 +29105,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
+@@ -28872,10 +29016,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
$as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
diff --git a/comms/asterisk10/patches/patch-configure.ac b/comms/asterisk10/patches/patch-configure.ac
index 4aad0207bf8..9ecdce5aac4 100644
--- a/comms/asterisk10/patches/patch-configure.ac
+++ b/comms/asterisk10/patches/patch-configure.ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-configure.ac,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-configure.ac,v 1.2 2012/06/05 01:39:45 jnemeth Exp $
---- configure.ac.orig 2011-10-06 22:58:40.000000000 +0000
+--- configure.ac.orig 2012-04-12 15:01:13.000000000 +0000
+++ configure.ac
-@@ -1051,6 +1051,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
+@@ -1004,7 +1004,7 @@ if $(${CC} -march=native -S -o /dev/null
+ fi
+ else
+ AC_MSG_RESULT(no)
+- AST_NATIVE_ARCH=
++ AST_NATIVE_ARCH=0
+ fi
+ AC_SUBST(AST_NATIVE_ARCH)
+
+@@ -1084,6 +1084,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
AC_CHECK_HEADER([libkern/OSAtomic.h],
[AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 09:46:13 +0000