Index: head/net/asterisk11/Makefile =================================================================== --- head/net/asterisk11/Makefile (revision 374835) +++ head/net/asterisk11/Makefile (revision 374836) @@ -1,159 +1,160 @@ # $FreeBSD$ PORTNAME= asterisk PORTVERSION= 11.15.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ PKGNAMESUFFIX= 11 MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ libnewt.so:${PORTSDIR}/devel/newt \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 CFLAGS+= -I${LOCALBASE}/include USE_GCC= yes USE_GNOME= libxml2 USES= bison cpe gmake CPE_VENDOR= digium USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-13* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 UUID OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ XMPP GSM SQLITE CURL LUA UUID OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI OPTIONS_DEFAULT_amd64= DAHDI OPTIONS_DEFAULT_sparc64= DAHDI EXCHANGE_DESC?= Exchange calendar support NEWG711_DESC?= New G711 codec SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support DAHDI_DESC?= DAHDI support XMPP_DESC?= XMPP/GTALK support UUID_DESC?= libuuid support (required for ICE and TURN in RTP) OPTIONS_SUB= yes OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ libh323_r.so:${PORTSDIR}/net/openh323 DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ libopenr2.so:${PORTSDIR}/misc/openr2 ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \ libltdl.so:${PORTSDIR}/devel/libltdl FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USE= MYSQL=yes VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp XMPP_CONFIGURE_WITH= iksemel XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel SQLITE_CONFIGURE_WITH= sqlite SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp LUA_CONFIGURE_WITH= lua LUA_USES= lua:51 LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes UUID_LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid UUID_CONFIGURE_ON= --with-uuid=${LOCALBASE} UUID_CONFIGURE_OFF= --disable-uuid UUID_CONFLICTS= ossp-uuid-[0-9]* ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} PLIST_SUB+= VARDIR=${VARDIR} post-extract: ${FIND} ${WRKSRC} -name '*.d' -delete post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts .if ${PORT_OPTIONS:MMYSQL} @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts .endif .if ${PORT_OPTIONS:MOOH323} @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts .endif .if ${PORT_OPTIONS:MNEWG711} @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts .endif post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua .include Index: head/net/asterisk11/files/patch-Makefile =================================================================== --- head/net/asterisk11/files/patch-Makefile (revision 374835) +++ head/net/asterisk11/files/patch-Makefile (revision 374836) @@ -1,137 +1,137 @@ --- Makefile.orig 2014-10-31 16:40:55 UTC +++ Makefile @@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) -DEBUG=-g3 +#DEBUG=-g3 # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk @@ -202,7 +202,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) + BSDVERSION=$(OSVERSION) _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) # flag to tell 'ldconfig' to only process specified directories LDCONFIG_FLAGS=-m @@ -456,8 +456,12 @@ datafiles: _all doc/core-en_US.xml $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi + if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \ + $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \ + fi + for x in images/*.jpg; do \ - $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \ + $(INSTALL) -m 644 $$x "$(DESTDIR)$(DOCSDIR)/images" ; \ done $(MAKE) -C sounds install @@ -537,7 +541,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \ - "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" + "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" "$(ASTSPOOLDIR)/outgoing" installdirs: @for i in $(INSTALLDIRS); do \ @@ -606,7 +610,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif -install: badshell bininstall datafiles +install: badshell bininstall datafiles samples @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi @@ -615,21 +619,7 @@ install: badshell bininstall datafiles @echo " + YOU MUST READ THE SECURITY DOCUMENT +" @echo " + +" @echo " + Asterisk has successfully been installed. +" - @echo " + If you would like to install the sample +" - @echo " + configuration files (overwriting any +" - @echo " + existing config files), run: +" @echo " + +" - @echo " + $(mK) samples +" - @echo " + +" - @echo " +----------------- or ---------------------+" - @echo " + +" - @echo " + You can go ahead and install the asterisk +" - @echo " + program documentation now or later run: +" - @echo " + +" - @echo " + $(mK) progdocs +" - @echo " + +" - @echo " + **Note** This requires that you have +" - @echo " + doxygen installed on your local system +" @echo " +-------------------------------------------+" @$(MAKE) -s oldmodcheck @@ -648,45 +638,30 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ - $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ done samples: adsi @echo Installing other config files... @for x in configs/*.sample; do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s "$${dst}" "$$x" ; then \ - echo "Config file $$x is unchanged"; \ - continue; \ - fi ; \ - mv -f "$${dst}" "$${dst}.old" ; \ - else \ - echo "Skipping config file $$x"; \ - continue; \ - fi ;\ - fi ; \ echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ + $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ;\ done - if [ "$(OVERWRITE)" = "y" ]; then \ - echo "Updating asterisk.conf" ; \ - sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ - -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ - -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \ - -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \ - -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \ - -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \ - -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \ - -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ - -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ - -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ - -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ - "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ - rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - fi ; \ + echo "Updating asterisk.conf" ; \ + sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ + -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ + -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \ + -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \ + -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \ + -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \ + -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \ + -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ + -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ + -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ + -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ -+ "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ ++ "$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ + $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \ + rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"