Date: Fri, 15 Jul 2011 19:08:03 GMT From: Douglas Carmichael <dcarmich@dcarmichael.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/158954: I have updated the net/asterisk port to asterisk 1.8.5.0 Message-ID: <201107151908.p6FJ83Jn035819@red.freebsd.org> Resent-Message-ID: <201107151910.p6FJAALk081629@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158954 >Category: ports >Synopsis: I have updated the net/asterisk port to asterisk 1.8.5.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 15 19:10:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Douglas Carmichael >Release: 8.2-RELEASE-p2 >Organization: n/a >Environment: FreeBSD dc-freebsd82.carmichael.lan 8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #1: Wed Jun 29 23:00:30 CDT 2011 root@dc-freebsd82.carmichael.lan:/usr/src/sys/amd64/compile/VMWARE81-64 amd64 >Description: I have updated the net/asterisk port to asterisk 1.8.5.0. A patch is attached. >How-To-Repeat: n/a >Fix: n/a Patch attached with submission follows: diff -ruN net/asterisk.orig/Makefile net/asterisk/Makefile --- net/asterisk.orig/Makefile 2011-07-15 13:32:25.000000000 -0500 +++ net/asterisk/Makefile 2011-07-15 13:33:11.000000000 -0500 @@ -6,7 +6,7 @@ # PORTNAME= asterisk -PORTVERSION= 1.8.4.4 +PORTVERSION= 1.8.5.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ diff -ruN net/asterisk.orig/distinfo net/asterisk/distinfo --- net/asterisk.orig/distinfo 2011-07-15 13:32:25.000000000 -0500 +++ net/asterisk/distinfo 2011-07-15 13:35:12.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.4.4.tar.gz) = 08d44e7cfd5c306d944cd48eb8a497a345ebbb4e781d7a6cc917376784789c1f -SIZE (asterisk-1.8.4.4.tar.gz) = 27326189 +SHA256 (asterisk-1.8.5.0.tar.gz) = 5c4601c0dab2c94a3dc37cab5d55af8eab67765a31eb8aed7321dd98e7c62a46 +SIZE (asterisk-1.8.5.0.tar.gz) = 27417584 diff -ruN net/asterisk.orig/files/patch-Makefile net/asterisk/files/patch-Makefile --- net/asterisk.orig/files/patch-Makefile 2011-07-15 13:32:25.000000000 -0500 +++ net/asterisk/files/patch-Makefile 1969-12-31 18:00:00.000000000 -0600 @@ -1,117 +0,0 @@ ---- Makefile.orig 2011-02-01 19:02:06.000000000 +0100 -+++ Makefile 2011-05-22 18:45:02.809438425 +0200 -@@ -122,7 +122,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - # Asterisk.conf is located in ASTETCDIR or by using the -C flag - # when starting Asterisk -@@ -220,11 +220,13 @@ - _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 -@@ -235,7 +237,7 @@ - _ASTCFLAGS+=-march=i686 - endif - # -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) - endif - -@@ -462,8 +464,13 @@ - $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \ - done - $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http"; -+ -+ if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \ -+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \ -+ fi -+ - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \ - done - $(MAKE) -C sounds install - -@@ -523,6 +530,7 @@ - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor" -+ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/outgoing" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail" -@@ -544,6 +552,7 @@ - $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http" - $(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8" - $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)" -+ $(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)" - - bininstall: _all installdirs $(SUBDIRS_INSTALL) - $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -@@ -603,7 +612,7 @@ - @exit 1 - endif - --install: badshell bininstall datafiles -+install: badshell bininstall datafiles samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -645,29 +654,18 @@ - else \ - echo "Installing $$x" ; \ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi - @echo Installing other config files... - @for x in configs/*.sample; do \ -- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ -- if [ -f $${dst} ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $${dst} $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $${dst} $${dst}.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ - fi ; \ -- echo "Installing file $$x"; \ -- $(INSTALL) -m 644 $$x $${dst} ;\ - done -- if [ "$(OVERWRITE)" = "y" ]; then \ -+ @if true; then \ - echo "Updating asterisk.conf" ; \ - sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ - -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ -@@ -681,6 +679,7 @@ - -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ - $(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \ - $(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \ -+ $(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH)-dist ; \ - rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \ - fi ; \ - $(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107151908.p6FJ83Jn035819>