From owner-svn-ports-head@freebsd.org Sat Mar 16 18:03:43 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1CB215379EC; Sat, 16 Mar 2019 18:03:42 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) 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 9A8116E566; Sat, 16 Mar 2019 18:03:42 +0000 (UTC) (envelope-from tcberner@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 91149259C6; Sat, 16 Mar 2019 18:03:42 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GI3gxF048451; Sat, 16 Mar 2019 18:03:42 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GI3frd048447; Sat, 16 Mar 2019 18:03:41 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903161803.x2GI3frd048447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 18:03:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495938 - in head/multimedia: avidemux avidemux-plugins X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/multimedia: avidemux avidemux-plugins X-SVN-Commit-Revision: 495938 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9A8116E566 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 18:03:43 -0000 Author: tcberner Date: Sat Mar 16 18:03:41 2019 New Revision: 495938 URL: https://svnweb.freebsd.org/changeset/ports/495938 Log: multimedia/avidemux, multimedia/avidemux-plugins: remove QT4 options (Qt4 deprecation) - this breaks multimeda/avidemux-qt4 until removal Approved by: portmgr (implicit) Modified: head/multimedia/avidemux-plugins/Makefile head/multimedia/avidemux-plugins/pkg-plist head/multimedia/avidemux/Makefile head/multimedia/avidemux/Makefile.common Modified: head/multimedia/avidemux-plugins/Makefile ============================================================================== --- head/multimedia/avidemux-plugins/Makefile Sat Mar 16 18:02:10 2019 (r495937) +++ head/multimedia/avidemux-plugins/Makefile Sat Mar 16 18:03:41 2019 (r495938) @@ -3,7 +3,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia PKGNAMESUFFIX= -plugins @@ -26,11 +26,6 @@ CMAKE_ARGS+= -DPLUGIN_UI=ALL .if ${PORT_OPTIONS:MCLI} BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli -.endif - -.if ${PORT_OPTIONS:MQT4} -BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/qt4/config.h:multimedia/avidemux-qt4 -RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/qt4/config.h:multimedia/avidemux-qt4 .endif .if ${PORT_OPTIONS:MGTK3} Modified: head/multimedia/avidemux-plugins/pkg-plist ============================================================================== --- head/multimedia/avidemux-plugins/pkg-plist Sat Mar 16 18:02:10 2019 (r495937) +++ head/multimedia/avidemux-plugins/pkg-plist Sat Mar 16 18:03:41 2019 (r495938) @@ -100,11 +100,8 @@ lib/ADM_plugins6/autoScripts/lib/ADM_image.py %%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so %%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so %%AMRWB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.so -%%QT4%%lib/ADM_plugins6/scriptEngines/qt4/libadm_script_QT4.so %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so -%%QT4%%%%X264%%lib/ADM_plugins6/videoEncoders/qt4/libADM_ve_x264_QT4.so -%%QT4%%%%X265%%lib/ADM_plugins6/videoEncoders/qt4/libADM_ve_x265_QT4.so %%CLI%%%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so %%CLI%%%%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so @@ -114,349 +111,3 @@ lib/ADM_plugins6/autoScripts/lib/ADM_image.py %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_HueQT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_asharpQT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_chromaShiftQT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_contrastQT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_cropQT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_eq2QT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_mpdelogoQT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_swscaleResizeQT4.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_glBenchmark.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_glResize.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_rotateGlFrag2.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlFrag2.so -%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlVertex.so -%%QT4%%share/avidemux6/help/QtScriptQT4/Dialog.jpg -%%QT4%%share/avidemux6/help/QtScriptQT4/_dialog_8admjs-example.html -%%QT4%%share/avidemux6/help/QtScriptQT4/_transcode_directory_8admjs-example.html -%%QT4%%share/avidemux6/help/QtScriptQT4/annotated.html -%%QT4%%share/avidemux6/help/QtScriptQT4/avidemux_icon_small.png -%%QT4%%share/avidemux6/help/QtScriptQT4/bc_s.png -%%QT4%%share/avidemux6/help/QtScriptQT4/bdwn.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_encoder-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_encoder.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output_collection-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output_collection.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_properties-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_properties.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item_collection-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item_collection.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_control.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_control.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_control_collection-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_control_collection.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_dialog-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_dialog.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_directory-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_directory.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_editor-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_editor.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_file-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_file.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_file_information-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_file_information.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_frame_properties-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_frame_properties.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_muxer-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_muxer.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment_collection-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment_collection.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control.png -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_decoder-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_decoder.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_encoder-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_encoder.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_file_properties-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_file_properties.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter_collection-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter_collection.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_output-members.html -%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_output.html -%%QT4%%share/avidemux6/help/QtScriptQT4/classes.html -%%QT4%%share/avidemux6/help/QtScriptQT4/closed.png -%%QT4%%share/avidemux6/help/QtScriptQT4/doxygen.css -%%QT4%%share/avidemux6/help/QtScriptQT4/dynsections.js -%%QT4%%share/avidemux6/help/QtScriptQT4/examples.html -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2blank.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2cl.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2doc.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2folderclosed.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2folderopen.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2lastnode.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2link.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mlastnode.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mnode.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mo.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2node.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2ns.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2plastnode.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2pnode.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2splitbar.png -%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2vertline.png -%%QT4%%share/avidemux6/help/QtScriptQT4/functions.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x62.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x63.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x64.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x65.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x66.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x67.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x68.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x69.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6a.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6c.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6d.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6e.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6f.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x70.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x71.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x72.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x73.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x74.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x75.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x76.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x77.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_enum.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_eval.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_func.html -%%QT4%%share/avidemux6/help/QtScriptQT4/functions_prop.html -%%QT4%%share/avidemux6/help/QtScriptQT4/group__global_functions.html -%%QT4%%share/avidemux6/help/QtScriptQT4/hierarchy.html -%%QT4%%share/avidemux6/help/QtScriptQT4/jquery.js -%%QT4%%share/avidemux6/help/QtScriptQT4/modules.html -%%QT4%%share/avidemux6/help/QtScriptQT4/nav_f.png -%%QT4%%share/avidemux6/help/QtScriptQT4/nav_g.png -%%QT4%%share/avidemux6/help/QtScriptQT4/nav_h.png -%%QT4%%share/avidemux6/help/QtScriptQT4/open.png -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_61.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_61.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_62.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_62.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_63.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_63.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_64.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_64.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_65.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_65.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_66.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_66.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_67.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_67.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_68.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_68.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_69.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_69.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6a.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6a.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6c.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6c.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6d.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6d.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6e.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6e.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6f.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6f.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_70.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_70.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_71.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_71.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_72.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_72.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_73.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_73.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_74.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_74.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_75.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_75.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_76.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_76.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_77.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_77.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_61.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_61.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_63.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_63.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_64.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_64.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_65.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_65.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_66.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_66.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6c.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6c.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6d.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6d.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_73.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_73.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_76.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_76.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/close.png -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_61.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_61.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_63.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_63.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_66.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_66.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_67.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_67.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_69.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_69.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6d.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6d.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6f.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6f.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_70.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_70.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_73.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_73.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_61.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_61.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_62.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_62.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_63.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_63.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_64.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_64.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_65.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_65.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_66.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_66.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_68.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_68.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_69.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_69.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6a.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6a.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6c.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6c.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6d.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6d.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6e.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6e.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6f.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6f.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_70.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_70.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_72.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_72.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_73.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_73.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_74.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_74.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_75.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_75.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_77.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_77.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_61.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_61.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_63.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_63.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_64.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_64.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_65.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_65.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_66.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_66.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_69.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_69.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6c.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6c.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6d.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6d.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6f.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6f.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_70.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_70.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_72.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_72.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_73.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_73.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_74.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_74.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_75.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_75.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_77.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_77.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/groups_67.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/groups_67.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/mag_sel.png -%%QT4%%share/avidemux6/help/QtScriptQT4/search/nomatches.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/pages_61.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/pages_61.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_61.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_61.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_62.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_62.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_63.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_63.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_64.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_64.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_65.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_65.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_66.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_66.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_67.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_67.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_68.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_68.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_69.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_69.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6c.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6c.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6d.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6d.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6e.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6e.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6f.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6f.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_70.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_70.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_71.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_71.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_72.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_72.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_73.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_73.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_74.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_74.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_76.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_76.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_77.html -%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_77.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/search.css -%%QT4%%share/avidemux6/help/QtScriptQT4/search/search.js -%%QT4%%share/avidemux6/help/QtScriptQT4/search/search_l.png -%%QT4%%share/avidemux6/help/QtScriptQT4/search/search_m.png -%%QT4%%share/avidemux6/help/QtScriptQT4/search/search_r.png -%%QT4%%share/avidemux6/help/QtScriptQT4/sync_off.png -%%QT4%%share/avidemux6/help/QtScriptQT4/sync_on.png -%%QT4%%share/avidemux6/help/QtScriptQT4/tab_a.png -%%QT4%%share/avidemux6/help/QtScriptQT4/tab_b.png -%%QT4%%share/avidemux6/help/QtScriptQT4/tab_h.png -%%QT4%%share/avidemux6/help/QtScriptQT4/tab_s.png -%%QT4%%share/avidemux6/help/QtScriptQT4/tabs.css Modified: head/multimedia/avidemux/Makefile ============================================================================== --- head/multimedia/avidemux/Makefile Sat Mar 16 18:02:10 2019 (r495937) +++ head/multimedia/avidemux/Makefile Sat Mar 16 18:03:41 2019 (r495938) @@ -6,7 +6,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org @@ -14,23 +14,20 @@ COMMENT= Simple GUI based video editor .include "${.CURDIR}/Makefile.common" -.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4} +.if ${PORT_OPTIONS:MGTK2} PLIST_FILES+= ${DATADIR}/${PORTNAME}.png .endif .if ${PORT_OPTIONS:MGTK2} PLIST_FILES+= ${DESKTOPDIR}/${PORTNAME}.desktop .endif -.if ${PORT_OPTIONS:MQT4} -PLIST_FILES+= ${DESKTOPDIR}/${PORTNAME}_qt4.desktop -.endif CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux_core post-configure: post-configure-common post-install: -.if ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} +.if ${PORT_OPTIONS:MGTK3} @${MKDIR} "${STAGEDIR}${DATADIR}" ${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${STAGEDIR}${DATADIR}/${PORTNAME}.png" .if ${PORT_OPTIONS:MGTK3} @@ -38,12 +35,6 @@ post-install: -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|gtk|g" \ < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}.desktop ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}" -.endif -.if ${PORT_OPTIONS:MQT4} - @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ - -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|qt4|g" \ - < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}_qt4.desktop - ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}_qt4.desktop" "${STAGEDIR}${DESKTOPDIR}" .endif .endif Modified: head/multimedia/avidemux/Makefile.common ============================================================================== --- head/multimedia/avidemux/Makefile.common Sat Mar 16 18:02:10 2019 (r495937) +++ head/multimedia/avidemux/Makefile.common Sat Mar 16 18:03:41 2019 (r495938) @@ -34,7 +34,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -OPTIONS_DEFINE= QT4 CLI FREETYPE FONTCONFIG OSS JACK \ +OPTIONS_DEFINE= CLI FREETYPE FONTCONFIG OSS JACK \ PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \ FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU OPTIONS_DEFAULT= FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \ @@ -58,14 +58,9 @@ OPTIONS_DEFAULT+= LAME FAAC AMR X264 .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" -. if ${PORT_OPTIONS:MQT4} -PLIST_SUB+= QT_NLS="" -. else -PLIST_SUB+= QT_NLS="@comment " -. endif .else CMAKE_ARGS+= -DNO_NLS:BOOL=ON -PLIST_SUB+= NLS="@comment " QT_NLS="@comment " +PLIST_SUB+= NLS="@comment " .endif # for libexecinfo: (so that __builtin_frame_address() finds the top @@ -81,7 +76,7 @@ CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo # We haven't ALSA(Never) & Aften(Yet) on FreeBSD CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF -.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MQT4) +.if empty(PORT_OPTIONS:MGTK3) CMAKE_ARGS+= -DX11:BOOL=OFF .else USE_GNOME+= libxslt @@ -95,16 +90,8 @@ CMAKE_ARGS+= -DGTK:BOOL=OFF PLIST_SUB+= GTK="@comment " .endif -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE=2019-03-15 -USES+= qt:4 -USE_QT= qmake_build moc_build rcc_build uic_build linguist_build gui -PLIST_SUB+= QT4="" -.else CMAKE_ARGS+= -DQT4:BOOL=OFF PLIST_SUB+= QT4="@comment " -.endif .if ${PORT_OPTIONS:MCLI} PLIST_SUB+= CLI=""