From cb40ff609dcd9481cb826073655387016fa8ef49 Mon Sep 17 00:00:00 2001 From: flo Date: Mon, 4 Jun 2012 22:04:32 +0000 Subject: - Update to 1.8.13.0 - Update conflicts [1] Reported by: FreeBSD Ports conflicts checker [1] --- net/asterisk/Makefile | 5 ++--- net/asterisk/distinfo | 4 ++-- net/asterisk/files/patch-Makefile | 14 -------------- net/asterisk/pkg-plist | 6 ------ 4 files changed, 4 insertions(+), 25 deletions(-) (limited to 'net/asterisk') diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 0181b380cbb5..8ad793e43e4d 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -6,8 +6,7 @@ # PORTNAME= asterisk -PORTVERSION= 1.8.12.2 -PORTREVISION= 1 +PORTVERSION= 1.8.13.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -45,7 +44,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ ASTCFLAGS="${CFLAGS}" MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk*-1.2* asterisk*-1.4* asterisk*-1.6* +CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-10* OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ IODBC "Enable iODBC support" off \ diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo index 76d83ae6efb2..acb37ba90772 100644 --- a/net/asterisk/distinfo +++ b/net/asterisk/distinfo @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.12.2.tar.gz) = 742fb21fdec2daebd2d264aa30926fbde1afd2e45d9e2cb027ad1852da8e93b4 -SIZE (asterisk-1.8.12.2.tar.gz) = 25089098 +SHA256 (asterisk-1.8.13.0.tar.gz) = 578c46cef13ccc17e201e4cce50b21bf9e2fbd9516c69e7529ac0b43b1c041e1 +SIZE (asterisk-1.8.13.0.tar.gz) = 25059587 diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile index 28dffeeee306..68340e451100 100644 --- a/net/asterisk/files/patch-Makefile +++ b/net/asterisk/files/patch-Makefile @@ -9,20 +9,6 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -220,11 +220,13 @@ - _ASTCFLAGS+=-isystem /usr/local/include - endif - -+ifneq ($(OSARCH),FreeBSD) - ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) - ifneq ($(PROC),ultrasparc) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - endif -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char @@ -235,7 +237,7 @@ _ASTCFLAGS+=-march=i686 endif diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist index 0b919179a7f7..cdf0fb16e71e 100644 --- a/net/asterisk/pkg-plist +++ b/net/asterisk/pkg-plist @@ -34,8 +34,6 @@ etc/asterisk/queuerules.conf-dist etc/asterisk/res_ldap.conf-dist @unexec if cmp -s %D/etc/asterisk/unistim.conf %D/etc/asterisk/unistim.conf-dist; then rm -f %D/etc/asterisk/unistim.conf; fi etc/asterisk/unistim.conf-dist -@unexec if cmp -s %D/etc/asterisk/usbradio.conf %D/etc/asterisk/usbradio.conf-dist; then rm -f %D/etc/asterisk/usbradio.conf; fi -etc/asterisk/usbradio.conf-dist @unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi etc/asterisk/adsi.conf-dist @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi @@ -132,8 +130,6 @@ etc/asterisk/res_pgsql.conf-dist etc/asterisk/res_pktccops.conf-dist @unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi etc/asterisk/res_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist @unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi etc/asterisk/rtp.conf-dist @unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi @@ -205,7 +201,6 @@ etc/asterisk/res_fax.conf-dist @exec if test ! -e %D/etc/asterisk/queuerules.conf; then cp -p %D/etc/asterisk/queuerules.conf-dist %D/etc/asterisk/queuerules.conf; fi @exec if test ! -e %D/etc/asterisk/res_ldap.conf; then cp -p %D/etc/asterisk/res_ldap.conf-dist %D/etc/asterisk/res_ldap.conf; fi @exec if test ! -e %D/etc/asterisk/unistim.conf; then cp -p %D/etc/asterisk/unistim.conf-dist %D/etc/asterisk/unistim.conf; fi -@exec if test ! -e %D/etc/asterisk/usbradio.conf; then cp -p %D/etc/asterisk/usbradio.conf-dist %D/etc/asterisk/usbradio.conf; fi @exec if test ! -e %D/etc/asterisk/adsi.conf; then cp -p %D/etc/asterisk/adsi.conf-dist %D/etc/asterisk/adsi.conf; fi @exec if test ! -e %D/etc/asterisk/agents.conf; then cp -p %D/etc/asterisk/agents.conf-dist %D/etc/asterisk/agents.conf; fi @exec if test ! -e %D/etc/asterisk/alarmreceiver.conf; then cp -p %D/etc/asterisk/alarmreceiver.conf-dist %D/etc/asterisk/alarmreceiver.conf; fi @@ -257,7 +252,6 @@ etc/asterisk/res_fax.conf-dist @exec if test ! -e %D/etc/asterisk/res_pktccops.conf; then cp -p %D/etc/asterisk/res_pktccops.conf-dist %D/etc/asterisk/res_pktccops.conf; fi @exec if test ! -e %D/etc/asterisk/res_pgsql.conf; then cp -p %D/etc/asterisk/res_pgsql.conf-dist %D/etc/asterisk/res_pgsql.conf; fi @exec if test ! -e %D/etc/asterisk/res_odbc.conf; then cp -p %D/etc/asterisk/res_odbc.conf-dist %D/etc/asterisk/res_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/rpt.conf; then cp -p %D/etc/asterisk/rpt.conf-dist %D/etc/asterisk/rpt.conf; fi @exec if test ! -e %D/etc/asterisk/rtp.conf; then cp -p %D/etc/asterisk/rtp.conf-dist %D/etc/asterisk/rtp.conf; fi @exec if test ! -e %D/etc/asterisk/sip.conf; then cp -p %D/etc/asterisk/sip.conf-dist %D/etc/asterisk/sip.conf; fi @exec if test ! -e %D/etc/asterisk/sip_notify.conf; then cp -p %D/etc/asterisk/sip_notify.conf-dist %D/etc/asterisk/sip_notify.conf; fi -- cgit