diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index 13b39a82a829..a6955ac7da12 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -6,7 +6,7 @@ # PORTNAME= asterisk -PORTVERSION= 10.6.1 +PORTVERSION= 10.7.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/asterisk10/distinfo b/net/asterisk10/distinfo index 55fc3fd4b31c..41dec610eac8 100644 --- a/net/asterisk10/distinfo +++ b/net/asterisk10/distinfo @@ -1,2 +1,2 @@ -SHA256 (asterisk-10.6.1.tar.gz) = 17529dd3d47920c0dbd1fa611a7247c7394430050210027aa3041ab8b56ab2d4 -SIZE (asterisk-10.6.1.tar.gz) = 24989457 +SHA256 (asterisk-10.7.0.tar.gz) = fd97a1683de05df0a902ccbb8f2649ca2468cb5e2eb1e4023412b864eedcc76e +SIZE (asterisk-10.7.0.tar.gz) = 25006763 diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile index b815f9b7eaa0..e0f27c8cccea 100644 --- a/net/asterisk10/files/patch-Makefile +++ b/net/asterisk10/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-09-19 22:29:40.000000000 +0200 -+++ Makefile 2011-10-07 11:17:16.000000000 +0200 -@@ -122,7 +122,7 @@ +--- Makefile.orig 2012-06-13 16:30:34.000000000 +0200 ++++ Makefile 2012-08-02 00:12:13.812569306 +0200 +@@ -123,7 +123,7 @@ OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,16 +9,16 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -243,7 +245,7 @@ - endif - endif +@@ -192,7 +192,7 @@ + + 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) + BSDVERSION=$(OSVERSION) _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -476,8 +478,12 @@ +@@ -425,8 +425,12 @@ $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -32,15 +32,16 @@ done $(MAKE) -C sounds install -@@ -537,6 +543,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" -@@ -618,7 +625,7 @@ +@@ -485,7 +489,7 @@ + "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ + "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ + "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \ +- "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" ++ "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" "$(ASTSPOOLDIR)/outgoing" + + installdirs: + @for i in $(INSTALLDIRS); do \ +@@ -552,7 +556,7 @@ @exit 1 endif @@ -49,7 +50,7 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -660,29 +667,18 @@ +@@ -594,29 +598,18 @@ else \ echo "Installing $$x" ; \ fi ; \ @@ -84,7 +85,7 @@ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ -@@ -696,6 +692,7 @@ +@@ -630,6 +623,7 @@ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \