Date: Sat, 16 Jan 2016 17:18:29 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406243 - in head/net: asterisk11 asterisk13 asterisk13/files Message-ID: <201601161718.u0GHITPJ039510@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Jan 16 17:18:29 2016 New Revision: 406243 URL: https://svnweb.freebsd.org/changeset/ports/406243 Log: - Update net/asterisk11 to 11.21.0 - Update net/asterisk13 to 13.7.0 Modified: head/net/asterisk11/Makefile head/net/asterisk11/distinfo head/net/asterisk13/Makefile head/net/asterisk13/distinfo head/net/asterisk13/files/patch-Makefile Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Sat Jan 16 17:16:36 2016 (r406242) +++ head/net/asterisk11/Makefile Sat Jan 16 17:18:29 2016 (r406243) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.20.0 -PORTREVISION= 1 +PORTVERSION= 11.21.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ Modified: head/net/asterisk11/distinfo ============================================================================== --- head/net/asterisk11/distinfo Sat Jan 16 17:16:36 2016 (r406242) +++ head/net/asterisk11/distinfo Sat Jan 16 17:18:29 2016 (r406243) @@ -1,5 +1,5 @@ -SHA256 (asterisk-11.20.0.tar.gz) = ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 -SIZE (asterisk-11.20.0.tar.gz) = 34864289 +SHA256 (asterisk-11.21.0.tar.gz) = 14e525c104633bf49a4122bda93d9fcbc166e4caa1217efbdab2efeebee16b6e +SIZE (asterisk-11.21.0.tar.gz) = 34875184 SHA256 (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = f5d21ca8305b29ea84fb4603c65c041483ea3a9cd0bf313eb4f098342a29af5f SIZE (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = 1408055 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Sat Jan 16 17:16:36 2016 (r406242) +++ head/net/asterisk13/Makefile Sat Jan 16 17:18:29 2016 (r406243) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.6.0 -PORTREVISION= 1 +PORTVERSION= 13.7.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ Modified: head/net/asterisk13/distinfo ============================================================================== --- head/net/asterisk13/distinfo Sat Jan 16 17:16:36 2016 (r406242) +++ head/net/asterisk13/distinfo Sat Jan 16 17:18:29 2016 (r406243) @@ -1,5 +1,5 @@ -SHA256 (asterisk-13.6.0.tar.gz) = 8a01b53c946d092ac561c11b404f68cd328306d0e3b434a7485a11d4b175005a -SIZE (asterisk-13.6.0.tar.gz) = 32146107 +SHA256 (asterisk-13.7.0.tar.gz) = d04c783e18a41de5fd6d8dc375533633995ea5a11437df727f0f6a32bfdbcd7a +SIZE (asterisk-13.7.0.tar.gz) = 32198169 SHA256 (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = f5d21ca8305b29ea84fb4603c65c041483ea3a9cd0bf313eb4f098342a29af5f SIZE (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = 1408055 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 Modified: head/net/asterisk13/files/patch-Makefile ============================================================================== --- head/net/asterisk13/files/patch-Makefile Sat Jan 16 17:16:36 2016 (r406242) +++ head/net/asterisk13/files/patch-Makefile Sat Jan 16 17:18:29 2016 (r406243) @@ -1,4 +1,4 @@ ---- Makefile.orig 2015-07-24 22:20:17 UTC +--- Makefile.orig 2015-12-15 18:01:38 UTC +++ Makefile @@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( OVERWRITE=y @@ -14,7 +14,7 @@ # Default install directory for DAHDI hooks. -DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d -+# DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d ++#DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d # This Makefile previously contained a note about the ability to use .asterisk.makeopts # from your home directory or /etc/asterisk.makeopts to set defaults for menuselect. @@ -51,7 +51,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -602,10 +607,10 @@ bininstall: _all installdirs $(SUBDIRS_I +@@ -603,10 +608,10 @@ bininstall: _all installdirs $(SUBDIRS_I if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ fi @@ -66,7 +66,7 @@ $(SUBDIRS_INSTALL): +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install -@@ -638,7 +643,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) +@@ -639,7 +644,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -75,18 +75,11 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -680,29 +685,16 @@ adsi: - else \ - echo "Installing $$x" ; \ - fi ; \ -- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ - done - - samples: adsi - @echo Installing other config files... - @for x in configs/samples/*.sample; do \ -- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ +@@ -682,23 +687,10 @@ upgrade: bininstall + # (2) the extension to strip off + define INSTALL_CONFIGS + @for x in configs/$(1)/*$(2); do \ +- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s "$${dst}" "$$x" ; then \ @@ -102,13 +95,13 @@ echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \ - done + done ; \ - if [ "$(OVERWRITE)" = "y" ]; then \ -+ @if true; then \ ++ if true; then \ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -@@ -715,15 +707,15 @@ samples: adsi +@@ -711,8 +703,8 @@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ @@ -117,13 +110,14 @@ + "$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ + $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - fi ; \ - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" - build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" - - @for x in phoneprov/*; do \ -- dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ -+ dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s "$${dst}" "$$x" ; then \ + fi + endef +@@ -728,7 +720,7 @@ adsi: + else \ + echo "Installing $$x" ; \ + fi ; \ +- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ + done + + samples: adsi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601161718.u0GHITPJ039510>