diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2006-03-15 08:09:24 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2006-03-15 08:09:24 +0000 |
| commit | 65d0eb460a7be319131fadd10994272b39fdd361 (patch) | |
| tree | 39f74f6ca4d01abc927e6d5535ccfdbbe73c05d2 | |
| parent | 0395d9a7eb833c5468750d215ec9af1f816a39ad (diff) | |
| download | ports-65d0eb460a7be319131fadd10994272b39fdd361.tar.gz ports-65d0eb460a7be319131fadd10994272b39fdd361.zip | |
Notes
42 files changed, 414 insertions, 258 deletions
diff --git a/misc/libpri-bristuff/Makefile b/misc/libpri-bristuff/Makefile index ffb4303050fa..812cffec9e3c 100644 --- a/misc/libpri-bristuff/Makefile +++ b/misc/libpri-bristuff/Makefile @@ -6,20 +6,20 @@ # PORTNAME= libpri -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= misc MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \ ftp://ftp.digium.com/pub/libpri/old/ -#PATCHFILES= ${PORTNAME}-1.0.8-${BRIVER}.patch.gz -#PATCH_SITES= ${MASTER_SITE_LOCAL} -#PATCH_SITE_SUBDIR= fjoe -#PATCH_DIST_STRIP= -p1 +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe +PATCH_DIST_STRIP= -p1 MAINTAINER= gonzo@univ.kiev.ua COMMENT= A C implementation of the Primary Rate ISDN specification -BRIVER= bristuff-0.2.0-RC8h +BRIVER= bristuff-0.3.0-PRE-1l USE_GMAKE= yes INSTALLS_SHLIB= yes diff --git a/misc/libpri-bristuff/distinfo b/misc/libpri-bristuff/distinfo index 24cfb7ccd8ac..cfa28374603b 100644 --- a/misc/libpri-bristuff/distinfo +++ b/misc/libpri-bristuff/distinfo @@ -1,3 +1,6 @@ -MD5 (libpri-1.2.1.tar.gz) = d039b171514ec8b1a163b0875f76734e -SHA256 (libpri-1.2.1.tar.gz) = b34ef6f1bcac7ed8aa64e4cbcffad0f4c364a911e8c7509a1ba26280046d22f8 -SIZE (libpri-1.2.1.tar.gz) = 75687 +MD5 (libpri-1.2.2.tar.gz) = efce9c3699110588df5e4cf09eae01d9 +SHA256 (libpri-1.2.2.tar.gz) = 168fce4699b77c1ac5ae176237dae2f289714be95ddd2fe8bdc25a22f00318dd +SIZE (libpri-1.2.2.tar.gz) = 76070 +MD5 (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = e24e00f07601f6c43fb3825d0e67af3c +SHA256 (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 92b4a8e5a36bb772b8cfc7e8563d4c422dec9415bc1f3247179a83ddf8352fdf +SIZE (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 43755 diff --git a/misc/libpri-bristuff/files/patch-Makefile b/misc/libpri-bristuff/files/patch-Makefile index 087b757839b9..e32cf46a3c84 100644 --- a/misc/libpri-bristuff/files/patch-Makefile +++ b/misc/libpri-bristuff/files/patch-Makefile @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile +--- Makefile.orig Sat Feb 25 12:53:36 2006 ++++ Makefile Sat Feb 25 12:56:28 2006 @@ -27,7 +27,7 @@ # Uncomment if you want libpri to count number of Q921/Q931 sent/received #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS @@ -12,7 +9,7 @@ $FreeBSD$ OSARCH=$(shell uname -s) PROC?=$(shell uname -m) -@@ -35,11 +35,11 @@ +@@ -35,12 +35,12 @@ TOBJS=testpri.o T2OBJS=testprilib.o STATIC_LIBRARY=libpri.a @@ -20,26 +17,23 @@ $FreeBSD$ +DYNAMIC_LIBRARY=libpri.so.1 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) +-CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB -INSTALL_PREFIX?= -+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) +-INSTALL_BASE=/usr ++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB +INSTALL_PREFIX=$(PREFIX) - INSTALL_BASE=/usr - SOFLAGS = -Wl,-hlibpri.so.1 ++INSTALL_BASE= + SOFLAGS = -Wl,-hlibpri.so.1.0 LDCONFIG = /sbin/ldconfig -@@ -81,20 +81,19 @@ - fi - - install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) -- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include -+ mkdir -p $(INSTALL_PREFIX)/lib -+ mkdir -p $(INSTALL_PREFIX)/include + ifeq (${OSARCH},Linux) +@@ -84,12 +84,11 @@ + mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib + mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include ifneq (${OSARCH},SunOS) - install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include - install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi -- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ) +- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 ) - install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - if test $$(id -u) = 0; then $(LDCONFIG); fi + echo installing libpri.h @@ -48,22 +42,13 @@ $FreeBSD$ + ( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ) + $(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib else -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) -- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) ) -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY) -+ install -f $(INSTALL_PREFIX)/include -m 644 libpri.h -+ install -f $(INSTALL_PREFIX)/lib -m 755 $(DYNAMIC_LIBRARY) -+ ( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) ) -+ install -f $(INSTALL_PREFIX)/lib -m 644 $(STATIC_LIBRARY) - endif - - uninstall: + install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h + install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) @@ -130,7 +129,6 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . - ln -sf libpri.so.1 libpri.so + ln -sf libpri.so.1.0 libpri.so + ln -sf libpri.so.1.0 libpri.so.1 $(SOSLINK) - diff --git a/misc/libpri-bristuff/pkg-plist b/misc/libpri-bristuff/pkg-plist index ccbeae646ef3..e552b67c0b2a 100644 --- a/misc/libpri-bristuff/pkg-plist +++ b/misc/libpri-bristuff/pkg-plist @@ -1,4 +1,4 @@ include/libpri.h lib/libpri.a -lib/libpri.so.1 lib/libpri.so +lib/libpri.so.1 diff --git a/misc/libpri/Makefile b/misc/libpri/Makefile index ffb4303050fa..812cffec9e3c 100644 --- a/misc/libpri/Makefile +++ b/misc/libpri/Makefile @@ -6,20 +6,20 @@ # PORTNAME= libpri -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= misc MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \ ftp://ftp.digium.com/pub/libpri/old/ -#PATCHFILES= ${PORTNAME}-1.0.8-${BRIVER}.patch.gz -#PATCH_SITES= ${MASTER_SITE_LOCAL} -#PATCH_SITE_SUBDIR= fjoe -#PATCH_DIST_STRIP= -p1 +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe +PATCH_DIST_STRIP= -p1 MAINTAINER= gonzo@univ.kiev.ua COMMENT= A C implementation of the Primary Rate ISDN specification -BRIVER= bristuff-0.2.0-RC8h +BRIVER= bristuff-0.3.0-PRE-1l USE_GMAKE= yes INSTALLS_SHLIB= yes diff --git a/misc/libpri/distinfo b/misc/libpri/distinfo index 24cfb7ccd8ac..cfa28374603b 100644 --- a/misc/libpri/distinfo +++ b/misc/libpri/distinfo @@ -1,3 +1,6 @@ -MD5 (libpri-1.2.1.tar.gz) = d039b171514ec8b1a163b0875f76734e -SHA256 (libpri-1.2.1.tar.gz) = b34ef6f1bcac7ed8aa64e4cbcffad0f4c364a911e8c7509a1ba26280046d22f8 -SIZE (libpri-1.2.1.tar.gz) = 75687 +MD5 (libpri-1.2.2.tar.gz) = efce9c3699110588df5e4cf09eae01d9 +SHA256 (libpri-1.2.2.tar.gz) = 168fce4699b77c1ac5ae176237dae2f289714be95ddd2fe8bdc25a22f00318dd +SIZE (libpri-1.2.2.tar.gz) = 76070 +MD5 (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = e24e00f07601f6c43fb3825d0e67af3c +SHA256 (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 92b4a8e5a36bb772b8cfc7e8563d4c422dec9415bc1f3247179a83ddf8352fdf +SIZE (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 43755 diff --git a/misc/libpri/files/patch-Makefile b/misc/libpri/files/patch-Makefile index 087b757839b9..e32cf46a3c84 100644 --- a/misc/libpri/files/patch-Makefile +++ b/misc/libpri/files/patch-Makefile @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile +--- Makefile.orig Sat Feb 25 12:53:36 2006 ++++ Makefile Sat Feb 25 12:56:28 2006 @@ -27,7 +27,7 @@ # Uncomment if you want libpri to count number of Q921/Q931 sent/received #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS @@ -12,7 +9,7 @@ $FreeBSD$ OSARCH=$(shell uname -s) PROC?=$(shell uname -m) -@@ -35,11 +35,11 @@ +@@ -35,12 +35,12 @@ TOBJS=testpri.o T2OBJS=testprilib.o STATIC_LIBRARY=libpri.a @@ -20,26 +17,23 @@ $FreeBSD$ +DYNAMIC_LIBRARY=libpri.so.1 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) +-CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB -INSTALL_PREFIX?= -+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) +-INSTALL_BASE=/usr ++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB +INSTALL_PREFIX=$(PREFIX) - INSTALL_BASE=/usr - SOFLAGS = -Wl,-hlibpri.so.1 ++INSTALL_BASE= + SOFLAGS = -Wl,-hlibpri.so.1.0 LDCONFIG = /sbin/ldconfig -@@ -81,20 +81,19 @@ - fi - - install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) -- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include -+ mkdir -p $(INSTALL_PREFIX)/lib -+ mkdir -p $(INSTALL_PREFIX)/include + ifeq (${OSARCH},Linux) +@@ -84,12 +84,11 @@ + mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib + mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include ifneq (${OSARCH},SunOS) - install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include - install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi -- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ) +- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 ) - install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - if test $$(id -u) = 0; then $(LDCONFIG); fi + echo installing libpri.h @@ -48,22 +42,13 @@ $FreeBSD$ + ( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ) + $(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib else -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) -- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) ) -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY) -+ install -f $(INSTALL_PREFIX)/include -m 644 libpri.h -+ install -f $(INSTALL_PREFIX)/lib -m 755 $(DYNAMIC_LIBRARY) -+ ( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) ) -+ install -f $(INSTALL_PREFIX)/lib -m 644 $(STATIC_LIBRARY) - endif - - uninstall: + install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h + install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) @@ -130,7 +129,6 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . - ln -sf libpri.so.1 libpri.so + ln -sf libpri.so.1.0 libpri.so + ln -sf libpri.so.1.0 libpri.so.1 $(SOSLINK) - diff --git a/misc/libpri/pkg-plist b/misc/libpri/pkg-plist index ccbeae646ef3..e552b67c0b2a 100644 --- a/misc/libpri/pkg-plist +++ b/misc/libpri/pkg-plist @@ -1,4 +1,4 @@ include/libpri.h lib/libpri.a -lib/libpri.so.1 lib/libpri.so +lib/libpri.so.1 diff --git a/misc/libpri2/Makefile b/misc/libpri2/Makefile index ffb4303050fa..812cffec9e3c 100644 --- a/misc/libpri2/Makefile +++ b/misc/libpri2/Makefile @@ -6,20 +6,20 @@ # PORTNAME= libpri -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= misc MASTER_SITES= ftp://ftp.digium.com/pub/libpri/ \ ftp://ftp.digium.com/pub/libpri/old/ -#PATCHFILES= ${PORTNAME}-1.0.8-${BRIVER}.patch.gz -#PATCH_SITES= ${MASTER_SITE_LOCAL} -#PATCH_SITE_SUBDIR= fjoe -#PATCH_DIST_STRIP= -p1 +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe +PATCH_DIST_STRIP= -p1 MAINTAINER= gonzo@univ.kiev.ua COMMENT= A C implementation of the Primary Rate ISDN specification -BRIVER= bristuff-0.2.0-RC8h +BRIVER= bristuff-0.3.0-PRE-1l USE_GMAKE= yes INSTALLS_SHLIB= yes diff --git a/misc/libpri2/distinfo b/misc/libpri2/distinfo index 24cfb7ccd8ac..cfa28374603b 100644 --- a/misc/libpri2/distinfo +++ b/misc/libpri2/distinfo @@ -1,3 +1,6 @@ -MD5 (libpri-1.2.1.tar.gz) = d039b171514ec8b1a163b0875f76734e -SHA256 (libpri-1.2.1.tar.gz) = b34ef6f1bcac7ed8aa64e4cbcffad0f4c364a911e8c7509a1ba26280046d22f8 -SIZE (libpri-1.2.1.tar.gz) = 75687 +MD5 (libpri-1.2.2.tar.gz) = efce9c3699110588df5e4cf09eae01d9 +SHA256 (libpri-1.2.2.tar.gz) = 168fce4699b77c1ac5ae176237dae2f289714be95ddd2fe8bdc25a22f00318dd +SIZE (libpri-1.2.2.tar.gz) = 76070 +MD5 (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = e24e00f07601f6c43fb3825d0e67af3c +SHA256 (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 92b4a8e5a36bb772b8cfc7e8563d4c422dec9415bc1f3247179a83ddf8352fdf +SIZE (libpri-1.2.2-bristuff-0.3.0-PRE-1l.patch.gz) = 43755 diff --git a/misc/libpri2/files/patch-Makefile b/misc/libpri2/files/patch-Makefile index 087b757839b9..e32cf46a3c84 100644 --- a/misc/libpri2/files/patch-Makefile +++ b/misc/libpri2/files/patch-Makefile @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile +--- Makefile.orig Sat Feb 25 12:53:36 2006 ++++ Makefile Sat Feb 25 12:56:28 2006 @@ -27,7 +27,7 @@ # Uncomment if you want libpri to count number of Q921/Q931 sent/received #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS @@ -12,7 +9,7 @@ $FreeBSD$ OSARCH=$(shell uname -s) PROC?=$(shell uname -m) -@@ -35,11 +35,11 @@ +@@ -35,12 +35,12 @@ TOBJS=testpri.o T2OBJS=testprilib.o STATIC_LIBRARY=libpri.a @@ -20,26 +17,23 @@ $FreeBSD$ +DYNAMIC_LIBRARY=libpri.so.1 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo --CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) +-CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB -INSTALL_PREFIX?= -+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) +-INSTALL_BASE=/usr ++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -DRELAX_TRB +INSTALL_PREFIX=$(PREFIX) - INSTALL_BASE=/usr - SOFLAGS = -Wl,-hlibpri.so.1 ++INSTALL_BASE= + SOFLAGS = -Wl,-hlibpri.so.1.0 LDCONFIG = /sbin/ldconfig -@@ -81,20 +81,19 @@ - fi - - install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) -- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include -+ mkdir -p $(INSTALL_PREFIX)/lib -+ mkdir -p $(INSTALL_PREFIX)/include + ifeq (${OSARCH},Linux) +@@ -84,12 +84,11 @@ + mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib + mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include ifneq (${OSARCH},SunOS) - install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include - install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi -- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ) +- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 ) - install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib - if test $$(id -u) = 0; then $(LDCONFIG); fi + echo installing libpri.h @@ -48,22 +42,13 @@ $FreeBSD$ + ( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ) + $(BSD_INSTALL_DATA) $(STATIC_LIBRARY) $(INSTALL_PREFIX)/lib else -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) -- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) ) -- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY) -+ install -f $(INSTALL_PREFIX)/include -m 644 libpri.h -+ install -f $(INSTALL_PREFIX)/lib -m 755 $(DYNAMIC_LIBRARY) -+ ( cd $(INSTALL_PREFIX)/lib ; ln -sf libpri.so.1 libpri.so ; $(SOSLINK) ) -+ install -f $(INSTALL_PREFIX)/lib -m 644 $(STATIC_LIBRARY) - endif - - uninstall: + install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h + install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY) @@ -130,7 +129,6 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) - $(LDCONFIG) $(LDCONFIG_FLAGS) . - ln -sf libpri.so.1 libpri.so + ln -sf libpri.so.1.0 libpri.so + ln -sf libpri.so.1.0 libpri.so.1 $(SOSLINK) - diff --git a/misc/libpri2/pkg-plist b/misc/libpri2/pkg-plist index ccbeae646ef3..e552b67c0b2a 100644 --- a/misc/libpri2/pkg-plist +++ b/misc/libpri2/pkg-plist @@ -1,4 +1,4 @@ include/libpri.h lib/libpri.a -lib/libpri.so.1 lib/libpri.so +lib/libpri.so.1 diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile index 10d4cd2b786f..9f36afcfb1af 100644 --- a/net/asterisk-bristuff/Makefile +++ b/net/asterisk-bristuff/Makefile @@ -7,19 +7,22 @@ PORTNAME= asterisk PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz\ + asterisk124_codec_negotiation-20060202_2-${BRIVER}.diff.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ @@ -28,6 +31,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 +BRIVER= bristuff-0.3.0-PRE-1l GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/editline USE_GMAKE= yes diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo index 6b4fba28f1df..f2d5ef781f4a 100644 --- a/net/asterisk-bristuff/distinfo +++ b/net/asterisk-bristuff/distinfo @@ -1,6 +1,9 @@ MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 +MD5 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 72a17e513b085d868c638503857d2512 +SHA256 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 5e42e611c9e123a6d8513ab59a56a157976e7a7544e86ee1775e018f47d629f8 +SIZE (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 94989 +MD5 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = df6de1135788f06d72f94b8ec42676e7 +SHA256 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 6f25be043ab518cd876afd7750951ec7dd4870f5d293871965b097250557f17f +SIZE (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 28577 diff --git a/net/asterisk-bristuff/files/patch-agi::Makefile b/net/asterisk-bristuff/files/patch-agi::Makefile index b35976526f59..82b11dbfde30 100644 --- a/net/asterisk-bristuff/files/patch-agi::Makefile +++ b/net/asterisk-bristuff/files/patch-agi::Makefile @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 +--- agi/Makefile.orig Sun Jan 22 17:53:44 2006 ++++ agi/Makefile Sun Jan 22 17:55:53 2006 @@ -11,7 +11,9 @@ # the GNU General Public License # --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test +-AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test ++AGIS_BIN=eagi-test eagi-sphinx-test xagi-test +AGIS_SCR=agi-test.agi +AGIS=$(AGIS_SCR) $(AGIS_BIN) diff --git a/net/asterisk-bristuff/files/patch-res-res_watchdog.c b/net/asterisk-bristuff/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..8372764ed3e4 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006 ++++ res/res_watchdog.c Mon Jan 23 23:55:10 2006 +@@ -37,6 +37,10 @@ + #include <asterisk/utils.h> + #include <asterisk/adsi.h> + ++#if defined(__FreeBSD__) && !defined(O_SYNC) ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist index 3af861f7a135..ad61ad74f72f 100644 --- a/net/asterisk-bristuff/pkg-plist +++ b/net/asterisk-bristuff/pkg-plist @@ -19,6 +19,9 @@ etc/asterisk/asterisk.adsi-dist @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi etc/asterisk/asterisk.conf-dist @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf +@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi +etc/asterisk/capi.conf-dist +@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf @unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi etc/asterisk/cdr.conf-dist @exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf @@ -49,12 +52,12 @@ etc/asterisk/dundi.conf-dist @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi etc/asterisk/enum.conf-dist @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi etc/asterisk/extconfig.conf-dist @exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf +@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi +etc/asterisk/extensions.ael-dist +@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi etc/asterisk/extensions.conf-dist @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf @@ -139,6 +142,9 @@ etc/asterisk/voicemail.conf-dist @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi +etc/asterisk/watchdog.conf-dist +@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi etc/asterisk/zapata.conf-dist @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf @@ -157,13 +163,15 @@ include/asterisk/build.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h +include/asterisk/chan_capi.h +include/asterisk/chan_capi_app.h include/asterisk/channel.h include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h include/asterisk/compat.h -include/asterisk/config.h include/asterisk/compiler.h +include/asterisk/config.h include/asterisk/crypto.h include/asterisk/devicestate.h include/asterisk/dlfcn-compat.h @@ -172,8 +180,8 @@ include/asterisk/dnsmgr.h include/asterisk/doxyref.h include/asterisk/dsp.h include/asterisk/dundi.h -include/asterisk/enum.h include/asterisk/endian.h +include/asterisk/enum.h include/asterisk/features.h include/asterisk/file.h include/asterisk/frame.h @@ -214,9 +222,11 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h include/asterisk/vmodem.h +include/asterisk/xlaw.h lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_authenticate.so +lib/asterisk/modules/app_callingpres.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so lib/asterisk/modules/app_chanspy.so @@ -224,6 +234,7 @@ lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_curl.so lib/asterisk/modules/app_cut.so lib/asterisk/modules/app_db.so +lib/asterisk/modules/app_devstate.so lib/asterisk/modules/app_dial.so lib/asterisk/modules/app_dictate.so lib/asterisk/modules/app_directed_pickup.so @@ -255,6 +266,7 @@ lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so lib/asterisk/modules/app_parkandannounce.so +lib/asterisk/modules/app_pickup.so lib/asterisk/modules/app_playback.so lib/asterisk/modules/app_privacy.so lib/asterisk/modules/app_queue.so @@ -265,6 +277,7 @@ lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so %%WITH_FAX%%lib/asterisk/modules/app_rxfax.so lib/asterisk/modules/app_sayunixtime.so +lib/asterisk/modules/app_segfault.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so lib/asterisk/modules/app_setcallerid.so @@ -347,8 +360,9 @@ lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so lib/asterisk/modules/res_musiconhold.so +lib/asterisk/modules/res_odbc.so +lib/asterisk/modules/res_watchdog.so sbin/asterisk sbin/astgenkey sbin/astman @@ -361,6 +375,7 @@ sbin/streamplayer %%DATADIR%%/agi-bin/agi-test.agi %%DATADIR%%/agi-bin/eagi-sphinx-test %%DATADIR%%/agi-bin/eagi-test +%%DATADIR%%/agi-bin/xagi-test %%DATADIR%%/firmware/iax/iaxy.bin %%DATADIR%%/images/asterisk-intro.jpg %%DATADIR%%/keys/freeworlddialup.pub @@ -717,11 +732,11 @@ sbin/streamplayer %%DATADIR%%/sounds/vm-whichbox.gsm %%DATADIR%%/sounds/vm-youhave.gsm %%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate +@dirrm %%DATADIR%%/sounds/priv-callerintros @dirrm %%DATADIR%%/sounds/phonetic @dirrm %%DATADIR%%/sounds/letters @dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros +@dirrm %%DATADIR%%/sounds/dictate @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/mohmp3 @dirrm %%DATADIR%%/keys diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 10d4cd2b786f..9f36afcfb1af 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -7,19 +7,22 @@ PORTNAME= asterisk PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz\ + asterisk124_codec_negotiation-20060202_2-${BRIVER}.diff.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ @@ -28,6 +31,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 +BRIVER= bristuff-0.3.0-PRE-1l GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/editline USE_GMAKE= yes diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo index 6b4fba28f1df..f2d5ef781f4a 100644 --- a/net/asterisk/distinfo +++ b/net/asterisk/distinfo @@ -1,6 +1,9 @@ MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 +MD5 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 72a17e513b085d868c638503857d2512 +SHA256 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 5e42e611c9e123a6d8513ab59a56a157976e7a7544e86ee1775e018f47d629f8 +SIZE (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 94989 +MD5 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = df6de1135788f06d72f94b8ec42676e7 +SHA256 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 6f25be043ab518cd876afd7750951ec7dd4870f5d293871965b097250557f17f +SIZE (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 28577 diff --git a/net/asterisk/files/patch-agi::Makefile b/net/asterisk/files/patch-agi::Makefile index b35976526f59..82b11dbfde30 100644 --- a/net/asterisk/files/patch-agi::Makefile +++ b/net/asterisk/files/patch-agi::Makefile @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 +--- agi/Makefile.orig Sun Jan 22 17:53:44 2006 ++++ agi/Makefile Sun Jan 22 17:55:53 2006 @@ -11,7 +11,9 @@ # the GNU General Public License # --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test +-AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test ++AGIS_BIN=eagi-test eagi-sphinx-test xagi-test +AGIS_SCR=agi-test.agi +AGIS=$(AGIS_SCR) $(AGIS_BIN) diff --git a/net/asterisk/files/patch-res-res_watchdog.c b/net/asterisk/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..8372764ed3e4 --- /dev/null +++ b/net/asterisk/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006 ++++ res/res_watchdog.c Mon Jan 23 23:55:10 2006 +@@ -37,6 +37,10 @@ + #include <asterisk/utils.h> + #include <asterisk/adsi.h> + ++#if defined(__FreeBSD__) && !defined(O_SYNC) ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist index 3af861f7a135..ad61ad74f72f 100644 --- a/net/asterisk/pkg-plist +++ b/net/asterisk/pkg-plist @@ -19,6 +19,9 @@ etc/asterisk/asterisk.adsi-dist @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi etc/asterisk/asterisk.conf-dist @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf +@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi +etc/asterisk/capi.conf-dist +@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf @unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi etc/asterisk/cdr.conf-dist @exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf @@ -49,12 +52,12 @@ etc/asterisk/dundi.conf-dist @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi etc/asterisk/enum.conf-dist @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi etc/asterisk/extconfig.conf-dist @exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf +@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi +etc/asterisk/extensions.ael-dist +@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi etc/asterisk/extensions.conf-dist @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf @@ -139,6 +142,9 @@ etc/asterisk/voicemail.conf-dist @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi +etc/asterisk/watchdog.conf-dist +@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi etc/asterisk/zapata.conf-dist @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf @@ -157,13 +163,15 @@ include/asterisk/build.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h +include/asterisk/chan_capi.h +include/asterisk/chan_capi_app.h include/asterisk/channel.h include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h include/asterisk/compat.h -include/asterisk/config.h include/asterisk/compiler.h +include/asterisk/config.h include/asterisk/crypto.h include/asterisk/devicestate.h include/asterisk/dlfcn-compat.h @@ -172,8 +180,8 @@ include/asterisk/dnsmgr.h include/asterisk/doxyref.h include/asterisk/dsp.h include/asterisk/dundi.h -include/asterisk/enum.h include/asterisk/endian.h +include/asterisk/enum.h include/asterisk/features.h include/asterisk/file.h include/asterisk/frame.h @@ -214,9 +222,11 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h include/asterisk/vmodem.h +include/asterisk/xlaw.h lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_authenticate.so +lib/asterisk/modules/app_callingpres.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so lib/asterisk/modules/app_chanspy.so @@ -224,6 +234,7 @@ lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_curl.so lib/asterisk/modules/app_cut.so lib/asterisk/modules/app_db.so +lib/asterisk/modules/app_devstate.so lib/asterisk/modules/app_dial.so lib/asterisk/modules/app_dictate.so lib/asterisk/modules/app_directed_pickup.so @@ -255,6 +266,7 @@ lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so lib/asterisk/modules/app_parkandannounce.so +lib/asterisk/modules/app_pickup.so lib/asterisk/modules/app_playback.so lib/asterisk/modules/app_privacy.so lib/asterisk/modules/app_queue.so @@ -265,6 +277,7 @@ lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so %%WITH_FAX%%lib/asterisk/modules/app_rxfax.so lib/asterisk/modules/app_sayunixtime.so +lib/asterisk/modules/app_segfault.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so lib/asterisk/modules/app_setcallerid.so @@ -347,8 +360,9 @@ lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so lib/asterisk/modules/res_musiconhold.so +lib/asterisk/modules/res_odbc.so +lib/asterisk/modules/res_watchdog.so sbin/asterisk sbin/astgenkey sbin/astman @@ -361,6 +375,7 @@ sbin/streamplayer %%DATADIR%%/agi-bin/agi-test.agi %%DATADIR%%/agi-bin/eagi-sphinx-test %%DATADIR%%/agi-bin/eagi-test +%%DATADIR%%/agi-bin/xagi-test %%DATADIR%%/firmware/iax/iaxy.bin %%DATADIR%%/images/asterisk-intro.jpg %%DATADIR%%/keys/freeworlddialup.pub @@ -717,11 +732,11 @@ sbin/streamplayer %%DATADIR%%/sounds/vm-whichbox.gsm %%DATADIR%%/sounds/vm-youhave.gsm %%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate +@dirrm %%DATADIR%%/sounds/priv-callerintros @dirrm %%DATADIR%%/sounds/phonetic @dirrm %%DATADIR%%/sounds/letters @dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros +@dirrm %%DATADIR%%/sounds/dictate @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/mohmp3 @dirrm %%DATADIR%%/keys diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index 10d4cd2b786f..9f36afcfb1af 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -7,19 +7,22 @@ PORTNAME= asterisk PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz\ + asterisk124_codec_negotiation-20060202_2-${BRIVER}.diff.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ @@ -28,6 +31,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 +BRIVER= bristuff-0.3.0-PRE-1l GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/editline USE_GMAKE= yes diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo index 6b4fba28f1df..f2d5ef781f4a 100644 --- a/net/asterisk10/distinfo +++ b/net/asterisk10/distinfo @@ -1,6 +1,9 @@ MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 +MD5 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 72a17e513b085d868c638503857d2512 +SHA256 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 5e42e611c9e123a6d8513ab59a56a157976e7a7544e86ee1775e018f47d629f8 +SIZE (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 94989 +MD5 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = df6de1135788f06d72f94b8ec42676e7 +SHA256 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 6f25be043ab518cd876afd7750951ec7dd4870f5d293871965b097250557f17f +SIZE (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 28577 diff --git a/net/asterisk10/files/patch-agi::Makefile b/net/asterisk10/files/patch-agi::Makefile index b35976526f59..82b11dbfde30 100644 --- a/net/asterisk10/files/patch-agi::Makefile +++ b/net/asterisk10/files/patch-agi::Makefile @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 +--- agi/Makefile.orig Sun Jan 22 17:53:44 2006 ++++ agi/Makefile Sun Jan 22 17:55:53 2006 @@ -11,7 +11,9 @@ # the GNU General Public License # --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test +-AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test ++AGIS_BIN=eagi-test eagi-sphinx-test xagi-test +AGIS_SCR=agi-test.agi +AGIS=$(AGIS_SCR) $(AGIS_BIN) diff --git a/net/asterisk10/files/patch-res-res_watchdog.c b/net/asterisk10/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..8372764ed3e4 --- /dev/null +++ b/net/asterisk10/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006 ++++ res/res_watchdog.c Mon Jan 23 23:55:10 2006 +@@ -37,6 +37,10 @@ + #include <asterisk/utils.h> + #include <asterisk/adsi.h> + ++#if defined(__FreeBSD__) && !defined(O_SYNC) ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist index 3af861f7a135..ad61ad74f72f 100644 --- a/net/asterisk10/pkg-plist +++ b/net/asterisk10/pkg-plist @@ -19,6 +19,9 @@ etc/asterisk/asterisk.adsi-dist @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi etc/asterisk/asterisk.conf-dist @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf +@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi +etc/asterisk/capi.conf-dist +@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf @unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi etc/asterisk/cdr.conf-dist @exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf @@ -49,12 +52,12 @@ etc/asterisk/dundi.conf-dist @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi etc/asterisk/enum.conf-dist @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi etc/asterisk/extconfig.conf-dist @exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf +@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi +etc/asterisk/extensions.ael-dist +@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi etc/asterisk/extensions.conf-dist @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf @@ -139,6 +142,9 @@ etc/asterisk/voicemail.conf-dist @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi +etc/asterisk/watchdog.conf-dist +@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi etc/asterisk/zapata.conf-dist @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf @@ -157,13 +163,15 @@ include/asterisk/build.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h +include/asterisk/chan_capi.h +include/asterisk/chan_capi_app.h include/asterisk/channel.h include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h include/asterisk/compat.h -include/asterisk/config.h include/asterisk/compiler.h +include/asterisk/config.h include/asterisk/crypto.h include/asterisk/devicestate.h include/asterisk/dlfcn-compat.h @@ -172,8 +180,8 @@ include/asterisk/dnsmgr.h include/asterisk/doxyref.h include/asterisk/dsp.h include/asterisk/dundi.h -include/asterisk/enum.h include/asterisk/endian.h +include/asterisk/enum.h include/asterisk/features.h include/asterisk/file.h include/asterisk/frame.h @@ -214,9 +222,11 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h include/asterisk/vmodem.h +include/asterisk/xlaw.h lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_authenticate.so +lib/asterisk/modules/app_callingpres.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so lib/asterisk/modules/app_chanspy.so @@ -224,6 +234,7 @@ lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_curl.so lib/asterisk/modules/app_cut.so lib/asterisk/modules/app_db.so +lib/asterisk/modules/app_devstate.so lib/asterisk/modules/app_dial.so lib/asterisk/modules/app_dictate.so lib/asterisk/modules/app_directed_pickup.so @@ -255,6 +266,7 @@ lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so lib/asterisk/modules/app_parkandannounce.so +lib/asterisk/modules/app_pickup.so lib/asterisk/modules/app_playback.so lib/asterisk/modules/app_privacy.so lib/asterisk/modules/app_queue.so @@ -265,6 +277,7 @@ lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so %%WITH_FAX%%lib/asterisk/modules/app_rxfax.so lib/asterisk/modules/app_sayunixtime.so +lib/asterisk/modules/app_segfault.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so lib/asterisk/modules/app_setcallerid.so @@ -347,8 +360,9 @@ lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so lib/asterisk/modules/res_musiconhold.so +lib/asterisk/modules/res_odbc.so +lib/asterisk/modules/res_watchdog.so sbin/asterisk sbin/astgenkey sbin/astman @@ -361,6 +375,7 @@ sbin/streamplayer %%DATADIR%%/agi-bin/agi-test.agi %%DATADIR%%/agi-bin/eagi-sphinx-test %%DATADIR%%/agi-bin/eagi-test +%%DATADIR%%/agi-bin/xagi-test %%DATADIR%%/firmware/iax/iaxy.bin %%DATADIR%%/images/asterisk-intro.jpg %%DATADIR%%/keys/freeworlddialup.pub @@ -717,11 +732,11 @@ sbin/streamplayer %%DATADIR%%/sounds/vm-whichbox.gsm %%DATADIR%%/sounds/vm-youhave.gsm %%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate +@dirrm %%DATADIR%%/sounds/priv-callerintros @dirrm %%DATADIR%%/sounds/phonetic @dirrm %%DATADIR%%/sounds/letters @dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros +@dirrm %%DATADIR%%/sounds/dictate @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/mohmp3 @dirrm %%DATADIR%%/keys diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile index 10d4cd2b786f..9f36afcfb1af 100644 --- a/net/asterisk12/Makefile +++ b/net/asterisk12/Makefile @@ -7,19 +7,22 @@ PORTNAME= asterisk PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz\ + asterisk124_codec_negotiation-20060202_2-${BRIVER}.diff.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ @@ -28,6 +31,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 +BRIVER= bristuff-0.3.0-PRE-1l GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/editline USE_GMAKE= yes diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo index 6b4fba28f1df..f2d5ef781f4a 100644 --- a/net/asterisk12/distinfo +++ b/net/asterisk12/distinfo @@ -1,6 +1,9 @@ MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 +MD5 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 72a17e513b085d868c638503857d2512 +SHA256 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 5e42e611c9e123a6d8513ab59a56a157976e7a7544e86ee1775e018f47d629f8 +SIZE (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 94989 +MD5 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = df6de1135788f06d72f94b8ec42676e7 +SHA256 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 6f25be043ab518cd876afd7750951ec7dd4870f5d293871965b097250557f17f +SIZE (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 28577 diff --git a/net/asterisk12/files/patch-agi::Makefile b/net/asterisk12/files/patch-agi::Makefile index b35976526f59..82b11dbfde30 100644 --- a/net/asterisk12/files/patch-agi::Makefile +++ b/net/asterisk12/files/patch-agi::Makefile @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 +--- agi/Makefile.orig Sun Jan 22 17:53:44 2006 ++++ agi/Makefile Sun Jan 22 17:55:53 2006 @@ -11,7 +11,9 @@ # the GNU General Public License # --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test +-AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test ++AGIS_BIN=eagi-test eagi-sphinx-test xagi-test +AGIS_SCR=agi-test.agi +AGIS=$(AGIS_SCR) $(AGIS_BIN) diff --git a/net/asterisk12/files/patch-res-res_watchdog.c b/net/asterisk12/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..8372764ed3e4 --- /dev/null +++ b/net/asterisk12/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006 ++++ res/res_watchdog.c Mon Jan 23 23:55:10 2006 +@@ -37,6 +37,10 @@ + #include <asterisk/utils.h> + #include <asterisk/adsi.h> + ++#if defined(__FreeBSD__) && !defined(O_SYNC) ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist index 3af861f7a135..ad61ad74f72f 100644 --- a/net/asterisk12/pkg-plist +++ b/net/asterisk12/pkg-plist @@ -19,6 +19,9 @@ etc/asterisk/asterisk.adsi-dist @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi etc/asterisk/asterisk.conf-dist @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf +@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi +etc/asterisk/capi.conf-dist +@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf @unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi etc/asterisk/cdr.conf-dist @exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf @@ -49,12 +52,12 @@ etc/asterisk/dundi.conf-dist @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi etc/asterisk/enum.conf-dist @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi etc/asterisk/extconfig.conf-dist @exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf +@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi +etc/asterisk/extensions.ael-dist +@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi etc/asterisk/extensions.conf-dist @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf @@ -139,6 +142,9 @@ etc/asterisk/voicemail.conf-dist @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi +etc/asterisk/watchdog.conf-dist +@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi etc/asterisk/zapata.conf-dist @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf @@ -157,13 +163,15 @@ include/asterisk/build.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h +include/asterisk/chan_capi.h +include/asterisk/chan_capi_app.h include/asterisk/channel.h include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h include/asterisk/compat.h -include/asterisk/config.h include/asterisk/compiler.h +include/asterisk/config.h include/asterisk/crypto.h include/asterisk/devicestate.h include/asterisk/dlfcn-compat.h @@ -172,8 +180,8 @@ include/asterisk/dnsmgr.h include/asterisk/doxyref.h include/asterisk/dsp.h include/asterisk/dundi.h -include/asterisk/enum.h include/asterisk/endian.h +include/asterisk/enum.h include/asterisk/features.h include/asterisk/file.h include/asterisk/frame.h @@ -214,9 +222,11 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h include/asterisk/vmodem.h +include/asterisk/xlaw.h lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_authenticate.so +lib/asterisk/modules/app_callingpres.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so lib/asterisk/modules/app_chanspy.so @@ -224,6 +234,7 @@ lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_curl.so lib/asterisk/modules/app_cut.so lib/asterisk/modules/app_db.so +lib/asterisk/modules/app_devstate.so lib/asterisk/modules/app_dial.so lib/asterisk/modules/app_dictate.so lib/asterisk/modules/app_directed_pickup.so @@ -255,6 +266,7 @@ lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so lib/asterisk/modules/app_parkandannounce.so +lib/asterisk/modules/app_pickup.so lib/asterisk/modules/app_playback.so lib/asterisk/modules/app_privacy.so lib/asterisk/modules/app_queue.so @@ -265,6 +277,7 @@ lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so %%WITH_FAX%%lib/asterisk/modules/app_rxfax.so lib/asterisk/modules/app_sayunixtime.so +lib/asterisk/modules/app_segfault.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so lib/asterisk/modules/app_setcallerid.so @@ -347,8 +360,9 @@ lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so lib/asterisk/modules/res_musiconhold.so +lib/asterisk/modules/res_odbc.so +lib/asterisk/modules/res_watchdog.so sbin/asterisk sbin/astgenkey sbin/astman @@ -361,6 +375,7 @@ sbin/streamplayer %%DATADIR%%/agi-bin/agi-test.agi %%DATADIR%%/agi-bin/eagi-sphinx-test %%DATADIR%%/agi-bin/eagi-test +%%DATADIR%%/agi-bin/xagi-test %%DATADIR%%/firmware/iax/iaxy.bin %%DATADIR%%/images/asterisk-intro.jpg %%DATADIR%%/keys/freeworlddialup.pub @@ -717,11 +732,11 @@ sbin/streamplayer %%DATADIR%%/sounds/vm-whichbox.gsm %%DATADIR%%/sounds/vm-youhave.gsm %%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate +@dirrm %%DATADIR%%/sounds/priv-callerintros @dirrm %%DATADIR%%/sounds/phonetic @dirrm %%DATADIR%%/sounds/letters @dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros +@dirrm %%DATADIR%%/sounds/dictate @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/mohmp3 @dirrm %%DATADIR%%/keys diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index 10d4cd2b786f..9f36afcfb1af 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -7,19 +7,22 @@ PORTNAME= asterisk PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz\ + asterisk124_codec_negotiation-20060202_2-${BRIVER}.diff.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ @@ -28,6 +31,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 +BRIVER= bristuff-0.3.0-PRE-1l GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/editline USE_GMAKE= yes diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo index 6b4fba28f1df..f2d5ef781f4a 100644 --- a/net/asterisk14/distinfo +++ b/net/asterisk14/distinfo @@ -1,6 +1,9 @@ MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 +MD5 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 72a17e513b085d868c638503857d2512 +SHA256 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 5e42e611c9e123a6d8513ab59a56a157976e7a7544e86ee1775e018f47d629f8 +SIZE (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 94989 +MD5 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = df6de1135788f06d72f94b8ec42676e7 +SHA256 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 6f25be043ab518cd876afd7750951ec7dd4870f5d293871965b097250557f17f +SIZE (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 28577 diff --git a/net/asterisk14/files/patch-agi::Makefile b/net/asterisk14/files/patch-agi::Makefile index b35976526f59..82b11dbfde30 100644 --- a/net/asterisk14/files/patch-agi::Makefile +++ b/net/asterisk14/files/patch-agi::Makefile @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 +--- agi/Makefile.orig Sun Jan 22 17:53:44 2006 ++++ agi/Makefile Sun Jan 22 17:55:53 2006 @@ -11,7 +11,9 @@ # the GNU General Public License # --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test +-AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test ++AGIS_BIN=eagi-test eagi-sphinx-test xagi-test +AGIS_SCR=agi-test.agi +AGIS=$(AGIS_SCR) $(AGIS_BIN) diff --git a/net/asterisk14/files/patch-res-res_watchdog.c b/net/asterisk14/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..8372764ed3e4 --- /dev/null +++ b/net/asterisk14/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006 ++++ res/res_watchdog.c Mon Jan 23 23:55:10 2006 +@@ -37,6 +37,10 @@ + #include <asterisk/utils.h> + #include <asterisk/adsi.h> + ++#if defined(__FreeBSD__) && !defined(O_SYNC) ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist index 3af861f7a135..ad61ad74f72f 100644 --- a/net/asterisk14/pkg-plist +++ b/net/asterisk14/pkg-plist @@ -19,6 +19,9 @@ etc/asterisk/asterisk.adsi-dist @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi etc/asterisk/asterisk.conf-dist @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf +@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi +etc/asterisk/capi.conf-dist +@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf @unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi etc/asterisk/cdr.conf-dist @exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf @@ -49,12 +52,12 @@ etc/asterisk/dundi.conf-dist @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi etc/asterisk/enum.conf-dist @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi etc/asterisk/extconfig.conf-dist @exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf +@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi +etc/asterisk/extensions.ael-dist +@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi etc/asterisk/extensions.conf-dist @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf @@ -139,6 +142,9 @@ etc/asterisk/voicemail.conf-dist @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi +etc/asterisk/watchdog.conf-dist +@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi etc/asterisk/zapata.conf-dist @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf @@ -157,13 +163,15 @@ include/asterisk/build.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h +include/asterisk/chan_capi.h +include/asterisk/chan_capi_app.h include/asterisk/channel.h include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h include/asterisk/compat.h -include/asterisk/config.h include/asterisk/compiler.h +include/asterisk/config.h include/asterisk/crypto.h include/asterisk/devicestate.h include/asterisk/dlfcn-compat.h @@ -172,8 +180,8 @@ include/asterisk/dnsmgr.h include/asterisk/doxyref.h include/asterisk/dsp.h include/asterisk/dundi.h -include/asterisk/enum.h include/asterisk/endian.h +include/asterisk/enum.h include/asterisk/features.h include/asterisk/file.h include/asterisk/frame.h @@ -214,9 +222,11 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h include/asterisk/vmodem.h +include/asterisk/xlaw.h lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_authenticate.so +lib/asterisk/modules/app_callingpres.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so lib/asterisk/modules/app_chanspy.so @@ -224,6 +234,7 @@ lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_curl.so lib/asterisk/modules/app_cut.so lib/asterisk/modules/app_db.so +lib/asterisk/modules/app_devstate.so lib/asterisk/modules/app_dial.so lib/asterisk/modules/app_dictate.so lib/asterisk/modules/app_directed_pickup.so @@ -255,6 +266,7 @@ lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so lib/asterisk/modules/app_parkandannounce.so +lib/asterisk/modules/app_pickup.so lib/asterisk/modules/app_playback.so lib/asterisk/modules/app_privacy.so lib/asterisk/modules/app_queue.so @@ -265,6 +277,7 @@ lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so %%WITH_FAX%%lib/asterisk/modules/app_rxfax.so lib/asterisk/modules/app_sayunixtime.so +lib/asterisk/modules/app_segfault.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so lib/asterisk/modules/app_setcallerid.so @@ -347,8 +360,9 @@ lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so lib/asterisk/modules/res_musiconhold.so +lib/asterisk/modules/res_odbc.so +lib/asterisk/modules/res_watchdog.so sbin/asterisk sbin/astgenkey sbin/astman @@ -361,6 +375,7 @@ sbin/streamplayer %%DATADIR%%/agi-bin/agi-test.agi %%DATADIR%%/agi-bin/eagi-sphinx-test %%DATADIR%%/agi-bin/eagi-test +%%DATADIR%%/agi-bin/xagi-test %%DATADIR%%/firmware/iax/iaxy.bin %%DATADIR%%/images/asterisk-intro.jpg %%DATADIR%%/keys/freeworlddialup.pub @@ -717,11 +732,11 @@ sbin/streamplayer %%DATADIR%%/sounds/vm-whichbox.gsm %%DATADIR%%/sounds/vm-youhave.gsm %%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate +@dirrm %%DATADIR%%/sounds/priv-callerintros @dirrm %%DATADIR%%/sounds/phonetic @dirrm %%DATADIR%%/sounds/letters @dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros +@dirrm %%DATADIR%%/sounds/dictate @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/mohmp3 @dirrm %%DATADIR%%/keys diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 10d4cd2b786f..9f36afcfb1af 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -7,19 +7,22 @@ PORTNAME= asterisk PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz\ + asterisk124_codec_negotiation-20060202_2-${BRIVER}.diff.gz +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= fjoe/ +PATCH_DIST_STRIP= -p1 + MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ @@ -28,6 +31,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 amd64 +BRIVER= bristuff-0.3.0-PRE-1l GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/editline USE_GMAKE= yes diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo index 6b4fba28f1df..f2d5ef781f4a 100644 --- a/net/asterisk16/distinfo +++ b/net/asterisk16/distinfo @@ -1,6 +1,9 @@ MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 +MD5 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 72a17e513b085d868c638503857d2512 +SHA256 (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 5e42e611c9e123a6d8513ab59a56a157976e7a7544e86ee1775e018f47d629f8 +SIZE (asterisk-1.2.4-bristuff-0.3.0-PRE-1l.patch.gz) = 94989 +MD5 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = df6de1135788f06d72f94b8ec42676e7 +SHA256 (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 6f25be043ab518cd876afd7750951ec7dd4870f5d293871965b097250557f17f +SIZE (asterisk124_codec_negotiation-20060202_2-bristuff-0.3.0-PRE-1l.diff.gz) = 28577 diff --git a/net/asterisk16/files/patch-agi::Makefile b/net/asterisk16/files/patch-agi::Makefile index b35976526f59..82b11dbfde30 100644 --- a/net/asterisk16/files/patch-agi::Makefile +++ b/net/asterisk16/files/patch-agi::Makefile @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 +--- agi/Makefile.orig Sun Jan 22 17:53:44 2006 ++++ agi/Makefile Sun Jan 22 17:55:53 2006 @@ -11,7 +11,9 @@ # the GNU General Public License # --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test +-AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test ++AGIS_BIN=eagi-test eagi-sphinx-test xagi-test +AGIS_SCR=agi-test.agi +AGIS=$(AGIS_SCR) $(AGIS_BIN) diff --git a/net/asterisk16/files/patch-res-res_watchdog.c b/net/asterisk16/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..8372764ed3e4 --- /dev/null +++ b/net/asterisk16/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006 ++++ res/res_watchdog.c Mon Jan 23 23:55:10 2006 +@@ -37,6 +37,10 @@ + #include <asterisk/utils.h> + #include <asterisk/adsi.h> + ++#if defined(__FreeBSD__) && !defined(O_SYNC) ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist index 3af861f7a135..ad61ad74f72f 100644 --- a/net/asterisk16/pkg-plist +++ b/net/asterisk16/pkg-plist @@ -19,6 +19,9 @@ etc/asterisk/asterisk.adsi-dist @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi etc/asterisk/asterisk.conf-dist @exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf +@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi +etc/asterisk/capi.conf-dist +@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf @unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi etc/asterisk/cdr.conf-dist @exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf @@ -49,12 +52,12 @@ etc/asterisk/dundi.conf-dist @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi etc/asterisk/enum.conf-dist @exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi etc/asterisk/extconfig.conf-dist @exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf +@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi +etc/asterisk/extensions.ael-dist +@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi etc/asterisk/extensions.conf-dist @exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf @@ -139,6 +142,9 @@ etc/asterisk/voicemail.conf-dist @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi +etc/asterisk/watchdog.conf-dist +@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi etc/asterisk/zapata.conf-dist @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf @@ -157,13 +163,15 @@ include/asterisk/build.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h +include/asterisk/chan_capi.h +include/asterisk/chan_capi_app.h include/asterisk/channel.h include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h include/asterisk/compat.h -include/asterisk/config.h include/asterisk/compiler.h +include/asterisk/config.h include/asterisk/crypto.h include/asterisk/devicestate.h include/asterisk/dlfcn-compat.h @@ -172,8 +180,8 @@ include/asterisk/dnsmgr.h include/asterisk/doxyref.h include/asterisk/dsp.h include/asterisk/dundi.h -include/asterisk/enum.h include/asterisk/endian.h +include/asterisk/enum.h include/asterisk/features.h include/asterisk/file.h include/asterisk/frame.h @@ -214,9 +222,11 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h include/asterisk/vmodem.h +include/asterisk/xlaw.h lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_authenticate.so +lib/asterisk/modules/app_callingpres.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so lib/asterisk/modules/app_chanspy.so @@ -224,6 +234,7 @@ lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_curl.so lib/asterisk/modules/app_cut.so lib/asterisk/modules/app_db.so +lib/asterisk/modules/app_devstate.so lib/asterisk/modules/app_dial.so lib/asterisk/modules/app_dictate.so lib/asterisk/modules/app_directed_pickup.so @@ -255,6 +266,7 @@ lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so lib/asterisk/modules/app_parkandannounce.so +lib/asterisk/modules/app_pickup.so lib/asterisk/modules/app_playback.so lib/asterisk/modules/app_privacy.so lib/asterisk/modules/app_queue.so @@ -265,6 +277,7 @@ lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so %%WITH_FAX%%lib/asterisk/modules/app_rxfax.so lib/asterisk/modules/app_sayunixtime.so +lib/asterisk/modules/app_segfault.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so lib/asterisk/modules/app_setcallerid.so @@ -347,8 +360,9 @@ lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so lib/asterisk/modules/res_musiconhold.so +lib/asterisk/modules/res_odbc.so +lib/asterisk/modules/res_watchdog.so sbin/asterisk sbin/astgenkey sbin/astman @@ -361,6 +375,7 @@ sbin/streamplayer %%DATADIR%%/agi-bin/agi-test.agi %%DATADIR%%/agi-bin/eagi-sphinx-test %%DATADIR%%/agi-bin/eagi-test +%%DATADIR%%/agi-bin/xagi-test %%DATADIR%%/firmware/iax/iaxy.bin %%DATADIR%%/images/asterisk-intro.jpg %%DATADIR%%/keys/freeworlddialup.pub @@ -717,11 +732,11 @@ sbin/streamplayer %%DATADIR%%/sounds/vm-whichbox.gsm %%DATADIR%%/sounds/vm-youhave.gsm %%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate +@dirrm %%DATADIR%%/sounds/priv-callerintros @dirrm %%DATADIR%%/sounds/phonetic @dirrm %%DATADIR%%/sounds/letters @dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros +@dirrm %%DATADIR%%/sounds/dictate @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/mohmp3 @dirrm %%DATADIR%%/keys |