- Remove net/asterisk16, net/asterisk16-addons, japanese/asterisk16-sounds

- Update net/appkonference to 2.1 to make it work with net/asterisk [1]
- Switch www/bigbluebutton to net/asterisk
- While here fix typo in www/xxxterm's MOVED entry

PR:		ports/169038 [1]
Approved by:	maintainer [1]
This commit is contained in:
Florian Smeets 2012-08-21 23:29:37 +00:00
parent 0c7b2eeb40
commit db14b9f38a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=302910
39 changed files with 58 additions and 10347 deletions

4
MOVED
View file

@ -3645,6 +3645,8 @@ www/django-mezzanine-filebrowser|www/py-django-mezzanine-filebrowser|2012-08-19|
www/django-mezzanine-grappelli|www/py-django-mezzanine-grappelli|2012-08-19|Rename to consistency with other Python ports www/django-mezzanine-grappelli|www/py-django-mezzanine-grappelli|2012-08-19|Rename to consistency with other Python ports
misc/gpt31||2012-08-20|Has expired: was a dependency for net/globus4, which was removed 2008-12-07, unmaintained upstream since 2004 misc/gpt31||2012-08-20|Has expired: was a dependency for net/globus4, which was removed 2008-12-07, unmaintained upstream since 2004
misc/gpt||2012-08-20|Has expired: was a dependency for net/globus4, which was removed 2008-12-07, unmaintained upstream since 2004 misc/gpt||2012-08-20|Has expired: was a dependency for net/globus4, which was removed 2008-12-07, unmaintained upstream since 2004
www/xxxterm/|www/xombrero|2012-08-20|Project renamed www/xxxterm|www/xombrero|2012-08-20|Project renamed
www/cakephp2|www/cakephp21|2012-08-21|Moved to match port version www/cakephp2|www/cakephp21|2012-08-21|Moved to match port version
databases/libudbc||2012-08-21|Has expired: Does not fetch and no vendor support anymore databases/libudbc||2012-08-21|Has expired: Does not fetch and no vendor support anymore
net/asterisk16||2012-08-22|Unsupported upstream, please use net/asterisk instead.
net/asterisk16-addons||2012-08-22|Unsupported upstream, now part of net/asterisk.

View file

@ -5,6 +5,29 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades. you update your ports collection, before attempting any port upgrades.
20101128:
AFFECTS: users of net/asterisk16, net/asterisk16-addons
AUTHOR: Florian Smeets <flo@FreeBSD.org>
asterisk16 has been unsupported upstream for a while now and has known
security vulnerabilities therefor it was removed from the ports tree.
People still running net/asterisk16 should upgrade to net/asterisk.
First delete the asterisk addons, as they are part of asterisk now.
# pkg_delete -f asterisk16-addons\*
after that you can run one of the following
# portmaster -o net/asterisk net/asterisk16
or
# portupgrade -o net/asterisk net/asterisk16
After that you need to update your configuration. Take a look at the following
URL for the changes between 1.6 and 1.8
http://svnview.digium.com/svn/asterisk/branches/1.8/UPGRADE.txt
20120820: 20120820:
AFFECTS: users of ports-mgmt/portupgrade-devel AFFECTS: users of ports-mgmt/portupgrade-devel
AUTHOR: bdrewery@FreeBSD.org AUTHOR: bdrewery@FreeBSD.org

View file

@ -22,7 +22,6 @@
SUBDIR += another-htmllint SUBDIR += another-htmllint
SUBDIR += anthy SUBDIR += anthy
SUBDIR += asterisk-sounds SUBDIR += asterisk-sounds
SUBDIR += asterisk16-sounds
SUBDIR += aterm SUBDIR += aterm
SUBDIR += awffull SUBDIR += awffull
SUBDIR += bible_names-fpw SUBDIR += bible_names-fpw

View file

@ -1,45 +0,0 @@
# New ports collection makefile for: ja-asterisk16-sounds
# Date created: 2010-06-12
# Whom: TAKAHASHI Kaoru <kaoru@kaisei.org>
#
# $FreeBSD$
#
PORTNAME= asterisk16
PORTVERSION= 1.6
PORTREVISION= 1
CATEGORIES= japanese net
MASTER_SITES= http://ftp.voip-info.jp/asterisk/sounds/${PORTVERSION:S|.|_|}/ \
ftp://ftp.voip-info.jp/asterisk/sounds/${PORTVERSION:S|.|_|}/
PKGNAMESUFFIX= -sounds
DISTNAME= asterisk-sound-jp_${PORTVERSION:S|.||}_pre
MAINTAINER= kaoru@kaisei.org
COMMENT= Japanese sound files for Asterisk 1.6
RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16
NO_BUILD= yes
ASTERISKDIR= ${PREFIX}/share/asterisk/sounds
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
SUB_FILES= pkg-message
SUB_LIST= PORTSDIR=${PORTSDIR}
do-install:
@-${MKDIR} ${ASTERISKDIR}/ja
for gsm in ${WRKDIR}/ja/*.gsm; do \
${INSTALL_DATA} "$$gsm" ${ASTERISKDIR}/ja ; \
done
@${MKDIR} ${ASTERISKDIR}/ja/digits
for digitgsm in ${WRKDIR}/ja/digits/*.gsm; do \
${INSTALL_DATA} "$$digitgsm" ${ASTERISKDIR}/ja/digits ; \
done
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/ja
@cd ${WRKDIR}/ja && ${INSTALL_DATA} README.txt ${DOCSDIR}/ja
.endif
post-install:
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

View file

@ -1,2 +0,0 @@
SHA256 (asterisk-sound-jp_16_pre.tar.gz) = 576d2f47beded83449b69dbb32c4c0467451547bf4d126346000bc3bf5eb4071
SIZE (asterisk-sound-jp_16_pre.tar.gz) = 945968

View file

@ -1,21 +0,0 @@
=============================================================================
[FYI]
To get natural word order in Japanese sentences
you can patch to %%PORTSDIR%%/net/asterisk16 and reinstall it as below.
For example,
1. Download app_voicemail.c.yymmdd-01.patch and say.c.yymmdd-01.patch from
ftp://ftp.voip-info.jp/asterisk/patch/1.6.0.X/
where 1.6.0.X is corresponding to PORTVERSION in
%%PORTSDIR%%/net/asterisk16/Makefile.
2. Put them to %%PORTSDIR%%/net/asterisk16/files as
patch-apps::app_voicemail.c and patch-main::say.c, respectively.
3. Reinstall %%PORTSDIR%%/net/asterisk16.
4. Add the following options section to
%%LOCALBASE%%/etc/asterisk/asterisk.conf.
[options]
languageprefix=yes
=============================================================================

View file

@ -1,7 +0,0 @@
This is a port of Japanese sound files for Asterisk 1.6.
Under the restriction of using Asterisk(tm) The Open Source PBX only,
you can use them royalty-free.
For more information about the license, you have to refer to
README.txt written in Japanese.
WWW: http://voip-info.jp/

View file

@ -1,248 +0,0 @@
@comment $FreeBSD$
share/asterisk/sounds/ja/1-for-am-2-for-pm.gsm
share/asterisk/sounds/ja/agent-alreadyon.gsm
share/asterisk/sounds/ja/agent-incorrect.gsm
share/asterisk/sounds/ja/agent-loggedoff.gsm
share/asterisk/sounds/ja/agent-loginok.gsm
share/asterisk/sounds/ja/agent-newlocation.gsm
share/asterisk/sounds/ja/agent-pass.gsm
share/asterisk/sounds/ja/agent-user.gsm
share/asterisk/sounds/ja/auth-incorrect.gsm
share/asterisk/sounds/ja/auth-thankyou.gsm
share/asterisk/sounds/ja/conf-adminmenu.gsm
share/asterisk/sounds/ja/conf-enteringno.gsm
share/asterisk/sounds/ja/conf-errormenu.gsm
share/asterisk/sounds/ja/conf-getchannel.gsm
share/asterisk/sounds/ja/conf-getconfno.gsm
share/asterisk/sounds/ja/conf-getpin.gsm
share/asterisk/sounds/ja/conf-invalid.gsm
share/asterisk/sounds/ja/conf-invalidpin.gsm
share/asterisk/sounds/ja/conf-kicked.gsm
share/asterisk/sounds/ja/conf-locked.gsm
share/asterisk/sounds/ja/conf-lockednow.gsm
share/asterisk/sounds/ja/conf-muted.gsm
share/asterisk/sounds/ja/conf-noempty.gsm
share/asterisk/sounds/ja/conf-onlyone.gsm
share/asterisk/sounds/ja/conf-onlyperson.gsm
share/asterisk/sounds/ja/conf-otherinparty.gsm
share/asterisk/sounds/ja/conf-thereare.gsm
share/asterisk/sounds/ja/conf-unlockednow.gsm
share/asterisk/sounds/ja/conf-unmuted.gsm
share/asterisk/sounds/ja/conf-usermenu.gsm
share/asterisk/sounds/ja/demo-echotest.gsm
share/asterisk/sounds/ja/digits/0.gsm
share/asterisk/sounds/ja/digits/1.gsm
share/asterisk/sounds/ja/digits/10.gsm
share/asterisk/sounds/ja/digits/11.gsm
share/asterisk/sounds/ja/digits/12.gsm
share/asterisk/sounds/ja/digits/13.gsm
share/asterisk/sounds/ja/digits/14.gsm
share/asterisk/sounds/ja/digits/15.gsm
share/asterisk/sounds/ja/digits/16.gsm
share/asterisk/sounds/ja/digits/17.gsm
share/asterisk/sounds/ja/digits/18.gsm
share/asterisk/sounds/ja/digits/19.gsm
share/asterisk/sounds/ja/digits/2.gsm
share/asterisk/sounds/ja/digits/20.gsm
share/asterisk/sounds/ja/digits/3.gsm
share/asterisk/sounds/ja/digits/30.gsm
share/asterisk/sounds/ja/digits/4.gsm
share/asterisk/sounds/ja/digits/40.gsm
share/asterisk/sounds/ja/digits/5.gsm
share/asterisk/sounds/ja/digits/50.gsm
share/asterisk/sounds/ja/digits/6.gsm
share/asterisk/sounds/ja/digits/60.gsm
share/asterisk/sounds/ja/digits/7.gsm
share/asterisk/sounds/ja/digits/70.gsm
share/asterisk/sounds/ja/digits/8.gsm
share/asterisk/sounds/ja/digits/80.gsm
share/asterisk/sounds/ja/digits/9.gsm
share/asterisk/sounds/ja/digits/90.gsm
share/asterisk/sounds/ja/digits/a-m.gsm
share/asterisk/sounds/ja/digits/at.gsm
share/asterisk/sounds/ja/digits/byou.gsm
share/asterisk/sounds/ja/digits/day-0.gsm
share/asterisk/sounds/ja/digits/day-1.gsm
share/asterisk/sounds/ja/digits/day-2.gsm
share/asterisk/sounds/ja/digits/day-3.gsm
share/asterisk/sounds/ja/digits/day-4.gsm
share/asterisk/sounds/ja/digits/day-5.gsm
share/asterisk/sounds/ja/digits/day-6.gsm
share/asterisk/sounds/ja/digits/dollars.gsm
share/asterisk/sounds/ja/digits/fun.gsm
share/asterisk/sounds/ja/digits/gatsu.gsm
share/asterisk/sounds/ja/digits/h-1.gsm
share/asterisk/sounds/ja/digits/h-10.gsm
share/asterisk/sounds/ja/digits/h-11.gsm
share/asterisk/sounds/ja/digits/h-12.gsm
share/asterisk/sounds/ja/digits/h-13.gsm
share/asterisk/sounds/ja/digits/h-14.gsm
share/asterisk/sounds/ja/digits/h-15.gsm
share/asterisk/sounds/ja/digits/h-16.gsm
share/asterisk/sounds/ja/digits/h-17.gsm
share/asterisk/sounds/ja/digits/h-18.gsm
share/asterisk/sounds/ja/digits/h-19.gsm
share/asterisk/sounds/ja/digits/h-2.gsm
share/asterisk/sounds/ja/digits/h-20.gsm
share/asterisk/sounds/ja/digits/h-3.gsm
share/asterisk/sounds/ja/digits/h-30.gsm
share/asterisk/sounds/ja/digits/h-4.gsm
share/asterisk/sounds/ja/digits/h-5.gsm
share/asterisk/sounds/ja/digits/h-6.gsm
share/asterisk/sounds/ja/digits/h-7.gsm
share/asterisk/sounds/ja/digits/h-8.gsm
share/asterisk/sounds/ja/digits/h-9.gsm
share/asterisk/sounds/ja/digits/hundred.gsm
share/asterisk/sounds/ja/digits/ji.gsm
share/asterisk/sounds/ja/digits/million.gsm
share/asterisk/sounds/ja/digits/mon-0.gsm
share/asterisk/sounds/ja/digits/mon-1.gsm
share/asterisk/sounds/ja/digits/mon-10.gsm
share/asterisk/sounds/ja/digits/mon-11.gsm
share/asterisk/sounds/ja/digits/mon-2.gsm
share/asterisk/sounds/ja/digits/mon-3.gsm
share/asterisk/sounds/ja/digits/mon-4.gsm
share/asterisk/sounds/ja/digits/mon-5.gsm
share/asterisk/sounds/ja/digits/mon-6.gsm
share/asterisk/sounds/ja/digits/mon-7.gsm
share/asterisk/sounds/ja/digits/mon-8.gsm
share/asterisk/sounds/ja/digits/mon-9.gsm
share/asterisk/sounds/ja/digits/nen.gsm
share/asterisk/sounds/ja/digits/nichi.gsm
share/asterisk/sounds/ja/digits/oclock.gsm
share/asterisk/sounds/ja/digits/oh.gsm
share/asterisk/sounds/ja/digits/p-m.gsm
share/asterisk/sounds/ja/digits/thousand.gsm
share/asterisk/sounds/ja/digits/today.gsm
share/asterisk/sounds/ja/digits/tomorrow.gsm
share/asterisk/sounds/ja/digits/yesterday.gsm
share/asterisk/sounds/ja/dir-instr.gsm
share/asterisk/sounds/ja/dir-intro.gsm
share/asterisk/sounds/ja/dir-nomatch.gsm
share/asterisk/sounds/ja/dir-nomore.gsm
share/asterisk/sounds/ja/enter-a-time.gsm
share/asterisk/sounds/ja/hours.gsm
share/asterisk/sounds/ja/invalid.gsm
share/asterisk/sounds/ja/jp-arimasen.gsm
share/asterisk/sounds/ja/jp-arimasu.gsm
share/asterisk/sounds/ja/jp-baai.gsm
share/asterisk/sounds/ja/jp-chigaimasu.gsm
share/asterisk/sounds/ja/jp-dekimasen.gsm
share/asterisk/sounds/ja/jp-dekimasu.gsm
share/asterisk/sounds/ja/jp-desu.gsm
share/asterisk/sounds/ja/jp-ga.gsm
share/asterisk/sounds/ja/jp-gozaimasu.gsm
share/asterisk/sounds/ja/jp-ha.gsm
share/asterisk/sounds/ja/jp-kara.gsm
share/asterisk/sounds/ja/jp-machigai.gsm
share/asterisk/sounds/ja/jp-masu.gsm
share/asterisk/sounds/ja/jp-ni.gsm
share/asterisk/sounds/ja/jp-no.gsm
share/asterisk/sounds/ja/jp-oshitekudasai.gsm
share/asterisk/sounds/ja/jp-saigo.gsm
share/asterisk/sounds/ja/jp-saisho.gsm
share/asterisk/sounds/ja/jp-tadashii.gsm
share/asterisk/sounds/ja/jp-wa.gsm
share/asterisk/sounds/ja/jp-wo.gsm
share/asterisk/sounds/ja/minutes.gsm
share/asterisk/sounds/ja/not-rqsted-wakeup.gsm
share/asterisk/sounds/ja/pbx-invalid.gsm
share/asterisk/sounds/ja/pbx-invalidpark.gsm
share/asterisk/sounds/ja/pbx-transfer.gsm
share/asterisk/sounds/ja/privacy-incorrect.gsm
share/asterisk/sounds/ja/privacy-prompt.gsm
share/asterisk/sounds/ja/privacy-thankyou.gsm
share/asterisk/sounds/ja/privacy-unident.gsm
share/asterisk/sounds/ja/q-default.gsm
share/asterisk/sounds/ja/rqsted-wakeup-for.gsm
share/asterisk/sounds/ja/ss-noservice.gsm
share/asterisk/sounds/ja/transfer.gsm
share/asterisk/sounds/ja/tt-allbusy.gsm
share/asterisk/sounds/ja/tt-monkeysintro.gsm
share/asterisk/sounds/ja/tt-somethingwrong.gsm
share/asterisk/sounds/ja/tt-weasels.gsm
share/asterisk/sounds/ja/vm-Cust1.gsm
share/asterisk/sounds/ja/vm-Cust2.gsm
share/asterisk/sounds/ja/vm-Cust3.gsm
share/asterisk/sounds/ja/vm-Cust4.gsm
share/asterisk/sounds/ja/vm-Cust5.gsm
share/asterisk/sounds/ja/vm-Family.gsm
share/asterisk/sounds/ja/vm-Friends.gsm
share/asterisk/sounds/ja/vm-INBOX.gsm
share/asterisk/sounds/ja/vm-Old.gsm
share/asterisk/sounds/ja/vm-Work.gsm
share/asterisk/sounds/ja/vm-advopts.gsm
share/asterisk/sounds/ja/vm-and.gsm
share/asterisk/sounds/ja/vm-changeto.gsm
share/asterisk/sounds/ja/vm-delete.gsm
share/asterisk/sounds/ja/vm-deleted.gsm
share/asterisk/sounds/ja/vm-enter-num-to-call.gsm
share/asterisk/sounds/ja/vm-extension.gsm
share/asterisk/sounds/ja/vm-first.gsm
share/asterisk/sounds/ja/vm-for.gsm
share/asterisk/sounds/ja/vm-forwardoptions.gsm
share/asterisk/sounds/ja/vm-from-phonenumber.gsm
share/asterisk/sounds/ja/vm-goodbye.gsm
share/asterisk/sounds/ja/vm-helpexit.gsm
share/asterisk/sounds/ja/vm-incorrect-mailbox.gsm
share/asterisk/sounds/ja/vm-incorrect.gsm
share/asterisk/sounds/ja/vm-instructions.gsm
share/asterisk/sounds/ja/vm-intro.gsm
share/asterisk/sounds/ja/vm-isonphone.gsm
share/asterisk/sounds/ja/vm-isunavail.gsm
share/asterisk/sounds/ja/vm-last.gsm
share/asterisk/sounds/ja/vm-leavemsg.gsm
share/asterisk/sounds/ja/vm-login.gsm
share/asterisk/sounds/ja/vm-mailbox-full.gsm
share/asterisk/sounds/ja/vm-message.gsm
share/asterisk/sounds/ja/vm-messages.gsm
share/asterisk/sounds/ja/vm-mismatch.gsm
share/asterisk/sounds/ja/vm-msginstruct.gsm
share/asterisk/sounds/ja/vm-msgsaved.gsm
share/asterisk/sounds/ja/vm-newpassword.gsm
share/asterisk/sounds/ja/vm-next.gsm
share/asterisk/sounds/ja/vm-no.gsm
share/asterisk/sounds/ja/vm-nobodyavail.gsm
share/asterisk/sounds/ja/vm-nomore.gsm
share/asterisk/sounds/ja/vm-onefor.gsm
share/asterisk/sounds/ja/vm-options.gsm
share/asterisk/sounds/ja/vm-opts.gsm
share/asterisk/sounds/ja/vm-passchanged.gsm
share/asterisk/sounds/ja/vm-password-eririn.gsm
share/asterisk/sounds/ja/vm-password.gsm
share/asterisk/sounds/ja/vm-press.gsm
share/asterisk/sounds/ja/vm-prev.gsm
share/asterisk/sounds/ja/vm-reachoper.gsm
share/asterisk/sounds/ja/vm-rec-busy.gsm
share/asterisk/sounds/ja/vm-rec-name.gsm
share/asterisk/sounds/ja/vm-rec-unv.gsm
share/asterisk/sounds/ja/vm-received.gsm
share/asterisk/sounds/ja/vm-reenterpassword.gsm
share/asterisk/sounds/ja/vm-repeat.gsm
share/asterisk/sounds/ja/vm-saved.gsm
share/asterisk/sounds/ja/vm-savedto.gsm
share/asterisk/sounds/ja/vm-savefolder.gsm
share/asterisk/sounds/ja/vm-savemessage.gsm
share/asterisk/sounds/ja/vm-sorry.gsm
share/asterisk/sounds/ja/vm-starmain.gsm
share/asterisk/sounds/ja/vm-theperson.gsm
share/asterisk/sounds/ja/vm-tocancel.gsm
share/asterisk/sounds/ja/vm-toforward.gsm
share/asterisk/sounds/ja/vm-tohearenv.gsm
share/asterisk/sounds/ja/vm-toreply.gsm
share/asterisk/sounds/ja/vm-undelete.gsm
share/asterisk/sounds/ja/vm-undeleted.gsm
share/asterisk/sounds/ja/vm-whichbox.gsm
share/asterisk/sounds/ja/vm-youhave.gsm
share/asterisk/sounds/ja/wakeup-call-cancelled.gsm
share/asterisk/sounds/ja/wakeup-call.gsm
share/asterisk/sounds/ja/wakeup-menu.gsm
share/asterisk/sounds/ja/wakeup-menu2.gsm
share/asterisk/sounds/ja/wakeup.gsm
@dirrm share/asterisk/sounds/ja/digits
@dirrm share/asterisk/sounds/ja
@dirrmtry share/asterisk/sounds
@dirrmtry share/asterisk
%%PORTDOCS%%%%DOCSDIR%%/ja/README.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
%%PORTDOCS%%@dirrm %%DOCSDIR%%

View file

@ -32,8 +32,6 @@
SUBDIR += asterisk10 SUBDIR += asterisk10
SUBDIR += asterisk14 SUBDIR += asterisk14
SUBDIR += asterisk14-addons SUBDIR += asterisk14-addons
SUBDIR += asterisk16
SUBDIR += asterisk16-addons
SUBDIR += atmsupport SUBDIR += atmsupport
SUBDIR += avahi SUBDIR += avahi
SUBDIR += avahi-app SUBDIR += avahi-app

View file

@ -6,19 +6,17 @@
# #
PORTNAME= appkonference PORTNAME= appkonference
PORTVERSION= 1.5 PORTVERSION= 2.1
PORTREVISION= 2
CATEGORIES= net CATEGORIES= net
MASTER_SITES= SF MASTER_SITES= SF
MAINTAINER= alex.deiter@gmail.com MAINTAINER= alex.deiter@gmail.com
COMMENT= High-performance Asterisk voice/video conferencing plugin COMMENT= High-performance Asterisk voice/video conferencing plugin
BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16 BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16 RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
USE_GMAKE= yes USE_GMAKE= yes
MAKE_ENV= LOCALBASE=${LOCALBASE}
WRKSRC= ${WRKDIR}/${PORTNAME}/konference WRKSRC= ${WRKDIR}/${PORTNAME}/konference
PLIST_FILES= lib/asterisk/modules/app_konference.so PLIST_FILES= lib/asterisk/modules/app_konference.so

View file

@ -1,2 +1,2 @@
SHA256 (appkonference-1.5.tar.gz) = 6470cc38b07a14b27993bc1e6a5c636943ae36e7e2385a3e136b3bc55a87af27 SHA256 (appkonference-2.1.tar.gz) = 0e1bc8d01cab61e9cb84e6aa0ab12d14c86fade453b7508b07331edc1142653c
SIZE (appkonference-1.5.tar.gz) = 186882 SIZE (appkonference-2.1.tar.gz) = 191953

View file

@ -1,23 +1,29 @@
--- Makefile.orig 2010-10-23 00:28:54.000000000 +0000 --- ./Makefile.orig 2012-06-13 14:10:52.160359057 +0200
+++ Makefile 2010-10-23 00:31:39.000000000 +0000 +++ ./Makefile 2012-06-13 14:13:01.635359504 +0200
@@ -18,9 +18,9 @@ @@ -16,11 +16,11 @@
# ASTERISK_SRC_DIR =
INSTALL_PREFIX := # asterisk release or subversion working copy
-INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/usr/lib/asterisk/modules -ASTERISK_SRC_VERSION = $(shell if [ -e $(ASTERISK_SRC_DIR)/.version ] ; then echo release; elif [ -e $(ASTERISK_SRC_DIR)/.svn ] ; then echo subversion; else echo unknown; fi)
+INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/${LOCALBASE}/lib/asterisk/modules +ASTERISK_SRC_VERSION = release
-ASTERISK_INCLUDE_DIR ?= ../asterisk/include # asterisk release version or subversion branch
+ASTERISK_INCLUDE_DIR ?= ${LOCALBASE}/include ifeq ($(ASTERISK_SRC_VERSION),release)
- ASTERISK = $(shell cat $(ASTERISK_SRC_DIR)/.version | cut -d "." -f1,2 | sed -e 's/\.//')
+ ASTERISK = 18
else
ifeq ($(ASTERISK_SRC_VERSION),subversion)
ASTERISK = $(shell svn info $(ASTERISK_SRC_DIR) | grep URL | sed -e 's:^.*/::' | cut -d "." -f 1,2 | sed -e 's/\.//')
@@ -31,10 +31,10 @@
endif
RELEASE = 1.5 # asterisk include directory
-ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include
+ASTERISK_INCLUDE_DIR = ${LOCALBASE}/include
@@ -157,7 +157,7 @@ # asterisk module directory
$(RM) $(TARGET) -INSTALL_MODULES_DIR = /usr/lib/asterisk/modules
+INSTALL_MODULES_DIR = ${LOCALBASE}/lib/asterisk/modules
$(TARGET): $(OBJS) # module release
- $(CC) -pg $(SOLINK) -o $@ $(OBJS) RELEASE = 2.1
+ $(CC) $(SOLINK) -o $@ $(OBJS)
vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o
$(CC) $(PROFILE) -o $@ $^ -lm

View file

@ -1,58 +0,0 @@
# New ports collection makefile for: asterisk-addons
# Date created: 23 March 2006
# Whom: Fabian Gast <fgast@only640k.org>
#
# $FreeBSD$
#
PORTNAME= asterisk16
PORTVERSION= 1.6.2.4
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
PKGNAMESUFFIX= -addons
DISTNAME= asterisk${PKGNAMESUFFIX}-${DISTVERSION}
MAINTAINER= flo@FreeBSD.org
COMMENT= GPL modules for the Asterisk Open Source PBX
BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16
RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16
OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off
ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64
USE_AUTOTOOLS= libtool
USE_MYSQL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
OSVERSION=${OSVERSION} \
NOISY_BUILD=YES \
DOCSDIR=${DOCSDIR} \
ASTCFLAGS="${CFLAGS}"
CONFLICTS= asterisk*-1.2* asterisk*-1.4*
.include <bsd.port.pre.mk>
.if defined(WITH_SAMPLE_CONFIG)
PLIST_SUB+= SAMPLE_CONFIG=""
.else
PLIST_SUB+= SAMPLE_CONFIG="@comment "
.endif
#pre-configure:
# if ${GREP} -sq fixup_codecs ${LOCALBASE}/include/asterisk/channel.h; \
# then \
# ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/codecnego.diff; \
# fi
post-install:
.if defined(WITH_SAMPLE_CONFIG)
@cd ${WRKSRC} && ${GMAKE} samples
.endif
.include <bsd.port.post.mk>

View file

@ -1,2 +0,0 @@
SHA256 (asterisk-addons-1.6.2.4.tar.gz) = 0898696af8097b6cbd46d4b3d63b7838138f947c9bf08d34e4ef4411bf2211a6
SIZE (asterisk-addons-1.6.2.4.tar.gz) = 886891

View file

@ -1,37 +0,0 @@
--- Makefile.orig 2009-12-19 14:51:24.000000000 +0100
+++ Makefile 2010-09-21 16:03:27.000000000 +0200
@@ -26,7 +26,9 @@
ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
# Overwite config files on "make samples"
-OVERWRITE:=y
+OVERWRITE:=n
+
+ASTCFLAGS+=-I${LOCALBASE}/include
# If the file .asteriskaddons.makeopts is present in your home directory, you can
# include all of your favorite menuselect options so that every time you download
@@ -218,19 +220,19 @@
samples:
mkdir -p $(DESTDIR)$(ASTETCDIR)
for x in configs/*.sample; do \
- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
+ if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x` ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
+ if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x` $$x ; then \
echo "Config file $$x is unchanged"; \
continue; \
fi ; \
- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
+ mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x` $(DESTDIR)$(ASTETCDIR)/`basename $$x`.old ; \
else \
echo "Skipping config file $$x"; \
continue; \
fi ;\
fi ; \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ;\
done
doc/addons-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc))

View file

@ -1,12 +0,0 @@
--- Makefile.rules.orig 2009-02-17 13:27:59.000000000 +0000
+++ Makefile.rules 2009-02-17 13:28:21.000000000 +0000
@@ -38,7 +38,9 @@
# ppro's, etc, as well as the AMD K6 and K7.
#K6OPT=-DK6OPT
+ifneq ($(OSARCH),FreeBSD)
OPTIMIZE?=-O6
+endif
ASTCFLAGS+=$(OPTIMIZE)
endif

View file

@ -1,5 +0,0 @@
This package contains additional modules for the Asterisk Open Source PBX
which are, not included in the normal base distribution, becouse of licence
incompatilities.
WWW: http://www.asteriskpbx.com

View file

@ -1,12 +0,0 @@
lib/asterisk/modules/app_addon_sql_mysql.so
lib/asterisk/modules/app_saycountpl.so
lib/asterisk/modules/cdr_addon_mysql.so
lib/asterisk/modules/res_config_mysql.so
lib/asterisk/modules/format_mp3.so
lib/asterisk/modules/chan_ooh323.so
share/asterisk/documentation/addons-en_US.xml
%%SAMPLE_CONFIG%%etc/asterisk/cdr_mysql.conf.sample
%%SAMPLE_CONFIG%%etc/asterisk/mobile.conf.sample
%%SAMPLE_CONFIG%%etc/asterisk/mysql.conf.sample
%%SAMPLE_CONFIG%%etc/asterisk/ooh323.conf.sample
%%SAMPLE_CONFIG%%etc/asterisk/res_mysql.conf.sample

View file

@ -1,264 +0,0 @@
# New ports collection makefile for: asterisk
# Date created: 17 October 2003
# Whom: Maxim Sobolev <sobomax@portaone.com>
#
# $FreeBSD$
#
PORTNAME= asterisk
PORTVERSION= 1.6.2.24
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
PKGNAMESUFFIX= 16
MAINTAINER= flo@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.52:${PORTSDIR}/devel/newt \
execinfo:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
DEPRECATED= asterisk 1.6.2.* will be EOLed on 2012-04-21
EXPIRATION_DATE= 2012-05-31
ONLY_FOR_ARCHS= i386 amd64 sparc64
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
USE_GMAKE= yes
USE_GNOME= libxml2
USE_BISON= build
USE_RC_SUBR= asterisk
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
MKDIR="${MKDIR}" \
PWLIBDIR=${LOCALBASE}/share/pwlib \
OPENH323DIR=${LOCALBASE}/share/openh323 \
OSVERSION=${OSVERSION} \
NOISY_BUILD=YES \
DOCSDIR=${DOCSDIR} \
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.8*
OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \
IODBC "Enable iODBC support" off \
UODBC "Enable unixODBC support" on \
POSTGRES "Enable PostgreSQL support" on \
RADIUS "Enable RADIUS accounting support" on \
SNMP "Enable SNMP support" on \
H323 "Enable H.323 support" on \
FREETDS "Enable FreeTDS support" on \
JABBER "Enable Jabber and Gtalk support" on \
SQLITE "Enable SQLITE support" on \
GSM "Enable GSM codec" on \
CURL "Enable CURL support" on \
ILBC "Enable iLBC codec" off \
SPANDSP "Enable Spandsp faxing support" off
ASTERISK_USER?= asterisk
ASTERISK_GROUP?= asterisk
USERS= ${ASTERISK_USER}
GROUPS= ${ASTERISK_GROUP} dahdi
.include <bsd.port.pre.mk>
.if ${PREFIX} == ${LOCALBASE}
VARDIR=/var
.else
VARDIR=${PREFIX}/var
.endif
.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
OPTIONS+= DAHDI "Enable DAHDI support" on
.if defined(WITH_IODBC) && defined(WITH_UODBC)
IGNORE= please select only one of iodbc or unixODBC
.endif
# Include this since we have altered OPTIONS.
.include <bsd.port.options.mk>
.endif
SUB_LIST+= ASTERISK_USER=${ASTERISK_USER}
PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER}
PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP}
PLIST_SUB+= VARDIR=${VARDIR}
.if !defined(WITH_H323)
PLIST_SUB+= WITH_H323="@comment "
CONFIGURE_ARGS+= --without-h323
.else
PLIST_SUB+= WITH_H323=""
CONFIGURE_ARGS+= --with-h323=${LOCALBASE}
LIB_DEPENDS+= pt_r.1:${PORTSDIR}/devel/pwlib \
h323_r.1:${PORTSDIR}/net/openh323
.endif
.if !defined(WITH_DAHDI)
PLIST_SUB+= WITH_DAHDI="@comment "
CONFIGURE_ARGS+= --without-dahdi
.else
PLIST_SUB+= WITH_DAHDI=""
CONFIGURE_ARGS+= --with-dahdi
BUILD_DEPENDS+= libpri>=1.4.10:${PORTSDIR}/misc/libpri \
${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri
.endif
#
# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV
# similarly
.if !defined(WITH_UODBC)
CONFIGURE_ARGS+= --without-unixodbc
.endif
.if !defined(WITH_IODBC)
CONFIGURE_ARGS+= --without-iodbc
.endif
.if !defined(WITH_UODBC) && !defined(WITH_IODBC)
PLIST_SUB+= WITH_ODBC="@comment "
.endif
.if defined(WITH_UODBC) || defined(WITH_IODBC)
PLIST_SUB+= WITH_ODBC=""
USE_AUTOTOOLS= libltdl
.if defined(WITH_UODBC)
CONFIGURE_ARGS+= --with-unixodbc --with-ltdl
LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC
.elif defined(WITH_IODBC)
CONFIGURE_ARGS+= --with-iodbc --with-ltdl
LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif
.endif
.if !defined(WITH_FREETDS)
PLIST_SUB+= WITH_FREETDS="@comment "
CONFIGURE_ARGS+= --without-tds
.else
PLIST_SUB+= WITH_FREETDS=""
CONFIGURE_ARGS+= --with-tds=${LOCALBASE}
LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds
.endif
.if !defined(WITH_POSTGRES)
PLIST_SUB+= WITH_POSTGRES="@comment "
CONFIGURE_ARGS+= --without-postgres
.else
PLIST_SUB+= WITH_POSTGRES=""
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-postgres
.endif
.if !defined(WITH_OGGVORBIS)
PLIST_SUB+= WITH_OGGVORBIS="@comment "
CONFIGURE_ARGS+= --without-ogg
.else
PLIST_SUB+= WITH_OGGVORBIS=""
CONFIGURE_ARGS+= --with-ogg
LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
.endif
.if !defined(WITH_RADIUS)
PLIST_SUB+= WITH_RADIUS="@comment "
CONFIGURE_ARGS+= --without-radius
.else
PLIST_SUB+= WITH_RADIUS=""
CONFIGURE_ARGS+= --with-radius
LIB_DEPENDS+= radiusclient-ng.2:${PORTSDIR}/net/radiusclient
.endif
.if !defined(WITH_SNMP)
PLIST_SUB+= WITH_SNMP="@comment "
CONFIGURE_ARGS+= --without-netsnmp
.else
PLIST_SUB+= WITH_SNMP=""
CONFIGURE_ARGS+= --with-netsnmp
LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
.endif
.if !defined(WITH_JABBER)
PLIST_SUB+= WITH_JABBER="@comment "
CONFIGURE_ARGS+= --without-iksemel
.else
PLIST_SUB+= WITH_JABBER=""
CONFIGURE_ARGS+= --with-iksemel
LIB_DEPENDS+= iksemel.4:${PORTSDIR}/textproc/iksemel
.endif
.if !defined(WITH_SQLITE)
PLIST_SUB+= WITH_SQLITE="@comment "
CONFIGURE_ARGS+= --without-sqlite \
--with-sqlite3=no
.else
PLIST_SUB+= WITH_SQLITE=""
CONFIGURE_ARGS+= --with-sqlite
LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite2 \
sqlite3:${PORTSDIR}/databases/sqlite3
.endif
.if !defined(WITH_ILBC)
PLIST_SUB+= WITH_ILBC="@comment "
.else
PLIST_SUB+= WITH_ILBC=""
EXTRA_PATCHES+= ${PATCHDIR}/ilbc_enable.diff
.endif
.if !defined(WITH_GSM)
PLIST_SUB+= WITH_GSM="@comment "
CONFIGURE_ARGS+= --without-gsm
.else
PLIST_SUB+= WITH_GSM=""
CONFIGURE_ARGS+= --with-gsm
LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
.endif
.if !defined(WITH_CURL)
PLIST_SUB+= WITH_CURL="@comment "
CONFIGURE_ARGS+= --with-libcurl=no
.else
PLIST_SUB+= WITH_CURL=""
CONFIGURE_ARGS+= --with-libcurl
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
.endif
.if !defined(WITH_SPANDSP)
PLIST_SUB+= WITH_SPANDSP="@comment "
CONFIGURE_ARGS+= --without-spandsp
.else
PLIST_SUB+= WITH_SPANDSP=""
CONFIGURE_ARGS+= --with-spandsp
LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel
.endif
.if defined(WITH_MISC_PATCHES)
EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff
EXTRA_PATCHES+= ${PATCHDIR}/feature_disconnect.diff
EXTRA_PATCHES+= ${PATCHDIR}/sip_force_callid.diff
EXTRA_PATCHES+= ${PATCHDIR}/sip_set_auth.diff
.if defined(WITH_CODEC_PATCH)
EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-codecnego.diff
.else
EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-nocodecnego.diff
.endif
.endif
post-extract:
${MKDIR} ${WRKSRC}/codecs/ilbc
${FIND} ${WRKSRC} -name '*.d' -delete
post-patch:
${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
post-install:
@${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk
.include <bsd.port.post.mk>

View file

@ -1,2 +0,0 @@
SHA256 (asterisk-1.6.2.24.tar.gz) = 5f5b28f7644eeef6ecf778b4cdbbfe89ef70d482943af9b2e588823bd8ef0e54
SIZE (asterisk-1.6.2.24.tar.gz) = 23810139

View file

@ -1,43 +0,0 @@
#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: asterisk
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable asterisk:
#
# asterisk_enable="YES"
#
. /etc/rc.subr
name=asterisk
rcvar=asterisk_enable
extra_commands="reload"
stop_cmd="asterisk_stop"
reload_cmd="asterisk_reload"
command="%%PREFIX%%/sbin/asterisk"
command_args="-n -U %%ASTERISK_USER%%"
pidfile=${asterisk_pidfile:-"/var/run/asterisk.pid"}
asterisk_stop() {
echo 'Stopping asterisk'
$command -nqrx 'core stop now'
}
asterisk_reload() {
echo 'Reloading asterisk'
$command -nqrx 'reload'
}
load_rc_config $name
asterisk_enable=${asterisk_enable:-"NO"}
run_rc_command "$1"

File diff suppressed because it is too large Load diff

View file

@ -1,258 +0,0 @@
--- Makefile.orig 2010-06-11 05:35:06.000000000 +0900
+++ Makefile 2010-09-25 23:04:59.000000000 +0900
@@ -121,7 +121,7 @@
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
-DEBUG=-g3
+#DEBUG=-g3
# Define standard directories for various platforms
@@ -149,7 +149,7 @@
ASTMANDIR=$(mandir)
ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
- ASTVARRUNDIR=$(localstatedir)/run/asterisk
+ ASTVARRUNDIR=$(localstatedir)/run
ASTDBDIR=$(localstatedir)/db/asterisk
else
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
@@ -248,12 +248,13 @@
ifneq ($(findstring BSD,$(OSARCH)),)
_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
@@ -261,7 +262,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
@@ -478,21 +479,23 @@
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
for x in static-http/*; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
if [ -d doc/tex/asterisk ] ; then \
- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+ $(MKDIR) $(DESTDIR)$(DOCSDIR) ; \
for n in doc/tex/asterisk/* ; do \
- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+ $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \
done \
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/images
+ if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
+ fi
for x in images/*.jpg; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \
done
- mkdir -p $(DESTDIR)$(AGI_DIR)
+ $(MKDIR) $(DESTDIR)$(AGI_DIR)
$(MAKE) -C sounds install
doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
@@ -539,50 +542,52 @@
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
installdirs:
- mkdir -p $(DESTDIR)$(MODULES_DIR)
- mkdir -p $(DESTDIR)$(ASTSBINDIR)
- mkdir -p $(DESTDIR)$(ASTETCDIR)
- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
+ $(MKDIR) $(DESTDIR)$(ASTDBDIR)
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/outgoing
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
bininstall: _all installdirs $(SUBDIRS_INSTALL)
- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
- $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation
+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
+ $(BSD_INSTALL_DATA) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+ $(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
fi
$(SUBDIRS_INSTALL):
@@ -616,7 +621,7 @@
@exit 1
endif
-install: badshell datafiles bininstall
+install: badshell datafiles bininstall samples
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@@ -650,38 +655,25 @@
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
- @mkdir -p $(DESTDIR)$(ASTETCDIR)
+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@for x in configs/*.adsi; do \
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
if [ -f $${dst} ] ; then \
- echo "Overwriting $$x" ; \
- else \
- echo "Installing $$x" ; \
+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
fi ; \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
done
samples: adsi
@echo Installing other config files...
- @mkdir -p $(DESTDIR)$(ASTETCDIR)
+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@for x in configs/*.sample; do \
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
- if [ -f $${dst} ]; then \
- if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s $${dst} $$x ; then \
- echo "Config file $$x is unchanged"; \
- continue; \
- fi ; \
- mv -f $${dst} $${dst}.old ; \
- else \
- echo "Skipping config file $$x"; \
- continue; \
- fi ;\
+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \
+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
fi ; \
- echo "Installing file $$x"; \
- $(INSTALL) -m 644 $$x $${dst} ;\
done
- @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+ @if true; then \
echo "Creating asterisk.conf"; \
( \
echo "[directories](!) ; remove the (!) to enable this" ; \
@@ -745,14 +737,17 @@
echo "pbx_realtime=1.6" ; \
echo "res_agi=1.6" ; \
echo "app_set=1.6" ; \
- ) > $(DESTDIR)$(ASTCONFPATH) ; \
+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
+ fi; \
else \
echo "Skipping asterisk.conf creation"; \
fi
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
- @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
- @for x in phoneprov/*; do \
+ @$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov
+ for x in phoneprov/*; do \
dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
if [ -f $${dst} ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
@@ -767,14 +762,14 @@
fi ;\
fi ; \
echo "Installing file $$x"; \
- $(INSTALL) -m 644 $$x $${dst} ;\
+ $(BSD_INSTALL_DATA) $$x $${dst} ;\
done
webvmail:
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
done

View file

@ -1,13 +0,0 @@
--- Makefile.rules.orig 2010-05-05 15:59:28.000000000 +0600
+++ Makefile.rules 2010-05-05 15:26:04.000000000 +0600
@@ -43,6 +43,10 @@
endif
endif
+ifneq ($(OSARCH),FreeBSD)
+ OPTIMIZE?=-O6
+endif
+
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
_ASTCFLAGS+=$(OPTIMIZE)
else

View file

@ -1,28 +0,0 @@
$FreeBSD$
--- agi/Makefile
+++ agi/Makefile
@@ -13,7 +13,9 @@
.PHONY: clean all uninstall
-AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
+AGIS_BIN=eagi-test eagi-sphinx-test
+AGIS_SCR=agi-test.agi jukebox.agi
+AGIS=$(AGIS_SCR) $(AGIS_BIN)
ifeq ($(OSARCH),SunOS)
LIBS+=-lsocket -lnsl
@@ -40,8 +42,9 @@
eagi-sphinx-test: eagi-sphinx-test.o
install: all
- mkdir -p $(DESTDIR)$(AGI_DIR)
- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR)
+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
uninstall:
for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done

View file

@ -1,32 +0,0 @@
--- channels/chan_dahdi.c.orig 2010-05-05 17:50:15.000000000 +0600
+++ channels/chan_dahdi.c 2010-05-05 17:50:09.000000000 +0600
@@ -2672,13 +2672,17 @@
return;
}
if (p->echocancel.head.tap_length) {
+ struct dahdi_echocanparams *pecp;
+
if ((p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP) || (p->sig == SIG_PRI) || (p->sig == SIG_SS7)) {
x = 1;
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &x);
if (res)
ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));
}
- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
+
+ pecp = &p->echocancel.head;
+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
@@ -2712,8 +2716,9 @@
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
+ struct dahdi_echocanparams *pecp = &ecp;
- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp);
+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
if (res)
ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));

View file

@ -1,29 +0,0 @@
--- channels/Makefile.orig 2010-05-05 17:57:22.000000000 +0600
+++ channels/Makefile 2010-05-05 18:01:58.000000000 +0600
@@ -27,9 +27,10 @@
endif
ifeq ($(OSARCH),FreeBSD)
- PTLIB=-lpt_FreeBSD_x86_r
- H323LIB=-lh323_FreeBSD_x86_r
+ PTLIB=-lpt_r
+ H323LIB=-lh323_r
CHANH323LIB=-pthread
+ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
endif
ifeq ($(OSARCH),NetBSD)
@@ -80,9 +81,13 @@
else
chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ifeq ($(OSARCH),FreeBSD)
+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
+else
$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
endif
+endif
chan_misdn.o: _ASTCFLAGS+=-Imisdn

View file

@ -1,11 +0,0 @@
--- channels/chan_sip.c.orig 2010-05-28 23:57:40.000000000 +0600
+++ channels/chan_sip.c 2010-08-11 10:47:07.000000000 +0600
@@ -980,7 +980,7 @@
#define DEFAULT_MOHINTERPRET "default" /*!< The default music class */
#define DEFAULT_MOHSUGGEST ""
#define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */
-#define DEFAULT_CALLERID "asterisk" /*!< Default caller ID */
+#define DEFAULT_CALLERID "Unknown" /*!< Default caller ID */
#define DEFAULT_NOTIFYMIME "application/simple-message-summary"
#define DEFAULT_ALLOWGUEST TRUE
#define DEFAULT_RTPKEEPALIVE 0 /*!< Default RTPkeepalive setting */

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- channels/h323/Makefile.in
+++ channels/h323/Makefile.in
@@ -13,7 +13,7 @@
STDCCFLAGS += -I../../include -include ../../include/asterisk/autoconfig.h
STDCCFLAGS += -fPIC
#OPTCCFLAGS +=
-CFLAGS = -pipe
+CFLAGS = -pipe @CXXFLAGS@
TARGET = libchanh323.a
TARGET += Makefile.ast
SOURCES = ast_h323.cxx compat_h323.cxx cisco-h225.cxx caps_h323.cxx

View file

@ -1,20 +0,0 @@
--- configure.orig 2011-04-26 19:20:35.845444584 +0200
+++ configure 2011-04-26 19:22:06.968444097 +0200
@@ -4548,8 +4548,6 @@
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
- CPPFLAGS=-I/usr/local/include
- LDFLAGS=-L/usr/local/lib
;;
openbsd*)
@@ -21797,7 +21795,7 @@
fi
- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
+ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
if test "${HAS_OPENH323:-unset}" != "unset"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5

View file

@ -1,24 +0,0 @@
--- ./include/asterisk/lock.h.orig 2010-11-12 17:01:29.000000000 +0100
+++ ./include/asterisk/lock.h 2010-11-12 17:01:38.000000000 +0100
@@ -1049,10 +1049,6 @@
t->tracking = tracking;
pthread_rwlockattr_init(&attr);
-#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
- pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP);
-#endif
-
res = pthread_rwlock_init(&t->lock, &attr);
pthread_rwlockattr_destroy(&attr);
return res;
@@ -1801,10 +1797,6 @@
pthread_rwlockattr_init(&attr);
-#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
- pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP);
-#endif
-
res = pthread_rwlock_init(prwlock, &attr);
pthread_rwlockattr_destroy(&attr);
return res;

View file

@ -1,33 +0,0 @@
$FreeBSD$
--- ./main/Makefile.orig 2010-06-26 00:58:37.000000000 +0600
+++ ./main/Makefile 2010-08-24 09:40:39.000000000 +0600
@@ -113,8 +113,8 @@
cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
$(MAKE) -C editline libedit.a
-db1-ast/libdb1.a: CHECK_SUBDIR
- _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
+#db1-ast/libdb1.a: CHECK_SUBDIR
+# _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
ast_expr2.c ast_expr2.h: ast_expr2.y
@@ -177,13 +177,13 @@
GMIMELDFLAGS+=$(GMIME_LIB)
endif
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
else
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
endif
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@

View file

@ -1,21 +0,0 @@
$FreeBSD$
--- main/db.c
+++ main/db.c
@@ -36,6 +36,7 @@
#include <sys/time.h>
#include <signal.h>
#include <dirent.h>
+#include <db.h>
#include "asterisk/channel.h"
#include "asterisk/file.h"
@@ -46,7 +47,6 @@
#include "asterisk/utils.h"
#include "asterisk/lock.h"
#include "asterisk/manager.h"
-#include "db1-ast/include/db.h"
static DB *astdb;
AST_MUTEX_DEFINE_STATIC(dblock);

View file

@ -1,14 +0,0 @@
$FreeBSD$
--- main/frame.c
+++ main/frame.c
@@ -1260,7 +1260,7 @@
switch(type) {
case TYPE_DONTSEND:
- return 0;
+ return 2;
break;
case TYPE_SILENCE:
return 4;

View file

@ -1,16 +0,0 @@
$FreeBSD$
--- main/utils.c
+++ main/utils.c
@@ -936,8 +936,8 @@
pthread_attr_init(attr);
}
-#ifdef __linux__
- /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
+#if defined(__linux__) || defined(__FreeBSD__)
+ /* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
which is kind of useless. Change this here to
PTHREAD_INHERIT_SCHED; that way the -p option to set realtime
priority will propagate down to new threads by default.

View file

@ -1,13 +0,0 @@
--- ./utils/extconf.c.orig 2010-11-12 16:49:46.000000000 +0100
+++ ./utils/extconf.c 2010-11-12 16:50:00.000000000 +0100
@@ -718,10 +718,6 @@
pthread_rwlockattr_init(&attr);
-#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
- pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP);
-#endif
-
return pthread_rwlock_init(prwlock, &attr);
}

View file

@ -1,5 +0,0 @@
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
sense, middleware between Internet and telephony channels on the bottom,
and Internet and telephony applications at the top.
WWW: http://www.asteriskpbx.com

File diff suppressed because it is too large Load diff

View file

@ -7,7 +7,7 @@
PORTNAME= bigbluebutton PORTNAME= bigbluebutton
PORTVERSION= 0.71 PORTVERSION= 0.71
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= www java CATEGORIES= www java
MASTER_SITES= http://bigbluebutton.org/downloads/${PORTVERSION}/ \ MASTER_SITES= http://bigbluebutton.org/downloads/${PORTVERSION}/ \
http://bigbluebutton.org/downloads/0.70/:2 \ http://bigbluebutton.org/downloads/0.70/:2 \
@ -82,10 +82,10 @@ SUB_FILES= pkg-message openoffice nginx.conf-dist bbb-conf
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if defined(WITH_MEETME) || defined(WITH_KONFERENCE) .if defined(WITH_MEETME) || defined(WITH_KONFERENCE)
BUILD_DEPENDS+=${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk16 BUILD_DEPENDS+=${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk
.if defined(WITH_MEETME) .if defined(WITH_MEETME)
.if !exists(${LOCALBASE}/lib/asterisk/modules/app_meetme.so) .if !exists(${LOCALBASE}/lib/asterisk/modules/app_meetme.so)
IGNORE=Option meetme requires app_meetme.so from asterisk port. Rebuild net/asterisk16 with WITH_ZAPTEL=yes IGNORE=Option meetme requires app_meetme.so from asterisk port. Rebuild net/asterisk with WITH_DAHDI=yes
.endif .endif
.endif .endif
.if defined(WITH_KONFERENCE) .if defined(WITH_KONFERENCE)