*/*: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-02-12 14:20:06 +01:00
parent 22a853f387
commit bd12ca9751
744 changed files with 5231 additions and 3885 deletions

View File

@ -2,7 +2,6 @@
PORTNAME= speech
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= accessibility
PKGNAMEPREFIX= qt5-

View File

@ -2,7 +2,6 @@
PORTNAME= karchive
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
PORTREVISION= 1
CATEGORIES= archivers kde kde-frameworks
MAINTAINER= kde@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1546843253
SHA256 (KDE/frameworks/5.54.0/karchive-5.54.0.tar.xz) = 8f28ab8a8f7236ae5e9e6cf35263dbbb87a52ec938d35515f073bc33dbc33d90
SIZE (KDE/frameworks/5.54.0/karchive-5.54.0.tar.xz) = 439964
TIMESTAMP = 1549270026
SHA256 (KDE/frameworks/5.55.0/karchive-5.55.0.tar.xz) = 8475efa46cdc054d9fb6336e42c6075fb037921a9147d4e5aa564a5e58b79fd2
SIZE (KDE/frameworks/5.55.0/karchive-5.55.0.tar.xz) = 439948

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Horde_Compress
PORTVERSION= 2.2.1
PORTVERSION= 2.2.2
CATEGORIES= archivers www pear
MAINTAINER= horde@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1504391761
SHA256 (Horde/Horde_Compress-2.2.1.tgz) = c94faad0a56c57ec5199fc0b4678808d8885ad60f53b59bf00686df9d873749c
SIZE (Horde/Horde_Compress-2.2.1.tgz) = 2198999
TIMESTAMP = 1549970813
SHA256 (Horde/Horde_Compress-2.2.2.tgz) = edbe014a0b1f6e2a5e68f818e6589ce5f8ec601ee3c52917aa35e82ec693d033
SIZE (Horde/Horde_Compress-2.2.2.tgz) = 2199440

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= urbackup-client
DISTVERSION= 2.2.6
PORTREVISION= 2
DISTVERSION= 2.3.4
CATEGORIES= archivers
MASTER_SITES= https://hndl.urbackup.org/Client/${DISTVERSION}/
@ -14,15 +13,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcryptopp.so:security/cryptopp
USES= autoreconf compiler:c++11-lang dos2unix gettext localbase \
pkgconfig
USES= autoreconf compiler:c++11-lang dos2unix gettext localbase libtool \
pkgconfig sqlite:3
USE_RC_SUBR= urbackup_client
USERS= urbackup
GROUPS= urbackup
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-clientupdate
CONFIGURE_ARGS= --disable-clientupdate --without-embedded-sqlite3
CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp`
SUB_FILES= pkg-message urbackupclient.conf.sample-daemon

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1533504834
SHA256 (urbackup-client-2.2.6.tar.gz) = 95d5a8d4e8016c23171f12340a7fc28cd8d275d6c815604f28e978a4256eff6f
SIZE (urbackup-client-2.2.6.tar.gz) = 3370637
TIMESTAMP = 1549130281
SHA256 (urbackup-client-2.3.4.tar.gz) = 0016df892687c4f254877827253b0e493c85d273da8ab95edc00e99dce1f6b63
SIZE (urbackup-client-2.3.4.tar.gz) = 4343843

View File

@ -9,8 +9,8 @@ UrBackup also continuously watches folders you want backed up in
order to quickly find differences to previous backups. Because of
that, incremental file backups are really fast.
Your files can be restored through the web interface, via the client or the
Windows Explorer while the backups of drive volumes can be restored with a
Your files can be restored through the web interface, via the client or the
Windows Explorer while the backups of drive volumes can be restored with a
bootable CD or USB-Stick (bare metal restore).
A web interface makes setting up your own backup server really easy.

View File

@ -3,6 +3,7 @@
PORTNAME= libosmium
PORTVERSION= 2.15.0
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= astro geography devel

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mkgmap
PORTVERSION= r4262
PORTVERSION= r4271
CATEGORIES= astro converters java
MASTER_SITES= http://www.mkgmap.org.uk/download/ \
http://mirror.amdmi3.ru/distfiles/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547519612
SHA256 (mkgmap-r4262.tar.gz) = 47ee61c8c1ebb917ebef04f5da74075944dd455a7b35106c62e5e06638a7062a
SIZE (mkgmap-r4262.tar.gz) = 3393734
TIMESTAMP = 1549989456
SHA256 (mkgmap-r4271.tar.gz) = a1fa3bfca70a4740a2fad0a61cef902f2e38e7b9238b3ce41c27e57993b934b3
SIZE (mkgmap-r4271.tar.gz) = 3395854

View File

@ -245,6 +245,7 @@
SUBDIR += gqradio
SUBDIR += gradio
SUBDIR += gramofile
SUBDIR += gsequencer
SUBDIR += gsm
SUBDIR += gsound
SUBDIR += gstreamer-plugins-a52dec
@ -706,6 +707,7 @@
SUBDIR += pytone
SUBDIR += qjackctl
SUBDIR += qmidiarp
SUBDIR += qmidictl
SUBDIR += qmpdclient
SUBDIR += qsampler
SUBDIR += qsynth

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= abcde
DISTVERSION= 2.9.2
PORTREVISION= 1
DISTVERSION= 2.9.3
CATEGORIES= audio
MASTER_SITES= http://abcde.einval.com/download/
@ -20,10 +19,10 @@ RUN_DEPENDS= cd-discid:audio/cd-discid \
oggenc:audio/vorbis-tools \
bash:shells/bash
USES= shebangfix
NO_ARCH= yes
NO_BUILD= yes
USES= shebangfix
SHEBANG_FILES= abcde abcde-musicbrainz-tool cddb-tool
SUB_FILES= pkg-message

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1533303769
SHA256 (abcde-2.9.2.tar.gz) = 34356c6ea4cc39b33c807261bfdf8e8da8905b2ed50313147c78b283eef6858d
SIZE (abcde-2.9.2.tar.gz) = 160799
TIMESTAMP = 1549916342
SHA256 (abcde-2.9.3.tar.gz) = 046cd0bba78dd4bbdcbcf82fe625865c60df35a005482de13a6699c5a3b83124
SIZE (abcde-2.9.3.tar.gz) = 160876

View File

@ -1,11 +0,0 @@
--- abcde.orig 2018-08-07 10:53:58.070134000 +0200
+++ abcde 2018-08-07 10:54:34.101817000 +0200
@@ -2110,7 +2110,7 @@
CDPARANOIAAUDIOTRACKS="$TRACKS"
LEADOUT="$(echo "$CDPARANOIAOUTPUT" | grep -Eo '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
- OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
+ OFFSETS="$(echo "$CDPARANOIAOUTPUT" | awk '/^ +.*\[/ {print $4}')"
makeids
;;
*)

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fasttracker2
DISTVERSION= 0.1-b132
DISTVERSION= 0.1-b134
CATEGORIES= audio
MASTER_SITES= https://16-bits.org/ \
LOCAL/ehaupt
@ -17,7 +17,7 @@ LICENSE_COMB= multi
LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/src/LICENSE.txt
LICENSE_FILE_CC-BY-NC-SA-4.0= ${WRKSRC}/src/gfxdata/bmp/LICENSE.txt
USES= dos2unix localbase:ldflags zip iconv:wchar_t
USES= dos2unix iconv:wchar_t localbase:ldflags sdl zip
USE_SDL= sdl2
WRKSRC= ${WRKDIR}/ft2-clone-code

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548774891
SHA256 (ft2clone-b132-code.zip) = 128009f55e685794bfe08dbef94b5f3c80be9209c12da0dd860889a36b8180d2
SIZE (ft2clone-b132-code.zip) = 3462977
TIMESTAMP = 1549950528
SHA256 (ft2clone-b134-code.zip) = 0b65ee79c4393a0dcb9fbe41458eaa5fdc9722c0606b370e61a76fd1dd91c9fa
SIZE (ft2clone-b134-code.zip) = 3463053

50
audio/gsequencer/Makefile Normal file
View File

@ -0,0 +1,50 @@
# $FreeBSD$
PORTNAME= gsequencer
DISTVERSION= 2.1.53
CATEGORIES= audio
MASTER_SITES= SAVANNAH/gsequencer/2.1.x
MAINTAINER= yuri@FreeBSD.org
COMMENT= Advanced Gtk+ sequencer
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= dssi>0:audio/dssi \
lv2>0:audio/lv2
LIB_DEPENDS= libasound.so:audio/alsa-lib \
libfftw3.so:math/fftw3 \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libinstpatch-1.0.so:audio/libinstpatch \
libsamplerate.so:audio/libsamplerate \
libsndfile.so:audio/libsndfile \
libuuid.so:misc/e2fsprogs-libuuid
RUN_DEPENDS= dssi>0:audio/dssi
USES= desktop-file-utils gettext-runtime gmake gnome libtool localbase pkgconfig shared-mime-info
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-alsa --enable-oss
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango
USE_XORG= x11
USE_GCC= yes # the project uses gnu99 extensions, clang fails even with USE_CSTD=gnu99. Suggestions how to build with clang are welcome.
USE_CSTD= gnu99
USE_LDCONFIG= yes
LDFLAGS+= -luuid
INSTALLS_ICONS= yes
OPTIONS_DEFINE= JACK PULSEAUDIO
JACK_CONFIGURE_ENABLE= jack
JACK_LIB_DEPENDS= libjack.so:audio/jack
PULSEAUDIO_CONFIGURE_ENABLE= pulse
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
post-install:
@${RMDIR} ${STAGEDIR}${PREFIX}/share/doc-base
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1549941919
SHA256 (gsequencer-2.1.53.tar.gz) = 0a0944912ef019b3a8bc64a0fc63465f69885a256f7200f4723cd4fc1de50fc2
SIZE (gsequencer-2.1.53.tar.gz) = 5082278

View File

@ -0,0 +1,11 @@
--- ags/lib/ags_uuid.c.orig 2019-02-11 23:41:39 UTC
+++ ags/lib/ags_uuid.c
@@ -117,7 +117,7 @@ ags_uuid_generate(AgsUUID *ptr)
return;
}
- uuid_generate_time_safe(ptr[0]);
+ uuid_generate_time(ptr[0]); // uuid_generate_time_safe() is missing in FreeBSD's libuuid.so
}
/**

View File

@ -0,0 +1,11 @@
--- ags/util/ags_id_generator.c.orig 2019-02-11 23:40:12 UTC
+++ ags/util/ags_id_generator.c
@@ -53,7 +53,7 @@ ags_id_generator_create_uuid()
/* make sure uuid is really unique */
//FIXME:JK: uncomment me
// while(uuid_generate_time_safe(out) != 0);
- uuid_generate_time_safe(out);
+ uuid_generate_time(out); // uuid_generate_time_safe() is missing in FreeBSD's libuuid.so
/* create a string representation */
uuid_str = (gchar *) malloc((AGS_ID_GENERATOR_DEFAULT_UUID_LENGTH + 1) * sizeof(gchar));

View File

@ -0,0 +1,6 @@
Advanced Gtk+ Sequencer is capable of doing multi-channel editing, it contains
an automation editor and you might want live export to audio files. There are
sequencer machines as well a fully featured notation editor. Supporting
copy & paste, resizing audio channels or align in-/output pads.
WWW: https://nongnu.org/gsequencer/

431
audio/gsequencer/pkg-plist Normal file
View File

@ -0,0 +1,431 @@
bin/gsequencer
bin/midi2xml
include/ags/audio/ags_acceleration.h
include/ags/audio/ags_audio.h
include/ags/audio/ags_audio_application_context.h
include/ags/audio/ags_audio_buffer_util.h
include/ags/audio/ags_audio_signal.h
include/ags/audio/ags_automation.h
include/ags/audio/ags_buffer.h
include/ags/audio/ags_channel.h
include/ags/audio/ags_char_buffer_util.h
include/ags/audio/ags_devin.h
include/ags/audio/ags_devout.h
include/ags/audio/ags_fifoout.h
include/ags/audio/ags_generic_recall_channel_run.h
include/ags/audio/ags_generic_recall_recycling.h
include/ags/audio/ags_input.h
include/ags/audio/ags_midi.h
include/ags/audio/ags_midiin.h
include/ags/audio/ags_notation.h
include/ags/audio/ags_note.h
include/ags/audio/ags_output.h
include/ags/audio/ags_pattern.h
include/ags/audio/ags_playback.h
include/ags/audio/ags_playback_domain.h
include/ags/audio/ags_port.h
include/ags/audio/ags_preset.h
include/ags/audio/ags_recall.h
include/ags/audio/ags_recall_audio.h
include/ags/audio/ags_recall_audio_run.h
include/ags/audio/ags_recall_audio_signal.h
include/ags/audio/ags_recall_channel.h
include/ags/audio/ags_recall_channel_run.h
include/ags/audio/ags_recall_container.h
include/ags/audio/ags_recall_dependency.h
include/ags/audio/ags_recall_dssi.h
include/ags/audio/ags_recall_dssi_run.h
include/ags/audio/ags_recall_factory.h
include/ags/audio/ags_recall_id.h
include/ags/audio/ags_recall_ladspa.h
include/ags/audio/ags_recall_ladspa_run.h
include/ags/audio/ags_recall_lv2.h
include/ags/audio/ags_recall_lv2_run.h
include/ags/audio/ags_recall_recycling.h
include/ags/audio/ags_recycling.h
include/ags/audio/ags_recycling_context.h
include/ags/audio/ags_sequencer_util.h
include/ags/audio/ags_sound_enums.h
include/ags/audio/ags_sound_provider.h
include/ags/audio/ags_soundcard_util.h
include/ags/audio/ags_synth_generator.h
include/ags/audio/ags_synth_util.h
include/ags/audio/ags_track.h
include/ags/audio/ags_wave.h
include/ags/audio/core-audio/ags_core_audio_client.h
include/ags/audio/core-audio/ags_core_audio_devin.h
include/ags/audio/core-audio/ags_core_audio_devout.h
include/ags/audio/core-audio/ags_core_audio_midiin.h
include/ags/audio/core-audio/ags_core_audio_port.h
include/ags/audio/core-audio/ags_core_audio_server.h
include/ags/audio/file/ags_audio_container.h
include/ags/audio/file/ags_audio_file.h
include/ags/audio/file/ags_audio_file_link.h
include/ags/audio/file/ags_audio_file_xml.h
include/ags/audio/file/ags_ipatch.h
include/ags/audio/file/ags_ipatch_dls2_reader.h
include/ags/audio/file/ags_ipatch_gig_reader.h
include/ags/audio/file/ags_ipatch_sample.h
include/ags/audio/file/ags_ipatch_sf2_reader.h
include/ags/audio/file/ags_sndfile.h
include/ags/audio/file/ags_sound_container.h
include/ags/audio/file/ags_sound_resource.h
include/ags/audio/jack/ags_jack_client.h
include/ags/audio/jack/ags_jack_devin.h
include/ags/audio/jack/ags_jack_devout.h
include/ags/audio/jack/ags_jack_midiin.h
include/ags/audio/jack/ags_jack_port.h
include/ags/audio/jack/ags_jack_server.h
include/ags/audio/midi/ags_midi_buffer_util.h
include/ags/audio/midi/ags_midi_builder.h
include/ags/audio/midi/ags_midi_file.h
include/ags/audio/midi/ags_midi_parser.h
include/ags/audio/midi/ags_midi_util.h
include/ags/audio/osc/ags_osc_buffer_util.h
include/ags/audio/osc/ags_osc_builder.h
include/ags/audio/osc/ags_osc_client.h
include/ags/audio/osc/ags_osc_connection.h
include/ags/audio/osc/ags_osc_parser.h
include/ags/audio/osc/ags_osc_response.h
include/ags/audio/osc/ags_osc_server.h
include/ags/audio/osc/ags_osc_util.h
include/ags/audio/osc/controller/ags_osc_action_controller.h
include/ags/audio/osc/controller/ags_osc_config_controller.h
include/ags/audio/osc/controller/ags_osc_controller.h
include/ags/audio/osc/controller/ags_osc_front_controller.h
include/ags/audio/osc/controller/ags_osc_info_controller.h
include/ags/audio/osc/controller/ags_osc_meter_controller.h
include/ags/audio/osc/controller/ags_osc_node_controller.h
include/ags/audio/osc/controller/ags_osc_plugin_controller.h
include/ags/audio/osc/controller/ags_osc_renew_controller.h
include/ags/audio/osc/controller/ags_osc_status_controller.h
include/ags/audio/pulse/ags_pulse_client.h
include/ags/audio/pulse/ags_pulse_devin.h
include/ags/audio/pulse/ags_pulse_devout.h
include/ags/audio/pulse/ags_pulse_port.h
include/ags/audio/pulse/ags_pulse_server.h
include/ags/audio/recall/ags_analyse_audio_signal.h
include/ags/audio/recall/ags_analyse_channel.h
include/ags/audio/recall/ags_analyse_channel_run.h
include/ags/audio/recall/ags_analyse_recycling.h
include/ags/audio/recall/ags_buffer_audio_signal.h
include/ags/audio/recall/ags_buffer_channel.h
include/ags/audio/recall/ags_buffer_channel_run.h
include/ags/audio/recall/ags_buffer_recycling.h
include/ags/audio/recall/ags_capture_wave_audio.h
include/ags/audio/recall/ags_capture_wave_audio_run.h
include/ags/audio/recall/ags_capture_wave_channel.h
include/ags/audio/recall/ags_capture_wave_channel_run.h
include/ags/audio/recall/ags_copy_audio_signal.h
include/ags/audio/recall/ags_copy_channel.h
include/ags/audio/recall/ags_copy_channel_run.h
include/ags/audio/recall/ags_copy_pattern_audio.h
include/ags/audio/recall/ags_copy_pattern_audio_run.h
include/ags/audio/recall/ags_copy_pattern_channel.h
include/ags/audio/recall/ags_copy_pattern_channel_run.h
include/ags/audio/recall/ags_copy_recycling.h
include/ags/audio/recall/ags_count_beats_audio.h
include/ags/audio/recall/ags_count_beats_audio_run.h
include/ags/audio/recall/ags_delay_audio.h
include/ags/audio/recall/ags_delay_audio_run.h
include/ags/audio/recall/ags_envelope_audio_signal.h
include/ags/audio/recall/ags_envelope_channel.h
include/ags/audio/recall/ags_envelope_channel_run.h
include/ags/audio/recall/ags_envelope_recycling.h
include/ags/audio/recall/ags_eq10_audio_signal.h
include/ags/audio/recall/ags_eq10_channel.h
include/ags/audio/recall/ags_eq10_channel_run.h
include/ags/audio/recall/ags_eq10_recycling.h
include/ags/audio/recall/ags_feed_audio_signal.h
include/ags/audio/recall/ags_feed_channel.h
include/ags/audio/recall/ags_feed_channel_run.h
include/ags/audio/recall/ags_feed_recycling.h
include/ags/audio/recall/ags_loop_channel.h
include/ags/audio/recall/ags_loop_channel_run.h
include/ags/audio/recall/ags_mute_audio.h
include/ags/audio/recall/ags_mute_audio_run.h
include/ags/audio/recall/ags_mute_audio_signal.h
include/ags/audio/recall/ags_mute_channel.h
include/ags/audio/recall/ags_mute_channel_run.h
include/ags/audio/recall/ags_mute_recycling.h
include/ags/audio/recall/ags_peak_audio_signal.h
include/ags/audio/recall/ags_peak_channel.h
include/ags/audio/recall/ags_peak_channel_run.h
include/ags/audio/recall/ags_peak_recycling.h
include/ags/audio/recall/ags_play_audio.h
include/ags/audio/recall/ags_play_audio_signal.h
include/ags/audio/recall/ags_play_channel.h
include/ags/audio/recall/ags_play_channel_run.h
include/ags/audio/recall/ags_play_channel_run_master.h
include/ags/audio/recall/ags_play_dssi_audio.h
include/ags/audio/recall/ags_play_dssi_audio_run.h
include/ags/audio/recall/ags_play_lv2_audio.h
include/ags/audio/recall/ags_play_lv2_audio_run.h
include/ags/audio/recall/ags_play_notation_audio.h
include/ags/audio/recall/ags_play_notation_audio_run.h
include/ags/audio/recall/ags_play_recycling.h
include/ags/audio/recall/ags_play_wave_audio.h
include/ags/audio/recall/ags_play_wave_audio_run.h
include/ags/audio/recall/ags_play_wave_channel.h
include/ags/audio/recall/ags_play_wave_channel_run.h
include/ags/audio/recall/ags_prepare_audio_signal.h
include/ags/audio/recall/ags_prepare_channel.h
include/ags/audio/recall/ags_prepare_channel_run.h
include/ags/audio/recall/ags_prepare_recycling.h
include/ags/audio/recall/ags_record_midi_audio.h
include/ags/audio/recall/ags_record_midi_audio_run.h
include/ags/audio/recall/ags_route_dssi_audio.h
include/ags/audio/recall/ags_route_dssi_audio_run.h
include/ags/audio/recall/ags_route_lv2_audio.h
include/ags/audio/recall/ags_route_lv2_audio_run.h
include/ags/audio/recall/ags_rt_stream_audio_signal.h
include/ags/audio/recall/ags_rt_stream_channel.h
include/ags/audio/recall/ags_rt_stream_channel_run.h
include/ags/audio/recall/ags_rt_stream_recycling.h
include/ags/audio/recall/ags_stream_audio_signal.h
include/ags/audio/recall/ags_stream_channel.h
include/ags/audio/recall/ags_stream_channel_run.h
include/ags/audio/recall/ags_stream_recycling.h
include/ags/audio/recall/ags_volume_audio_signal.h
include/ags/audio/recall/ags_volume_channel.h
include/ags/audio/recall/ags_volume_channel_run.h
include/ags/audio/recall/ags_volume_recycling.h
include/ags/audio/task/ags_add_audio.h
include/ags/audio/task/ags_add_audio_signal.h
include/ags/audio/task/ags_add_effect.h
include/ags/audio/task/ags_add_note.h
include/ags/audio/task/ags_add_soundcard.h
include/ags/audio/task/ags_apply_bpm.h
include/ags/audio/task/ags_apply_presets.h
include/ags/audio/task/ags_apply_sequencer_length.h
include/ags/audio/task/ags_apply_sound_config.h
include/ags/audio/task/ags_apply_synth.h
include/ags/audio/task/ags_apply_tact.h
include/ags/audio/task/ags_cancel_audio.h
include/ags/audio/task/ags_cancel_channel.h
include/ags/audio/task/ags_clear_audio_signal.h
include/ags/audio/task/ags_clear_buffer.h
include/ags/audio/task/ags_crop_note.h
include/ags/audio/task/ags_export_output.h
include/ags/audio/task/ags_free_selection.h
include/ags/audio/task/ags_link_channel.h
include/ags/audio/task/ags_move_note.h
include/ags/audio/task/ags_notify_soundcard.h
include/ags/audio/task/ags_open_file.h
include/ags/audio/task/ags_open_sf2_instrument.h
include/ags/audio/task/ags_open_sf2_sample.h
include/ags/audio/task/ags_open_single_file.h
include/ags/audio/task/ags_open_wave.h
include/ags/audio/task/ags_remove_audio.h
include/ags/audio/task/ags_remove_audio_signal.h
include/ags/audio/task/ags_remove_note.h
include/ags/audio/task/ags_remove_soundcard.h
include/ags/audio/task/ags_reset_amplitude.h
include/ags/audio/task/ags_reset_peak.h
include/ags/audio/task/ags_resize_audio.h
include/ags/audio/task/ags_seek_soundcard.h
include/ags/audio/task/ags_set_audio_channels.h
include/ags/audio/task/ags_set_buffer_size.h
include/ags/audio/task/ags_set_device.h
include/ags/audio/task/ags_set_format.h
include/ags/audio/task/ags_set_muted.h
include/ags/audio/task/ags_set_samplerate.h
include/ags/audio/task/ags_start_audio.h
include/ags/audio/task/ags_start_channel.h
include/ags/audio/task/ags_start_sequencer.h
include/ags/audio/task/ags_start_soundcard.h
include/ags/audio/task/ags_stop_sequencer.h
include/ags/audio/task/ags_stop_soundcard.h
include/ags/audio/task/ags_switch_buffer_flag.h
include/ags/audio/task/ags_tic_device.h
include/ags/audio/task/ags_toggle_pattern_bit.h
include/ags/audio/thread/ags_audio_loop.h
include/ags/audio/thread/ags_audio_thread.h
include/ags/audio/thread/ags_channel_thread.h
include/ags/audio/thread/ags_export_thread.h
include/ags/audio/thread/ags_sequencer_thread.h
include/ags/audio/thread/ags_soundcard_thread.h
include/ags/audio/thread/ags_wave_loader.h
include/ags/config.h
include/ags/file/ags_file.h
include/ags/file/ags_file_id_ref.h
include/ags/file/ags_file_launch.h
include/ags/file/ags_file_link.h
include/ags/file/ags_file_lookup.h
include/ags/file/ags_file_stock.h
include/ags/file/ags_file_util.h
include/ags/lib/ags_buffer_util.h
include/ags/lib/ags_complex.h
include/ags/lib/ags_conversion.h
include/ags/lib/ags_endian.h
include/ags/lib/ags_function.h
include/ags/lib/ags_log.h
include/ags/lib/ags_parameter.h
include/ags/lib/ags_regex.h
include/ags/lib/ags_string_util.h
include/ags/lib/ags_time.h
include/ags/lib/ags_turtle.h
include/ags/lib/ags_turtle_manager.h
include/ags/lib/ags_uuid.h
include/ags/libags-audio.h
include/ags/libags-gui.h
include/ags/libags.h
include/ags/object/ags_applicable.h
include/ags/object/ags_application_context.h
include/ags/object/ags_async_queue.h
include/ags/object/ags_config.h
include/ags/object/ags_connectable.h
include/ags/object/ags_countable.h
include/ags/object/ags_globals.h
include/ags/object/ags_macros.h
include/ags/object/ags_main_loop.h
include/ags/object/ags_marshal.h
include/ags/object/ags_mutable.h
include/ags/object/ags_plugin.h
include/ags/object/ags_portlet.h
include/ags/object/ags_seekable.h
include/ags/object/ags_sequencer.h
include/ags/object/ags_sound_server.h
include/ags/object/ags_soundcard.h
include/ags/object/ags_tactable.h
include/ags/plugin/ags_base_plugin.h
include/ags/plugin/ags_dssi_manager.h
include/ags/plugin/ags_dssi_plugin.h
include/ags/plugin/ags_ladspa_conversion.h
include/ags/plugin/ags_ladspa_manager.h
include/ags/plugin/ags_ladspa_plugin.h
include/ags/plugin/ags_lv2_conversion.h
include/ags/plugin/ags_lv2_event_manager.h
include/ags/plugin/ags_lv2_log_manager.h
include/ags/plugin/ags_lv2_manager.h
include/ags/plugin/ags_lv2_option_manager.h
include/ags/plugin/ags_lv2_plugin.h
include/ags/plugin/ags_lv2_preset.h
include/ags/plugin/ags_lv2_uri_map_manager.h
include/ags/plugin/ags_lv2_urid_manager.h
include/ags/plugin/ags_lv2_worker.h
include/ags/plugin/ags_lv2_worker_manager.h
include/ags/plugin/ags_lv2ui_manager.h
include/ags/plugin/ags_lv2ui_plugin.h
include/ags/plugin/ags_plugin_port.h
include/ags/plugin/ags_plugin_stock.h
include/ags/server/ags_registry.h
include/ags/server/ags_server.h
include/ags/server/ags_server_application_context.h
include/ags/server/ags_server_status.h
include/ags/server/ags_service_provider.h
include/ags/server/controller/ags_controller.h
include/ags/server/controller/ags_front_controller.h
include/ags/server/controller/ags_local_factory_controller.h
include/ags/server/controller/ags_local_registry_controller.h
include/ags/server/controller/ags_local_serialization_controller.h
include/ags/server/controller/ags_local_task_controller.h
include/ags/server/security/ags_authentication.h
include/ags/server/security/ags_authentication_manager.h
include/ags/server/security/ags_business_group.h
include/ags/server/security/ags_certificate.h
include/ags/server/security/ags_certificate_manager.h
include/ags/server/security/ags_password_store.h
include/ags/server/security/ags_password_store_manager.h
include/ags/server/security/ags_security_context.h
include/ags/server/security/ags_xml_authentication.h
include/ags/server/security/ags_xml_certificate.h
include/ags/server/security/ags_xml_password_store.h
include/ags/server/thread/ags_remote_task.h
include/ags/server/thread/ags_remote_task_thread.h
include/ags/thread/ags_autosave_thread.h
include/ags/thread/ags_concurrency_provider.h
include/ags/thread/ags_condition_manager.h
include/ags/thread/ags_destroy_worker.h
include/ags/thread/ags_generic_main_loop.h
include/ags/thread/ags_history.h
include/ags/thread/ags_message_delivery.h
include/ags/thread/ags_message_queue.h
include/ags/thread/ags_mutex_manager.h
include/ags/thread/ags_poll_fd.h
include/ags/thread/ags_polling_thread.h
include/ags/thread/ags_returnable_thread.h
include/ags/thread/ags_single_thread.h
include/ags/thread/ags_task.h
include/ags/thread/ags_task_completion.h
include/ags/thread/ags_task_thread.h
include/ags/thread/ags_thread-posix.h
include/ags/thread/ags_thread_application_context.h
include/ags/thread/ags_thread_pool.h
include/ags/thread/ags_timestamp.h
include/ags/thread/ags_worker_thread.h
include/ags/thread/file/ags_thread_file_xml.h
include/ags/util/ags_destroy_util.h
include/ags/util/ags_id_generator.h
include/ags/util/ags_list_util.h
include/ags/util/ags_soundcard_helper.h
include/ags/widget/ags_cartesian.h
include/ags/widget/ags_container.h
include/ags/widget/ags_dial.h
include/ags/widget/ags_expander.h
include/ags/widget/ags_expander_set.h
include/ags/widget/ags_hindicator.h
include/ags/widget/ags_hled_array.h
include/ags/widget/ags_hlevel_box.h
include/ags/widget/ags_hscale_box.h
include/ags/widget/ags_indicator.h
include/ags/widget/ags_led.h
include/ags/widget/ags_led_array.h
include/ags/widget/ags_level.h
include/ags/widget/ags_level_box.h
include/ags/widget/ags_notebook.h
include/ags/widget/ags_piano.h
include/ags/widget/ags_piano_keys.h
include/ags/widget/ags_ruler.h
include/ags/widget/ags_scale.h
include/ags/widget/ags_scale_box.h
include/ags/widget/ags_scrolled_level_box.h
include/ags/widget/ags_scrolled_piano.h
include/ags/widget/ags_scrolled_scale_box.h
include/ags/widget/ags_vindicator.h
include/ags/widget/ags_vled_array.h
include/ags/widget/ags_vlevel_box.h
include/ags/widget/ags_vscale_box.h
include/ags/widget/ags_widget_marshal.h
lib/gsequencer/libgsequencer.so
lib/gsequencer/libgsequencer.so.0
lib/gsequencer/libgsequencer.so.0.0.1
lib/libags.so
lib/libags.so.2
lib/libags.so.2.0.0
lib/libags_audio.so
lib/libags_audio.so.2
lib/libags_audio.so.2.0.0
lib/libags_gui.so
lib/libags_gui.so.2
lib/libags_gui.so.2.0.0
lib/libags_server.so
lib/libags_server.so.2
lib/libags_server.so.2.0.0
lib/libags_thread.so
lib/libags_thread.so.2
lib/libags_thread.so.2.0.0
libdata/pkgconfig/libags.pc
libdata/pkgconfig/libags_audio.pc
libdata/pkgconfig/libags_gui.pc
man/man1/gsequencer.1.gz
man/man1/midi2xml.1.gz
share/applications/gsequencer.desktop
%%DATADIR%%/icons/ags.png
%%DATADIR%%/icons/ags.xpm
%%DATADIR%%/icons/jumper.png
%%DATADIR%%/images/ags.png
%%DATADIR%%/images/ags_supermoon-800x450.png
%%DATADIR%%/styles/ags.rc
share/icons/hicolor/128x128/apps/gsequencer.png
share/icons/hicolor/32x32/apps/gsequencer.png
share/icons/hicolor/48x48/apps/gsequencer.png
share/icons/hicolor/64x64/apps/gsequencer.png
share/metainfo/gsequencer.appdata.xml
share/mime/packages/gsequencer.xml
share/xml/gsequencer/schema/dtd/2.1.53/ags_file.dtd
share/xml/gsequencer/schema/dtd/2.1.53/ags_midi_file.dtd
share/xml/gsequencer/schema/dtd/2.1.53/ags_osc_file.dtd
share/xml/gsequencer/schema/dtd/2.1.53/ags_simple_file.dtd
share/xml/gsequencer/stylesheet/ags-xsl/midi-xml/ags-simple.xsl
share/xml/gsequencer/stylesheet/ags-xsl/midi-xml/ags.xsl

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ladspa
PORTVERSION= 1.13
PORTREVISION= 1
PORTVERSION= 1.15
CATEGORIES= audio
MASTER_SITES= http://www.ladspa.org/download/
DISTNAME= ladspa_sdk_${PORTVERSION}
@ -14,20 +13,20 @@ COMMENT= Linux Audio Developer's Simple Plugin API
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/doc/COPYING
WRKSRC= ${WRKDIR}/ladspa_sdk
USES= gmake tar:tgz
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/ladspa_sdk_${PORTVERSION}
PROGRAM_FILES= analyseplugin applyplugin listplugins
PLUGIN_FILES= amp.so delay.so filter.so noise.so sine.so
PLUGIN_DIR?= ${STAGEDIR}${PREFIX}/lib/ladspa/
MAKEFILE= makefile
ALL_TARGET= targets
BUILD_WRKSRC= ${WRKSRC}/src
post-patch:
${REINPLACE_CMD} -e 's,-ldl,,; s,-O3,${CFLAGS},; s,-Werror ,,; \
s,^CC,#CC,;s,^CPP,#CPP,;s,CPP,CXX,; s,^CXXFLAGS.*=,CXXFLAGS+=,' \
${WRKSRC}/src/makefile
${WRKSRC}/src/Makefile
do-install:
${INSTALL_DATA} ${WRKSRC}/src/ladspa.h ${STAGEDIR}${PREFIX}/include

View File

@ -1,2 +1,3 @@
SHA256 (ladspa_sdk_1.13.tgz) = b5ed3f4f253a0f6c1b7a1f4b8cf62376ca9f51d999650dd822650c43852d306b
SIZE (ladspa_sdk_1.13.tgz) = 70540
TIMESTAMP = 1549915483
SHA256 (ladspa_sdk_1.15.tgz) = 4229959b09d20c88c8c86f4aa76427843011705df22d9c28b38359fd1829fded
SIZE (ladspa_sdk_1.15.tgz) = 71179

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libopenmpt
PORTVERSION= 0.4.2
PORTVERSION= 0.4.3
DISTVERSIONSUFFIX= +release.autotools
CATEGORIES= audio
MASTER_SITES= https://lib.openmpt.org/files/libopenmpt/src/ \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548322318
SHA256 (libopenmpt-0.4.2+release.autotools.tar.gz) = d7120b8298e7693ab80631341b82ade6e07e7355ac516ac99513ceec6fb910c2
SIZE (libopenmpt-0.4.2+release.autotools.tar.gz) = 1461745
TIMESTAMP = 1549950641
SHA256 (libopenmpt-0.4.3+release.autotools.tar.gz) = d77443a279003921d6f0c4edb30d1e9dda387983f44113a6d58f623c1e6942ae
SIZE (libopenmpt-0.4.3+release.autotools.tar.gz) = 1462862

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= musescore
DISTVERSION= 3.0.0
PORTREVISION= 2
DISTVERSION= 3.0.2
CATEGORIES= audio
MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${DISTVERSION}/
DISTNAME= MuseScore-${DISTVERSION}
@ -15,9 +14,6 @@ COMMENT= Free music composition & notation software
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL
# Because of webengine
ONLY_FOR_ARCHS= i386 amd64
LIB_DEPENDS= libmp3lame.so:audio/lame \
libsndfile.so:audio/libsndfile \
libvorbis.so:audio/libvorbis \
@ -38,12 +34,13 @@ CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE="ON" \
DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R}
OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO OCR WEBENGINE
# WebEngine is only available on i386/amd64; defaults to ON there.
# If enabled on arches that don't have WebEngine, the build breaks.
OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO WEBENGINE
OPTIONS_DEFAULT= PORTAUDIO
OPTIONS_DEFAULT_amd64= WEBENGINE
OPTIONS_DEFAULT_i386= WEBENGINE
OCR_DESC= Optical Character Recognition
WEBENGINE_DESC= Use WebEngine in the welcome panel
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
@ -54,7 +51,6 @@ PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
PORTAUDIO_CMAKE_BOOL= BUILD_PORTAUDIO
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO
OCR_CMAKE_BOOL= OCR
WEBENGINE_USE= qt=webengine
WEBENGINE_CMAKE_BOOL= BUILD_WEBENGINE

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547127510
SHA256 (MuseScore-3.0.0.zip) = 8a764a1f8911502cb9887c84cde4a8dda193a766337b8e477e89185cbf3722c6
SIZE (MuseScore-3.0.0.zip) = 116183004
TIMESTAMP = 1549439898
SHA256 (MuseScore-3.0.2.zip) = 620ba2a56d80528c6654f4f59dcfe968b5667ac49fecfd63742ceb92aad5e0b1
SIZE (MuseScore-3.0.2.zip) = 116531283

View File

@ -0,0 +1,155 @@
Upstream commit to fix non-WebEngine builds.
https://github.com/musescore/MuseScore/commit/bb0c1a9b4940f3f6b52c0df535289ec8a3bc9e03
diff --git a/mscore/logindialog.h b/mscore/logindialog.h
index 4e86ae7985..f44511d8c0 100644
--- mscore/logindialog.h
+++ mscore/logindialog.h
@@ -21,6 +21,8 @@ class LoginManager;
//---------------------------------------------------------
// LoginDialog
+// Old-style login dialog in case QtWebEngine is
+// unavailable.
//---------------------------------------------------------
class LoginDialog : public QDialog, public Ui::LoginDialog
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
index 80c712aea9..5bb8354992 100644
--- mscore/musescore.cpp
+++ mscore/musescore.cpp
@@ -7572,12 +7572,14 @@ bool MuseScore::exportPartsPdfsToJSON(const QString& inFilePath, const QString&
}
//---------------------------------------------------------
-// getQmlEngine
+// getPluginEngine
//---------------------------------------------------------
+#ifdef SCRIPT_INTERFACE
QmlPluginEngine* MuseScore::getPluginEngine()
{
if (!_qmlEngine)
_qmlEngine = new QmlPluginEngine(this);
return _qmlEngine;
}
+#endif
diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
index a53d7fe811..664786ccc8 100644
--- mscore/network/loginmanager.cpp
+++ mscore/network/loginmanager.cpp
@@ -18,7 +18,9 @@
#include "kQOAuth/kqoauthrequest.h"
#include "kQOAuth/kqoauthrequest_xauth.h"
+#ifdef USE_WEBENGINE
#include <QWebEngineCookieStore>
+#endif
namespace Ms {
@@ -286,8 +288,11 @@ void LoginManager::onTryLoginError(const QString& error)
disconnect(this, SIGNAL(getUserError(QString)), this, SLOT(onTryLoginError(QString)));
connect(this, SIGNAL(loginSuccess()), this, SLOT(tryLogin()));
logout();
+#ifdef USE_WEBENGINE
loginInteractive();
-// mscore->showLoginDialog(); // TODO: switch depending on USE_WEBENGINE
+#else
+ mscore->showLoginDialog();
+#endif
}
/*------- END - TRY LOGIN ROUTINES ----------------------------*/
@@ -295,6 +300,7 @@ void LoginManager::onTryLoginError(const QString& error)
// loginInteractive
//---------------------------------------------------------
+#ifdef USE_WEBENGINE
void LoginManager::loginInteractive()
{
QWebEngineView* webView = new QWebEngineView;
@@ -326,6 +332,7 @@ void LoginManager::loginInteractive()
webView->load(ApiInfo::loginUrl);
webView->show();
}
+#endif
//---------------------------------------------------------
// login
@@ -346,7 +353,7 @@ void LoginManager::login(QString login, QString password)
connect(reply, &QNetworkReply::finished, this, [this, reply] {
onReplyFinished(reply, RequestType::LOGIN);
});
- }
+ }
//---------------------------------------------------------
// onLoginSuccessReply
@@ -874,6 +881,7 @@ ApiRequest ApiRequestBuilder::build() const
// musescore.com
//---------------------------------------------------------
+#ifdef USE_WEBENGINE
void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& request)
{
const ApiInfo& apiInfo = ApiInfo::instance();
@@ -881,4 +889,5 @@ void ApiWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo&
request.setHttpHeader(apiInfo.clientIdHeader, apiInfo.clientId);
request.setHttpHeader(apiInfo.apiKeyHeader, apiInfo.apiKey);
}
+#endif
}
diff --git a/mscore/network/loginmanager.h b/mscore/network/loginmanager.h
index 584eeea30d..327d9fc966 100644
--- mscore/network/loginmanager.h
+++ mscore/network/loginmanager.h
@@ -13,6 +13,8 @@
#ifndef __LOGINMANAGER_H__
#define __LOGINMANAGER_H__
+#include "config.h"
+
namespace Ms {
//---------------------------------------------------------
@@ -83,7 +85,9 @@ class LoginManager : public QObject
public:
LoginManager(QAction* uploadAudioMenuAction, QObject* parent = 0);
void login(QString login, QString password);
+#ifdef USE_WEBENGINE
void loginInteractive();
+#endif
void upload(const QString& path, int nid, const QString& title, const QString& description, const QString& priv, const QString& license, const QString& tags, const QString& changes);
bool hasAccessToken();
void getUser();
diff --git a/mscore/network/loginmanager_p.h b/mscore/network/loginmanager_p.h
index 88228a3958..2848dde35a 100644
--- mscore/network/loginmanager_p.h
+++ mscore/network/loginmanager_p.h
@@ -20,6 +20,8 @@
#ifndef __LOGINMANAGER_P_H__
#define __LOGINMANAGER_P_H__
+#include "config.h"
+
namespace Ms {
//---------------------------------------------------------
@@ -102,6 +104,7 @@ class ApiRequestBuilder
// ApiWebEngineRequestInterceptor
//---------------------------------------------------------
+#ifdef USE_WEBENGINE
class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor
{
Q_OBJECT
@@ -109,6 +112,7 @@ class ApiWebEngineRequestInterceptor : public QWebEngineUrlRequestInterceptor
ApiWebEngineRequestInterceptor(QObject* parent) : QWebEngineUrlRequestInterceptor(parent) {}
void interceptRequest(QWebEngineUrlRequestInfo& info) override;
};
+#endif
//---------------------------------------------------------
// HttpStatus

View File

@ -62,6 +62,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/instruments_eu.qm
%%DATADIR%%/locale/instruments_fa.qm
%%DATADIR%%/locale/instruments_fi.qm
%%DATADIR%%/locale/instruments_fil.qm
%%DATADIR%%/locale/instruments_fo.qm
%%DATADIR%%/locale/instruments_fr.qm
%%DATADIR%%/locale/instruments_ga.qm
@ -127,6 +128,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/mscore_eu.qm
%%DATADIR%%/locale/mscore_fa.qm
%%DATADIR%%/locale/mscore_fi.qm
%%DATADIR%%/locale/mscore_fil.qm
%%DATADIR%%/locale/mscore_fo.qm
%%DATADIR%%/locale/mscore_fr.qm
%%DATADIR%%/locale/mscore_ga.qm
@ -192,6 +194,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/tours_eu.qm
%%DATADIR%%/locale/tours_fa.qm
%%DATADIR%%/locale/tours_fi.qm
%%DATADIR%%/locale/tours_fil.qm
%%DATADIR%%/locale/tours_fo.qm
%%DATADIR%%/locale/tours_ga.qm
%%DATADIR%%/locale/tours_gd.qm
@ -251,7 +254,6 @@ share/mime/packages/musescore.xml
%%DATADIR%%/manual/plugins/connectorinfo.html
%%DATADIR%%/manual/plugins/connectorinforeader.html
%%DATADIR%%/manual/plugins/connectorinfowriter.html
%%DATADIR%%/manual/plugins/cursor.html
%%DATADIR%%/manual/plugins/durationelement.html
%%DATADIR%%/manual/plugins/dynamic.html
%%DATADIR%%/manual/plugins/element.html

View File

@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS= openal-200[0-9]*
USES= cmake compiler:c11 tar:bzip2
USE_BINUTILS= yes
USE_LDCONFIG= yes
LLD_UNSAFE= yes
CMAKE_ARGS= -DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc"
CMAKE_OFF= ALSOFT_BACKEND_ALSA \
ALSOFT_DLOPEN \
@ -25,7 +26,12 @@ CMAKE_OFF= ALSOFT_BACKEND_ALSA \
ALSOFT_REQUIRE_QSA
CMAKE_ON= ALSOFT_BACKEND_WAVE \
ALSOFT_UTILS
LDFLAGS+= -Wl,--as-needed # do not link with librt and libdl
# use gold linker due to some problems with ld.bfd on 12-STABLE,
# cf. PR 235603
# do not link with librt and libdl.
LDFLAGS+= -fuse-ld=gold \
-Wl,--as-needed
OPTIONS_DEFINE= EXAMPLES CONFIG JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO
OPTIONS_DEFAULT= OSS

View File

@ -2,7 +2,6 @@
PORTNAME= plasma-pa
DISTVERSION= ${KDE_PLASMA_VERSION}
PORTREVISION= 1
CATEGORIES= audio kde kde-plasma
MAINTAINER= kde@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547014596
SHA256 (KDE/plasma/5.14.5/plasma-pa-5.14.5.tar.xz) = 0f4735d97950921517d96f3bd24753c6e6416384e7a010ed77317852cfc3e47c
SIZE (KDE/plasma/5.14.5/plasma-pa-5.14.5.tar.xz) = 94368
TIMESTAMP = 1549993914
SHA256 (KDE/plasma/5.15.0/plasma-pa-5.15.0.tar.xz) = 190a8d2d64227070082127cde98a2a3a91e30b7b16c8fd705b1e18d3cf13074f
SIZE (KDE/plasma/5.15.0/plasma-pa-5.15.0.tar.xz) = 94884

View File

@ -45,8 +45,6 @@ share/kservices5/kcm_pulseaudio.desktop
share/kservices5/plasma-applet-org.kde.plasma.volume.desktop
share/locale/ar/LC_MESSAGES/kcm_pulseaudio.mo
share/locale/ar/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
share/locale/ast/LC_MESSAGES/kcm_pulseaudio.mo
share/locale/ast/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
share/locale/ca/LC_MESSAGES/kcm_pulseaudio.mo
share/locale/ca/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
share/locale/ca@valencia/LC_MESSAGES/kcm_pulseaudio.mo
@ -88,6 +86,7 @@ share/locale/ko/LC_MESSAGES/kcm_pulseaudio.mo
share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
share/locale/lt/LC_MESSAGES/kcm_pulseaudio.mo
share/locale/lt/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
share/locale/lv/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo
share/locale/nb/LC_MESSAGES/kcm_pulseaudio.mo
share/locale/nl/LC_MESSAGES/kcm_pulseaudio.mo
share/locale/nl/LC_MESSAGES/plasma_applet_org.kde.plasma.volume.mo

19
audio/qmidictl/Makefile Normal file
View File

@ -0,0 +1,19 @@
# $FreeBSD$
PORTNAME= qmidictl
DISTVERSION= 0.5.3
CATEGORIES= audio
MASTER_SITES= SF
MAINTAINER= yuri@FreeBSD.org
COMMENT= MIDI remote control application sending MIDI over UDP/IP multicast
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gl gmake localbase pkgconfig qt:5
GNU_CONFIGURE= yes
USE_QT= core gui widgets qmake_build buildtools_build
USE_GL= gl
.include <bsd.port.mk>

3
audio/qmidictl/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1549909733
SHA256 (qmidictl-0.5.3.tar.gz) = a42d7a2f3fc8090a4fa0a7696f532048071febac88d5ae5e10a0697cb1831551
SIZE (qmidictl-0.5.3.tar.gz) = 195116

View File

@ -0,0 +1,13 @@
--- src/qmidictlUdpDevice.cpp.orig 2019-02-11 18:29:43 UTC
+++ src/qmidictlUdpDevice.cpp
@@ -40,6 +40,10 @@ inline void closesocket(int s) { ::close
#endif
#endif
+#if defined(__FreeBSD__)
+#include <netinet/in.h>
+#endif
+
#include <QByteArray>
#include <QThread>

View File

@ -0,0 +1,13 @@
--- src/qmidictlUdpDevice.h.orig 2019-02-11 18:32:44 UTC
+++ src/qmidictlUdpDevice.h
@@ -36,6 +36,10 @@
#endif
#endif
+#if defined(__FreeBSD__)
+#include <netinet/in.h>
+#endif
+
#include <QObject>
#include <QString>

5
audio/qmidictl/pkg-descr Normal file
View File

@ -0,0 +1,5 @@
QmidiCtl is a MIDI remote controller application that sends MIDI data over the
network, using UDP/IP multicast. Inspired by multimidicast and designed to be
compatible with ipMIDI for Windows.
WWW: https://qmidictl.sourceforge.io/

9
audio/qmidictl/pkg-plist Normal file
View File

@ -0,0 +1,9 @@
bin/qmidictl
man/man1/qmidictl.1.gz
man/man1/qmidictl.fr.1.gz
share/applications/hildon/qmidictl.desktop
share/icons/hicolor/26x26/hildon/qmidictl.png
share/icons/hicolor/32x32/hildon/qmidictl.png
share/icons/hicolor/48x48/hildon/qmidictl.png
share/icons/hicolor/64x64/hildon/qmidictl.png
share/metainfo/qmidictl.appdata.xml

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= RHVoice-dictionary
DISTVERSION= g20180922
DISTVERSION= g20190109
CATEGORIES= audio
MAINTAINER= yuri@FreeBSD.org
@ -11,7 +11,7 @@ RUN_DEPENDS= RHVoice>0:audio/rhvoice
USE_GITHUB= yes
GH_ACCOUNT= vantu5z
GH_TAGNAME= d89bbe5
GH_TAGNAME= 45ddf91
NO_BUILD= yes
NO_ARCH= yes

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1537658202
SHA256 (vantu5z-RHVoice-dictionary-g20180922-d89bbe5_GH0.tar.gz) = b274c51538d8a0914c381eac4225a8708e2de163e1c237f288b13418d4e266af
SIZE (vantu5z-RHVoice-dictionary-g20180922-d89bbe5_GH0.tar.gz) = 93749
TIMESTAMP = 1549952719
SHA256 (vantu5z-RHVoice-dictionary-g20190109-45ddf91_GH0.tar.gz) = 7f02fd22549dd1c5f82e3ce7a5daf776d1195d91e2851a93dfb27b6c6fe58398
SIZE (vantu5z-RHVoice-dictionary-g20190109-45ddf91_GH0.tar.gz) = 94657

View File

@ -4,7 +4,7 @@
PORTNAME= qcad
PORTVERSION= 3.21.3.15
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= cad
DIST_SUBDIR= ${PORTNAME}
@ -49,12 +49,8 @@ QSCRIPTS= bbox dwg2bmp dwg2pdf dwg2svg
OPTIONS_DEFINE= EXAMPLES
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
CFLAGS_${ARCH}= -fPIC
CXXFLAGS_${ARCH}= -fPIC
.endif
CFLAGS_i386= -fPIC
CXXFLAGS_i386= -fPIC
pre-configure:
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
@ -79,4 +75,4 @@ do-install:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -11,7 +11,7 @@ COMMENT= BladeRF USB 3.0 Superspeed software defined radio
LICENSE= MIT LGPL20 GPLv2
LICENSE_COMB= multi
USES= cmake libedit
USES= cmake compiler:c11 libedit
USE_GITHUB= yes
GH_ACCOUNT= Nuand
GH_TUPLE= analogdevicesinc:no-OS:0bba46e:x/thirdparty/analogdevicesinc/no-OS

View File

@ -2,7 +2,6 @@
PORTNAME= connectivity
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= comms
PKGNAMEPREFIX= qt5-

View File

@ -2,7 +2,6 @@
PORTNAME= sensors
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= comms
PKGNAMEPREFIX= qt5-

View File

@ -2,7 +2,6 @@
PORTNAME= serialbus
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= comms
PKGNAMEPREFIX= qt5-

View File

@ -2,7 +2,6 @@
PORTNAME= serialport
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= comms
PKGNAMEPREFIX= qt5-

View File

@ -3,7 +3,7 @@
PORTNAME= kbibtex
DISTVERSION= 0.8.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= databases kde
MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION}/

View File

@ -1,8 +1,6 @@
# Created by: Martin Matuska <martin@matuska.org>
# $FreeBSD$
PORTREVISION= 1
LUASQL_DRIVER= firebird
MASTERDIR= ${.CURDIR}/../luasql-mysql

View File

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= luasql
PORTVERSION= 2.3.5
PORTVERSION= 2.4.0
DISTVERSIONPREFIX= v
PORTREVISION?= 1
CATEGORIES= databases
PKGNAMESUFFIX= -${LUASQL_DRIVER}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1488373399
SHA256 (keplerproject-luasql-v2.3.5_GH0.tar.gz) = dc337d01e28f1d579a452e784939671727214df69d35809dfbc893ae096b444d
SIZE (keplerproject-luasql-v2.3.5_GH0.tar.gz) = 101733
TIMESTAMP = 1549381463
SHA256 (keplerproject-luasql-v2.4.0_GH0.tar.gz) = db2458a8c8c5f3bc717e4030fe2878f1ad8d71e437ec6149c381eebad5d525c5
SIZE (keplerproject-luasql-v2.4.0_GH0.tar.gz) = 103139

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= fdb
PORTVERSION= 1.8
PORTREVISION= 1
PORTVERSION= 2.0.0
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -13,6 +12,8 @@ COMMENT= Firebird RDBMS bindings for Python
LICENSE= ISCL
py27_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
NO_ARCH= yes
USES= firebird python
USE_PYTHON= autoplist distutils

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1513466213
SHA256 (fdb-1.8.tar.gz) = cae951b1ab2784861a984bde05b3dccd6507e73feca3b426a8206f0d124f6a79
SIZE (fdb-1.8.tar.gz) = 960783
TIMESTAMP = 1549928308
SHA256 (fdb-2.0.0.tar.gz) = 197313dad7d1f774c3c73ba7348a8b57c5c67eb50572bd352f0079696ee0cbdb
SIZE (fdb-2.0.0.tar.gz) = 896815

View File

@ -2,7 +2,6 @@
PORTNAME= sql
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 2
CATEGORIES= databases
PKGNAMEPREFIX= qt5-

View File

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
DB= IBase
DB_DESC= InterBase/Firebird

View File

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
DB= MYSQL
DB_DESC= MySQL

View File

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
COMMENT= Qt ${DB_DESC} plugin

View File

@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= pgsql
PORTREVISION= 1
DB= PSQL
DB_DESC= PostgreSQL

View File

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
DB= SQLite2
DB_DESC= SQLite 2

View File

@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= sqlite3
PORTREVISION= 1
DB= SQLite
DB_DESC= SQLite 3

View File

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
DB= TDS
DB_DESC= TDS Database Connectivity

View File

@ -233,6 +233,7 @@
SUBDIR += sugarcrm
SUBDIR += synapse
SUBDIR += syncthing-gtk
SUBDIR += sysctlview
SUBDIR += systempreferences
SUBDIR += taskcoach
SUBDIR += taskd

View File

@ -2,7 +2,6 @@
PORTNAME= milou
DISTVERSION= ${KDE_PLASMA_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547014597
SHA256 (KDE/plasma/5.14.5/milou-5.14.5.tar.xz) = 0315e73b9c9ba568b09fa13c0bd75c5fa5d36a18e5e1567fde8c57580321e69c
SIZE (KDE/plasma/5.14.5/milou-5.14.5.tar.xz) = 57628
TIMESTAMP = 1549993915
SHA256 (KDE/plasma/5.15.0/milou-5.15.0.tar.xz) = 37f8f6f81916318182fe57a2ed3bfbd03a6505a1b6bbc773b05fbacad076d721
SIZE (KDE/plasma/5.15.0/milou-5.15.0.tar.xz) = 57152

View File

@ -13,8 +13,6 @@ share/kservices5/plasma-applet-org.kde.milou.desktop
share/kservicetypes5/miloupreviewplugin.desktop
share/locale/ar/LC_MESSAGES/milou.mo
share/locale/ar/LC_MESSAGES/plasma_applet_org.kde.milou.mo
share/locale/ast/LC_MESSAGES/milou.mo
share/locale/ast/LC_MESSAGES/plasma_applet_org.kde.milou.mo
share/locale/bs/LC_MESSAGES/milou.mo
share/locale/bs/LC_MESSAGES/plasma_applet_org.kde.milou.mo
share/locale/ca/LC_MESSAGES/milou.mo

View File

@ -2,7 +2,6 @@
PORTNAME= sddm-kcm
DISTVERSION= ${KDE_PLASMA_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547014598
SHA256 (KDE/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz) = a1220ef49e57a5b0f63a01501d2d5d57c704f0869db7c53a465c40c1f2133d2a
SIZE (KDE/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz) = 60956
TIMESTAMP = 1549993916
SHA256 (KDE/plasma/5.15.0/sddm-kcm-5.15.0.tar.xz) = b6500919ac8a112af2b3d500d50a3951e294e49cf41cf23cab2785bd6840d339
SIZE (KDE/plasma/5.15.0/sddm-kcm-5.15.0.tar.xz) = 61400

View File

@ -6,7 +6,6 @@ lib/libexec/kauth/kcmsddm_authhelper
share/dbus-1/system-services/org.kde.kcontrol.kcmsddm.service
share/kservices5/kcm_sddm.desktop
share/locale/ar/LC_MESSAGES/kcm_sddm.mo
share/locale/ast/LC_MESSAGES/kcm_sddm.mo
share/locale/bs/LC_MESSAGES/kcm_sddm.mo
share/locale/ca/LC_MESSAGES/kcm_sddm.mo
share/locale/ca@valencia/LC_MESSAGES/kcm_sddm.mo

View File

@ -0,0 +1,40 @@
# $FreeBSD$
PORTNAME= sysctlview
PORTVERSION= 0.1
CATEGORIES= deskutils
MAINTAINER= alfix86@gmail.com
COMMENT= Show sysctl mib
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= pkgconfig gettext-runtime gnome
USE_GNOME= gtk30 pango atk cairo gdkpixbuf2 glib20
USE_GITLAB= yes
GL_ACCOUNT= alfix
GL_COMMIT= 4f35c02f0c9fa3d27fbfbc4e654272b1c2d7d54d
DESKTOP_ENTRIES="Sysctlview" "Show kernel state" "" \
"sysctlview" "System;" false
OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
PLIST_FILES= bin/sysctlview \
${DATADIR}/sysctlview.window.xml
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sysctlview ${STAGEDIR}${PREFIX}/bin
${MKDIR} ${STAGEDIR}${DATADIR}
${CP} ${WRKSRC}/sysctlview.window.xml ${STAGEDIR}${DATADIR}
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
TIMESTAMP = 1549083799
SHA256 (alfix-sysctlview-4f35c02f0c9fa3d27fbfbc4e654272b1c2d7d54d_GL0.tar.gz) = 60289d811c13b5066bfef686b431e3b2cb046a241bf542fcbca671bdc1bbceb7
SIZE (alfix-sysctlview-4f35c02f0c9fa3d27fbfbc4e654272b1c2d7d54d_GL0.tar.gz) = 304472

View File

@ -0,0 +1,11 @@
--- main.c.orig 2018-12-26 11:57:59 UTC
+++ main.c
@@ -27,7 +27,7 @@
#include "trees.h"
-#define DATADIR "./"
+#define DATADIR "%%PREFIX%%/share/sysctlview/"
int
main (int argc, char *argv[])

View File

@ -0,0 +1,3 @@
sysctlview is a gtk frontend for the sysctl mib.
WWW: https://gitlab.com/alfix/sysctlview/

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= binutils
PORTVERSION= 2.31.1
PORTREVISION= 2
PORTVERSION= 2.32
PORTEPOCH?= 1
CATEGORIES?= devel
MASTER_SITES= SOURCEWARE/binutils/releases

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548062653
SHA256 (binutils-2.31.1.tar.bz2) = ffcc382695bf947da6135e7436b8ed52d991cf270db897190f19d6f9838564d0
SIZE (binutils-2.31.1.tar.bz2) = 30110779
TIMESTAMP = 1549441338
SHA256 (binutils-2.32.tar.bz2) = de38b15c902eb2725eac6af21183a5f34ea4634cb0bcef19612b50e5ed31072d
SIZE (binutils-2.32.tar.bz2) = 30782392

View File

@ -18,6 +18,7 @@ bin/strings
bin/strip
include/bfd.h
include/bfdlink.h
include/bfd_stdint.h
include/diagnostics.h
include/dis-asm.h
%%GOLD%%include/plugin-api.h

View File

@ -3,7 +3,7 @@
PORTNAME= ccache
#PORTVERSION must be set later due to depending on PORT_OPTIONS.
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://www.samba.org/ftp/ccache/ \
LOCAL/bdrewery
@ -101,11 +101,11 @@ PLIST_SUB+= CCLINKDIR="${CCLINKDIR}"
CCACHE_COMPILERS+= icc icpc
.endif
GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 8
GNU_COMPILERS+= 34 42 43 44 45 46 47 48 49 5 6 7 8 9
CCACHE_COMPILERS+= cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|}
.if ${PORT_OPTIONS:MCLANGLINK}
CLANG_COMPILERS+= 33 34 35 36 37 38 39 40 50 60 70 -devel
CLANG_COMPILERS+= 33 34 35 36 37 38 39 40 50 60 70 80 -devel
CCACHE_COMPILERS+= clang clang++ ${CLANG_COMPILERS:S|^|clang|} ${CLANG_COMPILERS:S|^|clang++|}
.endif

View File

@ -1,7 +1,7 @@
# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 1
PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../cppcheck

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cppcheck
PORTVERSION= 1.86
PORTVERSION= 1.87
PORTREVISION?= 0 # devel/cppcheck-gui
CATEGORIES= devel

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1545247837
SHA256 (danmar-cppcheck-1.86_GH0.tar.gz) = 86ea85c2ee5ec31a7410bfc7c206b87e600d284089428750d66d1ce1ffa0c9a6
SIZE (danmar-cppcheck-1.86_GH0.tar.gz) = 2184186
TIMESTAMP = 1549730182
SHA256 (danmar-cppcheck-1.87_GH0.tar.gz) = ea7ac1cd2f5c00ecffd596fd0f7281cba44308e565a634fae02b77ecd927c153
SIZE (danmar-cppcheck-1.87_GH0.tar.gz) = 2243258

View File

@ -1,5 +1,6 @@
bin/cppcheck
%%DATADIR%%/avr.cfg
%%DATADIR%%/boost.cfg
%%DATADIR%%/bsd.cfg
%%DATADIR%%/cppcheck-lib.cfg
%%DATADIR%%/embedded_sql.cfg
@ -9,10 +10,13 @@ bin/cppcheck
%%DATADIR%%/microsoft_sal.cfg
%%DATADIR%%/motif.cfg
%%DATADIR%%/posix.cfg
%%DATADIR%%/python.cfg
%%DATADIR%%/qt.cfg
%%DATADIR%%/ruby.cfg
%%DATADIR%%/sdl.cfg
%%DATADIR%%/sfml.cfg
%%DATADIR%%/std.cfg
%%DATADIR%%/tinyxml2.cfg
%%DATADIR%%/windows.cfg
%%DATADIR%%/wxwidgets.cfg
%%DATADIR%%/zlib.cfg

View File

@ -3,6 +3,7 @@
PORTNAME= cpu_features
PORTVERSION= 0.2.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= skreuzer@FreeBSD.org
@ -14,6 +15,8 @@ USES= cmake:insource
USE_GITHUB= yes
GH_ACCOUNT= google
CFLAGS+= -fPIC
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/list_cpu_features ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/libcpu_features.a ${STAGEDIR}${PREFIX}/lib

View File

@ -2,11 +2,9 @@
# $FreeBSD$
PORTNAME= dparser
PORTVERSION= 1.30
PORTREVISION= 3
PORTVERSION= 1.31
DISTVERSIONPREFIX= v
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/
DISTNAME= d-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple but powerful tool for parsing
@ -14,10 +12,12 @@ COMMENT= Simple but powerful tool for parsing
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
WRKSRC= ${WRKDIR}/d
USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= jplevyak
EXTRACT_AFTER_ARGS= --exclude "*my*"
USES= gmake
MAKE_ARGS= CC="${CC}" D_OPTIMIZE= PREFIX=${PREFIX}
PORTDOCS= *
@ -29,11 +29,15 @@ OPTIONS_DEFINE= BOEHM DOCS
BOEHM_DESC= Boehm garbage collector support
BOEHM_LIB_DEPENDS= libgc.so:devel/boehm-gc
BOEHM_MAKE_ARGS= D_USE_GC=1 \
GC_CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
BOEHM_MAKE_ARGS= D_USE_GC=1 LOCALBASE=${LOCALBASE}
BOEHM_VARS= LIBDPARSE=libdparse_gc.a
BOEHM_VARS_OFF= LIBDPARSE=libdparse.a
TEST_TARGET= test
post-patch:
@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/D_BUILD_VERSION
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/make_dparser ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/make_dparser.1 ${STAGEDIR}${PREFIX}/man/man1

View File

@ -1,2 +1,3 @@
SHA256 (d-1.30-src.tar.gz) = 4c4a61bd5954d75da89cbcfe8f6aac3a113769939b31ce2bf4b20b7b3a31cdd8
SIZE (d-1.30-src.tar.gz) = 239510
TIMESTAMP = 1549984176
SHA256 (jplevyak-dparser-v1.31_GH0.tar.gz) = 8fed643095893396ef5f88eaa70497a42585fe8ded0349085fd0abafafe4aee2
SIZE (jplevyak-dparser-v1.31_GH0.tar.gz) = 190612

View File

@ -1,7 +1,7 @@
--- Makefile.orig 2013-03-02 21:22:20 UTC
--- Makefile.orig 2019-01-10 00:20:05 UTC
+++ Makefile
@@ -11,7 +11,7 @@ MAJOR=1
MINOR=30
MINOR=31
RELEASE=$(MAJOR).$(MINOR)
-CC = gcc
@ -9,7 +9,7 @@
ifndef PREFIX
PREFIX=/usr/local
@@ -38,7 +38,7 @@ ifeq ($(ARCH),i686)
@@ -38,18 +38,21 @@ ifeq ($(ARCH),i686)
ARCH = x86
endif
@ -18,7 +18,22 @@
CFLAGS += -fPIC
endif
@@ -64,10 +64,10 @@ ifdef D_USE_FREELISTS
ifeq ($(OS_TYPE),CYGWIN)
GC_CFLAGS += -L/usr/local/lib
else
-GC_CFLAGS += -I/usr/local/include -L/usr/local/lib
+GC_CFLAGS += -I/usr/local/include
endif
ifdef D_USE_GC
CFLAGS += -DUSE_GC ${GC_CFLAGS}
+ifeq ($(OS_TYPE),FreeBSD)
+ LIBS += -L${LOCALBASE}/lib
+endif
LIBS += -lgc
ifeq ($(OS_TYPE),Linux)
LIBS += -ldl
@@ -64,10 +67,10 @@ ifdef D_USE_FREELISTS
CFLAGS += -DUSE_FREELISTS
endif
@ -32,16 +47,7 @@
CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"$(D_BUILD_VERSION)\"
CFLAGS += -Wall
@@ -94,7 +94,7 @@ TEST_FILES = d/parser_tests d/baseline $
PYTHON_FILES = d/python/Makefile d/python/*.py d/python/*.c d/python/*.h d/python/*.i d/python/README d/python/*.html d/python/contrib/d* d/python/tests/*.py
VERILOG_FILES = d/verilog/Makefile d/verilog/verilog.g d/verilog/README d/verilog/ambig.c \
d/verilog/main.c d/verilog/vparse.c d/verilog/vparse.h d/verilog/verilog_tests
-TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) d/D_BUILD_VERSION \
+TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) \
d/grammar.g d/sample.g d/my.g
LIB_SRCS = arg.c parse.c scan.c symtab.c util.c read_binary.c dparse_tree.c
@@ -141,7 +141,7 @@ endif
@@ -143,7 +146,7 @@ endif
ALL_SRCS = $(MAKE_PARSER_SRCS) $(BASE_SAMPLE_PARSER_SRCS) $(LIB_SRCS) $(MK_LIB_SRCS)

View File

@ -1,11 +1,20 @@
--- arg.c.orig 2013-01-23 02:14:58 UTC
--- arg.c.orig 2019-01-10 00:20:05 UTC
+++ arg.c
@@ -40,7 +40,7 @@ process_arg(ArgumentState *arg_state, in
@@ -31,7 +31,7 @@ void process_arg(ArgumentState *arg_state, int i, char
*(double *)desc[i].location = atof(arg);
break;
case 'L':
- *(int64 *)desc[i].location = atoll(arg);
+ *(int64 *)desc[i].location = strtoll(arg,NULL,10);
break;
case 'S': strncpy((char *)desc[i].location,arg, atoi(desc[i].type+1));
break;
case 'S':
strncpy((char *)desc[i].location, arg, atoi(desc[i].type + 1));
@@ -143,7 +143,7 @@ void usage(ArgumentState *arg_state, char *arg_unused)
#if defined(__alpha)
" %-9ld",
#else
-#if defined(FreeBSD)
+#if defined(__FreeBSD__)
" %-9qd",
#else
" %-9" PRId64,

View File

@ -3,7 +3,7 @@
PORTNAME= efl
DISTVERSION= 1.20.7
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel enlightenment
MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
DIST_SUBDIR= enlightenment

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= Ice
PORTVERSION= 3.7.1
PORTREVISION= 1
PORTVERSION= 3.7.2
DISTVERSIONPREFIX= v
CATEGORIES= devel
PKGNAMESUFFIX?= 37

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1534213743
SHA256 (zeroc-ice-ice-v3.7.1_GH0.tar.gz) = b1526ab9ba80a3d5f314dacf22674dff005efb9866774903d0efca5a0fab326d
SIZE (zeroc-ice-ice-v3.7.1_GH0.tar.gz) = 8765196
TIMESTAMP = 1549889745
SHA256 (zeroc-ice-ice-v3.7.2_GH0.tar.gz) = e329a24abf94a4772a58a0fe61af4e707743a272c854552eef3d7833099f40f9
SIZE (zeroc-ice-ice-v3.7.2_GH0.tar.gz) = 9427121

View File

@ -20,6 +20,6 @@
- test(info.localHost == "127.0.0.1");
+ test(info.remoteHost == "127.0.0.1" || inFreeBSDJail());
+ test(info.localHost == "127.0.0.1" || inFreeBSDJail());
test(info.localPort == getTestPort(current.adapter->getCommunicator()->getProperties(), 1));
test(info.localPort == TestHelper::getTestPort(current.adapter->getCommunicator()->getProperties(), 1));
try

View File

@ -1,8 +1,8 @@
--- cpp/test/include/TestCommon.h.orig 2018-04-20 15:02:08 UTC
+++ cpp/test/include/TestCommon.h
@@ -38,6 +38,22 @@
# endif
#endif
--- cpp/test/include/TestHelper.h.orig 2019-02-11 14:02:41.681160000 +0100
+++ cpp/test/include/TestHelper.h 2019-02-11 16:04:38.557681000 +0100
@@ -199,4 +199,20 @@
#define test(ex) ((ex) ? ((void)0) : ::Test::testFailed(#ex, __FILE__, __LINE__))
+#if defined(__FreeBSD__)
+extern "C" { int sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
@ -20,6 +20,4 @@
+}
+#endif
+
void
inline print(const std::string& msg)
{
#endif

View File

@ -34,12 +34,12 @@
while(info):
if isinstance(info, Ice.TCPEndpointInfo):
@@ -119,7 +138,7 @@ def allTests(communicator):
test(tcpEndpoint.port == 12020)
test(tcpEndpoint.port == 15000)
tcpEndpoint = getTCPEndpointInfo(publishedEndpoints[0].getInfo())
- test(tcpEndpoint.host == "127.0.0.1")
+ test(tcpEndpoint.host == "127.0.0.1" or isFreeBSDJail())
test(tcpEndpoint.port == 12020)
test(tcpEndpoint.port == 15000)
adapter.destroy()
@@ -137,7 +156,7 @@ def allTests(communicator):
@ -54,7 +54,7 @@
@@ -147,7 +166,7 @@ def allTests(communicator):
udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
test(udp.port == 12010)
test(udp.port == port)
- test(udp.host == defaultHost)
+ test(udp.host == defaultHost or isFreeBSDJail())

View File

@ -1,48 +1,29 @@
--- scripts/Util.py.orig 2018-08-27 01:10:47 UTC
+++ scripts/Util.py
@@ -82,7 +82,7 @@ class Platform:
--- scripts/Util.py.orig 2019-02-11 16:48:19.076747000 +0100
+++ scripts/Util.py 2019-02-11 19:16:32.768690000 +0100
@@ -232,7 +232,7 @@
elif Mapping.getByName("cpp"):
cwd = Mapping.getByName("cpp").getPath()
def parseBuildVariables(self, variables):
# Run make to get the values of the given variables
- output = run('make print V="{0}"'.format(" ".join(variables.keys())), cwd = toplevel)
+ output = run('gmake print V="{0}"'.format(" ".join(variables.keys())), cwd = toplevel)
- output = run('make print V="{0}"'.format(" ".join(variables.keys())), cwd=cwd)
+ output = run('gmake print V="{0}"'.format(" ".join(variables.keys())), cwd=cwd)
for l in output.split("\n"):
match = re.match(r'^.*:.*: (.*) = (.*)', l)
if match and match.group(1):
@@ -199,6 +199,46 @@ class AIX(Platform):
@@ -304,6 +304,27 @@
def hasOpenSSL(self):
return True
+class FreeBSD(Platform):
+
+ def __init__(self):
+ Platform.__init__(self)
+
+ def getFilters(self, config):
+ filters = Platform.getFilters(self, config)
+ #filters = (filters[0], filters[1] + ["Slice/*"])
+ return filters
+ self.nugetPackageCache = None
+
+ def hasOpenSSL(self):
+ return True
+
+ def getBinSubDir(self, mapping, process, current):
+ buildPlatform = current.driver.configs[mapping].buildPlatform
+ return "bin"
+
+ def getLibSubDir(self, mapping, process, current):
+ buildPlatform = current.driver.configs[mapping].buildPlatform
+
+ # PHP module is always installed in the lib directory for the default build platform
+ if isinstance(mapping, PhpMapping) and buildPlatform == self.getDefaultBuildPlatform():
+ return "lib"
+ return "lib"
+
+ def getBuildSubDir(self, name, current):
+ return os.path.join("build", current.config.buildPlatform, current.config.buildConfig)
+
+ def getSliceDir(self, iceDir):
+ return os.path.join(iceDir, "slice")
+ installDir = self.getInstallDir(mapping, current)
+ return os.path.join(installDir, "slice")
+
+ def getDefaultExe(self, name, config):
+ if name == "icebox":
@ -56,7 +37,24 @@
class Linux(Platform):
def __init__(self):
@@ -434,6 +474,8 @@ if sys.platform == "darwin":
@@ -1374,13 +1402,13 @@
if os.path.exists(translator):
return translator + " " + args if args else translator
elif isinstance(platform, Windows):
- return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe")
+ return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe") + " " + args if args else translator
elif os.path.exists("/usr/local/bin/slice2py"):
- return "/usr/local/bin/slice2py"
+ return "/usr/local/bin/slice2py" + " " + args if args else translator
else:
import slice2py
return sys.executable + " " + os.path.normpath(
- os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py"))
+ os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py")) + " " + args if args else translator
else:
return Process.getCommandLine(self, current, args)
@@ -3786,6 +3807,8 @@
platform = Darwin()
elif sys.platform.startswith("aix"):
platform = AIX()
@ -65,14 +63,3 @@
elif sys.platform.startswith("linux") or sys.platform.startswith("gnukfreebsd"):
platform = Linux()
elif sys.platform == "win32" or sys.platform[:6] == "cygwin":
@@ -1333,8 +1375,8 @@ class SliceTranslator(ProcessFromBinDir,
return translator + " " + args if args else translator
elif isinstance(platform, Windows):
return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe")
- elif os.path.exists("/usr/local/bin/slice2py"):
- return "/usr/local/bin/slice2py"
+ elif os.path.exists("%%LOCALBASE%%/bin/slice2py"):
+ return "%%LOCALBASE%%/bin/slice2py " + args if args else "%%LOCALBASE%%/bin/slice2py "
else:
import slice2py
return sys.executable + " " + os.path.normpath(

View File

@ -219,79 +219,79 @@ include/IceUtil/UUID.h
include/IceUtil/UndefSysMacros.h
%%STATIC%%lib/libGlacier2++11.a
lib/libGlacier2++11.so
lib/libGlacier2++11.so.3.7.1
lib/libGlacier2++11.so.3.7.2
lib/libGlacier2++11.so.37
%%STATIC%%lib/libGlacier2.a
lib/libGlacier2.so
lib/libGlacier2.so.3.7.1
lib/libGlacier2.so.3.7.2
lib/libGlacier2.so.37
lib/libGlacier2CryptPermissionsVerifier.so.3.7.1
lib/libGlacier2CryptPermissionsVerifier.so.3.7.2
lib/libGlacier2CryptPermissionsVerifier.so.37
%%STATIC%%lib/libIce++11.a
lib/libIce++11.so
lib/libIce++11.so.3.7.1
lib/libIce++11.so.3.7.2
lib/libIce++11.so.37
%%STATIC%%lib/libIce.a
lib/libIce.so
lib/libIce.so.3.7.1
lib/libIce.so.3.7.2
lib/libIce.so.37
%%STATIC%%lib/libIceBox++11.a
lib/libIceBox++11.so
lib/libIceBox++11.so.3.7.1
lib/libIceBox++11.so.3.7.2
lib/libIceBox++11.so.37
%%STATIC%%lib/libIceBox.a
lib/libIceBox.so
lib/libIceBox.so.3.7.1
lib/libIceBox.so.3.7.2
lib/libIceBox.so.37
lib/libIceDB.so.3.7.1
lib/libIceDB.so.3.7.2
lib/libIceDB.so.37
%%STATIC%%lib/libIceDiscovery++11.a
lib/libIceDiscovery++11.so
lib/libIceDiscovery++11.so.3.7.1
lib/libIceDiscovery++11.so.3.7.2
lib/libIceDiscovery++11.so.37
%%STATIC%%lib/libIceDiscovery.a
lib/libIceDiscovery.so
lib/libIceDiscovery.so.3.7.1
lib/libIceDiscovery.so.3.7.2
lib/libIceDiscovery.so.37
%%STATIC%%lib/libIceGrid++11.a
lib/libIceGrid++11.so
lib/libIceGrid++11.so.3.7.1
lib/libIceGrid++11.so.3.7.2
lib/libIceGrid++11.so.37
%%STATIC%%lib/libIceGrid.a
lib/libIceGrid.so
lib/libIceGrid.so.3.7.1
lib/libIceGrid.so.3.7.2
lib/libIceGrid.so.37
%%STATIC%%lib/libIceLocatorDiscovery++11.a
lib/libIceLocatorDiscovery++11.so
lib/libIceLocatorDiscovery++11.so.3.7.1
lib/libIceLocatorDiscovery++11.so.3.7.2
lib/libIceLocatorDiscovery++11.so.37
%%STATIC%%lib/libIceLocatorDiscovery.a
lib/libIceLocatorDiscovery.so
lib/libIceLocatorDiscovery.so.3.7.1
lib/libIceLocatorDiscovery.so.3.7.2
lib/libIceLocatorDiscovery.so.37
%%STATIC%%lib/libIcePatch2.a
lib/libIcePatch2.so
lib/libIcePatch2.so.3.7.1
lib/libIcePatch2.so.3.7.2
lib/libIcePatch2.so.37
%%STATIC%%lib/libIceSSL++11.a
lib/libIceSSL++11.so
lib/libIceSSL++11.so.3.7.1
lib/libIceSSL++11.so.3.7.2
lib/libIceSSL++11.so.37
%%STATIC%%lib/libIceSSL.a
lib/libIceSSL.so
lib/libIceSSL.so.3.7.1
lib/libIceSSL.so.3.7.2
lib/libIceSSL.so.37
%%STATIC%%lib/libIceStorm++11.a
lib/libIceStorm++11.so
lib/libIceStorm++11.so.3.7.1
lib/libIceStorm++11.so.3.7.2
lib/libIceStorm++11.so.37
%%STATIC%%lib/libIceStorm.a
lib/libIceStorm.so
lib/libIceStorm.so.3.7.1
lib/libIceStorm.so.3.7.2
lib/libIceStorm.so.37
lib/libIceStormService.so.3.7.1
lib/libIceStormService.so.3.7.2
lib/libIceStormService.so.37
lib/libIceXML.so.3.7.1
lib/libIceXML.so.3.7.2
lib/libIceXML.so.37
man/man1/glacier2router.1.gz
man/man1/icebox.1.gz

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jenkins
PORTVERSION= 2.163
PORTVERSION= 2.164
CATEGORIES= devel java
MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
DISTNAME= jenkins

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1549290520
SHA256 (jenkins/2.163/jenkins.war) = fdf78f2348d88e6abd7807a3d61c02f2c2faa6b917a2a6018eaf498afd4a9454
SIZE (jenkins/2.163/jenkins.war) = 77253959
TIMESTAMP = 1549941781
SHA256 (jenkins/2.164/jenkins.war) = 8a5c34fce5ba91e9b9a72f550525ff28659171ee45f44dae2cc84aba47115e22
SIZE (jenkins/2.164/jenkins.war) = 77329094

View File

@ -3,7 +3,6 @@
PORTNAME= extra-cmake-modules
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1546843253
SHA256 (KDE/frameworks/5.54.0/extra-cmake-modules-5.54.0.tar.xz) = 91b7a9359f1bfe6f667a5a9c23f6b2178555df26ca2e4dd1bb5c38dc36c77144
SIZE (KDE/frameworks/5.54.0/extra-cmake-modules-5.54.0.tar.xz) = 324996
TIMESTAMP = 1549270026
SHA256 (KDE/frameworks/5.55.0/extra-cmake-modules-5.55.0.tar.xz) = 649453922aef38a24af04258ab6661ddfd566aaba4d1773a9e1f4799344406f5
SIZE (KDE/frameworks/5.55.0/extra-cmake-modules-5.55.0.tar.xz) = 325208

View File

@ -1,199 +0,0 @@
diff --git a/cmake/FindQHelpGenerator.cmake b/cmake/FindQHelpGenerator.cmake
new file mode 100644
--- /dev/null
+++ cmake/FindQHelpGenerator.cmake
@@ -0,0 +1,94 @@
+#.rst:
+# FindQHelpGenerator
+# ------------------
+#
+# Try to find the Qt help generator.
+# Based on FindQCollectionGenerator.cmake
+#
+# This will define the following variables:
+#
+# ``QHelpGenerator_FOUND``
+# True if (the requested version of) Sphinx is available
+# ``QHelpGenerator_VERSION``
+# The version of the Qt help generator. Note that this not the
+# same as the version of Qt it is provided by.
+# ``QHelpGenerator_QT_VERSION``
+# The version of Qt that the Qt help generator is from.
+# ``QHelpGenerator_EXECUTABLE``
+# The path to the Qt help generator executable.
+#
+# If ``QHelpGenerator_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``QHelpGenerator::Generator``
+# The Qt help generator.
+#
+# In general we recommend using the imported target, as it is easier to use.
+#
+# Since 5.53.0.
+
+#=============================================================================
+# Copyright 2015 Alex Merry <alex.merry@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+find_program(QHelpGenerator_EXECUTABLE
+ NAMES
+ qhelpgenerator-qt5
+ qhelpgenerator
+ DOC "Qt help generator"
+)
+
+if (QHelpGenerator_EXECUTABLE)
+ if(NOT TARGET QHelpGenerator::Generator)
+ add_executable(QHelpGenerator::Generator IMPORTED)
+ set_target_properties(QHelpGenerator::Generator PROPERTIES
+ IMPORTED_LOCATION "${QHelpGenerator_EXECUTABLE}"
+ )
+ endif()
+
+ execute_process(
+ COMMAND "${QHelpGenerator_EXECUTABLE}" -v
+ OUTPUT_VARIABLE _QHelpGenerator_version_raw
+ ERROR_VARIABLE _QHelpGenerator_version_raw
+ )
+ if (_QHelpGenerator_version_raw MATCHES "^Qt Help Generator version ([0-9]+(\\.[0-9]+)*) \\(Qt ([0-9]+(\\.[0-9]+)*)\\)")
+ set(QHelpGenerator_VERSION "${CMAKE_MATCH_1}")
+ set(QHelpGenerator_QT_VERSION "${CMAKE_MATCH_3}")
+ endif()
+ unset(_QHelpGenerator_version_raw)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QHelpGenerator
+ FOUND_VAR
+ QHelpGenerator_FOUND
+ REQUIRED_VARS
+ QHelpGenerator_EXECUTABLE
+ VERSION_VAR
+ QHelpGenerator_VERSION
+)
+
+mark_as_advanced(QHelpGenerator_EXECUTABLE)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
--- docs/CMakeLists.txt
+++ docs/CMakeLists.txt
@@ -27,6 +27,7 @@
#=============================================================================
include(CMakeDependentOption)
+include("${CMAKE_SOURCE_DIR}/modules/ECMQueryQmake.cmake")
find_package(Sphinx 1.2 MODULE)
set_package_properties(
@@ -38,15 +39,39 @@
PURPOSE "Required to build documentation for Extra CMake Modules."
)
-find_package(QCollectionGenerator MODULE)
-set_package_properties(
- QCollectionGenerator
- PROPERTIES
- URL "http://www.qt.io/"
- DESCRIPTION "Qt help collection generator."
- TYPE OPTIONAL
- PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
-)
+# QCollectionGenerator and QHelpGenerator were merged in Qt 5.12
+query_qmake(QT_VERSION QT_VERSION)
+
+if(QT_VERSION VERSION_LESS 5.12.0)
+ find_package(QCollectionGenerator MODULE)
+ set_package_properties(
+ QCollectionGenerator
+ PROPERTIES
+ URL "http://www.qt.io/"
+ DESCRIPTION "Qt help collection generator"
+ TYPE OPTIONAL
+ PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
+ )
+ if(QCollectionGenerator_FOUND)
+ set(_ecm_qtdoc_generator QCollectionGenerator::Generator)
+ endif()
+else()
+ find_package(QHelpGenerator MODULE)
+ set_package_properties(
+ QHelpGenerator
+ PROPERTIES
+ URL "http://www.qt.io/"
+ DESCRIPTION "Qt help generator"
+ TYPE OPTIONAL
+ PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
+ )
+ if(QHelpGenerator_FOUND)
+ set(_ecm_qtdoc_generator QHelpGenerator::Generator)
+ endif()
+endif()
+if(DEFINED _ecm_qtdoc_generator)
+ set(QT_HELP_GENERATOR_FOUND TRUE)
+endif()
cmake_dependent_option(
BUILD_HTML_DOCS "Build html help with Sphinx" ON
@@ -62,7 +87,7 @@
cmake_dependent_option(
BUILD_QTHELP_DOCS "Build Qt help with Sphinx" OFF
- "Sphinx_FOUND;QCollectionGenerator_FOUND" OFF
+ "Sphinx_FOUND;QT_HELP_GENERATOR_FOUND" OFF
)
add_feature_info(BUILD_QTHELP_DOCS BUILD_QTHELP_DOCS "Generate QtHelp documentation for installed modules.")
@@ -78,7 +103,7 @@
list(APPEND doc_formats qthelp)
set(qthelp_extra_commands
COMMAND
- QCollectionGenerator::Generator
+ "${_ecm_qtdoc_generator}"
${CMAKE_CURRENT_BINARY_DIR}/qthelp/ExtraCMakeModules.qhcp
)
endif()
diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake
--- modules/ECMQueryQmake.cmake
+++ modules/ECMQueryQmake.cmake
@@ -1,11 +1,14 @@
find_package(Qt5Core QUIET)
-if (Qt5Core_FOUND)
- set(_qmake_executable_default "qmake-qt5")
-endif ()
if (TARGET Qt5::qmake)
get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
+else()
+ # If the project() line contains the 'NONE' keyword, the find_package call
+ # above will not be able to find Qt5Core.
+ # We need to look for the executable directly.
+ find_program(_qmake_executable_default NAMES qmake)
endif()
+
set(QMAKE_EXECUTABLE ${_qmake_executable_default}
CACHE FILEPATH "Location of the Qt5 qmake executable")

Some files were not shown because too many files have changed in this diff Show More