From owner-svn-ports-all@freebsd.org Fri Jan 1 16:43:41 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B0724CD40D; Fri, 1 Jan 2021 16:43:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6rSY1f8cz3JJX; Fri, 1 Jan 2021 16:43:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B4FD26221; Fri, 1 Jan 2021 16:43:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 101GhfTV047239; Fri, 1 Jan 2021 16:43:41 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 101Ghewn047238; Fri, 1 Jan 2021 16:43:40 GMT (envelope-from rene@FreeBSD.org) Message-Id: <202101011643.101Ghewn047238@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 1 Jan 2021 16:43:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559852 - head/net/freeswitch X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/net/freeswitch X-SVN-Commit-Revision: 559852 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2021 16:43:41 -0000 Author: rene Date: Fri Jan 1 16:43:40 2021 New Revision: 559852 URL: https://svnweb.freebsd.org/changeset/ports/559852 Log: net/freeswitch: drop non-default ALL_MODULES option which uses Python 2.7 PR: 249744 Submitted by: swills Modified: head/net/freeswitch/Makefile head/net/freeswitch/pkg-plist Modified: head/net/freeswitch/Makefile ============================================================================== --- head/net/freeswitch/Makefile Fri Jan 1 16:38:52 2021 (r559851) +++ head/net/freeswitch/Makefile Fri Jan 1 16:43:40 2021 (r559852) @@ -56,7 +56,7 @@ GROUPS= ${USERS} SUB_FILES= pkg-message -OPTIONS_DEFINE= ALL_MODULES X11 EXAMPLES PGSQL +OPTIONS_DEFINE= X11 EXAMPLES PGSQL OPTIONS_DEFAULT= 8K 16K ENGLISH PGSQL OPTIONS_MULTI= BITRATE LANGUAGE OPTIONS_MULTI_BITRATE= 8K 16K 32K 48K @@ -64,7 +64,6 @@ OPTIONS_MULTI_LANGUAGE= CHINESE_HK CHINESE_SIM BRAZILI OPTIONS_SUB= yes NO_OPTIONS_SORT= yes -ALL_MODULES_DESC= Build all modules X11_DESC= graphics/ImageMagick[-nox11] dependency 8K_DESC= 8kHz Audio Files 16K_DESC= 16kHz Audio Files @@ -79,46 +78,6 @@ FRENCH_CA_DESC= French Canadian Language Sounds RUSSIAN_DESC= Russian Language Sounds SWEDISH_DESC= Swedish Language Sounds -ALL_MODULES_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \ - ${LOCALBASE}/bin/aclocal:devel/automake \ - ${LOCALBASE}/bin/erl:lang/erlang \ - ${LOCALBASE}/bin/bash:shells/bash \ - ${LOCALBASE}/bin/mariadb:databases/mariadb104-client -ALL_MODULES_CONFLICTS_BUILD= apr -ALL_MODULES_EXTRA_PATCHES= ${FILESDIR}/extrapatch-modules.conf -ALL_MODULES_LIB_DEPENDS= libopencv_video.so:graphics/opencv \ - libSoundTouch.so:audio/soundtouch \ - libasound.so:audio/alsa-lib \ - libcodec2.so:audio/codec2 \ - libflite.so:audio/flite \ - libh2o.so:www/h2o \ - libh323.so:net/h323plus \ - libhiredis.so:databases/hiredis \ - libilbc.so:net/ilbc \ - libmemcached.so:databases/libmemcached \ - libmongoc-1.0.so:devel/mongo-c-driver \ - libmp3lame.so:audio/lame \ - libmp4v2.so:multimedia/mp4v2 \ - libmpg123.so:audio/mpg123 \ - libnetsnmp.so:net-mgmt/net-snmp \ - libopencv_core.so:graphics/opencv-core \ - libopusfile.so:audio/opusfile \ - libportaudio.so:audio/portaudio \ - libpt.so:devel/ptlib \ - librabbitmq.so:net/rabbitmq-c \ - libshout.so:audio/libshout \ - libtheora.so:multimedia/libtheora \ - libtonezone.so:misc/dahdi \ - libvlc.so:multimedia/vlc \ - libyaml.so:textproc/libyaml -ALL_MODULES_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa -ALL_MODULES_USE= XORG=x11 OPENLDAP=yes JAVA=yes -ALL_MODULES_USES= python:2.7 xorg # required by mod_unimrcp -ALL_MODULES_CFLAGS= -I${LOCALBASE}/include/openh323/ \ - -I${JAVA_HOME}/include/ \ - -I${JAVA_HOME}/include/freebsd -JAVA_VERSION= 11 - 8K_VARS= BITRATES+=8000 16K_VARS= BITRATES+=16000 32K_VARS= BITRATES+=32000 @@ -134,14 +93,6 @@ PGSQL_CONFIGURE_ENV_OFF= ac_cv_lib_pq_PQgetvalue=false # INSTALL_TARGET= install-strip .include - -.if ${PORT_OPTIONS:MALL_MODULES} -.if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6 -.else -LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6-nox11 -.endif -.endif EDPRE= freeswitch-sounds EDPOST= 1.0.51.tar.gz Modified: head/net/freeswitch/pkg-plist ============================================================================== --- head/net/freeswitch/pkg-plist Fri Jan 1 16:38:52 2021 (r559851) +++ head/net/freeswitch/pkg-plist Fri Jan 1 16:43:40 2021 (r559852) @@ -5,11 +5,6 @@ bin/fs_ivrd bin/fs_tts bin/fsxs bin/gentls_cert -%%ALL_MODULES%%bin/test_avformat -%%ALL_MODULES%%bin/test_iks -%%ALL_MODULES%%bin/test_mod_av -%%ALL_MODULES%%bin/test_nlsml -%%ALL_MODULES%%bin/test_srgs bin/tone2wav include/freeswitch/libteletone.h include/freeswitch/libteletone_detect.h @@ -64,137 +59,50 @@ include/freeswitch/switch_xml.h include/freeswitch/switch_xml_config.h include/freeswitch/test/switch_fct.h include/freeswitch/test/switch_test.h -%%ALL_MODULES%%lib/freeswitch/mod/mod_abstraction.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_alsa.so lib/freeswitch/mod/mod_amr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_amrwb.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_av.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_avmd.so lib/freeswitch/mod/mod_b64.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_basic.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_bert.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_blacklist.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_callcenter.so lib/freeswitch/mod/mod_cdr_csv.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_cdr_mongodb.so lib/freeswitch/mod/mod_cdr_sqlite.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_cidlookup.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_clearmode.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_cluechoo.so lib/freeswitch/mod/mod_commands.so lib/freeswitch/mod/mod_conference.so lib/freeswitch/mod/mod_console.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_curl.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_cv.so lib/freeswitch/mod/mod_db.so lib/freeswitch/mod/mod_dialplan_asterisk.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_dialplan_directory.so lib/freeswitch/mod/mod_dialplan_xml.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_dingaling.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_directory.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_distributor.so lib/freeswitch/mod/mod_dptools.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_easyroute.so lib/freeswitch/mod/mod_enum.so lib/freeswitch/mod/mod_esf.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_esl.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_event_multicast.so lib/freeswitch/mod/mod_event_socket.so lib/freeswitch/mod/mod_expr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_fail2ban.so lib/freeswitch/mod/mod_fifo.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_format_cdr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_fsk.so lib/freeswitch/mod/mod_fsv.so lib/freeswitch/mod/mod_g723_1.so lib/freeswitch/mod/mod_g729.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_graylog2.so lib/freeswitch/mod/mod_h26x.so lib/freeswitch/mod/mod_hash.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_hiredis.so lib/freeswitch/mod/mod_httapi.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_http_cache.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_imagick.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_isac.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_json_cdr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_ladspa.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_lcr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_ldap.so lib/freeswitch/mod/mod_local_stream.so lib/freeswitch/mod/mod_logfile.so lib/freeswitch/mod/mod_loopback.so lib/freeswitch/mod/mod_lua.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_memcache.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_mp4.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_mp4v.so lib/freeswitch/mod/mod_native_file.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_nibblebill.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_odbc_cdr.so lib/freeswitch/mod/mod_opus.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_oreka.so lib/freeswitch/mod/mod_png.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_portaudio.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_portaudio_stream.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_posix_timer.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_prefix.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_raven.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_rayo.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_redis.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_rss.so lib/freeswitch/mod/mod_rtc.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_rtmp.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_de.so lib/freeswitch/mod/mod_say_en.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_es.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_es_ar.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_fa.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_fr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_he.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_hr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_hu.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_it.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_ja.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_nl.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_pl.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_pt.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_ru.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_sv.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_th.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_say_zh.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_shell_stream.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_shout.so lib/freeswitch/mod/mod_skinny.so lib/freeswitch/mod/mod_sms.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_snapshot.so lib/freeswitch/mod/mod_sndfile.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_snmp.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_snom.so lib/freeswitch/mod/mod_sofia.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_sonar.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_soundtouch.so lib/freeswitch/mod/mod_spandsp.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_spy.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_ssml.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_stress.so lib/freeswitch/mod/mod_syslog.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_theora.so lib/freeswitch/mod/mod_tone_stream.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_translate.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_tts_commandline.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_unimrcp.so lib/freeswitch/mod/mod_valet_parking.so lib/freeswitch/mod/mod_verto.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_video_filter.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_vlc.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_vmd.so lib/freeswitch/mod/mod_voicemail.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_voicemail_ivr.so lib/freeswitch/mod/mod_xml_cdr.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_xml_curl.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_xml_ldap.so lib/freeswitch/mod/mod_xml_rpc.so lib/freeswitch/mod/mod_xml_scgi.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_yaml.so lib/libfreeswitch.a lib/libfreeswitch.so lib/libfreeswitch.so.1