ports/131922: net/asterisk16 add some OPTION, remove unnecessary dependency, fix pkg-plist

[Dmitry]

>Number:         131922
>Category:       ports
>Synopsis:       net/asterisk16 add some OPTION, remove unnecessary dependency, fix pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 21 02:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry
>Release:        FreeBSD 7.1-STABLE amd64
>Organization:
>Environment:
FreeBSD *** 7.1-STABLE FreeBSD 7.1-STABLE #0: Wed Feb 18 18:03:46 YEKT 2009     root@***:/usr/src/sys/GENERIC_  amd64
>Description:
Add optional support curl, gsm, remove unnecessary dependency mpg123
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2009-02-21 06:58:20.000000000 +0500
+++ Makefile	2009-02-21 06:28:55.000000000 +0500
@@ -18,12 +18,8 @@
 MAINTAINER=	sobomax at FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
 
-BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
-		newt.51:${PORTSDIR}/devel/newt \
-		gsm.1:${PORTSDIR}/audio/gsm \
-		curl.5:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+		newt.51:${PORTSDIR}/devel/newt
 
 ONLY_FOR_ARCHS=	i386 sparc64 amd64 powerpc
 
@@ -57,6 +53,8 @@
 		JABBER		"Enable Jabber and Gtalk support" on \
 		SQLITE          "Enable SQLITE support" on \
 		ILBC		"Enable iLBC codec" off \
+		GSM		"Enable GSM codec" on \
+		CURL		"Enable CURL support" on \
 #		CODEC_PATCH	"Apply codec negotiation patch" off \
 #		MISC_PATCHES	"Apply additional patches" off
 
@@ -175,6 +173,24 @@
 EXTRA_PATCHES+=	${PATCHDIR}/ilbc_enable.diff
 .endif
 
+.if !defined(WITH_GSM)
+PLIST_SUB+=	WITH_GSM="@comment "
+CONFIGURE_ARGS+= --without-gsm
+.else
+PLIST_SUB+=	WITH_GSM=""
+CONFIGURE_ARGS+= --with-gsm
+LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
+.endif
+
+.if !defined(WITH_CURL)
+PLIST_SUB+=	WITH_CURL="@comment "
+CONFIGURE_ARGS+= --without-curl
+.else
+PLIST_SUB+=	WITH_CURL=""
+CONFIGURE_ARGS+= --with-curl
+LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
+.endif
+
 .if defined(WITH_CODEC_PATCH)
 PATCHFILES=	asterisk-1.4.22-codec-negotiation-20081110.diff.gz
 PATCH_SITES=	http://b2bua.org/chrome/site/
--- pkg-plist.orig	2009-02-21 07:05:19.000000000 +0500
+++ pkg-plist	2009-02-21 06:34:37.000000000 +0500
@@ -252,7 +252,7 @@
 lib/asterisk/modules/app_readexten.so
 lib/asterisk/modules/app_waituntil.so
 %%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so
-lib/asterisk/modules/cdr_sqlite3_custom.so
+%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite3_custom.so
 %%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so
 lib/asterisk/modules/chan_unistim.so
 lib/asterisk/modules/codec_g722.so
@@ -271,7 +271,7 @@
 lib/asterisk/modules/func_vmcount.so
 lib/asterisk/modules/func_volume.so
 lib/asterisk/modules/res_ael_share.so
-lib/asterisk/modules/res_config_curl.so
+%%WITH_CURL%%lib/asterisk/modules/res_config_curl.so
 lib/asterisk/modules/res_config_ldap.so
 %%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so
 lib/asterisk/modules/res_limit.so
@@ -353,7 +353,7 @@
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g726.so
-lib/asterisk/modules/codec_gsm.so
+%%WITH_GSM%%lib/asterisk/modules/codec_gsm.so
 %%WITH_ILBC%%lib/asterisk/modules/codec_ilbc.so
 lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_speex.so
@@ -376,7 +376,7 @@
 lib/asterisk/modules/func_callerid.so
 lib/asterisk/modules/func_cdr.so
 lib/asterisk/modules/func_channel.so
-lib/asterisk/modules/func_curl.so
+%%WITH_CURL%%lib/asterisk/modules/func_curl.so
 lib/asterisk/modules/func_cut.so
 lib/asterisk/modules/func_db.so
 lib/asterisk/modules/func_enum.so


>Release-Note:
>Audit-Trail:
>Unformatted: