From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 13 07:10:03 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 519B71065670 for ; Thu, 13 Sep 2012 07:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 253B78FC15 for ; Thu, 13 Sep 2012 07:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8D7A3hZ070324 for ; Thu, 13 Sep 2012 07:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8D7A29L070311; Thu, 13 Sep 2012 07:10:02 GMT (envelope-from gnats) Resent-Date: Thu, 13 Sep 2012 07:10:02 GMT Resent-Message-Id: <201209130710.q8D7A29L070311@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, Dmitry Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A3BDB1065676 for ; Thu, 13 Sep 2012 07:03:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 767858FC1B for ; Thu, 13 Sep 2012 07:03:31 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8D73U8x030596 for ; Thu, 13 Sep 2012 07:03:30 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q8D73U2k030595; Thu, 13 Sep 2012 07:03:30 GMT (envelope-from nobody) Message-Id: <201209130703.q8D73U2k030595@red.freebsd.org> Date: Thu, 13 Sep 2012 07:03:30 GMT From: Dmitry To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/171590: net/asterisk10 fix work DAHDI and MYSQL options [patch] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2012 07:10:03 -0000 >Number: 171590 >Category: ports >Synopsis: net/asterisk10 fix work DAHDI and MYSQL options [patch] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Sep 13 07:10:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Dmitry >Release: 9.1-PRERELEASE >Organization: - >Environment: FreeBSD *** 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240127: *** root@***:/usr/obj/usr/src/sys/GENERIC_ amd64 >Description: DAHDI option - not work MYSQL option - change --with-mysql -> --with-mysqlclient >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2012-09-13 12:12:18.000000000 +0600 +++ Makefile 2012-09-13 12:42:48.000000000 +0600 @@ -24,7 +24,6 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes @@ -52,6 +51,12 @@ OPTIONS_SINGLE= ODBC OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64" +OPTIONS_DEFINE+= DAHDI +OPTIONS_DEFAULT+= DAHDI +.endif + +DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support NEWG711_DESC?= New G711 Codec SRTP_DESC?= SecureRTP support @@ -71,12 +76,6 @@ VARDIR=${PREFIX}/var .endif -.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64" -OPTIONS_DEFINE+= DAHDI -OPTIONS_DEFAULT+= DAHDI -DAHDI_DESC?= DAHDI support -.endif - SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} @@ -97,7 +96,7 @@ CONFIGURE_ARGS+= --with-dahdi --with-openr2 BUILD_DEPENDS+= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri\ +LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri \ openr2.4:${PORTSDIR}/misc/openr2 .else PLIST_SUB+= WITH_DAHDI="@comment " @@ -149,10 +148,10 @@ .if ${PORT_OPTIONS:MMYSQL} PLIST_SUB+= WITH_MYSQL="" USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql +CONFIGURE_ARGS+= --with-mysqlclient .else PLIST_SUB+= WITH_MYSQL="@comment " -CONFIGURE_ARGS+= --without-mysql +CONFIGURE_ARGS+= --without-mysqlclient .endif .if ${PORT_OPTIONS:MVORBIS} >Release-Note: >Audit-Trail: >Unformatted: