ports/127615: [PATCH] net/asterisk: fix WITH_ZAPTEL option handling

[Dmitry Marakasov]

>Number:         127615
>Category:       ports
>Synopsis:       [PATCH] net/asterisk: fix WITH_ZAPTEL option handling
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 24 15:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Wed Jun 25 15:36:22 MSD 2008
>Description:
Asterisk only uses ZAPTEL option on i386 and amd64 and it's default to off. However, if you build it in BATCH mode (that happens on the build cluster/in tinderbox, for instance), zaptel support will be enabled cause WITHOUT_ZAPTEL doesn't get defined.

To fix it, port should check for WITH_ZAPTEL instead of WITHOUT_ZAPTEL [see patch].
Setting WITHOUT_ZAPTEL on non-i386/amd64 systems may be removed as it's not needed.

Also check for WITH_ILBC instead of WITHOUT_ILBC for the same reason.

Port maintainer (sobomax at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
cd /usr/ports/net/asterisk
make rmconfig
BATCH=1 make install
pkg_info -r asterisk-1.4.21.2_3
>Fix:

--- asterisk-1.4.21.2_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/net/asterisk/Makefile,v
retrieving revision 1.105
diff -u -u -r1.105 Makefile
--- Makefile	21 Aug 2008 07:32:48 -0000	1.105
+++ Makefile	24 Sep 2008 15:02:49 -0000
@@ -59,8 +59,6 @@
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 OPTIONS+=	ZAPTEL		"Enable Zaptel support" off
-.else
-WITHOUT_ZAPTEL=	yes
 .endif
 
 .if defined(WITHOUT_H323)
@@ -73,7 +71,7 @@
 		h323_r.1:${PORTSDIR}/net/openh323
 .endif
 
-.if defined(WITHOUT_ZAPTEL)
+.if !defined(WITH_ZAPTEL)
 PLIST_SUB+=	WITH_ZAPTEL="@comment "
 CONFIGURE_ARGS+= --without-zaptel
 .else
@@ -161,7 +159,7 @@
 LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite2
 .endif
 
-.if defined(WITHOUT_ILBC)
+.if defined(WITH_ILBC)
 PLIST_SUB+=	WITH_ILBC="@comment "
 .else
 PLIST_SUB+=	WITH_ILBC=""
--- asterisk-1.4.21.2_3.patch ends here ---

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