Build fix:

This is the second attempt to fix the build problem that some people
have seen (I have received inconsistent reports).  This should
force chan_mgcp to build on systems where it can.  It was tested
on NetBSD 5.0, thus ensuring that it doesn't break previously
working systems; and NetBSD 6.99.7, where I finally saw the problem
that some people were reporting.

4 files changed, 16 insertions, 6 deletions

diff --git a/comms/asterisk10/PLIST b/comms/asterisk10/PLIST
index fe2e0f9446c..be3dfd753a8 100644
--- a/comms/asterisk10/PLIST
+++ b/comms/asterisk10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/08/15 08:05:06 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/09/30 19:24:18 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -332,6 +332,7 @@ lib/asterisk/modules/res_musiconhold.so
 lib/asterisk/modules/res_mutestream.so
 ${PLIST.unixodbc}lib/asterisk/modules/res_odbc.so
 lib/asterisk/modules/res_phoneprov.so
+${PLIST.mgcp}lib/asterisk/modules/res_pktccops.so
 lib/asterisk/modules/res_realtime.so
 lib/asterisk/modules/res_rtp_asterisk.so
 lib/asterisk/modules/res_rtp_multicast.so
diff --git a/comms/asterisk10/options.mk b/comms/asterisk10/options.mk
index 9a5b35c6c27..587eabd81ae 100644
--- a/comms/asterisk10/options.mk
+++ b/comms/asterisk10/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2012/04/07 20:05:57 jnemeth Exp $
+# $NetBSD: options.mk,v 1.5 2012/09/30 19:24:18 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -67,8 +67,12 @@ post-configure:
 .if !empty(PKG_OPTIONS:Munixodbc)
 	${ECHO} "MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE" >> ${WRKSRC}/pkgsrc.makeopts
 .endif
-	# this is a hack to work around a bug in menuselect
+.if defined(PLIST.mgcp)
+	${ECHO} "MENUSELECT_RES=-res_pktccops" >> ${WRKSRC}/pkgsrc.makeopts
+	${ECHO} "MENUSELECT_CHANNELS=-chan_mgcp" >> ${WRKSRC}/pkgsrc.makeopts
+.endif
 	${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts
+	# this is a hack to work around a bug in menuselect
 	cd ${WRKSRC} && make menuselect.makeopts
 
 .if !empty(PKG_OPTIONS:Mwebvmail)
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index 252c81a142b..6a11b8a34ca 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2012/08/19 18:41:10 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/09/30 19:29:05 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -326,6 +326,7 @@ lib/asterisk/modules/res_musiconhold.so
 lib/asterisk/modules/res_mutestream.so
 ${PLIST.unixodbc}lib/asterisk/modules/res_odbc.so
 lib/asterisk/modules/res_phoneprov.so
+${PLIST.mgcp}lib/asterisk/modules/res_pktccops.so
 lib/asterisk/modules/res_realtime.so
 lib/asterisk/modules/res_rtp_asterisk.so
 lib/asterisk/modules/res_rtp_multicast.so
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index b77c926d6bc..0836b361232 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2012/04/07 20:10:45 jnemeth Exp $
+# $NetBSD: options.mk,v 1.11 2012/09/30 19:29:05 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -67,8 +67,12 @@ post-configure:
 .if !empty(PKG_OPTIONS:Munixodbc)
 	${ECHO} "MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE" >> ${WRKSRC}/pkgsrc.makeopts
 .endif
-	# this is a hack to work around a bug in menuselect
+.if defined(PLIST.mgcp)
+	${ECHO} "MENUSELECT_RES=-res_pktccops" >> ${WRKSRC}/pkgsrc.makeopts
+	${ECHO} "MENUSELECT_CHANNELS=-chan_mgcp" >> ${WRKSRC}/pkgsrc.makeopts
+.endif
 	${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts
+	# this is a hack to work around a bug in menuselect
 	cd ${WRKSRC} && make menuselect.makeopts
 
 .if !empty(PKG_OPTIONS:Mwebvmail)