From owner-svn-ports-all@FreeBSD.ORG Thu Aug 2 21:02:57 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 735E61065674; Thu, 2 Aug 2012 21:02:57 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E8C88FC12; Thu, 2 Aug 2012 21:02:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q72L2vBD025167; Thu, 2 Aug 2012 21:02:57 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q72L2vkm025162; Thu, 2 Aug 2012 21:02:57 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201208022102.q72L2vkm025162@svn.freebsd.org> From: Florian Smeets Date: Thu, 2 Aug 2012 21:02:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301871 - in head/net/asterisk10: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Aug 2012 21:02:57 -0000 Author: flo Date: Thu Aug 2 21:02:56 2012 New Revision: 301871 URL: http://svn.freebsd.org/changeset/ports/301871 Log: Update to 10.7.0 Modified: head/net/asterisk10/Makefile head/net/asterisk10/distinfo head/net/asterisk10/files/patch-Makefile (contents, props changed) Modified: head/net/asterisk10/Makefile ============================================================================== --- head/net/asterisk10/Makefile Thu Aug 2 20:59:47 2012 (r301870) +++ head/net/asterisk10/Makefile Thu Aug 2 21:02:56 2012 (r301871) @@ -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/ Modified: head/net/asterisk10/distinfo ============================================================================== --- head/net/asterisk10/distinfo Thu Aug 2 20:59:47 2012 (r301870) +++ head/net/asterisk10/distinfo Thu Aug 2 21:02:56 2012 (r301871) @@ -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 Modified: head/net/asterisk10/files/patch-Makefile ============================================================================== --- head/net/asterisk10/files/patch-Makefile Thu Aug 2 20:59:47 2012 (r301870) +++ head/net/asterisk10/files/patch-Makefile Thu Aug 2 21:02:56 2012 (r301871) @@ -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)" ; \