Date: Mon, 28 May 2007 21:35:10 GMT From: Joseph Terner<jtsn@gmx.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/113103: [patch] net/asterisk-bristuff: broken with current version of misc/zaptel Message-ID: <200705282135.l4SLZAMr076955@www.freebsd.org> Resent-Message-ID: <200705282140.l4SLe3IQ052028@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113103 >Category: ports >Synopsis: [patch] net/asterisk-bristuff: broken with current version of misc/zaptel >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 28 21:40:03 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Joseph Terner >Release: FreeBSD 6.2 >Organization: >Environment: FreeBSD 6.2-STABLE FreeBSD 6.2-STABLE #0 i386 >Description: The commit of misc/zaptel 1.4.1 to the ports tree broke net/asterisk-bristuff 1.2.13_4. The asterisk-bristuff port expects the file $LOCALBASE/include/zaptel.h. The new zaptel port installs this file into $LOCALBASE/include/zaptel/zaptel.h. This patch modifies asterisk-bristuff to make it build again. >How-To-Repeat: >Fix: diff -ru ../../net/asterisk-bristuff/Makefile asterisk-bristuff/Makefile --- ../../net/asterisk-bristuff/Makefile Fri Feb 23 23:51:11 2007 +++ asterisk-bristuff/Makefile Mon May 28 21:43:50 2007 @@ -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 @@ 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 diff -ru ../../net/asterisk-bristuff/files/patch-Makefile asterisk-bristuff/files/patch-Makefile --- ../../net/asterisk-bristuff/files/patch-Makefile Tue Nov 7 15:58:28 2006 +++ asterisk-bristuff/files/patch-Makefile Mon May 28 23:11:05 2007 @@ -1,5 +1,5 @@ --- Makefile.orig Sun Oct 29 16:49:02 2006 -+++ Makefile Sun Oct 29 16:52:11 2006 ++++ Makefile Thu May 24 21:56:21 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/ @@ -78,7 +78,7 @@ ifeq ($(findstring BSD,$(OSARCH)),BSD) PROC=$(shell uname -m) - ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib ++ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib endif ifneq ($(PROC),ultrasparc) @@ -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+=-I$(LOCALBASE)/include/zaptel -DZAPTEL_OPTIMIZATIONS endif + endif # WITHOUT_ZAPTEL @@ -414,7 +411,7 @@ endif diff -ru ../../net/asterisk-bristuff/files/patch-apps::Makefile asterisk-bristuff/files/patch-apps::Makefile --- ../../net/asterisk-bristuff/files/patch-apps::Makefile Tue Nov 7 15:58:28 2006 +++ asterisk-bristuff/files/patch-apps::Makefile Thu May 24 21:39:41 2007 @@ -5,7 +5,7 @@ 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 diff -ru ../../net/asterisk-bristuff/files/patch-channels::Makefile asterisk-bristuff/files/patch-channels::Makefile --- ../../net/asterisk-bristuff/files/patch-channels::Makefile Wed Apr 26 13:31:03 2006 +++ asterisk-bristuff/files/patch-channels::Makefile Thu May 24 21:39:59 2007 @@ -48,7 +48,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),) ifeq (${OSARCH},NetBSD) SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib endif diff -ru ../../net/asterisk-bristuff/files/patch-res::Makefile asterisk-bristuff/files/patch-res::Makefile --- ../../net/asterisk-bristuff/files/patch-res::Makefile Tue Jan 17 23:27:45 2006 +++ asterisk-bristuff/files/patch-res::Makefile Thu May 24 21:55:29 2007 @@ -9,7 +9,7 @@ ifeq ($(findstring BSD,${OSARCH}),BSD) - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include ++ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel + SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib endif >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705282135.l4SLZAMr076955>