From nobody@FreeBSD.org  Mon May 28 21:35:11 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1746316A477
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 28 May 2007 21:35:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 076D213C43E
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 28 May 2007 21:35:11 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l4SLZAN3076956
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 28 May 2007 21:35:10 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l4SLZAMr076955;
	Mon, 28 May 2007 21:35:10 GMT
	(envelope-from nobody)
Message-Id: <200705282135.l4SLZAMr076955@www.freebsd.org>
Date: Mon, 28 May 2007 21:35:10 GMT
From: Joseph Terner<jtsn@gmx.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] net/asterisk-bristuff: broken with current version of misc/zaptel
X-Send-Pr-Version: www-3.0

>Number:         113103
>Category:       ports
>Synopsis:       [patch] net/asterisk-bristuff: broken with current version of misc/zaptel
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    fjoe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 28 21:40:03 GMT 2007
>Closed-Date:    Tue Jul 03 16:27:16 GMT 2007
>Last-Modified:  Tue Jul  3 17:50:03 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->fjoe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon May 28 21:40:12 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113103 
State-Changed-From-To: open->closed 
State-Changed-By: fjoe 
State-Changed-When: Tue Jul 3 16:26:53 UTC 2007 
State-Changed-Why:  
Similar patch committed. Don't know if it actually works. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113103 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113103: commit references a PR
Date: Tue,  3 Jul 2007 17:40:20 +0000 (UTC)

 fjoe        2007-07-03 17:40:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/asterisk-bristuff Makefile 
     net/asterisk-bristuff/files patch-Makefile 
                                 patch-apps::Makefile 
                                 patch-channels::Makefile 
                                 patch-res::Makefile 
   Log:
   Fix build with zaptel 1.4.1.
   
   PR:             113103
   
   Revision  Changes    Path
   1.66      +3 -7      ports/net/asterisk-bristuff/Makefile
   1.17      +7 -5      ports/net/asterisk-bristuff/files/patch-Makefile
   1.9       +6 -5      ports/net/asterisk-bristuff/files/patch-apps::Makefile
   1.13      +15 -14    ports/net/asterisk-bristuff/files/patch-channels::Makefile
   1.9       +4 -6      ports/net/asterisk-bristuff/files/patch-res::Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
