5 files changed, 35 insertions, 37 deletions
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 6f09b56e1369..29df02e1255e 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.2.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -65,9 +65,9 @@ MAKE_ENV+=	WITH_H323=1
 PLIST_SUB+=	WITH_ZAPTEL="@comment "
 MAKE_ENV+=	WITHOUT_ZAPTEL=1
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
+BUILD_DEPENDS+=	${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
 LIB_DEPENDS+=	pri-bristuff.1:${PORTSDIR}/misc/libpri-bristuff
-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
@@ -94,9 +94,5 @@ PLIST_SUB+=	WITH_FAX=""
 post-patch:
 	${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
 	${REINPLACE_CMD} -e 's,^#include <libpri\.h>,#include <libpri-bristuff.h>,' ${WRKSRC}/channels/chan_zap.c
-	${REINPLACE_CMD}\
-		-e 's,-lpri,-lpri-bristuff,'\
-		-e 's,libpri\.so,libpri-bristuff.so,g'\
-			${WRKSRC}/channels/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile
index 28f02db2dc0a..e0e5710b2de3 100644
--- a/net/asterisk-bristuff/files/patch-Makefile
+++ b/net/asterisk-bristuff/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Oct 29 16:49:02 2006
-+++ Makefile	Sun Oct 29 16:52:11 2006
+--- Makefile.orig	Tue Jul  3 23:08:38 2007
++++ Makefile	Tue Jul  3 23:32:03 2007
 @@ -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/
@@ -139,15 +139,17 @@
  
  endif # FreeBSD
  
-@@ -307,7 +304,7 @@
+@@ -307,8 +304,8 @@
  
  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),)
-   ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
+-  ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
++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 -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel
  endif
  
+ endif # WITHOUT_ZAPTEL
 @@ -414,7 +411,7 @@
  endif
  
diff --git a/net/asterisk-bristuff/files/patch-apps::Makefile b/net/asterisk-bristuff/files/patch-apps::Makefile
index 9881ae1f3831..5e5bcba8a28b 100644
--- a/net/asterisk-bristuff/files/patch-apps::Makefile
+++ b/net/asterisk-bristuff/files/patch-apps::Makefile
@@ -1,12 +1,13 @@
---- apps/Makefile.orig	Sun Apr 30 16:38:22 2006
-+++ apps/Makefile	Wed Jun 14 14:03:42 2006
-@@ -45,25 +45,27 @@
+--- apps/Makefile.orig	Wed Jul  4 00:07:15 2007
++++ apps/Makefile	Wed Jul  4 00:18:41 2007
+@@ -52,25 +52,28 @@
  #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
++  CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel
  endif
  endif # WITHOUT_ZAPTEL
  
@@ -37,7 +38,7 @@
  
  ifeq (${OSARCH},CYGWIN)
  CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-@@ -95,18 +97,26 @@
+@@ -102,18 +105,26 @@
  	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
  
  install: all
diff --git a/net/asterisk-bristuff/files/patch-channels::Makefile b/net/asterisk-bristuff/files/patch-channels::Makefile
index 872026dfdca2..baed903e8574 100644
--- a/net/asterisk-bristuff/files/patch-channels::Makefile
+++ b/net/asterisk-bristuff/files/patch-channels::Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig
-+++ channels/Makefile
+--- channels/Makefile.orig	Tue Jul  3 23:40:42 2007
++++ channels/Makefile	Tue Jul  3 23:45:45 2007
 @@ -48,8 +48,8 @@
  endif
  
@@ -28,14 +25,15 @@ $FreeBSD$
    CHANNEL_LIBS+=chan_h323.so
  endif
  
-@@ -91,12 +91,12 @@
+@@ -92,12 +92,12 @@
    CHANNEL_LIBS+=chan_alsa.so
  endif
  
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri-bristuff.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri-bristuff.so.1),)
    CFLAGS+=-DZAPATA_PRI
-   ZAPPRI=-lpri
+-  ZAPPRI=-lpri
++  ZAPPRI=-lpri-bristuff
  endif
  
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
@@ -43,12 +41,12 @@ $FreeBSD$
    CFLAGS+=-DZAPATA_R2
    ZAPR2=-lmfcr2
  endif
-@@ -109,12 +109,12 @@
+@@ -115,14 +115,14 @@
  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
@@ -56,9 +54,12 @@ $FreeBSD$
 -    SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
 +    SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
    endif
-   CFLAGS+=-DIAX_TRUNKING
+-  CFLAGS+=-DIAX_TRUNKING
++  CFLAGS+=-DIAX_TRUNKING -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel
    CHANNEL_LIBS+=chan_zap.so
-@@ -229,8 +229,10 @@
+ endif
+ endif # WITHOUT_ZAPTEL
+@@ -267,8 +267,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 +71,8 @@ $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:
+@@ -287,8 +289,7 @@
  #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<
  
  install: all
diff --git a/net/asterisk-bristuff/files/patch-res::Makefile b/net/asterisk-bristuff/files/patch-res::Makefile
index de5c365db34d..ee1cb1f96fc1 100644
--- a/net/asterisk-bristuff/files/patch-res::Makefile
+++ b/net/asterisk-bristuff/files/patch-res::Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- res/Makefile
-+++ res/Makefile
+--- res/Makefile.orig	Tue Jul  3 23:32:47 2007
++++ res/Makefile	Tue Jul  3 23:39:56 2007
 @@ -37,8 +37,8 @@
  endif
  
@@ -19,8 +16,9 @@ $FreeBSD$
  
  ifndef WITHOUT_ZAPTEL
 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
-   CFLAGS+=-DZAPATA_MOH
+-  CFLAGS+=-DZAPATA_MOH
 -endif
++  CFLAGS+=-DZAPATA_MOH -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel
  endif # WITHOUT_ZAPTEL
  
  #