Date: Wed, 25 Apr 2007 20:18:22 -0400 From: Kris Kennaway <kris@obsecurity.org> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/misc/zaptel Makefile distinfo pkg-plist ports/misc/zaptel/files patch-Makefile patch-qozap::Makefile patch-qozap::qozap_freebsd.c patch-tau32pci::tau32pci.c patch-test::Makefile patch-wcfxo::wcfxo.c patch-wcfxs::wcfxs.c patch-wct1xxp::wct1xxp.c ... Message-ID: <20070426001822.GA79250@xor.obsecurity.org> In-Reply-To: <200704260011.l3Q0Bcxo039783@repoman.freebsd.org> References: <200704260011.l3Q0Bcxo039783@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--yrj/dFKFPuw6o+aM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Maxim, For some reason you have ignored at least 2 emails from portmgr inquiring why you have been making apparently unapproved commits to other people's ports (your previous 3 commits were such). Since you are ignoring our private emails I have no choice but to ask you publically to respond immediately. Kris On Thu, Apr 26, 2007 at 12:11:37AM +0000, Maxim Sobolev wrote: > sobomax 2007-04-26 00:11:37 UTC >=20 > FreeBSD ports repository >=20 > Modified files: > misc/zaptel Makefile distinfo pkg-plist=20 > misc/libpri Makefile distinfo=20 > net/asterisk12 Makefile distinfo pkg-plist=20 > net/asterisk12/files patch-Makefile patch-apps::Makefile=20 > patch-cdr::Makefile=20 > patch-channels::Makefile=20 > patch-channels::chan_zap.c=20 > patch-codecs::Makefile=20 > patch-res::Makefile patch-utils::Makefile=20 > Added files: > misc/zaptel/files patch-Makefile patch-test::Makefile=20 > net/asterisk12/files patch-apps::app_flash.c=20 > patch-apps::app_meetme.c=20 > patch-apps::app_rpt.c=20 > patch-apps::app_zapbarge.c=20 > patch-apps::app_zapras.c=20 > patch-apps::app_zapscan.c patch-channel.c=20 > patch-channels::chan_iax2.c=20 > patch-channels::h323::Makefile=20 > patch-codecs::codec_zap.c=20 > patch-res::res_musiconhold.c=20 > Removed files: > misc/zaptel/files patch-qozap::Makefile=20 > patch-qozap::qozap_freebsd.c=20 > patch-tau32pci::tau32pci.c=20 > patch-wcfxo::wcfxo.c patch-wcfxs::wcfxs.c=20 > patch-wct1xxp::wct1xxp.c=20 > patch-wct4xxp::wct4xxp.c=20 > patch-wcte11xp::wcte11xp.c=20 > patch-zaphfc::Makefile=20 > patch-zaphfc::zaphfc_freebsd.c=20 > misc/libpri/files patch-mkdep=20 > net/asterisk12/files patch-rtp.c=20 > Log: > o Update zaptel to 1.4.1; > =20 > Submitted by: Oleksandr Tymoshenko <gonzo@pbxpress.com> > =20 > o update libpri to 1.4.0; > =20 > PR: 111555 > Submitted by: "Phillip N." <pneumann@gmail.com> > =20 > o update asterisk12 to 1.2.7. > =20 > Sponsored by: Sippy Software, Inc. ( http://www.sippysoft.com/ ) > =20 > The reason it all is going in together is that they are interdependent. > =20 > Revision Changes Path > 1.13 +2 -8 ports/misc/libpri/Makefile > http://cvsweb.FreeBSD.org/ports/misc/libpri/Makefile.diff?r1=3D1.12&r2=3D= 1.13 > | --- ports/misc/libpri/Makefile 2007/03/29 21:02:06 1.12 > | +++ ports/misc/libpri/Makefile 2007/04/26 00:11:36 1.13 > | @@ -2,11 +2,11 @@ > | # Date created: 25 Oct 2004 > | # Whom: Alexander Timoshenko <gonzo@univ.kiev.ua> > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/misc/libpri/Makefile,= v 1.12 2007/03/29 21:02:06 gabor Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/misc/libpri/Makefile,= v 1.13 2007/04/26 00:11:36 sobomax Exp $ > | # > | =20 > | PORTNAME=3D libpri > | -PORTVERSION=3D 1.2.4 > | +PORTVERSION=3D 1.4.0 > | CATEGORIES=3D misc > | MASTER_SITES=3D ftp://ftp.digium.com/pub/libpri/ \ > | ftp://ftp.digium.com/pub/libpri/old/ > | @@ -14,15 +14,9 @@ MASTER_SITES=3D ftp://ftp.digium.com/pub/l > | MAINTAINER=3D gonzo@univ.kiev.ua > | COMMENT=3D A C implementation of the Primary Rate ISDN specification > | =20 > | -#PATCHFILES=3D ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz > | -#PATCH_SITES=3D ${MASTER_SITE_LOCAL} > | -#PATCH_SITE_SUBDIR=3D fjoe > | -#PATCH_DIST_STRIP=3D -p1 > | -#BRIVER=3D bristuff-0.3.0-PRE-1l > | - > | USE_GMAKE=3D yes > | USE_LDCONFIG=3D yes > | -PLIST_FILES=3D include/libpri.h lib/libpri.a lib/libpri.a lib/libpri.s= o \ > | +PLIST_FILES=3D include/libpri.h lib/libpri.a lib/libpri.so \ > | lib/libpri.so.1 > | =20 > | NOT_FOR_ARCHS=3D alpha > 1.10 +3 -3 ports/misc/libpri/distinfo > http://cvsweb.FreeBSD.org/ports/misc/libpri/distinfo.diff?r1=3D1.9&r2=3D1= .10 > | --- ports/misc/libpri/distinfo 2007/03/29 21:02:06 1.9 > | +++ ports/misc/libpri/distinfo 2007/04/26 00:11:36 1.10 > | @@ -1,3 +1,3 @@ > | -MD5 (libpri-1.2.4.tar.gz) =3D 2bc348d8363027736ccbf5998d85d317 > | -SHA256 (libpri-1.2.4.tar.gz) =3D bbfaf5dff54934d844b3785e3fbd19817f0d8= 0b1aa84153e5be40802c6b00d93 > | -SIZE (libpri-1.2.4.tar.gz) =3D 76663 > | +MD5 (libpri-1.4.0.tar.gz) =3D 09b039226e43a810d523bc076823c6a9 > | +SHA256 (libpri-1.4.0.tar.gz) =3D 9f4db10a105545e68cbe0620795d2e1127882= 8fa281ad339eeb72087125eeaf9 > | +SIZE (libpri-1.4.0.tar.gz) =3D 80021 > 1.2 +0 -8 ports/misc/libpri/files/patch-mkdep (dead) > http://cvsweb.FreeBSD.org/ports/misc/libpri/files/patch-mkdep?rev=3D1.1&c= ontent-type=3Dtext/plain > 1.27 +1 -2 ports/misc/zaptel/Makefile > http://cvsweb.FreeBSD.org/ports/misc/zaptel/Makefile.diff?r1=3D1.26&r2=3D= 1.27 > | --- ports/misc/zaptel/Makefile 2007/04/13 07:04:32 1.26 > | +++ ports/misc/zaptel/Makefile 2007/04/26 00:11:35 1.27 > | @@ -2,11 +2,11 @@ > | # Date created: 29 April 2004 > | # Whom: Maxim Sobolev <sobomax@FreeBSD.org> > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/misc/zaptel/Makefile,= v 1.26 2007/04/13 07:04:32 sobomax Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/misc/zaptel/Makefile,= v 1.27 2007/04/26 00:11:35 sobomax Exp $ > | # > | =20 > | PORTNAME=3D zaptel > | -PORTVERSION=3D 1.2.13 > | +PORTVERSION=3D 1.4.1 > | CATEGORIES=3D misc > | MASTER_SITES=3D http://www.pbxpress.com/~gonzo/ > | DISTNAME=3D ${PORTNAME}-bsd-${PORTVERSION} > | @@ -46,7 +46,6 @@ pre-su-install: > | @${MKDIR} ${PREFIX}/lib/zaptel > | =20 > | post-install: > | - @${LN} -sfh ${PREFIX}/include ${PREFIX}/include/zaptel > | @${TOUCH} ${PREFIX}/lib/zaptel/linker.hints > | @${CAT} ${PKGMESSAGE} > | =20 > 1.15 +3 -3 ports/misc/zaptel/distinfo > http://cvsweb.FreeBSD.org/ports/misc/zaptel/distinfo.diff?r1=3D1.14&r2=3D= 1.15 > | --- ports/misc/zaptel/distinfo 2007/04/13 06:43:56 1.14 > | +++ ports/misc/zaptel/distinfo 2007/04/26 00:11:35 1.15 > | @@ -1,3 +1,3 @@ > | -MD5 (zaptel-bsd-1.2.13.tar.gz) =3D d5d01a5c367969c302d1d70620e9c236 > | -SHA256 (zaptel-bsd-1.2.13.tar.gz) =3D c2032a94514016df28f788986aef7d09= 9987aa1d4a62c4ea232af79c3b42a4c4 > | -SIZE (zaptel-bsd-1.2.13.tar.gz) =3D 363975 > | +MD5 (zaptel-bsd-1.4.1.tar.gz) =3D 34af06241beee361b6a696b20d294d36 > | +SHA256 (zaptel-bsd-1.4.1.tar.gz) =3D 9da4724c1a5a269e0b89d791fa5cc0758= d4de48ce7b3e6cc0c0aad4427ccc37f > | +SIZE (zaptel-bsd-1.4.1.tar.gz) =3D 1009671 > 1.5 +12 -0 ports/misc/zaptel/files/patch-Makefile (new) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-Makefile?rev=3D1.= 5&content-type=3Dtext/plain > 1.4 +0 -14 ports/misc/zaptel/files/patch-qozap::Makefile (dea= d) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-qozap::Makefile?r= ev=3D1.3&content-type=3Dtext/plain > 1.4 +0 -21 ports/misc/zaptel/files/patch-qozap::qozap_freebsd= .c (dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-qozap::qozap_free= bsd.c?rev=3D1.3&content-type=3Dtext/plain > 1.2 +0 -24 ports/misc/zaptel/files/patch-tau32pci::tau32pci.c= (dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-tau32pci::tau32pc= i.c?rev=3D1.1&content-type=3Dtext/plain > 1.6 +14 -0 ports/misc/zaptel/files/patch-test::Makefile (new) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-test::Makefile?re= v=3D1.6&content-type=3Dtext/plain > 1.4 +0 -31 ports/misc/zaptel/files/patch-wcfxo::wcfxo.c (dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-wcfxo::wcfxo.c?re= v=3D1.3&content-type=3Dtext/plain > 1.4 +0 -29 ports/misc/zaptel/files/patch-wcfxs::wcfxs.c (dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-wcfxs::wcfxs.c?re= v=3D1.3&content-type=3Dtext/plain > 1.2 +0 -30 ports/misc/zaptel/files/patch-wct1xxp::wct1xxp.c (= dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-wct1xxp::wct1xxp.= c?rev=3D1.1&content-type=3Dtext/plain > 1.2 +0 -35 ports/misc/zaptel/files/patch-wct4xxp::wct4xxp.c (= dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-wct4xxp::wct4xxp.= c?rev=3D1.1&content-type=3Dtext/plain > 1.2 +0 -30 ports/misc/zaptel/files/patch-wcte11xp::wcte11xp.c= (dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-wcte11xp::wcte11x= p.c?rev=3D1.1&content-type=3Dtext/plain > 1.3 +0 -16 ports/misc/zaptel/files/patch-zaphfc::Makefile (de= ad) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-zaphfc::Makefile?= rev=3D1.2&content-type=3Dtext/plain > 1.2 +0 -32 ports/misc/zaptel/files/patch-zaphfc::zaphfc_freeb= sd.c (dead) > http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-zaphfc::zaphfc_fr= eebsd.c?rev=3D1.1&content-type=3Dtext/plain > 1.9 +5 -3 ports/misc/zaptel/pkg-plist > http://cvsweb.FreeBSD.org/ports/misc/zaptel/pkg-plist.diff?r1=3D1.8&r2=3D= 1.9 > | --- ports/misc/zaptel/pkg-plist 2007/04/13 07:04:32 1.8 > | +++ ports/misc/zaptel/pkg-plist 2007/04/26 00:11:35 1.9 > | @@ -1,11 +1,12 @@ > | bin/fxo_test > | +bin/fxotune > | bin/ztcfg > | bin/ztmonitor > | bin/zttest > | bin/zttool > | -include/tonezone.h > | -include/zaptel > | -include/zaptel.h > | +etc/zaptel.conf.sample > | +include/zaptel/tonezone.h > | +include/zaptel/zaptel.h > | lib/libtonezone.a > | lib/zaptel/linker.hints > | lib/zaptel/qozap.ko > | @@ -19,3 +20,4 @@ lib/zaptel/zaphfc.ko > | lib/zaptel/zaptel.ko > | lib/zaptel/ztdummy.ko > | @dirrm lib/zaptel > | +@dirrm include/zaptel > 1.69 +5 -6 ports/net/asterisk12/Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/Makefile.diff?r1=3D1.68&r2= =3D1.69 > | --- ports/net/asterisk12/Makefile 2007/04/13 17:45:44 1.68 > | +++ ports/net/asterisk12/Makefile 2007/04/26 00:11:36 1.69 > | @@ -2,19 +2,18 @@ > | # Date created: 17 October 2003 > | # Whom: Maxim Sobolev <sobomax@portaone.com> > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/Makefi= le,v 1.68 2007/04/13 17:45:44 sobomax Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/Makefi= le,v 1.69 2007/04/26 00:11:36 sobomax Exp $ > | # > | =20 > | PORTNAME=3D asterisk > | -PORTVERSION=3D 1.2.13 > | -PORTREVISION=3D 4 > | +PORTVERSION=3D 1.2.17 > | PKGNAMESUFFIX=3D 12 > | CATEGORIES=3D net > | MASTER_SITES=3D http://ftp.digium.com/pub/asterisk/ \ > | http://ftp.digium.com/pub/asterisk/old-releases/ > | =20 > | -PATCHFILES=3D asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz > | -PATCH_SITES=3D http://unofficial.portaone.com/~bamby/public/ > | +PATCHFILES=3D asterisk-1.2.17-codec-negotiation-20070416.diff.gz > | +PATCH_SITES=3D http://sobomax.homeunix.org/~sobomax/ > | =20 > | # ${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff > | # ${MASTER_SITE_LOCAL:S,$,:bristuff,} > | @@ -67,9 +66,9 @@ PLIST_SUB+=3D WITH_ZAPTEL=3D"@comment " > | MAKE_ENV+=3D WITHOUT_ZAPTEL=3D1 > | .else > | BUILD_DEPENDS+=3D libpri>=3D1.2.0:${PORTSDIR}/misc/libpri \ > | - ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel > | + ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel > | LIB_DEPENDS+=3D pri.1:${PORTSDIR}/misc/libpri > | -RUN_DEPENDS+=3D ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel > | +RUN_DEPENDS+=3D ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/= zaptel > | PLIST_SUB+=3D WITH_ZAPTEL=3D"" > | MAKE_ENV+=3D WITH_ZAPTEL=3D1 > | .endif > 1.22 +6 -6 ports/net/asterisk12/distinfo > http://cvsweb.FreeBSD.org/ports/net/asterisk12/distinfo.diff?r1=3D1.21&r2= =3D1.22 > | --- ports/net/asterisk12/distinfo 2006/12/05 10:14:29 1.21 > | +++ ports/net/asterisk12/distinfo 2007/04/26 00:11:37 1.22 > | @@ -1,6 +1,6 @@ > | -MD5 (asterisk-1.2.13.tar.gz) =3D ad8fbe2198568f55c254045ecb3b7926 > | -SHA256 (asterisk-1.2.13.tar.gz) =3D 8d197b118d9ee25bc8793b37d1daa6b54f= d6074e6738f462368361e5698d98f8 > | -SIZE (asterisk-1.2.13.tar.gz) =3D 10584113 > | -MD5 (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) =3D 026e844= 8febfc83a458fc1a667e10541 > | -SHA256 (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) =3D 9b97= de229778898297d5aaed1df5530c2ae850543c1af0343105c2286395f7c5 > | -SIZE (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) =3D 32863 > | +MD5 (asterisk-1.2.17.tar.gz) =3D 1a41a1f4a535813b1272bae0545c7990 > | +SHA256 (asterisk-1.2.17.tar.gz) =3D ab20ada37e0f2874a0c59ac7d5395c5980= 419da6344cbb78b60874e9b8631cf1 > | +SIZE (asterisk-1.2.17.tar.gz) =3D 10615354 > | +MD5 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) =3D 9e31b80a8= a9ca26afe9c62f62e6401f7 > | +SHA256 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) =3D c715dd= 17259902ee1068ef2b1844f726570598e2d945f92233c42b0702abc2c6 > | +SIZE (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) =3D 32987 > 1.18 +25 -11 ports/net/asterisk12/files/patch-Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-Makefile.diff?= r1=3D1.17&r2=3D1.18 > | --- ports/net/asterisk12/files/patch-Makefile 2006/10/04 04:41:27 1.17 > | +++ ports/net/asterisk12/files/patch-Makefile 2007/04/26 00:11:37 1.18 > | @@ -1,5 +1,8 @@ > | ---- Makefile.orig Tue Sep 26 18:41:55 2006 > | -+++ Makefile Tue Sep 26 18:47:32 2006 > | + > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-Makefile,v 1.18 2007/04/26 00:11:37 sobomax Exp $ > | + > | +--- Makefile.orig > | ++++ Makefile > | @@ -19,8 +19,8 @@ > | # CROSS_COMPILE=3D/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale= _be- > | # CROSS_COMPILE_BIN=3D/opt/montavista/pro/devkit/arm/xscale_be/bin/ > | @@ -144,7 +147,7 @@ > | ifndef WITHOUT_ZAPTEL > | =20 > | -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(= CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard = $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wi= ldcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | ASTCFLAGS+=3D-DZAPTEL_OPTIMIZATIONS > | endif > | =20 > | @@ -219,13 +222,15 @@ > | =20 > | muted: muted.o > | $(CC) $(AUDIO_LIBS) -o muted muted.o > | -@@ -552,38 +549,38 @@ > | +@@ -552,12 +549,12 @@ > | =20 > | datafiles: all > | if [ x`$(ID) -un` =3D xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/li= b/pkgconfig; fi > | - mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits > | +- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence > | - mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros > | + $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits > | ++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence > | + $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros > | for x in sounds/digits/*.gsm; do \ > | if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ > | @@ -234,6 +239,15 @@ > | else \ > | echo "No description for $$x"; \ > | exit 1; \ > | +@@ -565,34 +562,34 @@ > | + done > | + for x in sounds/silence/*.gsm; do \ > | + if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ > | +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \ > | ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ;= \ > | + else \ > | + echo "No description for $$x"; \ > | + exit 1; \ > | fi; \ > | done > | - mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate > | @@ -267,7 +281,7 @@ > | else \ > | echo "No description for $$x"; \ > | exit 1; \ > | -@@ -591,18 +588,18 @@ > | +@@ -600,18 +597,18 @@ > | done > | for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sou= nds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/inva= lid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-*= sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* = sounds/second* ; do \ > | if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ > | @@ -291,7 +305,7 @@ > | =20 > | update:=20 > | @if [ -d .svn ]; then \ > | -@@ -631,47 +628,47 @@ > | +@@ -640,47 +637,47 @@ > | OLDHEADERS=3D$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR= )$(ASTHEADERDIR)/*.h))) > | =20 > | bininstall: all > | @@ -371,7 +385,7 @@ > | else \ > | echo "You need to do cvs update -d not just cvs update" ; \ > | fi=20 > | -@@ -701,46 +698,28 @@ > | +@@ -710,46 +707,28 @@ > | echo " WARNING WARNING WARNING" ;\ > | fi > | =20 > | @@ -425,7 +439,7 @@ > | if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ > | if [ "$(OVERWRITE)" =3D "y" ]; then \ > | if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; the= n \ > | -@@ -753,7 +732,7 @@ > | +@@ -762,7 +741,7 @@ > | continue; \ > | fi ;\ > | fi ; \ > | @@ -434,7 +448,7 @@ > | done > | if [ "$(OVERWRITE)" =3D "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; = then \ > | ( \ > | -@@ -813,25 +792,25 @@ > | +@@ -822,25 +801,25 @@ > | echo "; Default: strict"; \ > | echo ";"; \ > | echo ";translation_algorithm =3D strict"; \ > | @@ -466,7 +480,7 @@ > | :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm > | for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunava= il; do \ > | cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOO= LDIR)/voicemail/default/1234/unavail.gsm ; \ > | -@@ -845,9 +824,9 @@ > | +@@ -854,9 +833,9 @@ > | @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory = not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && e= xit 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 $(DESTD= IR)$(HTTP_CGIDIR)/vmail.cgi > | @@ -478,7 +492,7 @@ > | done > | @echo " +--------- Asterisk Web Voicemail ----------+" =20 > | @echo " + +" > | -@@ -874,10 +853,10 @@ > | +@@ -883,10 +862,10 @@ > | =20 > | __rpm: include/asterisk/version.h spec > | rm -rf /tmp/asterisk ; \ > 1.9 +6 -3 ports/net/asterisk12/files/patch-apps::Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::Makefile= .diff?r1=3D1.8&r2=3D1.9 > | --- ports/net/asterisk12/files/patch-apps::Makefile 2006/06/16 23:34:44= 1.8 > | +++ ports/net/asterisk12/files/patch-apps::Makefile 2007/04/26 00:11:37= 1.9 > | @@ -1,11 +1,14 @@ > | ---- apps/Makefile.orig Sun Apr 30 16:38:22 2006 > | -+++ apps/Makefile Wed Jun 14 14:03:42 2006 > | + > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-apps::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $ > | + > | +--- apps/Makefile.orig > | ++++ apps/Makefile > | @@ -45,25 +45,27 @@ > | #APPS+=3Dapp_rpt.so > | =20 > | ifndef WITHOUT_ZAPTEL > | -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) > | -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h),) > | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h),) > | APPS+=3Dapp_zapras.so app_meetme.so app_flash.so app_zapbarge.so ap= p_zapscan.so app_page.so > | endif > | endif # WITHOUT_ZAPTEL > 1.1 +14 -0 ports/net/asterisk12/files/patch-apps::app_flash.c= (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::app_flas= h.c?rev=3D1.1&content-type=3Dtext/plain > 1.1 +14 -0 ports/net/asterisk12/files/patch-apps::app_meetme.= c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::app_meet= me.c?rev=3D1.1&content-type=3Dtext/plain > 1.1 +14 -0 ports/net/asterisk12/files/patch-apps::app_rpt.c (= new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::app_rpt.= c?rev=3D1.1&content-type=3Dtext/plain > 1.1 +14 -0 ports/net/asterisk12/files/patch-apps::app_zapbarg= e.c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::app_zapb= arge.c?rev=3D1.1&content-type=3Dtext/plain > 1.1 +14 -0 ports/net/asterisk12/files/patch-apps::app_zapras.= c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::app_zapr= as.c?rev=3D1.1&content-type=3Dtext/plain > 1.1 +14 -0 ports/net/asterisk12/files/patch-apps::app_zapscan= .c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::app_zaps= can.c?rev=3D1.1&content-type=3Dtext/plain > 1.9 +26 -8 ports/net/asterisk12/files/patch-cdr::Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-cdr::Makefile.= diff?r1=3D1.8&r2=3D1.9 > | --- ports/net/asterisk12/files/patch-cdr::Makefile 2006/10/20 15:03:02 = 1.8 > | +++ ports/net/asterisk12/files/patch-cdr::Makefile 2007/04/26 00:11:37 = 1.9 > | @@ -1,5 +1,8 @@ > | ---- cdr/Makefile.orig Thu Sep 21 17:18:19 2006 > | -+++ cdr/Makefile Thu Oct 19 10:52:51 2006 > | + > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-cdr::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $ > | + > | +--- cdr/Makefile.orig > | ++++ cdr/Makefile > | @@ -21,8 +21,8 @@ > | endif > | =20 > | @@ -11,14 +14,16 @@ > | endif > | =20 > | #The problem with sparc is the best stuff is in newer versions of gcc= (post 3.0) only. > | -@@ -38,21 +38,21 @@ > | +@@ -38,21 +38,23 @@ > | # > | # unixODBC stuff... > | # > | -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wi= ldcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) > | ++ifdef WITH_ODBC > | +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wi= ldcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) > | MODS+=3Dcdr_odbc.so > | endif > | ++endif > | =20 > | # > | # FreeTDS stuff... > | @@ -38,16 +43,29 @@ > | CFLAGS +=3D -DFREETDS_0_62 > | else > | CFLAGS +=3D -DFREETDS_PRE_0_62 > | -@@ -65,7 +65,7 @@ > | +@@ -65,7 +67,7 @@ > | # > | # PGSQL stuff... Autoconf anyone?? > | # > | --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wi= ldcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_C= OMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/loc= al/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wil= dcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) > | -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wi= ldcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_C= OMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALB= ASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(w= ildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) > | +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libp= q-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include/libpq-fe.= h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcar= d $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql/libpq-fe.h)$(wildcard $(C= ROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPIL= E_TARGET)/usr/include/libpq-fe.h),) > | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libp= q-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include/libpq-f= e.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildc= ard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql/libpq-fe.h)$(wildcard= $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_CO= MPILE_TARGET)/usr/include/libpq-fe.h),) > | MODS+=3Dcdr_pgsql.so > | endif > | =20 > | -@@ -86,9 +86,9 @@ > | +@@ -76,9 +78,9 @@ > | + MLFLAGS+=3D-L$(CROSS_COMPILE_TARGET)/usr/lib/postgresql > | + endif > | +=20 > | +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include),) > | +- CFLAGS+=3D-I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include > | +- MLFLAGS+=3D-L$(CROSS_COMPILE_TARGET)/usr/local/pgsql/lib > | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include),) > | ++ CFLAGS+=3D-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include > | ++ MLFLAGS+=3D-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/lib > | + endif > | +=20 > | + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql),) > | +@@ -86,9 +88,9 @@ > | MLFLAGS+=3D-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql > | endif > | =20 > | @@ -60,7 +78,7 @@ > | endif > | =20 > | ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) > | -@@ -114,7 +114,7 @@ > | +@@ -114,7 +116,7 @@ > | all: depend $(MODS) > | =20 > | install: all > 1.1 +14 -0 ports/net/asterisk12/files/patch-channel.c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channel.c?rev= =3D1.1&content-type=3Dtext/plain > 1.13 +9 -9 ports/net/asterisk12/files/patch-channels::Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::Make= file.diff?r1=3D1.12&r2=3D1.13 > | --- ports/net/asterisk12/files/patch-channels::Makefile 2006/04/26 11:3= 1:03 1.12 > | +++ ports/net/asterisk12/files/patch-channels::Makefile 2007/04/26 00:1= 1:37 1.13 > | @@ -1,9 +1,9 @@ > | =20 > | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-channels::Makefile,v 1.12 2006/04/26 11:31:03 fjoe Exp $ > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-channels::Makefile,v 1.13 2007/04/26 00:11:37 sobomax Exp $ > | =20 > | --- channels/Makefile.orig > | +++ channels/Makefile > | -@@ -48,8 +48,8 @@ > | +@@ -50,8 +50,8 @@ > | endif > | =20 > | ifeq (${OSARCH},FreeBSD) > | @@ -14,7 +14,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | CHANH323LIB=3D-pthread > | endif > | =20 > | -@@ -73,11 +73,11 @@ > | +@@ -75,11 +75,11 @@ > | SOLINK+=3D-lrt > | endif > | =20 > | @@ -28,7 +28,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | CHANNEL_LIBS+=3Dchan_h323.so > | endif > | =20 > | -@@ -91,12 +91,12 @@ > | +@@ -94,12 +94,12 @@ > | CHANNEL_LIBS+=3Dchan_alsa.so > | endif > | =20 > | @@ -43,12 +43,12 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | CFLAGS+=3D-DZAPATA_R2 > | ZAPR2=3D-lmfcr2 > | endif > | -@@ -109,12 +109,12 @@ > | +@@ -112,12 +112,12 @@ > | endif > | =20 > | ifndef WITHOUT_ZAPTEL > | -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(= CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard = $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wi= ldcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | ifeq (${OSARCH},NetBSD) > | SOLINK+=3D-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib > | endif > | @@ -58,7 +58,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | endif > | CFLAGS+=3D-DIAX_TRUNKING > | CHANNEL_LIBS+=3Dchan_zap.so > | -@@ -229,8 +229,10 @@ > | +@@ -233,8 +233,10 @@ > | chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast > | $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDL= IBS) -lstdc++ > | else > | @@ -70,8 +70,8 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | + $(MAKE) -C h323 ast_h323.o > | endif > | =20 > | - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a > | -@@ -244,8 +246,7 @@ > | + misdn/chan_misdn_lib.a: > | +@@ -253,8 +255,7 @@ > | # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< > | =20 > | install: all > 1.3 +14 -0 ports/net/asterisk12/files/patch-channels::chan_ia= x2.c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::chan= _iax2.c?rev=3D1.3&content-type=3Dtext/plain > 1.5 +19 -6 ports/net/asterisk12/files/patch-channels::chan_za= p.c > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::chan= _zap.c.diff?r1=3D1.4&r2=3D1.5 > | --- ports/net/asterisk12/files/patch-channels::chan_zap.c 2006/01/17 22= :27:45 1.4 > | +++ ports/net/asterisk12/files/patch-channels::chan_zap.c 2007/04/26 00= :11:37 1.5 > | @@ -1,9 +1,22 @@ > | =20 > | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-channels::chan_zap.c,v 1.4 2006/01/17 22:27:45 sobomax Exp $ > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-channels::chan_zap.c,v 1.5 2007/04/26 00:11:37 sobomax Exp $ > | =20 > | ---- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005 > | -+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006 > | -@@ -638,6 +638,7 @@ static struct zt_pvt { > | +--- channels/chan_zap.c.orig > | ++++ channels/chan_zap.c > | +@@ -51,10 +51,10 @@ > | + #ifdef __linux__ > | + #include <linux/zaptel.h> > | + #else > | +-#include <zaptel.h> > | ++#include <zaptel/zaptel.h> > | + #endif /* __linux__ */ > | + #include <math.h> > | +-#include <tonezone.h> > | ++#include <zaptel/tonezone.h> > | + #include <ctype.h> > | + #ifdef ZAPATA_PRI > | + #include <libpri.h> > | +@@ -792,6 +792,7 @@ > | int cidlen; > | int ringt; > | int ringt_base; > | @@ -11,7 +24,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | int stripmsd; > | int callwaitcas; > | int callwaitrings; > | -@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel=20 > | +@@ -2464,6 +2465,19 @@ > | } > | =09 > | ast_mutex_lock(&p->lock); > | @@ -31,7 +44,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | =09 > | index =3D zt_get_index(ast, p, 1); > | =20 > | -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data) > | +@@ -6323,7 +6337,37 @@ > | ast_setstate(chan, AST_STATE_RING); > | chan->rings =3D 1; > | p->ringt =3D p->ringt_base; > | @@ -69,7 +82,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | if (res) { > | ast_hangup(chan); > | ast_log(LOG_WARNING, "PBX exited non-zero\n"); > | -@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data) > | +@@ -6628,7 +6672,7 @@ > | i =3D iflist; > | while(i) { > | if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { > 1.7 +20 -0 ports/net/asterisk12/files/patch-channels::h323::M= akefile (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::h323= ::Makefile?rev=3D1.7&content-type=3Dtext/plain > 1.9 +15 -6 ports/net/asterisk12/files/patch-codecs::Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-codecs::Makefi= le.diff?r1=3D1.8&r2=3D1.9 > | --- ports/net/asterisk12/files/patch-codecs::Makefile 2006/01/17 22:27:= 45 1.8 > | +++ ports/net/asterisk12/files/patch-codecs::Makefile 2007/04/26 00:11:= 37 1.9 > | @@ -1,9 +1,18 @@ > | =20 > | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-codecs::Makefile,v 1.8 2006/01/17 22:27:45 sobomax Exp $ > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-codecs::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $ > | =20 > | ---- codecs/Makefile.orig Tue Nov 29 20:24:39 2005 > | -+++ codecs/Makefile Fri Jan 13 10:33:21 2006 > | -@@ -30,8 +30,8 @@ > | +--- codecs/Makefile.orig > | ++++ codecs/Makefile > | +@@ -29,7 +29,7 @@ > | + endif > | +=20 > | + ifndef WITHOUT_ZAPTEL > | +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(= CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)= $(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wi= ldcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) > | + ifeq (${OSARCH},NetBSD) > | + SOLINK+=3D-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib > | + endif > | +@@ -43,8 +43,8 @@ > | =20 > | UI_SPEEX=3D$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) > | UIS_SPEEX=3D$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/spee= x.h) > | @@ -14,7 +23,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | ifneq (${UI_SPEEX},) > | MODSPEEX=3Dcodec_speex.so > | LIBSPEEX+=3D-lspeex -lm > | -@@ -43,14 +43,14 @@ > | +@@ -56,14 +56,14 @@ > | endif > | ifneq (${ULI_SPEEX},) > | MODSPEEX=3Dcodec_speex.so > | @@ -33,7 +42,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | LIBSPEEX+=3D-lspeex -lm > | endif > | =20 > | -@@ -65,7 +65,7 @@ > | +@@ -78,7 +78,7 @@ > | LIBLPC10=3Dlpc10/liblpc10.a > | =20 > | ifeq ($(findstring BSD,${OSARCH}),BSD) > | @@ -42,7 +51,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | endif > | =20 > | CODECS+=3D$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.= so \ > | -@@ -126,7 +126,7 @@ > | +@@ -139,7 +139,7 @@ > | endif > | =20 > | install: all > 1.1 +17 -0 ports/net/asterisk12/files/patch-codecs::codec_zap= .c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-codecs::codec_= zap.c?rev=3D1.1&content-type=3Dtext/plain > 1.9 +22 -4 ports/net/asterisk12/files/patch-res::Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-res::Makefile.= diff?r1=3D1.8&r2=3D1.9 > | --- ports/net/asterisk12/files/patch-res::Makefile 2006/01/17 22:27:45 = 1.8 > | +++ ports/net/asterisk12/files/patch-res::Makefile 2007/04/26 00:11:37 = 1.9 > | @@ -1,9 +1,27 @@ > | =20 > | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-res::Makefile,v 1.8 2006/01/17 22:27:45 sobomax Exp $ > | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-res::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $ > | =20 > | ---- res/Makefile > | +--- res/Makefile.orig > | +++ res/Makefile > | -@@ -37,8 +37,8 @@ > | +@@ -13,7 +13,8 @@ > | +=20 > | + MODS=3Dres_indications.so res_monitor.so res_adsi.so res_agi.so res_f= eatures.so > | +=20 > | +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wi= ldcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) > | ++ifdef WITH_ODBC > | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wi= ldcard $(CROSS_COMPILE_TARGET)${LOCALBASE}/include/odbcinst.h),) > | + ifneq (${OSARCH},FreeBSD) > | + MODS+=3Dres_config_odbc.so > | + else > | +@@ -21,6 +22,7 @@ > | + endif > | + MODS+=3Dres_odbc.so > | + endif > | ++endif > | +=20 > | + ifneq ($(NOCRYPTO),yes) > | + MODS+=3Dres_crypto.so > | +@@ -37,8 +39,8 @@ > | endif > | =20 > | ifeq ($(findstring BSD,${OSARCH}),BSD) > | @@ -14,7 +32,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | endif > | =20 > | ifeq (${OSARCH},CYGWIN) > | -@@ -55,9 +55,7 @@ > | +@@ -55,9 +57,7 @@ > | CFLAGS+=3D > | =20 > | ifndef WITHOUT_ZAPTEL > | @@ -24,7 +42,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | endif # WITHOUT_ZAPTEL > | =20 > | # > | -@@ -75,7 +73,7 @@ > | +@@ -75,7 +75,7 @@ > | rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h > | rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so=20 > | rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so > 1.1 +14 -0 ports/net/asterisk12/files/patch-res::res_musiconh= old.c (new) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-res::res_music= onhold.c?rev=3D1.1&content-type=3Dtext/plain > 1.6 +0 -17 ports/net/asterisk12/files/patch-rtp.c (dead) > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-rtp.c?rev=3D1.= 5&content-type=3Dtext/plain > 1.2 +5 -7 ports/net/asterisk12/files/patch-utils::Makefile > http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-utils::Makefil= e.diff?r1=3D1.1&r2=3D1.2 > | --- ports/net/asterisk12/files/patch-utils::Makefile 2006/01/17 22:27:4= 5 1.1 > | +++ ports/net/asterisk12/files/patch-utils::Makefile 2007/04/26 00:11:3= 7 1.2 > | @@ -1,9 +1,6 @@ > | - > | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/pa= tch-utils::Makefile,v 1.1 2006/01/17 22:27:45 sobomax Exp $ > | - > | ---- utils/Makefile > | -+++ utils/Makefile > | -@@ -17,16 +17,16 @@ > | +--- utils/Makefile.orig Wed Jan 24 19:43:50 2007 > | ++++ utils/Makefile Mon Apr 16 16:37:31 2007 > | +@@ -17,17 +17,17 @@ > | CFLAGS+=3D-DNO_AST_MM > | =20 > | ifeq ($(findstring BSD,${OSARCH}),BSD) > | @@ -11,6 +8,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | + CFLAGS+=3D-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_C= OMPILE_TARGET)$(LOCALBASE)/lib > | endif > | =20 > | + # to get check_expr, add it to the TARGET list > | TARGET=3Dstereorize streamplayer > | =20 > | -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildca= rd -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) > | @@ -23,7 +21,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD > | TARGET+=3Dastman > | endif > | =20 > | -@@ -40,7 +40,7 @@ > | +@@ -41,7 +41,7 @@ > | install: > | for x in $(TARGET); do \ > | if [ "$$x" !=3D "none" ]; then \ > 1.24 +12 -0 ports/net/asterisk12/pkg-plist > http://cvsweb.FreeBSD.org/ports/net/asterisk12/pkg-plist.diff?r1=3D1.23&r= 2=3D1.24 > | --- ports/net/asterisk12/pkg-plist 2007/01/03 16:18:06 1.23 > | +++ ports/net/asterisk12/pkg-plist 2007/04/26 00:11:37 1.24 > | @@ -329,6 +329,7 @@ lib/asterisk/modules/codec_ilbc.so > | lib/asterisk/modules/codec_lpc10.so > | lib/asterisk/modules/codec_speex.so > | lib/asterisk/modules/codec_ulaw.so > | +%%WITH_ZAPTEL%%lib/asterisk/modules/codec_zap.so > | lib/asterisk/modules/format_au.so > | lib/asterisk/modules/format_g723_1.so > | lib/asterisk/modules/format_g726.so > | @@ -621,6 +622,16 @@ sbin/streamplayer > | %%DATADIR%%/sounds/queue-youarenext.gsm > | %%DATADIR%%/sounds/screen-callee-options.gsm > | %%DATADIR%%/sounds/seconds.gsm > | +%%DATADIR%%/sounds/silence/1.gsm > | +%%DATADIR%%/sounds/silence/10.gsm > | +%%DATADIR%%/sounds/silence/2.gsm > | +%%DATADIR%%/sounds/silence/3.gsm > | +%%DATADIR%%/sounds/silence/4.gsm > | +%%DATADIR%%/sounds/silence/5.gsm > | +%%DATADIR%%/sounds/silence/6.gsm > | +%%DATADIR%%/sounds/silence/7.gsm > | +%%DATADIR%%/sounds/silence/8.gsm > | +%%DATADIR%%/sounds/silence/9.gsm > | %%DATADIR%%/sounds/spy-agent.gsm > | %%DATADIR%%/sounds/spy-h323.gsm > | %%DATADIR%%/sounds/spy-iax.gsm > | @@ -735,6 +746,7 @@ sbin/streamplayer > | %%DATADIR%%/sounds/vm-whichbox.gsm > | %%DATADIR%%/sounds/vm-youhave.gsm > | @exec mkdir -p %%DATADIR%%/sounds/priv-callerintros > | +@dirrm %%DATADIR%%/sounds/silence > | @dirrm %%DATADIR%%/sounds/priv-callerintros > | @dirrm %%DATADIR%%/sounds/phonetic > | @dirrm %%DATADIR%%/sounds/letters >=20 --yrj/dFKFPuw6o+aM Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFGL+/OWry0BWjoQKURAoyvAJ4t3GJSBq4ajRPVNejwlSPyaPSZUgCeN0rQ xr/qQK5H7cqgb9c8RQWg9yA= =pSVR -----END PGP SIGNATURE----- --yrj/dFKFPuw6o+aM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070426001822.GA79250>