1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

- Update to 10.5.0

- Update conflicts [1]

Reported by:	FreeBSD Ports conflicts checker [1]
This commit is contained in:
Florian Smeets 2012-06-04 22:03:33 +00:00
parent 543df633d3
commit 401a67d0e5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=298400
4 changed files with 4 additions and 23 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= asterisk
PORTVERSION= 10.4.2
PORTREVISION= 1
PORTVERSION= 10.5.0
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@ -43,7 +42,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*-1.8*
OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \
IODBC "Enable iODBC support" off \

View File

@ -1,2 +1,2 @@
SHA256 (asterisk-10.4.2.tar.gz) = 4180782babcda8fb7d326fb55340ba6a538155a3687a3831c73bf64550186a44
SIZE (asterisk-10.4.2.tar.gz) = 25009922
SHA256 (asterisk-10.5.0.tar.gz) = 0ac487ed88f798e4ed964ea4c46063572589864cdf7c839b6a040ff60d958178
SIZE (asterisk-10.5.0.tar.gz) = 24980521

View File

@ -9,18 +9,6 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -226,9 +226,11 @@
ifneq ($(AST_MARCH_NATIVE),)
_ASTCFLAGS+=$(AST_MARCH_NATIVE)
else
+ ifneq ($(OSARCH),FreeBSD)
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
endif
@@ -243,7 +245,7 @@
endif
endif

View File

@ -36,8 +36,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
@ -134,8 +132,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
@ -208,7 +204,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
@ -260,7 +255,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