Sun Aug 19 18:41:10 2012 UTC ()
Fix the build issue where some people were seeing chan_mgcp.so
being built and others weren't by detecting the situation when it
would be built and adjusting the PLIST accordingly.


(jnemeth)
diff -r1.42 -r1.43 pkgsrc/comms/asterisk18/Makefile
diff -r1.18 -r1.19 pkgsrc/comms/asterisk18/PLIST
cvs diff -r1.42 -r1.43 pkgsrc/comms/asterisk18/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/Makefile 2012/08/03 08:22:53 1.42
+++ pkgsrc/comms/asterisk18/Makefile 2012/08/19 18:41:10 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.42 2012/08/03 08:22:53 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.43 2012/08/19 18:41:10 jnemeth Exp $
2# 2#
3# NOTE: when updating this package, there are two places that sound 3# NOTE: when updating this package, there are two places that sound
4# tarballs need to be checked 4# tarballs need to be checked
5 5
6DISTNAME= asterisk-1.8.15.0 6DISTNAME= asterisk-1.8.15.0
7DIST_SUBDIR= ${PKGNAME_NOREV} 7DIST_SUBDIR= ${PKGNAME_NOREV}
8DISTFILES= ${DEFAULT_DISTFILES} 8DISTFILES= ${DEFAULT_DISTFILES}
9EXTRACT_ONLY= ${DISTNAME}.tar.gz 9EXTRACT_ONLY= ${DISTNAME}.tar.gz
10CATEGORIES= comms net audio 10CATEGORIES= comms net audio
11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ 11MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
12 http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \ 12 http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
13 http://downloads.asterisk.org/pub/telephony/sounds/releases/ 13 http://downloads.asterisk.org/pub/telephony/sounds/releases/
14 14
@@ -91,26 +91,34 @@ MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q} @@ -91,26 +91,34 @@ MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q}
91MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs 91MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
92MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin 92MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
93MAKE_FLAGS+= OPTIMIZE=-O3 93MAKE_FLAGS+= OPTIMIZE=-O3
94 94
95.if !empty(MACHINE_PLATFORM:MSunOS-*-i386) 95.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
96BUILDLINK_TRANSFORM+= rm:-march=i386 96BUILDLINK_TRANSFORM+= rm:-march=i386
97.endif 97.endif
98 98
99PLIST_VARS+= kqueue 99PLIST_VARS+= kqueue
100.if exists(/usr/include/sys/event.h) 100.if exists(/usr/include/sys/event.h)
101PLIST.kqueue= yes 101PLIST.kqueue= yes
102.endif 102.endif
103 103
 104PLIST_VARS+= mgcp
 105# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined
 106# if the grep fails
 107NOSIGPIPE!= ${GREP} SO_NOSIGPIPE /usr/include/sys/socket.h || echo ""
 108.if ${NOSIGPIPE} != ""
 109PLIST.mgcp= yes
 110.endif
 111
104.include "options.mk" 112.include "options.mk"
105 113
106# check sounds/Makefile for current version when upgrading package 114# check sounds/Makefile for current version when upgrading package
107DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.11.tar.gz 115DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
108 116
109# Override default paths in config files 117# Override default paths in config files
110SUBST_CLASSES+= configs 118SUBST_CLASSES+= configs
111SUBST_STAGE.configs= pre-configure 119SUBST_STAGE.configs= pre-configure
112SUBST_FILES.configs= configs/festival.conf.sample 120SUBST_FILES.configs= configs/festival.conf.sample
113SUBST_FILES.configs+= configs/http.conf.sample 121SUBST_FILES.configs+= configs/http.conf.sample
114SUBST_FILES.configs+= configs/musiconhold.conf.sample 122SUBST_FILES.configs+= configs/musiconhold.conf.sample
115SUBST_FILES.configs+= configs/osp.conf.sample 123SUBST_FILES.configs+= configs/osp.conf.sample
116SUBST_FILES.configs+= configs/phoneprov.conf.sample 124SUBST_FILES.configs+= configs/phoneprov.conf.sample
cvs diff -r1.18 -r1.19 pkgsrc/comms/asterisk18/PLIST (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/PLIST 2012/07/17 00:29:33 1.18
+++ pkgsrc/comms/asterisk18/PLIST 2012/08/19 18:41:10 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.18 2012/07/17 00:29:33 jnemeth Exp $ 1@comment $NetBSD: PLIST,v 1.19 2012/08/19 18:41:10 jnemeth Exp $
2include/asterisk.h 2include/asterisk.h
3include/asterisk/_private.h 3include/asterisk/_private.h
4include/asterisk/abstract_jb.h 4include/asterisk/abstract_jb.h
5include/asterisk/acl.h 5include/asterisk/acl.h
6include/asterisk/adsi.h 6include/asterisk/adsi.h
7include/asterisk/ael_structs.h 7include/asterisk/ael_structs.h
8include/asterisk/agi.h 8include/asterisk/agi.h
9include/asterisk/alaw.h 9include/asterisk/alaw.h
10include/asterisk/aoc.h 10include/asterisk/aoc.h
11include/asterisk/app.h 11include/asterisk/app.h
12include/asterisk/ast_expr.h 12include/asterisk/ast_expr.h
13include/asterisk/ast_version.h 13include/asterisk/ast_version.h
14include/asterisk/astdb.h 14include/asterisk/astdb.h
@@ -213,26 +213,27 @@ lib/asterisk/modules/cdr_manager.so @@ -213,26 +213,27 @@ lib/asterisk/modules/cdr_manager.so
213${PLIST.unixodbc}lib/asterisk/modules/cdr_odbc.so 213${PLIST.unixodbc}lib/asterisk/modules/cdr_odbc.so
214lib/asterisk/modules/cdr_sqlite3_custom.so 214lib/asterisk/modules/cdr_sqlite3_custom.so
215lib/asterisk/modules/cdr_syslog.so 215lib/asterisk/modules/cdr_syslog.so
216lib/asterisk/modules/cel_custom.so 216lib/asterisk/modules/cel_custom.so
217lib/asterisk/modules/cel_manager.so 217lib/asterisk/modules/cel_manager.so
218${PLIST.unixodbc}lib/asterisk/modules/cel_odbc.so 218${PLIST.unixodbc}lib/asterisk/modules/cel_odbc.so
219lib/asterisk/modules/cel_sqlite3_custom.so 219lib/asterisk/modules/cel_sqlite3_custom.so
220lib/asterisk/modules/chan_agent.so 220lib/asterisk/modules/chan_agent.so
221lib/asterisk/modules/chan_bridge.so 221lib/asterisk/modules/chan_bridge.so
222${PLIST.jabber}lib/asterisk/modules/chan_gtalk.so 222${PLIST.jabber}lib/asterisk/modules/chan_gtalk.so
223lib/asterisk/modules/chan_iax2.so 223lib/asterisk/modules/chan_iax2.so
224${PLIST.jabber}lib/asterisk/modules/chan_jingle.so 224${PLIST.jabber}lib/asterisk/modules/chan_jingle.so
225lib/asterisk/modules/chan_local.so 225lib/asterisk/modules/chan_local.so
 226${PLIST.mgcp}lib/asterisk/modules/chan_mgcp.so
226lib/asterisk/modules/chan_multicast_rtp.so 227lib/asterisk/modules/chan_multicast_rtp.so
227lib/asterisk/modules/chan_oss.so 228lib/asterisk/modules/chan_oss.so
228lib/asterisk/modules/chan_sip.so 229lib/asterisk/modules/chan_sip.so
229lib/asterisk/modules/chan_skinny.so 230lib/asterisk/modules/chan_skinny.so
230lib/asterisk/modules/chan_unistim.so 231lib/asterisk/modules/chan_unistim.so
231lib/asterisk/modules/codec_a_mu.so 232lib/asterisk/modules/codec_a_mu.so
232lib/asterisk/modules/codec_adpcm.so 233lib/asterisk/modules/codec_adpcm.so
233lib/asterisk/modules/codec_alaw.so 234lib/asterisk/modules/codec_alaw.so
234lib/asterisk/modules/codec_g722.so 235lib/asterisk/modules/codec_g722.so
235lib/asterisk/modules/codec_g726.so 236lib/asterisk/modules/codec_g726.so
236lib/asterisk/modules/codec_gsm.so 237lib/asterisk/modules/codec_gsm.so
237lib/asterisk/modules/codec_ilbc.so 238lib/asterisk/modules/codec_ilbc.so
238lib/asterisk/modules/codec_lpc10.so 239lib/asterisk/modules/codec_lpc10.so