From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 26 14:10:03 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3580E16A4CE for ; Sat, 26 Mar 2005 14:10:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8C0F43D2F for ; Sat, 26 Mar 2005 14:10:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2QEA20E077083 for ; Sat, 26 Mar 2005 14:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2QEA2s7077082; Sat, 26 Mar 2005 14:10:02 GMT (envelope-from gnats) Resent-Date: Sat, 26 Mar 2005 14:10:02 GMT Resent-Message-Id: <200503261410.j2QEA2s7077082@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ari Maniatis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1680916A4CE for ; Sat, 26 Mar 2005 14:08:03 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id D752B43D31 for ; Sat, 26 Mar 2005 14:08:02 +0000 (GMT) (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 j2QE82Nx011584 for ; Sat, 26 Mar 2005 14:08:02 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j2QE82UY011582; Sat, 26 Mar 2005 14:08:02 GMT (envelope-from nobody) Message-Id: <200503261408.j2QE82UY011582@www.freebsd.org> Date: Sat, 26 Mar 2005 14:08:02 GMT From: Ari Maniatis To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/79253: Asterisk port has errors in some config files X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2005 14:10:03 -0000 >Number: 79253 >Category: ports >Synopsis: Asterisk port has errors in some config files >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Mar 26 14:10:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ari Maniatis >Release: 4.10 release >Organization: ish group >Environment: FreeBSD delish.ish.com.au 4.10-RELEASE-p2 FreeBSD 4.10-RELEASE-p2 #0: Mon Sep 6 16:14:35 EST 2004 ish@delish.ish.com.au:/usr/obj/usr/src/sys/DELISHKERN i386 >Description: * musiconhold.conf.sample has incorrect Linux paths, not FreeBSD paths * mysql is not actually required and so should be an option >How-To-Repeat: Install /net/asterisk port. >Fix: --- Makefile.old Sat Mar 12 04:20:41 2005 +++ Makefile Sun Mar 27 01:06:27 2005 @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -19,10 +20,10 @@ MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit -BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt -RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client + +OPTIONS= MYSQL "MySQL support" off ONLY_FOR_ARCHS= i386 sparc64 @@ -41,6 +42,11 @@ CXX="${CXX}" MAN8= asterisk.8 +MUSICCONF= ${WRKSRC}/configs/musiconhold.conf.sample + +.if defined(WITH_MYSQL) +USE_MYSQL= YES +.endif .include @@ -67,6 +73,10 @@ RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel PLIST_SUB+= WITH_ZAPTEL="" .endif + +post-extract: + @${MV} ${MUSICCONF} ${MUSICCONF}.old + @${SED} 's,/var/lib/asterisk/,/usr/local/share/asterisk/,g' ${MUSICCONF}.old > ${MUSICCONF} post-install: @${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d >Release-Note: >Audit-Trail: >Unformatted: