diff options
| -rw-r--r-- | net/asterisk/Makefile | 3 | ||||
| -rw-r--r-- | net/asterisk/distinfo | 4 | ||||
| -rw-r--r-- | net/asterisk/files/patch-Makefile | 39 | ||||
| -rw-r--r-- | net/asterisk/pkg-plist | 2 |
4 files changed, 24 insertions, 24 deletions
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 3b741526b317..c47b4648063c 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -6,8 +6,7 @@ # PORTNAME= asterisk -PORTVERSION= 1.8.5.0 -PORTREVISION= 1 +PORTVERSION= 1.8.6.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo index 27efcb2028b5..b71c60b78c87 100644 --- a/net/asterisk/distinfo +++ b/net/asterisk/distinfo @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.5.0.tar.gz) = 5c4601c0dab2c94a3dc37cab5d55af8eab67765a31eb8aed7321dd98e7c62a46 -SIZE (asterisk-1.8.5.0.tar.gz) = 27417584 +SHA256 (asterisk-1.8.6.0.tar.gz) = dd6a489a8d89a147a18e5b7ee74eb44835459a7bd14786b8a114f3052066636b +SIZE (asterisk-1.8.6.0.tar.gz) = 27753713 diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile index 23027da55ea7..28dffeeee306 100644 --- a/net/asterisk/files/patch-Makefile +++ b/net/asterisk/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2011-02-01 19:02:06.000000000 +0100 -+++ Makefile 2011-05-22 18:45:02.809438425 +0200 +--- Makefile.orig 2011-08-25 21:08:04.000000000 +0200 ++++ Makefile 2011-08-31 21:21:45.000000000 +0200 @@ -122,7 +122,7 @@ OVERWRITE=y @@ -55,55 +55,56 @@ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail" -@@ -603,7 +612,7 @@ +@@ -604,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) . ; \ + /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -645,29 +654,18 @@ +@@ -646,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 ; \ +- $(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 [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $${dst} $$x ; then \ +- if cmp -s "$${dst}" "$$x" ; then \ - echo "Config file $$x is unchanged"; \ - continue; \ - fi ; \ -- mv -f $${dst} $${dst}.old ; \ +- mv -f "$${dst}" "$${dst}.old" ; \ - else \ - echo "Skipping config file $$x"; \ - continue; \ - fi ;\ +- fi ; \ +- echo "Installing file $$x"; \ +- $(INSTALL) -m 644 "$$x" "$${dst}" ;\ + $(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} ;\ ++ fi ; \ 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 @@ +@@ -682,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 ; \ + "$(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 + $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist index 5dfc4e12e5e6..b831f33bcc8f 100644 --- a/net/asterisk/pkg-plist +++ b/net/asterisk/pkg-plist @@ -1116,7 +1116,7 @@ share/asterisk/sounds/en/vm-undeleted.gsm share/asterisk/sounds/en/vm-unknown-caller.gsm share/asterisk/sounds/en/vm-whichbox.gsm share/asterisk/sounds/en/vm-youhave.gsm -share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.21 +share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.21 share/asterisk/static-http/ajamdemo.html share/asterisk/static-http/astman.css share/asterisk/static-http/astman.js |