diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2011-01-17 17:51:02 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2011-01-17 17:51:02 +0000 |
| commit | 93a5ead8aa648baa3cfd0bbd4a1d00923aa173f1 (patch) | |
| tree | 06e168bde2a4763a5612f88198726276afb61931 /net/asterisk | |
| parent | - update to 1.6.2.16 (diff) | |
- update to 1.8.2
- fix config file permissions
PR: ports/154002
Submitted by: Alexander Brovikov <alexander@brovikov.ru>
Approved by: jadawin (mentor)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=267917
Diffstat (limited to 'net/asterisk')
| -rw-r--r-- | net/asterisk/Makefile | 3 | ||||
| -rw-r--r-- | net/asterisk/distinfo | 4 | ||||
| -rw-r--r-- | net/asterisk/files/patch-Makefile | 24 |
3 files changed, 15 insertions, 16 deletions
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 92fa3d13a758..b6e21e683de0 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -6,8 +6,7 @@ # PORTNAME= asterisk -PORTVERSION= 1.8.1.1 -PORTREVISION= 1 +PORTVERSION= 1.8.2 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 fcaa48a51b0f..2d24845feee6 100644 --- a/net/asterisk/distinfo +++ b/net/asterisk/distinfo @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.1.1.tar.gz) = 71016372d81dd6c0b2977b8994aa626afa8aa71a2379005fc8fe30625ceedafa -SIZE (asterisk-1.8.1.1.tar.gz) = 26198619 +SHA256 (asterisk-1.8.2.tar.gz) = 864a66bd2c6bed2799d5e42f3b71ad4ce13715aa615bf1a50fb7fb6233f4d42e +SIZE (asterisk-1.8.2.tar.gz) = 26237515 diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile index 9d703bcc2ea5..20cf399c3504 100644 --- a/net/asterisk/files/patch-Makefile +++ b/net/asterisk/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2010-12-28 10:32:35.000000000 +0100 -+++ Makefile 2010-12-28 10:33:10.000000000 +0100 +--- Makefile.orig 2010-12-08 03:51:05.000000000 +0500 ++++ Makefile 2011-01-15 04:05:06.000000000 +0500 @@ -122,7 +122,7 @@ OVERWRITE=y @@ -23,16 +23,16 @@ ifeq ($(PROC),ppc) _ASTCFLAGS+=-fsigned-char -@@ -232,7 +234,7 @@ - - ifeq ($(OSARCH),FreeBSD) +@@ -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 -@@ -460,13 +462,17 @@ +@@ -463,13 +465,17 @@ done $(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http; if [ -d doc/tex/asterisk ] ; then \ @@ -53,7 +53,7 @@ done $(MAKE) -C sounds install -@@ -526,6 +532,7 @@ +@@ -529,6 +535,7 @@ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor" @@ -61,7 +61,7 @@ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail" -@@ -547,6 +554,7 @@ +@@ -550,6 +557,7 @@ $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http" $(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8" $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)" @@ -69,7 +69,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -@@ -606,7 +614,7 @@ +@@ -609,7 +617,7 @@ @exit 1 endif @@ -78,7 +78,7 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi -@@ -648,29 +656,18 @@ +@@ -651,29 +659,18 @@ else \ echo "Installing $$x" ; \ fi ; \ @@ -101,9 +101,9 @@ - echo "Skipping config file $$x"; \ - continue; \ - fi ;\ -+ $(INSTALL) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ + if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(INSTALL) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ fi ; \ - echo "Installing file $$x"; \ - $(INSTALL) -m 644 $$x $${dst} ;\ |