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 ...
Kris Kennaway
kris at obsecurity.org
Thu Apr 26 00:18:24 UTC 2007
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
>
> FreeBSD ports repository
>
> Modified files:
> misc/zaptel Makefile distinfo pkg-plist
> misc/libpri Makefile distinfo
> net/asterisk12 Makefile distinfo pkg-plist
> net/asterisk12/files patch-Makefile patch-apps::Makefile
> patch-cdr::Makefile
> patch-channels::Makefile
> patch-channels::chan_zap.c
> patch-codecs::Makefile
> patch-res::Makefile patch-utils::Makefile
> Added files:
> misc/zaptel/files patch-Makefile patch-test::Makefile
> net/asterisk12/files patch-apps::app_flash.c
> patch-apps::app_meetme.c
> patch-apps::app_rpt.c
> patch-apps::app_zapbarge.c
> patch-apps::app_zapras.c
> patch-apps::app_zapscan.c patch-channel.c
> patch-channels::chan_iax2.c
> patch-channels::h323::Makefile
> patch-codecs::codec_zap.c
> patch-res::res_musiconhold.c
> Removed files:
> misc/zaptel/files patch-qozap::Makefile
> patch-qozap::qozap_freebsd.c
> patch-tau32pci::tau32pci.c
> patch-wcfxo::wcfxo.c patch-wcfxs::wcfxs.c
> patch-wct1xxp::wct1xxp.c
> patch-wct4xxp::wct4xxp.c
> patch-wcte11xp::wcte11xp.c
> patch-zaphfc::Makefile
> patch-zaphfc::zaphfc_freebsd.c
> misc/libpri/files patch-mkdep
> net/asterisk12/files patch-rtp.c
> Log:
> o Update zaptel to 1.4.1;
>
> Submitted by: Oleksandr Tymoshenko <gonzo at pbxpress.com>
>
> o update libpri to 1.4.0;
>
> PR: 111555
> Submitted by: "Phillip N." <pneumann at gmail.com>
>
> o update asterisk12 to 1.2.7.
>
> Sponsored by: Sippy Software, Inc. ( http://www.sippysoft.com/ )
>
> The reason it all is going in together is that they are interdependent.
>
> Revision Changes Path
> 1.13 +2 -8 ports/misc/libpri/Makefile
> http://cvsweb.FreeBSD.org/ports/misc/libpri/Makefile.diff?r1=1.12&r2=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 at 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 $
> | #
> |
> | PORTNAME= libpri
> | -PORTVERSION= 1.2.4
> | +PORTVERSION= 1.4.0
> | CATEGORIES= misc
> | MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \
> | ftp://ftp.digium.com/pub/libpri/old/
> | @@ -14,15 +14,9 @@ MASTER_SITES= ftp://ftp.digium.com/pub/l
> | MAINTAINER= gonzo at univ.kiev.ua
> | COMMENT= A C implementation of the Primary Rate ISDN specification
> |
> | -#PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
> | -#PATCH_SITES= ${MASTER_SITE_LOCAL}
> | -#PATCH_SITE_SUBDIR= fjoe
> | -#PATCH_DIST_STRIP= -p1
> | -#BRIVER= bristuff-0.3.0-PRE-1l
> | -
> | USE_GMAKE= yes
> | USE_LDCONFIG= yes
> | -PLIST_FILES= include/libpri.h lib/libpri.a lib/libpri.a lib/libpri.so \
> | +PLIST_FILES= include/libpri.h lib/libpri.a lib/libpri.so \
> | lib/libpri.so.1
> |
> | NOT_FOR_ARCHS= alpha
> 1.10 +3 -3 ports/misc/libpri/distinfo
> http://cvsweb.FreeBSD.org/ports/misc/libpri/distinfo.diff?r1=1.9&r2=1.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) = 2bc348d8363027736ccbf5998d85d317
> | -SHA256 (libpri-1.2.4.tar.gz) = bbfaf5dff54934d844b3785e3fbd19817f0d80b1aa84153e5be40802c6b00d93
> | -SIZE (libpri-1.2.4.tar.gz) = 76663
> | +MD5 (libpri-1.4.0.tar.gz) = 09b039226e43a810d523bc076823c6a9
> | +SHA256 (libpri-1.4.0.tar.gz) = 9f4db10a105545e68cbe0620795d2e11278828fa281ad339eeb72087125eeaf9
> | +SIZE (libpri-1.4.0.tar.gz) = 80021
> 1.2 +0 -8 ports/misc/libpri/files/patch-mkdep (dead)
> http://cvsweb.FreeBSD.org/ports/misc/libpri/files/patch-mkdep?rev=1.1&content-type=text/plain
> 1.27 +1 -2 ports/misc/zaptel/Makefile
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/Makefile.diff?r1=1.26&r2=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 at 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 $
> | #
> |
> | PORTNAME= zaptel
> | -PORTVERSION= 1.2.13
> | +PORTVERSION= 1.4.1
> | CATEGORIES= misc
> | MASTER_SITES= http://www.pbxpress.com/~gonzo/
> | DISTNAME= ${PORTNAME}-bsd-${PORTVERSION}
> | @@ -46,7 +46,6 @@ pre-su-install:
> | @${MKDIR} ${PREFIX}/lib/zaptel
> |
> | post-install:
> | - @${LN} -sfh ${PREFIX}/include ${PREFIX}/include/zaptel
> | @${TOUCH} ${PREFIX}/lib/zaptel/linker.hints
> | @${CAT} ${PKGMESSAGE}
> |
> 1.15 +3 -3 ports/misc/zaptel/distinfo
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/distinfo.diff?r1=1.14&r2=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) = d5d01a5c367969c302d1d70620e9c236
> | -SHA256 (zaptel-bsd-1.2.13.tar.gz) = c2032a94514016df28f788986aef7d099987aa1d4a62c4ea232af79c3b42a4c4
> | -SIZE (zaptel-bsd-1.2.13.tar.gz) = 363975
> | +MD5 (zaptel-bsd-1.4.1.tar.gz) = 34af06241beee361b6a696b20d294d36
> | +SHA256 (zaptel-bsd-1.4.1.tar.gz) = 9da4724c1a5a269e0b89d791fa5cc0758d4de48ce7b3e6cc0c0aad4427ccc37f
> | +SIZE (zaptel-bsd-1.4.1.tar.gz) = 1009671
> 1.5 +12 -0 ports/misc/zaptel/files/patch-Makefile (new)
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-Makefile?rev=1.5&content-type=text/plain
> 1.4 +0 -14 ports/misc/zaptel/files/patch-qozap::Makefile (dead)
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-qozap::Makefile?rev=1.3&content-type=text/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_freebsd.c?rev=1.3&content-type=text/plain
> 1.2 +0 -24 ports/misc/zaptel/files/patch-tau32pci::tau32pci.c (dead)
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-tau32pci::tau32pci.c?rev=1.1&content-type=text/plain
> 1.6 +14 -0 ports/misc/zaptel/files/patch-test::Makefile (new)
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-test::Makefile?rev=1.6&content-type=text/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?rev=1.3&content-type=text/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?rev=1.3&content-type=text/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=1.1&content-type=text/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=1.1&content-type=text/plain
> 1.2 +0 -30 ports/misc/zaptel/files/patch-wcte11xp::wcte11xp.c (dead)
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-wcte11xp::wcte11xp.c?rev=1.1&content-type=text/plain
> 1.3 +0 -16 ports/misc/zaptel/files/patch-zaphfc::Makefile (dead)
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-zaphfc::Makefile?rev=1.2&content-type=text/plain
> 1.2 +0 -32 ports/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c (dead)
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/files/patch-zaphfc::zaphfc_freebsd.c?rev=1.1&content-type=text/plain
> 1.9 +5 -3 ports/misc/zaptel/pkg-plist
> http://cvsweb.FreeBSD.org/ports/misc/zaptel/pkg-plist.diff?r1=1.8&r2=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
> | + at dirrm include/zaptel
> 1.69 +5 -6 ports/net/asterisk12/Makefile
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/Makefile.diff?r1=1.68&r2=1.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 at portaone.com>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/Makefile,v 1.68 2007/04/13 17:45:44 sobomax Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/Makefile,v 1.69 2007/04/26 00:11:36 sobomax Exp $
> | #
> |
> | PORTNAME= asterisk
> | -PORTVERSION= 1.2.13
> | -PORTREVISION= 4
> | +PORTVERSION= 1.2.17
> | PKGNAMESUFFIX= 12
> | CATEGORIES= net
> | MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
> | http://ftp.digium.com/pub/asterisk/old-releases/
> |
> | -PATCHFILES= asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz
> | -PATCH_SITES= http://unofficial.portaone.com/~bamby/public/
> | +PATCHFILES= asterisk-1.2.17-codec-negotiation-20070416.diff.gz
> | +PATCH_SITES= http://sobomax.homeunix.org/~sobomax/
> |
> | # ${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff
> | # ${MASTER_SITE_LOCAL:S,$,:bristuff,}
> | @@ -67,9 +66,9 @@ PLIST_SUB+= WITH_ZAPTEL="@comment "
> | MAKE_ENV+= WITHOUT_ZAPTEL=1
> | .else
> | BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \
> | - ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
> | + ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
> | LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri
> | -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
> | +RUN_DEPENDS+= ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
> | PLIST_SUB+= WITH_ZAPTEL=""
> | MAKE_ENV+= WITH_ZAPTEL=1
> | .endif
> 1.22 +6 -6 ports/net/asterisk12/distinfo
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/distinfo.diff?r1=1.21&r2=1.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) = ad8fbe2198568f55c254045ecb3b7926
> | -SHA256 (asterisk-1.2.13.tar.gz) = 8d197b118d9ee25bc8793b37d1daa6b54fd6074e6738f462368361e5698d98f8
> | -SIZE (asterisk-1.2.13.tar.gz) = 10584113
> | -MD5 (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) = 026e8448febfc83a458fc1a667e10541
> | -SHA256 (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) = 9b97de229778898297d5aaed1df5530c2ae850543c1af0343105c2286395f7c5
> | -SIZE (asterisk-1.2.12.1-codec-negotiation-20061009.diff.gz) = 32863
> | +MD5 (asterisk-1.2.17.tar.gz) = 1a41a1f4a535813b1272bae0545c7990
> | +SHA256 (asterisk-1.2.17.tar.gz) = ab20ada37e0f2874a0c59ac7d5395c5980419da6344cbb78b60874e9b8631cf1
> | +SIZE (asterisk-1.2.17.tar.gz) = 10615354
> | +MD5 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = 9e31b80a8a9ca26afe9c62f62e6401f7
> | +SHA256 (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = c715dd17259902ee1068ef2b1844f726570598e2d945f92233c42b0702abc2c6
> | +SIZE (asterisk-1.2.17-codec-negotiation-20070416.diff.gz) = 32987
> 1.18 +25 -11 ports/net/asterisk12/files/patch-Makefile
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-Makefile.diff?r1=1.17&r2=1.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/patch-Makefile,v 1.18 2007/04/26 00:11:37 sobomax Exp $
> | +
> | +--- Makefile.orig
> | ++++ Makefile
> | @@ -19,8 +19,8 @@
> | # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
> | # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
> | @@ -144,7 +147,7 @@
> | 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)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
> | ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
> | endif
> |
> | @@ -219,13 +222,15 @@
> |
> | muted: muted.o
> | $(CC) $(AUDIO_LIBS) -o muted muted.o
> | -@@ -552,38 +549,38 @@
> | +@@ -552,12 +549,12 @@
> |
> | datafiles: all
> | if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/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-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* 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 @@
> |
> | update:
> | @if [ -d .svn ]; then \
> | -@@ -631,47 +628,47 @@
> | +@@ -640,47 +637,47 @@
> | OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
> |
> | bininstall: all
> | @@ -371,7 +385,7 @@
> | else \
> | echo "You need to do cvs update -d not just cvs update" ; \
> | fi
> | -@@ -701,46 +698,28 @@
> | +@@ -710,46 +707,28 @@
> | echo " WARNING WARNING WARNING" ;\
> | fi
> |
> | @@ -425,7 +439,7 @@
> | if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
> | if [ "$(OVERWRITE)" = "y" ]; then \
> | if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
> | -@@ -753,7 +732,7 @@
> | +@@ -762,7 +741,7 @@
> | continue; \
> | fi ;\
> | fi ; \
> | @@ -434,7 +448,7 @@
> | done
> | if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
> | ( \
> | -@@ -813,25 +792,25 @@
> | +@@ -822,25 +801,25 @@
> | echo "; Default: strict"; \
> | echo ";"; \
> | echo ";translation_algorithm = 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-isunavail; do \
> | cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/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" && 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
> | @@ -478,7 +492,7 @@
> | done
> | @echo " +--------- Asterisk Web Voicemail ----------+"
> | @echo " + +"
> | -@@ -874,10 +853,10 @@
> | +@@ -883,10 +862,10 @@
> |
> | __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=1.8&r2=1.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/patch-apps::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $
> | +
> | +--- apps/Makefile.orig
> | ++++ apps/Makefile
> | @@ -45,25 +45,27 @@
> | #APPS+=app_rpt.so
> |
> | 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+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_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_flash.c?rev=1.1&content-type=text/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_meetme.c?rev=1.1&content-type=text/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=1.1&content-type=text/plain
> 1.1 +14 -0 ports/net/asterisk12/files/patch-apps::app_zapbarge.c (new)
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-apps::app_zapbarge.c?rev=1.1&content-type=text/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_zapras.c?rev=1.1&content-type=text/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_zapscan.c?rev=1.1&content-type=text/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=1.8&r2=1.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/patch-cdr::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $
> | +
> | +--- cdr/Makefile.orig
> | ++++ cdr/Makefile
> | @@ -21,8 +21,8 @@
> | endif
> |
> | @@ -11,14 +14,16 @@
> | endif
> |
> | #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)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
> | ++ifdef WITH_ODBC
> | +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),)
> | MODS+=cdr_odbc.so
> | endif
> | ++endif
> |
> | #
> | # FreeTDS stuff...
> | @@ -38,16 +43,29 @@
> | CFLAGS += -DFREETDS_0_62
> | else
> | CFLAGS += -DFREETDS_PRE_0_62
> | -@@ -65,7 +65,7 @@
> | +@@ -65,7 +67,7 @@
> | #
> | # PGSQL stuff... Autoconf anyone??
> | #
> | --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
> | -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
> | +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
> | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
> | MODS+=cdr_pgsql.so
> | endif
> |
> | -@@ -86,9 +86,9 @@
> | +@@ -76,9 +78,9 @@
> | + MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/postgresql
> | + endif
> | +
> | +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include),)
> | +- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include
> | +- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/pgsql/lib
> | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include),)
> | ++ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include
> | ++ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/lib
> | + endif
> | +
> | + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql),)
> | +@@ -86,9 +88,9 @@
> | MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql
> | endif
> |
> | @@ -60,7 +78,7 @@
> | endif
> |
> | ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
> | -@@ -114,7 +114,7 @@
> | +@@ -114,7 +116,7 @@
> | all: depend $(MODS)
> |
> | 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=1.1&content-type=text/plain
> 1.13 +9 -9 ports/net/asterisk12/files/patch-channels::Makefile
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::Makefile.diff?r1=1.12&r2=1.13
> | --- ports/net/asterisk12/files/patch-channels::Makefile 2006/04/26 11:31:03 1.12
> | +++ ports/net/asterisk12/files/patch-channels::Makefile 2007/04/26 00:11:37 1.13
> | @@ -1,9 +1,9 @@
> |
> | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-channels::Makefile,v 1.12 2006/04/26 11:31:03 fjoe Exp $
> | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-channels::Makefile,v 1.13 2007/04/26 00:11:37 sobomax Exp $
> |
> | --- channels/Makefile.orig
> | +++ channels/Makefile
> | -@@ -48,8 +48,8 @@
> | +@@ -50,8 +50,8 @@
> | endif
> |
> | ifeq (${OSARCH},FreeBSD)
> | @@ -14,7 +14,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | CHANH323LIB=-pthread
> | endif
> |
> | -@@ -73,11 +73,11 @@
> | +@@ -75,11 +75,11 @@
> | SOLINK+=-lrt
> | endif
> |
> | @@ -28,7 +28,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | CHANNEL_LIBS+=chan_h323.so
> | endif
> |
> | -@@ -91,12 +91,12 @@
> | +@@ -94,12 +94,12 @@
> | CHANNEL_LIBS+=chan_alsa.so
> | endif
> |
> | @@ -43,12 +43,12 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | CFLAGS+=-DZAPATA_R2
> | ZAPR2=-lmfcr2
> | endif
> | -@@ -109,12 +109,12 @@
> | +@@ -112,12 +112,12 @@
> | endif
> |
> | 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)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
> | ifeq (${OSARCH},NetBSD)
> | SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
> | endif
> | @@ -58,7 +58,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | endif
> | CFLAGS+=-DIAX_TRUNKING
> | CHANNEL_LIBS+=chan_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 $(H323LDLIBS) -lstdc++
> | else
> | @@ -70,8 +70,8 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | + $(MAKE) -C h323 ast_h323.o
> | endif
> |
> | - 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 $@ $<
> |
> | install: all
> 1.3 +14 -0 ports/net/asterisk12/files/patch-channels::chan_iax2.c (new)
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::chan_iax2.c?rev=1.3&content-type=text/plain
> 1.5 +19 -6 ports/net/asterisk12/files/patch-channels::chan_zap.c
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::chan_zap.c.diff?r1=1.4&r2=1.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 @@
> |
> | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-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/patch-channels::chan_zap.c,v 1.5 2007/04/26 00:11:37 sobomax Exp $
> |
> | ---- 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
> | +@@ -2464,6 +2465,19 @@
> | }
> |
> | ast_mutex_lock(&p->lock);
> | @@ -31,7 +44,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> |
> | index = zt_get_index(ast, p, 1);
> |
> | -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data)
> | +@@ -6323,7 +6337,37 @@
> | ast_setstate(chan, AST_STATE_RING);
> | chan->rings = 1;
> | p->ringt = 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 = 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::Makefile (new)
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-channels::h323::Makefile?rev=1.7&content-type=text/plain
> 1.9 +15 -6 ports/net/asterisk12/files/patch-codecs::Makefile
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-codecs::Makefile.diff?r1=1.8&r2=1.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 @@
> |
> | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-codecs::Makefile,v 1.8 2006/01/17 22:27:45 sobomax Exp $
> | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-codecs::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $
> |
> | ---- 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
> | +
> | + 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)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
> | + ifeq (${OSARCH},NetBSD)
> | + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
> | + endif
> | +@@ -43,8 +43,8 @@
> |
> | UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h)
> | UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h)
> | @@ -14,7 +23,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | ifneq (${UI_SPEEX},)
> | MODSPEEX=codec_speex.so
> | LIBSPEEX+=-lspeex -lm
> | -@@ -43,14 +43,14 @@
> | +@@ -56,14 +56,14 @@
> | endif
> | ifneq (${ULI_SPEEX},)
> | MODSPEEX=codec_speex.so
> | @@ -33,7 +42,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | LIBSPEEX+=-lspeex -lm
> | endif
> |
> | -@@ -65,7 +65,7 @@
> | +@@ -78,7 +78,7 @@
> | LIBLPC10=lpc10/liblpc10.a
> |
> | ifeq ($(findstring BSD,${OSARCH}),BSD)
> | @@ -42,7 +51,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | endif
> |
> | CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \
> | -@@ -126,7 +126,7 @@
> | +@@ -139,7 +139,7 @@
> | endif
> |
> | 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=1.1&content-type=text/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=1.8&r2=1.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 @@
> |
> | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-res::Makefile,v 1.8 2006/01/17 22:27:45 sobomax Exp $
> | +$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-res::Makefile,v 1.9 2007/04/26 00:11:37 sobomax Exp $
> |
> | ---- res/Makefile
> | +--- res/Makefile.orig
> | +++ res/Makefile
> | -@@ -37,8 +37,8 @@
> | +@@ -13,7 +13,8 @@
> | +
> | + MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
> | +
> | +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
> | ++ifdef WITH_ODBC
> | ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)${LOCALBASE}/include/odbcinst.h),)
> | + ifneq (${OSARCH},FreeBSD)
> | + MODS+=res_config_odbc.so
> | + else
> | +@@ -21,6 +22,7 @@
> | + endif
> | + MODS+=res_odbc.so
> | + endif
> | ++endif
> | +
> | + ifneq ($(NOCRYPTO),yes)
> | + MODS+=res_crypto.so
> | +@@ -37,8 +39,8 @@
> | endif
> |
> | ifeq ($(findstring BSD,${OSARCH}),BSD)
> | @@ -14,7 +32,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | endif
> |
> | ifeq (${OSARCH},CYGWIN)
> | -@@ -55,9 +55,7 @@
> | +@@ -55,9 +57,7 @@
> | CFLAGS+=
> |
> | ifndef WITHOUT_ZAPTEL
> | @@ -24,7 +42,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | endif # WITHOUT_ZAPTEL
> |
> | #
> | -@@ -75,7 +73,7 @@
> | +@@ -75,7 +75,7 @@
> | rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
> | rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so
> | rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
> 1.1 +14 -0 ports/net/asterisk12/files/patch-res::res_musiconhold.c (new)
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-res::res_musiconhold.c?rev=1.1&content-type=text/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=1.5&content-type=text/plain
> 1.2 +5 -7 ports/net/asterisk12/files/patch-utils::Makefile
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/files/patch-utils::Makefile.diff?r1=1.1&r2=1.2
> | --- ports/net/asterisk12/files/patch-utils::Makefile 2006/01/17 22:27:45 1.1
> | +++ ports/net/asterisk12/files/patch-utils::Makefile 2007/04/26 00:11:37 1.2
> | @@ -1,9 +1,6 @@
> | -
> | -$FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/asterisk12/files/patch-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+=-DNO_AST_MM
> |
> | ifeq ($(findstring BSD,${OSARCH}),BSD)
> | @@ -11,6 +8,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | + CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
> | endif
> |
> | + # to get check_expr, add it to the TARGET list
> | TARGET=stereorize streamplayer
> |
> | -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
> | @@ -23,7 +21,7 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
> | TARGET+=astman
> | endif
> |
> | -@@ -40,7 +40,7 @@
> | +@@ -41,7 +41,7 @@
> | install:
> | for x in $(TARGET); do \
> | if [ "$$x" != "none" ]; then \
> 1.24 +12 -0 ports/net/asterisk12/pkg-plist
> http://cvsweb.FreeBSD.org/ports/net/asterisk12/pkg-plist.diff?r1=1.23&r2=1.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
> | + at dirrm %%DATADIR%%/sounds/silence
> | @dirrm %%DATADIR%%/sounds/priv-callerintros
> | @dirrm %%DATADIR%%/sounds/phonetic
> | @dirrm %%DATADIR%%/sounds/letters
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-ports/attachments/20070426/9410a50a/attachment.pgp
More information about the cvs-ports
mailing list