diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index 8bd60389f6e..7eea45e7e3d 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,7 +3,7 @@ PORTNAME= orca PORTVERSION= 3.28.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/accessibility/orca/pkg-descr b/accessibility/orca/pkg-descr index 30cfd432ca0..636b9916e38 100644 --- a/accessibility/orca/pkg-descr +++ b/accessibility/orca/pkg-descr @@ -2,6 +2,6 @@ Orca a scriptable screen reader that is currently under development. As such it is highly unstable and undergoes frequent changes. To read more about Orca, please refer to the Orca documentation series available in the ./docs/doc-set directory and also the Orca WIKI at -http://live.gnome.org/Orca. +the URL below. WWW: http://live.gnome.org/Orca diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile index 69758605dcc..f196957cc5a 100644 --- a/archivers/snappy-java/Makefile +++ b/archivers/snappy-java/Makefile @@ -11,14 +11,14 @@ DISTVERSIONPREFIX= snappy-java- PORTREVISION= 2 CATEGORIES= archivers java MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/snappy/snappy-1.0.4.tar.gz/b69151652e82168bc5c643bcd6f07162/:source2 \ - LOCAL/jgh/archivers/${PORTNAME}/:source3 + SF/bsdsrc/${.CURDIR:T}:source3 PKGNAMESUFFIX= java DISTFILES+= snappy-${PORTVERSION:R}.tar.gz:source2 \ FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz:source3 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ FreeBSD-snappy-${PORTVERSION}-maven-repository.tar.gz -MAINTAINER= mark@tranquillussoftware.co.uk +MAINTAINER= ports@FreeBSD.org COMMENT= Fast compressor/decompressor library LICENSE= APACHE20 diff --git a/audio/Makefile b/audio/Makefile index f5bcc242889..b55c56fc9d1 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -460,6 +460,7 @@ SUBDIR += linux-c6-pulseaudio-utils SUBDIR += linux-c6-sdl_mixer SUBDIR += linux-c7-alsa-lib + SUBDIR += linux-c7-alsa-lib-devel SUBDIR += linux-c7-alsa-plugins-oss SUBDIR += linux-c7-alsa-plugins-pulseaudio SUBDIR += linux-c7-alsa-utils diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile index 66d40c58914..025ec77fff3 100644 --- a/audio/gbsplay/Makefile +++ b/audio/gbsplay/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= gbsplay -DISTVERSION= 0.0.93-130 +DISTVERSION= 0.0.93-151 PORTREVISION= 1 -DISTVERSIONSUFFIX= -g6225989 +DISTVERSIONSUFFIX= -ga7777f8 PORTEPOCH= 1 CATEGORIES= audio diff --git a/audio/gbsplay/distinfo b/audio/gbsplay/distinfo index 8b94a1e4833..1a72866c567 100644 --- a/audio/gbsplay/distinfo +++ b/audio/gbsplay/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545989371 -SHA256 (mmitch-gbsplay-0.0.93-130-g6225989_GH0.tar.gz) = 00bc00bbec4a66edef6dfd71df4c0b55c28fa9b65cc614381ae258576fdd1622 -SIZE (mmitch-gbsplay-0.0.93-130-g6225989_GH0.tar.gz) = 129907 +TIMESTAMP = 1567890902 +SHA256 (mmitch-gbsplay-0.0.93-151-ga7777f8_GH0.tar.gz) = 851145187f32fa04ba803a7f914e5b82bd9e80ed5dd35abc1c157fe19390bc7d +SIZE (mmitch-gbsplay-0.0.93-151-ga7777f8_GH0.tar.gz) = 136054 diff --git a/audio/linux-c7-alsa-lib-devel/Makefile b/audio/linux-c7-alsa-lib-devel/Makefile new file mode 100644 index 00000000000..de2d4b3b784 --- /dev/null +++ b/audio/linux-c7-alsa-lib-devel/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= alsa-lib +PORTVERSION= 1.1.6 +DISTVERSIONSUFFIX= -2.el7 +CATEGORIES= audio linux +PKGNAMESUFFIX= -devel + +MAINTAINER= emulation@FreeBSD.org +COMMENT= Advanced Linux Sound Architecture headers (Linux CentOS ${LINUX_DIST_VER}) + +LICENSE= LGPL21+ + +USES= linux:c7 +USE_LINUX= alsalib +USE_LINUX_RPM= yes + +LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} + +DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr + +OPTIONS_DEFINE= DOCS + +.include diff --git a/audio/linux-c7-alsa-lib-devel/distinfo b/audio/linux-c7-alsa-lib-devel/distinfo new file mode 100644 index 00000000000..a050a9c280a --- /dev/null +++ b/audio/linux-c7-alsa-lib-devel/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1567880217 +SHA256 (centos/alsa-lib-devel-1.1.6-2.el7.i686.rpm) = 47cccf052146b269ba2c8dd269385fabade58450166eb640bfca6afff5792f85 +SIZE (centos/alsa-lib-devel-1.1.6-2.el7.i686.rpm) = 984608 +SHA256 (centos/alsa-lib-devel-1.1.6-2.el7.x86_64.rpm) = 9ae063780b8652153fe4c58015d00f651577f105cc30c944c665e2a27602f8e6 +SIZE (centos/alsa-lib-devel-1.1.6-2.el7.x86_64.rpm) = 984508 +SHA256 (centos/alsa-lib-1.1.6-2.el7.src.rpm) = 56cb2556210f4443f4ef81074ae396f82ba7a0ba3d224065628baddb8c6a55ef +SIZE (centos/alsa-lib-1.1.6-2.el7.src.rpm) = 1028253 diff --git a/audio/linux-c7-alsa-lib-devel/pkg-plist.amd64 b/audio/linux-c7-alsa-lib-devel/pkg-plist.amd64 new file mode 100644 index 00000000000..7e66e2c2467 --- /dev/null +++ b/audio/linux-c7-alsa-lib-devel/pkg-plist.amd64 @@ -0,0 +1,582 @@ +usr/include/alsa/asoundef.h +usr/include/alsa/asoundlib.h +usr/include/alsa/conf.h +usr/include/alsa/control.h +usr/include/alsa/control_external.h +usr/include/alsa/error.h +usr/include/alsa/global.h +usr/include/alsa/hwdep.h +usr/include/alsa/input.h +usr/include/alsa/mixer.h +usr/include/alsa/mixer_abst.h +usr/include/alsa/output.h +usr/include/alsa/pcm.h +usr/include/alsa/pcm_external.h +usr/include/alsa/pcm_extplug.h +usr/include/alsa/pcm_ioplug.h +usr/include/alsa/pcm_old.h +usr/include/alsa/pcm_plugin.h +usr/include/alsa/pcm_rate.h +usr/include/alsa/rawmidi.h +usr/include/alsa/seq.h +usr/include/alsa/seq_event.h +usr/include/alsa/seq_midi_event.h +usr/include/alsa/seqmid.h +usr/include/alsa/sound/asoc.h +usr/include/alsa/sound/asound_fm.h +usr/include/alsa/sound/emu10k1.h +usr/include/alsa/sound/hdsp.h +usr/include/alsa/sound/hdspm.h +usr/include/alsa/sound/sb16_csp.h +usr/include/alsa/sound/sscape_ioctl.h +usr/include/alsa/sound/tlv.h +usr/include/alsa/sound/type_compat.h +usr/include/alsa/timer.h +usr/include/alsa/topology.h +usr/include/alsa/use-case.h +usr/include/alsa/version.h +usr/include/sys/asoundlib.h +usr/lib/libasound.so +usr/lib/pkgconfig/alsa.pc +usr/lib64/libasound.so +usr/lib64/pkgconfig/alsa.pc +usr/share/aclocal/alsa.m4 +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2latency_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_min_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2rawmidi_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2timer_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/annotated.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/async_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bc_s.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bdwn.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/cards_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/classes.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/closed.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confarg.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conffunc.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confhooks.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confmisc_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__ext_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ctl_external_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/deprecated.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_381a0a05232d68d0a2ebe5cd502f4d69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_5f851d935025f1be023c2c62bd843fe2.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_8c35c1873c2690b478a9950d0638d637.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b73df3c68338d0823ff9d736eb268d89.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b81b067251166617f9d0a8c0cfc3a4a9.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d0e40b335958b6212fb6f781133eecbc.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d1b0f45016cd06bf2eb252bd3f501161.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d3519ec5023707b37568b471096da878.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d44c64559bbebec7f509842c48db8b23.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_e8b3d2be6db305a5d41d291dd9fd6e9c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dlmisc_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dynsections.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/examples.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/files.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2blank.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2cl.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2doc.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderclosed.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderopen.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2lastnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2link.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mlastnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mo.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2node.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2ns.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2plastnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2pnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2splitbar.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2vertline.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_enum.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_eval.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_type.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_vars.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___config.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___ctl_plugin___s_d_k.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___digital___audio___interface.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___error.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___global.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___h_control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___hw_dep.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___input.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___commands.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___controllers.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___event.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___interface.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___mixer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___output.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___access.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___deprecated.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___description.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___direct.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___dump.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___ext_plug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___format.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___h_w___params.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___helpers.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___hook.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___i_o_plug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___info.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___s_w___params.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___scope.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___simple.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___status.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___sub_format.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___plugin___s_d_k.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___raw_midi.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___s_control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_client.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_ev_type.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_event.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_events.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_middle.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_misc.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_port.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_queue.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_subscribe.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___sequencer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___simple_mixer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___timer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__topology.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__ucm.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer__simple_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/modules.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/namehint_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/names_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_g.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/open.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pages.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_2pcm_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__adpcm_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__alaw_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__asym_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__copy_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dmix_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dshare_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dsnoop_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__empty_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__file_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hooks_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hw_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__iec958_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ladspa_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__lfloat_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__linear_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__meter_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mmap__emul_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mulaw_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__multi_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__null_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__plugin_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__rate_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__route_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__share_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__shm_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__simple_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__softvol_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_external_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/close.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/mag_sel.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/nomatches.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_l.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_m.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_r.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/setup_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__abst_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__none_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structctl__access__elem.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__aes__iec958__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext__callback.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__devname.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__mixer__selem__regopt.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__config__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__report__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__channel__area__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__query__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug__callback.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug__callback.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__scope__ops__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__addr__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__connect__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ctrl__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ext.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__note__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__queue__control__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw32__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw8__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__event__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__queue__skew__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__real__time__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__result__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__read__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__tread__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__bytes__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__elem.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__map__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__ctl__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__dai__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__enum__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__elem.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__hw__config__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__io__ops__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__link__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__mixer__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pcm__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pdata__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__caps__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__dbscale__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__widget__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_off.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_on.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_s.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tabs.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__local_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__query_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tlv_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/topology_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__pcm__sync__id__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__seq__timestamp__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/version_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave1.gif +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave2.gif diff --git a/audio/linux-c7-alsa-lib-devel/pkg-plist.i386 b/audio/linux-c7-alsa-lib-devel/pkg-plist.i386 new file mode 100644 index 00000000000..2d4365d3d16 --- /dev/null +++ b/audio/linux-c7-alsa-lib-devel/pkg-plist.i386 @@ -0,0 +1,580 @@ +usr/include/alsa/asoundef.h +usr/include/alsa/asoundlib.h +usr/include/alsa/conf.h +usr/include/alsa/control.h +usr/include/alsa/control_external.h +usr/include/alsa/error.h +usr/include/alsa/global.h +usr/include/alsa/hwdep.h +usr/include/alsa/input.h +usr/include/alsa/mixer.h +usr/include/alsa/mixer_abst.h +usr/include/alsa/output.h +usr/include/alsa/pcm.h +usr/include/alsa/pcm_external.h +usr/include/alsa/pcm_extplug.h +usr/include/alsa/pcm_ioplug.h +usr/include/alsa/pcm_old.h +usr/include/alsa/pcm_plugin.h +usr/include/alsa/pcm_rate.h +usr/include/alsa/rawmidi.h +usr/include/alsa/seq.h +usr/include/alsa/seq_event.h +usr/include/alsa/seq_midi_event.h +usr/include/alsa/seqmid.h +usr/include/alsa/sound/asoc.h +usr/include/alsa/sound/asound_fm.h +usr/include/alsa/sound/emu10k1.h +usr/include/alsa/sound/hdsp.h +usr/include/alsa/sound/hdspm.h +usr/include/alsa/sound/sb16_csp.h +usr/include/alsa/sound/sscape_ioctl.h +usr/include/alsa/sound/tlv.h +usr/include/alsa/sound/type_compat.h +usr/include/alsa/timer.h +usr/include/alsa/topology.h +usr/include/alsa/use-case.h +usr/include/alsa/version.h +usr/include/sys/asoundlib.h +usr/lib/libasound.so +usr/lib/pkgconfig/alsa.pc +usr/share/aclocal/alsa.m4 +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2latency_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2pcm_min_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2rawmidi_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/_2test_2timer_8c-example.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/annotated.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundef_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/asoundlib_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/async_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bc_s.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bdwn.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/bug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/cards_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/classes.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/closed.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conf_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confarg.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/conffunc.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confhooks.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/confmisc_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__ext_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/control__external_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ctl_external_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/deprecated.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_381a0a05232d68d0a2ebe5cd502f4d69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_5f851d935025f1be023c2c62bd843fe2.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_8c35c1873c2690b478a9950d0638d637.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b73df3c68338d0823ff9d736eb268d89.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_b81b067251166617f9d0a8c0cfc3a4a9.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d0e40b335958b6212fb6f781133eecbc.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d1b0f45016cd06bf2eb252bd3f501161.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d3519ec5023707b37568b471096da878.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_d44c64559bbebec7f509842c48db8b23.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dir_e8b3d2be6db305a5d41d291dd9fd6e9c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dlmisc_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/dynsections.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/error_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/examples.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/files.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2blank.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2cl.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2doc.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderclosed.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2folderopen.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2lastnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2link.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mlastnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2mo.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2node.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2ns.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2plastnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2pnode.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2splitbar.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/ftv2vertline.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_0x77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/functions_vars_0x77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/global_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_defs_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_enum.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_eval.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_func_0x73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_type.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/globals_vars.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___config.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___ctl_plugin___s_d_k.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___digital___audio___interface.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___error.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___global.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___h_control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___hw_dep.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___input.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___commands.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___controllers.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___event.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___m_i_d_i___interface.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___mixer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___output.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___access.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___deprecated.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___description.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___direct.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___dump.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___ext_plug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___format.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___h_w___params.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___helpers.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___hook.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___i_o_plug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___info.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___s_w___params.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___scope.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___simple.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___status.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___p_c_m___sub_format.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___plugin___s_d_k.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___raw_midi.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___s_control.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_client.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_ev_type.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_event.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_events.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_middle.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_misc.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_port.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_queue.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___seq_subscribe.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___sequencer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___simple_mixer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group___timer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__topology.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/group__ucm.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hcontrol_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/hwdep_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/input_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/mixer__simple_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/modules.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/namehint_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/names_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_g.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/open.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/output_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pages.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_2pcm_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__adpcm_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__alaw_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__asym_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__copy_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dmix_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dshare_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__dsnoop_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__empty_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__external_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__extplug_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__file_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hooks_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__hw_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__iec958_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ioplug_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__ladspa_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__lfloat_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__linear_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__meter_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mmap__emul_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__mulaw_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__multi_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__null_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__plugin_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__rate_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__route_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__share_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__shm_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__simple_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm__softvol_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_external_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/pcm_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/rawmidi_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_5f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_62.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_66.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6c.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6e.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_71.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_76.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/all_77.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/classes_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/close.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/defines_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_5f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enums_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/enumvalues_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6e.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/files_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_5f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/functions_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_66.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/groups_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/mag_sel.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/nomatches.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_62.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/pages_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_l.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_m.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/search_r.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/typedefs_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_61.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_62.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_63.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_64.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_65.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_66.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_67.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_68.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_69.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6c.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6d.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6e.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_6f.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_70.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_71.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_72.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_73.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_74.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_75.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_76.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/search/variables_77.js +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__event_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seq__midi__event_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/seqmid_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/setup_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__abst_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/simple__none_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structctl__access__elem.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__aes__iec958__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__ctl__ext__callback.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__devname.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__mixer__selem__regopt.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__config__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__audio__tstamp__report__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__channel__area__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__query__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__chmap__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__extplug__callback.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__ioplug__callback.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__pcm__scope__ops__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__addr__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__connect__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ctrl__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__ext.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__note__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__queue__control__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw32__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__ev__raw8__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__event__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__queue__skew__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__real__time__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__seq__result__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__read__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__timer__tread__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__bytes__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__elem.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__map__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__channel__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__ctl__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__dai__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__enum__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__elem.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__graph__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__hw__config__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__io__ops__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__link__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__mixer__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__obj__template__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pcm__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__pdata__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__caps__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__stream__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__dbscale__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__tlv__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/structsnd__tplg__widget__template.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_off.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/sync_on.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tab_s.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tabs.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__local_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/timer__query_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/tlv_8c.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/topology_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__pcm__sync__id__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/unionsnd__seq__timestamp__t.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/use-case_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/version_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave1.gif +%%PORTDOCS%%%%DOCSDIR%%/doxygen/html/wave2.gif diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile index 6d5571de043..917191d75fa 100644 --- a/audio/linux-c7-alsa-plugins-oss/Makefile +++ b/audio/linux-c7-alsa-plugins-oss/Makefile @@ -4,29 +4,100 @@ PORTNAME= alsa-plugins PORTVERSION= 1.1.6 DISTVERSIONSUFFIX= -1.el7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio linux +MASTER_SITES= CENTOS_LINUX +MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/Source/SPackages/ \ + centos/${LINUX_DIST_VER}/updates/Source/SPackages/ +PKGNAMEPREFIX= linux-c7- PKGNAMESUFFIX= -oss +EXTRACT_SUFX= .src.rpm +DIST_SUBDIR= centos MAINTAINER= emulation@FreeBSD.org COMMENT= OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER}) -LICENSE= GPLv3 +LICENSE= LGPL21+ -USES= linux:c7 +USES= autoreconf:build linux:c7 USE_LDCONFIG= yes -USE_LINUX= alsalib -USE_LINUX_RPM= yes +USE_LINUX= alsalib:build,run alsa-lib-devel:build devtools:build \ + make:build +USE_LINUX_PREFIX=yes -LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} +RPM_PATCHES= alsa-plugins-1.1.6-post.patch \ + alsa-plugins-1.1.6-speexdsp.patch +CONFIG_ARGS= --disable-static --disable-mix --disable-usbstream \ + --disable-arcamav --disable-jack --disable-pulseaudio \ + --disable-samplerate --disable-libav --disable-a52 \ + --disable-lavrate --disable-speexdsp --with-speex=no +CFLAGS+= -DFREEBSD_OSS -DFREEBSD_OSS_USE_IO_PTR -DFREEBSD_OSS_BUFSZ_P2 +CFLAGS_amd64= -nostdinc -isystem \ + ${LINUXBASE}/usr/lib/gcc/x86_64-redhat-linux/4.8.5/include \ + -isystem /usr/include +CFLAGS_i386= -nostdinc -isystem \ + ${LINUXBASE}/usr/lib/gcc/i686-redhat-linux/4.8.5/include \ + -isystem /usr/include +COMPAT32_CFLAGS_amd64= -m32 +LIBDIR_amd64= /usr/lib64 +LIBDIR_i386= /usr/lib +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC32= ${WRKDIR}/32/${PORTNAME}-${PORTVERSION} CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +PLIST= ${PKGDIR}/pkg-plist.${ARCH} -OPTIONS_DEFINE= DOCS +post-extract: +.if !empty(COMPAT32_CFLAGS_${ARCH}) + @${MKDIR} ${WRKDIR}/32 + @(cd ${WRKDIR}/32 && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ + ../${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS}) +.endif + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS}) -post-patch: - @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/alsa +do-patch: +.for p in ${RPM_PATCHES} +.if !empty(COMPAT32_CFLAGS_${ARCH}) + @${PATCH} -d ${WRKSRC32} --forward --quiet -E -p1 < ${WRKDIR}/${p} +.endif + @${PATCH} -d ${WRKSRC} --forward --quiet -E -p1 < ${WRKDIR}/${p} +.endfor +.if !empty(COMPAT32_CFLAGS_${ARCH}) + @${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC32} --forward \ + --quiet -E -p0 +.endif + @${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC} --forward \ + --quiet -E -p0 + +do-configure: +.if !empty(COMPAT32_CFLAGS_${ARCH}) + @(cd ${WRKSRC32} && ${AUTORECONF} -f -i && ${SETENV} \ + PKG_CONFIG_PATH=${LINUXBASE}/usr/lib/pkgconfig \ + ${LINUXBASE}/bin/sh ./configure \ + CFLAGS="${CFLAGS} ${COMPAT32_CFLAGS_${ARCH}}" ${CONFIG_ARGS}) +.endif + @(cd ${WRKSRC} && ${AUTORECONF} -f -i && ${SETENV} \ + PKG_CONFIG_PATH=${LINUXBASE}${LIBDIR_${ARCH}}/pkgconfig \ + ${LINUXBASE}/bin/sh ./configure --libdir ${LIBDIR_${ARCH}} \ + CFLAGS="${CFLAGS}" ${CONFIG_ARGS}) + +do-build: +.if !empty(COMPAT32_CFLAGS_${ARCH}) + @(cd ${WRKSRC32} && ${LINUXBASE}/usr/bin/make) +.endif + @(cd ${WRKSRC} && ${LINUXBASE}/usr/bin/make) + +do-install: +.if !empty(COMPAT32_CFLAGS_${ARCH}) + @(cd ${WRKSRC32} && ${LINUXBASE}/usr/bin/make install-strip \ + DESTDIR=${STAGEDIR}${LINUXBASE}) + ${RM} -r ${STAGEDIR}${LINUXBASE}/usr/lib/alsa-lib/*.la +.endif + @(cd ${WRKSRC} && ${LINUXBASE}/usr/bin/make install-strip \ + DESTDIR=${STAGEDIR}${LINUXBASE}) + ${RM} -r ${STAGEDIR}${LINUXBASE}${LIBDIR_${ARCH}}/alsa-lib/*.la + ${RM} -r ${STAGEDIR}${LINUXBASE}/etc ${STAGEDIR}${LINUXBASE}/usr/share .include diff --git a/audio/linux-c7-alsa-plugins-oss/distinfo b/audio/linux-c7-alsa-plugins-oss/distinfo index a6a995595bb..df4ad797633 100644 --- a/audio/linux-c7-alsa-plugins-oss/distinfo +++ b/audio/linux-c7-alsa-plugins-oss/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1556469061 -SHA256 (centos/alsa-plugins-oss-1.1.6-1.el7.i686.rpm) = 4da7c5cd52caed8640db1cb1521c7c7ef837dd89272e93870a13d919f1db081a -SIZE (centos/alsa-plugins-oss-1.1.6-1.el7.i686.rpm) = 32748 -SHA256 (centos/alsa-plugins-oss-1.1.6-1.el7.x86_64.rpm) = f7ebfb51012b6905e4e96eecfff1179cde32ade799c2eb7e740c3646146a70c3 -SIZE (centos/alsa-plugins-oss-1.1.6-1.el7.x86_64.rpm) = 33236 +TIMESTAMP = 1567864839 SHA256 (centos/alsa-plugins-1.1.6-1.el7.src.rpm) = e01bf476f3117bc29276a24ddae250396b928dfe2755550ec234e6f77f43add0 SIZE (centos/alsa-plugins-1.1.6-1.el7.src.rpm) = 396174 diff --git a/audio/linux-c7-alsa-plugins-oss/files/patch-oss-ctl_oss.c b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-ctl_oss.c new file mode 100644 index 00000000000..01a998655fd --- /dev/null +++ b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-ctl_oss.c @@ -0,0 +1,42 @@ +--- oss/ctl_oss.c.orig 2018-04-03 07:01:38 UTC ++++ oss/ctl_oss.c +@@ -362,7 +362,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) + { + snd_config_iterator_t it, next; + const char *device = "/dev/mixer"; ++#ifndef FREEBSD_OSS + struct mixer_info mixinfo; ++#endif + int i, err, val; + snd_ctl_oss_t *oss; + +@@ -399,19 +401,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) + goto error; + } + ++#ifndef FREEBSD_OSS + if (ioctl(oss->fd, SOUND_MIXER_INFO, &mixinfo) < 0) { + err = -errno; + SNDERR("Cannot get mixer info for device %s", device); + goto error; + } ++#endif + + oss->ext.version = SND_CTL_EXT_VERSION; + oss->ext.card_idx = 0; /* FIXME */ ++#ifdef FREEBSD_OSS ++ strncpy(oss->ext.id, "fbsd", sizeof(oss->ext.id) - 1); ++ strcpy(oss->ext.driver, "FreeBSD/OSS plugin"); ++ strncpy(oss->ext.name, "FreeBSD/OSS", sizeof(oss->ext.name) - 1); ++ strncpy(oss->ext.longname, "FreeBSD/OSS", sizeof(oss->ext.longname) - 1); ++ strncpy(oss->ext.mixername, "FreeBSD/OSS", sizeof(oss->ext.mixername) - 1); ++#else + strncpy(oss->ext.id, mixinfo.id, sizeof(oss->ext.id) - 1); + strcpy(oss->ext.driver, "OSS-Emulation"); + strncpy(oss->ext.name, mixinfo.name, sizeof(oss->ext.name) - 1); + strncpy(oss->ext.longname, mixinfo.name, sizeof(oss->ext.longname) - 1); + strncpy(oss->ext.mixername, mixinfo.name, sizeof(oss->ext.mixername) - 1); ++#endif + oss->ext.poll_fd = -1; + oss->ext.callback = &oss_ext_callback; + oss->ext.private_data = oss; diff --git a/audio/linux-c7-alsa-plugins-oss/files/patch-oss-pcm_oss.c b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-pcm_oss.c new file mode 100644 index 00000000000..384dbb86568 --- /dev/null +++ b/audio/linux-c7-alsa-plugins-oss/files/patch-oss-pcm_oss.c @@ -0,0 +1,673 @@ +--- oss/pcm_oss.c.orig 2018-04-03 07:01:38 UTC ++++ oss/pcm_oss.c +@@ -24,15 +24,48 @@ + #include + #include + ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) ++ ++#ifdef FREEBSD_OSS ++#define AFMT_S32_LE 0x00001000 /* Little endian signed 32-bit */ ++#define AFMT_S32_BE 0x00002000 /* Big endian signed 32-bit */ ++#define AFMT_U32_LE 0x00004000 /* Little endian unsigned 32-bit */ ++#define AFMT_U32_BE 0x00008000 /* Big endian unsigned 32-bit */ ++#define AFMT_S24_LE 0x00010000 /* Little endian signed 24-bit */ ++#define AFMT_S24_BE 0x00020000 /* Big endian signed 24-bit */ ++#define AFMT_U24_LE 0x00040000 /* Little endian unsigned 24-bit */ ++#define AFMT_U24_BE 0x00080000 /* Big endian unsigned 24-bit */ ++ ++#define FREEBSD_OSS_RATE_MIN 1 ++#define FREEBSD_OSS_RATE_MAX 384000 ++ ++#define FREEBSD_OSS_CHANNELS_MIN 1 ++#define FREEBSD_OSS_CHANNELS_MAX 8 ++ ++#define FREEBSD_OSS_BUFSZ_MAX 131072 ++#define FREEBSD_OSS_BLKCNT_MIN 2 ++#define FREEBSD_OSS_BLKSZ_MIN 16 /* (FREEBSD_OSS_CHANNELS_MAX * 4) */ ++ ++#define FREEBSD_OSS_BUFSZ_MIN (FREEBSD_OSS_BLKCNT_MIN * FREEBSD_OSS_BLKSZ_MIN) ++#define FREEBSD_OSS_BLKCNT_MAX (FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BUFSZ_MIN) ++#define FREEBSD_OSS_BLKSZ_MAX (FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BLKCNT_MIN) ++#endif ++ + typedef struct snd_pcm_oss { + snd_pcm_ioplug_t io; + char *device; + int fd; ++#ifdef FREEBSD_OSS ++ int bufsz, ptr, ptr_align, last_bytes; ++#else + int fragment_set; + int caps; ++#endif + int format; ++#ifndef FREEBSD_OSS + unsigned int period_shift; + unsigned int periods; ++#endif + unsigned int frame_bytes; + } snd_pcm_oss_t; + +@@ -49,8 +82,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i + buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8; + size *= oss->frame_bytes; + result = write(oss->fd, buf, size); +- if (result <= 0) +- return result; ++#ifdef FREEBSD_OSS ++ if (result == -1) { ++ if (errno == EAGAIN) ++ return 0; ++ else ++ return -errno; ++ } ++#else ++ if (result <= 0) { ++ if (result == -EAGAIN) ++ return 0; ++ else ++ return result; ++ } ++#endif + return result / oss->frame_bytes; + } + +@@ -67,14 +113,88 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io + buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8; + size *= oss->frame_bytes; + result = read(oss->fd, buf, size); +- if (result <= 0) +- return result; ++#ifdef FREEBSD_OSS ++ if (result == -1) { ++ if (errno == EAGAIN) ++ return 0; ++ else ++ return -errno; ++ } ++#else ++ if (result <= 0) { ++ if (result == -EAGAIN) ++ return 0; ++ else ++ return result; ++ } ++#endif + return result / oss->frame_bytes; + } + + static snd_pcm_sframes_t oss_pointer(snd_pcm_ioplug_t *io) + { ++#ifdef FREEBSD_OSS + snd_pcm_oss_t *oss = io->private_data; ++#ifdef FREEBSD_OSS_USE_IO_PTR ++ struct count_info ci; ++#endif ++ audio_buf_info bi; ++ ++ if (io->state != SND_PCM_STATE_RUNNING) ++ return 0; ++ ++ if (io->state == SND_PCM_STATE_XRUN) ++ return -EPIPE; ++ ++#ifdef FREEBSD_OSS_USE_IO_PTR ++ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ? ++ SNDCTL_DSP_GETOPTR : SNDCTL_DSP_GETIPTR, &ci) < 0) ++ return -EINVAL; ++ ++ if (ci.ptr == oss->last_bytes && ++ ((ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ? ++ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) || ++ bi.bytes == oss->bufsz)) ++ return -EPIPE; ++ ++ if (ci.ptr < oss->last_bytes) ++ oss->ptr += oss->bufsz; ++ ++ oss->ptr += ci.ptr; ++ oss->ptr -= oss->last_bytes; ++ oss->ptr %= oss->ptr_align; ++ ++ oss->last_bytes = ci.ptr; ++#else /* !FREEBSD_OSS_USE_IO_PTR */ ++ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ? ++ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) ++ return -EINVAL; ++ ++ if (bi.bytes == oss->bufsz && bi.bytes == oss->last_bytes) { ++#if 0 ++#ifdef SNDCTL_DSP_GETERROR ++ audio_errinfo ei; ++ if (ioctl(oss->fd, SNDCTL_DSP_GETERROR, &ei) < 0 || ++ (io->stream == SND_PCM_STREAM_PLAYBACK && ++ ei.play_underruns != 0) || ++ (io->stream == SND_PCM_STREAM_CAPTURE && ++ ei.rec_overruns != 0)) ++#endif ++#endif ++ return -EPIPE; ++ } ++ ++ if (bi.bytes > oss->last_bytes) { ++ oss->ptr += bi.bytes - oss->last_bytes; ++ oss->ptr %= oss->ptr_align; ++ } ++ ++ oss->last_bytes = bi.bytes; ++#endif /* FREEBSD_OSS_USE_IO_PTR */ ++ ++ return snd_pcm_bytes_to_frames(io->pcm, oss->ptr); ++#else ++ snd_pcm_oss_t *oss = io->private_data; + struct count_info info; + int ptr; + +@@ -85,20 +205,59 @@ static snd_pcm_sframes_t oss_pointer(snd_pcm_ioplug_t + } + ptr = snd_pcm_bytes_to_frames(io->pcm, info.ptr); + return ptr; ++#endif + } + + static int oss_start(snd_pcm_ioplug_t *io) + { + snd_pcm_oss_t *oss = io->private_data; ++#ifdef FREEBSD_OSS ++ audio_buf_info bi; ++#ifdef FREEBSD_OSS_USE_IO_PTR ++ struct count_info ci; ++#endif ++#endif + int tmp = io->stream == SND_PCM_STREAM_PLAYBACK ? + PCM_ENABLE_OUTPUT : PCM_ENABLE_INPUT; + ++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE) ++ fprintf(stderr, "%s()\n", __func__); ++#endif ++ + if (ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp) < 0) { + fprintf(stderr, "*** OSS: trigger failed\n"); ++#ifdef FREEBSD_OSS ++ return -EINVAL; ++#else + if (io->stream == SND_PCM_STREAM_CAPTURE) + /* fake read to trigger */ + read(oss->fd, &tmp, 0); ++#endif + } ++ ++#ifdef FREEBSD_OSS ++ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ? ++ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) ++ return -EINVAL; ++ ++ if (oss->bufsz != (bi.fragsize * bi.fragstotal)) { ++ fprintf(stderr, "%s(): WARNING - bufsz changed! %d -> %d\n", ++ __func__, oss->bufsz, bi.fragsize * bi.fragstotal); ++ oss->bufsz = bi.fragsize * bi.fragstotal; ++ } ++ ++#ifdef FREEBSD_OSS_USE_IO_PTR ++ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ? ++ SNDCTL_DSP_GETOPTR : SNDCTL_DSP_GETIPTR, &ci) < 0) ++ return -EINVAL; ++ ++ oss->last_bytes = ci.ptr; ++#else ++ oss->last_bytes = bi.bytes; ++#endif ++ oss->ptr = 0; ++#endif ++ + return 0; + } + +@@ -107,6 +266,10 @@ static int oss_stop(snd_pcm_ioplug_t *io) + snd_pcm_oss_t *oss = io->private_data; + int tmp = 0; + ++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE) ++ fprintf(stderr, "%s()\n", __func__); ++#endif ++ + ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp); + return 0; + } +@@ -115,18 +278,46 @@ static int oss_drain(snd_pcm_ioplug_t *io) + { + snd_pcm_oss_t *oss = io->private_data; + ++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE) ++ fprintf(stderr, "%s()\n", __func__); ++#endif ++ + if (io->stream == SND_PCM_STREAM_PLAYBACK) +- ioctl(oss->fd, SNDCTL_DSP_SYNC); ++ ioctl(oss->fd, SNDCTL_DSP_SYNC, NULL); + return 0; + } + ++static int oss_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp) ++{ ++ snd_pcm_oss_t *oss = io->private_data; ++ int tmp; ++ ++ if (oss->fd < 0) ++ return -EBADFD; ++ ++ if (io->stream == SND_PCM_STREAM_PLAYBACK) { ++ if (ioctl(oss->fd, SNDCTL_DSP_GETODELAY, &tmp) < 0 || tmp < 0) ++ tmp = 0; ++ } else { ++ tmp = 0; ++ } ++ *delayp = snd_pcm_bytes_to_frames(io->pcm, tmp); ++ ++ return (0); ++} ++ ++#ifndef FREEBSD_OSS + static int oss_prepare(snd_pcm_ioplug_t *io) + { + snd_pcm_oss_t *oss = io->private_data; + int tmp; + +- ioctl(oss->fd, SNDCTL_DSP_RESET); ++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE) ++ fprintf(stderr, "%s()\n", __func__); ++#endif + ++ ioctl(oss->fd, SNDCTL_DSP_RESET, NULL); ++ + tmp = io->channels; + if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) { + perror("SNDCTL_DSP_CHANNELS"); +@@ -145,16 +336,75 @@ static int oss_prepare(snd_pcm_ioplug_t *io) + } + return 0; + } ++#endif + ++#ifdef FREEBSD_OSS ++static const struct { ++ int oss_format; ++ snd_pcm_format_t alsa_format; ++} oss_formats_tab[] = { ++ { AFMT_U8, SND_PCM_FORMAT_U8 }, ++ { AFMT_S8, SND_PCM_FORMAT_S8 }, ++ { AFMT_MU_LAW, SND_PCM_FORMAT_MU_LAW }, ++ { AFMT_A_LAW, SND_PCM_FORMAT_A_LAW }, ++ { AFMT_S16_LE, SND_PCM_FORMAT_S16_LE }, ++ { AFMT_S16_BE, SND_PCM_FORMAT_S16_BE }, ++ { AFMT_U16_LE, SND_PCM_FORMAT_U16_LE }, ++ { AFMT_U16_BE, SND_PCM_FORMAT_U16_BE }, ++ { AFMT_S24_LE, SND_PCM_FORMAT_S24_3LE }, ++ { AFMT_S24_BE, SND_PCM_FORMAT_S24_3BE }, ++ { AFMT_U24_LE, SND_PCM_FORMAT_U24_3LE }, ++ { AFMT_U24_BE, SND_PCM_FORMAT_U24_3BE }, ++ { AFMT_S32_LE, SND_PCM_FORMAT_S32_LE }, ++ { AFMT_S32_BE, SND_PCM_FORMAT_S32_BE }, ++ { AFMT_U32_LE, SND_PCM_FORMAT_U32_LE }, ++ { AFMT_U32_BE, SND_PCM_FORMAT_U32_BE }, ++ /* Special */ ++ { AFMT_S24_LE, SND_PCM_FORMAT_S20_3LE }, ++ { AFMT_S24_BE, SND_PCM_FORMAT_S20_3BE }, ++ { AFMT_U24_LE, SND_PCM_FORMAT_U20_3LE }, ++ { AFMT_U24_BE, SND_PCM_FORMAT_U20_3BE }, ++ { AFMT_S24_LE, SND_PCM_FORMAT_S18_3LE }, ++ { AFMT_S24_BE, SND_PCM_FORMAT_S18_3BE }, ++ { AFMT_U24_LE, SND_PCM_FORMAT_U18_3LE }, ++ { AFMT_U24_BE, SND_PCM_FORMAT_U18_3BE }, ++ { AFMT_S32_LE, SND_PCM_FORMAT_S24_LE }, ++ { AFMT_S32_BE, SND_PCM_FORMAT_S24_BE }, ++ { AFMT_U32_LE, SND_PCM_FORMAT_U24_LE }, ++ { AFMT_U32_BE, SND_PCM_FORMAT_U24_BE }, ++}; ++#endif ++ + static int oss_hw_params(snd_pcm_ioplug_t *io, + snd_pcm_hw_params_t *params ATTRIBUTE_UNUSED) + { + snd_pcm_oss_t *oss = io->private_data; + int i, tmp, err; ++#ifdef FREEBSD_OSS ++ int blksz_shift, blkcnt; ++ audio_buf_info bi; ++#else + unsigned int period_bytes; ++#endif + long oflags, flags; + ++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE) ++ fprintf(stderr, "%s()\n", __func__); ++#endif ++ + oss->frame_bytes = (snd_pcm_format_physical_width(io->format) * io->channels) / 8; ++#ifdef FREEBSD_OSS ++ oss->ptr_align = io->buffer_size * oss->frame_bytes; ++ ++ oss->format = 0; ++ for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) { ++ if (oss_formats_tab[i].alsa_format == io->format) { ++ oss->format = oss_formats_tab[i].oss_format; ++ break; ++ } ++ } ++ if (oss->format == 0) { ++#else + switch (io->format) { + case SND_PCM_FORMAT_U8: + oss->format = AFMT_U8; +@@ -166,9 +416,93 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, + oss->format = AFMT_S16_BE; + break; + default: ++#endif + fprintf(stderr, "*** OSS: unsupported format %s\n", snd_pcm_format_name(io->format)); + return -EINVAL; + } ++#ifdef FREEBSD_OSS ++ ++ ioctl(oss->fd, SNDCTL_DSP_RESET); ++ ++ /* use a 16ms HW buffer by default */ ++ tmp = ((16 * io->rate) / 1000) * oss->frame_bytes; ++ ++ /* round up to nearest power of two */ ++ while (tmp & (tmp - 1)) ++ tmp += tmp & ~(tmp - 1); ++ ++ /* get logarithmic value */ ++ for (blksz_shift = 0; blksz_shift < 24; blksz_shift++) { ++ if (tmp == (1 << blksz_shift)) ++ break; ++ } ++ ++ tmp = io->buffer_size * oss->frame_bytes; ++ ++ /* compute HW buffer big enough to hold SW buffer */ ++ for (blkcnt = FREEBSD_OSS_BLKCNT_MIN; blkcnt != FREEBSD_OSS_BLKCNT_MAX; blkcnt *= 2) { ++ if ((blkcnt << blksz_shift) >= tmp) ++ break; ++ } ++ ++ tmp = blksz_shift | (blkcnt << 16); ++ if (ioctl(oss->fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0) { ++ perror("SNDCTL_DSP_SETFRAGMENTS"); ++ return -EINVAL; ++ } ++ ++ tmp = oss->format; ++ if (ioctl(oss->fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || ++ tmp != oss->format) { ++ perror("SNDCTL_DSP_SETFMT"); ++ return -EINVAL; ++ } ++ ++ tmp = io->channels; ++ if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0 || ++ tmp != io->channels) { ++ perror("SNDCTL_DSP_CHANNELS"); ++ return -EINVAL; ++ } ++ ++ tmp = io->rate; ++ if (ioctl(oss->fd, SNDCTL_DSP_SPEED, &tmp) < 0 || ++ tmp > io->rate * 1.01 || tmp < io->rate * 0.99) { ++ perror("SNDCTL_DSP_SPEED"); ++ return -EINVAL; ++ } ++ ++ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ? ++ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) { ++ perror("SNDCTL_DSP_GET[I/O]SPACE"); ++ return -EINVAL; ++ } ++ ++ oss->bufsz = bi.fragsize * bi.fragstotal; ++ ++#ifdef SNDCTL_DSP_LOW_WATER ++ tmp = ((io->period_size * oss->frame_bytes) * 3) / 4; ++ tmp -= tmp % oss->frame_bytes; ++ if (tmp < oss->frame_bytes) ++ tmp = oss->frame_bytes; ++ if (tmp > bi.fragsize) ++ tmp = bi.fragsize; ++ if (ioctl(oss->fd, SNDCTL_DSP_LOW_WATER, &tmp) < 0) ++ perror("SNDCTL_DSP_LOW_WATER"); ++#endif ++ ++#ifdef FREEBSD_OSS_DEBUG_VERBOSE ++ fprintf(stderr, ++ "\n\n[%lu -> %d] %lu ~ %d -> %d, %lu ~ %d -> %d [d:%ld lw:%d]\n\n", ++ io->buffer_size / io->period_size, bi.fragstotal, ++ io->buffer_size * oss->frame_bytes, ++ (1 << blksz_shift) * blkcnt, oss->bufsz, ++ io->period_size * oss->frame_bytes, 1 << blksz_shift, ++ bi.fragsize, ++ (long)(io->buffer_size * oss->frame_bytes) - ++ oss->bufsz, tmp); ++#endif ++#else + period_bytes = io->period_size * oss->frame_bytes; + oss->period_shift = 0; + for (i = 31; i >= 4; i--) { +@@ -209,6 +543,7 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, + goto _retry; + } + oss->fragment_set = 1; ++#endif + + if ((flags = fcntl(oss->fd, F_GETFL)) < 0) { + err = -errno; +@@ -229,16 +564,152 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, + return 0; + } + +-#define ARRAY_SIZE(ary) (sizeof(ary)/sizeof(ary[0])) +- + static int oss_hw_constraint(snd_pcm_oss_t *oss) + { ++#ifdef FREEBSD_OSS + snd_pcm_ioplug_t *io = &oss->io; + static const snd_pcm_access_t access_list[] = { + SND_PCM_ACCESS_RW_INTERLEAVED, + SND_PCM_ACCESS_MMAP_INTERLEAVED + }; ++#ifdef FREEBSD_OSS_BLKCNT_P2 ++ unsigned int period_list[30]; ++#endif ++#ifdef FREEBSD_OSS_BUFSZ_P2 ++ unsigned int bufsz_list[30]; ++#endif + unsigned int nformats; ++ unsigned int format[ARRAY_SIZE(oss_formats_tab)]; ++#if 0 ++ unsigned int nchannels; ++ unsigned int channel[FREEBSD_OSS_CHANNELS_MAX]; ++#endif ++ int i, err, tmp; ++ ++#ifdef FREEBSD_OSS_DEBUG_VERBOSE ++ fprintf(stderr, "%s()\n", __func__); ++#endif ++ ++ /* check trigger */ ++ tmp = 0; ++ if (ioctl(oss->fd, SNDCTL_DSP_GETCAPS, &tmp) >= 0) { ++ if (!(tmp & DSP_CAP_TRIGGER)) ++ fprintf(stderr, "*** OSS: trigger is not supported!\n"); ++ } ++ ++ /* access type - interleaved only */ ++ if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS, ++ ARRAY_SIZE(access_list), access_list)) < 0) ++ return err; ++ ++ /* supported formats. */ ++ tmp = 0; ++ ioctl(oss->fd, SNDCTL_DSP_GETFMTS, &tmp); ++ nformats = 0; ++ for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) { ++ if (tmp & oss_formats_tab[i].oss_format) ++ format[nformats++] = oss_formats_tab[i].alsa_format; ++ } ++ if (! nformats) ++ format[nformats++] = SND_PCM_FORMAT_S16; ++ if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT, ++ nformats, format)) < 0) ++ return err; ++ ++#if 0 ++ /* supported channels */ ++ nchannels = 0; ++ for (i = 0; i < ARRAY_SIZE(channel); i++) { ++ tmp = i + 1; ++ if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) >= 0 && ++ 1 + i == tmp) ++ channel[nchannels++] = tmp; ++ } ++ if (! nchannels) /* assume 2ch stereo */ ++ err = snd_pcm_ioplug_set_param_minmax(io, ++ SND_PCM_IOPLUG_HW_CHANNELS, 2, 2); ++ else ++ err = snd_pcm_ioplug_set_param_list(io, ++ SND_PCM_IOPLUG_HW_CHANNELS, nchannels, channel); ++ if (err < 0) ++ return err; ++#endif ++ err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS, ++ FREEBSD_OSS_CHANNELS_MIN, FREEBSD_OSS_CHANNELS_MAX); ++ if (err < 0) ++ return err; ++ ++ /* supported rates */ ++ err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE, ++ FREEBSD_OSS_RATE_MIN, FREEBSD_OSS_RATE_MAX); ++ if (err < 0) ++ return err; ++ ++ /* ++ * Maximum buffer size on FreeBSD can go up to 131072 bytes without ++ * strict ^2 alignment so that s24le in 3bytes packing can be fed ++ * directly. ++ */ ++ ++#ifdef FREEBSD_OSS_BLKCNT_P2 ++ tmp = 0; ++ for (i = 1; i < 31 && tmp < ARRAY_SIZE(period_list); i++) { ++ if ((1 << i) > FREEBSD_OSS_BLKCNT_MAX) ++ break; ++ if ((1 << i) < FREEBSD_OSS_BLKCNT_MIN) ++ continue; ++ period_list[tmp++] = 1 << i; ++ } ++ ++ if (tmp > 0) ++ err = snd_pcm_ioplug_set_param_list(io, ++ SND_PCM_IOPLUG_HW_PERIODS, tmp, period_list); ++ else ++#endif ++ /* periods , not strictly ^2 but later on will be refined */ ++ err = snd_pcm_ioplug_set_param_minmax(io, ++ SND_PCM_IOPLUG_HW_PERIODS, FREEBSD_OSS_BLKCNT_MIN, ++ FREEBSD_OSS_BLKCNT_MAX); ++ if (err < 0) ++ return err; ++ ++ /* period size , not strictly ^2 */ ++ err = snd_pcm_ioplug_set_param_minmax(io, ++ SND_PCM_IOPLUG_HW_PERIOD_BYTES, FREEBSD_OSS_BLKSZ_MIN, ++ FREEBSD_OSS_BLKSZ_MAX); ++ if (err < 0) ++ return err; ++ ++#ifdef FREEBSD_OSS_BUFSZ_P2 ++ tmp = 0; ++ for (i = 1; i < 31 && tmp < ARRAY_SIZE(bufsz_list); i++) { ++ if ((1 << i) > FREEBSD_OSS_BUFSZ_MAX) ++ break; ++ if ((1 << i) < FREEBSD_OSS_BUFSZ_MIN) ++ continue; ++ bufsz_list[tmp++] = 1 << i; ++ } ++ ++ if (tmp > 0) ++ err = snd_pcm_ioplug_set_param_list(io, ++ SND_PCM_IOPLUG_HW_BUFFER_BYTES, tmp, bufsz_list); ++ else ++#endif ++ /* buffer size , not strictly ^2 */ ++ err = snd_pcm_ioplug_set_param_minmax(io, ++ SND_PCM_IOPLUG_HW_BUFFER_BYTES, FREEBSD_OSS_BUFSZ_MIN, ++ FREEBSD_OSS_BUFSZ_MAX); ++ if (err < 0) ++ return err; ++ ++ return 0; ++#else ++ snd_pcm_ioplug_t *io = &oss->io; ++ static const snd_pcm_access_t access_list[] = { ++ SND_PCM_ACCESS_RW_INTERLEAVED, ++ SND_PCM_ACCESS_MMAP_INTERLEAVED ++ }; ++ unsigned int nformats; + unsigned int format[5]; + unsigned int nchannels; + unsigned int channel[6]; +@@ -317,6 +788,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) + return err; + + return 0; ++#endif + } + + +@@ -324,6 +796,10 @@ static int oss_close(snd_pcm_ioplug_t *io) + { + snd_pcm_oss_t *oss = io->private_data; + ++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE) ++ fprintf(stderr, "%s()\n", __func__); ++#endif ++ + close(oss->fd); + free(oss->device); + free(oss); +@@ -337,8 +813,11 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca + .pointer = oss_pointer, + .close = oss_close, + .hw_params = oss_hw_params, ++#ifndef FREEBSD_OSS + .prepare = oss_prepare, ++#endif + .drain = oss_drain, ++ .delay = oss_delay, + }; + + static const snd_pcm_ioplug_callback_t oss_capture_callback = { +@@ -348,8 +827,11 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal + .pointer = oss_pointer, + .close = oss_close, + .hw_params = oss_hw_params, ++#ifndef FREEBSD_OSS + .prepare = oss_prepare, ++#endif + .drain = oss_drain, ++ .delay = oss_delay, + }; + + +@@ -360,6 +842,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) + int err; + snd_pcm_oss_t *oss; + ++#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE) ++ fprintf(stderr, "%s()\n", __func__); ++#endif ++ + snd_config_for_each(i, next, conf) { + snd_config_t *n = snd_config_iterator_entry(i); + const char *id; diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 index 02cf9a2c25f..d2715433a1f 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 @@ -2,6 +2,3 @@ usr/lib/alsa-lib/libasound_module_ctl_oss.so usr/lib/alsa-lib/libasound_module_pcm_oss.so usr/lib64/alsa-lib/libasound_module_ctl_oss.so usr/lib64/alsa-lib/libasound_module_pcm_oss.so -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL -%%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 index d3c73896211..f1114fa640b 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 @@ -1,5 +1,2 @@ usr/lib/alsa-lib/libasound_module_ctl_oss.so usr/lib/alsa-lib/libasound_module_pcm_oss.so -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL -%%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss diff --git a/audio/logitechmediaserver-dynamicplaylist/Makefile b/audio/logitechmediaserver-dynamicplaylist/Makefile index 7c5a3435edf..8fc05295e8e 100644 --- a/audio/logitechmediaserver-dynamicplaylist/Makefile +++ b/audio/logitechmediaserver-dynamicplaylist/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= logitechmediaserver- DISTNAME= DynamicPlayList-${PORTVERSION:S/b/beta/} DIST_SUBDIR= logitechmediaserver -MAINTAINER= mark@tranquillussoftware.co.uk +MAINTAINER= ports@FreeBSD.org COMMENT= Logitech Media Server plugin to create dynamic playlists LICENSE= GPLv2+ diff --git a/audio/logitechmediaserver-lazysearch/Makefile b/audio/logitechmediaserver-lazysearch/Makefile index c45ef1468b6..54b09e6a983 100644 --- a/audio/logitechmediaserver-lazysearch/Makefile +++ b/audio/logitechmediaserver-lazysearch/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= logitechmediaserver- DISTNAME= LazySearch2-7-${PORTVERSION} DIST_SUBDIR= logitechmediaserver -MAINTAINER= mark@tranquillussoftware.co.uk +MAINTAINER= ports@FreeBSD.org COMMENT= Logitech Media Server plugin for performing lazy searches LICENSE= GPLv2 diff --git a/audio/logitechmediaserver-sqlplaylist/Makefile b/audio/logitechmediaserver-sqlplaylist/Makefile index c771f6bba3f..329073dc6a7 100644 --- a/audio/logitechmediaserver-sqlplaylist/Makefile +++ b/audio/logitechmediaserver-sqlplaylist/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= logitechmediaserver- DISTNAME= SQLPlayList-${PORTVERSION:S/b/beta/} DIST_SUBDIR= logitechmediaserver -MAINTAINER= mark@tranquillussoftware.co.uk +MAINTAINER= ports@FreeBSD.org COMMENT= Logitech Media Server plugin to create playlists based on SQL queries LICENSE= GPLv2+ diff --git a/audio/logitechmediaserver-trackstat/Makefile b/audio/logitechmediaserver-trackstat/Makefile index ff2309e5d26..4e427b19f84 100644 --- a/audio/logitechmediaserver-trackstat/Makefile +++ b/audio/logitechmediaserver-trackstat/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= logitechmediaserver- DISTNAME= TrackStat-${PORTVERSION:S/b/beta/} DIST_SUBDIR= logitechmediaserver -MAINTAINER= mark@tranquillussoftware.co.uk +MAINTAINER= ports@FreeBSD.org COMMENT= Logitech Media Server plugin to store song ratings and statistics LICENSE= GPLv2+ diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile index 1610b303eb2..2e9b741ac42 100644 --- a/audio/logitechmediaserver/Makefile +++ b/audio/logitechmediaserver/Makefile @@ -4,7 +4,7 @@ PORTNAME= logitechmediaserver PORTVERSION= 7.9.2.g2018.12.10 CATEGORIES= audio -MAINTAINER= mark@tranquillussoftware.co.uk +MAINTAINER= ports@FreeBSD.org COMMENT= Audio streaming server that powers Squeezebox players from Logitech LICENSE= SDL diff --git a/audio/xmms2/pkg-descr b/audio/xmms2/pkg-descr index 95edca1b943..2a23b090515 100644 --- a/audio/xmms2/pkg-descr +++ b/audio/xmms2/pkg-descr @@ -3,4 +3,4 @@ model, allowing multiple (even simultaneous!) user interfaces, both textual and graphical. All common audio formats are supported using plugins. On top of this, there is a flexible media library to organize your music. -WWW: http://xmms2.org/ +WWW: https://github.com/xmms2/wiki/wiki diff --git a/biology/p5-BioPerl/Makefile b/biology/p5-BioPerl/Makefile index 6147a19796c..9166f42ced3 100644 --- a/biology/p5-BioPerl/Makefile +++ b/biology/p5-BioPerl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= BioPerl -PORTVERSION= 1.007005 -PORTREVISION= 1 +PORTVERSION= 1.007006 CATEGORIES= biology perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CDRAUG @@ -18,10 +17,8 @@ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \ - p5-Data-Stag>=0:devel/p5-Data-Stag \ +RUN_DEPENDS= p5-Data-Stag>=0:devel/p5-Data-Stag \ p5-Error>=0:lang/p5-Error \ - p5-GD>=0:graphics/p5-GD \ p5-Graph>=0:math/p5-Graph \ p5-HTTP-Message>=0:www/p5-HTTP-Message \ p5-IO-String>=0:devel/p5-IO-String \ @@ -52,16 +49,9 @@ USE_PERL5= configure NO_ARCH= yes -OPTIONS_DEFINE= DOCS EXAMPLES PGTEST SQLITETEST -PGTEST_DESC= Test PostGreSQL -SQLITETEST_DESC=Test SQLite +OPTIONS_DEFINE= DOCS EXAMPLES -PGTEST_RUN_DEPENDS= p5-DBD-Pg>=3:databases/p5-DBD-Pg -PGTEST_BUILD_DEPENDS= p5-DBD-Pg>=3:databases/p5-DBD-Pg -SQLITETEST_RUN_DEPENDS= p5-DBD-SQLite>=1:databases/p5-DBD-SQLite -SQLITETEST_BUILD_DEPENDS= p5-DBD-SQLite>=1:databases/p5-DBD-SQLite - -SHEBANG_FILES= examples/*.pl examples/*/*.pl +SHEBANG_GLOB= *.pl post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/biology/p5-BioPerl/distinfo b/biology/p5-BioPerl/distinfo index a7180cfa973..79a3ea03932 100644 --- a/biology/p5-BioPerl/distinfo +++ b/biology/p5-BioPerl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565523237 -SHA256 (BioPerl-1.7.5.tar.gz) = 4a96472004e35e11eafd1fa3b3966f1d18622de3afde3e2fa6765a2dbedb3a0a -SIZE (BioPerl-1.7.5.tar.gz) = 7512326 +TIMESTAMP = 1567842458 +SHA256 (BioPerl-1.7.6.tar.gz) = df2a3efc991b9b5d7cc9d038a1452c6dac910c9ad2a0e47e408dd692c111688d +SIZE (BioPerl-1.7.6.tar.gz) = 7514084 diff --git a/biology/p5-BioPerl/pkg-plist b/biology/p5-BioPerl/pkg-plist index 244f0c123a1..6a2f6dc5ae1 100644 --- a/biology/p5-BioPerl/pkg-plist +++ b/biology/p5-BioPerl/pkg-plist @@ -2,7 +2,6 @@ bin/bp_aacomp bin/bp_bioflat_index bin/bp_biogetseq bin/bp_chaos_plot -bin/bp_classify_hits_kingdom bin/bp_dbsplit bin/bp_extract_feature_seq bin/bp_fastam9_to_table @@ -516,7 +515,6 @@ bin/bp_unflatten_seq %%PERL5_MAN1%%/bp_bioflat_index.1.gz %%PERL5_MAN1%%/bp_biogetseq.1.gz %%PERL5_MAN1%%/bp_chaos_plot.1.gz -%%PERL5_MAN1%%/bp_classify_hits_kingdom.1.gz %%PERL5_MAN1%%/bp_dbsplit.1.gz %%PERL5_MAN1%%/bp_extract_feature_seq.1.gz %%PERL5_MAN1%%/bp_fastam9_to_table.1.gz @@ -1035,6 +1033,7 @@ bin/bp_unflatten_seq %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align/align_on_codons.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align/aligntutorial.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/align/simplealign.pl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/classify_hits_kingdom %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contributed/nmrpdb_parse.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contributed/prosite2perl.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contributed/rebase2list.pl diff --git a/cad/brickutils/Makefile b/cad/brickutils/Makefile index 0fd79d65009..35f83fe9ea8 100644 --- a/cad/brickutils/Makefile +++ b/cad/brickutils/Makefile @@ -19,6 +19,8 @@ COMMENT= Utility for building models with LEGO LICENSE= GPLv3 +BROKEN= missing RUN_DEPENDS + RUN_DEPENDS= ${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index f145157188f..58395f46f01 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openscad -PORTVERSION= 2019.04.04 -PORTREVISION= 4 +PORTVERSION= 2019.09.05 #PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel @@ -36,7 +35,7 @@ USE_GL= gl glu glew USE_GNOME= glib20 libxml2 USE_QT= buildtools_build core concurrent_build dbus gui multimedia widgets USE_XORG= x11 -GH_TAGNAME= 6bfcb5e036d2dc10716b5257f9b600efca148512 +GH_TAGNAME= e891d31bafea7c5f2e0004e4501dc8d2391862f3 QMAKE_ARGS= CONFIG+="experimental" VERSION=${PORTVERSION} # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport) LDFLAGS+= -Wl,--as-needed diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo index 8904a838c84..c96bba534ab 100644 --- a/cad/openscad-devel/distinfo +++ b/cad/openscad-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554446602 -SHA256 (openscad-openscad-2019.04.04-6bfcb5e036d2dc10716b5257f9b600efca148512_GH0.tar.gz) = 6fb8c8ba2c0d0091958fdbeb258ae0bd8fd9e21e5c9a8b4c9d0a601eca37b840 -SIZE (openscad-openscad-2019.04.04-6bfcb5e036d2dc10716b5257f9b600efca148512_GH0.tar.gz) = 14598790 +TIMESTAMP = 1567763341 +SHA256 (openscad-openscad-2019.09.05-e891d31bafea7c5f2e0004e4501dc8d2391862f3_GH0.tar.gz) = 1cb5532a9d548041bbf09a6247bd288f4b4fb4ee40d8fe742f019fe36d5a45e3 +SIZE (openscad-openscad-2019.09.05-e891d31bafea7c5f2e0004e4501dc8d2391862f3_GH0.tar.gz) = 14626199 diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist index a38e3807a65..8a198bdff40 100644 --- a/cad/openscad-devel/pkg-plist +++ b/cad/openscad-devel/pkg-plist @@ -109,5 +109,11 @@ share/mime/packages/openscad.xml %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/uk/LC_MESSAGES/openscad.mo +%%DATADIR%%/templates/difference.json +%%DATADIR%%/templates/for.json +%%DATADIR%%/templates/function.json +%%DATADIR%%/templates/module.json +%%DATADIR%%/templates/rotate.json +%%DATADIR%%/templates/translate.json share/pixmaps/openscad.png @dir %%DATADIR%%/libraries/MCAD diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile index 5af9b453c68..a2b744902fc 100644 --- a/chinese/wordpress-zh_CN/Makefile +++ b/chinese/wordpress-zh_CN/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.0.3 +DISTVERSION= 5.2.3 DISTVERSIONSUFFIX= -zh_CN CATEGORIES= chinese www MASTER_SITES= http://cn.wordpress.org/ diff --git a/chinese/wordpress-zh_CN/distinfo b/chinese/wordpress-zh_CN/distinfo index 9a90c2f2250..3dc30876d22 100644 --- a/chinese/wordpress-zh_CN/distinfo +++ b/chinese/wordpress-zh_CN/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548063716 -SHA256 (wordpress-5.0.3-zh_CN.tar.gz) = aa1d6fc03c6602854eeab2d8d6be5526dc2bb0078f7a0b79e8b2addedd5e0f0b -SIZE (wordpress-5.0.3-zh_CN.tar.gz) = 11098483 +TIMESTAMP = 1567784871 +SHA256 (wordpress-5.2.3-zh_CN.tar.gz) = 02652f946b0180a1c781f3aa0c91f2402353e427347e7978564f093b5c222f61 +SIZE (wordpress-5.2.3-zh_CN.tar.gz) = 11814081 diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile index c6f1b8148f8..719cdb58469 100644 --- a/chinese/wordpress-zh_TW/Makefile +++ b/chinese/wordpress-zh_TW/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 5.2 +PORTVERSION= 5.2.3 DISTVERSIONSUFFIX= -zh_TW CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ diff --git a/chinese/wordpress-zh_TW/distinfo b/chinese/wordpress-zh_TW/distinfo index e3b5d8943c3..b590e4f82e0 100644 --- a/chinese/wordpress-zh_TW/distinfo +++ b/chinese/wordpress-zh_TW/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557566163 -SHA256 (wordpress-5.2-zh_TW.tar.gz) = ba04874aa9767775fd84695fc606173c5eb1ac928831d3b14caae9c6f1784d66 -SIZE (wordpress-5.2-zh_TW.tar.gz) = 11839159 +TIMESTAMP = 1567784902 +SHA256 (wordpress-5.2.3-zh_TW.tar.gz) = eaf447c6f5ebf5fd368c6fb82ac9c1becd705c07ec92ec97b0b6386ab06049ac +SIZE (wordpress-5.2.3-zh_TW.tar.gz) = 11810856 diff --git a/comms/klog/Makefile b/comms/klog/Makefile index ddbe0a556c6..e38536cdb21 100644 --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= klog -PORTVERSION= 0.9.7.2 -PORTREVISION= 1 +PORTVERSION= 0.9.8.1 CATEGORIES= comms hamradio MASTER_SITES= SAVANNAH @@ -12,10 +11,12 @@ COMMENT= Simple Qt-based amateur radio logger LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lang gl qmake qt:5 +LIB_DEPENDS= libhamlib.so:comms/hamlib + +USES= compiler:c++11-lang gl qmake qt:5 xorg USE_GL= gl USE_QT= buildtools_build charts core gui linguisttools_build multimedia network \ - printsupport sql sql-sqlite3_run widgets + printsupport sql sql-sqlite3_run serialport widgets DESKTOP_ENTRIES= "KLog" "Simple Amateur Radio Logging Program" \ "" "klog" "Network;HamRadio;" \ diff --git a/comms/klog/distinfo b/comms/klog/distinfo index d619f1fe17d..cb12811d54a 100644 --- a/comms/klog/distinfo +++ b/comms/klog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555664268 -SHA256 (klog-0.9.7.2.tar.gz) = d60f6d9f56717f99e46757a3912b48b1604d133a410b35b6d56e6f9c8f9d45c5 -SIZE (klog-0.9.7.2.tar.gz) = 2020081 +TIMESTAMP = 1567980395 +SHA256 (klog-0.9.8.1.tar.gz) = 068106b8e8a6aac2f62e7b5c9280a7aa97fe35bb11d37764039df2ab998ad36d +SIZE (klog-0.9.8.1.tar.gz) = 2064170 diff --git a/comms/qrq/Makefile b/comms/qrq/Makefile index a22ad59c6a0..313273aeb2d 100644 --- a/comms/qrq/Makefile +++ b/comms/qrq/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qrq -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= comms hamradio MASTER_SITES= http://fkurz.net/ham/qrq/ diff --git a/comms/qrq/distinfo b/comms/qrq/distinfo index 513cd30574e..04125c3c2fb 100644 --- a/comms/qrq/distinfo +++ b/comms/qrq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556007902 -SHA256 (qrq-0.3.2.tar.gz) = f340aa1e99a1c7752fe3600828a6596354485fffdb66a39eaf79227ac24ac43c -SIZE (qrq-0.3.2.tar.gz) = 132546 +TIMESTAMP = 1567990101 +SHA256 (qrq-0.3.3.tar.gz) = 306ef7f8e0bbb16bdddc58a5d9c357e9b05c1a5c8a52680e5bae093a4064e945 +SIZE (qrq-0.3.3.tar.gz) = 159832 diff --git a/comms/qtel/pkg-plist b/comms/qtel/pkg-plist index d06c0ff474c..9e9118c9b95 100644 --- a/comms/qtel/pkg-plist +++ b/comms/qtel/pkg-plist @@ -1,21 +1,21 @@ bin/qtel include/svxlink/AsyncQtApplication.h %%STATIC%%lib/libasyncqt.a -lib/libasyncqt.so.1.5.0 -lib/libasyncqt.so.1.5 +lib/libasyncqt.so.1.6.0 +lib/libasyncqt.so.1.6 lib/libasyncqt.so share/applications/qtel.desktop -share/qtel/translations/qtel_sv.qm -share/qtel/translations/qtel_de.qm -share/qtel/translations/qtel_tr.qm -share/qtel/translations/qtel_nl.qm -share/qtel/translations/qtel_it.qm -share/qtel/translations/qtel_uk.qm -share/qtel/translations/qtel_ru.qm -share/qtel/translations/qtel_hu.qm -share/qtel/translations/qtel_es.qm -share/qtel/translations/qtel_ja.qm -share/qtel/translations/qtel_fr.qm -share/qtel/sounds/connect.raw +%%DATADIR%%/translations/qtel_sv.qm +%%DATADIR%%/translations/qtel_de.qm +%%DATADIR%%/translations/qtel_tr.qm +%%DATADIR%%/translations/qtel_nl.qm +%%DATADIR%%/translations/qtel_it.qm +%%DATADIR%%/translations/qtel_uk.qm +%%DATADIR%%/translations/qtel_ru.qm +%%DATADIR%%/translations/qtel_hu.qm +%%DATADIR%%/translations/qtel_es.qm +%%DATADIR%%/translations/qtel_ja.qm +%%DATADIR%%/translations/qtel_fr.qm +%%DATADIR%%/sounds/connect.raw share/icons/link.xpm man/man1/qtel.1.gz diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index d300e4b207c..31d744905a8 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -18,6 +18,7 @@ COMMENT= Ettus Research UHD driver framework # is understood and if appropriate, we can add that license here. LICENSE= GPLv3 +BROKEN= fails to package BROKEN_powerpc64= fails to link: undefined reference to boost function LIB_DEPENDS= ${PY_BOOST} \ diff --git a/converters/Makefile b/converters/Makefile index 7d41cb9deff..5db836cdf91 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -13,6 +13,7 @@ SUBDIR += base64 SUBDIR += base91 SUBDIR += bibtexconv + SUBDIR += bmfdec SUBDIR += bsdconv SUBDIR += btoa SUBDIR += chmview diff --git a/converters/bmfdec/Makefile b/converters/bmfdec/Makefile new file mode 100644 index 00000000000..e76b422e320 --- /dev/null +++ b/converters/bmfdec/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= bmfdec +DISTVERSION= g20180113 +CATEGORIES= converters devel sysutils + +MAINTAINER= takawata@FreeBSD.org +COMMENT= Decompile binary MOF file (BMF) from WMI buffer + +LICENSE= GPLv2 + +USE_GITHUB= yes +GH_ACCOUNT= pali +GH_TAGNAME= a9c0d30 + +PLIST_FILES= ${BINARIES:S,^,bin/&,} + +BINARIES= bmf2mof bmfdec bmfparse + +do-install: + (cd ${WRKSRC} && \ + ${INSTALL_PROGRAM} ${BINARIES} ${STAGEDIR}${PREFIX}/bin) + +.include diff --git a/converters/bmfdec/distinfo b/converters/bmfdec/distinfo new file mode 100644 index 00000000000..edafe0baaa4 --- /dev/null +++ b/converters/bmfdec/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567766875 +SHA256 (pali-bmfdec-g20180113-a9c0d30_GH0.tar.gz) = c24284d7a38c965b03c1e0b24450894280c45847a6c550a358bd7971d3f8d720 +SIZE (pali-bmfdec-g20180113-a9c0d30_GH0.tar.gz) = 10629 diff --git a/converters/bmfdec/pkg-descr b/converters/bmfdec/pkg-descr new file mode 100644 index 00000000000..1a82fa9c1c4 --- /dev/null +++ b/converters/bmfdec/pkg-descr @@ -0,0 +1,12 @@ +Binary MOF buffer in WMI tools: +* Decompile binary MOF file (BMF) to UTF-8 plain text MOF file. +* Decompress binary MOF file (BMF) +* Parse binary MOF file (BMF) + +EXAMPLES: + sysctl -b dev.acpi_wmi.0.bmof | bmf2mof + +SEE ALSO: + acpi_wmi(4) + +WWW: https://github.com/pali/bmfdec/ diff --git a/databases/p5-DBD-Mock/Makefile b/databases/p5-DBD-Mock/Makefile index 0fbc8018752..fe98c003e60 100644 --- a/databases/p5-DBD-Mock/Makefile +++ b/databases/p5-DBD-Mock/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= DBD-Mock -PORTVERSION= 1.45 -PORTREVISION= 1 +PORTVERSION= 1.47 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,12 +10,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= culot@FreeBSD.org COMMENT= Simple mock DBD implementation used for testing +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual + BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-DBI>=1.3:databases/p5-DBI \ - p5-Test-Exception>=0.31:devel/p5-Test-Exception \ - p5-Test-Simple>=0.47:devel/p5-Test-Simple + p5-Test-Exception>=0.31:devel/p5-Test-Exception USES= perl5 -USE_PERL5= configure +USE_PERL5= modbuildtiny .include diff --git a/databases/p5-DBD-Mock/distinfo b/databases/p5-DBD-Mock/distinfo index 6f03c6dc551..57388bfd976 100644 --- a/databases/p5-DBD-Mock/distinfo +++ b/databases/p5-DBD-Mock/distinfo @@ -1,2 +1,3 @@ -SHA256 (DBD-Mock-1.45.tar.gz) = 40a80c37b31ef14536b58b4a8b483e65953b00b8fa7397817c7eb76d540bd00f -SIZE (DBD-Mock-1.45.tar.gz) = 44496 +TIMESTAMP = 1567771820 +SHA256 (DBD-Mock-1.47.tar.gz) = 44724e97726c3a8e81269cda703735e42d50cea0b904c225c242b74365c2ff23 +SIZE (DBD-Mock-1.47.tar.gz) = 65762 diff --git a/databases/p5-DBD-Mock/pkg-plist b/databases/p5-DBD-Mock/pkg-plist index c34b9166eab..7cbf11fbb7d 100644 --- a/databases/p5-DBD-Mock/pkg-plist +++ b/databases/p5-DBD-Mock/pkg-plist @@ -8,3 +8,11 @@ %%SITE_PERL%%/DBD/Mock/Pool.pm %%SITE_PERL%%/DBD/Mock.pm %%PERL5_MAN3%%/DBD::Mock.3.gz +%%PERL5_MAN3%%/DBD::Mock::Pool.3.gz +%%PERL5_MAN3%%/DBD::Mock::Pool::db.3.gz +%%PERL5_MAN3%%/DBD::Mock::Session.3.gz +%%PERL5_MAN3%%/DBD::Mock::StatementTrack.3.gz +%%PERL5_MAN3%%/DBD::Mock::StatementTrack::Iterator.3.gz +%%PERL5_MAN3%%/DBD::Mock::db.3.gz +%%PERL5_MAN3%%/DBD::Mock::dr.3.gz +%%PERL5_MAN3%%/DBD::Mock::st.3.gz diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile index 507b1f85b93..68c53c83a58 100644 --- a/databases/postgresql-plruby/Makefile +++ b/databases/postgresql-plruby/Makefile @@ -16,6 +16,7 @@ LICENSE_COMB= dual DEPRECATED= Abandonware EXPIRATION_DATE= 2019-09-15 BROKEN_powerpc64= fails to build: ruby.h:628:35: call to 'ruby_safe_level_2_error' declared with attribute error: $SAFE=2 to 4 are obsolete +BROKEN_RUBY26= yes USES= uidfix pgsql WANT_PGSQL= server diff --git a/databases/py-marshmallow-sqlalchemy/Makefile b/databases/py-marshmallow-sqlalchemy/Makefile index b3bc1aafdf3..d7bbed9d269 100644 --- a/databases/py-marshmallow-sqlalchemy/Makefile +++ b/databases/py-marshmallow-sqlalchemy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= marshmallow-sqlalchemy -PORTVERSION= 0.17.2 +PORTVERSION= 0.19.0 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,8 +13,8 @@ COMMENT= SQLAlchemy integration with the marshmallow serialization library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}marshmallow>=2.0.0:devel/py-marshmallow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.9.7:databases/py-sqlalchemy12@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}marshmallow>=2.15.2:devel/py-marshmallow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.2.0:databases/py-sqlalchemy12@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils diff --git a/databases/py-marshmallow-sqlalchemy/distinfo b/databases/py-marshmallow-sqlalchemy/distinfo index 5ff54ed83d1..2d0853de882 100644 --- a/databases/py-marshmallow-sqlalchemy/distinfo +++ b/databases/py-marshmallow-sqlalchemy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567451238 -SHA256 (marshmallow-sqlalchemy-0.17.2.tar.gz) = d4323a29928f6b575001a0161eb00f3166a5c662dbd4cf2724d5966fc9395250 -SIZE (marshmallow-sqlalchemy-0.17.2.tar.gz) = 47780 +TIMESTAMP = 1567842466 +SHA256 (marshmallow-sqlalchemy-0.19.0.tar.gz) = b53ae45f6f113ae5433211786129ecb6eaf3646a3a333e769eeb22593b6dbe9c +SIZE (marshmallow-sqlalchemy-0.19.0.tar.gz) = 47312 diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index 3df7364a6b9..3dc3c3f059e 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -3,7 +3,7 @@ PORTNAME= bdb PORTVERSION= 0.6.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases ruby MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \ http://idaemons.org/distfiles/ruby/ \ @@ -16,8 +16,11 @@ COMMENT= Ruby interface to Oracle Berkeley DB revision 2 or later LICENSE= RUBY +BUILD_DEPENDS= rubygem-rdoc>=0.a:devel/rubygem-rdoc + OPTIONS_DEFINE= DOCS EXAMPLES +USES= bdb shebangfix tar:bzip2 USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_RUBY_RDOC= yes @@ -34,7 +37,6 @@ SHAREMODE= 0644 PLIST_FILES= %%RUBY_SITEARCHLIBDIR%%/bdb.so PORTDOCS= * PORTEXAMPLES= * -USES= bdb shebangfix tar:bzip2 SHEBANG_FILES= examples/record.rb \ examples/recno.rb \ examples/zeroc.rb \ diff --git a/deskutils/latte-dock/Makefile b/deskutils/latte-dock/Makefile index 2acb4bb84ae..d9d5aa54c76 100644 --- a/deskutils/latte-dock/Makefile +++ b/deskutils/latte-dock/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= latte-dock -DISTVERSION= 0.9.1 +DISTVERSION= 0.9.2 CATEGORIES= deskutils kde MASTER_SITES= KDE/stable/latte-dock diff --git a/deskutils/latte-dock/distinfo b/deskutils/latte-dock/distinfo index 2cb3c24550b..fc860b55942 100644 --- a/deskutils/latte-dock/distinfo +++ b/deskutils/latte-dock/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567024142 -SHA256 (latte-dock-0.9.1.tar.xz) = a76f19fde4461a6c53966aabecb0b3eb386230cb7261981f846e967661485193 -SIZE (latte-dock-0.9.1.tar.xz) = 696660 +TIMESTAMP = 1567766858 +SHA256 (latte-dock-0.9.2.tar.xz) = fa63e02fa455904a6bd964eb8414339bd7cf0ec0208f5f669815269f21f6fc76 +SIZE (latte-dock-0.9.2.tar.xz) = 708436 diff --git a/deskutils/latte-dock/files/patch-app_settings_delegates_persistentmenu.cpp b/deskutils/latte-dock/files/patch-app_settings_delegates_persistentmenu.cpp deleted file mode 100644 index aa991f379cf..00000000000 --- a/deskutils/latte-dock/files/patch-app_settings_delegates_persistentmenu.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- app/settings/delegates/persistentmenu.cpp.orig 2019-08-28 20:32:23 UTC -+++ app/settings/delegates/persistentmenu.cpp -@@ -20,7 +20,7 @@ - #include "persistentmenu.h" - - --PersistentMenu::PersistentMenu(QWidget *parent = 0) -+PersistentMenu::PersistentMenu(QWidget *parent) - : QMenu (parent), - m_blockHide(false) - { diff --git a/deskutils/latte-dock/pkg-plist b/deskutils/latte-dock/pkg-plist index 461255e489c..57401b05241 100644 --- a/deskutils/latte-dock/pkg-plist +++ b/deskutils/latte-dock/pkg-plist @@ -148,6 +148,12 @@ share/locale/ja/LC_MESSAGES/latte_indicator_org.kde.latte.plasma.mo share/locale/ja/LC_MESSAGES/plasma_applet_org.kde.latte.containment.mo share/locale/ja/LC_MESSAGES/plasma_applet_org.kde.latte.plasmoid.mo share/locale/ja/LC_MESSAGES/plasma_containmentactions_lattecontextmenu.mo +share/locale/ko/LC_MESSAGES/latte-dock.mo +share/locale/ko/LC_MESSAGES/latte_indicator_org.kde.latte.default.mo +share/locale/ko/LC_MESSAGES/latte_indicator_org.kde.latte.plasma.mo +share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.latte.containment.mo +share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.latte.plasmoid.mo +share/locale/ko/LC_MESSAGES/plasma_containmentactions_lattecontextmenu.mo share/locale/lt/LC_MESSAGES/latte-dock.mo share/locale/lt/LC_MESSAGES/latte_indicator_org.kde.latte.default.mo share/locale/lt/LC_MESSAGES/latte_indicator_org.kde.latte.plasma.mo diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile index 118d0d9a18d..19784aa7d7b 100644 --- a/deskutils/xmaddressbook/Makefile +++ b/deskutils/xmaddressbook/Makefile @@ -10,6 +10,9 @@ MASTER_SITES= XCONTRIB/office MAINTAINER= ports@FreeBSD.org COMMENT= X11/Motif-based addressbook program +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + USES= imake motif tar:Z USE_XORG= ice sm x11 xext xi xp xt oldx WRKSRC= ${WRKDIR}/xmaddressbook diff --git a/devel/Makefile b/devel/Makefile index 40815a1ef92..13363fda210 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1446,6 +1446,7 @@ SUBDIR += linux-c7-libsigc++20 SUBDIR += linux-c7-libthai SUBDIR += linux-c7-libunwind + SUBDIR += linux-c7-make SUBDIR += linux-c7-nspr SUBDIR += linux-c7-qt SUBDIR += linux-c7-sdl12 @@ -4154,9 +4155,12 @@ SUBDIR += py-azure-batch SUBDIR += py-azure-cosmos SUBDIR += py-azure-datalake-store + SUBDIR += py-azure-functions-devops-build SUBDIR += py-azure-graphrbac SUBDIR += py-azure-keyvault SUBDIR += py-azure-mgmt-advisor + SUBDIR += py-azure-mgmt-apimanagement + SUBDIR += py-azure-mgmt-appconfiguration SUBDIR += py-azure-mgmt-applicationinsights SUBDIR += py-azure-mgmt-authorization SUBDIR += py-azure-mgmt-batch @@ -4174,25 +4178,30 @@ SUBDIR += py-azure-mgmt-datalake-analytics SUBDIR += py-azure-mgmt-datalake-store SUBDIR += py-azure-mgmt-datamigration + SUBDIR += py-azure-mgmt-deploymentmanager SUBDIR += py-azure-mgmt-devtestlabs SUBDIR += py-azure-mgmt-dns SUBDIR += py-azure-mgmt-eventgrid SUBDIR += py-azure-mgmt-eventhub SUBDIR += py-azure-mgmt-hdinsight + SUBDIR += py-azure-mgmt-imagebuilder SUBDIR += py-azure-mgmt-iotcentral SUBDIR += py-azure-mgmt-iothub SUBDIR += py-azure-mgmt-iothubprovisioningservices SUBDIR += py-azure-mgmt-keyvault SUBDIR += py-azure-mgmt-kusto SUBDIR += py-azure-mgmt-loganalytics + SUBDIR += py-azure-mgmt-managedservices SUBDIR += py-azure-mgmt-managementgroups SUBDIR += py-azure-mgmt-maps SUBDIR += py-azure-mgmt-marketplaceordering SUBDIR += py-azure-mgmt-media SUBDIR += py-azure-mgmt-monitor SUBDIR += py-azure-mgmt-msi + SUBDIR += py-azure-mgmt-netapp SUBDIR += py-azure-mgmt-network SUBDIR += py-azure-mgmt-policyinsights + SUBDIR += py-azure-mgmt-privatedns SUBDIR += py-azure-mgmt-rdbms SUBDIR += py-azure-mgmt-recoveryservices SUBDIR += py-azure-mgmt-recoveryservicesbackup @@ -4396,6 +4405,7 @@ SUBDIR += py-extremes SUBDIR += py-ezpyinline SUBDIR += py-fabric + SUBDIR += py-fabric1 SUBDIR += py-fabric3 SUBDIR += py-fam SUBDIR += py-fastcache @@ -5136,6 +5146,7 @@ SUBDIR += py-virtualenvwrapper SUBDIR += py-visitor SUBDIR += py-voluptuous + SUBDIR += py-vsts SUBDIR += py-vsts-cd-manager SUBDIR += py-vulture SUBDIR += py-wadllib @@ -5836,6 +5847,7 @@ SUBDIR += rubygem-grape-swagger SUBDIR += rubygem-grape11 SUBDIR += rubygem-grape_logging + SUBDIR += rubygem-grape_logging181 SUBDIR += rubygem-graphiql-rails SUBDIR += rubygem-graphql SUBDIR += rubygem-graphql-docs diff --git a/devel/R-cran-hms/Makefile b/devel/R-cran-hms/Makefile index 1f50a37dca8..fc891dab089 100644 --- a/devel/R-cran-hms/Makefile +++ b/devel/R-cran-hms/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= hms -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 0.5.1 CATEGORIES= devel DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/devel/R-cran-hms/distinfo b/devel/R-cran-hms/distinfo index 4df8ccf95c5..8ba7a68be68 100644 --- a/devel/R-cran-hms/distinfo +++ b/devel/R-cran-hms/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563088358 -SHA256 (hms_0.5.0.tar.gz) = a87872665c3bf3901f597d78c152e7805f7129e4dbe27397051de4cf1a76561b -SIZE (hms_0.5.0.tar.gz) = 136036 +TIMESTAMP = 1567917093 +SHA256 (hms_0.5.1.tar.gz) = 6d336efef276ada8a565cd72dc5dd89274be0426cb288a1f51b4a0bbafeb8cec +SIZE (hms_0.5.1.tar.gz) = 136031 diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile index d3ce94f08ab..961b6c84e13 100644 --- a/devel/android-tools-adb/Makefile +++ b/devel/android-tools-adb/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= android-tools-adb -DISTVERSIONPREFIX= android- -DISTVERSION?= 9.0.0_r3 -PORTREVISION?= 3 +DISTVERSIONPREFIX= platform-tools- +DISTVERSION?= 29.0.2 +PORTREVISION?= 0 CATEGORIES= devel comms MAINTAINER= jbeich@FreeBSD.org @@ -17,22 +17,18 @@ GH_PROJECT= platform_system_core CONFLICTS_INSTALL?= ${PORTNAME}-devel-* -USES= compiler:c++14-lang pkgconfig ssl uidfix +USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} -CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" FILESDIR="${DOCSDIR}" \ - VEREXT="${GH_REVISION}-android" + VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" ALL_TARGET= all TEST_TARGET= test PLIST_FILES= bin/adb PORTDOCS= * -# Generated by "make update-revision" for "adb --version" -GH_REVISION= ${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//} - OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON OPTIONS_DEFAULT=MDNSRESPONDER OPTIONS_SUB= yes @@ -69,6 +65,9 @@ post-patch: ${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ ${WRKSRC}/adb/adb_io_test.cpp; \ fi +# XXX getcwd fails and not connected upstream + @${REINPLACE_CMD} -e '/TEST/s/, /&DISABLED_/' \ + ${WRKSRC}/adb/bugreport_test.cpp pre-install-TEST-on: do-test @@ -83,25 +82,4 @@ post-install-BASH-on: ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} -update-revision: - @${REINPLACE_CMD} -i '' -e "/^VERSION?=/s/=.*/= $$(\ - ${FETCH_CMD} -qo- \ - https://github.com/${GH_ACCOUNT}/platform_build/raw/${GH_TAGNAME}/core/version_defaults.mk | \ - ${SED} -n 's/^[[:space:]]*PLATFORM_SDK_VERSION := //p' \ - ).0.0-0 \$${VEREXT}/" \ - ${MAKEFILE} -# https://developer.github.com/v3/repos/commits/#get-a-single-commit -# Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1) - @${REINPLACE_CMD} -i '' -e "/^GH_REVISION=/s/:U[^}:]*/:U$$(\ - ${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \ - https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \ - ${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \ - )/" \ - ${.CURDIR}/Makefile - .include - -# XXX Work around !target(makesum) -.ifndef DISTVERSIONSUFFIX -makesum: update-revision -.endif diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo index 2039029136d..f731528f4fe 100644 --- a/devel/android-tools-adb/distinfo +++ b/devel/android-tools-adb/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1529542722 -SHA256 (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = b9de23465b304432aa2b585aa66c6bf4841b177f2139b75ca5adc5d917e0ecd6 -SIZE (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = 27484684 +TIMESTAMP = 1563393249 +SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = cd0f6fe386f07d7aef98cf46a41cef0aa1e8cebfe06f434bb5c88777de4c2643 +SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = 59909027 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 -SHA256 (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = f35f681e6fad873f3e94b5c2362939741f15f276022717e352bd21a74653704b -SIZE (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = 59064522 +SHA256 (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = aa40c37fd1cbb1c4a93a0c4ba26468bb47a5837826cb94423f5ca161dd85f118 +SIZE (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = 56861217 diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile index 923a4ac4988..daae11ae98b 100644 --- a/devel/android-tools-adb/files/Makefile +++ b/devel/android-tools-adb/files/Makefile @@ -5,24 +5,14 @@ NOMAN= # DragonFly, NetBSD, OpenBSD NO_MAN= # FreeBSD BINDIR?=/usr/bin FILESDIR?=${DOCDIR}/${PROG} -VERSION?= 28.0.0-0 ${VEREXT} -FILES= *.[Tt][Xx][Tt] +FILES= OVERVIEW.TXT SERVICES.TXT SYNC.TXT protocol.txt SRCS+= adb.cpp -SRCS+= adb_auth_host.cpp -SRCS+= adb_client.cpp SRCS+= adb_io.cpp SRCS+= adb_listeners.cpp SRCS+= adb_trace.cpp SRCS+= adb_utils.cpp -SRCS+= bugreport.cpp -SRCS+= commandline.cpp -SRCS+= console.cpp -SRCS+= diagnose_usb.cpp -SRCS+= fdevent.cpp -SRCS+= file_sync_client.cpp -SRCS+= line_printer.cpp SRCS+= services.cpp SRCS+= shell_service_protocol.cpp SRCS+= socket_spec.cpp @@ -30,24 +20,37 @@ SRCS+= ../adb/sockets.cpp SRCS+= sysdeps_unix.cpp SRCS+= transport.cpp SRCS+= transport_local.cpp -SRCS+= transport_mdns${MDNSEXT}.cpp SRCS+= transport_usb.cpp TEST_SRCS+= adb_io_test.cpp TEST_SRCS+= adb_listeners_test.cpp TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= bugreport_test.cpp -TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp TEST_SRCS+= socket_spec_test.cpp TEST_SRCS+= socket_test.cpp TEST_SRCS+= sysdeps_test.cpp TEST_SRCS+= transport_test.cpp +TEST_SRCS+= types_test.cpp .PATH: ${.CURDIR}/client +SRCS+= adb_client.cpp +SRCS+= adb_install.cpp +SRCS+= auth.cpp +SRCS+= bugreport.cpp +SRCS+= commandline.cpp +SRCS+= console.cpp +SRCS+= file_sync_client.cpp +SRCS+= line_printer.cpp SRCS+= main.cpp +SRCS+= transport_mdns${MDNSEXT}.cpp SRCS+= usb_libusb.cpp +.PATH: ${.CURDIR}/fdevent +SRCS+= fdevent.cpp +SRCS+= fdevent_poll.cpp +TEST_SRCS+= fdevent_test.cpp + .PATH: ${.CURDIR}/sysdeps SRCS+= errno.cpp TEST_SRCS+= stat_test.cpp @@ -56,6 +59,7 @@ TEST_SRCS+= stat_test.cpp SRCS+= network.cpp .PATH: ${.CURDIR}/../base +SRCS+= chrono_utils.cpp SRCS+= file.cpp SRCS+= logging.cpp SRCS+= parsenetaddress.cpp @@ -71,6 +75,9 @@ TEST_SRCS+= strings_test.cpp TEST_SRCS+= test_main.cpp TEST_SRCS+= test_utils.cpp +.PATH: ${.CURDIR}/../diagnose_usb +SRCS+= diagnose_usb.cpp + .PATH: ${.CURDIR}/../libcrypto_utils SRCS+= android_pubkey.c @@ -90,29 +97,31 @@ CPPFLAGS.sockets.cpp+= -o ${.TARGET} # required by base/file.cpp .PATH: ${.CURDIR}/../liblog -SRCS+= config_read.c -SRCS+= config_write.c -SRCS+= fake_log_device.c -SRCS+= fake_writer.c -SRCS+= local_logger.c -SRCS+= logger_lock.c -SRCS+= logger_name.c -SRCS+= logger_write.c -SRCS+= logprint.c -SRCS+= stderr_write.c +SRCS+= config_read.cpp +SRCS+= config_write.cpp +SRCS+= fake_log_device.cpp +SRCS+= fake_writer.cpp +SRCS+= logger_lock.cpp +SRCS+= logger_name.cpp +SRCS+= logger_write.cpp +SRCS+= logprint.cpp +SRCS+= stderr_write.cpp -CPPFLAGS+= -DADB_VERSION="\"${VERSION}\"" +CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\"" CPPFLAGS+= -DADB_HOST=1 CPPFLAGS+= -Doff64_t=off_t +CPPFLAGS+= -Dlseek64=lseek CPPFLAGS+= -DFAKE_LOG_DEVICE=1 CPPFLAGS+= -I${.CURDIR} +CPPFLAGS+= -I${.CURDIR}/client CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../base/include +CPPFLAGS+= -I${.CURDIR}/../diagnose_usb/include CPPFLAGS+= -I${.CURDIR}/../libcrypto_utils/include CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}} CPPFLAGS+= $$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null) CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null) -CXXFLAGS+= -std=gnu++14 +CXXFLAGS+= -std=gnu++2a .ifndef COMPILE.c CFLAGS+= ${CPPFLAGS} @@ -127,8 +136,8 @@ CPPFLAGS.${f}+= ${TEST_CPPFLAGS} LDADD+= $$(${PKG_CONFIG} libcrypto --libs 2>/dev/null || echo -lcrypto) LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb) -LDADD+= -lz \-lpthread -DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ} +LDADD+= \-lpthread +DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) TEST_LDADD+= $$(${GMOCK_CONFIG} --libs --ldflags) @@ -147,5 +156,5 @@ beforeinstall: test: ${PROG}_test @for f in ${.ALLSRC}; do ./$$f; done -${PROG}_test: ${OBJS:Nmain.o:Ncommandline.o} ${TEST_OBJS} +${PROG}_test: ${OBJS:Nmain.o:Nadb_install.o:Ncommandline.o} ${TEST_OBJS} ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD} diff --git a/devel/android-tools-adb/files/patch-adb_adb.cpp b/devel/android-tools-adb/files/patch-adb_adb.cpp new file mode 100644 index 00000000000..2bea0312150 --- /dev/null +++ b/devel/android-tools-adb/files/patch-adb_adb.cpp @@ -0,0 +1,22 @@ +--- adb/adb.cpp.orig 2019-07-17 19:54:09 UTC ++++ adb/adb.cpp +@@ -44,8 +44,19 @@ + #include + #include + #include ++#ifdef PLATFORM_TOOLS_VERSION ++#include ++namespace android { namespace build { ++std::string GetBuildNumber() { ++ struct utsname uts; ++ if (uname(&uts) == -1) ++ return "unknown"; ++ return uts.sysname; ++}}} ++#else + #include + #include ++#endif + + #include "adb_auth.h" + #include "adb_io.h" diff --git a/devel/android-tools-adb/files/patch-adb_adb__io__test.cpp b/devel/android-tools-adb/files/patch-adb_adb__io__test.cpp deleted file mode 100644 index 5473120eff4..00000000000 --- a/devel/android-tools-adb/files/patch-adb_adb__io__test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/adb_io_test.cpp.orig 2015-09-05 00:01:27 UTC -+++ adb/adb_io_test.cpp -@@ -18,6 +18,7 @@ - - #include - -+#include - #include - #include - #include diff --git a/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp b/devel/android-tools-adb/files/patch-adb_client_auth.cpp similarity index 62% rename from devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp rename to devel/android-tools-adb/files/patch-adb_client_auth.cpp index 2fb3e5335c7..c6bfa634962 100644 --- a/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp +++ b/devel/android-tools-adb/files/patch-adb_client_auth.cpp @@ -1,5 +1,5 @@ ---- adb/adb_auth_host.cpp.orig 2016-06-29 23:43:15 UTC -+++ adb/adb_auth_host.cpp +--- adb/client/auth.cpp.orig 2019-07-17 19:54:09 UTC ++++ adb/client/auth.cpp @@ -34,7 +34,9 @@ #include #include @@ -10,10 +10,11 @@ #include #include #include -@@ -70,6 +72,30 @@ static std::string get_user_info() { - return " " + username + "@" + hostname; - } - +@@ -52,6 +54,30 @@ static std::mutex& g_keys_mutex = *new std::mutex; + static std::map>& g_keys = + *new std::map>; + static std::map& g_monitored_paths = *new std::map; ++ +#if !defined(OPENSSL_IS_BORINGSSL) +// https://boringssl.googlesource.com/boringssl/+/6601402%5E!/ +static int EVP_EncodedLength(size_t *out_len, size_t len) { @@ -37,7 +38,6 @@ + return 1; +} +#endif -+ - static bool write_public_keyfile(RSA* private_key, const std::string& private_key_path) { - uint8_t binary_key_data[ANDROID_PUBKEY_ENCODED_SIZE]; - if (!android_pubkey_encode(private_key, binary_key_data, sizeof(binary_key_data))) { + + static std::string get_user_info() { + std::string hostname; diff --git a/devel/android-tools-adb/files/patch-adb_client_commandline.cpp b/devel/android-tools-adb/files/patch-adb_client_commandline.cpp new file mode 100644 index 00000000000..7118af6063d --- /dev/null +++ b/devel/android-tools-adb/files/patch-adb_client_commandline.cpp @@ -0,0 +1,28 @@ +--- adb/client/commandline.cpp.orig 2019-07-17 19:54:09 UTC ++++ adb/client/commandline.cpp +@@ -1016,7 +1016,11 @@ static int ppp(int argc, const char** argv) { + + // copy args + const char** ppp_args = (const char**)alloca(sizeof(char*) * argc + 1); ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++ ppp_args[0] = "ppp"; ++#else + ppp_args[0] = "pppd"; ++#endif + for (i = 2 ; i < argc ; i++) { + //argv[2] and beyond become ppp_args[1] and beyond + ppp_args[i - 1] = argv[i]; +@@ -1028,8 +1032,13 @@ static int ppp(int argc, const char** argv) { + adb_close(STDERR_FILENO); + adb_close(fd); + ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++ execvp("ppp", (char* const*)ppp_args); ++ perror_exit("exec ppp failed"); ++#else + execvp("pppd", (char* const*)ppp_args); + perror_exit("exec pppd failed"); ++#endif + } + + // parent side diff --git a/devel/android-tools-adb/files/patch-adb_commandline.cpp b/devel/android-tools-adb/files/patch-adb_commandline.cpp deleted file mode 100644 index 20e9bea6545..00000000000 --- a/devel/android-tools-adb/files/patch-adb_commandline.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- adb/commandline.cpp.orig 2015-06-17 22:20:38 UTC -+++ adb/commandline.cpp -@@ -637,7 +637,7 @@ static int ppp(int argc, const char** ar - - // copy args - ppp_args = (const char **) alloca(sizeof(char *) * argc + 1); -- ppp_args[0] = "pppd"; -+ ppp_args[0] = "ppp"; - for (i = 2 ; i < argc ; i++) { - //argv[2] and beyond become ppp_args[1] and beyond - ppp_args[i - 1] = argv[i]; -@@ -651,10 +651,10 @@ static int ppp(int argc, const char** ar - adb_close(STDERR_FILENO); - adb_close(fd); - -- err = execvp("pppd", (char * const *)ppp_args); -+ err = execvp("ppp", (char * const *)ppp_args); - - if (err < 0) { -- perror("execing pppd"); -+ perror("execing ppp"); - } - exit(-1); - } else { diff --git a/devel/android-tools-adb/files/patch-adb_commandline.h b/devel/android-tools-adb/files/patch-adb_commandline.h deleted file mode 100644 index ac22e1d11e3..00000000000 --- a/devel/android-tools-adb/files/patch-adb_commandline.h +++ /dev/null @@ -1,11 +0,0 @@ ---- adb/commandline.h.orig 2016-09-28 18:07:09 UTC -+++ adb/commandline.h -@@ -17,6 +17,8 @@ - #ifndef COMMANDLINE_H - #define COMMANDLINE_H - -+#include // fwrite -+ - #include "adb.h" - - // Callback used to handle the standard streams (stdout and stderr) sent by the diff --git a/devel/android-tools-adb/files/patch-adb_fdevent__test.cpp b/devel/android-tools-adb/files/patch-adb_fdevent__test.cpp deleted file mode 100644 index 492e538cf86..00000000000 --- a/devel/android-tools-adb/files/patch-adb_fdevent__test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/fdevent_test.cpp.orig 2015-09-17 22:58:36 UTC -+++ adb/fdevent_test.cpp -@@ -19,6 +19,7 @@ - #include - - #include -+#include // std::unique_ptr - #include - #include - #include diff --git a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h b/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h new file mode 100644 index 00000000000..bf3766d9bf0 --- /dev/null +++ b/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h @@ -0,0 +1,10 @@ +--- adb/fdevent/fdevent.h.orig 2019-07-17 19:54:09 UTC ++++ adb/fdevent/fdevent.h +@@ -20,6 +20,7 @@ + #include + #include + ++#include // std::atomic for GCC + #include + #include + #include diff --git a/devel/android-tools-adb/files/patch-adb_sysdeps.h b/devel/android-tools-adb/files/patch-adb_sysdeps.h index 8ca18724c86..36f436629b0 100644 --- a/devel/android-tools-adb/files/patch-adb_sysdeps.h +++ b/devel/android-tools-adb/files/patch-adb_sysdeps.h @@ -1,24 +1,8 @@ ---- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC +--- adb/sysdeps.h.orig 2019-07-17 19:54:09 UTC +++ adb/sysdeps.h -@@ -61,11 +61,13 @@ - #endif - #endif +@@ -330,6 +330,11 @@ size_t ParseCompleteUTF8(const char* first, const char --#ifdef _WIN32 -- -+#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7) - // Clang-only nullability specifiers - #define _Nonnull - #define _Nullable -+#endif -+ -+#ifdef _WIN32 - - #include - #include -@@ -401,6 +401,11 @@ typedef std::unique_ptr + #include +#if defined(__Bitrig__) || defined(__DragonFly__) || \ + defined(__FreeBSD__) || defined(__OpenBSD__) @@ -28,7 +12,7 @@ #define OS_PATH_SEPARATORS "/" #define OS_PATH_SEPARATOR '/' #define OS_PATH_SEPARATOR_STR "/" -@@ -627,6 +632,12 @@ static __inline__ bool adb_thread_create +@@ -516,6 +521,12 @@ inline int adb_socket_get_local_port(borrowed_fd fd) { static __inline__ int adb_thread_setname(const std::string& name) { #ifdef __APPLE__ return pthread_setname_np(name.c_str()); @@ -39,5 +23,5 @@ +#elif defined(__NetBSD__) + return pthread_setname_np(pthread_self(), "%s", (void*)name.c_str()); #else - const char *s = name.c_str(); - + // Both bionic and glibc's pthread_setname_np fails rather than truncating long strings. + // glibc doesn't have strlcpy, so we have to fake it. diff --git a/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp b/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp deleted file mode 100644 index 5b8020400d9..00000000000 --- a/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/sysdeps_test.cpp.orig 2017-06-27 22:39:52 UTC -+++ adb/sysdeps_test.cpp -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - #include "adb_io.h" diff --git a/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp b/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp deleted file mode 100644 index a99ca23f25d..00000000000 --- a/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/sysdeps/posix/network.cpp.orig 2017-06-20 10:50:27 UTC -+++ adb/sysdeps/posix/network.cpp -@@ -17,6 +17,7 @@ - #include "sysdeps/network.h" - - #include -+#include // strerror - #include - #include - diff --git a/devel/android-tools-adb/files/patch-adb_transport__mdns__unsupported.cpp b/devel/android-tools-adb/files/patch-adb_transport__mdns__unsupported.cpp new file mode 100644 index 00000000000..4acdbe14ff5 --- /dev/null +++ b/devel/android-tools-adb/files/patch-adb_transport__mdns__unsupported.cpp @@ -0,0 +1,21 @@ +--- /dev/null 1970-01-01 00:00:00 UTC ++++ adb/transport_mdns_unsupported.cpp +@@ -0,0 +1,18 @@ ++/* ++ * Copyright (C) 2016 The Android Open Source Project ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++/* For when mDNS discovery is unsupported */ ++void init_mdns_transport_discovery(void) {} diff --git a/devel/android-tools-adb/files/patch-adb_types.h b/devel/android-tools-adb/files/patch-adb_types.h new file mode 100644 index 00000000000..a4b9794ad1d --- /dev/null +++ b/devel/android-tools-adb/files/patch-adb_types.h @@ -0,0 +1,10 @@ +--- adb/types.h.orig 2019-07-17 19:54:09 UTC ++++ adb/types.h +@@ -16,6 +16,7 @@ + + #pragma once + ++#include // memcpy for GCC + #include + #include + #include diff --git a/devel/android-tools-adb/files/patch-base_file.cpp b/devel/android-tools-adb/files/patch-base_file.cpp index ca20501150a..9129decebfb 100644 --- a/devel/android-tools-adb/files/patch-base_file.cpp +++ b/devel/android-tools-adb/files/patch-base_file.cpp @@ -1,17 +1,14 @@ ---- base/file.cpp.orig 2017-06-20 10:50:27 UTC +--- base/file.cpp.orig 2019-07-17 19:54:09 UTC +++ base/file.cpp -@@ -19,6 +19,10 @@ - #include +@@ -20,6 +20,7 @@ #include + #include #include -+#include // PATH_MAX -+#include // BUFSIZ -+#include // realpath -+#include // strerror - #include - #include - #include -@@ -36,6 +39,9 @@ ++#include // PATH_MAX for GCC + #include + #include + #include +@@ -35,6 +36,9 @@ #if defined(__APPLE__) #include #endif @@ -19,9 +16,9 @@ +#include +#endif #if defined(_WIN32) + #include #include - #define O_CLOEXEC O_NOINHERIT -@@ -251,6 +258,23 @@ std::string GetExecutablePath() { +@@ -421,6 +425,23 @@ std::string GetExecutablePath() { if (result == 0 || result == sizeof(path) - 1) return ""; path[PATH_MAX - 1] = 0; return path; diff --git a/devel/android-tools-adb/files/patch-base_include_android-base_logging.h b/devel/android-tools-adb/files/patch-base_include_android-base_logging.h index 55a6b47c630..7e536840b84 100644 --- a/devel/android-tools-adb/files/patch-base_include_android-base_logging.h +++ b/devel/android-tools-adb/files/patch-base_include_android-base_logging.h @@ -1,15 +1,6 @@ ---- base/include/android-base/logging.h.orig 2015-09-29 18:07:07 UTC +--- base/include/android-base/logging.h.orig 2019-07-17 19:54:09 UTC +++ base/include/android-base/logging.h -@@ -25,6 +25,8 @@ - #endif - #endif - -+#include -+ - #include - #include - #include -@@ -321,7 +321,7 @@ struct LogAbortAfterFullExpr { +@@ -350,7 +350,7 @@ struct LogAbortAfterFullExpr { // DCHECKs are debug variants of CHECKs only enabled in debug builds. Generally // CHECK should be used unless profiling identifies a CHECK as being in // performance critical code. @@ -18,3 +9,14 @@ static constexpr bool kEnableDChecks = false; #else static constexpr bool kEnableDChecks = true; +@@ -486,8 +486,9 @@ namespace std { // NOLINT(cert-dcl58-cpp) + #pragma clang diagnostic ignored "-Wgcc-compat" + #define OSTREAM_STRING_POINTER_USAGE_WARNING \ + __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning"))) ++OSTREAM_STRING_POINTER_USAGE_WARNING // GCC + inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) +- OSTREAM_STRING_POINTER_USAGE_WARNING { ++{ + return stream << static_cast(string_pointer); + } + #pragma clang diagnostic pop diff --git a/devel/android-tools-adb/files/patch-base_include_android-base_thread__annotations.h b/devel/android-tools-adb/files/patch-base_include_android-base_thread__annotations.h new file mode 100644 index 00000000000..f2a1f8f68ba --- /dev/null +++ b/devel/android-tools-adb/files/patch-base_include_android-base_thread__annotations.h @@ -0,0 +1,14 @@ +--- base/include/android-base/thread_annotations.h.orig 2019-07-17 19:54:09 UTC ++++ base/include/android-base/thread_annotations.h +@@ -18,7 +18,11 @@ + + #include + ++#ifdef __clang__ + #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) ++#else ++#define THREAD_ANNOTATION_ATTRIBUTE__(x) ++#endif + + #define CAPABILITY(x) \ + THREAD_ANNOTATION_ATTRIBUTE__(capability(x)) diff --git a/devel/android-tools-adb/files/patch-base_parsenetaddress.cpp b/devel/android-tools-adb/files/patch-base_parsenetaddress.cpp deleted file mode 100644 index b640a75485f..00000000000 --- a/devel/android-tools-adb/files/patch-base_parsenetaddress.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- base/parsenetaddress.cpp.orig 2016-02-20 02:39:51 UTC -+++ base/parsenetaddress.cpp -@@ -16,6 +16,7 @@ - - #include "android-base/parsenetaddress.h" - -+#include // sscanf - #include - - #include "android-base/stringprintf.h" diff --git a/devel/android-tools-adb/files/patch-base_stringprintf__test.cpp b/devel/android-tools-adb/files/patch-base_stringprintf__test.cpp deleted file mode 100644 index a367b9d5c54..00000000000 --- a/devel/android-tools-adb/files/patch-base_stringprintf__test.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- base/stringprintf_test.cpp.orig 2015-09-17 22:58:36 UTC -+++ base/stringprintf_test.cpp -@@ -18,6 +18,7 @@ - - #include - -+#include - #include - - TEST(StringPrintfTest, HexSizeT) { diff --git a/devel/android-tools-adb/files/patch-base_logging.cpp b/devel/android-tools-adb/files/patch-base_threads.cpp similarity index 53% rename from devel/android-tools-adb/files/patch-base_logging.cpp rename to devel/android-tools-adb/files/patch-base_threads.cpp index c85502208e8..df22b968c34 100644 --- a/devel/android-tools-adb/files/patch-base_logging.cpp +++ b/devel/android-tools-adb/files/patch-base_threads.cpp @@ -1,25 +1,7 @@ ---- base/logging.cpp.orig 2016-08-08 21:10:17 UTC -+++ base/logging.cpp -@@ -25,7 +25,7 @@ - #include - - // For getprogname(3) or program_invocation_short_name. --#if defined(__ANDROID__) || defined(__APPLE__) -+#if !defined(_WIN32) && !defined(__GLIBC__) - #include - #elif defined(__GLIBC__) - #include -@@ -35,6 +35,8 @@ - #include - #endif - -+#include // strrchr -+#include // fprintf - #include - #include - #include -@@ -71,6 +72,16 @@ - #include +--- base/threads.cpp.orig 2019-07-17 19:54:09 UTC ++++ base/threads.cpp +@@ -25,6 +25,16 @@ + #include #elif defined(_WIN32) #include +#elif defined(__DragonFly__) || defined(__FreeBSD__) @@ -34,8 +16,8 @@ +#include #endif - #if defined(_WIN32) -@@ -88,6 +97,16 @@ static thread_id GetThreadId() { + namespace android { +@@ -41,6 +51,16 @@ uint64_t GetThreadId() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); diff --git a/devel/android-tools-adb/files/patch-include_cutils_trace.h b/devel/android-tools-adb/files/patch-libcutils_include_cutils_trace.h similarity index 74% rename from devel/android-tools-adb/files/patch-include_cutils_trace.h rename to devel/android-tools-adb/files/patch-libcutils_include_cutils_trace.h index df785a1e3bd..147cc6815cf 100644 --- a/devel/android-tools-adb/files/patch-include_cutils_trace.h +++ b/devel/android-tools-adb/files/patch-libcutils_include_cutils_trace.h @@ -1,5 +1,5 @@ ---- include/cutils/trace.h.orig 2017-06-20 10:50:27 UTC -+++ include/cutils/trace.h +--- libcutils/include/cutils/trace.h.orig 2019-07-17 19:54:09 UTC ++++ libcutils/include/cutils/trace.h @@ -18,8 +18,14 @@ #define _LIBS_CUTILS_TRACE_H diff --git a/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp b/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp new file mode 100644 index 00000000000..e93327448dc --- /dev/null +++ b/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp @@ -0,0 +1,12 @@ +--- liblog/fake_writer.cpp.orig 2019-07-17 19:54:09 UTC ++++ liblog/fake_writer.cpp +@@ -33,8 +33,8 @@ static int logFds[(int)LOG_ID_MAX] = {-1, -1, -1, -1, + + struct android_log_transport_write fakeLoggerWrite = { + .node = {&fakeLoggerWrite.node, &fakeLoggerWrite.node}, +- .context.priv = &logFds, + .name = "fake", ++ .context = { .priv = &logFds }, // GCC + .available = NULL, + .open = fakeOpen, + .close = fakeClose, diff --git a/devel/android-tools-adb/files/patch-liblog_logger.h b/devel/android-tools-adb/files/patch-liblog_logger.h new file mode 100644 index 00000000000..77c69a4895c --- /dev/null +++ b/devel/android-tools-adb/files/patch-liblog_logger.h @@ -0,0 +1,17 @@ +--- liblog/logger.h.orig 2019-07-17 19:54:09 UTC ++++ liblog/logger.h +@@ -16,8 +16,14 @@ + + #pragma once + ++#ifdef __cplusplus ++#include ++using std::atomic_int; ++using std::atomic_uintptr_t; ++#else + #include + #include ++#endif + + #include + #include diff --git a/devel/android-tools-adb/files/patch-liblog_logger__write.c b/devel/android-tools-adb/files/patch-liblog_logger__write.cpp similarity index 61% rename from devel/android-tools-adb/files/patch-liblog_logger__write.c rename to devel/android-tools-adb/files/patch-liblog_logger__write.cpp index 481e8740729..63dffda415a 100644 --- a/devel/android-tools-adb/files/patch-liblog_logger__write.c +++ b/devel/android-tools-adb/files/patch-liblog_logger__write.cpp @@ -1,5 +1,5 @@ ---- liblog/logger_write.c.orig 2016-04-16 00:01:39 UTC -+++ liblog/logger_write.c +--- liblog/logger_write.cpp.orig 2019-07-17 19:54:09 UTC ++++ liblog/logger_write.cpp @@ -15,12 +15,12 @@ */ @@ -9,7 +9,8 @@ #include #include - #ifdef __BIONIC__ +-#ifdef __BIONIC__ ++#if defined(__ANDROID__) +#include #include #endif diff --git a/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp b/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp new file mode 100644 index 00000000000..10d1418c09b --- /dev/null +++ b/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp @@ -0,0 +1,12 @@ +--- liblog/stderr_write.cpp.orig 2019-07-17 19:54:09 UTC ++++ liblog/stderr_write.cpp +@@ -56,8 +56,8 @@ struct stderrContext { + + struct android_log_transport_write stderrLoggerWrite = { + .node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node}, +- .context.priv = NULL, + .name = "stderr", ++ .context = { .priv = NULL }, // GCC + .available = stderrAvailable, + .open = stderrOpen, + .close = stderrClose, diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile index af810971da4..19fc3921c5f 100644 --- a/devel/android-tools-fastboot/Makefile +++ b/devel/android-tools-fastboot/Makefile @@ -3,7 +3,7 @@ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- DISTVERSION?= 9.0.0_r3 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= devel sysutils MASTER_SITES= https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage DISTFILES= fastboot.1:manpage diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile index 1f2648a8315..b7586143538 100644 --- a/devel/android-tools-fastboot/files/Makefile +++ b/devel/android-tools-fastboot/files/Makefile @@ -5,7 +5,7 @@ BINDIR?=/usr/bin FILESDIR?=${DOCDIR}/${PROG} VERSION?=0.0.0-0 -FILES= *.md +FILES= README.md SRCS+= bootimg_utils.cpp SRCS+= engine.cpp diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile index 6185674af90..451c3c13a82 100644 --- a/devel/cmake-doc/Makefile +++ b/devel/cmake-doc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cmake -DISTVERSION= 3.15.2 +DISTVERSION= 3.15.3 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -doc diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index 29dcf349cff..85231c35f61 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cmake -DISTVERSION= 3.15.2 +DISTVERSION= 3.15.3 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -gui diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile index df5d358a54d..dfb3f280ed7 100644 --- a/devel/ipython/Makefile +++ b/devel/ipython/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ipython -PORTVERSION= 7.7.0 +PORTVERSION= 7.8.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo index 4733663b342..91e82fcce26 100644 --- a/devel/ipython/distinfo +++ b/devel/ipython/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564577892 -SHA256 (ipython-7.7.0.tar.gz) = 1d3a1692921e932751bc1a1f7bb96dc38671eeefdc66ed33ee4cbc57e92a410e -SIZE (ipython-7.7.0.tar.gz) = 5157086 +TIMESTAMP = 1567842520 +SHA256 (ipython-7.8.0.tar.gz) = dd76831f065f17bddd7eaa5c781f5ea32de5ef217592cf019e34043b56895aa1 +SIZE (ipython-7.8.0.tar.gz) = 5198219 diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile index 1b64aae038d..9844918130a 100644 --- a/devel/libclc/Makefile +++ b/devel/libclc/Makefile @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= libclc -DISTVERSION= 0.3.0.20180518 -PORTREVISION= 3 +DISTVERSION= 0.4.0.20190527 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org COMMENT= Required library functions for OpenCL C programming language -LICENSE= BSD3CLAUSE MIT -LICENSE_COMB= dual +LICENSE= LLVM +LICENSE_NAME= LLVM Release License LICENSE_FILE= ${WRKSRC}/LICENSE.TXT +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= llvm${LLVM_DEFAULT}>=4.0:devel/llvm${LLVM_DEFAULT} \ libedit>=0:devel/libedit USE_GITHUB= yes GH_ACCOUNT= llvm-mirror -GH_TAGNAME= a2118d5 +GH_TAGNAME= 9f6204e # ninja based build is broken since commit 598792bc (16 sep 2016) USES= gmake python:2.7,build gmake diff --git a/devel/libclc/distinfo b/devel/libclc/distinfo index dc2b4edab8e..7a4dad2a1c9 100644 --- a/devel/libclc/distinfo +++ b/devel/libclc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527376171 -SHA256 (llvm-mirror-libclc-0.3.0.20180518-a2118d5_GH0.tar.gz) = 0796b912f3133ae85b731ff37fd2b040cc7acc455a6cc8f1bc12a3433afde0cc -SIZE (llvm-mirror-libclc-0.3.0.20180518-a2118d5_GH0.tar.gz) = 168255 +TIMESTAMP = 1562723277 +SHA256 (llvm-mirror-libclc-0.4.0.20190527-9f6204e_GH0.tar.gz) = 8004c3a075d715cff6780c8ffe04c9f798dadf48bd375bdd6d98adabed04cd55 +SIZE (llvm-mirror-libclc-0.4.0.20190527-9f6204e_GH0.tar.gz) = 176995 diff --git a/devel/libclc/files/patch-62a9191.c b/devel/libclc/files/patch-62a9191.c deleted file mode 100644 index 5dd301c5903..00000000000 --- a/devel/libclc/files/patch-62a9191.c +++ /dev/null @@ -1,73 +0,0 @@ -From 62a9191b606abdab8e2607d945628fa90d9664c1 Mon Sep 17 00:00:00 2001 -From: Jan Vesely -Date: Fri, 3 Aug 2018 15:14:08 +0000 -Subject: [PATCH] amdgcn: Use __constant AS for amdgcn builtins. - -Fixes build after clang r338707. -Reviewer: Matthew.Arsenault@amd.com -Signed-off-by: Jan Vesely - -git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@338898 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - amdgcn-amdhsa/lib/workitem/get_global_size.cl | 4 +++- - amdgcn-amdhsa/lib/workitem/get_local_size.cl | 4 +++- - amdgcn/lib/workitem/get_global_offset.cl | 4 +++- - amdgcn/lib/workitem/get_work_dim.cl | 4 +++- - 4 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/amdgcn-amdhsa/lib/workitem/get_global_size.cl b/amdgcn-amdhsa/lib/workitem/get_global_size.cl -index 2289615..392cd08 100644 ---- amdgcn-amdhsa/lib/workitem/get_global_size.cl -+++ amdgcn-amdhsa/lib/workitem/get_global_size.cl -@@ -1,6 +1,8 @@ - #include - --#if __clang_major__ >= 7 -+#if __clang_major__ >= 8 -+#define CONST_AS __constant -+#elif __clang_major__ >= 7 - #define CONST_AS __attribute__((address_space(4))) - #else - #define CONST_AS __attribute__((address_space(2))) -diff --git a/amdgcn-amdhsa/lib/workitem/get_local_size.cl b/amdgcn-amdhsa/lib/workitem/get_local_size.cl -index 034c6d9..64d1cf4 100644 ---- amdgcn-amdhsa/lib/workitem/get_local_size.cl -+++ amdgcn-amdhsa/lib/workitem/get_local_size.cl -@@ -1,6 +1,8 @@ - #include - --#if __clang_major__ >= 7 -+#if __clang_major__ >= 8 -+#define CONST_AS __constant -+#elif __clang_major__ >= 7 - #define CONST_AS __attribute__((address_space(4))) - #else - #define CONST_AS __attribute__((address_space(2))) -diff --git a/amdgcn/lib/workitem/get_global_offset.cl b/amdgcn/lib/workitem/get_global_offset.cl -index 0c2b948..0a87cd2 100644 ---- amdgcn/lib/workitem/get_global_offset.cl -+++ amdgcn/lib/workitem/get_global_offset.cl -@@ -1,6 +1,8 @@ - #include - --#if __clang_major__ >= 7 -+#if __clang_major__ >= 8 -+#define CONST_AS __constant -+#elif __clang_major__ >= 7 - #define CONST_AS __attribute__((address_space(4))) - #else - #define CONST_AS __attribute__((address_space(2))) -diff --git a/amdgcn/lib/workitem/get_work_dim.cl b/amdgcn/lib/workitem/get_work_dim.cl -index 8eb81ba..3add9b6 100644 ---- amdgcn/lib/workitem/get_work_dim.cl -+++ amdgcn/lib/workitem/get_work_dim.cl -@@ -1,6 +1,8 @@ - #include - --#if __clang_major__ >= 7 -+#if __clang_major__ >= 8 -+#define CONST_AS __constant -+#elif __clang_major__ >= 7 - #define CONST_AS __attribute__((address_space(4))) - #else - #define CONST_AS __attribute__((address_space(2))) diff --git a/devel/libclc/pkg-plist b/devel/libclc/pkg-plist index d85c14c6fa6..8804a406c80 100644 --- a/devel/libclc/pkg-plist +++ b/devel/libclc/pkg-plist @@ -7,6 +7,8 @@ include/clc/async/gentype.inc include/clc/async/prefetch.h include/clc/async/prefetch.inc include/clc/async/wait_group_events.h +include/clc/atom_decl_int32.inc +include/clc/atom_decl_int64.inc include/clc/atomic/atomic_add.h include/clc/atomic/atomic_and.h include/clc/atomic/atomic_cmpxchg.h @@ -127,18 +129,14 @@ include/clc/math/asinh.h include/clc/math/asinpi.h include/clc/math/atan.h include/clc/math/atan2.h -include/clc/math/atan2.inc include/clc/math/atan2pi.h -include/clc/math/atan2pi.inc include/clc/math/atanh.h include/clc/math/atanpi.h include/clc/math/binary_decl.inc include/clc/math/binary_decl_tt.inc -include/clc/math/binary_intrin.inc include/clc/math/cbrt.h include/clc/math/ceil.h include/clc/math/copysign.h -include/clc/math/copysign.inc include/clc/math/cos.h include/clc/math/cosh.h include/clc/math/cospi.h @@ -150,7 +148,6 @@ include/clc/math/exp2.h include/clc/math/expm1.h include/clc/math/fabs.h include/clc/math/fdim.h -include/clc/math/fdim.inc include/clc/math/floor.h include/clc/math/fma.h include/clc/math/fmax.h @@ -176,7 +173,6 @@ include/clc/math/half_sin.h include/clc/math/half_sqrt.h include/clc/math/half_tan.h include/clc/math/hypot.h -include/clc/math/hypot.inc include/clc/math/ilogb.h include/clc/math/ilogb.inc include/clc/math/ldexp.h @@ -190,7 +186,6 @@ include/clc/math/log1p.h include/clc/math/log2.h include/clc/math/logb.h include/clc/math/mad.h -include/clc/math/mad.inc include/clc/math/maxmag.h include/clc/math/minmag.h include/clc/math/modf.h @@ -212,7 +207,6 @@ include/clc/math/native_sin.h include/clc/math/native_sqrt.h include/clc/math/native_tan.h include/clc/math/nextafter.h -include/clc/math/nextafter.inc include/clc/math/pow.h include/clc/math/pown.h include/clc/math/pown.inc @@ -234,11 +228,10 @@ include/clc/math/sqrt.h include/clc/math/tan.h include/clc/math/tanh.h include/clc/math/tanpi.h -include/clc/math/ternary_intrin.inc +include/clc/math/ternary_decl.inc include/clc/math/tgamma.h include/clc/math/trunc.h include/clc/math/unary_decl.inc -include/clc/math/unary_intrin.inc include/clc/misc/shuffle.h include/clc/misc/shuffle2.h include/clc/relational/all.h @@ -301,6 +294,15 @@ lib/clc/fiji-amdgcn-mesa-mesa3d.bc lib/clc/gfx900-amdgcn--.bc lib/clc/gfx900-amdgcn--amdhsa.bc lib/clc/gfx900-amdgcn-mesa-mesa3d.bc +lib/clc/gfx902-amdgcn--.bc +lib/clc/gfx902-amdgcn--amdhsa.bc +lib/clc/gfx902-amdgcn-mesa-mesa3d.bc +lib/clc/gfx904-amdgcn--.bc +lib/clc/gfx904-amdgcn--amdhsa.bc +lib/clc/gfx904-amdgcn-mesa-mesa3d.bc +lib/clc/gfx906-amdgcn--.bc +lib/clc/gfx906-amdgcn--amdhsa.bc +lib/clc/gfx906-amdgcn-mesa-mesa3d.bc lib/clc/hainan-amdgcn--.bc lib/clc/hainan-amdgcn-mesa-mesa3d.bc lib/clc/hawaii-amdgcn--.bc diff --git a/devel/libversion/Makefile b/devel/libversion/Makefile index 900560dcd83..da27806cf7b 100644 --- a/devel/libversion/Makefile +++ b/devel/libversion/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libversion -PORTVERSION= 2.9.0 +PORTVERSION= 2.9.1 CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org diff --git a/devel/libversion/distinfo b/devel/libversion/distinfo index d389b4a4ee1..a6e07b83e4a 100644 --- a/devel/libversion/distinfo +++ b/devel/libversion/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550082881 -SHA256 (repology-libversion-2.9.0_GH0.tar.gz) = ab95e62759a53c2ea2428b39d2e864589f64137c1150f56d166a4754b34736ea -SIZE (repology-libversion-2.9.0_GH0.tar.gz) = 22085 +TIMESTAMP = 1567789118 +SHA256 (repology-libversion-2.9.1_GH0.tar.gz) = 2fb3b81069acbb58253c6db115e1c93349a2e7012e8ad9d46f3f0f97de1178f8 +SIZE (repology-libversion-2.9.1_GH0.tar.gz) = 22109 diff --git a/devel/linux-c7-devtools/Makefile b/devel/linux-c7-devtools/Makefile index f1eef05413e..0651f1fecf6 100644 --- a/devel/linux-c7-devtools/Makefile +++ b/devel/linux-c7-devtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= devtools PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= emulation@FreeBSD.org @@ -22,10 +22,11 @@ BIN_DISTNAMES= binutils-2.27-34.base.el7 \ cpp-4.8.5-36.el7_6.2 \ gcc-4.8.5-36.el7_6.2 \ gcc-c++-4.8.5-36.el7_6.2 \ - gcc-gfortran-4.8.5-36.el7_6.2 + gcc-gfortran-4.8.5-36.el7_6.2 \ + libstdc++-devel-4.8.5-36.el7_6.2 LIB_DISTNAMES= binutils-devel-2.27-34.base.el7 \ glibc-devel-2.17-260.el7_6.6 \ - libstdc++-devel-4.8.5-36.el7_6.2 \ + glibc-static-2.17-260.el7_6.6 \ libgomp-4.8.5-36.el7_6.2 \ libmpc-1.0.1-3.el7 DISTFILES_amd64=${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \ diff --git a/devel/linux-c7-devtools/distinfo b/devel/linux-c7-devtools/distinfo index 785ddbe5a58..4e3e1a0f901 100644 --- a/devel/linux-c7-devtools/distinfo +++ b/devel/linux-c7-devtools/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1564859591 +TIMESTAMP = 1567936796 SHA256 (centos/binutils-2.27-34.base.el7.i686.rpm) = 40f02c8e10d58e86e0d37ae4d3813ff1a2ece9d340f15371465758c0791e2c42 SIZE (centos/binutils-2.27-34.base.el7.i686.rpm) = 6343144 SHA256 (centos/binutils-2.27-34.base.el7.x86_64.rpm) = 45995236bc07a51d506c036a557540e9407024758027eb58635390e408823392 @@ -31,6 +31,10 @@ SHA256 (centos/glibc-headers-2.17-260.el7_6.6.i686.rpm) = ca43e46741f414d2848982 SIZE (centos/glibc-headers-2.17-260.el7_6.6.i686.rpm) = 699932 SHA256 (centos/glibc-headers-2.17-260.el7_6.6.x86_64.rpm) = 67de580f4cabd7625a050f101eb42ac93de27582d04ef939ab252059d11abedb SIZE (centos/glibc-headers-2.17-260.el7_6.6.x86_64.rpm) = 700036 +SHA256 (centos/glibc-static-2.17-260.el7_6.6.i686.rpm) = b67f91ceae9cbaedd450e9aa7fc79037fcaa95b40b758a73dc60a6d05c6ce40d +SIZE (centos/glibc-static-2.17-260.el7_6.6.i686.rpm) = 1326892 +SHA256 (centos/glibc-static-2.17-260.el7_6.6.x86_64.rpm) = 69def216085fcc622f3795a68e25a43fed92be2b5e75a8d8c1e5eefc30846414 +SIZE (centos/glibc-static-2.17-260.el7_6.6.x86_64.rpm) = 1623928 SHA256 (centos/kernel-headers-3.10.0-957.21.3.el7.centos.plus.i686.rpm) = 776f25e647161f6dcd4175742eb312427128d456a7cea147d58a0435f4ae8078 SIZE (centos/kernel-headers-3.10.0-957.21.3.el7.centos.plus.i686.rpm) = 8393612 SHA256 (centos/kernel-headers-3.10.0-957.27.2.el7.x86_64.rpm) = dcba6cda3e82004a9b75cc1a029bb5a822baaaefe17155579289b644f7c5a575 diff --git a/devel/linux-c7-devtools/pkg-plist.amd64 b/devel/linux-c7-devtools/pkg-plist.amd64 index 4d530adf945..ea427f7ae9d 100644 --- a/devel/linux-c7-devtools/pkg-plist.amd64 +++ b/devel/linux-c7-devtools/pkg-plist.amd64 @@ -734,29 +734,6 @@ usr/include/c++/4.8.2/forward_list usr/include/c++/4.8.2/fstream usr/include/c++/4.8.2/functional usr/include/c++/4.8.2/future -usr/include/c++/4.8.2/i686-redhat-linux/bits/atomic_word.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/basic_file.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++allocator.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++config.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++io.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++locale.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/cpu_defines.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/ctype_base.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/ctype_inline.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/cxxabi_tweaks.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/error_constants.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/extc++.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-default.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-posix.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-single.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/messages_members.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/opt_random.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/os_defines.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/stdc++.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/stdtr1c++.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/time_members.h -usr/include/c++/4.8.2/i686-redhat-linux/ext/opt_random.h usr/include/c++/4.8.2/initializer_list usr/include/c++/4.8.2/iomanip usr/include/c++/4.8.2/ios @@ -1955,8 +1932,6 @@ usr/lib/cpp usr/lib/crt1.o usr/lib/crti.o usr/lib/crtn.o -usr/lib/gcc/i686-redhat-linux/4.8.2/libstdc++.so -usr/lib/gcc/i686-redhat-linux/4.8.5 usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbegin.o usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbeginS.o usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbeginT.o @@ -2079,26 +2054,34 @@ usr/lib/gcc/x86_64-redhat-linux/4.8.2/libtsan.so usr/lib/gcc/x86_64-redhat-linux/4.8.2/rpmver usr/lib/gcc/x86_64-redhat-linux/4.8.5 usr/lib/gcrt1.o +usr/lib/libBrokenLocale.a usr/lib/libBrokenLocale.so +usr/lib/libanl.a usr/lib/libanl.so usr/lib/libbfd.a usr/lib/libbfd.so usr/lib/libbsd-compat.a usr/lib/libbsd.a +usr/lib/libc.a usr/lib/libc.so usr/lib/libc_nonshared.a +usr/lib/libc_stubs.a usr/lib/libcidn.so +usr/lib/libcrypt.a usr/lib/libcrypt.so +usr/lib/libdl.a usr/lib/libdl.so usr/lib/libg.a usr/lib/libgomp.so.1 usr/lib/libgomp.so.1.0.0 usr/lib/libiberty.a usr/lib/libieee.a +usr/lib/libm.a usr/lib/libm.so usr/lib/libmcheck.a usr/lib/libmpc.so.3 usr/lib/libmpc.so.3.0.0 +usr/lib/libnsl.a usr/lib/libnsl.so usr/lib/libnss_compat.so usr/lib/libnss_db.so @@ -2109,12 +2092,16 @@ usr/lib/libnss_nis.so usr/lib/libnss_nisplus.so usr/lib/libopcodes.a usr/lib/libopcodes.so +usr/lib/libpthread.a usr/lib/libpthread.so usr/lib/libpthread_nonshared.a +usr/lib/libresolv.a usr/lib/libresolv.so usr/lib/librpcsvc.a +usr/lib/librt.a usr/lib/librt.so usr/lib/libthread_db.so +usr/lib/libutil.a usr/lib/libutil.so usr/lib64/Mcrt1.o usr/lib64/Scrt1.o @@ -2122,29 +2109,37 @@ usr/lib64/crt1.o usr/lib64/crti.o usr/lib64/crtn.o usr/lib64/gcrt1.o +usr/lib64/libBrokenLocale.a usr/lib64/libBrokenLocale.so +usr/lib64/libanl.a usr/lib64/libanl.so usr/lib64/libbfd-2.27-34.base.el7.so usr/lib64/libbfd.a usr/lib64/libbfd.so usr/lib64/libbsd-compat.a usr/lib64/libbsd.a +usr/lib64/libc.a usr/lib64/libc.so usr/lib64/libc_nonshared.a +usr/lib64/libc_stubs.a usr/lib64/libcidn.so +usr/lib64/libcrypt.a usr/lib64/libcrypt.so +usr/lib64/libdl.a usr/lib64/libdl.so usr/lib64/libg.a usr/lib64/libgomp.so.1 usr/lib64/libgomp.so.1.0.0 usr/lib64/libiberty.a usr/lib64/libieee.a +usr/lib64/libm.a usr/lib64/libm.so usr/lib64/libmcheck.a usr/lib64/libmpc.so.3 usr/lib64/libmpc.so.3.0.0 usr/lib64/libmpfr.so.4 usr/lib64/libmpfr.so.4.1.1 +usr/lib64/libnsl.a usr/lib64/libnsl.so usr/lib64/libnss_compat.so usr/lib64/libnss_db.so @@ -2156,12 +2151,16 @@ usr/lib64/libnss_nisplus.so usr/lib64/libopcodes-2.27-34.base.el7.so usr/lib64/libopcodes.a usr/lib64/libopcodes.so +usr/lib64/libpthread.a usr/lib64/libpthread.so usr/lib64/libpthread_nonshared.a +usr/lib64/libresolv.a usr/lib64/libresolv.so usr/lib64/librpcsvc.a +usr/lib64/librt.a usr/lib64/librt.so usr/lib64/libthread_db.so +usr/lib64/libutil.a usr/lib64/libutil.so usr/libexec/gcc/x86_64-redhat-linux/4.8.2/cc1 usr/libexec/gcc/x86_64-redhat-linux/4.8.2/cc1plus diff --git a/devel/linux-c7-devtools/pkg-plist.i386 b/devel/linux-c7-devtools/pkg-plist.i386 index 05dc68f6d93..50c2b215597 100644 --- a/devel/linux-c7-devtools/pkg-plist.i386 +++ b/devel/linux-c7-devtools/pkg-plist.i386 @@ -1672,8 +1672,8 @@ usr/include/pty.h usr/include/pwd.h usr/include/rdma/cxgb3-abi.h usr/include/rdma/cxgb4-abi.h -usr/include/rdma/hfi/hfi1_user.h usr/include/rdma/hfi/hfi1_ioctl.h +usr/include/rdma/hfi/hfi1_user.h usr/include/rdma/ib_user_cm.h usr/include/rdma/ib_user_mad.h usr/include/rdma/ib_user_sa.h @@ -1994,29 +1994,37 @@ usr/lib/gcc/i686-redhat-linux/4.8.2/libstdc++.so usr/lib/gcc/i686-redhat-linux/4.8.2/rpmver usr/lib/gcc/i686-redhat-linux/4.8.5 usr/lib/gcrt1.o +usr/lib/libBrokenLocale.a usr/lib/libBrokenLocale.so +usr/lib/libanl.a usr/lib/libanl.so usr/lib/libbfd-2.27-34.base.el7.so usr/lib/libbfd.a usr/lib/libbfd.so usr/lib/libbsd-compat.a usr/lib/libbsd.a +usr/lib/libc.a usr/lib/libc.so usr/lib/libc_nonshared.a +usr/lib/libc_stubs.a usr/lib/libcidn.so +usr/lib/libcrypt.a usr/lib/libcrypt.so +usr/lib/libdl.a usr/lib/libdl.so usr/lib/libg.a usr/lib/libgomp.so.1 usr/lib/libgomp.so.1.0.0 usr/lib/libiberty.a usr/lib/libieee.a +usr/lib/libm.a usr/lib/libm.so usr/lib/libmcheck.a usr/lib/libmpc.so.3 usr/lib/libmpc.so.3.0.0 usr/lib/libmpfr.so.4 usr/lib/libmpfr.so.4.1.1 +usr/lib/libnsl.a usr/lib/libnsl.so usr/lib/libnss_compat.so usr/lib/libnss_db.so @@ -2028,12 +2036,16 @@ usr/lib/libnss_nisplus.so usr/lib/libopcodes-2.27-34.base.el7.so usr/lib/libopcodes.a usr/lib/libopcodes.so +usr/lib/libpthread.a usr/lib/libpthread.so usr/lib/libpthread_nonshared.a +usr/lib/libresolv.a usr/lib/libresolv.so usr/lib/librpcsvc.a +usr/lib/librt.a usr/lib/librt.so usr/lib/libthread_db.so +usr/lib/libutil.a usr/lib/libutil.so usr/libexec/gcc/i686-redhat-linux/4.8.2/cc1 usr/libexec/gcc/i686-redhat-linux/4.8.2/cc1plus diff --git a/devel/linux-c7-make/Makefile b/devel/linux-c7-make/Makefile new file mode 100644 index 00000000000..445ae80bc34 --- /dev/null +++ b/devel/linux-c7-make/Makefile @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PORTNAME= make +PORTVERSION= 3.82 +DISTVERSIONSUFFIX= -23.el7 +CATEGORIES= devel + +MAINTAINER= emulation@FreeBSD.org +COMMENT= GNU make utility (Linux CentOS ${LINUX_DIST_VER}) + +USES= linux:c7 +USE_LINUX_RPM= nolib + +DESCR= ${.CURDIR}/../gmake/pkg-descr + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + +.include diff --git a/devel/linux-c7-make/distinfo b/devel/linux-c7-make/distinfo new file mode 100644 index 00000000000..dc889245ef7 --- /dev/null +++ b/devel/linux-c7-make/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1567881407 +SHA256 (centos/make-3.82-23.el7.i686.rpm) = 6417801fa80cb5b7c362eb0b74f938b8256a1dc4d248f44faa8c9c24fc831f34 +SIZE (centos/make-3.82-23.el7.i686.rpm) = 427472 +SHA256 (centos/make-3.82-23.el7.x86_64.rpm) = e02baba191334ec15234324f32b36f2384ec50135982811880e075b8e9281459 +SIZE (centos/make-3.82-23.el7.x86_64.rpm) = 430540 +SHA256 (centos/make-3.82-23.el7.src.rpm) = 284a9239fe74d9db5ce074e5f0c36658398c68b7ef20e9ea590017051121199b +SIZE (centos/make-3.82-23.el7.src.rpm) = 1282509 diff --git a/devel/linux-c7-make/pkg-plist.amd64 b/devel/linux-c7-make/pkg-plist.amd64 new file mode 100644 index 00000000000..38bc39b0e96 --- /dev/null +++ b/devel/linux-c7-make/pkg-plist.amd64 @@ -0,0 +1,35 @@ +usr/bin/gmake +usr/bin/make +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +usr/share/info/make.info-1.gz +usr/share/info/make.info-2.gz +usr/share/info/make.info.gz +%%NLS%%usr/share/locale/be/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/da/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/de/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/es/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/fi/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/fr/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ga/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/gl/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/he/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/hr/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/id/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/it/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ja/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ko/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/lt/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/nl/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/pl/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ru/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/sv/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/tr/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/uk/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/vi/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/make.mo +usr/share/man/man1/gmake.1.gz +usr/share/man/man1/make.1.gz diff --git a/devel/linux-c7-make/pkg-plist.i386 b/devel/linux-c7-make/pkg-plist.i386 new file mode 100644 index 00000000000..38bc39b0e96 --- /dev/null +++ b/devel/linux-c7-make/pkg-plist.i386 @@ -0,0 +1,35 @@ +usr/bin/gmake +usr/bin/make +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +usr/share/info/make.info-1.gz +usr/share/info/make.info-2.gz +usr/share/info/make.info.gz +%%NLS%%usr/share/locale/be/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/da/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/de/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/es/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/fi/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/fr/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ga/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/gl/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/he/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/hr/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/id/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/it/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ja/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ko/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/lt/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/nl/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/pl/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/ru/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/sv/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/tr/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/uk/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/vi/LC_MESSAGES/make.mo +%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/make.mo +usr/share/man/man1/gmake.1.gz +usr/share/man/man1/make.1.gz diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile index 590cb21d123..d768f73da22 100644 --- a/devel/llvm80/Makefile +++ b/devel/llvm80/Makefile @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 8.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -55,19 +55,20 @@ CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB +OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLDB PYCLANG OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP -OPTIONS_DEFAULT= BE_STANDARD CLANG EXTRAS LIT LLD LLDB +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes +BE_AMDGPU_DESC= AMD GPU backend (required by mesa) BE_FREEBSD_DESC= Backends for FreeBSD architectures BE_FREEBSD_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}" -BE_NATIVE_DESC= Backend(s) for this architecture (${NATIVE_BACKENDS}) +BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD @@ -86,6 +87,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} +DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ @@ -114,6 +116,10 @@ LLDB_VARS= _USES_PYTHON=python:3.6+ OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp +PYCLANG_DESC= Install python bindings to libclang +PYCLANG_IMPLIES= CLANG +PYCLANG_VARS= _USES_PYTHON=python:3.6+ +PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo @@ -226,26 +232,36 @@ MAN1SRCS+= bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \ llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \ opt.1 tblgen.1 +.if ${PORT_OPTIONS:MPYCLANG} +PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py$) +.endif + .include .include "${.CURDIR}/Makefile.COMMANDS" -FREEBSD_BACKENDS= AArch64 ARM Mips PowerPC Sparc X86 +_FREEBSD_BACKENDS= AArch64 ARM Mips PowerPC Sparc X86 +FREEBSD_BACKENDS= ${_FREEBSD_BACKENDS} .if ${ARCH} == amd64 -NATIVE_BACKENDS= X86 +_NATIVE_BACKENDS= X86 .elif ${ARCH} == arm64 -NATIVE_BACKENDS= AAarch64 +_NATIVE_BACKENDS= AAarch64 .elif ${ARCH:Marmv*} -NATIVE_BACKENDS= ARM +_NATIVE_BACKENDS= ARM .elif ${ARCH} == i386 -NATIVE_BACKENDS= X86 +_NATIVE_BACKENDS= X86 .elif ${ARCH:Mmips*} -NATIVE_BACKENDS= Mips +_NATIVE_BACKENDS= Mips .elif ${ARCH:Mpowerpc*} -NATIVE_BACKENDS= PowerPC +_NATIVE_BACKENDS= PowerPC .elif ${ARCH:Mriscv*} BROKEN_riscv= No non-experimental native backend .endif -STANDARD_BACKENDS= ${FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \ +NATIVE_BACKENDS= ${_NATIVE_BACKENDS} +.if ${PORT_OPTIONS:MBE_AMDGPU} +FREEBSD_BACKENDS+= AMDGPU +NATIVE_BACKENDS+= AMDGPU +.endif +STANDARD_BACKENDS= ${_FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \ NVPTX SystemZ WebAssembly XCore _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser AsmPrinter Disassembler Utils @@ -529,7 +545,7 @@ build-plist: -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \ | ${SORT} >> ${PLIST}.tmp ${AWK} '{ \ - if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|ompt.h|${EXTRAS_PATTERN}|libclang_rt)/) {printf "%%%%CLANG%%%%"} \ + if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|ompt.h|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ @@ -537,6 +553,7 @@ build-plist: if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \ if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \ + if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \ if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST} ${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} diff --git a/devel/llvm80/pkg-plist b/devel/llvm80/pkg-plist index 01605b02ed8..f85bf764fe3 100644 --- a/devel/llvm80/pkg-plist +++ b/devel/llvm80/pkg-plist @@ -89,6 +89,9 @@ bin/sancov%%LLVM_SUFFIX%% %%LIT%%llvm%%LLVM_SUFFIX%%/bin/lit %%LIT%%bin/llvm-lit%%LLVM_SUFFIX%% %%LIT%%llvm%%LLVM_SUFFIX%%/bin/llvm-lit +%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/__init__.py +%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/cindex.py +%%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/enumerations.py %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/__init__.py %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/_lldb.so %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index dfde5cd16ab..eb352d6b55e 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mercurial -PORTVERSION= 5.1 +PORTVERSION= 5.1.1 CATEGORIES= devel python MASTER_SITES= https://www.mercurial-scm.org/release/ diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index 2c02c979be6..f865961c1a1 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564837287 -SHA256 (mercurial-5.1.tar.gz) = 6222d92d860e411e422b7dc58062132bc512fa52ec48a71143b40cab4be7c829 -SIZE (mercurial-5.1.tar.gz) = 7283396 +TIMESTAMP = 1567842522 +SHA256 (mercurial-5.1.1.tar.gz) = 35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f +SIZE (mercurial-5.1.1.tar.gz) = 7285831 diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile index 9ee398083d2..8025a8c163a 100644 --- a/devel/oclgrind/Makefile +++ b/devel/oclgrind/Makefile @@ -2,8 +2,9 @@ # $FreeBSD$ PORTNAME= oclgrind -PORTVERSION= 20190807 +PORTVERSION= 20190907 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jmd@FreeBSD.org @@ -17,13 +18,17 @@ BUILD_DEPENDS= opencl>=0:devel/opencl \ LIB_DEPENDS= libOpenCL.so:devel/ocl-icd RUN_DEPENDS= opencl>=0:devel/opencl -USES= cmake compiler:c++11-lang +USES= cmake USE_GITHUB= yes GH_ACCOUNT= jrprice GH_PROJECT= Oclgrind -GH_TAGNAME= cd8cad1 +GH_TAGNAME= e7c87b0 USE_LDCONFIG= yes -CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/share/llvm/cmake +CC= clang${LLVM_DEFAULT} +CXX= clang++${LLVM_DEFAULT} +CPP= clang-cpp${LLVM_DEFAULT} + +CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm .include diff --git a/devel/oclgrind/distinfo b/devel/oclgrind/distinfo index 927e39a5f2b..dabe435280d 100644 --- a/devel/oclgrind/distinfo +++ b/devel/oclgrind/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565212188 -SHA256 (jrprice-Oclgrind-v20190807-cd8cad1_GH0.tar.gz) = afc653cba9ca0e936d0b24303b703c63efa689356e5189738e05cba9ed8a0db6 -SIZE (jrprice-Oclgrind-v20190807-cd8cad1_GH0.tar.gz) = 196613 +TIMESTAMP = 1567897486 +SHA256 (jrprice-Oclgrind-v20190907-e7c87b0_GH0.tar.gz) = d9900578c320c430f2970423c6d2288f18f187a67d508c5b93295f1b422bc52c +SIZE (jrprice-Oclgrind-v20190907-e7c87b0_GH0.tar.gz) = 196630 diff --git a/devel/p5-CPS/Makefile b/devel/p5-CPS/Makefile index b69faacdb5a..3af2895c891 100644 --- a/devel/p5-CPS/Makefile +++ b/devel/p5-CPS/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= CPS -PORTVERSION= 0.18 -PORTREVISION= 1 +PORTVERSION= 0.19 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:PEVANS diff --git a/devel/p5-CPS/distinfo b/devel/p5-CPS/distinfo index 07bd53e8dfb..ed6053fed0c 100644 --- a/devel/p5-CPS/distinfo +++ b/devel/p5-CPS/distinfo @@ -1,2 +1,3 @@ -SHA256 (CPS-0.18.tar.gz) = 2cd41f7d4dc091015fc7a4a4d3a6b58e2670d36c7ac47c6dec0538c7e732bfe6 -SIZE (CPS-0.18.tar.gz) = 34245 +TIMESTAMP = 1567769877 +SHA256 (CPS-0.19.tar.gz) = b52fccf7a40607d0cfdfbc5de75973febb06ea65eef5380b391c87a5a472675b +SIZE (CPS-0.19.tar.gz) = 31621 diff --git a/devel/p5-CPS/pkg-plist b/devel/p5-CPS/pkg-plist index d6db0f4e015..a4280dcca67 100644 --- a/devel/p5-CPS/pkg-plist +++ b/devel/p5-CPS/pkg-plist @@ -1,12 +1,10 @@ %%SITE_PERL%%/CPS.pm %%SITE_PERL%%/CPS/Functional.pm -%%SITE_PERL%%/CPS/Future.pm %%SITE_PERL%%/CPS/Governor.pm %%SITE_PERL%%/CPS/Governor/Deferred.pm %%SITE_PERL%%/CPS/Governor/Simple.pm %%PERL5_MAN3%%/CPS.3.gz %%PERL5_MAN3%%/CPS::Functional.3.gz -%%PERL5_MAN3%%/CPS::Future.3.gz %%PERL5_MAN3%%/CPS::Governor.3.gz %%PERL5_MAN3%%/CPS::Governor::Deferred.3.gz %%PERL5_MAN3%%/CPS::Governor::Simple.3.gz diff --git a/devel/p5-Geo-ShapeFile/Makefile b/devel/p5-Geo-ShapeFile/Makefile index b20d5a565a6..ed20fd9118c 100644 --- a/devel/p5-Geo-ShapeFile/Makefile +++ b/devel/p5-Geo-ShapeFile/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Geo-ShapeFile -PORTVERSION= 2.66 +PORTVERSION= 3.00 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,6 +16,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Tree-R>0:devel/p5-Tree-R \ p5-autovivification>0:devel/p5-autovivification +TEST_DEPENDS= p5-Test-Exception>0:devel/p5-Test-Exception NO_ARCH= yes USES= dos2unix perl5 diff --git a/devel/p5-Geo-ShapeFile/distinfo b/devel/p5-Geo-ShapeFile/distinfo index 217f8c2c40b..95562005db4 100644 --- a/devel/p5-Geo-ShapeFile/distinfo +++ b/devel/p5-Geo-ShapeFile/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551966275 -SHA256 (Geo-ShapeFile-2.66.tar.gz) = c0470986bb9f805b079ca1a53916bf6abb568ac7056806483306b92abad610da -SIZE (Geo-ShapeFile-2.66.tar.gz) = 333574 +TIMESTAMP = 1567771012 +SHA256 (Geo-ShapeFile-3.00.tar.gz) = f9657c82d170df0d9564484c1335cdbf0b85efbd6acc1cfb0c7a5a971b9519a3 +SIZE (Geo-ShapeFile-3.00.tar.gz) = 358391 diff --git a/devel/p5-Geo-ShapeFile/pkg-descr b/devel/p5-Geo-ShapeFile/pkg-descr index 78ef2c90e21..74c177d4f44 100644 --- a/devel/p5-Geo-ShapeFile/pkg-descr +++ b/devel/p5-Geo-ShapeFile/pkg-descr @@ -1,4 +1,4 @@ The Geo::ShapeFile module reads ESRI ShapeFiles containing GIS mapping data, it has support for shp (shape), shx (shape index), and dbf (data base) formats. -WWW: https://metacpan.org/release/Geo-ShapeFile +WWW: https://metacpan.org/pod/Geo::ShapeFile diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile index 5016ae0ced8..76555f1f84a 100644 --- a/devel/p5-IO-Pager/Makefile +++ b/devel/p5-IO-Pager/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= IO-Pager -PORTVERSION= 0.40 +PORTVERSION= 0.42 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-IO-Pager/distinfo b/devel/p5-IO-Pager/distinfo index 0254bc16bbe..23283c18cdd 100644 --- a/devel/p5-IO-Pager/distinfo +++ b/devel/p5-IO-Pager/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539291278 -SHA256 (IO-Pager-0.40.tgz) = 0735f5ccc077d5d10f4d2856ce5591f89ac8f4cc8c25d5ac4572ee93f5f5edef -SIZE (IO-Pager-0.40.tgz) = 18847 +TIMESTAMP = 1567842460 +SHA256 (IO-Pager-0.42.tgz) = cc2c9c9d76f141281772c73d95b8f496c1fb6b4ed7fef6ccac04aacc14976aa8 +SIZE (IO-Pager-0.42.tgz) = 20518 diff --git a/devel/p5-IO-Pager/pkg-plist b/devel/p5-IO-Pager/pkg-plist index 82b8002bf1c..8f2ee65208e 100644 --- a/devel/p5-IO-Pager/pkg-plist +++ b/devel/p5-IO-Pager/pkg-plist @@ -1,8 +1,10 @@ %%SITE_PERL%%/IO/Pager.pm %%SITE_PERL%%/IO/Pager/Buffered.pm %%SITE_PERL%%/IO/Pager/Page.pm +%%SITE_PERL%%/IO/Pager/Perl.pm %%SITE_PERL%%/IO/Pager/Unbuffered.pm %%PERL5_MAN3%%/IO::Pager.3.gz %%PERL5_MAN3%%/IO::Pager::Buffered.3.gz %%PERL5_MAN3%%/IO::Pager::Page.3.gz +%%PERL5_MAN3%%/IO::Pager::Perl.3.gz %%PERL5_MAN3%%/IO::Pager::Unbuffered.3.gz diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile index 7cd9363be0f..989c1d8e8d0 100644 --- a/devel/p5-Module-Info-File/Makefile +++ b/devel/p5-Module-Info-File/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Module-Info-File -PORTVERSION= 1.00 +PORTVERSION= 1.01 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,8 +17,9 @@ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Module-Info>=0.20:devel/p5-Module-Info \ p5-Try-Tiny>=0:lang/p5-Try-Tiny -NO_ARCH= yes USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include diff --git a/devel/p5-Module-Info-File/distinfo b/devel/p5-Module-Info-File/distinfo index 58b90974643..d03ac26e08a 100644 --- a/devel/p5-Module-Info-File/distinfo +++ b/devel/p5-Module-Info-File/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491601108 -SHA256 (Module-Info-File-1.00.tar.gz) = 545459f8c42f90d2e22da98f444a1ad1180f6e771cbdcf060e884f9b3deaa583 -SIZE (Module-Info-File-1.00.tar.gz) = 14347 +TIMESTAMP = 1567842514 +SHA256 (Module-Info-File-1.01.tar.gz) = f276fb98d324eea684eb87f4b87ecb297fdc123b8c98999b13b05182bd290ff9 +SIZE (Module-Info-File-1.01.tar.gz) = 16553 diff --git a/devel/p5-Term-Choose-Util/Makefile b/devel/p5-Term-Choose-Util/Makefile index 467dd16494a..8cf194ceecb 100644 --- a/devel/p5-Term-Choose-Util/Makefile +++ b/devel/p5-Term-Choose-Util/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Term-Choose-Util -PORTVERSION= 0.075 +PORTVERSION= 0.076 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Encode-Locale>=0:converters/p5-Encode-Locale \ p5-File-HomeDir>=0:devel/p5-File-HomeDir \ - p5-Term-Choose>=1.649:devel/p5-Term-Choose + p5-Term-Choose>=1.700:devel/p5-Term-Choose USES= perl5 USE_PERL5= configure diff --git a/devel/p5-Term-Choose-Util/distinfo b/devel/p5-Term-Choose-Util/distinfo index ca9494e795e..42ab7da09ba 100644 --- a/devel/p5-Term-Choose-Util/distinfo +++ b/devel/p5-Term-Choose-Util/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566324253 -SHA256 (Term-Choose-Util-0.075.tar.gz) = 8d1550dd52df96499582229ad94e9416601097147071aed95c072741f5047d5e -SIZE (Term-Choose-Util-0.075.tar.gz) = 20385 +TIMESTAMP = 1567784692 +SHA256 (Term-Choose-Util-0.076.tar.gz) = 0857b0c1e0fbaa02bbf226a8c5324f6a3c23a2aed9e9d09e696fcd4c38277d04 +SIZE (Term-Choose-Util-0.076.tar.gz) = 20453 diff --git a/devel/p5-Term-Choose/Makefile b/devel/p5-Term-Choose/Makefile index c0a4234fc8f..8d5303dec6f 100644 --- a/devel/p5-Term-Choose/Makefile +++ b/devel/p5-Term-Choose/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Term-Choose -PORTVERSION= 1.655 +PORTVERSION= 1.700 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Term-Choose/distinfo b/devel/p5-Term-Choose/distinfo index e7d891c2b74..d192eb755be 100644 --- a/devel/p5-Term-Choose/distinfo +++ b/devel/p5-Term-Choose/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564918801 -SHA256 (Term-Choose-1.655.tar.gz) = 105a31dbb6413c825a60aad9bc8d979b987b51c33c016adb10adfe56c7e5db66 -SIZE (Term-Choose-1.655.tar.gz) = 56266 +TIMESTAMP = 1567784690 +SHA256 (Term-Choose-1.700.tar.gz) = 8ca0fcbcbfc528ae14fe9c498f7026ba4fec8e7c639826a0b3bf3830c4e7795a +SIZE (Term-Choose-1.700.tar.gz) = 56330 diff --git a/devel/p5-Term-Choose/pkg-plist b/devel/p5-Term-Choose/pkg-plist index c806b543837..c28419d1044 100644 --- a/devel/p5-Term-Choose/pkg-plist +++ b/devel/p5-Term-Choose/pkg-plist @@ -4,6 +4,7 @@ %%SITE_PERL%%/Term/Choose/LineFold/CharWidthAmbiguousWide.pm %%SITE_PERL%%/Term/Choose/LineFold/CharWidthDefault.pm %%SITE_PERL%%/Term/Choose/Linux.pm +%%SITE_PERL%%/Term/Choose/Screen.pm %%SITE_PERL%%/Term/Choose/ValidateOptions.pm %%SITE_PERL%%/Term/Choose/Win32.pm %%PERL5_MAN3%%/Term::Choose.3.gz diff --git a/devel/p5-Term-Form/Makefile b/devel/p5-Term-Form/Makefile index 7d4b1da4869..5137a8c2fbd 100644 --- a/devel/p5-Term-Form/Makefile +++ b/devel/p5-Term-Form/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Term-Form -PORTVERSION= 0.519 +PORTVERSION= 0.520 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,8 +15,8 @@ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Term-Choose>=1.654:devel/p5-Term-Choose \ - p5-Term-Choose-Util>=0.074:devel/p5-Term-Choose-Util +RUN_DEPENDS= p5-Term-Choose>=1.700:devel/p5-Term-Choose \ + p5-Term-Choose-Util>=0.076:devel/p5-Term-Choose-Util TEST_DEPENDS= p5-Test-Fatal>=0:devel/p5-Test-Fatal USES= perl5 diff --git a/devel/p5-Term-Form/distinfo b/devel/p5-Term-Form/distinfo index 48fff71fbeb..4f36bf4811b 100644 --- a/devel/p5-Term-Form/distinfo +++ b/devel/p5-Term-Form/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566229392 -SHA256 (Term-Form-0.519.tar.gz) = 93bbe4f5158945b469e9e87bae40dc9d111fe141e4ead70b824c13a237318456 -SIZE (Term-Form-0.519.tar.gz) = 24568 +TIMESTAMP = 1567784693 +SHA256 (Term-Form-0.520.tar.gz) = 3edb17dc7610751fa3a31765af7aaaa514cf98680f9dfefd4140032a090bd69b +SIZE (Term-Form-0.520.tar.gz) = 24603 diff --git a/devel/p5-Term-TablePrint/Makefile b/devel/p5-Term-TablePrint/Makefile index 8bcc6a79150..1455e54f872 100644 --- a/devel/p5-Term-TablePrint/Makefile +++ b/devel/p5-Term-TablePrint/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Term-TablePrint -PORTVERSION= 0.116 +PORTVERSION= 0.117 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,8 +15,8 @@ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Term-Choose>=1.654:devel/p5-Term-Choose \ - p5-Term-Choose-Util>=0.074:devel/p5-Term-Choose-Util +RUN_DEPENDS= p5-Term-Choose>=1.700:devel/p5-Term-Choose \ + p5-Term-Choose-Util>=0.076:devel/p5-Term-Choose-Util USES= perl5 USE_PERL5= configure diff --git a/devel/p5-Term-TablePrint/distinfo b/devel/p5-Term-TablePrint/distinfo index 7cf7169c665..393723dd395 100644 --- a/devel/p5-Term-TablePrint/distinfo +++ b/devel/p5-Term-TablePrint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562522609 -SHA256 (Term-TablePrint-0.116.tar.gz) = 9f490f9f3eb15d25b5aae331b0a9e9689bbc9c8a7b05a5170470332cc4dce886 -SIZE (Term-TablePrint-0.116.tar.gz) = 22674 +TIMESTAMP = 1567784695 +SHA256 (Term-TablePrint-0.117.tar.gz) = 29699ce39b3961c9c7d7b279256e7c6378ff481c2bee19acf68490d207527695 +SIZE (Term-TablePrint-0.117.tar.gz) = 22655 diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile index d3640759e89..dd89834555f 100644 --- a/devel/phabricator/Makefile +++ b/devel/phabricator/Makefile @@ -15,11 +15,8 @@ RUN_DEPENDS= ${PHP_PKGNAMEPREFIX}libphutil>=20190831:devel/libphutil@${PHP_FLAVO arcanist-lib${PHP_PKGNAMESUFFIX}>=20190622:devel/arcanist-lib@${PHP_FLAVOR} \ git:devel/git -OPTIONS_DEFINE= GD OPCACHE -OPTIONS_DEFAULT=GD OPCACHE -OPCACHE_DESC?= Use OPcache to improve performance - USES= php:flavors shebangfix + REINPLACE_ARGS= -i "" SHEBANG_FILES= scripts/*.php \ scripts/almanac/*.php \ @@ -46,6 +43,10 @@ SHEBANG_FILES= scripts/*.php \ USE_PHP= ctype curl fileinfo filter hash iconv mbstring mysqli openssl \ pcntl posix zip +OPTIONS_DEFINE= GD OPCACHE +OPTIONS_DEFAULT=GD OPCACHE +OPCACHE_DESC?= Use OPcache to improve performance + GD_USE= PHP=gd OPCACHE_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR} diff --git a/devel/phabricator/files/pkg-message.in b/devel/phabricator/files/pkg-message.in index 2130c4cd6b9..f03f06d656c 100644 --- a/devel/phabricator/files/pkg-message.in +++ b/devel/phabricator/files/pkg-message.in @@ -43,15 +43,6 @@ A phabricator example configuration installed here: %%PREFIX%%lib/php/phabricator/conf/local/local.json.sample -Don't forget to update the database schema after update: - - service phd stop - cd %%PREFIX%%/lib/php/phabricator - ./bin/storage upgrade - service phd start - -You also might want to stop the web server while upgrading the database. - If you want to access phabricator hosted git repositories via git, you can add the following configuration snippet to /etc/sshd_config and reload sshd afterwards (`service sshd reload'): @@ -74,5 +65,28 @@ Match User git X11Forwarding no ======================================================================== EOM +}, +{ type: upgrade + message: < --password +EOM } ] diff --git a/devel/py-azure-batch/Makefile b/devel/py-azure-batch/Makefile index 71c30251393..01651dc5502 100644 --- a/devel/py-azure-batch/Makefile +++ b/devel/py-azure-batch/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-batch -PORTVERSION= 7.0.0 +PORTVERSION= 8.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-batch/distinfo b/devel/py-azure-batch/distinfo index b277a7f98da..19e1892187d 100644 --- a/devel/py-azure-batch/distinfo +++ b/devel/py-azure-batch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561037811 -SHA256 (azure-batch-7.0.0.zip) = 1225f142176a1cbc8330d0367009da41a2f7d3c3fd070fa4f80890bf9a6c15e1 -SIZE (azure-batch-7.0.0.zip) = 236003 +TIMESTAMP = 1567880486 +SHA256 (azure-batch-8.0.0.zip) = 918bd0dae244a595f5de6cebf0bdab87c6ccd7d9d2f288e1543b6916ed8a16c9 +SIZE (azure-batch-8.0.0.zip) = 241961 diff --git a/devel/py-azure-cosmos/Makefile b/devel/py-azure-cosmos/Makefile index a046a1957a0..73a457b9f4b 100644 --- a/devel/py-azure-cosmos/Makefile +++ b/devel/py-azure-cosmos/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-cosmos -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-cosmos/distinfo b/devel/py-azure-cosmos/distinfo index 13c72808f2a..ccb28c647c5 100644 --- a/devel/py-azure-cosmos/distinfo +++ b/devel/py-azure-cosmos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561040691 -SHA256 (azure-cosmos-3.1.0.tar.gz) = f4a718cc4d26e90ad22abbd0d208f43040cbb4b7768144632dd3042fec9da5a4 -SIZE (azure-cosmos-3.1.0.tar.gz) = 122634 +TIMESTAMP = 1567880428 +SHA256 (azure-cosmos-3.1.1.tar.gz) = f3922891baf59742556cbc8bd96aaba4f582a6a8f9bbccb8f2b0376539a21761 +SIZE (azure-cosmos-3.1.1.tar.gz) = 122635 diff --git a/devel/py-azure-datalake-store/Makefile b/devel/py-azure-datalake-store/Makefile index 38bb3175c0a..5c44e63d6e4 100644 --- a/devel/py-azure-datalake-store/Makefile +++ b/devel/py-azure-datalake-store/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-datalake-store -PORTVERSION= 0.0.45 +PORTVERSION= 0.0.47 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-datalake-store/distinfo b/devel/py-azure-datalake-store/distinfo index 7171f9e86e7..d1823a75a61 100644 --- a/devel/py-azure-datalake-store/distinfo +++ b/devel/py-azure-datalake-store/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557602077 -SHA256 (azure-datalake-store-0.0.45.tar.gz) = 6d719302f2fcac6c941c47d934a6f20f71ec7a519ab53f4aac9283b1db9d5ccc -SIZE (azure-datalake-store-0.0.45.tar.gz) = 57249 +TIMESTAMP = 1567880397 +SHA256 (azure-datalake-store-0.0.47.tar.gz) = 55bcbec99a35a52ea291518dadfd94c3b645e66d05ce927228289b93979ad3a5 +SIZE (azure-datalake-store-0.0.47.tar.gz) = 52533 diff --git a/devel/py-azure-functions-devops-build/Makefile b/devel/py-azure-functions-devops-build/Makefile new file mode 100644 index 00000000000..926eb475e91 --- /dev/null +++ b/devel/py-azure-functions-devops-build/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= azure-functions-devops-build +PORTVERSION= 0.0.22 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Azure Devops Build Manager For Azure Functions + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vsts>=0:devel/py-vsts@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-functions-devops-build/distinfo b/devel/py-azure-functions-devops-build/distinfo new file mode 100644 index 00000000000..b4b96f6d0a6 --- /dev/null +++ b/devel/py-azure-functions-devops-build/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1558568726 +SHA256 (azure-functions-devops-build-0.0.22.tar.gz) = c6341abda6098813f8fa625acd1e925410a17a8a1c7aaabdf975bb7cecb14edf +SIZE (azure-functions-devops-build-0.0.22.tar.gz) = 23669 diff --git a/devel/py-azure-functions-devops-build/pkg-descr b/devel/py-azure-functions-devops-build/pkg-descr new file mode 100644 index 00000000000..7604bd5f01c --- /dev/null +++ b/devel/py-azure-functions-devops-build/pkg-descr @@ -0,0 +1,6 @@ +This project provides the class AzureDevopsBuildManager and supporting classes. +This manager class allows the caller to manage Azure Devops pipelines that are +maintained within an Azure Devops account. This project was created to be able +to support command line tooling for the AZ Cli. + +WWW: https://pypi.org/project/azure-functions-devops-build/ diff --git a/devel/py-azure-mgmt-apimanagement/Makefile b/devel/py-azure-mgmt-apimanagement/Makefile new file mode 100644 index 00000000000..ec4a84612bc --- /dev/null +++ b/devel/py-azure-mgmt-apimanagement/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= azure-mgmt-apimanagement +PORTVERSION= 0.1.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Microsoft Azure API Management Client Library for Python + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} + +USES= azurepy python zip +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-mgmt-apimanagement/distinfo b/devel/py-azure-mgmt-apimanagement/distinfo new file mode 100644 index 00000000000..037cbcfddc2 --- /dev/null +++ b/devel/py-azure-mgmt-apimanagement/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567883130 +SHA256 (azure-mgmt-apimanagement-0.1.0.zip) = 5d45d3438c6a11bae6bb8d4d5173cdb44b85683695f9f3433f22f45aecc47819 +SIZE (azure-mgmt-apimanagement-0.1.0.zip) = 556098 diff --git a/devel/py-azure-mgmt-apimanagement/pkg-descr b/devel/py-azure-mgmt-apimanagement/pkg-descr new file mode 100644 index 00000000000..982d6ac6383 --- /dev/null +++ b/devel/py-azure-mgmt-apimanagement/pkg-descr @@ -0,0 +1,6 @@ +This is the Microsoft Azure API Management Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +WWW: https://pypi.org/project/azure-mgmt-apimanagement/ diff --git a/devel/py-azure-mgmt-appconfiguration/Makefile b/devel/py-azure-mgmt-appconfiguration/Makefile new file mode 100644 index 00000000000..3c75acbeef3 --- /dev/null +++ b/devel/py-azure-mgmt-appconfiguration/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= azure-mgmt-appconfiguration +PORTVERSION= 0.1.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Microsoft Azure App Configuration Client Library for Python + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} + +USES= azurepy python zip +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-mgmt-appconfiguration/distinfo b/devel/py-azure-mgmt-appconfiguration/distinfo new file mode 100644 index 00000000000..3c6c3f02dc3 --- /dev/null +++ b/devel/py-azure-mgmt-appconfiguration/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567885539 +SHA256 (azure-mgmt-appconfiguration-0.1.0.zip) = 2ff66c9aa1946ab5b604f98af550df0fda05d05ee9106f61ec2db7b357064e7c +SIZE (azure-mgmt-appconfiguration-0.1.0.zip) = 25015 diff --git a/devel/py-azure-mgmt-appconfiguration/pkg-descr b/devel/py-azure-mgmt-appconfiguration/pkg-descr new file mode 100644 index 00000000000..c367af22dba --- /dev/null +++ b/devel/py-azure-mgmt-appconfiguration/pkg-descr @@ -0,0 +1,6 @@ +This is the Microsoft Azure App Configuration Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +WWW: https://pypi.org/project/azure-mgmt-appconfiguration/ diff --git a/devel/py-azure-mgmt-batch/Makefile b/devel/py-azure-mgmt-batch/Makefile index afd85d8ece3..b8e1974d8ca 100644 --- a/devel/py-azure-mgmt-batch/Makefile +++ b/devel/py-azure-mgmt-batch/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-batch -PORTVERSION= 6.0.0 +PORTVERSION= 7.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-batch/distinfo b/devel/py-azure-mgmt-batch/distinfo index 8980355725f..4e3b53d34fb 100644 --- a/devel/py-azure-mgmt-batch/distinfo +++ b/devel/py-azure-mgmt-batch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548590210 -SHA256 (azure-mgmt-batch-6.0.0.zip) = dc929d2a0a65804c28a75dc00bb84ba581f805582a09238f4e7faacb15f8a2a3 -SIZE (azure-mgmt-batch-6.0.0.zip) = 78197 +TIMESTAMP = 1567880378 +SHA256 (azure-mgmt-batch-7.0.0.zip) = 16c5b652b439b1a0a20366558f5c06858a3052d50b16a470bb80cd30f97abca1 +SIZE (azure-mgmt-batch-7.0.0.zip) = 116027 diff --git a/devel/py-azure-mgmt-cognitiveservices/Makefile b/devel/py-azure-mgmt-cognitiveservices/Makefile index 03203841537..ecdfa31f80c 100644 --- a/devel/py-azure-mgmt-cognitiveservices/Makefile +++ b/devel/py-azure-mgmt-cognitiveservices/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-cognitiveservices -PORTVERSION= 4.0.0 +PORTVERSION= 5.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-cognitiveservices/distinfo b/devel/py-azure-mgmt-cognitiveservices/distinfo index 3f6152b648f..da46ebe2fcc 100644 --- a/devel/py-azure-mgmt-cognitiveservices/distinfo +++ b/devel/py-azure-mgmt-cognitiveservices/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557601575 -SHA256 (azure-mgmt-cognitiveservices-4.0.0.zip) = 4d0b393ac6cc85bff4caa44f9d3a22db366e49f68b046f36864c57d3827feb17 -SIZE (azure-mgmt-cognitiveservices-4.0.0.zip) = 66131 +TIMESTAMP = 1567880356 +SHA256 (azure-mgmt-cognitiveservices-5.0.0.zip) = 06245a7200bd1ed8a7a8ad3bce282011d6ba2faaae847f337cafd53d5d1efbd4 +SIZE (azure-mgmt-cognitiveservices-5.0.0.zip) = 41950 diff --git a/devel/py-azure-mgmt-compute/Makefile b/devel/py-azure-mgmt-compute/Makefile index d767582e21d..47e27fbc64b 100644 --- a/devel/py-azure-mgmt-compute/Makefile +++ b/devel/py-azure-mgmt-compute/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-compute -PORTVERSION= 5.0.0 +PORTVERSION= 7.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-compute/distinfo b/devel/py-azure-mgmt-compute/distinfo index 3d57d18bad1..4400f586c69 100644 --- a/devel/py-azure-mgmt-compute/distinfo +++ b/devel/py-azure-mgmt-compute/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557601516 -SHA256 (azure-mgmt-compute-5.0.0.zip) = bc200f100da77c0c910cc9e4db103d4c3f9e052222aa400630b608e410bbbefd -SIZE (azure-mgmt-compute-5.0.0.zip) = 3383546 +TIMESTAMP = 1567880337 +SHA256 (azure-mgmt-compute-7.0.0.zip) = fba4147a479dda850aac1df5f4a08921aff69a17d7f26648705303fecb576ffd +SIZE (azure-mgmt-compute-7.0.0.zip) = 1486932 diff --git a/devel/py-azure-mgmt-containerregistry/Makefile b/devel/py-azure-mgmt-containerregistry/Makefile index f262f24dde2..03e4ff76bff 100644 --- a/devel/py-azure-mgmt-containerregistry/Makefile +++ b/devel/py-azure-mgmt-containerregistry/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-containerregistry -PORTVERSION= 2.8.0 +DISTVERSION= 3.0.0rc5 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-containerregistry/distinfo b/devel/py-azure-mgmt-containerregistry/distinfo index 1d1cfe604aa..8160336539e 100644 --- a/devel/py-azure-mgmt-containerregistry/distinfo +++ b/devel/py-azure-mgmt-containerregistry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557601482 -SHA256 (azure-mgmt-containerregistry-2.8.0.zip) = b24be1050d54f3158e8be7f6ad677f0c8888dddefd09fb8391ebfc73d40173a4 -SIZE (azure-mgmt-containerregistry-2.8.0.zip) = 782109 +TIMESTAMP = 1567882391 +SHA256 (azure-mgmt-containerregistry-3.0.0rc5.zip) = 899985f58c5f6390a02c8da04af5a7df877ee5ca6bd81ea256ecb0ec02ce1e56 +SIZE (azure-mgmt-containerregistry-3.0.0rc5.zip) = 461605 diff --git a/devel/py-azure-mgmt-cosmosdb/Makefile b/devel/py-azure-mgmt-cosmosdb/Makefile index c2955d9fe16..b719f25174c 100644 --- a/devel/py-azure-mgmt-cosmosdb/Makefile +++ b/devel/py-azure-mgmt-cosmosdb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-cosmosdb -PORTVERSION= 0.7.0 +PORTVERSION= 0.8.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-cosmosdb/distinfo b/devel/py-azure-mgmt-cosmosdb/distinfo index 2405c461d24..d0db0099738 100644 --- a/devel/py-azure-mgmt-cosmosdb/distinfo +++ b/devel/py-azure-mgmt-cosmosdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561037774 -SHA256 (azure-mgmt-cosmosdb-0.7.0.zip) = b980d1556f1a415a3c7b964faff83a1448914394c4c878a6a61cd2e693fb3db5 -SIZE (azure-mgmt-cosmosdb-0.7.0.zip) = 216358 +TIMESTAMP = 1567880296 +SHA256 (azure-mgmt-cosmosdb-0.8.0.zip) = 4b7b59132992bdf5d4ad211ca8e416402bfca5d7a90a80c20989879cc5ea5345 +SIZE (azure-mgmt-cosmosdb-0.8.0.zip) = 92519 diff --git a/devel/py-azure-mgmt-datamigration/Makefile b/devel/py-azure-mgmt-datamigration/Makefile index 8183830ff59..8b01f22d18f 100644 --- a/devel/py-azure-mgmt-datamigration/Makefile +++ b/devel/py-azure-mgmt-datamigration/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-datamigration -PORTVERSION= 2.2.0 +PORTVERSION= 3.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-datamigration/distinfo b/devel/py-azure-mgmt-datamigration/distinfo index 425f1a8359e..d95cc3f3984 100644 --- a/devel/py-azure-mgmt-datamigration/distinfo +++ b/devel/py-azure-mgmt-datamigration/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558570976 -SHA256 (azure-mgmt-datamigration-2.2.0.zip) = fc93558356bfc415efb5f2858bf66ee41313dd8e274a2eb6065a399594f73d2e -SIZE (azure-mgmt-datamigration-2.2.0.zip) = 532518 +TIMESTAMP = 1567880258 +SHA256 (azure-mgmt-datamigration-3.0.0.zip) = b6d45a8c802f9cdbef3417f2714ee9b705102714d029589acaedce2b8fbb855d +SIZE (azure-mgmt-datamigration-3.0.0.zip) = 143629 diff --git a/devel/py-azure-mgmt-deploymentmanager/Makefile b/devel/py-azure-mgmt-deploymentmanager/Makefile new file mode 100644 index 00000000000..a42a9a2e9fd --- /dev/null +++ b/devel/py-azure-mgmt-deploymentmanager/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= azure-mgmt-deploymentmanager +PORTVERSION= 0.1.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Microsoft Azure Deployment Manager Client Library for Python + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} + +USES= azurepy python zip +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-mgmt-deploymentmanager/distinfo b/devel/py-azure-mgmt-deploymentmanager/distinfo new file mode 100644 index 00000000000..323046e1b46 --- /dev/null +++ b/devel/py-azure-mgmt-deploymentmanager/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567885670 +SHA256 (azure-mgmt-deploymentmanager-0.1.0.zip) = 398a6d38b658c4a790e1a6884921eb98a22a10d906340bb8c9fb3207d709703f +SIZE (azure-mgmt-deploymentmanager-0.1.0.zip) = 98176 diff --git a/devel/py-azure-mgmt-deploymentmanager/pkg-descr b/devel/py-azure-mgmt-deploymentmanager/pkg-descr new file mode 100644 index 00000000000..1bf2df6bf99 --- /dev/null +++ b/devel/py-azure-mgmt-deploymentmanager/pkg-descr @@ -0,0 +1,6 @@ +This is the Microsoft Azure Deployment Manager Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +WWW: https://pypi.org/project/azure-mgmt-deploymentmanager/ diff --git a/devel/py-azure-mgmt-devtestlabs/Makefile b/devel/py-azure-mgmt-devtestlabs/Makefile index c8513c2947f..12a948df8e8 100644 --- a/devel/py-azure-mgmt-devtestlabs/Makefile +++ b/devel/py-azure-mgmt-devtestlabs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-devtestlabs -PORTVERSION= 3.0.0 +PORTVERSION= 4.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-devtestlabs/distinfo b/devel/py-azure-mgmt-devtestlabs/distinfo index 435f5c04858..3d14c4d72c5 100644 --- a/devel/py-azure-mgmt-devtestlabs/distinfo +++ b/devel/py-azure-mgmt-devtestlabs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550320300 -SHA256 (azure-mgmt-devtestlabs-3.0.0.zip) = b3d5b2919021bf45f0acdd34ab23dc9b0435d9d0a6b472e5008128fb8521e700 -SIZE (azure-mgmt-devtestlabs-3.0.0.zip) = 394574 +TIMESTAMP = 1567880237 +SHA256 (azure-mgmt-devtestlabs-4.0.0.zip) = 59549c4c4068f26466b1097b574a8e5099fb2cd6c8be0a00395b06d3b29e278d +SIZE (azure-mgmt-devtestlabs-4.0.0.zip) = 149388 diff --git a/devel/py-azure-mgmt-hdinsight/Makefile b/devel/py-azure-mgmt-hdinsight/Makefile index 32680305c5b..60ac31263ea 100644 --- a/devel/py-azure-mgmt-hdinsight/Makefile +++ b/devel/py-azure-mgmt-hdinsight/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-hdinsight -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-hdinsight/distinfo b/devel/py-azure-mgmt-hdinsight/distinfo index 236dd27b012..309732efef3 100644 --- a/devel/py-azure-mgmt-hdinsight/distinfo +++ b/devel/py-azure-mgmt-hdinsight/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561037686 -SHA256 (azure-mgmt-hdinsight-1.1.0.zip) = 76d277fb1a2fedc5181a7c738f058ebff8646bde5fb477cb53a43712166c4952 -SIZE (azure-mgmt-hdinsight-1.1.0.zip) = 62456 +TIMESTAMP = 1567880216 +SHA256 (azure-mgmt-hdinsight-1.2.0.zip) = 958a366736749fc5f6f575e3a8fdd0054b2b4119f2c3e11441124126d4d109fb +SIZE (azure-mgmt-hdinsight-1.2.0.zip) = 69797 diff --git a/devel/py-azure-mgmt-imagebuilder/Makefile b/devel/py-azure-mgmt-imagebuilder/Makefile new file mode 100644 index 00000000000..57a955a7199 --- /dev/null +++ b/devel/py-azure-mgmt-imagebuilder/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= azure-mgmt-imagebuilder +PORTVERSION= 0.2.1 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Microsoft Azure Image Builder Client Library for Python + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} + +USES= azurepy python zip +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-mgmt-imagebuilder/distinfo b/devel/py-azure-mgmt-imagebuilder/distinfo new file mode 100644 index 00000000000..0423391ecfb --- /dev/null +++ b/devel/py-azure-mgmt-imagebuilder/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567885796 +SHA256 (azure-mgmt-imagebuilder-0.2.1.zip) = 7e5efd9f641764884cbb6e1521c8e7ff67c5ff85ed367ebe8623dbd289df9457 +SIZE (azure-mgmt-imagebuilder-0.2.1.zip) = 72553 diff --git a/devel/py-azure-mgmt-imagebuilder/pkg-descr b/devel/py-azure-mgmt-imagebuilder/pkg-descr new file mode 100644 index 00000000000..86ba5069616 --- /dev/null +++ b/devel/py-azure-mgmt-imagebuilder/pkg-descr @@ -0,0 +1,6 @@ +This is the Microsoft Azure Image Builder Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +WWW: https://pypi.org/project/azure-mgmt-imagebuilder/ diff --git a/devel/py-azure-mgmt-kusto/Makefile b/devel/py-azure-mgmt-kusto/Makefile index ec2240a140c..cc08c8b5f0f 100644 --- a/devel/py-azure-mgmt-kusto/Makefile +++ b/devel/py-azure-mgmt-kusto/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-kusto -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-kusto/distinfo b/devel/py-azure-mgmt-kusto/distinfo index cd71b6c0bdd..3a4a1dab115 100644 --- a/devel/py-azure-mgmt-kusto/distinfo +++ b/devel/py-azure-mgmt-kusto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551394436 -SHA256 (azure-mgmt-kusto-0.3.0.zip) = 9eb8b7781fd4410ee9e207cd0c3983baf9e58414b5b4a18849d09856e36bacde -SIZE (azure-mgmt-kusto-0.3.0.zip) = 79531 +TIMESTAMP = 1567880195 +SHA256 (azure-mgmt-kusto-0.4.0.zip) = 0bcc4a6c8a1f53702c4f144e7bc73bc541cf092b67d55581648c1b205072a8eb +SIZE (azure-mgmt-kusto-0.4.0.zip) = 43196 diff --git a/devel/py-azure-mgmt-managedservices/Makefile b/devel/py-azure-mgmt-managedservices/Makefile new file mode 100644 index 00000000000..6460fec2571 --- /dev/null +++ b/devel/py-azure-mgmt-managedservices/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= azure-mgmt-managedservices +PORTVERSION= 1.0.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Microsoft Azure Managed Services Client Library for Python + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} + +USES= azurepy python zip +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-mgmt-managedservices/distinfo b/devel/py-azure-mgmt-managedservices/distinfo new file mode 100644 index 00000000000..92b4dcfe4dc --- /dev/null +++ b/devel/py-azure-mgmt-managedservices/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567885903 +SHA256 (azure-mgmt-managedservices-1.0.0.zip) = fed8399fc6773aada37c1d0496a46f59410d77c9494d0ca5967c531c3376ad19 +SIZE (azure-mgmt-managedservices-1.0.0.zip) = 50022 diff --git a/devel/py-azure-mgmt-managedservices/pkg-descr b/devel/py-azure-mgmt-managedservices/pkg-descr new file mode 100644 index 00000000000..b86768e18bc --- /dev/null +++ b/devel/py-azure-mgmt-managedservices/pkg-descr @@ -0,0 +1,6 @@ +This is the Microsoft Azure Managed Services Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +WWW: https://pypi.org/project/azure-mgmt-managedservices/ diff --git a/devel/py-azure-mgmt-monitor/Makefile b/devel/py-azure-mgmt-monitor/Makefile index 182a236810e..e9b3f4f5340 100644 --- a/devel/py-azure-mgmt-monitor/Makefile +++ b/devel/py-azure-mgmt-monitor/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-monitor -PORTVERSION= 0.6.0 +PORTVERSION= 0.7.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-monitor/distinfo b/devel/py-azure-mgmt-monitor/distinfo index b2708182af7..24cbae79ba4 100644 --- a/devel/py-azure-mgmt-monitor/distinfo +++ b/devel/py-azure-mgmt-monitor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552135334 -SHA256 (azure-mgmt-monitor-0.6.0.zip) = 5a804dae2c3e31bfd6f1b0482d49761b9a56f7eefa9b190cd76ef5fe1d504ef2 -SIZE (azure-mgmt-monitor-0.6.0.zip) = 300779 +TIMESTAMP = 1567880159 +SHA256 (azure-mgmt-monitor-0.7.0.zip) = 8216ab3ec57994303c47a0977e853a8a3fff4778e08dc3575e669522cadcf9de +SIZE (azure-mgmt-monitor-0.7.0.zip) = 354032 diff --git a/devel/py-azure-mgmt-netapp/Makefile b/devel/py-azure-mgmt-netapp/Makefile new file mode 100644 index 00000000000..020eb7dd715 --- /dev/null +++ b/devel/py-azure-mgmt-netapp/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= azure-mgmt-netapp +PORTVERSION= 0.5.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Microsoft Azure NetApp Files Management Client Library for Python + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} + +USES= azurepy python zip +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-mgmt-netapp/distinfo b/devel/py-azure-mgmt-netapp/distinfo new file mode 100644 index 00000000000..3ff5fb184b2 --- /dev/null +++ b/devel/py-azure-mgmt-netapp/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567886007 +SHA256 (azure-mgmt-netapp-0.5.0.zip) = cd1c15c18a52bb5297243719b2c2881a3f3817c6bc37fb1d06f7dae3e75df4f2 +SIZE (azure-mgmt-netapp-0.5.0.zip) = 130878 diff --git a/devel/py-azure-mgmt-netapp/pkg-descr b/devel/py-azure-mgmt-netapp/pkg-descr new file mode 100644 index 00000000000..eaed9526c72 --- /dev/null +++ b/devel/py-azure-mgmt-netapp/pkg-descr @@ -0,0 +1,6 @@ +This is the Microsoft Azure NetApp Files Management Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +WWW: https://pypi.org/project/azure-mgmt-netapp/ diff --git a/devel/py-azure-mgmt-network/Makefile b/devel/py-azure-mgmt-network/Makefile index aa7bf9b01c8..763469563c9 100644 --- a/devel/py-azure-mgmt-network/Makefile +++ b/devel/py-azure-mgmt-network/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-network -DISTVERSION= 3.0.0 +DISTVERSION= 5.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-network/distinfo b/devel/py-azure-mgmt-network/distinfo index 8be47ce7d9f..6379eb12451 100644 --- a/devel/py-azure-mgmt-network/distinfo +++ b/devel/py-azure-mgmt-network/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559777803 -SHA256 (azure-mgmt-network-3.0.0.zip) = 7b7f4759c367da33be631e63320daa6663575d092c04891fef531dff6f4be516 -SIZE (azure-mgmt-network-3.0.0.zip) = 5094722 +TIMESTAMP = 1567879921 +SHA256 (azure-mgmt-network-5.0.0.zip) = ec63eac868ad231892b41dd93dade162773a968f0e007e8323f0419f47edd50f +SIZE (azure-mgmt-network-5.0.0.zip) = 5874392 diff --git a/devel/py-azure-mgmt-privatedns/Makefile b/devel/py-azure-mgmt-privatedns/Makefile new file mode 100644 index 00000000000..f79779b4746 --- /dev/null +++ b/devel/py-azure-mgmt-privatedns/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= azure-mgmt-privatedns +PORTVERSION= 0.1.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Microsoft Azure DNS Private Zones Client Library for Python + +LICENSE= MIT + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} + +USES= azurepy python zip +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-azure-mgmt-privatedns/distinfo b/devel/py-azure-mgmt-privatedns/distinfo new file mode 100644 index 00000000000..999c091cc1f --- /dev/null +++ b/devel/py-azure-mgmt-privatedns/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567886095 +SHA256 (azure-mgmt-privatedns-0.1.0.zip) = d29cfd8cec806e06673d9382d3f5766fc65d9a9de75b424705094a34a7db8d23 +SIZE (azure-mgmt-privatedns-0.1.0.zip) = 49776 diff --git a/devel/py-azure-mgmt-privatedns/pkg-descr b/devel/py-azure-mgmt-privatedns/pkg-descr new file mode 100644 index 00000000000..04b1f0308f4 --- /dev/null +++ b/devel/py-azure-mgmt-privatedns/pkg-descr @@ -0,0 +1,6 @@ +This is the Microsoft Azure DNS Private Zones Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +WWW: https://pypi.org/project/azure-mgmt-privatedns/ diff --git a/devel/py-azure-mgmt-resource/Makefile b/devel/py-azure-mgmt-resource/Makefile index 0c36e0ac67d..0db40362b9f 100644 --- a/devel/py-azure-mgmt-resource/Makefile +++ b/devel/py-azure-mgmt-resource/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-resource -PORTVERSION= 3.0.0 +PORTVERSION= 4.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-resource/distinfo b/devel/py-azure-mgmt-resource/distinfo index ad476082106..f7f99b01cd0 100644 --- a/devel/py-azure-mgmt-resource/distinfo +++ b/devel/py-azure-mgmt-resource/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561037567 -SHA256 (azure-mgmt-resource-3.0.0.zip) = a64b49f6e9bc07c7499c767c9fadfa2019a4d44222d78c941cd748653f83a963 -SIZE (azure-mgmt-resource-3.0.0.zip) = 631187 +TIMESTAMP = 1567862145 +SHA256 (azure-mgmt-resource-4.0.0.zip) = 2b909f137469c7bfa541554c3d22eb918e9191c07667a42f2c6fc684e24ac83f +SIZE (azure-mgmt-resource-4.0.0.zip) = 908349 diff --git a/devel/py-azure-mgmt-security/Makefile b/devel/py-azure-mgmt-security/Makefile index 4b79f89ac45..9e19f24752d 100644 --- a/devel/py-azure-mgmt-security/Makefile +++ b/devel/py-azure-mgmt-security/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-security -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-security/distinfo b/devel/py-azure-mgmt-security/distinfo index 862dcbb8873..94e9cba2b6a 100644 --- a/devel/py-azure-mgmt-security/distinfo +++ b/devel/py-azure-mgmt-security/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556399186 -SHA256 (azure-mgmt-security-0.2.0.zip) = 32965b12dece3b7bad56f247608258985d61bff90952d8ff00b1c4dc67cfe432 -SIZE (azure-mgmt-security-0.2.0.zip) = 161380 +TIMESTAMP = 1567862089 +SHA256 (azure-mgmt-security-0.3.0.zip) = 1b1d621d796e59c690cadfa83bd1c2df2db0b4eecb97db8a376aa0430431e67c +SIZE (azure-mgmt-security-0.3.0.zip) = 123703 diff --git a/devel/py-azure-mgmt-servicefabric/Makefile b/devel/py-azure-mgmt-servicefabric/Makefile index 1bc8bb641b3..576fd57a3f7 100644 --- a/devel/py-azure-mgmt-servicefabric/Makefile +++ b/devel/py-azure-mgmt-servicefabric/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-servicefabric -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-servicefabric/distinfo b/devel/py-azure-mgmt-servicefabric/distinfo index 3b88e534d44..98f7a3d3007 100644 --- a/devel/py-azure-mgmt-servicefabric/distinfo +++ b/devel/py-azure-mgmt-servicefabric/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559777483 -SHA256 (azure-mgmt-servicefabric-0.3.0.zip) = 56f47d7529195711f71b06f85a0a1a914b2da9d084d7f58c5a5c6bcbd1d53932 -SIZE (azure-mgmt-servicefabric-0.3.0.zip) = 172152 +TIMESTAMP = 1567862046 +SHA256 (azure-mgmt-servicefabric-0.4.0.zip) = a2cbd2797e796a550a93d37229b2ded22765f50166730a63c8e20a27677e28f4 +SIZE (azure-mgmt-servicefabric-0.4.0.zip) = 70460 diff --git a/devel/py-azure-mgmt-signalr/Makefile b/devel/py-azure-mgmt-signalr/Makefile index 53a27654f77..4672ecaf9ef 100644 --- a/devel/py-azure-mgmt-signalr/Makefile +++ b/devel/py-azure-mgmt-signalr/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-signalr -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-signalr/distinfo b/devel/py-azure-mgmt-signalr/distinfo index 52341e0f2b8..97f8d86c231 100644 --- a/devel/py-azure-mgmt-signalr/distinfo +++ b/devel/py-azure-mgmt-signalr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558570625 -SHA256 (azure-mgmt-signalr-0.2.0.zip) = 9fee18e9a27ad06aa097c9ecc0b47198555e85829fa5d63d17de65918d83694c -SIZE (azure-mgmt-signalr-0.2.0.zip) = 54773 +TIMESTAMP = 1567862024 +SHA256 (azure-mgmt-signalr-0.3.0.zip) = 0a6c876434f1a51bfbf1c4cea3f7167329f4ea86c12ba8ce8123d8f4b9896221 +SIZE (azure-mgmt-signalr-0.3.0.zip) = 60560 diff --git a/devel/py-azure-mgmt-sql/Makefile b/devel/py-azure-mgmt-sql/Makefile index 47b4b36e58c..8b4e4ff6606 100644 --- a/devel/py-azure-mgmt-sql/Makefile +++ b/devel/py-azure-mgmt-sql/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-sql -PORTVERSION= 0.12.0 +PORTVERSION= 0.13.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-sql/distinfo b/devel/py-azure-mgmt-sql/distinfo index 39a59ee75b5..99156483888 100644 --- a/devel/py-azure-mgmt-sql/distinfo +++ b/devel/py-azure-mgmt-sql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553900412 -SHA256 (azure-mgmt-sql-0.12.0.zip) = 8399702e9d1836f3b040ce0c93d8dc089767d66edb9224a3b8a6c9ab7e8ff01f -SIZE (azure-mgmt-sql-0.12.0.zip) = 630709 +TIMESTAMP = 1567861993 +SHA256 (azure-mgmt-sql-0.13.0.zip) = f41c47a8bcf0eaa8daaac863d9b454d34496cd050f48594561c47a8b84aa92a0 +SIZE (azure-mgmt-sql-0.13.0.zip) = 367772 diff --git a/devel/py-azure-mgmt-sqlvirtualmachine/Makefile b/devel/py-azure-mgmt-sqlvirtualmachine/Makefile index 57ded289bf2..f7551d66534 100644 --- a/devel/py-azure-mgmt-sqlvirtualmachine/Makefile +++ b/devel/py-azure-mgmt-sqlvirtualmachine/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-mgmt-sqlvirtualmachine -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-mgmt-sqlvirtualmachine/distinfo b/devel/py-azure-mgmt-sqlvirtualmachine/distinfo index f29c392a1de..7139c82eebf 100644 --- a/devel/py-azure-mgmt-sqlvirtualmachine/distinfo +++ b/devel/py-azure-mgmt-sqlvirtualmachine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559777054 -SHA256 (azure-mgmt-sqlvirtualmachine-0.3.0.zip) = 8de993db9b0bdd964cdeefc68b99b5ab9e95109c0aacb3b65d574a5efae0b63e -SIZE (azure-mgmt-sqlvirtualmachine-0.3.0.zip) = 74257 +TIMESTAMP = 1567861890 +SHA256 (azure-mgmt-sqlvirtualmachine-0.4.0.zip) = 95718425df713e87700e21207f2695ea26b91fe2ddd89918ca7c76bfe58cb5cb +SIZE (azure-mgmt-sqlvirtualmachine-0.4.0.zip) = 75890 diff --git a/devel/py-azure-storage-blob/Makefile b/devel/py-azure-storage-blob/Makefile index eb3220c9823..6abb153a3d8 100644 --- a/devel/py-azure-storage-blob/Makefile +++ b/devel/py-azure-storage-blob/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-storage-blob -PORTVERSION= 2.0.1 +PORTVERSION= 2.1.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ COMMENT= Microsoft Azure Storage Blob Client Library for Python LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1.5:www/py-azure-common@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-storage-common>=2.0:devel/py-azure-storage-common@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-storage-common>=2.1:devel/py-azure-storage-common@${PY_FLAVOR} \ ${PY_FUTURES} USES= azurepy python diff --git a/devel/py-azure-storage-blob/distinfo b/devel/py-azure-storage-blob/distinfo index 11323bbc5c8..73dd6bef7ed 100644 --- a/devel/py-azure-storage-blob/distinfo +++ b/devel/py-azure-storage-blob/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557600678 -SHA256 (azure-storage-blob-2.0.1.tar.gz) = 93381abf5d18222b9dd8a07fa5f810536427c047663433f4c77877d047877032 -SIZE (azure-storage-blob-2.0.1.tar.gz) = 75732 +TIMESTAMP = 1567861589 +SHA256 (azure-storage-blob-2.1.0.tar.gz) = b90323aad60f207f9f90a0c4cf94c10acc313c20b39403398dfba51f25f7b454 +SIZE (azure-storage-blob-2.1.0.tar.gz) = 83156 diff --git a/devel/py-azure-storage-common/Makefile b/devel/py-azure-storage-common/Makefile index cfa86ab60bc..6f7221ee3b9 100644 --- a/devel/py-azure-storage-common/Makefile +++ b/devel/py-azure-storage-common/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-storage-common -PORTVERSION= 2.0.0 +PORTVERSION= 2.1.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-azure-storage-common/distinfo b/devel/py-azure-storage-common/distinfo index edf28b2d64a..cef40663937 100644 --- a/devel/py-azure-storage-common/distinfo +++ b/devel/py-azure-storage-common/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557600571 -SHA256 (azure-storage-common-2.0.0.tar.gz) = 4390cd5f6fb50fbff37ba154258ea010291a84f128917141e1d7060597bd4708 -SIZE (azure-storage-common-2.0.0.tar.gz) = 41352 +TIMESTAMP = 1567861764 +SHA256 (azure-storage-common-2.1.0.tar.gz) = ccedef5c67227bc4d6670ffd37cec18fb529a1b7c3a5e53e4096eb0cf23dc73f +SIZE (azure-storage-common-2.1.0.tar.gz) = 41869 diff --git a/devel/py-backports_abc/Makefile b/devel/py-backports_abc/Makefile index 879fc38b92d..af74417cdb4 100644 --- a/devel/py-backports_abc/Makefile +++ b/devel/py-backports_abc/Makefile @@ -7,7 +7,7 @@ CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= sunpoets@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Backport of recent additions to the 'collections.abc' module LICENSE= PSFL diff --git a/devel/py-cuisine/Makefile b/devel/py-cuisine/Makefile index 162e0b93f40..5c6b1195f51 100644 --- a/devel/py-cuisine/Makefile +++ b/devel/py-cuisine/Makefile @@ -2,6 +2,7 @@ PORTNAME= cuisine PORTVERSION= 0.7.13 +PORTREVISION= 1 #PORTEPOCH= 0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP @@ -12,7 +13,7 @@ COMMENT= Chef-like functionality for Fabric LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric1>=1.7,1:devel/py-fabric1@${PY_FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist diff --git a/devel/py-ddtrace/Makefile b/devel/py-ddtrace/Makefile index 00f3b65cd4d..ec255ca66b1 100644 --- a/devel/py-ddtrace/Makefile +++ b/devel/py-ddtrace/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ddtrace -PORTVERSION= 0.28.0 +PORTVERSION= 0.29.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ddtrace/distinfo b/devel/py-ddtrace/distinfo index e257fd55a71..c054de630fe 100644 --- a/devel/py-ddtrace/distinfo +++ b/devel/py-ddtrace/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566229416 -SHA256 (ddtrace-0.28.0.tar.gz) = d227c030379169716f3009787f4d12c92096a24418dda6ea73ac41aaf0d197cb -SIZE (ddtrace-0.28.0.tar.gz) = 511961 +TIMESTAMP = 1567784705 +SHA256 (ddtrace-0.29.0.tar.gz) = fee1f271705cadd87545ea893392b9bc5d180c16a8a328cb5a98f5c68d9f7846 +SIZE (ddtrace-0.29.0.tar.gz) = 518776 diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile index 007971ab345..9c818f6ca46 100644 --- a/devel/py-fabric/Makefile +++ b/devel/py-fabric/Makefile @@ -2,31 +2,34 @@ # $FreeBSD$ PORTNAME= fabric -PORTVERSION= 1.14.1 +PORTVERSION= 2.5.0 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Fabric-${DISTVERSION} MAINTAINER= koobs@FreeBSD.org -COMMENT= Simple, Pythonic remote execution and deployment +COMMENT= High level SSH command execution LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${PY_FLAVOR} # <3.0 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=2.4:security/py-paramiko@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}invoke>=1.1,<2.0:devel/py-invoke@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.1:security/py-cryptography@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.5:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-relaxed>0:devel/py-pytest-relaxed@${PY_FLAVOR} -USES= python:2.7 +USES= python USE_PYTHON= distutils concurrent autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fabric1 + NO_ARCH= yes do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v \ - --exclude=test_nested_execution_with_explicit_ports + @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs \ + -k 'not python_dash_m_acts_like_fab' .include diff --git a/devel/py-fabric/distinfo b/devel/py-fabric/distinfo index da201a34135..0e55b2f698e 100644 --- a/devel/py-fabric/distinfo +++ b/devel/py-fabric/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554010618 -SHA256 (Fabric-1.14.1.tar.gz) = 66097883bb3e5beecacae92b82b2bd489d10a8fd4f06ce1cb27019de2e6d76a8 -SIZE (Fabric-1.14.1.tar.gz) = 220463 +TIMESTAMP = 1565561659 +SHA256 (fabric-2.5.0.tar.gz) = 24842d7d51556adcabd885ac3cf5e1df73fc622a1708bf3667bf5927576cdfa6 +SIZE (fabric-2.5.0.tar.gz) = 161421 diff --git a/devel/py-fabric/pkg-descr b/devel/py-fabric/pkg-descr index 39a31b53225..c61d1414070 100644 --- a/devel/py-fabric/pkg-descr +++ b/devel/py-fabric/pkg-descr @@ -1,10 +1,8 @@ -Fabric is a simple pythonic remote deployment tool. +Fabric is a high level Python library designed to execute shell commands +remotely over SSH, yielding useful Python objects in return. -It is designed to upload files to, and run shell commands on, a number -of servers in parallel or serially. These commands are grouped in tasks -(regular python functions) and specified in a 'fabfile.' - -This is called remote automation, and the primary use case is deploying -applications to multiple similar hosts. +It builds on top of Invoke (subprocess command execution and command-line +features) and Paramiko (SSH protocol implementation), extending their APIs +to complement one another and provide additional functionality. WWW: https://www.fabfile.org diff --git a/devel/py-fabric1/Makefile b/devel/py-fabric1/Makefile new file mode 100644 index 00000000000..2fef03c0db8 --- /dev/null +++ b/devel/py-fabric1/Makefile @@ -0,0 +1,35 @@ +# Created by: Yi-Jheng Lin +# $FreeBSD$ + +PORTNAME= fabric +PORTVERSION= 1.14.1 +PORTEPOCH= 1 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 1 +DISTNAME= Fabric-${DISTVERSION} + +MAINTAINER= koobs@FreeBSD.org +COMMENT= High level SSH command execution + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${PY_FLAVOR} # <3.0 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} + +USES= python:2.7 +USE_PYTHON= distutils concurrent autoplist + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fabric + +NO_ARCH= yes + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v \ + --exclude=test_nested_execution_with_explicit_ports + +.include diff --git a/devel/py-fabric1/distinfo b/devel/py-fabric1/distinfo new file mode 100644 index 00000000000..da201a34135 --- /dev/null +++ b/devel/py-fabric1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1554010618 +SHA256 (Fabric-1.14.1.tar.gz) = 66097883bb3e5beecacae92b82b2bd489d10a8fd4f06ce1cb27019de2e6d76a8 +SIZE (Fabric-1.14.1.tar.gz) = 220463 diff --git a/devel/py-fabric/files/patch-setup.py b/devel/py-fabric1/files/patch-setup.py similarity index 100% rename from devel/py-fabric/files/patch-setup.py rename to devel/py-fabric1/files/patch-setup.py diff --git a/devel/py-fabric1/pkg-descr b/devel/py-fabric1/pkg-descr new file mode 100644 index 00000000000..c61d1414070 --- /dev/null +++ b/devel/py-fabric1/pkg-descr @@ -0,0 +1,8 @@ +Fabric is a high level Python library designed to execute shell commands +remotely over SSH, yielding useful Python objects in return. + +It builds on top of Invoke (subprocess command execution and command-line +features) and Paramiko (SSH protocol implementation), extending their APIs +to complement one another and provide additional functionality. + +WWW: https://www.fabfile.org diff --git a/devel/py-google-pasta/Makefile b/devel/py-google-pasta/Makefile index 49e2be043ee..1c3f9925ee2 100644 --- a/devel/py-google-pasta/Makefile +++ b/devel/py-google-pasta/Makefile @@ -2,6 +2,7 @@ PORTNAME= google-pasta PORTVERSION= 0.1.7 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,9 +12,14 @@ COMMENT= Library to refactor python code through AST manipulation LICENSE= APACHE20 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} + USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + .include diff --git a/devel/py-google-pasta/files/patch-setup.py b/devel/py-google-pasta/files/patch-setup.py new file mode 100644 index 00000000000..7a0c0d70be2 --- /dev/null +++ b/devel/py-google-pasta/files/patch-setup.py @@ -0,0 +1,27 @@ +# Fix tests running twice +# TODO: Upstream + +# Register six dependency +# https://github.com/google/pasta/pull/77 + +--- setup.py.orig 2019-05-29 17:07:01 UTC ++++ setup.py +@@ -26,7 +26,8 @@ def all_tests(): + test_suite = test_loader.discover('.', pattern='*_test.py') + return test_suite + +-setup( ++if __name__ == '__main__': ++ setup( + name="google-pasta", + version="0.1.7", + packages=find_packages(), +@@ -43,4 +44,7 @@ setup( + "Development Status :: 2 - Pre-Alpha", + "License :: OSI Approved :: Apache Software License", + ], +-) ++ install_requires=[ ++ 'six', ++ ], ++ ) diff --git a/devel/py-jep/Makefile b/devel/py-jep/Makefile index d0179b216a2..d58523b8306 100644 --- a/devel/py-jep/Makefile +++ b/devel/py-jep/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= jep -PORTVERSION= 3.8.2 -PORTREVISION= 2 +PORTVERSION= 3.9.0 CATEGORIES= devel java python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jep/distinfo b/devel/py-jep/distinfo index 384495db66a..c16144619cf 100644 --- a/devel/py-jep/distinfo +++ b/devel/py-jep/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534073822 -SHA256 (jep-3.8.2.tar.gz) = 6825fa2d399c228ebcb0c70b979b6ab733468b7c9541ab48ef1d9ca83184de2f -SIZE (jep-3.8.2.tar.gz) = 2967853 +TIMESTAMP = 1567946938 +SHA256 (jep-3.9.0.tar.gz) = 7a15b6279b703c8af6b1f002186c542770f9059e8b3fe724914f664e67b7e595 +SIZE (jep-3.9.0.tar.gz) = 2999022 diff --git a/devel/py-jupyterlab/Makefile b/devel/py-jupyterlab/Makefile index 7ce2e03f958..e6d21c1bc88 100644 --- a/devel/py-jupyterlab/Makefile +++ b/devel/py-jupyterlab/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jupyterlab -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jupyterlab/distinfo b/devel/py-jupyterlab/distinfo index 13ff89c6aa5..40637473657 100644 --- a/devel/py-jupyterlab/distinfo +++ b/devel/py-jupyterlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567191906 -SHA256 (jupyterlab-1.1.1.tar.gz) = 6515229d18ff3412dd582a4ba780c76476810c9b27d832bd55533d88e2d071d6 -SIZE (jupyterlab-1.1.1.tar.gz) = 11068352 +TIMESTAMP = 1567940867 +SHA256 (jupyterlab-1.1.2.tar.gz) = c5cb8d9b4fd24c1c9114d5e19adf1a2e11926f70ce7a460f6fdf60a9540350ab +SIZE (jupyterlab-1.1.2.tar.gz) = 11064192 diff --git a/devel/py-knack/Makefile b/devel/py-knack/Makefile index 14eb7227d39..914702023d5 100644 --- a/devel/py-knack/Makefile +++ b/devel/py-knack/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= knack -DISTVERSION= 0.6.2 +DISTVERSION= 0.6.3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-knack/distinfo b/devel/py-knack/distinfo index 016936d54b2..0a45a804aa9 100644 --- a/devel/py-knack/distinfo +++ b/devel/py-knack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559779943 -SHA256 (knack-0.6.2.tar.gz) = 281ea8475178089ac730442a874413e1c40a5e7bd7d4107e4e6aef2a6a92bdcf -SIZE (knack-0.6.2.tar.gz) = 61781 +TIMESTAMP = 1567886810 +SHA256 (knack-0.6.3.tar.gz) = b1ac92669641b902e1aef97138666a21b8852f65d83cbde03eb9ddebf82ce121 +SIZE (knack-0.6.3.tar.gz) = 62069 diff --git a/devel/py-lark-parser/Makefile b/devel/py-lark-parser/Makefile index df8ded178cd..62efe1aa5ca 100644 --- a/devel/py-lark-parser/Makefile +++ b/devel/py-lark-parser/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lark-parser -PORTVERSION= 0.7.4 +PORTVERSION= 0.7.5 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-lark-parser/distinfo b/devel/py-lark-parser/distinfo index 7af0a12369b..f277a2f6a56 100644 --- a/devel/py-lark-parser/distinfo +++ b/devel/py-lark-parser/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567191913 -SHA256 (lark-parser-0.7.4.tar.gz) = 64676473e0e45363ea4840dc68be442c9dfab05bf3847d176e551dfbbacbd470 -SIZE (lark-parser-0.7.4.tar.gz) = 274654 +TIMESTAMP = 1567842468 +SHA256 (lark-parser-0.7.5.tar.gz) = 00080827281eee9c9f305dd948c824646f2ea97fe9dbde903be1b608ae786459 +SIZE (lark-parser-0.7.5.tar.gz) = 274865 diff --git a/devel/py-marshmallow/Makefile b/devel/py-marshmallow/Makefile index 672f493add2..0b23e3c2e86 100644 --- a/devel/py-marshmallow/Makefile +++ b/devel/py-marshmallow/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= marshmallow -PORTVERSION= 3.0.2 +PORTVERSION= 3.0.3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-marshmallow/distinfo b/devel/py-marshmallow/distinfo index df23777015e..e7ac4b46b1f 100644 --- a/devel/py-marshmallow/distinfo +++ b/devel/py-marshmallow/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567688309 -SHA256 (marshmallow-3.0.2.tar.gz) = 33155c0d25671e30243ead12f34f4b57949809eb43dc36c2c0eb9296be801ce1 -SIZE (marshmallow-3.0.2.tar.gz) = 168727 +TIMESTAMP = 1567784709 +SHA256 (marshmallow-3.0.3.tar.gz) = 51188df086da5c427c3c193faddf7f95857ee4053dbf2d083e5cbfd846b2fb29 +SIZE (marshmallow-3.0.3.tar.gz) = 168839 diff --git a/devel/py-portalocker/Makefile b/devel/py-portalocker/Makefile index ee99a659787..ad37f1c33e6 100644 --- a/devel/py-portalocker/Makefile +++ b/devel/py-portalocker/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= portalocker -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 1.5.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,7 +17,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -post-extract: - @${RM} -r ${WRKSRC}/tests - .include diff --git a/devel/py-portalocker/distinfo b/devel/py-portalocker/distinfo index 554e1a83c60..e9a1a4ee0b3 100644 --- a/devel/py-portalocker/distinfo +++ b/devel/py-portalocker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550328827 -SHA256 (portalocker-1.4.0.tar.gz) = 3fb35648a9e03f267e54c6186513abbd1cdd321c305502545a3550eea8b2923f -SIZE (portalocker-1.4.0.tar.gz) = 11255 +TIMESTAMP = 1567947250 +SHA256 (portalocker-1.5.1.tar.gz) = 1ed88cff4807267ec3331d2a843529399256043851509c39487db97146dda821 +SIZE (portalocker-1.5.1.tar.gz) = 11746 diff --git a/devel/py-traits/Makefile b/devel/py-traits/Makefile index 84020c06acc..1c3fc347d8c 100644 --- a/devel/py-traits/Makefile +++ b/devel/py-traits/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= traits -PORTVERSION= 5.1.1 -PORTREVISION= 1 +PORTVERSION= 5.1.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-traits/distinfo b/devel/py-traits/distinfo index b12183b9b64..4906b95aa3e 100644 --- a/devel/py-traits/distinfo +++ b/devel/py-traits/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556410550 -SHA256 (traits-5.1.1.tar.gz) = c4489dffb3272f94549a01fccbe447675c0186d2b8d59e8c7013c328e7c39553 -SIZE (traits-5.1.1.tar.gz) = 436742 +TIMESTAMP = 1567733145 +SHA256 (traits-5.1.2.tar.gz) = 7a78594f84dd81486cd876fdfe3648583836377cb9fb02973f307dc06fc52728 +SIZE (traits-5.1.2.tar.gz) = 437698 diff --git a/devel/py-vsts/Makefile b/devel/py-vsts/Makefile new file mode 100644 index 00000000000..c4e6101f22a --- /dev/null +++ b/devel/py-vsts/Makefile @@ -0,0 +1,22 @@ +# $FreeBSD$ + +PORTNAME= vsts +PORTVERSION= 0.1.25 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= dbaio@FreeBSD.org +COMMENT= Python wrapper around the VSTS APIs + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.6.0:net-mgmt/py-msrest@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-vsts/distinfo b/devel/py-vsts/distinfo new file mode 100644 index 00000000000..fb945f8804e --- /dev/null +++ b/devel/py-vsts/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1553909959 +SHA256 (vsts-0.1.25.tar.gz) = da179160121f5b38be061dbff29cd2b60d5d029b2207102454d77a7114e64f97 +SIZE (vsts-0.1.25.tar.gz) = 847327 diff --git a/devel/py-vsts/pkg-descr b/devel/py-vsts/pkg-descr new file mode 100644 index 00000000000..051a215ecd3 --- /dev/null +++ b/devel/py-vsts/pkg-descr @@ -0,0 +1,4 @@ +This repository contains Python APIs for interacting with and managing Azure +DevOps. These APIs power the Visual Studio Team Services CLI. + +WWW: https://pypi.org/project/vsts/ diff --git a/devel/py-whichcraft/Makefile b/devel/py-whichcraft/Makefile index 1cd35dac23b..6028341f0e2 100644 --- a/devel/py-whichcraft/Makefile +++ b/devel/py-whichcraft/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= whichcraft -PORTVERSION= 0.6.0 +PORTVERSION= 0.6.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-whichcraft/distinfo b/devel/py-whichcraft/distinfo index 428344f9c7d..7e7119fef6d 100644 --- a/devel/py-whichcraft/distinfo +++ b/devel/py-whichcraft/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563011681 -SHA256 (whichcraft-0.6.0.tar.gz) = d54caa14cc3f7b1d2276f8753fd05f1dc5a554df6f83a36c5c2a551e81de2498 -SIZE (whichcraft-0.6.0.tar.gz) = 6745 +TIMESTAMP = 1567938473 +SHA256 (whichcraft-0.6.1.tar.gz) = acdbb91b63d6a15efbd6430d1d7b2d36e44a71697e93e19b7ded477afd9fce87 +SIZE (whichcraft-0.6.1.tar.gz) = 6909 diff --git a/devel/rubygem-aws-partitions/Makefile b/devel/rubygem-aws-partitions/Makefile index 0251ab0cb69..70dd01a74a0 100644 --- a/devel/rubygem-aws-partitions/Makefile +++ b/devel/rubygem-aws-partitions/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= aws-partitions -PORTVERSION= 1.208.0 +PORTVERSION= 1.210.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-partitions/distinfo b/devel/rubygem-aws-partitions/distinfo index 561ce27a0c1..6f323ec855c 100644 --- a/devel/rubygem-aws-partitions/distinfo +++ b/devel/rubygem-aws-partitions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567688374 -SHA256 (rubygem/aws-partitions-1.208.0.gem) = 8ba9fb621f1131e5ffbb153fb460942af62ec97d2315ca32bddc69dd19e2726e -SIZE (rubygem/aws-partitions-1.208.0.gem) = 17408 +TIMESTAMP = 1567842474 +SHA256 (rubygem/aws-partitions-1.210.0.gem) = 115feff8c3705d200c9e4f0955a555a0baf34e2348610ed4f0c9106bb56aa237 +SIZE (rubygem/aws-partitions-1.210.0.gem) = 17408 diff --git a/devel/rubygem-aws-sdk-configservice/Makefile b/devel/rubygem-aws-sdk-configservice/Makefile index a4d55f10f6a..baccf98d149 100644 --- a/devel/rubygem-aws-sdk-configservice/Makefile +++ b/devel/rubygem-aws-sdk-configservice/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-configservice -PORTVERSION= 1.35.0 +PORTVERSION= 1.36.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-configservice/distinfo b/devel/rubygem-aws-sdk-configservice/distinfo index d7481d45c08..73d693713a0 100644 --- a/devel/rubygem-aws-sdk-configservice/distinfo +++ b/devel/rubygem-aws-sdk-configservice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567272090 -SHA256 (rubygem/aws-sdk-configservice-1.35.0.gem) = 1016b1fbc267160747603f44c03a1ac91af30a7848d7c3ade44b8734674a349a -SIZE (rubygem/aws-sdk-configservice-1.35.0.gem) = 68608 +TIMESTAMP = 1567784715 +SHA256 (rubygem/aws-sdk-configservice-1.36.0.gem) = 4ba884379eafcea4a2e4db29658ff7d3148308042f17dbc6d79de9ce0b1dd964 +SIZE (rubygem/aws-sdk-configservice-1.36.0.gem) = 77312 diff --git a/devel/rubygem-aws-sdk-core2/Makefile b/devel/rubygem-aws-sdk-core2/Makefile index 6c554b13041..4b9daf80d7b 100644 --- a/devel/rubygem-aws-sdk-core2/Makefile +++ b/devel/rubygem-aws-sdk-core2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.347 +DISTVERSION= 2.11.349 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 2 diff --git a/devel/rubygem-aws-sdk-core2/distinfo b/devel/rubygem-aws-sdk-core2/distinfo index 99bba1f8b15..634f06a71bf 100644 --- a/devel/rubygem-aws-sdk-core2/distinfo +++ b/devel/rubygem-aws-sdk-core2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567688386 -SHA256 (rubygem/aws-sdk-core-2.11.347.gem) = b485a9d4679039660c04d06a7a1a54c9c86de916693d1a1fa97d4b2bd0c27b60 -SIZE (rubygem/aws-sdk-core-2.11.347.gem) = 1645568 +TIMESTAMP = 1567842476 +SHA256 (rubygem/aws-sdk-core-2.11.349.gem) = e0d440a65f542626c493438e8ab2b5ff6a9d4652614f7c480fbc489abc67b475 +SIZE (rubygem/aws-sdk-core-2.11.349.gem) = 1646080 diff --git a/devel/rubygem-aws-sdk-kinesisanalytics/Makefile b/devel/rubygem-aws-sdk-kinesisanalytics/Makefile index a586f361c48..09b1d0ba250 100644 --- a/devel/rubygem-aws-sdk-kinesisanalytics/Makefile +++ b/devel/rubygem-aws-sdk-kinesisanalytics/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-kinesisanalytics -PORTVERSION= 1.19.0 +PORTVERSION= 1.20.0 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-kinesisanalytics/distinfo b/devel/rubygem-aws-sdk-kinesisanalytics/distinfo index 46163a61c00..7e439bb59cd 100644 --- a/devel/rubygem-aws-sdk-kinesisanalytics/distinfo +++ b/devel/rubygem-aws-sdk-kinesisanalytics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567272202 -SHA256 (rubygem/aws-sdk-kinesisanalytics-1.19.0.gem) = 51f46c141cf44ead7a560d876836329273658c76a406db5ba0998c4779ca3b60 -SIZE (rubygem/aws-sdk-kinesisanalytics-1.19.0.gem) = 38912 +TIMESTAMP = 1567842478 +SHA256 (rubygem/aws-sdk-kinesisanalytics-1.20.0.gem) = 54d14ea7e16e7c70b0231725cde59ed1ff449067e51b3bc99d34dd763471accc +SIZE (rubygem/aws-sdk-kinesisanalytics-1.20.0.gem) = 38912 diff --git a/devel/rubygem-aws-sdk-resources2/Makefile b/devel/rubygem-aws-sdk-resources2/Makefile index 1a0596c109f..5c3330e9165 100644 --- a/devel/rubygem-aws-sdk-resources2/Makefile +++ b/devel/rubygem-aws-sdk-resources2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.347 +DISTVERSION= 2.11.349 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 2 diff --git a/devel/rubygem-aws-sdk-resources2/distinfo b/devel/rubygem-aws-sdk-resources2/distinfo index 6dfac5a8029..d22ac9803ac 100644 --- a/devel/rubygem-aws-sdk-resources2/distinfo +++ b/devel/rubygem-aws-sdk-resources2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567688390 -SHA256 (rubygem/aws-sdk-resources-2.11.347.gem) = 064c5c3de0f8f8cb88100b393aa70fd71d2484108fa3287d4afde6d15b2c3288 -SIZE (rubygem/aws-sdk-resources-2.11.347.gem) = 48640 +TIMESTAMP = 1567842480 +SHA256 (rubygem/aws-sdk-resources-2.11.349.gem) = b24fe7c314a625ee4b2aa620471fcfa560451040ba4d346724c1d8e42a511c86 +SIZE (rubygem/aws-sdk-resources-2.11.349.gem) = 48640 diff --git a/devel/rubygem-aws-sdk2/Makefile b/devel/rubygem-aws-sdk2/Makefile index 3fb3541ad7c..000efbb9925 100644 --- a/devel/rubygem-aws-sdk2/Makefile +++ b/devel/rubygem-aws-sdk2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.347 +DISTVERSION= 2.11.349 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 2 diff --git a/devel/rubygem-aws-sdk2/distinfo b/devel/rubygem-aws-sdk2/distinfo index 1d8e7e56396..c851058f26e 100644 --- a/devel/rubygem-aws-sdk2/distinfo +++ b/devel/rubygem-aws-sdk2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567688396 -SHA256 (rubygem/aws-sdk-2.11.347.gem) = e7ec8c5f9b4fe63664a22f370ef4b01f2e51890fd8baecd502bf7a263401a64a -SIZE (rubygem/aws-sdk-2.11.347.gem) = 4608 +TIMESTAMP = 1567842482 +SHA256 (rubygem/aws-sdk-2.11.349.gem) = 8d36764a659b7f77d0d928a325d9e61e987964e0f8b2a9eaa3f704c3beb727ab +SIZE (rubygem/aws-sdk-2.11.349.gem) = 4608 diff --git a/devel/rubygem-crack/Makefile b/devel/rubygem-crack/Makefile index 4f4bea00057..1b77f688af7 100644 --- a/devel/rubygem-crack/Makefile +++ b/devel/rubygem-crack/Makefile @@ -12,10 +12,11 @@ COMMENT= Ruby Library of Simple JSON and XML Parsing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-safe_yaml>=1.0.0:devel/rubygem-safe_yaml +RUN_DEPENDS= rubygem-safe_yaml>=1.0.0<1.1:devel/rubygem-safe_yaml + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem .include diff --git a/devel/rubygem-cucumber-core/Makefile b/devel/rubygem-cucumber-core/Makefile index 39d5678ff57..d503d224ea3 100644 --- a/devel/rubygem-cucumber-core/Makefile +++ b/devel/rubygem-cucumber-core/Makefile @@ -14,11 +14,16 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-cucumber-tag_expressions>=1.1.0:devel/rubygem-cucumber-tag_expressions \ - rubygem-gherkin>=5.0:textproc/rubygem-gherkin + rubygem-gherkin>=5.0<6:textproc/rubygem-gherkin USES= gem USE_RUBY= yes NO_ARCH= yes +post-patch: +# Remove backports + @${REINPLACE_CMD} -e '/backports/d' ${WRKSRC}/cucumber-core.gemspec + @${REINPLACE_CMD} -e "/require 'backports/d" ${WRKSRC}/lib/cucumber/core/event.rb + .include diff --git a/devel/rubygem-cucumber-core/files/patch-gemspec b/devel/rubygem-cucumber-core/files/patch-gemspec deleted file mode 100644 index 114fed19f7d..00000000000 --- a/devel/rubygem-cucumber-core/files/patch-gemspec +++ /dev/null @@ -1,12 +0,0 @@ ---- cucumber-core.gemspec.orig 2019-07-18 18:16:20 UTC -+++ cucumber-core.gemspec -@@ -24,8 +24,7 @@ Gem::Specification.new do |s| - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q.freeze, ["~> 5.0"]) -- s.add_runtime_dependency(%q.freeze, ["~> 1.1.0"]) -- s.add_runtime_dependency(%q.freeze, [">= 3.8.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 1.1.0"]) - s.add_development_dependency(%q.freeze, ["~> 1.16.0"]) - s.add_development_dependency(%q.freeze, [">= 0.9.2"]) - s.add_development_dependency(%q.freeze, ["~> 3.6"]) diff --git a/devel/rubygem-cucumber-core/files/patch-lib-cucumber-core-event.rb b/devel/rubygem-cucumber-core/files/patch-lib-cucumber-core-event.rb deleted file mode 100644 index 85df0988a46..00000000000 --- a/devel/rubygem-cucumber-core/files/patch-lib-cucumber-core-event.rb +++ /dev/null @@ -1,8 +0,0 @@ ---- lib/cucumber/core/event.rb.orig 2017-09-28 08:34:06 UTC -+++ lib/cucumber/core/event.rb -@@ -1,5 +1,3 @@ --require 'backports/2.1.0/array/to_h' -- - module Cucumber - module Core - class Event diff --git a/devel/rubygem-devise-rails5/Makefile b/devel/rubygem-devise-rails5/Makefile index 04cfdda6315..eb30fd6febe 100644 --- a/devel/rubygem-devise-rails5/Makefile +++ b/devel/rubygem-devise-rails5/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= devise -PORTVERSION= 4.7.0 +PORTVERSION= 4.7.1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 diff --git a/devel/rubygem-devise-rails5/distinfo b/devel/rubygem-devise-rails5/distinfo index ce2f638bcc9..a399f46300e 100644 --- a/devel/rubygem-devise-rails5/distinfo +++ b/devel/rubygem-devise-rails5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566324269 -SHA256 (rubygem/devise-4.7.0.gem) = b0283431db29de160600fa421dfe24a5fd7d68d6894ae15f05ca891c34841161 -SIZE (rubygem/devise-4.7.0.gem) = 88064 +TIMESTAMP = 1567842484 +SHA256 (rubygem/devise-4.7.1.gem) = 31e5eaebf25a68c8a0ccce173fe109fb4e45abcbb992777374e01ad900eec428 +SIZE (rubygem/devise-4.7.1.gem) = 88576 diff --git a/devel/rubygem-devise-rails52/Makefile b/devel/rubygem-devise-rails52/Makefile index ce5311956b9..bf74061e2dc 100644 --- a/devel/rubygem-devise-rails52/Makefile +++ b/devel/rubygem-devise-rails52/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= devise -PORTVERSION= 4.7.0 +PORTVERSION= 4.7.1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails52 diff --git a/devel/rubygem-devise-rails52/distinfo b/devel/rubygem-devise-rails52/distinfo index ce2f638bcc9..a399f46300e 100644 --- a/devel/rubygem-devise-rails52/distinfo +++ b/devel/rubygem-devise-rails52/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566324269 -SHA256 (rubygem/devise-4.7.0.gem) = b0283431db29de160600fa421dfe24a5fd7d68d6894ae15f05ca891c34841161 -SIZE (rubygem/devise-4.7.0.gem) = 88064 +TIMESTAMP = 1567842484 +SHA256 (rubygem/devise-4.7.1.gem) = 31e5eaebf25a68c8a0ccce173fe109fb4e45abcbb992777374e01ad900eec428 +SIZE (rubygem/devise-4.7.1.gem) = 88576 diff --git a/devel/rubygem-devise/Makefile b/devel/rubygem-devise/Makefile index 2ec1b3a91f3..aceba774132 100644 --- a/devel/rubygem-devise/Makefile +++ b/devel/rubygem-devise/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= devise -PORTVERSION= 4.7.0 +PORTVERSION= 4.7.1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-devise/distinfo b/devel/rubygem-devise/distinfo index ce2f638bcc9..a399f46300e 100644 --- a/devel/rubygem-devise/distinfo +++ b/devel/rubygem-devise/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566324269 -SHA256 (rubygem/devise-4.7.0.gem) = b0283431db29de160600fa421dfe24a5fd7d68d6894ae15f05ca891c34841161 -SIZE (rubygem/devise-4.7.0.gem) = 88064 +TIMESTAMP = 1567842484 +SHA256 (rubygem/devise-4.7.1.gem) = 31e5eaebf25a68c8a0ccce173fe109fb4e45abcbb992777374e01ad900eec428 +SIZE (rubygem/devise-4.7.1.gem) = 88576 diff --git a/devel/rubygem-faker/Makefile b/devel/rubygem-faker/Makefile index 4b44ead0db3..546e08c4f52 100644 --- a/devel/rubygem-faker/Makefile +++ b/devel/rubygem-faker/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= faker -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ COMMENT= Library for generating fake data: names, addresses, phone numbers LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt -RUN_DEPENDS= rubygem-i18n>=0.8:devel/rubygem-i18n +RUN_DEPENDS= rubygem-i18n>=1.6.0,2<1.7,2:devel/rubygem-i18n USES= gem USE_RUBY= yes diff --git a/devel/rubygem-faker/distinfo b/devel/rubygem-faker/distinfo index 1b32ad394b4..493c80e8fe2 100644 --- a/devel/rubygem-faker/distinfo +++ b/devel/rubygem-faker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567362095 -SHA256 (rubygem/faker-2.2.1.gem) = ba171d5cc32360beb46ee0addb19540ddae5b440015d35ea9732357c3fbefff2 -SIZE (rubygem/faker-2.2.1.gem) = 862720 +TIMESTAMP = 1567842486 +SHA256 (rubygem/faker-2.2.2.gem) = 2efbcde352156ff15e5dfcb6b0106bc6c263a2652e54106a7a660e826c1472cc +SIZE (rubygem/faker-2.2.2.gem) = 858112 diff --git a/devel/rubygem-grape_logging/Makefile b/devel/rubygem-grape_logging/Makefile index afbd920b52d..534a7b713f4 100644 --- a/devel/rubygem-grape_logging/Makefile +++ b/devel/rubygem-grape_logging/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= grape_logging -PORTVERSION= 1.8.1 +PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-grape_logging/distinfo b/devel/rubygem-grape_logging/distinfo index 211645148c8..88a88aa5afd 100644 --- a/devel/rubygem-grape_logging/distinfo +++ b/devel/rubygem-grape_logging/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549018944 -SHA256 (rubygem/grape_logging-1.8.1.gem) = 9109e6d404898e102b82cd8c5234522276ded4c6ec7be73426c750fb2beb33d2 -SIZE (rubygem/grape_logging-1.8.1.gem) = 12800 +TIMESTAMP = 1567784724 +SHA256 (rubygem/grape_logging-1.8.2.gem) = 0c9edce47be391c52c289a738f696fa4e56c25ab17e0fea58a9f74da6f110230 +SIZE (rubygem/grape_logging-1.8.2.gem) = 12800 diff --git a/devel/rubygem-grape_logging/files/patch-lib-grape_logging-util-parameter_filter.rb b/devel/rubygem-grape_logging/files/patch-lib-grape_logging-util-parameter_filter.rb new file mode 100644 index 00000000000..9b9392964de --- /dev/null +++ b/devel/rubygem-grape_logging/files/patch-lib-grape_logging-util-parameter_filter.rb @@ -0,0 +1,9 @@ +--- lib/grape_logging/util/parameter_filter.rb.orig 2019-09-07 15:56:34 UTC ++++ lib/grape_logging/util/parameter_filter.rb +@@ -1,5 +1,5 @@ + if defined?(::Rails.application) +- class ParameterFilter < ActiveSupport::ParameterFilter ++ class ParameterFilter < ActionDispatch::Http::ParameterFilter + def initialize(_replacement, filter_parameters) + super(filter_parameters) + end diff --git a/devel/rubygem-grape_logging181/Makefile b/devel/rubygem-grape_logging181/Makefile new file mode 100644 index 00000000000..2835ddd27b3 --- /dev/null +++ b/devel/rubygem-grape_logging181/Makefile @@ -0,0 +1,26 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= grape_logging +PORTVERSION= 1.8.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 181 + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Request logging for Grape + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-grape>=0:devel/rubygem-grape \ + rubygem-rack>=0:www/rubygem-rack + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +PORTSCOUT= limit:^1\.8\.1 + +.include diff --git a/devel/rubygem-grape_logging181/distinfo b/devel/rubygem-grape_logging181/distinfo new file mode 100644 index 00000000000..211645148c8 --- /dev/null +++ b/devel/rubygem-grape_logging181/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1549018944 +SHA256 (rubygem/grape_logging-1.8.1.gem) = 9109e6d404898e102b82cd8c5234522276ded4c6ec7be73426c750fb2beb33d2 +SIZE (rubygem/grape_logging-1.8.1.gem) = 12800 diff --git a/devel/rubygem-grape_logging181/pkg-descr b/devel/rubygem-grape_logging181/pkg-descr new file mode 100644 index 00000000000..68b45b2a7a6 --- /dev/null +++ b/devel/rubygem-grape_logging181/pkg-descr @@ -0,0 +1,5 @@ +This gem provides simple request logging for Grape with just few lines of code +you have to put in your project! In return you will get response codes, paths, +parameters and more! + +WWW: https://github.com/aserafin/grape_logging diff --git a/devel/rubygem-jekyll-coffeescript/Makefile b/devel/rubygem-jekyll-coffeescript/Makefile index c5933904224..432746856ec 100644 --- a/devel/rubygem-jekyll-coffeescript/Makefile +++ b/devel/rubygem-jekyll-coffeescript/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jekyll-coffeescript -PORTVERSION= 1.2.2 +PORTVERSION= 2.0.0 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,8 +11,8 @@ COMMENT= CoffeeScript converter for Jekyll LICENSE= MIT -RUN_DEPENDS= rubygem-coffee-script>=2.2:devel/rubygem-coffee-script \ - rubygem-coffee-script-source>=1.12:devel/rubygem-coffee-script-source +RUN_DEPENDS= rubygem-coffee-script>=2.2<3:devel/rubygem-coffee-script \ + rubygem-coffee-script-source>=1.12<2:devel/rubygem-coffee-script-source USES= gem USE_RUBY= yes diff --git a/devel/rubygem-jekyll-coffeescript/distinfo b/devel/rubygem-jekyll-coffeescript/distinfo index 76ee6b5861e..bbb20dd8a12 100644 --- a/devel/rubygem-jekyll-coffeescript/distinfo +++ b/devel/rubygem-jekyll-coffeescript/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553536705 -SHA256 (rubygem/jekyll-coffeescript-1.2.2.gem) = 894e71c2071a834e76eb7e8044944440a0c81c2c7092532fed1503b13d331110 -SIZE (rubygem/jekyll-coffeescript-1.2.2.gem) = 4608 +TIMESTAMP = 1567842488 +SHA256 (rubygem/jekyll-coffeescript-2.0.0.gem) = 329c72fb62843056a5d6711514d4ff7f17a799169e88167d1d3a83ea1698d29d +SIZE (rubygem/jekyll-coffeescript-2.0.0.gem) = 4608 diff --git a/devel/rubygem-octopress-hooks/Makefile b/devel/rubygem-octopress-hooks/Makefile index 98d3fb4597a..245cd91668d 100644 --- a/devel/rubygem-octopress-hooks/Makefile +++ b/devel/rubygem-octopress-hooks/Makefile @@ -2,6 +2,7 @@ PORTNAME= octopress-hooks PORTVERSION= 2.6.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,10 +12,11 @@ COMMENT= Allows access to Jekyll data at different internal processing stages LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-jekyll>=2.0:www/rubygem-jekyll +RUN_DEPENDS= rubygem-jekyll3>=2.0:www/rubygem-jekyll3 + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem .include diff --git a/devel/rubygem-safe_yaml/Makefile b/devel/rubygem-safe_yaml/Makefile index c16a32e1bd3..e14bbdaf699 100644 --- a/devel/rubygem-safe_yaml/Makefile +++ b/devel/rubygem-safe_yaml/Makefile @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= safe_yaml -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.5 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Parse YAML safely LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt +USES= gem shebangfix +USE_RUBY= yes + NO_ARCH= yes -USE_RUBY= yes -USES= gem shebangfix -SHEBANG_FILES= bundle_install_all_ruby_versions.sh \ - run_specs_all_ruby_versions.sh PLIST_FILES= bin/safe_yaml +SHEBANG_GLOB= *.sh + .include diff --git a/devel/rubygem-safe_yaml/distinfo b/devel/rubygem-safe_yaml/distinfo index b69bbdaadf4..b657b2d6c65 100644 --- a/devel/rubygem-safe_yaml/distinfo +++ b/devel/rubygem-safe_yaml/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/safe_yaml-1.0.4.gem) = 248193992ef1730a0c9ec579999ef2256a2b3a32a9bd9d708a1e12544a489ec2 -SIZE (rubygem/safe_yaml-1.0.4.gem) = 30208 +TIMESTAMP = 1567842490 +SHA256 (rubygem/safe_yaml-1.0.5.gem) = a6ac2d64b7eb027bdeeca1851fe7e7af0d668e133e8a88066a0c6f7087d9f848 +SIZE (rubygem/safe_yaml-1.0.5.gem) = 30720 diff --git a/devel/rubygem-safe_yaml/pkg-descr b/devel/rubygem-safe_yaml/pkg-descr index 9fcd1318b8c..15c0b418b5c 100644 --- a/devel/rubygem-safe_yaml/pkg-descr +++ b/devel/rubygem-safe_yaml/pkg-descr @@ -1,4 +1,4 @@ Parse YAML safely, without that pesky arbitrary object deserialization vulnerability -WWW: http://dtao.github.io/safe_yaml/ +WWW: https://github.com/dtao/safe_yaml diff --git a/devel/rubygem-tty-markdown/Makefile b/devel/rubygem-tty-markdown/Makefile index 7664fbfb3c9..9de90fdae5a 100644 --- a/devel/rubygem-tty-markdown/Makefile +++ b/devel/rubygem-tty-markdown/Makefile @@ -3,6 +3,7 @@ PORTNAME= tty-markdown PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,7 +13,7 @@ COMMENT= Convert markdown document/text into terminal friendly output LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-kramdown>=1.16.2<2:textproc/rubygem-kramdown \ +RUN_DEPENDS= rubygem-kramdown1>=1.16.2<2:textproc/rubygem-kramdown1 \ rubygem-pastel>=0.7.2<0.8:devel/rubygem-pastel \ rubygem-rouge>=3.3<4:textproc/rubygem-rouge \ rubygem-strings>=0.1.4<0.2:devel/rubygem-strings \ diff --git a/devel/rubygem-zeitwerk/Makefile b/devel/rubygem-zeitwerk/Makefile index 0ea218081ab..107e57b4daf 100644 --- a/devel/rubygem-zeitwerk/Makefile +++ b/devel/rubygem-zeitwerk/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zeitwerk -PORTVERSION= 2.1.9 +PORTVERSION= 2.1.10 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,4 +14,6 @@ LICENSE= MIT USES= gem USE_RUBY= yes +NO_ARCH= yes + .include diff --git a/devel/rubygem-zeitwerk/distinfo b/devel/rubygem-zeitwerk/distinfo index b94f1689c85..b0777960c0f 100644 --- a/devel/rubygem-zeitwerk/distinfo +++ b/devel/rubygem-zeitwerk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566809897 -SHA256 (rubygem/zeitwerk-2.1.9.gem) = fcdf5dd8ba6aab1867735dfd02730e1f92a08cbec4d677f16629c903c4c3513d -SIZE (rubygem/zeitwerk-2.1.9.gem) = 20992 +TIMESTAMP = 1567842492 +SHA256 (rubygem/zeitwerk-2.1.10.gem) = c00d3e4f9622b709431ca3cc75cb178eb363d97a7b99c87746703701c6eb2f40 +SIZE (rubygem/zeitwerk-2.1.10.gem) = 20992 diff --git a/devel/thonny/Makefile b/devel/thonny/Makefile index 793d0880eb0..0754f6e2169 100644 --- a/devel/thonny/Makefile +++ b/devel/thonny/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= thonny -PORTVERSION= 3.1.2 +PORTVERSION= 3.2.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} diff --git a/devel/thonny/distinfo b/devel/thonny/distinfo index f4d0289a974..bfb905eabc5 100644 --- a/devel/thonny/distinfo +++ b/devel/thonny/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550362194 -SHA256 (thonny-3.1.2.tar.gz) = 13dd3fc1f5150853904e1cec650c380e4ed27b8cc38e14938ef2522d0d41ba35 -SIZE (thonny-3.1.2.tar.gz) = 378077 +TIMESTAMP = 1567939723 +SHA256 (thonny-3.2.1.tar.gz) = 01098357e6224fe9d0e9de4ff88c4d6b4bb2a68a6c52a0730bff08faf44b2980 +SIZE (thonny-3.2.1.tar.gz) = 691488 diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index 61325146da2..db6b6ea996e 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -3,12 +3,12 @@ PORTNAME= xcoral PORTVERSION= 3.47 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= http://xcoral.free.fr/ PATCH_SITES= http://aldan.algebra.com/~mi/port-stuff/ -PATCHFILES= xcoral-alpheus-and-peneus.patch.bz2 +PATCHFILES= xcoral-alpheus-and-peneus-2019.patch.bz2 MAINTAINER= mi@aldan.algebra.com COMMENT= Multiwindow mouse-based text editor for X diff --git a/editors/xcoral/distinfo b/editors/xcoral/distinfo index 0cd3d67c23c..5517f675c3d 100644 --- a/editors/xcoral/distinfo +++ b/editors/xcoral/distinfo @@ -1,4 +1,5 @@ +TIMESTAMP = 1567738907 SHA256 (xcoral-3.47.tar.gz) = 886e02eeb96e494d32969fcf41dcd09133896b717b714eb42affed1f460af3dd SIZE (xcoral-3.47.tar.gz) = 2760763 -SHA256 (xcoral-alpheus-and-peneus.patch.bz2) = f04cc61f0cf05cbdfe720e7b6f4f743d26f2a04dc109a2ead445394a739456a0 -SIZE (xcoral-alpheus-and-peneus.patch.bz2) = 71099 +SHA256 (xcoral-alpheus-and-peneus-2019.patch.bz2) = fcc31a3f7b1dfbcab1c10853ee69afe93e74fba3ac81cd23325e8f7b81852d45 +SIZE (xcoral-alpheus-and-peneus-2019.patch.bz2) = 71180 diff --git a/emulators/citra-qt5/Makefile b/emulators/citra-qt5/Makefile index 690002e635c..ac7516fe5ba 100644 --- a/emulators/citra-qt5/Makefile +++ b/emulators/citra-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../citra diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index b170874df2f..47e5f51c39c 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20190902 -PORTREVISION?= 0 +PORTVERSION= s20190906 +PORTREVISION?= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 8acd2b966 +GH_TAGNAME= 4bc22aa35 GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ @@ -45,13 +45,13 @@ LDFLAGS+= -Wl,--as-needed # Qt5Network TEST_TARGET= test OPTIONS_DEFINE= ALSA FFMPEG PULSEAUDIO JACK SNDIO -OPTIONS_DEFAULT=ALSA FFMPEG PULSEAUDIO JACK +OPTIONS_DEFAULT=ALSA FFMPEG PULSEAUDIO JACK SNDIO OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA @@ -61,10 +61,10 @@ FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG_AUDIO_DECODER ENABLE_FFMPEG_VIDEO_DUMPER JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK -PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0.:audio/pulseaudio +PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE -SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO SDL_CMAKE_BOOL= ENABLE_SDL2 diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 745fe1167e9..2ebe18d712b 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1567438685 -SHA256 (citra-emu-citra-s20190902-8acd2b966_GH0.tar.gz) = 5d4e7a17539654d207212ae061741db786980e513570c884049cb57b3788a071 -SIZE (citra-emu-citra-s20190902-8acd2b966_GH0.tar.gz) = 5062786 +TIMESTAMP = 1567778886 +SHA256 (citra-emu-citra-s20190906-4bc22aa35_GH0.tar.gz) = 59b7db608412090a52ed3a4ca1580ef0e019fd5370d0a895513dcbf962cc5d98 +SIZE (citra-emu-citra-s20190906-4bc22aa35_GH0.tar.gz) = 5062871 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c diff --git a/emulators/citra/files/patch-cubeb-dlopen b/emulators/citra/files/patch-cubeb-dlopen new file mode 100644 index 00000000000..b523917f994 --- /dev/null +++ b/emulators/citra/files/patch-cubeb-dlopen @@ -0,0 +1,809 @@ +https://github.com/kinetiknz/cubeb/commit/0d1d9d84fb3e +https://github.com/kinetiknz/cubeb/pull/539 + +diff --git externals/cubeb/CMakeLists.txt externals/cubeb/CMakeLists.txt +index cdb00f9..71373cb 100644 +--- externals/cubeb/CMakeLists.txt ++++ externals/cubeb/CMakeLists.txt +@@ -135,10 +135,7 @@ if(USE_PULSE) + target_sources(cubeb PRIVATE + src/cubeb_pulse.c) + target_compile_definitions(cubeb PRIVATE USE_PULSE) +- target_link_libraries(cubeb PRIVATE pulse) +- if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- target_link_libraries(cubeb PRIVATE dl) +- endif() ++ target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS}) + endif() + + check_include_files(alsa/asoundlib.h USE_ALSA) +@@ -146,10 +143,7 @@ if(USE_ALSA) + target_sources(cubeb PRIVATE + src/cubeb_alsa.c) + target_compile_definitions(cubeb PRIVATE USE_ALSA) +- target_link_libraries(cubeb PRIVATE asound pthread) +- if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- target_link_libraries(cubeb PRIVATE dl) +- endif() ++ target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS}) + endif() + + check_include_files(jack/jack.h USE_JACK) +@@ -157,10 +151,7 @@ if(USE_JACK) + target_sources(cubeb PRIVATE + src/cubeb_jack.cpp) + target_compile_definitions(cubeb PRIVATE USE_JACK) +- target_link_libraries(cubeb PRIVATE jack pthread) +- if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- target_link_libraries(cubeb PRIVATE dl) +- endif() ++ target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS}) + endif() + + check_include_files(audioclient.h USE_WASAPI) +@@ -201,7 +192,7 @@ if(USE_SNDIO) + target_sources(cubeb PRIVATE + src/cubeb_sndio.c) + target_compile_definitions(cubeb PRIVATE USE_SNDIO) +- target_link_libraries(cubeb PRIVATE sndio) ++ target_link_libraries(cubeb PRIVATE pthread) + endif() + + check_include_files(kai.h USE_KAI) +diff --git externals/cubeb/src/cubeb.c externals/cubeb/src/cubeb.c +index e562a35..d66dd16 100644 +--- externals/cubeb/src/cubeb.c ++++ externals/cubeb/src/cubeb.c +@@ -177,6 +177,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_JACK) + jack_init, + #endif ++#if defined(USE_SNDIO) ++ sndio_init, ++#endif + #if defined(USE_ALSA) + alsa_init, + #endif +@@ -189,9 +192,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_WINMM) + winmm_init, + #endif +-#if defined(USE_SNDIO) +- sndio_init, +-#endif + #if defined(USE_OPENSL) + opensl_init, + #endif +diff --git externals/cubeb/src/cubeb_alsa.c externals/cubeb/src/cubeb_alsa.c +index bfd4d8f..a29eed0 100644 +--- externals/cubeb/src/cubeb_alsa.c ++++ externals/cubeb/src/cubeb_alsa.c +@@ -14,10 +14,58 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" + ++#ifdef DISABLE_LIBASOUND_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBASOUND_API_VISIT(X) \ ++ X(snd_config) \ ++ X(snd_config_add) \ ++ X(snd_config_copy) \ ++ X(snd_config_delete) \ ++ X(snd_config_get_id) \ ++ X(snd_config_get_string) \ ++ X(snd_config_imake_integer) \ ++ X(snd_config_search) \ ++ X(snd_config_search_definition) \ ++ X(snd_lib_error_set_handler) \ ++ X(snd_pcm_avail_update) \ ++ X(snd_pcm_close) \ ++ X(snd_pcm_delay) \ ++ X(snd_pcm_drain) \ ++ X(snd_pcm_frames_to_bytes) \ ++ X(snd_pcm_get_params) \ ++ X(snd_pcm_hw_params_any) \ ++ X(snd_pcm_hw_params_get_channels_max) \ ++ X(snd_pcm_hw_params_get_rate) \ ++ X(snd_pcm_hw_params_set_rate_near) \ ++ X(snd_pcm_hw_params_sizeof) \ ++ X(snd_pcm_nonblock) \ ++ X(snd_pcm_open) \ ++ X(snd_pcm_open_lconf) \ ++ X(snd_pcm_pause) \ ++ X(snd_pcm_poll_descriptors) \ ++ X(snd_pcm_poll_descriptors_count) \ ++ X(snd_pcm_poll_descriptors_revents) \ ++ X(snd_pcm_readi) \ ++ X(snd_pcm_recover) \ ++ X(snd_pcm_set_params) \ ++ X(snd_pcm_start) \ ++ X(snd_pcm_state) \ ++ X(snd_pcm_writei) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBASOUND_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++/* snd_pcm_hw_params_alloca is actually a macro */ ++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof ++#endif ++ + #define CUBEB_STREAM_MAX 16 + #define CUBEB_WATCHDOG_MS 10000 + +@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libasound; + + pthread_t thread; + +@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) + static void + stream_buffer_decrement(cubeb_stream * stm, long count) + { +- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); +- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); ++ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); ++ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); + stm->bufframes -= count; + } + +@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) + /* Call _poll_descriptors_revents() even if we don't use it + to let underlying plugins clear null events. Otherwise poll() + may wake up again and again, producing unnecessary CPU usage. */ +- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); ++ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); + +- avail = snd_pcm_avail_update(stm->pcm); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + + /* Got null event? Bail and wait for another wakeup. */ + if (avail == 0) { +@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) + // TODO: should it be marked as DRAINING? + } + +- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); ++ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); + + if (got < 0) { + avail = got; // the error handler below will recover us +@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) + (!stm->other_stream || stm->other_stream->bufframes > 0)) { + long got = avail - stm->bufframes; + void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); + + /* Correct read size to the other stream available frames */ + if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { +@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) + long drain_frames = avail - stm->bufframes; + double drain_time = (double) drain_frames / stm->params.rate; + +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); +- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); ++ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); + stm->bufframes = avail; + + /* Mark as draining, unless we're waiting for capture */ +@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) + } + } + +- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); + if (wrote < 0) { + avail = wrote; // the error handler below will recover us + } else { +@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) + + /* Got some error? Let's try to recover the stream. */ + if (avail < 0) { +- avail = snd_pcm_recover(stm->pcm, avail, 0); ++ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); + + /* Capture pcm must be started after initial setup/recover */ + if (avail >= 0 && + stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- avail = snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ avail = WRAP(snd_pcm_start)(stm->pcm); + } + } + +@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + + slave_def = NULL; + +- r = snd_config_search(root_pcm, "slave", &slave_pcm); ++ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); + if (r < 0) { + return NULL; + } + +- r = snd_config_get_string(slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_pcm, &string); + if (r >= 0) { +- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); + if (r < 0) { + return NULL; + } + } + + do { +- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); ++ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); + if (r < 0) { + break; + } + +- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); + if (r < 0) { + break; + } +@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm); + if (r < 0) { + break; + } +@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + } while (0); + + if (slave_def) { +- snd_config_delete(slave_def); ++ WRAP(snd_config_delete)(slave_def); + } + + return NULL; +@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) + + lconf = NULL; + +- if (snd_config == NULL) { ++ if (*WRAP(snd_config) == NULL) { + return NULL; + } + +- r = snd_config_copy(&lconf, snd_config); ++ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); + if (r < 0) { + return NULL; + } + + do { +- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); + if (r < 0) { + break; + } + +- r = snd_config_get_id(pcm_node, &string); ++ r = WRAP(snd_config_get_id)(pcm_node, &string); + if (r < 0) { + break; + } +@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm_node); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); + if (r < 0) { + break; + } +@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) + } + + /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ +- r = snd_config_search(pcm_node, "type", &node); ++ r = WRAP(snd_config_search)(pcm_node, "type", &node); + if (r < 0) { + break; + } + +- r = snd_config_get_string(node, &string); ++ r = WRAP(snd_config_get_string)(node, &string); + if (r < 0) { + break; + } +@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) + + /* Don't clobber an explicit existing handle_underrun value, set it only + if it doesn't already exist. */ +- r = snd_config_search(pcm_node, "handle_underrun", &node); ++ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); + if (r != -ENOENT) { + break; + } + + /* Disable pcm_pulse's asynchronous underrun handling. */ +- r = snd_config_imake_integer(&node, "handle_underrun", 0); ++ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); + if (r < 0) { + break; + } + +- r = snd_config_add(pcm_node, node); ++ r = WRAP(snd_config_add)(pcm_node, node); + if (r < 0) { + break; + } +@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) + return lconf; + } while (0); + +- snd_config_delete(lconf); ++ WRAP(snd_config_delete)(lconf); + + return NULL; + } +@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (local_config) { +- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); ++ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); + } else { +- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); ++ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); + } + pthread_mutex_unlock(&cubeb_alsa_mutex); + +@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) + int r; + + pthread_mutex_lock(&cubeb_alsa_mutex); +- r = snd_pcm_close(pcm); ++ r = WRAP(snd_pcm_close)(pcm); + pthread_mutex_unlock(&cubeb_alsa_mutex); + + return r; +@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function, + alsa_init(cubeb ** context, char const * context_name) + { + (void)context_name; ++ void * libasound = NULL; + cubeb * ctx; + int r; + int i; +@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name) + assert(context); + *context = NULL; + ++#ifndef DISABLE_LIBASOUND_DLOPEN ++ libasound = dlopen("libasound.so", RTLD_LAZY); ++ if (!libasound) { ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libasound, #x); \ ++ if (!cubeb_##x) { \ ++ dlclose(libasound); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBASOUND_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + pthread_mutex_lock(&cubeb_alsa_mutex); + if (!cubeb_alsa_error_handler_set) { +- snd_lib_error_set_handler(silent_error_handler); ++ WRAP(snd_lib_error_set_handler)(silent_error_handler); + cubeb_alsa_error_handler_set = 1; + } + pthread_mutex_unlock(&cubeb_alsa_mutex); +@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name) + assert(ctx); + + ctx->ops = &alsa_ops; ++ ctx->libasound = libasound; + + r = pthread_mutex_init(&ctx->mutex, NULL); + assert(r == 0); +@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name) + config fails with EINVAL, the PA PCM is too old for this workaround. */ + if (r == -EINVAL) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + ctx->local_config = NULL; + } else if (r >= 0) { +@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx) + + if (ctx->local_config) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + } + ++ if (ctx->libasound) { ++ dlclose(ctx->libasound); ++ } ++ + free(ctx); + } + +@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR; + } + +- r = snd_pcm_nonblock(stm->pcm, 1); ++ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); + assert(r == 0); + + latency_us = latency_frames * 1e6 / stm->params.rate; +@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + latency_us = latency_us < min_latency ? min_latency: latency_us; + } + +- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, ++ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, + stm->params.channels, stm->params.rate, 1, + latency_us); + if (r < 0) { +@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR_INVALID_FORMAT; + } + +- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); ++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); + assert(r == 0); + + /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ + stm->buffer_size *= 2; +- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); ++ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); + assert(stm->buffer); + +- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); ++ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); + assert(stm->nfds > 0); + + stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); + assert(stm->saved_fds); +- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); ++ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); + assert((nfds_t) r == stm->nfds); + + if (alsa_register_stream(ctx, stm) != 0) { +@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + if (stm->pcm) { + if (stm->state == DRAINING) { +- snd_pcm_drain(stm->pcm); ++ WRAP(snd_pcm_drain)(stm->pcm); + } + alsa_locked_pcm_close(stm->pcm); + stm->pcm = NULL; +@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) + + assert(stm); + +- r = snd_pcm_hw_params_any(stm->pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); ++ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); + if (r < 0) { + return CUBEB_ERROR; + } +@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { + + /* get a pcm, disabling resampling, so we get a rate the + * hardware/dmix/pulse/etc. supports. */ +- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); ++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_any(pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); ++ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); + if (r >= 0) { + /* There is a default rate: use it. */ +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_OK; + } + + /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ + *rate = 44100; + +- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); ++ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + + return CUBEB_OK; + } +@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + /* Capture pcm must be started after initial setup/recover */ + if (stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ WRAP(snd_pcm_start)(stm->pcm); + } +- snd_pcm_pause(stm->pcm, 0); ++ WRAP(snd_pcm_pause)(stm->pcm, 0); + gettimeofday(&stm->last_activity, NULL); + pthread_mutex_unlock(&stm->mutex); + +@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm) + pthread_mutex_unlock(&ctx->mutex); + + pthread_mutex_lock(&stm->mutex); +- snd_pcm_pause(stm->pcm, 1); ++ WRAP(snd_pcm_pause)(stm->pcm, 1); + pthread_mutex_unlock(&stm->mutex); + + return CUBEB_OK; +@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) + pthread_mutex_lock(&stm->mutex); + + delay = -1; +- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || +- snd_pcm_delay(stm->pcm, &delay) != 0) { ++ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || ++ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { + *position = stm->last_position; + pthread_mutex_unlock(&stm->mutex); + return CUBEB_OK; +@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) + snd_pcm_sframes_t delay; + /* This function returns the delay in frames until a frame written using + snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ +- if (snd_pcm_delay(stm->pcm, &delay)) { ++ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { + return CUBEB_ERROR; + } + +diff --git externals/cubeb/src/cubeb_sndio.c externals/cubeb/src/cubeb_sndio.c +index 5a43343..c9a31a7 100644 +--- externals/cubeb/src/cubeb_sndio.c ++++ externals/cubeb/src/cubeb_sndio.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" +@@ -22,10 +23,36 @@ + #define DPR(...) do {} while(0) + #endif + ++#ifdef DISABLE_LIBSNDIO_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBSNDIO_API_VISIT(X) \ ++ X(sio_close) \ ++ X(sio_eof) \ ++ X(sio_getpar) \ ++ X(sio_initpar) \ ++ X(sio_onmove) \ ++ X(sio_open) \ ++ X(sio_pollfd) \ ++ X(sio_read) \ ++ X(sio_revents) \ ++ X(sio_setpar) \ ++ X(sio_setvol) \ ++ X(sio_start) \ ++ X(sio_stop) \ ++ X(sio_write) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBSNDIO_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++#endif ++ + static struct cubeb_ops const sndio_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libsndio; + }; + + struct cubeb_stream { +@@ -103,7 +130,7 @@ sndio_mainloop(void *arg) + DPR("sndio_mainloop()\n"); + s->state_cb(s, s->arg, CUBEB_STATE_STARTED); + pthread_mutex_lock(&s->mtx); +- if (!sio_start(s->hdl)) { ++ if (!WRAP(sio_start)(s->hdl)) { + pthread_mutex_unlock(&s->mtx); + return NULL; + } +@@ -183,7 +210,7 @@ sndio_mainloop(void *arg) + events |= POLLIN; + if ((s->mode & SIO_PLAY) && pstart < pend) + events |= POLLOUT; +- nfds = sio_pollfd(s->hdl, pfds, events); ++ nfds = WRAP(sio_pollfd)(s->hdl, pfds, events); + + if (nfds > 0) { + pthread_mutex_unlock(&s->mtx); +@@ -193,7 +220,7 @@ sndio_mainloop(void *arg) + continue; + } + +- revents = sio_revents(s->hdl, pfds); ++ revents = WRAP(sio_revents)(s->hdl, pfds); + + if (revents & POLLHUP) { + state = CUBEB_STATE_ERROR; +@@ -201,8 +228,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLOUT) { +- n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() werr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -211,8 +238,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLIN) { +- n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() rerr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -224,7 +251,7 @@ sndio_mainloop(void *arg) + if (prime > 0 && (s->mode & SIO_REC)) + rstart = rend; + } +- sio_stop(s->hdl); ++ WRAP(sio_stop)(s->hdl); + s->hwpos = s->swpos; + pthread_mutex_unlock(&s->mtx); + s->state_cb(s, s->arg, state); +@@ -234,8 +261,31 @@ sndio_mainloop(void *arg) + /*static*/ int + sndio_init(cubeb **context, char const *context_name) + { ++ void * libsndio = NULL; ++ ++#ifndef DISABLE_LIBSNDIO_DLOPEN ++ libsndio = dlopen("libsndio.so", RTLD_LAZY); ++ if (!libsndio) { ++ DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name); ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libsndio, #x); \ ++ if (!cubeb_##x) { \ ++ DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \ ++ dlclose(libsndio); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBSNDIO_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + DPR("sndio_init(%s)\n", context_name); + *context = malloc(sizeof(*context)); ++ (*context)->libsndio = libsndio; + (*context)->ops = &sndio_ops; + (void)context_name; + return CUBEB_OK; +@@ -251,6 +301,8 @@ static void + sndio_destroy(cubeb *context) + { + DPR("sndio_destroy()\n"); ++ if (context->libsndio) ++ dlclose(context->libsndio); + free(context); + } + +@@ -303,12 +355,12 @@ sndio_stream_init(cubeb * context, + goto err; + } + s->context = context; +- s->hdl = sio_open(NULL, s->mode, 1); ++ s->hdl = WRAP(sio_open)(NULL, s->mode, 1); + if (s->hdl == NULL) { + DPR("sndio_stream_init(), sio_open() failed\n"); + goto err; + } +- sio_initpar(&wpar); ++ WRAP(sio_initpar)(&wpar); + wpar.sig = 1; + wpar.bits = 16; + switch (format) { +@@ -331,7 +383,7 @@ sndio_stream_init(cubeb * context, + if (s->mode & SIO_PLAY) + wpar.pchan = output_stream_params->channels; + wpar.appbufsz = latency_frames; +- if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) { ++ if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) { + DPR("sndio_stream_init(), sio_setpar() failed\n"); + goto err; + } +@@ -342,7 +394,7 @@ sndio_stream_init(cubeb * context, + DPR("sndio_stream_init() unsupported params\n"); + goto err; + } +- sio_onmove(s->hdl, sndio_onmove, s); ++ WRAP(sio_onmove)(s->hdl, sndio_onmove, s); + s->active = 0; + s->nfr = rpar.round; + s->rbpf = rpar.bps * rpar.rchan; +@@ -379,7 +431,7 @@ sndio_stream_init(cubeb * context, + return CUBEB_OK; + err: + if (s->hdl) +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->pbuf) + free(s->pbuf); + if (s->rbuf) +@@ -425,7 +477,7 @@ static void + sndio_stream_destroy(cubeb_stream *s) + { + DPR("sndio_stream_destroy()\n"); +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->mode & SIO_PLAY) + free(s->pbuf); + if (s->mode & SIO_REC) +@@ -476,7 +528,7 @@ sndio_stream_set_volume(cubeb_stream *s, float volume) + { + DPR("sndio_stream_set_volume(%f)\n", volume); + pthread_mutex_lock(&s->mtx); +- sio_setvol(s->hdl, SIO_MAXVOL * volume); ++ WRAP(sio_setvol)(s->hdl, SIO_MAXVOL * volume); + pthread_mutex_unlock(&s->mtx); + return CUBEB_OK; + } diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile index 6f592cc2994..b375865cbd9 100644 --- a/emulators/linux_base-c7/Makefile +++ b/emulators/linux_base-c7/Makefile @@ -2,7 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- EXTRACT_ONLY= ${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//} @@ -20,6 +20,7 @@ BIN_DISTNAMES= bash-4.2.46-31.el7 \ e2fsprogs-1.42.9-13.el7 \ filesystem-3.2-25.el7 \ findutils-4.5.11-6.el7 \ + gawk-4.0.2-4.el7_3.1 \ glibc-common-2.17-260.el7_6.6 \ grep-2.20-3.el7 \ info-5.1-5.el7 \ @@ -90,6 +91,7 @@ SRC_DISTFILES= acl-2.2.51-14.el7${SRC_SUFX}:SOURCE \ filesystem-3.2-25.el7${SRC_SUFX}:SOURCE \ findutils-4.5.11-6.el7${SRC_SUFX}:SOURCE \ gamin-0.1.10-16.el7${SRC_SUFX}:SOURCE \ + gawk-4.0.2-4.el7_3.1${SRC_SUFX}:SOURCE \ gcc-4.8.5-36.el7_6.2${SRC_SUFX}:SOURCE \ gdbm-1.10-8.el7${SRC_SUFX}:SOURCE \ glib2-2.56.1-4.el7_6${SRC_SUFX}:SOURCE \ diff --git a/emulators/linux_base-c7/distinfo b/emulators/linux_base-c7/distinfo index ab69bb04e3d..02940b60964 100644 --- a/emulators/linux_base-c7/distinfo +++ b/emulators/linux_base-c7/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1566746201 +TIMESTAMP = 1567944717 SHA256 (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 0280ee16df09be0cebf62695706598caed8ff5cba47de1fed625068a90a9ef68 SIZE (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 5124 SHA256 (centos/bash-4.2.46-31.el7.i686.rpm) = 2988de97c4231cd72677ac64f3f1e20191355e0e34a56d59ed26cabc700ee29d @@ -49,6 +49,10 @@ SHA256 (centos/gamin-0.1.10-16.el7.i686.rpm) = c90f79a61297f76b4192ea5eb0dbe460c SIZE (centos/gamin-0.1.10-16.el7.i686.rpm) = 129420 SHA256 (centos/gamin-0.1.10-16.el7.x86_64.rpm) = f1b3e07abe6b1de722d3c3cf42a039a519be5d13aad9a7894e560504892167e7 SIZE (centos/gamin-0.1.10-16.el7.x86_64.rpm) = 131464 +SHA256 (centos/gawk-4.0.2-4.el7_3.1.i686.rpm) = 80c502934e0e79f8ed297fd6ac7edf9988c2bed3f06d62a280a31a5250e42fa1 +SIZE (centos/gawk-4.0.2-4.el7_3.1.i686.rpm) = 872308 +SHA256 (centos/gawk-4.0.2-4.el7_3.1.x86_64.rpm) = 3aedd340b676e49fe6d25b04a77402d074b2a13f2607e165d6ec94c51a5ced12 +SIZE (centos/gawk-4.0.2-4.el7_3.1.x86_64.rpm) = 894476 SHA256 (centos/gdbm-1.10-8.el7.i686.rpm) = cb3e549dd21830d782fdd68385ade2acd8105c55ed56473b572d058098b79128 SIZE (centos/gdbm-1.10-8.el7.i686.rpm) = 71744 SHA256 (centos/gdbm-1.10-8.el7.x86_64.rpm) = 65f28fdefa291bfe53e9c8646ce0f7510f312a4fee232af36e3d4fe678b60591 @@ -239,6 +243,8 @@ SHA256 (centos/findutils-4.5.11-6.el7.src.rpm) = 2c931e340b646212a941ba1c5d08314 SIZE (centos/findutils-4.5.11-6.el7.src.rpm) = 3134161 SHA256 (centos/gamin-0.1.10-16.el7.src.rpm) = 33ff0eb6f5bf0795c263669d874b72b51a29d3fcfaeb139540713c0abb9e7603 SIZE (centos/gamin-0.1.10-16.el7.src.rpm) = 475323 +SHA256 (centos/gawk-4.0.2-4.el7_3.1.src.rpm) = 4ea7058b4c1e6da7dc2f2b11d70969132643721ebe05e86fb94a8d999e11ebdb +SIZE (centos/gawk-4.0.2-4.el7_3.1.src.rpm) = 2761533 SHA256 (centos/gcc-4.8.5-36.el7_6.2.src.rpm) = ac99e3be48ea00a95dc8d302a31c74597f365f1f3c05ed10623954a155f5498c SIZE (centos/gcc-4.8.5-36.el7_6.2.src.rpm) = 79303561 SHA256 (centos/gdbm-1.10-8.el7.src.rpm) = 0cbcec29b9a0ff012d3e03ee30b2e87d3dbe26f3b8dd095d7a277eb7047fb76e diff --git a/emulators/linux_base-c7/pkg-plist.amd64 b/emulators/linux_base-c7/pkg-plist.amd64 index 3ca83c36226..6f3187f32e0 100644 --- a/emulators/linux_base-c7/pkg-plist.amd64 +++ b/emulators/linux_base-c7/pkg-plist.amd64 @@ -79,6 +79,7 @@ sbin usr/bin/[ usr/bin/alias usr/bin/arch +usr/bin/awk usr/bin/base64 usr/bin/basename usr/bin/bash @@ -134,6 +135,7 @@ usr/bin/db47_upgrade usr/bin/db47_verify usr/bin/dd usr/bin/df +usr/bin/dgawk usr/bin/dir usr/bin/dircolors usr/bin/dirname @@ -156,6 +158,7 @@ usr/bin/flock usr/bin/fmt usr/bin/fold usr/bin/gapplication +usr/bin/gawk usr/bin/gdbus usr/bin/gencat usr/bin/getconf @@ -176,6 +179,7 @@ usr/bin/i386 usr/bin/iconv usr/bin/id usr/bin/idn +usr/bin/igawk usr/bin/info usr/bin/infocmp usr/bin/infokey @@ -230,6 +234,7 @@ usr/bin/od usr/bin/oldfind usr/bin/paste usr/bin/pathchk +usr/bin/pgawk usr/bin/pinky usr/bin/pldd usr/bin/pr @@ -1256,6 +1261,8 @@ usr/lib64/openssl/engines/libubsec.so usr/lib64/rtkaio/librt.so.1 usr/lib64/rtkaio/librtkaio-2.17.so usr/lib64/security/pam_cap.so +usr/libexec/awk/grcat +usr/libexec/awk/pwcat usr/libexec/coreutils/libstdbuf.so usr/libexec/gam_server usr/libexec/getconf/POSIX_V6_ILP32_OFF32 @@ -1345,6 +1352,26 @@ usr/sbin/tune2fs usr/sbin/wipefs usr/sbin/zdump usr/sbin/zic +usr/share/awk/assert.awk +usr/share/awk/bits2str.awk +usr/share/awk/cliff_rand.awk +usr/share/awk/ctime.awk +usr/share/awk/ftrans.awk +usr/share/awk/getopt.awk +usr/share/awk/gettime.awk +usr/share/awk/group.awk +usr/share/awk/join.awk +usr/share/awk/libintl.awk +usr/share/awk/noassign.awk +usr/share/awk/ord.awk +usr/share/awk/passwd.awk +usr/share/awk/quicksort.awk +usr/share/awk/readable.awk +usr/share/awk/rewind.awk +usr/share/awk/round.awk +usr/share/awk/strtonum.awk +usr/share/awk/walkarray.awk +usr/share/awk/zerofile.awk usr/share/bash-completion/completions/addpart usr/share/bash-completion/completions/blkdiscard usr/share/bash-completion/completions/blkid @@ -1495,6 +1522,14 @@ usr/share/centos-release/EULA %%PORTDOCS%%usr/share/doc/gamin-0.1.10/server_structs.gif %%PORTDOCS%%usr/share/doc/gamin-0.1.10/socket.txt %%PORTDOCS%%usr/share/doc/gamin-0.1.10/using.html +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/COPYING +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/FUTURES +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/LIMITATIONS +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/NEWS +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/POSIX.STD +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.multibyte +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.tests %%PORTDOCS%%usr/share/doc/gdbm-1.10/AUTHORS %%PORTDOCS%%usr/share/doc/gdbm-1.10/COPYING %%PORTDOCS%%usr/share/doc/gdbm-1.10/NEWS @@ -2197,6 +2232,8 @@ usr/share/info/coreutils.info.gz usr/share/info/dir usr/share/info/find-maint.info.gz usr/share/info/find.info.gz +usr/share/info/gawk.info.gz +usr/share/info/gawkinet.info.gz usr/share/info/grep.info.gz usr/share/info/history.info.gz usr/share/info/info-stnd.info.gz @@ -2270,6 +2307,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/cy/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/da/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/libc.mo @@ -2282,6 +2320,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/de/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/de/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/grep.mo @@ -2322,6 +2361,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/es/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/es/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/libc.mo @@ -2347,6 +2387,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/fi/LC_MESSAGES/bash.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/fi/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/grep.mo @@ -2359,6 +2400,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/fr/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/fr/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/libc.mo @@ -2429,6 +2471,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/it/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/it/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/libc.mo @@ -2440,6 +2483,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/ja/LC_MESSAGES/bash.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/ja/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/grep.mo @@ -2499,6 +2543,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/nl/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/nl/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/libc.mo @@ -2516,6 +2561,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/pl/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/pl/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/grep.mo @@ -2594,6 +2640,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/sv/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/sv/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/libc.mo @@ -2635,6 +2682,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/vi/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/vi/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/libc.mo @@ -2683,6 +2731,7 @@ usr/share/man/man1/:.1.gz usr/share/man/man1/[.1.gz usr/share/man/man1/alias.1.gz usr/share/man/man1/arch.1.gz +usr/share/man/man1/awk.1.gz usr/share/man/man1/base64.1.gz usr/share/man/man1/basename.1.gz usr/share/man/man1/bash.1.gz @@ -2736,6 +2785,7 @@ usr/share/man/man1/date.1.gz usr/share/man/man1/dd.1.gz usr/share/man/man1/declare.1.gz usr/share/man/man1/df.1.gz +usr/share/man/man1/dgawk.1.gz usr/share/man/man1/dir.1.gz usr/share/man/man1/dircolors.1.gz usr/share/man/man1/dirname.1.gz @@ -2765,6 +2815,7 @@ usr/share/man/man1/flock.1.gz usr/share/man/man1/fmt.1.gz usr/share/man/man1/fold.1.gz usr/share/man/man1/gapplication.1.gz +usr/share/man/man1/gawk.1.gz usr/share/man/man1/gdbus.1.gz usr/share/man/man1/getopt.1.gz usr/share/man/man1/getopts.1.gz @@ -2782,6 +2833,7 @@ usr/share/man/man1/history.1.gz usr/share/man/man1/hostid.1.gz usr/share/man/man1/id.1.gz usr/share/man/man1/idn.1.gz +usr/share/man/man1/igawk.1.gz usr/share/man/man1/info.1.gz usr/share/man/man1/infocmp.1m.gz usr/share/man/man1/infokey.1.gz @@ -2836,6 +2888,7 @@ usr/share/man/man1/od.1.gz usr/share/man/man1/oldfind.1.gz usr/share/man/man1/paste.1.gz usr/share/man/man1/pathchk.1.gz +usr/share/man/man1/pgawk.1.gz usr/share/man/man1/pinky.1.gz usr/share/man/man1/popd.1.gz usr/share/man/man1/pr.1.gz diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386 index dc71d62e3b1..0ed7ee1da14 100644 --- a/emulators/linux_base-c7/pkg-plist.i386 +++ b/emulators/linux_base-c7/pkg-plist.i386 @@ -77,6 +77,7 @@ sbin usr/bin/[ usr/bin/alias usr/bin/arch +usr/bin/awk usr/bin/base64 usr/bin/basename usr/bin/bash @@ -132,6 +133,7 @@ usr/bin/db47_upgrade usr/bin/db47_verify usr/bin/dd usr/bin/df +usr/bin/dgawk usr/bin/dir usr/bin/dircolors usr/bin/dirname @@ -154,6 +156,7 @@ usr/bin/flock usr/bin/fmt usr/bin/fold usr/bin/gapplication +usr/bin/gawk usr/bin/gdbus usr/bin/gencat usr/bin/getconf @@ -173,6 +176,7 @@ usr/bin/i386 usr/bin/iconv usr/bin/id usr/bin/idn +usr/bin/igawk usr/bin/info usr/bin/infocmp usr/bin/infokey @@ -228,6 +232,7 @@ usr/bin/od usr/bin/oldfind usr/bin/paste usr/bin/pathchk +usr/bin/pgawk usr/bin/pinky usr/bin/pldd usr/bin/pr @@ -800,6 +805,8 @@ usr/lib/systemd/system/fstrim.service usr/lib/systemd/system/fstrim.timer usr/lib/tmpfiles.d/libselinux.conf usr/lib/udev/rules.d/60-raw.rules +usr/libexec/awk/grcat +usr/libexec/awk/pwcat usr/libexec/coreutils/libstdbuf.so usr/libexec/gam_server usr/libexec/getconf/POSIX_V6_ILP32_OFF32 @@ -883,6 +890,26 @@ usr/sbin/tune2fs usr/sbin/wipefs usr/sbin/zdump usr/sbin/zic +usr/share/awk/assert.awk +usr/share/awk/bits2str.awk +usr/share/awk/cliff_rand.awk +usr/share/awk/ctime.awk +usr/share/awk/ftrans.awk +usr/share/awk/getopt.awk +usr/share/awk/gettime.awk +usr/share/awk/group.awk +usr/share/awk/join.awk +usr/share/awk/libintl.awk +usr/share/awk/noassign.awk +usr/share/awk/ord.awk +usr/share/awk/passwd.awk +usr/share/awk/quicksort.awk +usr/share/awk/readable.awk +usr/share/awk/rewind.awk +usr/share/awk/round.awk +usr/share/awk/strtonum.awk +usr/share/awk/walkarray.awk +usr/share/awk/zerofile.awk usr/share/bash-completion/completions/addpart usr/share/bash-completion/completions/blkdiscard usr/share/bash-completion/completions/blkid @@ -1033,6 +1060,14 @@ usr/share/centos-release/EULA %%PORTDOCS%%usr/share/doc/gamin-0.1.10/server_structs.gif %%PORTDOCS%%usr/share/doc/gamin-0.1.10/socket.txt %%PORTDOCS%%usr/share/doc/gamin-0.1.10/using.html +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/COPYING +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/FUTURES +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/LIMITATIONS +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/NEWS +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/POSIX.STD +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.multibyte +%%PORTDOCS%%usr/share/doc/gawk-4.0.2/README.tests %%PORTDOCS%%usr/share/doc/gdbm-1.10/AUTHORS %%PORTDOCS%%usr/share/doc/gdbm-1.10/COPYING %%PORTDOCS%%usr/share/doc/gdbm-1.10/NEWS @@ -1732,6 +1767,8 @@ usr/share/info/coreutils.info.gz usr/share/info/dir usr/share/info/find-maint.info.gz usr/share/info/find.info.gz +usr/share/info/gawk.info.gz +usr/share/info/gawkinet.info.gz usr/share/info/grep.info.gz usr/share/info/history.info.gz usr/share/info/info-stnd.info.gz @@ -1805,6 +1842,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/cy/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/da/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/da/LC_MESSAGES/libc.mo @@ -1817,6 +1855,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/de/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/de/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/de/LC_MESSAGES/grep.mo @@ -1857,6 +1896,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/es/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/es/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/es/LC_MESSAGES/libc.mo @@ -1882,6 +1922,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/fi/LC_MESSAGES/bash.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/fi/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/fi/LC_MESSAGES/grep.mo @@ -1894,6 +1935,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/fr/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/fr/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/fr/LC_MESSAGES/libc.mo @@ -1964,6 +2006,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/it/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/it/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/it/LC_MESSAGES/libc.mo @@ -1975,6 +2018,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/ja/LC_MESSAGES/bash.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/ja/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/ja/LC_MESSAGES/grep.mo @@ -2034,6 +2078,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/nl/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/nl/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/nl/LC_MESSAGES/libc.mo @@ -2051,6 +2096,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/pl/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/pl/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/gdbm.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/pl/LC_MESSAGES/grep.mo @@ -2129,6 +2175,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/sv/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/sv/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/sv/LC_MESSAGES/libc.mo @@ -2170,6 +2217,7 @@ usr/share/licenses/openssl-libs-1.0.2k/LICENSE %%NLS%%usr/share/locale/vi/LC_MESSAGES/coreutils.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/e2fsprogs.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/findutils.mo +%%NLS%%usr/share/locale/vi/LC_MESSAGES/gawk.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/glib20.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/grep.mo %%NLS%%usr/share/locale/vi/LC_MESSAGES/libc.mo @@ -2215,6 +2263,7 @@ usr/share/man/man1/:.1.gz usr/share/man/man1/[.1.gz usr/share/man/man1/alias.1.gz usr/share/man/man1/arch.1.gz +usr/share/man/man1/awk.1.gz usr/share/man/man1/base64.1.gz usr/share/man/man1/basename.1.gz usr/share/man/man1/bash.1.gz @@ -2268,6 +2317,7 @@ usr/share/man/man1/date.1.gz usr/share/man/man1/dd.1.gz usr/share/man/man1/declare.1.gz usr/share/man/man1/df.1.gz +usr/share/man/man1/dgawk.1.gz usr/share/man/man1/dir.1.gz usr/share/man/man1/dircolors.1.gz usr/share/man/man1/dirname.1.gz @@ -2297,6 +2347,7 @@ usr/share/man/man1/flock.1.gz usr/share/man/man1/fmt.1.gz usr/share/man/man1/fold.1.gz usr/share/man/man1/gapplication.1.gz +usr/share/man/man1/gawk.1.gz usr/share/man/man1/gdbus.1.gz usr/share/man/man1/getopt.1.gz usr/share/man/man1/getopts.1.gz @@ -2314,6 +2365,7 @@ usr/share/man/man1/history.1.gz usr/share/man/man1/hostid.1.gz usr/share/man/man1/id.1.gz usr/share/man/man1/idn.1.gz +usr/share/man/man1/igawk.1.gz usr/share/man/man1/info.1.gz usr/share/man/man1/infocmp.1m.gz usr/share/man/man1/infokey.1.gz @@ -2368,6 +2420,7 @@ usr/share/man/man1/od.1.gz usr/share/man/man1/oldfind.1.gz usr/share/man/man1/paste.1.gz usr/share/man/man1/pathchk.1.gz +usr/share/man/man1/pgawk.1.gz usr/share/man/man1/pinky.1.gz usr/share/man/man1/popd.1.gz usr/share/man/man1/pr.1.gz diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 561d6fb8094..fa34491aa47 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.7-8640 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g08c12f4c0 +DISTVERSION= 0.0.7-8656 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g5ed700db5 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 9acc58f68db..0ff2ecd38b5 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1567469989 -SHA256 (RPCS3-rpcs3-v0.0.7-8640-g08c12f4c0_GH0.tar.gz) = f983c882af6fbd2078c8a3838e9ff3c42ec2f536f1fff3aa69066132a39084f5 -SIZE (RPCS3-rpcs3-v0.0.7-8640-g08c12f4c0_GH0.tar.gz) = 5556484 +TIMESTAMP = 1567886472 +SHA256 (RPCS3-rpcs3-v0.0.7-8656-g5ed700db5_GH0.tar.gz) = 8d02c6467d9726589044ac8f918a2fcd7d1487f7eaafa8405eba059ec42d7717 +SIZE (RPCS3-rpcs3-v0.0.7-8656-g5ed700db5_GH0.tar.gz) = 5557046 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e diff --git a/emulators/yuzu-qt5/Makefile b/emulators/yuzu-qt5/Makefile index 456d42c3f25..c76e683cdde 100644 --- a/emulators/yuzu-qt5/Makefile +++ b/emulators/yuzu-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../yuzu diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 3d8c212566e..a605575252a 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= yuzu -PORTVERSION= s20190901 -PORTREVISION?= 0 +PORTVERSION= s20190905 +PORTREVISION?= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -28,7 +28,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 50b5bb44a +GH_TAGNAME= 4ee994963 GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \ DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ @@ -40,7 +40,7 @@ GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \ citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ facebook:zstd:v1.3.8:zstd/externals/zstd \ - fmtlib:fmt:5.3.0:fmt/externals/fmt \ + fmtlib:fmt:6.0.0:fmt/externals/fmt \ kinetiknz:cubeb:cubeb-0.2-1098-g6f2420d:cubeb/externals/cubeb \ lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \ ogniK5377:opus:v1.3-rc-20-g562f8ba5:opus/externals/opus \ @@ -53,23 +53,23 @@ LDFLAGS+= -Wl,--as-needed # Qt5Network TEST_TARGET= test OPTIONS_DEFINE= ALSA PULSEAUDIO JACK SNDIO -OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK +OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK SNDIO OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK -PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0.:audio/pulseaudio +PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE -SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO SDL_CMAKE_BOOL= ENABLE_SDL2 diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 0001c534173..a9f350a63f2 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1567357985 -SHA256 (yuzu-emu-yuzu-s20190901-50b5bb44a_GH0.tar.gz) = dc94a90d66b2f8b797afbe4e20b3b5e063ba41c7b0412a9fab8ed059646668e8 -SIZE (yuzu-emu-yuzu-s20190901-50b5bb44a_GH0.tar.gz) = 2713991 +TIMESTAMP = 1567713826 +SHA256 (yuzu-emu-yuzu-s20190905-4ee994963_GH0.tar.gz) = 5feeb81430fa3c494de76c47178777ff1f2c1a9fed7c4e6b5c36bbe9c9cf784d +SIZE (yuzu-emu-yuzu-s20190905-4ee994963_GH0.tar.gz) = 2744144 SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254 SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7 @@ -23,8 +23,8 @@ SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514 SHA256 (facebook-zstd-v1.3.8_GH0.tar.gz) = 90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3 SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) = 1875233 -SHA256 (fmtlib-fmt-5.3.0_GH0.tar.gz) = defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89 -SIZE (fmtlib-fmt-5.3.0_GH0.tar.gz) = 662493 +SHA256 (fmtlib-fmt-6.0.0_GH0.tar.gz) = f1907a58d5e86e6c382e51441d92ad9e23aea63827ba47fd647eacc0d3a16c78 +SIZE (fmtlib-fmt-6.0.0_GH0.tar.gz) = 708425 SHA256 (kinetiknz-cubeb-cubeb-0.2-1098-g6f2420d_GH0.tar.gz) = f13de26eb3bdf4bf328ca199e78b242b10f750ce29c064ac650995e62e520e28 SIZE (kinetiknz-cubeb-cubeb-0.2-1098-g6f2420d_GH0.tar.gz) = 202308 SHA256 (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 31a61b29dcb0204c9ac283d24cd53ae4d7e15e6f4e7dd88919d965ff9cf8ced5 diff --git a/emulators/yuzu/files/patch-cubeb-dlopen b/emulators/yuzu/files/patch-cubeb-dlopen new file mode 100644 index 00000000000..53d46f24d97 --- /dev/null +++ b/emulators/yuzu/files/patch-cubeb-dlopen @@ -0,0 +1,799 @@ +https://github.com/kinetiknz/cubeb/commit/0d1d9d84fb3e +https://github.com/kinetiknz/cubeb/pull/539 + +diff --git externals/cubeb/CMakeLists.txt externals/cubeb/CMakeLists.txt +index cdb00f9..71373cb 100644 +--- externals/cubeb/CMakeLists.txt ++++ externals/cubeb/CMakeLists.txt +@@ -135,10 +135,7 @@ if(USE_PULSE) + target_sources(cubeb PRIVATE + src/cubeb_pulse.c) + target_compile_definitions(cubeb PRIVATE USE_PULSE) +- target_link_libraries(cubeb PRIVATE pulse) +- if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- target_link_libraries(cubeb PRIVATE dl) +- endif() ++ target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS}) + endif() + + check_include_files(alsa/asoundlib.h USE_ALSA) +@@ -146,10 +143,7 @@ if(USE_ALSA) + target_sources(cubeb PRIVATE + src/cubeb_alsa.c) + target_compile_definitions(cubeb PRIVATE USE_ALSA) +- target_link_libraries(cubeb PRIVATE asound pthread) +- if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- target_link_libraries(cubeb PRIVATE dl) +- endif() ++ target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS}) + endif() + + check_include_files(jack/jack.h USE_JACK) +@@ -157,10 +151,7 @@ if(USE_JACK) + target_sources(cubeb PRIVATE + src/cubeb_jack.cpp) + target_compile_definitions(cubeb PRIVATE USE_JACK) +- target_link_libraries(cubeb PRIVATE jack pthread) +- if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- target_link_libraries(cubeb PRIVATE dl) +- endif() ++ target_link_libraries(cubeb PRIVATE pthread ${CMAKE_DL_LIBS}) + endif() + + check_include_files(audioclient.h USE_WASAPI) +@@ -201,7 +192,7 @@ if(USE_SNDIO) + target_sources(cubeb PRIVATE + src/cubeb_sndio.c) + target_compile_definitions(cubeb PRIVATE USE_SNDIO) +- target_link_libraries(cubeb PRIVATE sndio) ++ target_link_libraries(cubeb PRIVATE pthread) + endif() + + check_include_files(kai.h USE_KAI) +diff --git externals/cubeb/src/cubeb.c externals/cubeb/src/cubeb.c +index e562a35..d66dd16 100644 +--- externals/cubeb/src/cubeb.c ++++ externals/cubeb/src/cubeb.c +@@ -177,6 +177,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_JACK) + jack_init, + #endif ++#if defined(USE_SNDIO) ++ sndio_init, ++#endif + #if defined(USE_ALSA) + alsa_init, + #endif +@@ -189,9 +192,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_WINMM) + winmm_init, + #endif +-#if defined(USE_SNDIO) +- sndio_init, +-#endif + #if defined(USE_OPENSL) + opensl_init, + #endif +diff --git externals/cubeb/src/cubeb_alsa.c externals/cubeb/src/cubeb_alsa.c +index bfd4d8f..a29eed0 100644 +--- externals/cubeb/src/cubeb_alsa.c ++++ externals/cubeb/src/cubeb_alsa.c +@@ -14,10 +14,58 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" + ++#ifdef DISABLE_LIBASOUND_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBASOUND_API_VISIT(X) \ ++ X(snd_config) \ ++ X(snd_config_add) \ ++ X(snd_config_copy) \ ++ X(snd_config_delete) \ ++ X(snd_config_get_id) \ ++ X(snd_config_get_string) \ ++ X(snd_config_imake_integer) \ ++ X(snd_config_search) \ ++ X(snd_config_search_definition) \ ++ X(snd_lib_error_set_handler) \ ++ X(snd_pcm_avail_update) \ ++ X(snd_pcm_close) \ ++ X(snd_pcm_delay) \ ++ X(snd_pcm_drain) \ ++ X(snd_pcm_frames_to_bytes) \ ++ X(snd_pcm_get_params) \ ++ X(snd_pcm_hw_params_any) \ ++ X(snd_pcm_hw_params_get_channels_max) \ ++ X(snd_pcm_hw_params_get_rate) \ ++ X(snd_pcm_hw_params_set_rate_near) \ ++ X(snd_pcm_hw_params_sizeof) \ ++ X(snd_pcm_nonblock) \ ++ X(snd_pcm_open) \ ++ X(snd_pcm_open_lconf) \ ++ X(snd_pcm_pause) \ ++ X(snd_pcm_poll_descriptors) \ ++ X(snd_pcm_poll_descriptors_count) \ ++ X(snd_pcm_poll_descriptors_revents) \ ++ X(snd_pcm_readi) \ ++ X(snd_pcm_recover) \ ++ X(snd_pcm_set_params) \ ++ X(snd_pcm_start) \ ++ X(snd_pcm_state) \ ++ X(snd_pcm_writei) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBASOUND_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++/* snd_pcm_hw_params_alloca is actually a macro */ ++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof ++#endif ++ + #define CUBEB_STREAM_MAX 16 + #define CUBEB_WATCHDOG_MS 10000 + +@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libasound; + + pthread_t thread; + +@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) + static void + stream_buffer_decrement(cubeb_stream * stm, long count) + { +- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); +- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); ++ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); ++ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); + stm->bufframes -= count; + } + +@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) + /* Call _poll_descriptors_revents() even if we don't use it + to let underlying plugins clear null events. Otherwise poll() + may wake up again and again, producing unnecessary CPU usage. */ +- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); ++ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); + +- avail = snd_pcm_avail_update(stm->pcm); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + + /* Got null event? Bail and wait for another wakeup. */ + if (avail == 0) { +@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) + // TODO: should it be marked as DRAINING? + } + +- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); ++ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); + + if (got < 0) { + avail = got; // the error handler below will recover us +@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) + (!stm->other_stream || stm->other_stream->bufframes > 0)) { + long got = avail - stm->bufframes; + void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); + + /* Correct read size to the other stream available frames */ + if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { +@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) + long drain_frames = avail - stm->bufframes; + double drain_time = (double) drain_frames / stm->params.rate; + +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); +- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); ++ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); + stm->bufframes = avail; + + /* Mark as draining, unless we're waiting for capture */ +@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) + } + } + +- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); + if (wrote < 0) { + avail = wrote; // the error handler below will recover us + } else { +@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) + + /* Got some error? Let's try to recover the stream. */ + if (avail < 0) { +- avail = snd_pcm_recover(stm->pcm, avail, 0); ++ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); + + /* Capture pcm must be started after initial setup/recover */ + if (avail >= 0 && + stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- avail = snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ avail = WRAP(snd_pcm_start)(stm->pcm); + } + } + +@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + + slave_def = NULL; + +- r = snd_config_search(root_pcm, "slave", &slave_pcm); ++ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); + if (r < 0) { + return NULL; + } + +- r = snd_config_get_string(slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_pcm, &string); + if (r >= 0) { +- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); + if (r < 0) { + return NULL; + } + } + + do { +- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); ++ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); + if (r < 0) { + break; + } + +- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); + if (r < 0) { + break; + } +@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm); + if (r < 0) { + break; + } +@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + } while (0); + + if (slave_def) { +- snd_config_delete(slave_def); ++ WRAP(snd_config_delete)(slave_def); + } + + return NULL; +@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) + + lconf = NULL; + +- if (snd_config == NULL) { ++ if (*WRAP(snd_config) == NULL) { + return NULL; + } + +- r = snd_config_copy(&lconf, snd_config); ++ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); + if (r < 0) { + return NULL; + } + + do { +- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); + if (r < 0) { + break; + } + +- r = snd_config_get_id(pcm_node, &string); ++ r = WRAP(snd_config_get_id)(pcm_node, &string); + if (r < 0) { + break; + } +@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm_node); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); + if (r < 0) { + break; + } +@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) + } + + /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ +- r = snd_config_search(pcm_node, "type", &node); ++ r = WRAP(snd_config_search)(pcm_node, "type", &node); + if (r < 0) { + break; + } + +- r = snd_config_get_string(node, &string); ++ r = WRAP(snd_config_get_string)(node, &string); + if (r < 0) { + break; + } +@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) + + /* Don't clobber an explicit existing handle_underrun value, set it only + if it doesn't already exist. */ +- r = snd_config_search(pcm_node, "handle_underrun", &node); ++ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); + if (r != -ENOENT) { + break; + } + + /* Disable pcm_pulse's asynchronous underrun handling. */ +- r = snd_config_imake_integer(&node, "handle_underrun", 0); ++ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); + if (r < 0) { + break; + } + +- r = snd_config_add(pcm_node, node); ++ r = WRAP(snd_config_add)(pcm_node, node); + if (r < 0) { + break; + } +@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) + return lconf; + } while (0); + +- snd_config_delete(lconf); ++ WRAP(snd_config_delete)(lconf); + + return NULL; + } +@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (local_config) { +- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); ++ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); + } else { +- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); ++ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); + } + pthread_mutex_unlock(&cubeb_alsa_mutex); + +@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) + int r; + + pthread_mutex_lock(&cubeb_alsa_mutex); +- r = snd_pcm_close(pcm); ++ r = WRAP(snd_pcm_close)(pcm); + pthread_mutex_unlock(&cubeb_alsa_mutex); + + return r; +@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function, + alsa_init(cubeb ** context, char const * context_name) + { + (void)context_name; ++ void * libasound = NULL; + cubeb * ctx; + int r; + int i; +@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name) + assert(context); + *context = NULL; + ++#ifndef DISABLE_LIBASOUND_DLOPEN ++ libasound = dlopen("libasound.so", RTLD_LAZY); ++ if (!libasound) { ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libasound, #x); \ ++ if (!cubeb_##x) { \ ++ dlclose(libasound); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBASOUND_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + pthread_mutex_lock(&cubeb_alsa_mutex); + if (!cubeb_alsa_error_handler_set) { +- snd_lib_error_set_handler(silent_error_handler); ++ WRAP(snd_lib_error_set_handler)(silent_error_handler); + cubeb_alsa_error_handler_set = 1; + } + pthread_mutex_unlock(&cubeb_alsa_mutex); +@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name) + assert(ctx); + + ctx->ops = &alsa_ops; ++ ctx->libasound = libasound; + + r = pthread_mutex_init(&ctx->mutex, NULL); + assert(r == 0); +@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name) + config fails with EINVAL, the PA PCM is too old for this workaround. */ + if (r == -EINVAL) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + ctx->local_config = NULL; + } else if (r >= 0) { +@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx) + + if (ctx->local_config) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + } + ++ if (ctx->libasound) { ++ dlclose(ctx->libasound); ++ } ++ + free(ctx); + } + +@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR; + } + +- r = snd_pcm_nonblock(stm->pcm, 1); ++ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); + assert(r == 0); + + latency_us = latency_frames * 1e6 / stm->params.rate; +@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + latency_us = latency_us < min_latency ? min_latency: latency_us; + } + +- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, ++ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, + stm->params.channels, stm->params.rate, 1, + latency_us); + if (r < 0) { +@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR_INVALID_FORMAT; + } + +- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); ++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); + assert(r == 0); + + /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ + stm->buffer_size *= 2; +- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); ++ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); + assert(stm->buffer); + +- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); ++ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); + assert(stm->nfds > 0); + + stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); + assert(stm->saved_fds); +- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); ++ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); + assert((nfds_t) r == stm->nfds); + + if (alsa_register_stream(ctx, stm) != 0) { +@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + if (stm->pcm) { + if (stm->state == DRAINING) { +- snd_pcm_drain(stm->pcm); ++ WRAP(snd_pcm_drain)(stm->pcm); + } + alsa_locked_pcm_close(stm->pcm); + stm->pcm = NULL; +@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) + + assert(stm); + +- r = snd_pcm_hw_params_any(stm->pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); ++ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); + if (r < 0) { + return CUBEB_ERROR; + } +@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { + + /* get a pcm, disabling resampling, so we get a rate the + * hardware/dmix/pulse/etc. supports. */ +- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); ++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_any(pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); ++ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); + if (r >= 0) { + /* There is a default rate: use it. */ +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_OK; + } + + /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ + *rate = 44100; + +- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); ++ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + + return CUBEB_OK; + } +@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + /* Capture pcm must be started after initial setup/recover */ + if (stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ WRAP(snd_pcm_start)(stm->pcm); + } +- snd_pcm_pause(stm->pcm, 0); ++ WRAP(snd_pcm_pause)(stm->pcm, 0); + gettimeofday(&stm->last_activity, NULL); + pthread_mutex_unlock(&stm->mutex); + +@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm) + pthread_mutex_unlock(&ctx->mutex); + + pthread_mutex_lock(&stm->mutex); +- snd_pcm_pause(stm->pcm, 1); ++ WRAP(snd_pcm_pause)(stm->pcm, 1); + pthread_mutex_unlock(&stm->mutex); + + return CUBEB_OK; +@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) + pthread_mutex_lock(&stm->mutex); + + delay = -1; +- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || +- snd_pcm_delay(stm->pcm, &delay) != 0) { ++ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || ++ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { + *position = stm->last_position; + pthread_mutex_unlock(&stm->mutex); + return CUBEB_OK; +@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) + snd_pcm_sframes_t delay; + /* This function returns the delay in frames until a frame written using + snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ +- if (snd_pcm_delay(stm->pcm, &delay)) { ++ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { + return CUBEB_ERROR; + } + +diff --git externals/cubeb/src/cubeb_sndio.c externals/cubeb/src/cubeb_sndio.c +index 5a43343..c9a31a7 100644 +--- externals/cubeb/src/cubeb_sndio.c ++++ externals/cubeb/src/cubeb_sndio.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" +@@ -22,10 +23,35 @@ + #define DPR(...) do {} while(0) + #endif + ++#ifdef DISABLE_LIBSNDIO_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBSNDIO_API_VISIT(X) \ ++ X(sio_close) \ ++ X(sio_eof) \ ++ X(sio_getpar) \ ++ X(sio_initpar) \ ++ X(sio_onmove) \ ++ X(sio_open) \ ++ X(sio_pollfd) \ ++ X(sio_read) \ ++ X(sio_revents) \ ++ X(sio_setpar) \ ++ X(sio_start) \ ++ X(sio_stop) \ ++ X(sio_write) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBSNDIO_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++#endif ++ + static struct cubeb_ops const sndio_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libsndio; + }; + + struct cubeb_stream { +@@ -119,7 +145,7 @@ sndio_mainloop(void *arg) + DPR("sndio_mainloop()\n"); + s->state_cb(s, s->arg, CUBEB_STATE_STARTED); + pthread_mutex_lock(&s->mtx); +- if (!sio_start(s->hdl)) { ++ if (!WRAP(sio_start)(s->hdl)) { + pthread_mutex_unlock(&s->mtx); + return NULL; + } +@@ -203,7 +229,7 @@ sndio_mainloop(void *arg) + events |= POLLIN; + if ((s->mode & SIO_PLAY) && pstart < pend) + events |= POLLOUT; +- nfds = sio_pollfd(s->hdl, pfds, events); ++ nfds = WRAP(sio_pollfd)(s->hdl, pfds, events); + + if (nfds > 0) { + pthread_mutex_unlock(&s->mtx); +@@ -213,7 +239,7 @@ sndio_mainloop(void *arg) + continue; + } + +- revents = sio_revents(s->hdl, pfds); ++ revents = WRAP(sio_revents)(s->hdl, pfds); + + if (revents & POLLHUP) { + state = CUBEB_STATE_ERROR; +@@ -221,8 +247,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLOUT) { +- n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() werr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -231,8 +257,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLIN) { +- n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() rerr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -244,7 +270,7 @@ sndio_mainloop(void *arg) + if (prime > 0 && (s->mode & SIO_REC)) + rstart = rend; + } +- sio_stop(s->hdl); ++ WRAP(sio_stop)(s->hdl); + s->hwpos = s->swpos; + pthread_mutex_unlock(&s->mtx); + s->state_cb(s, s->arg, state); +@@ -254,8 +280,31 @@ sndio_mainloop(void *arg) + /*static*/ int + sndio_init(cubeb **context, char const *context_name) + { ++ void * libsndio = NULL; ++ ++#ifndef DISABLE_LIBSNDIO_DLOPEN ++ libsndio = dlopen("libsndio.so", RTLD_LAZY); ++ if (!libsndio) { ++ DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name); ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libsndio, #x); \ ++ if (!cubeb_##x) { \ ++ DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \ ++ dlclose(libsndio); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBSNDIO_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + DPR("sndio_init(%s)\n", context_name); + *context = malloc(sizeof(*context)); ++ (*context)->libsndio = libsndio; + (*context)->ops = &sndio_ops; + (void)context_name; + return CUBEB_OK; +@@ -271,6 +320,8 @@ static void + sndio_destroy(cubeb *context) + { + DPR("sndio_destroy()\n"); ++ if (context->libsndio) ++ dlclose(context->libsndio); + free(context); + } + +@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context, + goto err; + } + s->context = context; +- s->hdl = sio_open(NULL, s->mode, 1); ++ s->hdl = WRAP(sio_open)(NULL, s->mode, 1); + if (s->hdl == NULL) { + DPR("sndio_stream_init(), sio_open() failed\n"); + goto err; + } +- sio_initpar(&wpar); ++ WRAP(sio_initpar)(&wpar); + wpar.sig = 1; + wpar.bits = 16; + switch (format) { +@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context, + if (s->mode & SIO_PLAY) + wpar.pchan = output_stream_params->channels; + wpar.appbufsz = latency_frames; +- if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) { ++ if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) { + DPR("sndio_stream_init(), sio_setpar() failed\n"); + goto err; + } +@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context, + DPR("sndio_stream_init() unsupported params\n"); + goto err; + } +- sio_onmove(s->hdl, sndio_onmove, s); ++ WRAP(sio_onmove)(s->hdl, sndio_onmove, s); + s->active = 0; + s->nfr = rpar.round; + s->rbpf = rpar.bps * rpar.rchan; +@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context, + return CUBEB_OK; + err: + if (s->hdl) +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->pbuf) + free(s->pbuf); + if (s->rbuf) +@@ -446,7 +497,7 @@ static void + sndio_stream_destroy(cubeb_stream *s) + { + DPR("sndio_stream_destroy()\n"); +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->mode & SIO_PLAY) + free(s->pbuf); + if (s->mode & SIO_REC) diff --git a/finance/R-cran-plm/Makefile b/finance/R-cran-plm/Makefile index 5e6bedba5fd..76684d8217d 100644 --- a/finance/R-cran-plm/Makefile +++ b/finance/R-cran-plm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= plm -DISTVERSION= 2.1-0 +DISTVERSION= 2.2-0 CATEGORIES= finance DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/finance/R-cran-plm/distinfo b/finance/R-cran-plm/distinfo index 5f6b6a7da3c..150c4e1ad34 100644 --- a/finance/R-cran-plm/distinfo +++ b/finance/R-cran-plm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564834646 -SHA256 (plm_2.1-0.tar.gz) = fa62f2b4ed561b39daca2245aa8b93f97536dce24deacdefa29529c464b58637 -SIZE (plm_2.1-0.tar.gz) = 1512526 +TIMESTAMP = 1567917807 +SHA256 (plm_2.2-0.tar.gz) = 7f038532c387d417ea0c86322d873e6a3959a061a490bc506241a95edc50c86a +SIZE (plm_2.2-0.tar.gz) = 1513935 diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile index 6ac2a00e5b4..6b522dc9b80 100644 --- a/finance/homebank/Makefile +++ b/finance/homebank/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= homebank -PORTVERSION= 5.2.6 +PORTVERSION= 5.2.7 CATEGORIES= finance MASTER_SITES= http://homebank.free.fr/public/ diff --git a/finance/homebank/distinfo b/finance/homebank/distinfo index 7abb1405e7a..baf4ae032e0 100644 --- a/finance/homebank/distinfo +++ b/finance/homebank/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559546882 -SHA256 (homebank-5.2.6.tar.gz) = 9a14cbf7029080f208d76b27a2d8066964426685ddc86fd1abed30bd428c9881 -SIZE (homebank-5.2.6.tar.gz) = 2679210 +TIMESTAMP = 1567749166 +SHA256 (homebank-5.2.7.tar.gz) = 8eedbe4246477935bd3882c1a628d7fd6036f6467be998c2558bdf4b39b0eb5f +SIZE (homebank-5.2.7.tar.gz) = 2723372 diff --git a/french/wordpress/Makefile b/french/wordpress/Makefile index 7cfff866995..b1c805d3488 100644 --- a/french/wordpress/Makefile +++ b/french/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.2 +DISTVERSION= 5.2.3 DISTVERSIONSUFFIX= -fr_FR PORTEPOCH= 1 CATEGORIES= french www diff --git a/french/wordpress/distinfo b/french/wordpress/distinfo index 3d9abccc839..f7f34125a9e 100644 --- a/french/wordpress/distinfo +++ b/french/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561104176 -SHA256 (wordpress-5.2.2-fr_FR.tar.gz) = 3dad23c71cb23ab0e131fa76da5da56c166f9d2649c86ca4ae5f75129bcf9e2f -SIZE (wordpress-5.2.2-fr_FR.tar.gz) = 11851897 +TIMESTAMP = 1567784981 +SHA256 (wordpress-5.2.3-fr_FR.tar.gz) = 9657d8dc7804becddf821c05773081ffd97e001613c354154771e14f6eab677f +SIZE (wordpress-5.2.3-fr_FR.tar.gz) = 11841146 diff --git a/games/wtf/Makefile b/games/wtf/Makefile index 125f88beed0..5a268ed8326 100644 --- a/games/wtf/Makefile +++ b/games/wtf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wtf -PORTVERSION= 20190728 +PORTVERSION= 20190903 CATEGORIES= games MASTER_SITES= SF/bsdwtf diff --git a/games/wtf/distinfo b/games/wtf/distinfo index 3d9bbdefce8..d642f9c2b51 100644 --- a/games/wtf/distinfo +++ b/games/wtf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565566396 -SHA256 (wtf-20190728.tar.gz) = 2122466d52a7b879598ae154bef5e2cccb161cd3e19e69be96a6ea9678e86f34 -SIZE (wtf-20190728.tar.gz) = 29623 +TIMESTAMP = 1567780908 +SHA256 (wtf-20190903.tar.gz) = 1e2c3cabe8ba2f4d0d4c9b4e1ebfb805ab7456806d3119e5056b2a5bcefaaafe +SIZE (wtf-20190903.tar.gz) = 29756 diff --git a/games/xpilot-ng-client/Makefile b/games/xpilot-ng-client/Makefile index f35eca7ff1b..a25c92cb905 100644 --- a/games/xpilot-ng-client/Makefile +++ b/games/xpilot-ng-client/Makefile @@ -6,6 +6,9 @@ PKGNAMESUFFIX= -client COMMENT= Enhanced version of XPilot (client program) +DEPRECATED= Depends on deprecated libXxf86misc +EXPIRATION_DATE=2019-11-01 + MASTERDIR= ${.CURDIR}/../xpilot-ng-server USE_XORG= x11 xext xxf86misc diff --git a/german/wordpress/Makefile b/german/wordpress/Makefile index 56deccb1809..623066aa8c1 100644 --- a/german/wordpress/Makefile +++ b/german/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.2 +DISTVERSION= 5.2.3 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ @@ -14,7 +14,6 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/license.txt -BROKEN= unfetchable CONFLICTS_INSTALL= wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].* NO_ARCH= yes diff --git a/german/wordpress/distinfo b/german/wordpress/distinfo index 5bf06d10d8b..4f3c536073c 100644 --- a/german/wordpress/distinfo +++ b/german/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561104224 -SHA256 (wordpress-5.2.2-de_DE.tar.gz) = 6f65fbbafff83d2e61c54035ee0695bdff3960f5bab505af359e49d71b0801db -SIZE (wordpress-5.2.2-de_DE.tar.gz) = 11856114 +TIMESTAMP = 1567785060 +SHA256 (wordpress-5.2.3-de_DE.tar.gz) = 4f94741c2c640bb3a4fb163db0769cacb13d6e5adfaf79bfed912a603cde8c32 +SIZE (wordpress-5.2.3-de_DE.tar.gz) = 11845849 diff --git a/graphics/Makefile b/graphics/Makefile index 7d8479a5d79..78ff7fa814d 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -534,8 +534,6 @@ SUBDIR += linux-c7-wayland SUBDIR += lua-gd SUBDIR += luminance-qt5 - SUBDIR += luxrender - SUBDIR += luxrender14 SUBDIR += lximage-qt SUBDIR += magnum SUBDIR += magnum-examples @@ -871,6 +869,7 @@ SUBDIR += py-pycha SUBDIR += py-pycollada SUBDIR += py-pydot + SUBDIR += py-pyembree SUBDIR += py-pyepsg SUBDIR += py-pygal SUBDIR += py-pyganim diff --git a/graphics/R-cran-visNetwork/Makefile b/graphics/R-cran-visNetwork/Makefile index 3ec8a70d1ac..b215bdac091 100644 --- a/graphics/R-cran-visNetwork/Makefile +++ b/graphics/R-cran-visNetwork/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= visNetwork -PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/graphics/R-cran-visNetwork/distinfo b/graphics/R-cran-visNetwork/distinfo index cc46cfb982b..e4e2f42472a 100644 --- a/graphics/R-cran-visNetwork/distinfo +++ b/graphics/R-cran-visNetwork/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563057855 -SHA256 (visNetwork_2.0.7.tar.gz) = 15ad01636a3a19e1901be6743052805a5b6a9ac1240fb3dab765252b1e865128 -SIZE (visNetwork_2.0.7.tar.gz) = 4156264 +TIMESTAMP = 1567917214 +SHA256 (visNetwork_2.0.8.tar.gz) = 89ca01cabfcb40513314580daf25dccda0bd8fc74cbe8789e1d7ed6426093051 +SIZE (visNetwork_2.0.8.tar.gz) = 4155589 diff --git a/graphics/delaboratory/pkg-descr b/graphics/delaboratory/pkg-descr index a10be0140a4..4c5edee7f41 100644 --- a/graphics/delaboratory/pkg-descr +++ b/graphics/delaboratory/pkg-descr @@ -21,4 +21,4 @@ It features: - RAW support (via dcraw), up to 5 color samplers, histograms and color matrices, etc. -WWW: http://bsdforge.com/projects/graphics/delaboratory/ +WWW: https://bsdforge.com/projects/graphics/delaboratory/ diff --git a/graphics/drm-fbsd11.2-kmod/Makefile b/graphics/drm-fbsd11.2-kmod/Makefile index ff0260f47f7..c3b39acac3d 100644 --- a/graphics/drm-fbsd11.2-kmod/Makefile +++ b/graphics/drm-fbsd11.2-kmod/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drm-fbsd11.2-kmod -PORTVERSION= 4.11g20190806 +PORTVERSION= 4.11g20190906 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org @@ -28,7 +28,7 @@ USES= kmod uidfix USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm -GH_TAGNAME= 7fb366e +GH_TAGNAME= 72300db .include diff --git a/graphics/drm-fbsd11.2-kmod/distinfo b/graphics/drm-fbsd11.2-kmod/distinfo index 3fef1ced15c..8976db74bf8 100644 --- a/graphics/drm-fbsd11.2-kmod/distinfo +++ b/graphics/drm-fbsd11.2-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565079936 -SHA256 (FreeBSDDesktop-kms-drm-4.11g20190806-7fb366e_GH0.tar.gz) = 444e1c32a20074a1465f426da075c199fc21885237bfa5cf1273ab5bd718d756 -SIZE (FreeBSDDesktop-kms-drm-4.11g20190806-7fb366e_GH0.tar.gz) = 7358213 +TIMESTAMP = 1567783476 +SHA256 (FreeBSDDesktop-kms-drm-4.11g20190906-72300db_GH0.tar.gz) = cda252dd7a8174a295e07ec0e425e0592e642462f10f57555156cd51fd44d2f0 +SIZE (FreeBSDDesktop-kms-drm-4.11g20190906-72300db_GH0.tar.gz) = 7358902 diff --git a/graphics/embree/Makefile b/graphics/embree/Makefile index 9f489ebf0f5..99a6fed469f 100644 --- a/graphics/embree/Makefile +++ b/graphics/embree/Makefile @@ -11,19 +11,14 @@ COMMENT= Collection of high-performance ray tracing kernels LICENSE= APACHE20 -BROKEN= fails to link -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= heavy use of SSE instructions -USE_GITHUB= yes - -USES= cmake compiler:env +USES= cmake compiler:env gl xorg USE_GL= gl glu glut USE_XORG= xi xmu USE_LDCONFIG= yes +USE_GITHUB= yes CMAKE_ARGS= -DEMBREE_TASKING_SYSTEM:STRING=INTERNAL @@ -31,7 +26,6 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2 PLIST_SUB+= VERSION=${DISTVERSION} OPTIONS_DEFINE= DOCS IMAGEMAGICK ISPC JPEG PNG -OPTIONS_DEFAULT= ISPC OPTIONS_SUB= yes IMAGEMAGICK_DESC= BMP, GIF, PNG, TGA, TIFF image formats support diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 2404ae7a730..c3c0fce9aca 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -15,6 +15,8 @@ COMMENT= SGI's Open Inventor (TM) LICENSE= LGPL21 BROKEN= unfetchable +DEPRECATED= Depends on expiring graphics/libGLw +EXPIRATION_DATE= 2019-11-01 ONLY_FOR_ARCHS= amd64 i386 CONFLICTS= Coin-[0-9]* SoXt-[0-9]* diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile index 3f23fc95c2c..cd434ec1519 100644 --- a/graphics/libGLw/Makefile +++ b/graphics/libGLw/Makefile @@ -12,6 +12,9 @@ DIST_SUBDIR= GL MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL widgets library +DEPRECATED= Deprecated upstream +EXPIRATION_DATE= 2019-11-01 + USES= motif libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GL= gl diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile deleted file mode 100644 index b12e88b2586..00000000000 --- a/graphics/luxrender/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# Created by: Alexey Dokuchaev -# $FreeBSD$ - -PORTNAME= luxrender -DISTVERSION?= 1.6 -PORTREVISION= 15 -CATEGORIES= graphics -MASTER_SITES= https://bitbucket.org/luxrender/lux/get/ \ - https://bitbucket.org/luxrender/luxrays/get/:lr -DISTFILES= v${DISTVERSION:C/[.-]//g}${EXTRACT_SUFX} \ - ${PORTNAME}_v${DISTVERSION:S/-//}${EXTRACT_SUFX}:lr -DIST_SUBDIR= ${PORTNAME} - -MAINTAINER= danfe@FreeBSD.org -COMMENT= Physically based and unbiased rendering system - -LICENSE= GPLv3 - -BROKEN= fails to build with boost 1.70, see bug 236599 -DEPRECATED= Depends on expiring graphics/embree -EXPIRATION_DATE= 2019-09-04 - -LIB_DEPENDS= ${PY_BOOST} \ - libfftw3.so:math/fftw3 \ - libOpenImageIO.so:graphics/openimageio -.if ${DISTVERSION} != 1.4 -LIB_DEPENDS+= libembree.so:graphics/embree -.endif - -CONFLICTS_INSTALL?= ${PORTNAME}14-1.4* - -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= uses SSE instructions - -USES+= bison cmake:noninja python:build tar:bzip2 -USE_GL= glu - -WRKSRC= ${WRKDIR}/${PORTNAME}-lux-${LUX_REV} -LUXRAYS_WRKSRC= ${WRKDIR}/${PORTNAME}-luxrays-${LUXRAYS_REV} - -CMAKE_ARGS= -DLUXCORE_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ - -DLUXCORE_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxcore.a" \ - -DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ - -DLUXRAYS_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxrays.a" \ - -DSLG_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \ - -DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \ - -DLUXRAYS_DISABLE_OPENCL:BOOL=ON - -LUX_REV?= b3f85cf7742f -LUXRAYS_REV?= 61352e6aae3f - -OPTIONS_DEFINE= FREEIMAGE X11 -OPTIONS_DEFAULT= X11 - -FREEIMAGE_DESC= Build with FreeImage (otherwise use OIIO only) -FREEIMAGE_CMAKE_ON= -DLUX_USE_FREEIMAGE:BOOL=ON -FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage - -post-extract: - @${LN} -sf ${PORTNAME}-luxrays-${LUXRAYS_REV} ${WRKDIR}/luxrays - -post-patch: - @${REINPLACE_CMD} -e 's/__APPLE__/__FreeBSD__/' \ - ${WRKSRC}/core/osfunc.h \ - ${WRKSRC}/shapes/mikktspace/weldmesh.c -# Avoid infamous "local symbol discarded in section `.text...' errors - @${REINPLACE_CMD} -e '/^set(Boost_USE_STATIC_LIBS/s,ON,OFF,' \ - ${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake -# Avoid picking up Python 3.x bits if they're installed - @${REINPLACE_CMD} -e 's,PythonLibs,& ${PYTHON_VER} EXACT REQUIRED,' \ - ${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake \ - ${WRKSRC}/cmake/pylux.cmake - -pre-configure: - -${PYTHON_CMD} ${WRKSRC}/makeBuildNumber.py ${WRKSRC}/core/version.h - cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ - ${CMAKE_ARGS} . - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ - ${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC} - -.include diff --git a/graphics/luxrender/distinfo b/graphics/luxrender/distinfo deleted file mode 100644 index a857ce4ab2d..00000000000 --- a/graphics/luxrender/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (luxrender/v16.tar.bz2) = 29144f657087644086928a66421df5d25fc4dccd05970200932f5693650ddecf -SIZE (luxrender/v16.tar.bz2) = 2421141 -SHA256 (luxrender/luxrender_v1.6.tar.bz2) = eb38489e4bcb1336027efc8fa991f506bf78e8cb9edc7b73794e0cdcf998b15a -SIZE (luxrender/luxrender_v1.6.tar.bz2) = 36615450 diff --git a/graphics/luxrender/files/patch-CMakeLists.txt b/graphics/luxrender/files/patch-CMakeLists.txt deleted file mode 100644 index 5cd7bca6165..00000000000 --- a/graphics/luxrender/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -210,7 +210,6 @@ IF(NOT APPLE AND NOT WIN32) - STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE}) - IF (_mach_x86_64) - SET(ARCH_X86_64 1) -- SET(LIB_SUFFIX 64) - #jromang - Hack to avoid boost bug on x64 Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433) - ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T) - ENDIF (_mach_x86_64) -@@ -402,7 +401,7 @@ ELSEIF(MSVC) - ELSE(APPLE) - # Dade - default compiler options - # Removed "-O3" from definitions in order to have CMake Release/Debug options to work -- ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H) -+ ADD_DEFINITIONS(-msse -Wall -fPIC -DHAVE_PTHREAD_H) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden") - # The QBVH accelerator needs to be compiled with much reduced optimizations diff --git a/graphics/luxrender/files/patch-accelerators_bvhaccel.cpp b/graphics/luxrender/files/patch-accelerators_bvhaccel.cpp deleted file mode 100644 index 9b351647ea1..00000000000 --- a/graphics/luxrender/files/patch-accelerators_bvhaccel.cpp +++ /dev/null @@ -1,23 +0,0 @@ -After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails: - -accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous - u_int middle = distance(list.begin(), it); - ^~~~~~~~ -/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter *>] -distance(_InputIter __first, _InputIter __last) -^ -/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter *>] - distance(SinglePassIterator first, SinglePassIterator last) - ^ - ---- accelerators/bvhaccel.cpp.orig 2016-05-09 21:21:17 UTC -+++ accelerators/bvhaccel.cpp -@@ -146,7 +146,7 @@ boost::shared_ptr BVHAccel::BuildHie - - vector >::iterator it = - partition(list.begin()+splits[j], list.begin()+splits[j+1], bind2nd(ptr_fun(bvh_ltf[splitAxis]), splitValue)); -- u_int middle = distance(list.begin(), it); -+ u_int middle = std::distance(list.begin(), it); - middle = max(splits[j]+1, min(splits[j+1]-1, middle)); // Make sure coincidental BBs are still split - splits.insert(splits.begin()+j+1, middle); - } diff --git a/graphics/luxrender/files/patch-c++14-fixes b/graphics/luxrender/files/patch-c++14-fixes deleted file mode 100644 index 2391a7e2f78..00000000000 --- a/graphics/luxrender/files/patch-c++14-fixes +++ /dev/null @@ -1,40 +0,0 @@ ---- core/queryable/queryable.h.orig 2016-05-09 21:21:17 UTC -+++ core/queryable/queryable.h -@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public) - } - template friend void AddStringAttribute(T &object, - const std::string &name, const std::string &description, -- const boost::function &get, const boost::function set = NULL) { -+ const boost::function &get, const boost::function set = 0x0) { - - AddAttrib(object, name, description, get, set); - } ---- core/scheduler.cpp.orig 2016-05-09 21:21:17 UTC -+++ core/scheduler.cpp -@@ -43,7 +43,7 @@ void NullTask(Range*){} - - Scheduler::Scheduler(unsigned step) - { -- current_task = NULL; -+ current_task = 0x0; - default_step = step; - state = RUNNING; - -@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask() - condition.wait(lock); - - if(current_task == NullTask) -- return NULL; -+ return 0x0; - - return current_task; - } -@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread) - - if(counter == 0) - { -- current_task = NULL; -+ current_task = 0x0; - condition.notify_all(); - } - else diff --git a/graphics/luxrender/files/patch-gcc42-fixes b/graphics/luxrender/files/patch-gcc42-fixes deleted file mode 100644 index dbf2e1b99f5..00000000000 --- a/graphics/luxrender/files/patch-gcc42-fixes +++ /dev/null @@ -1,394 +0,0 @@ ---- ../luxrays/include/luxrays/core/geometry/frame.h.orig -+++ ../luxrays/include/luxrays/core/geometry/frame.h -@@ -46,11 +46,11 @@ public: - SetFromZ(z); - } - -- Frame(const Normal &z) { -+ Frame(const luxrays::Normal &z) { - SetFromZ(Vector(z)); - } - -- void SetFromZ(const Normal &z) { -+ void SetFromZ(const luxrays::Normal &z) { - SetFromZ(Vector(z)); - } - ---- textures/bilerp.h.orig -+++ textures/bilerp.h -@@ -39,7 +39,7 @@ public: - // BilerpTexture Public Methods - BilerpFloatTexture(TextureMapping2D *m, - float t00, float t01, float t10, float t11) : -- Texture("BilerpFloatTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("BilerpFloatTexture-" + boost::lexical_cast(this)) { - mapping = m; - v00 = t00; - v01 = t01; -@@ -87,7 +87,7 @@ public: - BilerpSpectrumTexture(TextureMapping2D *m, - const RGBColor &t00, const RGBColor &t01, - const RGBColor &t10, const RGBColor &t11) : -- Texture("BilerpSpectrumTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("BilerpSpectrumTexture-" + boost::lexical_cast(this)) { - mapping = m; - v00 = t00; - v01 = t01; -@@ -145,7 +145,7 @@ public: - const boost::shared_ptr > &t01, - const boost::shared_ptr > &t10, - const boost::shared_ptr > &t11) : -- Texture("BilerpFresnelTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("BilerpFresnelTexture-" + boost::lexical_cast(this)) { - mapping = m; - v00 = t00; - v01 = t01; ---- textures/blackbody.h.orig -+++ textures/blackbody.h -@@ -34,7 +34,7 @@ namespace lux - class BlackBodyTexture : public Texture { - public: - // BlackBodyTexture Public Methods -- BlackBodyTexture(float t) : Texture("BlackBodyTexture-" + boost::lexical_cast(this)), -+ BlackBodyTexture(float t) : lux::Texture::Texture("BlackBodyTexture-" + boost::lexical_cast(this)), - BBSPD(t) { } - virtual ~BlackBodyTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/blender_base.h.orig -+++ textures/blender_base.h -@@ -34,7 +34,7 @@ public: - virtual ~BlenderTexture3D() { } - - BlenderTexture3D(const std::string &name, const Transform &tex2world, const ParamSet &tp, -- short type) : Texture(name) { -+ short type) : lux::Texture::Texture(name) { - // Read mapping coordinates - mapping = TextureMapping3D::Create(tex2world, tp); - tex1 = tp.GetFloatTexture("tex1", 0.f); ---- textures/cauchytexture.h.orig -+++ textures/cauchytexture.h -@@ -35,7 +35,7 @@ class CauchyTexture : public Texture(this)), -+ lux::Texture::Texture("CauchyTexture-" + boost::lexical_cast(this)), - fresnel(cauchya, cauchyb, 0.f), index(cauchya + cauchyb * 1e6f / - (WAVELENGTH_END * WAVELENGTH_START)) { } - virtual ~CauchyTexture() { } ---- textures/checkerboard.h.orig -+++ textures/checkerboard.h -@@ -42,7 +42,7 @@ public: - Checkerboard2D(TextureMapping2D *m, - boost::shared_ptr > &c1, - boost::shared_ptr > &c2, const string &aa) : -- Texture("Checkerboard2D-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("Checkerboard2D-" + boost::lexical_cast(this)), - tex1(c1), tex2(c2), mapping(m) { - // Select anti-aliasing method for _Checkerboard2D_ - if (aa == "none") -@@ -226,7 +226,7 @@ public: - Checkerboard3D(TextureMapping3D *m, - boost::shared_ptr > &c1, - boost::shared_ptr > &c2) : -- Texture("Checkerboard3D-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("Checkerboard3D-" + boost::lexical_cast(this)), - tex1(c1), tex2(c2), mapping(m) { } - virtual ~Checkerboard3D() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, ---- textures/cloud.h.orig -+++ textures/cloud.h -@@ -47,7 +47,7 @@ public: - const u_int octaves, const float o, const float offset, - const u_int numspheres, const float spheresize, - TextureMapping3D *map) : -- Texture("CloudTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("CloudTexture-" + boost::lexical_cast(this)), - radius(r), numSpheres(numspheres), sphereSize(spheresize), - sharpness(sharp), baseFlatness(baseflatness), variability(v), - omega(o), firstNoiseScale(noiseScale), noiseOffset(offset), ---- textures/colordepth.h.orig -+++ textures/colordepth.h -@@ -34,7 +34,7 @@ class ColorDepthTexture : public Texture - public: - // ColorDepthTexture Public Methods - ColorDepthTexture(float t, boost::shared_ptr > &c) : -- Texture("ColorDepthTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ColorDepthTexture-" + boost::lexical_cast(this)), - d(-max(1e-3f, t)), color(c) { } - virtual ~ColorDepthTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/constant.h.orig -+++ textures/constant.h -@@ -36,7 +36,7 @@ class ConstantFloatTexture : public Text - public: - // ConstantTexture Public Methods - ConstantFloatTexture(float v) : -- Texture("ConstantFloatTexture-" + boost::lexical_cast(this)), value(v) { -+ lux::Texture::Texture("ConstantFloatTexture-" + boost::lexical_cast(this)), value(v) { - AddFloatAttribute(*this, "value", "ConstantFloatTexture value", &ConstantFloatTexture::value); - } - virtual ~ConstantFloatTexture() { } -@@ -60,7 +60,7 @@ class ConstantRGBColorTexture : public T - public: - // ConstantTexture Public Methods - ConstantRGBColorTexture(const RGBColor &s) : -- Texture("ConstantRGBColorTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ConstantRGBColorTexture-" + boost::lexical_cast(this)), - color(s) { - RGBSPD = new RGBReflSPD(color); - -@@ -99,7 +99,7 @@ class ConstantFresnelTexture : public Te - public: - // ConstantTexture Public Methods - ConstantFresnelTexture(float v) : -- Texture("ConstantFresnelTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ConstantFresnelTexture-" + boost::lexical_cast(this)), - value(DIELECTRIC_FRESNEL, SWCSpectrum(v), 0.f), val(v) { - AddFloatAttribute(*this, "value", "ConstantFresnelTexture value", &ConstantFresnelTexture::val); - } ---- textures/densitygrid.h.orig -+++ textures/densitygrid.h -@@ -39,7 +39,7 @@ public: - // DensityGridTexture Public Methods - DensityGridTexture(int x, int y, int z, const float *d, - enum WrapMode w, TextureMapping3D *map) : -- Texture("DensityGridTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("DensityGridTexture-" + boost::lexical_cast(this)), - nx(x), ny(y), nz(z), wrapMode(w), mapping(map) { - density.assign(d, d + nx * ny * nz); - dMin = *std::min_element(density.begin(), density.end()); ---- textures/dots.h.orig -+++ textures/dots.h -@@ -37,7 +37,7 @@ public: - // DotsTexture Public Methods - DotsTexture(TextureMapping2D *m, boost::shared_ptr > &c1, - boost::shared_ptr > &c2) : -- Texture("DotsTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("DotsTexture-" + boost::lexical_cast(this)), - outsideDot(c1), insideDot(c2), mapping(m) { } - virtual ~DotsTexture() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, ---- textures/equalenergy.h.orig -+++ textures/equalenergy.h -@@ -35,7 +35,7 @@ class EqualEnergyTexture : public Textur - public: - // EqualEnergyTexture Public Methods - EqualEnergyTexture(float t) : -- Texture("EqualEnergyTexture-" + boost::lexical_cast(this)), e(t) { } -+ lux::Texture::Texture("EqualEnergyTexture-" + boost::lexical_cast(this)), e(t) { } - virtual ~EqualEnergyTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &) const { ---- textures/exponential.h.orig -+++ textures/exponential.h -@@ -36,7 +36,7 @@ public: - // ExponentialTexture Public Methods - ExponentialTexture(const Point &o, const Vector &up, float d, - TextureMapping3D *map) : -- Texture("ExponentialTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ExponentialTexture-" + boost::lexical_cast(this)), - origin(o), upDir(up), decay(d), mapping(map) { } - virtual ~ExponentialTexture() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, ---- textures/fbm.h.orig -+++ textures/fbm.h -@@ -37,7 +37,7 @@ class FBmTexture : public Texture - public: - // FBmTexture Public Methods - FBmTexture(int oct, float roughness, TextureMapping3D *map) : -- Texture("FBmTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("FBmTexture-" + boost::lexical_cast(this)) { - omega = roughness; - octaves = oct; - mapping = map; ---- textures/frequencytexture.h.orig -+++ textures/frequencytexture.h -@@ -35,7 +35,7 @@ class FrequencyTexture : public Texture< - public: - // FrequencyTexture Public Methods - FrequencyTexture(float w, float p, float r) -- : Texture("FrequencyTexture-" + boost::lexical_cast(this)), -+ : lux::Texture::Texture("FrequencyTexture-" + boost::lexical_cast(this)), - FSPD(w, p, r) { } - virtual ~FrequencyTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/fresnelcolor.h.orig -+++ textures/fresnelcolor.h -@@ -34,7 +34,7 @@ class FresnelColorTexture : public Textu - public: - // FresnelColorTexture Public Methods - FresnelColorTexture(const boost::shared_ptr > &c) : -- Texture("FresnelColorTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("FresnelColorTexture-" + boost::lexical_cast(this)), - color(c) { } - virtual ~FresnelColorTexture() { } - virtual FresnelGeneral Evaluate(const SpectrumWavelengths &sw, ---- textures/gaussiantexture.h.orig -+++ textures/gaussiantexture.h -@@ -35,7 +35,7 @@ class GaussianTexture : public Texture(this)), -+ lux::Texture::Texture("GaussianTexture-" + boost::lexical_cast(this)), - GSPD(m, w, r) { } - virtual ~GaussianTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/harlequin.h.orig -+++ textures/harlequin.h -@@ -40,7 +40,7 @@ namespace lux - class HarlequinTexture : public Texture { - public: - // Harlequin Public Methods -- HarlequinTexture() : Texture("HarlequinTexture-" + boost::lexical_cast(this)) { -+ HarlequinTexture() : lux::Texture::Texture("HarlequinTexture-" + boost::lexical_cast(this)) { - float c[3]; - for (int i = 0; i < HARLEQUIN_TEXTURE_PALETTE_SIZE; i++) { - c[0] = RadicalInverse(i * COLOR_SAMPLES + 1, 2); ---- textures/hitpointcolor.h.orig -+++ textures/hitpointcolor.h -@@ -34,7 +34,7 @@ namespace lux - class HitPointAlphaTexture : public Texture { - public: - HitPointAlphaTexture() : -- Texture("HitPointAlphaTexture-" + boost::lexical_cast(this)) { } -+ lux::Texture::Texture("HitPointAlphaTexture-" + boost::lexical_cast(this)) { } - virtual ~HitPointAlphaTexture() { } - virtual float Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dgs) const { -@@ -58,7 +58,7 @@ public: - class HitPointRGBColorTexture : public Texture { - public: - HitPointRGBColorTexture() : -- Texture("HitPointRGBColorTexture-" + boost::lexical_cast(this)) { } -+ lux::Texture::Texture("HitPointRGBColorTexture-" + boost::lexical_cast(this)) { } - virtual ~HitPointRGBColorTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dgs) const { -@@ -83,7 +83,7 @@ public: - class HitPointGreyTexture : public Texture { - public: - HitPointGreyTexture(const u_int ch) : -- Texture("HitPointGreyTexture-" + boost::lexical_cast(this)), channel(ch) { } -+ lux::Texture::Texture("HitPointGreyTexture-" + boost::lexical_cast(this)), channel(ch) { } - virtual ~HitPointGreyTexture() { } - virtual float Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dgs) const { ---- textures/imagemap.h.orig -+++ textures/imagemap.h -@@ -112,7 +112,7 @@ class ImageFloatTexture : public Texture - public: - // ImageFloatTexture Public Methods - ImageFloatTexture(const TexInfo &texInfo, TextureMapping2D *m, Channel ch) : -- Texture("ImageFloatTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ImageFloatTexture-" + boost::lexical_cast(this)), - ImageTexture(texInfo, m) { channel = ch; } - - virtual ~ImageFloatTexture() { } -@@ -152,7 +152,7 @@ class ImageSpectrumTexture : public Text - public: - // ImageSpectrumTexture Public Methods - ImageSpectrumTexture(const TexInfo &texInfo, TextureMapping2D *m) : -- Texture("ImageSpectrumTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ImageSpectrumTexture-" + boost::lexical_cast(this)), - ImageTexture(texInfo, m), isIlluminant(false) { } - - virtual ~ImageSpectrumTexture() { } -@@ -200,7 +200,7 @@ class NormalMapTexture : public Texture< - public: - // NormalMapTexture Public Methods - NormalMapTexture(const TexInfo &texInfo, TextureMapping2D *m) : -- Texture("NormalMapTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("NormalMapTexture-" + boost::lexical_cast(this)), - ImageTexture(texInfo, m) { } - - virtual ~NormalMapTexture() { } ---- textures/irregulardata.h.orig -+++ textures/irregulardata.h -@@ -36,7 +36,7 @@ public: - // IrregularDataSpectrumTexture Public Methods - IrregularDataTexture(u_int n, const float *wl, const float *data, - float resolution = 5.f) : -- Texture("IrregularDataTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("IrregularDataTexture-" + boost::lexical_cast(this)), - SPD(wl, data, n, resolution) { } - virtual ~IrregularDataTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/marble.h.orig -+++ textures/marble.h -@@ -39,7 +39,7 @@ public: - // MarbleTexture Public Methods - virtual ~MarbleTexture() { delete mapping; } - MarbleTexture(int oct, float roughness, float sc, float var, -- TextureMapping3D *map) : Texture("MarbleTexture-" + boost::lexical_cast(this)) { -+ TextureMapping3D *map) : lux::Texture::Texture("MarbleTexture-" + boost::lexical_cast(this)) { - omega = roughness; - octaves = oct; - mapping = map; ---- textures/regulardata.h.orig -+++ textures/regulardata.h -@@ -35,7 +35,7 @@ class RegularDataTexture : public Textur - public: - // RegularDataSpectrumTexture Public Methods - RegularDataTexture(float s, float e, u_int n, const float *data) -- : Texture("RegularDataTexture-" + boost::lexical_cast(this)), -+ : lux::Texture::Texture("RegularDataTexture-" + boost::lexical_cast(this)), - SPD(data, s, e, n) { } - virtual ~RegularDataTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/sellmeiertexture.h.orig -+++ textures/sellmeiertexture.h -@@ -36,7 +36,7 @@ class SellmeierTexture : public Texture< - public: - // SellmeierTexture Public Methods - SellmeierTexture(float a_, u_int n, const float *b_, const float *c_) : -- Texture("SellmeierTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("SellmeierTexture-" + boost::lexical_cast(this)), - b(b_, b_ + n), c(c_, c_ + n), a(a_) { - // Sellmeier expects wavelength in µm but we have it in nm - for (u_int i = 0; i < n; ++i) ---- textures/tabulatedfresnel.h.orig -+++ textures/tabulatedfresnel.h -@@ -37,7 +37,7 @@ public: - // TabulatedFresnel Public Methods - TabulatedFresnel(const vector &wl, const vector &n, - const vector &k) : -- Texture("TabulatedFresnel-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("TabulatedFresnel-" + boost::lexical_cast(this)), - N(&wl[0], &n[0], wl.size()), K(&wl[0], &k[0], wl.size()), - index(N.Filter()) { } - virtual ~TabulatedFresnel() { } ---- textures/uv.h.orig -+++ textures/uv.h -@@ -36,7 +36,7 @@ namespace lux - class UVTexture : public Texture { - public: - // UVTexture Public Methods -- UVTexture(TextureMapping2D *m) : Texture("UVTexture-" + boost::lexical_cast(this)) { -+ UVTexture(TextureMapping2D *m) : lux::Texture::Texture("UVTexture-" + boost::lexical_cast(this)) { - mapping = m; - } - virtual ~UVTexture() { ---- textures/windy.h.orig -+++ textures/windy.h -@@ -37,7 +37,7 @@ class WindyTexture : public Texture(this)) { mapping = map; } -+ lux::Texture::Texture("WindyTexture-" + boost::lexical_cast(this)) { mapping = map; } - virtual ~WindyTexture() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dg) const { ---- textures/wrinkled.h.orig -+++ textures/wrinkled.h -@@ -37,7 +37,7 @@ class WrinkledTexture : public Texture(this)) { -+ lux::Texture::Texture("WrinkledTexture-" + boost::lexical_cast(this)) { - omega = roughness; - octaves = oct; - mapping = map; diff --git a/graphics/luxrender/files/patch-luxrays-CMakeLists.txt b/graphics/luxrender/files/patch-luxrays-CMakeLists.txt deleted file mode 100644 index ffdd49ebebc..00000000000 --- a/graphics/luxrender/files/patch-luxrays-CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ ---- ../luxrays/CMakeLists.txt.orig -+++ ../luxrays/CMakeLists.txt -@@ -91,14 +91,6 @@ if (NOT OPENGL_FOUND AND NOT LUXRAYS_DIS - SET(LUXRAYS_DISABLE_OPENCL 1) - endif() - --if (NOT GLEW_FOUND) -- MESSAGE(FATAL_ERROR "--> Could not locate required GLEW files, disabling samples build - Please check ${GLEW_SEARCH_PATH}") --endif() -- --if (NOT GLUT_FOUND) -- MESSAGE(FATAL_ERROR "--> Could not locate required GLUT files, disabling samples build - Please check ${GLUT_SEARCH_PATH}") --endif() -- - if (NOT EMBREE_FOUND) - MESSAGE(FATAL_ERROR "--> Could not locate required Intel Embree files - Please check ${EMBREE_SEARCH_PATH}") - endif() -@@ -124,29 +116,6 @@ add_subdirectory(src/luxcore) - - ################################################################################ - # --# Samples --# --################################################################################ -- --if(NOT APPLE OR OSX_BUILD_DEMOS) -- add_subdirectory(samples/benchsimple) -- add_subdirectory(samples/luxcoredemo) -- add_subdirectory(samples/luxcorescenedemo) -- add_subdirectory(samples/luxcoreimplserializationdemo) --endif() -- --if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND) -- add_subdirectory(samples/smallluxgpu4) --endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND) -- --add_subdirectory(samples/luxcoreconsole) --if(OPENGL_FOUND) -- add_subdirectory(samples/luxcoreui) --endif(OPENGL_FOUND) -- -- --################################################################################ --# - # For non win32 we'll have to copy everything to a single dir - # - ################################################################################ diff --git a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake b/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake deleted file mode 100644 index 4ff5dc3bad2..00000000000 --- a/graphics/luxrender/files/patch-luxrays-cmake-PlatformSpecific.cmake +++ /dev/null @@ -1,26 +0,0 @@ ---- ../luxrays/cmake/PlatformSpecific.cmake.orig -+++ ../luxrays/cmake/PlatformSpecific.cmake -@@ -138,18 +138,17 @@ ENDIF(MSVC) - - - --IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) -+#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - # Update if necessary -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") - IF(NOT CYGWIN) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - ENDIF(NOT CYGWIN) - - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") -- SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ftree-vectorize -fvariable-expansion-in-unroller") -- --ENDIF() -+ SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG") -+#ENDIF() - - - # Setting Universal Binary Properties, only for Mac OS X diff --git a/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h b/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h deleted file mode 100644 index 4a0b0eeb738..00000000000 --- a/graphics/luxrender/files/patch-luxrays-include-luxcore-luxcore.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ../luxrays/include/luxcore/luxcore.h.orig -+++ ../luxrays/include/luxcore/luxcore.h -@@ -63,7 +63,7 @@ - */ - namespace luxcore { - --CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler -+extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler - - #define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } } - -@@ -603,7 +603,7 @@ public: - * - * \return the default Properties. - */ -- static const luxrays::Properties &GetDefaultProperties(); -+ const luxrays::Properties &GetDefaultProperties(); - - friend class RenderSession; - diff --git a/graphics/luxrender/pkg-descr b/graphics/luxrender/pkg-descr deleted file mode 100644 index 164c5dfb4a6..00000000000 --- a/graphics/luxrender/pkg-descr +++ /dev/null @@ -1,25 +0,0 @@ -LuxRender is a physically based and unbiased rendering engine. Based on -state of the art algorithms, LuxRender simulates the flow of light according -to physical equations, thus producing realistic images of photographic -quality. Some of the main features of LuxRender are: - - * biased and unbiased rendering: Users can choose between physical - accuracy (unbiased) and speed (biased); - * full spectral rendering: Instead of the RGB colour spectrum, full - spectra are used for internal calculations; - * hierarchical procedural and image based texture system: Procedural and - image based textures can be mixed in various ways, making it possible to - create complex materials; - * displacement mapping and subdivision: Based on procedural or image - textures, object surfaces can be transformed; - * network and co-operative rendering: Rendering time can be reduced by - combining the processing power of multiple computers; - * perspective (including shift lens), orthographic, and environment - cameras; - * HDR output: Render output can be saved in various file formats, - including .png, .tga, and .exr. - -Fully functional exporters are available for Blender and Maya, while -exporters for a growing number of 3D applications are under development. - -WWW: http://www.luxrender.net/ diff --git a/graphics/luxrender/pkg-plist b/graphics/luxrender/pkg-plist deleted file mode 100644 index ea0ba1485cb..00000000000 --- a/graphics/luxrender/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/luxconsole -bin/luxmerger -include/luxrender/api.h -lib/liblux.so -share/pixmaps/luxrender.svg -share/applications/luxrender.desktop diff --git a/graphics/luxrender14/Makefile b/graphics/luxrender14/Makefile deleted file mode 100644 index d2235915762..00000000000 --- a/graphics/luxrender14/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Alexey Dokuchaev -# $FreeBSD$ - -DISTVERSION= 1.4 -PORTREVISION= 5 - -LUX_REV= dfd211d6faa0 -LUXRAYS_REV= 7c7127ee1fa4 - -MASTERDIR= ${.CURDIR}/../luxrender -PKGNAMESUFFIX= 14 - -DISTINFO_FILE= ${.CURDIR}/distinfo -PATCHDIR= ${.CURDIR}/files - -CONFLICTS_INSTALL= ${PORTNAME}-* - -USES= dos2unix -DOS2UNIX_FILES= ../luxrays/CMakeLists.txt - -OPTIONS_SLAVE= FREEIMAGE - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/luxrender14/distinfo b/graphics/luxrender14/distinfo deleted file mode 100644 index 21b9a50c419..00000000000 --- a/graphics/luxrender14/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (luxrender/v14.tar.bz2) = 87389167496037e22cbf420efd610474d6a02395c4f4e4a39e2bd50453676b0b -SIZE (luxrender/v14.tar.bz2) = 2642639 -SHA256 (luxrender/luxrender_v1.4.tar.bz2) = 8229a814807fed2810eefd4a5ba051e7b05a4b30862ee066a3c205d6bd730205 -SIZE (luxrender/luxrender_v1.4.tar.bz2) = 26682611 diff --git a/graphics/luxrender14/files/patch-CMakeLists.txt b/graphics/luxrender14/files/patch-CMakeLists.txt deleted file mode 100644 index 5cd7bca6165..00000000000 --- a/graphics/luxrender14/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -210,7 +210,6 @@ IF(NOT APPLE AND NOT WIN32) - STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE}) - IF (_mach_x86_64) - SET(ARCH_X86_64 1) -- SET(LIB_SUFFIX 64) - #jromang - Hack to avoid boost bug on x64 Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433) - ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T) - ENDIF (_mach_x86_64) -@@ -402,7 +401,7 @@ ELSEIF(MSVC) - ELSE(APPLE) - # Dade - default compiler options - # Removed "-O3" from definitions in order to have CMake Release/Debug options to work -- ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H) -+ ADD_DEFINITIONS(-msse -Wall -fPIC -DHAVE_PTHREAD_H) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden") - # The QBVH accelerator needs to be compiled with much reduced optimizations diff --git a/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp b/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp deleted file mode 100644 index 77cffab8916..00000000000 --- a/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp +++ /dev/null @@ -1,23 +0,0 @@ -After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails: - -accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous - u_int middle = distance(list.begin(), it); - ^~~~~~~~ -/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter *>] -distance(_InputIter __first, _InputIter __last) -^ -/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter *>] - distance(SinglePassIterator first, SinglePassIterator last) - ^ - ---- accelerators/bvhaccel.cpp.orig 2015-01-20 23:10:10 UTC -+++ accelerators/bvhaccel.cpp -@@ -146,7 +146,7 @@ boost::shared_ptr BVHAccel::BuildHie - - vector >::iterator it = - partition(list.begin()+splits[j], list.begin()+splits[j+1], bind2nd(ptr_fun(bvh_ltf[splitAxis]), splitValue)); -- u_int middle = distance(list.begin(), it); -+ u_int middle = std::distance(list.begin(), it); - middle = max(splits[j]+1, min(splits[j+1]-1, middle)); // Make sure coincidental BBs are still split - splits.insert(splits.begin()+j+1, middle); - } diff --git a/graphics/luxrender14/files/patch-c++14-fixes b/graphics/luxrender14/files/patch-c++14-fixes deleted file mode 100644 index 6516429721d..00000000000 --- a/graphics/luxrender14/files/patch-c++14-fixes +++ /dev/null @@ -1,40 +0,0 @@ ---- core/queryable/queryable.h.orig 2015-01-20 23:10:10 UTC -+++ core/queryable/queryable.h -@@ -194,7 +194,7 @@ class LUX_EXPORT Queryable (public) - } - template friend void AddStringAttribute(T &object, - const std::string &name, const std::string &description, -- const boost::function &get, const boost::function set = NULL) { -+ const boost::function &get, const boost::function set = 0x0) { - - AddAttrib(object, name, description, get, set); - } ---- core/scheduler.cpp.orig 2015-01-20 23:10:10 UTC -+++ core/scheduler.cpp -@@ -43,7 +43,7 @@ void NullTask(Range*){} - - Scheduler::Scheduler(unsigned step) - { -- current_task = NULL; -+ current_task = 0x0; - default_step = step; - state = RUNNING; - -@@ -127,7 +127,7 @@ TaskType Scheduler::GetTask() - condition.wait(lock); - - if(current_task == NullTask) -- return NULL; -+ return 0x0; - - return current_task; - } -@@ -152,7 +152,7 @@ bool Scheduler::EndTask(Thread* thread) - - if(counter == 0) - { -- current_task = NULL; -+ current_task = 0x0; - condition.notify_all(); - } - else diff --git a/graphics/luxrender14/files/patch-gcc42-fixes b/graphics/luxrender14/files/patch-gcc42-fixes deleted file mode 100644 index dbf2e1b99f5..00000000000 --- a/graphics/luxrender14/files/patch-gcc42-fixes +++ /dev/null @@ -1,394 +0,0 @@ ---- ../luxrays/include/luxrays/core/geometry/frame.h.orig -+++ ../luxrays/include/luxrays/core/geometry/frame.h -@@ -46,11 +46,11 @@ public: - SetFromZ(z); - } - -- Frame(const Normal &z) { -+ Frame(const luxrays::Normal &z) { - SetFromZ(Vector(z)); - } - -- void SetFromZ(const Normal &z) { -+ void SetFromZ(const luxrays::Normal &z) { - SetFromZ(Vector(z)); - } - ---- textures/bilerp.h.orig -+++ textures/bilerp.h -@@ -39,7 +39,7 @@ public: - // BilerpTexture Public Methods - BilerpFloatTexture(TextureMapping2D *m, - float t00, float t01, float t10, float t11) : -- Texture("BilerpFloatTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("BilerpFloatTexture-" + boost::lexical_cast(this)) { - mapping = m; - v00 = t00; - v01 = t01; -@@ -87,7 +87,7 @@ public: - BilerpSpectrumTexture(TextureMapping2D *m, - const RGBColor &t00, const RGBColor &t01, - const RGBColor &t10, const RGBColor &t11) : -- Texture("BilerpSpectrumTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("BilerpSpectrumTexture-" + boost::lexical_cast(this)) { - mapping = m; - v00 = t00; - v01 = t01; -@@ -145,7 +145,7 @@ public: - const boost::shared_ptr > &t01, - const boost::shared_ptr > &t10, - const boost::shared_ptr > &t11) : -- Texture("BilerpFresnelTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("BilerpFresnelTexture-" + boost::lexical_cast(this)) { - mapping = m; - v00 = t00; - v01 = t01; ---- textures/blackbody.h.orig -+++ textures/blackbody.h -@@ -34,7 +34,7 @@ namespace lux - class BlackBodyTexture : public Texture { - public: - // BlackBodyTexture Public Methods -- BlackBodyTexture(float t) : Texture("BlackBodyTexture-" + boost::lexical_cast(this)), -+ BlackBodyTexture(float t) : lux::Texture::Texture("BlackBodyTexture-" + boost::lexical_cast(this)), - BBSPD(t) { } - virtual ~BlackBodyTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/blender_base.h.orig -+++ textures/blender_base.h -@@ -34,7 +34,7 @@ public: - virtual ~BlenderTexture3D() { } - - BlenderTexture3D(const std::string &name, const Transform &tex2world, const ParamSet &tp, -- short type) : Texture(name) { -+ short type) : lux::Texture::Texture(name) { - // Read mapping coordinates - mapping = TextureMapping3D::Create(tex2world, tp); - tex1 = tp.GetFloatTexture("tex1", 0.f); ---- textures/cauchytexture.h.orig -+++ textures/cauchytexture.h -@@ -35,7 +35,7 @@ class CauchyTexture : public Texture(this)), -+ lux::Texture::Texture("CauchyTexture-" + boost::lexical_cast(this)), - fresnel(cauchya, cauchyb, 0.f), index(cauchya + cauchyb * 1e6f / - (WAVELENGTH_END * WAVELENGTH_START)) { } - virtual ~CauchyTexture() { } ---- textures/checkerboard.h.orig -+++ textures/checkerboard.h -@@ -42,7 +42,7 @@ public: - Checkerboard2D(TextureMapping2D *m, - boost::shared_ptr > &c1, - boost::shared_ptr > &c2, const string &aa) : -- Texture("Checkerboard2D-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("Checkerboard2D-" + boost::lexical_cast(this)), - tex1(c1), tex2(c2), mapping(m) { - // Select anti-aliasing method for _Checkerboard2D_ - if (aa == "none") -@@ -226,7 +226,7 @@ public: - Checkerboard3D(TextureMapping3D *m, - boost::shared_ptr > &c1, - boost::shared_ptr > &c2) : -- Texture("Checkerboard3D-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("Checkerboard3D-" + boost::lexical_cast(this)), - tex1(c1), tex2(c2), mapping(m) { } - virtual ~Checkerboard3D() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, ---- textures/cloud.h.orig -+++ textures/cloud.h -@@ -47,7 +47,7 @@ public: - const u_int octaves, const float o, const float offset, - const u_int numspheres, const float spheresize, - TextureMapping3D *map) : -- Texture("CloudTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("CloudTexture-" + boost::lexical_cast(this)), - radius(r), numSpheres(numspheres), sphereSize(spheresize), - sharpness(sharp), baseFlatness(baseflatness), variability(v), - omega(o), firstNoiseScale(noiseScale), noiseOffset(offset), ---- textures/colordepth.h.orig -+++ textures/colordepth.h -@@ -34,7 +34,7 @@ class ColorDepthTexture : public Texture - public: - // ColorDepthTexture Public Methods - ColorDepthTexture(float t, boost::shared_ptr > &c) : -- Texture("ColorDepthTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ColorDepthTexture-" + boost::lexical_cast(this)), - d(-max(1e-3f, t)), color(c) { } - virtual ~ColorDepthTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/constant.h.orig -+++ textures/constant.h -@@ -36,7 +36,7 @@ class ConstantFloatTexture : public Text - public: - // ConstantTexture Public Methods - ConstantFloatTexture(float v) : -- Texture("ConstantFloatTexture-" + boost::lexical_cast(this)), value(v) { -+ lux::Texture::Texture("ConstantFloatTexture-" + boost::lexical_cast(this)), value(v) { - AddFloatAttribute(*this, "value", "ConstantFloatTexture value", &ConstantFloatTexture::value); - } - virtual ~ConstantFloatTexture() { } -@@ -60,7 +60,7 @@ class ConstantRGBColorTexture : public T - public: - // ConstantTexture Public Methods - ConstantRGBColorTexture(const RGBColor &s) : -- Texture("ConstantRGBColorTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ConstantRGBColorTexture-" + boost::lexical_cast(this)), - color(s) { - RGBSPD = new RGBReflSPD(color); - -@@ -99,7 +99,7 @@ class ConstantFresnelTexture : public Te - public: - // ConstantTexture Public Methods - ConstantFresnelTexture(float v) : -- Texture("ConstantFresnelTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ConstantFresnelTexture-" + boost::lexical_cast(this)), - value(DIELECTRIC_FRESNEL, SWCSpectrum(v), 0.f), val(v) { - AddFloatAttribute(*this, "value", "ConstantFresnelTexture value", &ConstantFresnelTexture::val); - } ---- textures/densitygrid.h.orig -+++ textures/densitygrid.h -@@ -39,7 +39,7 @@ public: - // DensityGridTexture Public Methods - DensityGridTexture(int x, int y, int z, const float *d, - enum WrapMode w, TextureMapping3D *map) : -- Texture("DensityGridTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("DensityGridTexture-" + boost::lexical_cast(this)), - nx(x), ny(y), nz(z), wrapMode(w), mapping(map) { - density.assign(d, d + nx * ny * nz); - dMin = *std::min_element(density.begin(), density.end()); ---- textures/dots.h.orig -+++ textures/dots.h -@@ -37,7 +37,7 @@ public: - // DotsTexture Public Methods - DotsTexture(TextureMapping2D *m, boost::shared_ptr > &c1, - boost::shared_ptr > &c2) : -- Texture("DotsTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("DotsTexture-" + boost::lexical_cast(this)), - outsideDot(c1), insideDot(c2), mapping(m) { } - virtual ~DotsTexture() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, ---- textures/equalenergy.h.orig -+++ textures/equalenergy.h -@@ -35,7 +35,7 @@ class EqualEnergyTexture : public Textur - public: - // EqualEnergyTexture Public Methods - EqualEnergyTexture(float t) : -- Texture("EqualEnergyTexture-" + boost::lexical_cast(this)), e(t) { } -+ lux::Texture::Texture("EqualEnergyTexture-" + boost::lexical_cast(this)), e(t) { } - virtual ~EqualEnergyTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &) const { ---- textures/exponential.h.orig -+++ textures/exponential.h -@@ -36,7 +36,7 @@ public: - // ExponentialTexture Public Methods - ExponentialTexture(const Point &o, const Vector &up, float d, - TextureMapping3D *map) : -- Texture("ExponentialTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ExponentialTexture-" + boost::lexical_cast(this)), - origin(o), upDir(up), decay(d), mapping(map) { } - virtual ~ExponentialTexture() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, ---- textures/fbm.h.orig -+++ textures/fbm.h -@@ -37,7 +37,7 @@ class FBmTexture : public Texture - public: - // FBmTexture Public Methods - FBmTexture(int oct, float roughness, TextureMapping3D *map) : -- Texture("FBmTexture-" + boost::lexical_cast(this)) { -+ lux::Texture::Texture("FBmTexture-" + boost::lexical_cast(this)) { - omega = roughness; - octaves = oct; - mapping = map; ---- textures/frequencytexture.h.orig -+++ textures/frequencytexture.h -@@ -35,7 +35,7 @@ class FrequencyTexture : public Texture< - public: - // FrequencyTexture Public Methods - FrequencyTexture(float w, float p, float r) -- : Texture("FrequencyTexture-" + boost::lexical_cast(this)), -+ : lux::Texture::Texture("FrequencyTexture-" + boost::lexical_cast(this)), - FSPD(w, p, r) { } - virtual ~FrequencyTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/fresnelcolor.h.orig -+++ textures/fresnelcolor.h -@@ -34,7 +34,7 @@ class FresnelColorTexture : public Textu - public: - // FresnelColorTexture Public Methods - FresnelColorTexture(const boost::shared_ptr > &c) : -- Texture("FresnelColorTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("FresnelColorTexture-" + boost::lexical_cast(this)), - color(c) { } - virtual ~FresnelColorTexture() { } - virtual FresnelGeneral Evaluate(const SpectrumWavelengths &sw, ---- textures/gaussiantexture.h.orig -+++ textures/gaussiantexture.h -@@ -35,7 +35,7 @@ class GaussianTexture : public Texture(this)), -+ lux::Texture::Texture("GaussianTexture-" + boost::lexical_cast(this)), - GSPD(m, w, r) { } - virtual ~GaussianTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/harlequin.h.orig -+++ textures/harlequin.h -@@ -40,7 +40,7 @@ namespace lux - class HarlequinTexture : public Texture { - public: - // Harlequin Public Methods -- HarlequinTexture() : Texture("HarlequinTexture-" + boost::lexical_cast(this)) { -+ HarlequinTexture() : lux::Texture::Texture("HarlequinTexture-" + boost::lexical_cast(this)) { - float c[3]; - for (int i = 0; i < HARLEQUIN_TEXTURE_PALETTE_SIZE; i++) { - c[0] = RadicalInverse(i * COLOR_SAMPLES + 1, 2); ---- textures/hitpointcolor.h.orig -+++ textures/hitpointcolor.h -@@ -34,7 +34,7 @@ namespace lux - class HitPointAlphaTexture : public Texture { - public: - HitPointAlphaTexture() : -- Texture("HitPointAlphaTexture-" + boost::lexical_cast(this)) { } -+ lux::Texture::Texture("HitPointAlphaTexture-" + boost::lexical_cast(this)) { } - virtual ~HitPointAlphaTexture() { } - virtual float Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dgs) const { -@@ -58,7 +58,7 @@ public: - class HitPointRGBColorTexture : public Texture { - public: - HitPointRGBColorTexture() : -- Texture("HitPointRGBColorTexture-" + boost::lexical_cast(this)) { } -+ lux::Texture::Texture("HitPointRGBColorTexture-" + boost::lexical_cast(this)) { } - virtual ~HitPointRGBColorTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dgs) const { -@@ -83,7 +83,7 @@ public: - class HitPointGreyTexture : public Texture { - public: - HitPointGreyTexture(const u_int ch) : -- Texture("HitPointGreyTexture-" + boost::lexical_cast(this)), channel(ch) { } -+ lux::Texture::Texture("HitPointGreyTexture-" + boost::lexical_cast(this)), channel(ch) { } - virtual ~HitPointGreyTexture() { } - virtual float Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dgs) const { ---- textures/imagemap.h.orig -+++ textures/imagemap.h -@@ -112,7 +112,7 @@ class ImageFloatTexture : public Texture - public: - // ImageFloatTexture Public Methods - ImageFloatTexture(const TexInfo &texInfo, TextureMapping2D *m, Channel ch) : -- Texture("ImageFloatTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ImageFloatTexture-" + boost::lexical_cast(this)), - ImageTexture(texInfo, m) { channel = ch; } - - virtual ~ImageFloatTexture() { } -@@ -152,7 +152,7 @@ class ImageSpectrumTexture : public Text - public: - // ImageSpectrumTexture Public Methods - ImageSpectrumTexture(const TexInfo &texInfo, TextureMapping2D *m) : -- Texture("ImageSpectrumTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("ImageSpectrumTexture-" + boost::lexical_cast(this)), - ImageTexture(texInfo, m), isIlluminant(false) { } - - virtual ~ImageSpectrumTexture() { } -@@ -200,7 +200,7 @@ class NormalMapTexture : public Texture< - public: - // NormalMapTexture Public Methods - NormalMapTexture(const TexInfo &texInfo, TextureMapping2D *m) : -- Texture("NormalMapTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("NormalMapTexture-" + boost::lexical_cast(this)), - ImageTexture(texInfo, m) { } - - virtual ~NormalMapTexture() { } ---- textures/irregulardata.h.orig -+++ textures/irregulardata.h -@@ -36,7 +36,7 @@ public: - // IrregularDataSpectrumTexture Public Methods - IrregularDataTexture(u_int n, const float *wl, const float *data, - float resolution = 5.f) : -- Texture("IrregularDataTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("IrregularDataTexture-" + boost::lexical_cast(this)), - SPD(wl, data, n, resolution) { } - virtual ~IrregularDataTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/marble.h.orig -+++ textures/marble.h -@@ -39,7 +39,7 @@ public: - // MarbleTexture Public Methods - virtual ~MarbleTexture() { delete mapping; } - MarbleTexture(int oct, float roughness, float sc, float var, -- TextureMapping3D *map) : Texture("MarbleTexture-" + boost::lexical_cast(this)) { -+ TextureMapping3D *map) : lux::Texture::Texture("MarbleTexture-" + boost::lexical_cast(this)) { - omega = roughness; - octaves = oct; - mapping = map; ---- textures/regulardata.h.orig -+++ textures/regulardata.h -@@ -35,7 +35,7 @@ class RegularDataTexture : public Textur - public: - // RegularDataSpectrumTexture Public Methods - RegularDataTexture(float s, float e, u_int n, const float *data) -- : Texture("RegularDataTexture-" + boost::lexical_cast(this)), -+ : lux::Texture::Texture("RegularDataTexture-" + boost::lexical_cast(this)), - SPD(data, s, e, n) { } - virtual ~RegularDataTexture() { } - virtual SWCSpectrum Evaluate(const SpectrumWavelengths &sw, ---- textures/sellmeiertexture.h.orig -+++ textures/sellmeiertexture.h -@@ -36,7 +36,7 @@ class SellmeierTexture : public Texture< - public: - // SellmeierTexture Public Methods - SellmeierTexture(float a_, u_int n, const float *b_, const float *c_) : -- Texture("SellmeierTexture-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("SellmeierTexture-" + boost::lexical_cast(this)), - b(b_, b_ + n), c(c_, c_ + n), a(a_) { - // Sellmeier expects wavelength in µm but we have it in nm - for (u_int i = 0; i < n; ++i) ---- textures/tabulatedfresnel.h.orig -+++ textures/tabulatedfresnel.h -@@ -37,7 +37,7 @@ public: - // TabulatedFresnel Public Methods - TabulatedFresnel(const vector &wl, const vector &n, - const vector &k) : -- Texture("TabulatedFresnel-" + boost::lexical_cast(this)), -+ lux::Texture::Texture("TabulatedFresnel-" + boost::lexical_cast(this)), - N(&wl[0], &n[0], wl.size()), K(&wl[0], &k[0], wl.size()), - index(N.Filter()) { } - virtual ~TabulatedFresnel() { } ---- textures/uv.h.orig -+++ textures/uv.h -@@ -36,7 +36,7 @@ namespace lux - class UVTexture : public Texture { - public: - // UVTexture Public Methods -- UVTexture(TextureMapping2D *m) : Texture("UVTexture-" + boost::lexical_cast(this)) { -+ UVTexture(TextureMapping2D *m) : lux::Texture::Texture("UVTexture-" + boost::lexical_cast(this)) { - mapping = m; - } - virtual ~UVTexture() { ---- textures/windy.h.orig -+++ textures/windy.h -@@ -37,7 +37,7 @@ class WindyTexture : public Texture(this)) { mapping = map; } -+ lux::Texture::Texture("WindyTexture-" + boost::lexical_cast(this)) { mapping = map; } - virtual ~WindyTexture() { delete mapping; } - virtual float Evaluate(const SpectrumWavelengths &sw, - const DifferentialGeometry &dg) const { ---- textures/wrinkled.h.orig -+++ textures/wrinkled.h -@@ -37,7 +37,7 @@ class WrinkledTexture : public Texture(this)) { -+ lux::Texture::Texture("WrinkledTexture-" + boost::lexical_cast(this)) { - omega = roughness; - octaves = oct; - mapping = map; diff --git a/graphics/luxrender14/files/patch-luxrays-CMakeLists.txt b/graphics/luxrender14/files/patch-luxrays-CMakeLists.txt deleted file mode 100644 index 03af0903b73..00000000000 --- a/graphics/luxrender14/files/patch-luxrays-CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ ---- ../luxrays/CMakeLists.txt.orig -+++ ../luxrays/CMakeLists.txt -@@ -91,14 +91,6 @@ if (NOT OPENGL_FOUND AND NOT LUXRAYS_DIS - SET(LUXRAYS_DISABLE_OPENCL 1) - endif() - --if (NOT GLEW_FOUND) -- MESSAGE(FATAL_ERROR "--> Could not locate required GLEW files, disabling samples build - Please check ${GLEW_SEARCH_PATH}") --endif() -- --if (NOT GLUT_FOUND) -- MESSAGE(FATAL_ERROR "--> Could not locate required GLUT files, disabling samples build - Please check ${GLUT_SEARCH_PATH}") --endif() -- - if (LUXRAYS_DISABLE_OPENCL) - ADD_DEFINITIONS("-DLUXRAYS_DISABLE_OPENCL") - endif() -@@ -120,20 +112,6 @@ add_subdirectory(src/luxcore) - - ################################################################################ - # --# Samples --# --################################################################################ -- --add_subdirectory(samples/benchsimple) --add_subdirectory(samples/luxcoredemo) --add_subdirectory(samples/luxcorescenedemo) --if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND) -- add_subdirectory(samples/smallluxgpu4) --endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND) -- -- --################################################################################ --# - # For non win32 we'll have to copy everything to a single dir - # - ################################################################################ diff --git a/graphics/luxrender14/files/patch-luxrays-cmake-PlatformSpecific.cmake b/graphics/luxrender14/files/patch-luxrays-cmake-PlatformSpecific.cmake deleted file mode 100644 index 4ff5dc3bad2..00000000000 --- a/graphics/luxrender14/files/patch-luxrays-cmake-PlatformSpecific.cmake +++ /dev/null @@ -1,26 +0,0 @@ ---- ../luxrays/cmake/PlatformSpecific.cmake.orig -+++ ../luxrays/cmake/PlatformSpecific.cmake -@@ -138,18 +138,17 @@ ENDIF(MSVC) - - - --IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) -+#IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - # Update if necessary -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") - IF(NOT CYGWIN) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - ENDIF(NOT CYGWIN) - - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") -- SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -ftree-vectorize -fvariable-expansion-in-unroller") -- --ENDIF() -+ SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG") -+#ENDIF() - - - # Setting Universal Binary Properties, only for Mac OS X diff --git a/graphics/luxrender14/files/patch-luxrays-include-luxcore-luxcore.h b/graphics/luxrender14/files/patch-luxrays-include-luxcore-luxcore.h deleted file mode 100644 index 4a0b0eeb738..00000000000 --- a/graphics/luxrender14/files/patch-luxrays-include-luxcore-luxcore.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ../luxrays/include/luxcore/luxcore.h.orig -+++ ../luxrays/include/luxcore/luxcore.h -@@ -63,7 +63,7 @@ - */ - namespace luxcore { - --CPP_EXPORT CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler -+extern CPP_API void (*LuxCore_LogHandler)(const char *msg); // LuxCore Log Handler - - #define LC_LOG(a) { if (luxcore::LuxCore_LogHandler) { std::stringstream _LUXCORE_LOG_LOCAL_SS; _LUXCORE_LOG_LOCAL_SS << a; luxcore::LuxCore_LogHandler(_LUXCORE_LOG_LOCAL_SS.str().c_str()); } } - -@@ -603,7 +603,7 @@ public: - * - * \return the default Properties. - */ -- static const luxrays::Properties &GetDefaultProperties(); -+ const luxrays::Properties &GetDefaultProperties(); - - friend class RenderSession; - diff --git a/graphics/minder/Makefile b/graphics/minder/Makefile index 5a3f8a6dd81..00108599cb4 100644 --- a/graphics/minder/Makefile +++ b/graphics/minder/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= minder -PORTVERSION= 1.4.1 +PORTVERSION= 1.5.0 CATEGORIES= graphics # avoid PKGBASE collision with net-p2p/minder PKGNAMESUFFIX= -app diff --git a/graphics/minder/distinfo b/graphics/minder/distinfo index f4661bc343c..b5fed663a66 100644 --- a/graphics/minder/distinfo +++ b/graphics/minder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563180628 -SHA256 (phase1geo-Minder-1.4.1_GH0.tar.gz) = e1e5343fb83612bfc4f1943cbc53411649da4ce9bd078061b0623e7c9db95621 -SIZE (phase1geo-Minder-1.4.1_GH0.tar.gz) = 681957 +TIMESTAMP = 1567931738 +SHA256 (phase1geo-Minder-1.5.0_GH0.tar.gz) = e313b5305242959434d551d3ec78bbed6faceb5494c1832b98b0b63a95b2e3f0 +SIZE (phase1geo-Minder-1.5.0_GH0.tar.gz) = 879292 diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 65b14f80664..b88922f67e6 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= netpbm -DISTVERSION= 10.87.01 +DISTVERSION= 10.87.02 CATEGORIES= graphics MASTER_SITES= https://github.com/t6/netpbm/releases/download/v${DISTVERSION}/ \ - https://gitlab.com/tobiask/netpbm/uploads/aa50c2aa391a8aedb35d5e914b88c4d0/ \ LOCAL/tobik MAINTAINER= tobik@FreeBSD.org diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index e27abab91e3..838cb315256 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565471255 -SHA256 (netpbm-10.87.01.tar.gz) = 29c4c6a5588ca45c9598678a4e71e579be3d38fcf61dd7629195c77f4ec5adf6 -SIZE (netpbm-10.87.01.tar.gz) = 3336887 +TIMESTAMP = 1567932994 +SHA256 (netpbm-10.87.02.tar.gz) = 3adab914fa78a31c3d60c02a6839fa52765d1dc58afb123379e647bd8f535268 +SIZE (netpbm-10.87.02.tar.gz) = 3336952 diff --git a/graphics/py-pyembree/Makefile b/graphics/py-pyembree/Makefile new file mode 100644 index 00000000000..b6699399424 --- /dev/null +++ b/graphics/py-pyembree/Makefile @@ -0,0 +1,28 @@ +# Created by: Yuri Victorovich +# $FreeBSD$ + +PORTNAME= pyembree +DISTVERSION= 0.1.4 +PORTREVISION= 2 +CATEGORIES= graphics python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Python wrapper for Embree + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${PYNUMPY} +LIB_DEPENDS= libembree.so:graphics/embree +RUN_DEPENDS= ${PYNUMPY} + +USES= localbase python +USE_PYTHON= autoplist distutils cython +USE_GITHUB= yes +GH_ACCOUNT= scopatz + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pyembree/*.so + +.include diff --git a/graphics/py-pyembree/distinfo b/graphics/py-pyembree/distinfo new file mode 100644 index 00000000000..ea8ed0f9d1a --- /dev/null +++ b/graphics/py-pyembree/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1523604521 +SHA256 (scopatz-pyembree-0.1.4_GH0.tar.gz) = 63a73f198c38c37374e6288c73f7ddfdccf7b67829e2b81a1990b714b4fdabd3 +SIZE (scopatz-pyembree-0.1.4_GH0.tar.gz) = 12812 diff --git a/graphics/py-pyembree/pkg-descr b/graphics/py-pyembree/pkg-descr new file mode 100644 index 00000000000..16a0b99446d --- /dev/null +++ b/graphics/py-pyembree/pkg-descr @@ -0,0 +1,3 @@ +Python wrapper for Embree. + +WWW: https://github.com/scopatz/pyembree diff --git a/graphics/unpaper/Makefile b/graphics/unpaper/Makefile index 5ac1a001b24..1c523f72c44 100644 --- a/graphics/unpaper/Makefile +++ b/graphics/unpaper/Makefile @@ -2,31 +2,27 @@ # $FreeBSD$ PORTNAME= unpaper -PORTVERSION= 0.3 +PORTVERSION= 6.1 CATEGORIES= graphics MASTER_SITES= https://www.flameeyes.eu/files/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kai@FreeBSD.org COMMENT= Post-processing tool for scanned sheets of paper LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/COPYING -PORTDOCS= * -PLIST_FILES= bin/${PORTNAME} +BUILD_DEPENDS= xsltproc:textproc/libxslt \ + bash:shells/bash +LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libavformat.so:multimedia/ffmpeg \ + libavutil.so:multimedia/ffmpeg -OPTIONS_DEFINE= DOCS +USES= autoreconf pkgconfig tar:xz -do-build: - @${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} \ - ${WRKSRC}/src/${PORTNAME}.c -lm +GNU_CONFIGURE= yes -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGELOG README ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} +PLIST_FILES= bin/${PORTNAME} \ + man/man1/${PORTNAME}.1.gz .include diff --git a/graphics/unpaper/distinfo b/graphics/unpaper/distinfo index 9021174aa58..16e5a9c01cd 100644 --- a/graphics/unpaper/distinfo +++ b/graphics/unpaper/distinfo @@ -1,2 +1,3 @@ -SHA256 (unpaper-0.3.tar.gz) = 3433664040942bf7638946e2327e5c64119c600fde8ace918f47109fafbde5be -SIZE (unpaper-0.3.tar.gz) = 546488 +TIMESTAMP = 1565468288 +SHA256 (unpaper-6.1.tar.xz) = 237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930 +SIZE (unpaper-6.1.tar.xz) = 2655724 diff --git a/graphics/unpaper/files/patch-file.c b/graphics/unpaper/files/patch-file.c new file mode 100644 index 00000000000..aa8bbf6368f --- /dev/null +++ b/graphics/unpaper/files/patch-file.c @@ -0,0 +1,30 @@ +Subject: Fix wrong ffmpeg API usage +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800312 +Bug: https://github.com/Flameeyes/unpaper/issues/39 +Author: Andreas Cadhalpun +Forwarded: https://github.com/Flameeyes/unpaper/pull/42 + +--- file.c.orig 2014-10-26 22:35:38 UTC ++++ file.c +@@ -93,10 +93,21 @@ void loadImage(const char *filename, AVFrame **image) + if (pkt.stream_index != 0) + errOutput("unable to open file %s: invalid stream.", filename); + ++ while (!got_frame && pkt.data) { ++ ++ if (pkt.size <= 0) { ++ pkt.data = NULL; ++ pkt.size = 0; ++ } ++ + ret = avcodec_decode_video2(avctx, frame, &got_frame, &pkt); + if (ret < 0) { + av_strerror(ret, errbuff, sizeof(errbuff)); + errOutput("unable to open file %s: %s", filename, errbuff); ++ } ++ ++ pkt.data += ret; ++ pkt.size -= ret; + } + + switch(frame->format) { diff --git a/japanese/Makefile b/japanese/Makefile index d70c754adc6..19cb4cd87a4 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -92,6 +92,8 @@ SUBDIR += font-mplus-bitmap SUBDIR += font-mplus-ipa SUBDIR += font-mplus-outline + SUBDIR += font-myrica + SUBDIR += font-myricam SUBDIR += font-naga10 SUBDIR += font-nasu SUBDIR += font-ricty diff --git a/japanese/font-myrica/Makefile b/japanese/font-myrica/Makefile new file mode 100644 index 00000000000..5c41f96b1c0 --- /dev/null +++ b/japanese/font-myrica/Makefile @@ -0,0 +1,45 @@ +# $FreeBSD$ + +PORTNAME= myrica +PORTVERSION= 2.012.20180119 +#PORTREVISION= 0 +CATEGORIES= japanese x11-fonts +MASTER_SITES= https://github.com/tomokuni/Myrica/raw/master/product/ +PKGNAMEPREFIX= ja-font- +DISTNAME= Myrica +DIST_SUBDIR= ${DISTNAME}-${PORTVERSION} + +MAINTAINER= ume@FreeBSD.org +COMMENT= Myrica free TrueType fonts for programming + +USES= fonts:fc 7z +FONTNAME= myrica +NO_WRKSUBDIR= yes +NO_ARCH= yes +NO_BUILD= yes +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install +SUB_FILES= pkg-install +WRKSRC= ${WRKDIR}/${DISTNAME} +PORTDOCS= LICENSE_M+.txt LICENSE_OFL.txt README.md + +OPTIONS_DEFINE= DOCS + +do-install: + ${MKDIR} ${STAGEDIR}${FONTSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} *.TTC ${STAGEDIR}${FONTSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d + ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail + ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + +.include diff --git a/japanese/font-myrica/distinfo b/japanese/font-myrica/distinfo new file mode 100644 index 00000000000..bd3781e993f --- /dev/null +++ b/japanese/font-myrica/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567831810 +SHA256 (Myrica-2.012.20180119/Myrica.7z) = f73dca7a5999d02351534dbdc184e0e2f9f1a8294de5ff931bb535a5327c68c0 +SIZE (Myrica-2.012.20180119/Myrica.7z) = 4735980 diff --git a/japanese/font-myrica/files/20-unhint-myrica.conf b/japanese/font-myrica/files/20-unhint-myrica.conf new file mode 100644 index 00000000000..60ea9abd01a --- /dev/null +++ b/japanese/font-myrica/files/20-unhint-myrica.conf @@ -0,0 +1,19 @@ + + + + + + + Myrica M + + + Myrica N + + + Myrica P + + + false + + + diff --git a/japanese/font-myrica/files/62-fonts-myrica.conf b/japanese/font-myrica/files/62-fonts-myrica.conf new file mode 100644 index 00000000000..d992fd8fdd2 --- /dev/null +++ b/japanese/font-myrica/files/62-fonts-myrica.conf @@ -0,0 +1,17 @@ + + + + + + sans-serif + + Myrica P + + + + monospace + + Myrica M + + + diff --git a/japanese/font-myrica/files/pkg-install.in b/japanese/font-myrica/files/pkg-install.in new file mode 100644 index 00000000000..61de9573ef6 --- /dev/null +++ b/japanese/font-myrica/files/pkg-install.in @@ -0,0 +1,107 @@ +#!/bin/sh +# $FreeBSD$ + +catfontsdir() +{ + while read _IN + do + case "${_IN}" in + *-misc-myrica-*|[0-9]*|"") ;; + *) echo ${_IN} ;; + esac + done +} + +ROMA="" +BOLD="ds=y" +RITA="ai=0.08" +ROBL="ai=0.08" + +make_xlfd() +{ + _enc=$1 + _file=$2 + _vendor=$3 + _fname=$4 + _poc=$5 + _weight=$6 + + case "${_poc}:${_enc}" in + p:jisx0201.1976-*) PFIX="bw=0.5" ;; + c:jisx0201.1976-*) PFIX="bw=0.5" ;; + p:*) PFIX="" ;; + c:*) PFIX="" ;; + esac + + set -- "" ${_weight}-r \ + ${RITA} ${_weight}-ri \ + ${ROBL} ${_weight}-ro + while [ $# != 0 ]; do + _prefix="${PFIX}:$1"; shift + _variant=$1; shift + [ ${index_type} = "scale" -a ${_prefix} != ":" ] && continue + printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \ + $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc + done | sed -e 's,::,:,g' -e 's,^:,,' + + _prefix="${PFIX}:" + [ ${index_type} = "scale" -a ${_prefix} != ":" ] && return + _file=$(echo $_file | sed -e 's,\.ttf$,Italic&,') + for _variant in ${_weight}-i ${_weight}-o; do + printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \ + $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc + [ ${index_type} = "scale" ] && break + done | sed -e 's,::,:,g' -e 's,^:,,' +} + +addentries() +{ + for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0 jisx0208.1997-0 jisx0213.2004-1 + do + make_xlfd $ENC Myrica.TTC misc "myrica" m medium + done +} + +nfonts() +{ + _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L} +} + +install_fontsdir() +{ + index_type=${1:-"dir"} + index="fonts.${index_type}" + tmpfile="${index}.tmp" + touch ${index} + (catfontsdir < ${index}; addentries ${index_type}) > ${tmpfile} + nfonts < ${tmpfile} > ${index} + cat ${tmpfile} >> ${index} + rm -f ${tmpfile} +} + +deinstall_fontsdir() +{ + index_type=${1:-"dir"} + index="fonts.${index_type}" + tmpfile="${index}.tmp" + catfontsdir < ${index} > ${tmpfile} + nfonts < ${tmpfile} > ${index} + cat ${tmpfile} >> ${index} + rm -f ${tmpfile} + if [ -r ${index} -a $(wc -l < ${index}) = 1 ]; then + rm -f ${index} + fi +} + +case "$2" in +POST-INSTALL) + cd %%FONTSDIR%% + install_fontsdir dir + install_fontsdir scale + ;; +POST-DEINSTALL) + cd %%FONTSDIR%% + deinstall_fontsdir dir + deinstall_fontsdir scale + ;; +esac diff --git a/japanese/font-myrica/pkg-descr b/japanese/font-myrica/pkg-descr new file mode 100644 index 00000000000..86365265604 --- /dev/null +++ b/japanese/font-myrica/pkg-descr @@ -0,0 +1,3 @@ +Myrica is a free TrueType fonts for programming + +WWW: https://myrica.estable.jp/ diff --git a/japanese/font-myrica/pkg-plist b/japanese/font-myrica/pkg-plist new file mode 100644 index 00000000000..ac9d32ae2ff --- /dev/null +++ b/japanese/font-myrica/pkg-plist @@ -0,0 +1,5 @@ +etc/fonts/conf.avail/20-unhint-myrica.conf +etc/fonts/conf.avail/62-fonts-myrica.conf +etc/fonts/conf.d/20-unhint-myrica.conf +etc/fonts/conf.d/62-fonts-myrica.conf +%%FONTSDIR%%/Myrica.TTC diff --git a/japanese/font-myricam/Makefile b/japanese/font-myricam/Makefile new file mode 100644 index 00000000000..806e2a4f4dc --- /dev/null +++ b/japanese/font-myricam/Makefile @@ -0,0 +1,45 @@ +# $FreeBSD$ + +PORTNAME= myricam +PORTVERSION= 2.012.20180119 +#PORTREVISION= 0 +CATEGORIES= japanese x11-fonts +MASTER_SITES= https://github.com/tomokuni/Myrica/raw/master/product/ +PKGNAMEPREFIX= ja-font- +DISTNAME= MyricaM +DIST_SUBDIR= ${DISTNAME}-${PORTVERSION} + +MAINTAINER= ume@FreeBSD.org +COMMENT= Myrica free TrueType fonts for programming + +USES= fonts:fc 7z +FONTNAME= myricam +NO_WRKSUBDIR= yes +NO_ARCH= yes +NO_BUILD= yes +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install +SUB_FILES= pkg-install +WRKSRC= ${WRKDIR}/${DISTNAME} +PORTDOCS= LICENSE_M+.txt LICENSE_OFL.txt README.md + +OPTIONS_DEFINE= DOCS + +do-install: + ${MKDIR} ${STAGEDIR}${FONTSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} *.TTC ${STAGEDIR}${FONTSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d + ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail + ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + +.include diff --git a/japanese/font-myricam/distinfo b/japanese/font-myricam/distinfo new file mode 100644 index 00000000000..807e2eee69f --- /dev/null +++ b/japanese/font-myricam/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567834800 +SHA256 (MyricaM-2.012.20180119/MyricaM.7z) = 7b309919d0f5e51cb2d96dc13b94794efe39f2b2f4eae7a43d9404088ad2ddda +SIZE (MyricaM-2.012.20180119/MyricaM.7z) = 4394538 diff --git a/japanese/font-myricam/files/20-unhint-myricam.conf b/japanese/font-myricam/files/20-unhint-myricam.conf new file mode 100644 index 00000000000..0b8e46b7d95 --- /dev/null +++ b/japanese/font-myricam/files/20-unhint-myricam.conf @@ -0,0 +1,19 @@ + + + + + + + MyricaM M + + + MyricaM N + + + MyricaM P + + + false + + + diff --git a/japanese/font-myricam/files/62-fonts-myricam.conf b/japanese/font-myricam/files/62-fonts-myricam.conf new file mode 100644 index 00000000000..9a995412f54 --- /dev/null +++ b/japanese/font-myricam/files/62-fonts-myricam.conf @@ -0,0 +1,17 @@ + + + + + + sans-serif + + MyricaM P + + + + monospace + + MyricaM M + + + diff --git a/japanese/font-myricam/files/pkg-install.in b/japanese/font-myricam/files/pkg-install.in new file mode 100644 index 00000000000..964e1b27ee3 --- /dev/null +++ b/japanese/font-myricam/files/pkg-install.in @@ -0,0 +1,107 @@ +#!/bin/sh +# $FreeBSD$ + +catfontsdir() +{ + while read _IN + do + case "${_IN}" in + *-misc-myrica\ m-*|[0-9]*|"") ;; + *) echo ${_IN} ;; + esac + done +} + +ROMA="" +BOLD="ds=y" +RITA="ai=0.08" +ROBL="ai=0.08" + +make_xlfd() +{ + _enc=$1 + _file=$2 + _vendor=$3 + _fname=$4 + _poc=$5 + _weight=$6 + + case "${_poc}:${_enc}" in + p:jisx0201.1976-*) PFIX="bw=0.5" ;; + c:jisx0201.1976-*) PFIX="bw=0.5" ;; + p:*) PFIX="" ;; + c:*) PFIX="" ;; + esac + + set -- "" ${_weight}-r \ + ${RITA} ${_weight}-ri \ + ${ROBL} ${_weight}-ro + while [ $# != 0 ]; do + _prefix="${PFIX}:$1"; shift + _variant=$1; shift + [ ${index_type} = "scale" -a ${_prefix} != ":" ] && continue + printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \ + $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc + done | sed -e 's,::,:,g' -e 's,^:,,' + + _prefix="${PFIX}:" + [ ${index_type} = "scale" -a ${_prefix} != ":" ] && return + _file=$(echo $_file | sed -e 's,\.ttf$,Italic&,') + for _variant in ${_weight}-i ${_weight}-o; do + printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \ + $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc + [ ${index_type} = "scale" ] && break + done | sed -e 's,::,:,g' -e 's,^:,,' +} + +addentries() +{ + for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0 jisx0208.1997-0 jisx0213.2004-1 + do + make_xlfd $ENC MyricaM.TTC misc "myrica m" m medium + done +} + +nfonts() +{ + _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L} +} + +install_fontsdir() +{ + index_type=${1:-"dir"} + index="fonts.${index_type}" + tmpfile="${index}.tmp" + touch ${index} + (catfontsdir < ${index}; addentries ${index_type}) > ${tmpfile} + nfonts < ${tmpfile} > ${index} + cat ${tmpfile} >> ${index} + rm -f ${tmpfile} +} + +deinstall_fontsdir() +{ + index_type=${1:-"dir"} + index="fonts.${index_type}" + tmpfile="${index}.tmp" + catfontsdir < ${index} > ${tmpfile} + nfonts < ${tmpfile} > ${index} + cat ${tmpfile} >> ${index} + rm -f ${tmpfile} + if [ -r ${index} -a $(wc -l < ${index}) = 1 ]; then + rm -f ${index} + fi +} + +case "$2" in +POST-INSTALL) + cd %%FONTSDIR%% + install_fontsdir dir + install_fontsdir scale + ;; +POST-DEINSTALL) + cd %%FONTSDIR%% + deinstall_fontsdir dir + deinstall_fontsdir scale + ;; +esac diff --git a/japanese/font-myricam/pkg-descr b/japanese/font-myricam/pkg-descr new file mode 100644 index 00000000000..86365265604 --- /dev/null +++ b/japanese/font-myricam/pkg-descr @@ -0,0 +1,3 @@ +Myrica is a free TrueType fonts for programming + +WWW: https://myrica.estable.jp/ diff --git a/japanese/font-myricam/pkg-plist b/japanese/font-myricam/pkg-plist new file mode 100644 index 00000000000..72873fee04d --- /dev/null +++ b/japanese/font-myricam/pkg-plist @@ -0,0 +1,5 @@ +etc/fonts/conf.avail/20-unhint-myricam.conf +etc/fonts/conf.avail/62-fonts-myricam.conf +etc/fonts/conf.d/20-unhint-myricam.conf +etc/fonts/conf.d/62-fonts-myricam.conf +%%FONTSDIR%%/MyricaM.TTC diff --git a/japanese/wordpress/Makefile b/japanese/wordpress/Makefile index 16969fb6f11..f1081dab729 100644 --- a/japanese/wordpress/Makefile +++ b/japanese/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.2 +DISTVERSION= 5.2.3 DISTVERSIONSUFFIX= -ja CATEGORIES= japanese www MASTER_SITES= http://ja.wordpress.org/ diff --git a/japanese/wordpress/distinfo b/japanese/wordpress/distinfo index c849497db62..e260d0ca2ba 100644 --- a/japanese/wordpress/distinfo +++ b/japanese/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561104262 -SHA256 (wordpress-5.2.2-ja.tar.gz) = 1055ade56855f6fdafe8dbf2dd53b476dc0ce332de3cb462267670c98c3e4308 -SIZE (wordpress-5.2.2-ja.tar.gz) = 11855693 +TIMESTAMP = 1567785101 +SHA256 (wordpress-5.2.3-ja.tar.gz) = f5f71765c12ca96248f9c1fd9a71cbfbc6d7af8ca455e294b4005a90773692bc +SIZE (wordpress-5.2.3-ja.tar.gz) = 11847107 diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index e3b31cc82b9..6139e6eaada 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -3,6 +3,7 @@ PORTNAME= eclipse PORTVERSION= 4.12 +PORTREVISION= 1 CATEGORIES= java devel # Update to git-tag on git.eclipse.org @@ -37,8 +38,8 @@ ECLIPSE_MODULES=jdt/eclipse.jdt \ equinox/rt.equinox.p2 # Each Eclipse module has its own MASTER_SITE .for M in ${ECLIPSE_MODULES} -MASTER_SITES+= https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} \ - https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} +MASTER_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} \ + https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g} .endfor diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt index 8d57e331eed..c71e4f916b5 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt +++ b/java/eclipse/files/patch-eclipse.platform.swt @@ -159,6 +159,18 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/ecl if (osName.startsWith("Windows")) isWin32 = true; IsLinux = isLinux; IsWin32 = isWin32; +diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 ++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java 0000-00-00 00:00:00.000000000 +0000 +@@ -155,7 +155,7 @@ + * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/ + * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript + */ +- static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2. ++ static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD + + static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733 + diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf --- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 diff --git a/lang/gcc10-devel/Makefile b/lang/gcc10-devel/Makefile index 334520f288f..7aec74b051d 100644 --- a/lang/gcc10-devel/Makefile +++ b/lang/gcc10-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 10.0.0.s20190825 +PORTVERSION= 10.0.0.s20190901 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc10-devel/distinfo b/lang/gcc10-devel/distinfo index f15881bdfea..4e2722d6ad6 100644 --- a/lang/gcc10-devel/distinfo +++ b/lang/gcc10-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566801020 -SHA256 (gcc-10-20190825.tar.xz) = 40d60384573a7bad93588a3bdc47613d4f2f331d3bee919439b5d4ee4204d0e4 -SIZE (gcc-10-20190825.tar.xz) = 69657860 +TIMESTAMP = 1567428547 +SHA256 (gcc-10-20190901.tar.xz) = 53f814de840289ee17af864e03eaf87edec41bda50b175bb3b3063f5844d506c +SIZE (gcc-10-20190901.tar.xz) = 69690400 diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile index a1b38bd7493..111f06ca8c5 100644 --- a/lang/gcc7-devel/Makefile +++ b/lang/gcc7-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 7.4.1.s20190829 +PORTVERSION= 7.4.1.s20190905 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo index 2ceba2700a8..68a906c4fc1 100644 --- a/lang/gcc7-devel/distinfo +++ b/lang/gcc7-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567146830 -SHA256 (gcc-7-20190829.tar.xz) = 3940927900cf61fefe41b00cc3786c900fc17e9dcdcd1b6087b58e21ec06f1bb -SIZE (gcc-7-20190829.tar.xz) = 59373056 +TIMESTAMP = 1567768738 +SHA256 (gcc-7-20190905.tar.xz) = 40ed2c71caf9132e9d05ba62504e4561d27a006728a0db7bad68bf06f58c38d6 +SIZE (gcc-7-20190905.tar.xz) = 59408084 diff --git a/lang/gcc8-devel/Makefile b/lang/gcc8-devel/Makefile index 81f6293978a..90ee2080d42 100644 --- a/lang/gcc8-devel/Makefile +++ b/lang/gcc8-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 8.3.1.s20190830 +PORTVERSION= 8.3.1.s20190906 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc8-devel/distinfo b/lang/gcc8-devel/distinfo index 6d734c4f07d..a0b323d2fd2 100644 --- a/lang/gcc8-devel/distinfo +++ b/lang/gcc8-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567226297 -SHA256 (gcc-8-20190830.tar.xz) = 4b05c96968a679b63db6590fe2d047f9ef5df2676a06093df7fb00045289e427 -SIZE (gcc-8-20190830.tar.xz) = 61917852 +TIMESTAMP = 1567825698 +SHA256 (gcc-8-20190906.tar.xz) = 136655a1c170dbc66b0ca57e10cc244a2b38c6eb9ec23991a670a45f600f0a00 +SIZE (gcc-8-20190906.tar.xz) = 61973904 diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile index 1331f8caae7..8ef1ecb651b 100644 --- a/lang/nickle/Makefile +++ b/lang/nickle/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nickle -PORTVERSION= 2.84 -PORTREVISION= 1 +PORTVERSION= 2.85 CATEGORIES= lang MASTER_SITES= http://www.nickle.org/release/ diff --git a/lang/nickle/distinfo b/lang/nickle/distinfo index 801a73095d5..5f09aebef73 100644 --- a/lang/nickle/distinfo +++ b/lang/nickle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540859403 -SHA256 (nickle-2.84.tar.gz) = ba785eaa352264d638168bf88abacf2e36aa32b881805bc8181b4f3dc26a74d5 -SIZE (nickle-2.84.tar.gz) = 810473 +TIMESTAMP = 1567939386 +SHA256 (nickle-2.85.tar.gz) = aaa8c96c31e533f238e03b1d91d6a6b5e95bed25a8b89a48d64d67fcfe8c7e89 +SIZE (nickle-2.85.tar.gz) = 810187 diff --git a/lang/nickle/pkg-plist b/lang/nickle/pkg-plist index 18757c0785a..3628420a242 100644 --- a/lang/nickle/pkg-plist +++ b/lang/nickle/pkg-plist @@ -54,3 +54,4 @@ man/man1/nickle.1.gz %%DATADIR%%/test/round.5c %%DATADIR%%/test/scanf.5c %%DATADIR%%/test/signal.5c +%%DATADIR%%/test/string-file.5c diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index ac162c13c05..4e2759507ee 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -16,7 +16,7 @@ CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2019-09-03 +NIGHTLY_DATE= 2019-09-07 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index 4266b1e95c1..6dfad122a05 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1567445447 -SHA256 (rust/2019-09-03/rustc-nightly-src.tar.xz) = 9c3b989938b3fa274e50a4ec6bd98bc5429a76f3d5f3d65bf41f2a02917b5c74 -SIZE (rust/2019-09-03/rustc-nightly-src.tar.xz) = 94079212 +TIMESTAMP = 1567796615 +SHA256 (rust/2019-09-07/rustc-nightly-src.tar.xz) = 2b97cfaac4fa69d743506ce7d4728a62be9f6f65f5a4afe846adcc198f6d47f8 +SIZE (rust/2019-09-07/rustc-nightly-src.tar.xz) = 94062088 SHA256 (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 62117526710b92d1cc00632a6bcf8c1941f5a7d9c1f7a964d7bca55f09786537 SIZE (rust/2019-08-13/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 49723228 SHA256 (rust/2019-08-13/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = c65ef74bebebcf18c9f89c67c16de146c7071e2dffe90effcaf544ff74829d6d diff --git a/lang/rust-nightly/files/patch-src_bootstrap_native.rs b/lang/rust-nightly/files/patch-src_bootstrap_native.rs deleted file mode 100644 index ed2de6528b7..00000000000 --- a/lang/rust-nightly/files/patch-src_bootstrap_native.rs +++ /dev/null @@ -1,48 +0,0 @@ -Avoid unnecessarily restarting the LLVM build and installing it -into STAGEDIR during the install phase. - -https://github.com/rust-lang/rust/issues/61206 - ---- src/bootstrap/native.rs.orig 2019-05-22 05:39:52 UTC -+++ src/bootstrap/native.rs -@@ -92,17 +92,9 @@ impl Step for Llvm { - .join(exe("llvm-config", &*builder.config.build)); - let done_stamp = out_dir.join("llvm-finished-building"); - -- if let Some(llvm_commit) = llvm_info.sha() { - if done_stamp.exists() { -- let done_contents = t!(fs::read(&done_stamp)); -- -- // If LLVM was already built previously and the submodule's commit didn't change -- // from the previous build, then no action is required. -- if done_contents == llvm_commit.as_bytes() { -- return build_llvm_config -- } -+ return build_llvm_config - } -- } - - let _folder = builder.fold_output(|| "llvm"); - let descriptor = if emscripten { "Emscripten " } else { "" }; -@@ -218,6 +210,10 @@ impl Step for Llvm { - } - } - -+ if target == "powerpc64-unknown-freebsd" { -+ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%"); -+ } -+ - // http://llvm.org/docs/HowToCrossCompileLLVM.html - if target != builder.config.build && !emscripten { - builder.ensure(Llvm { -@@ -283,9 +279,7 @@ impl Step for Llvm { - - cfg.build(); - -- if let Some(llvm_commit) = llvm_info.sha() { -- t!(fs::write(&done_stamp, llvm_commit)); -- } -+ t!(fs::write(&done_stamp, "done building LLVM")); - - build_llvm_config - } diff --git a/mail/Makefile b/mail/Makefile index ad087b1e652..d965394bc3e 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -36,6 +36,8 @@ SUBDIR += bincimap SUBDIR += bmf SUBDIR += bogofilter + SUBDIR += bogofilter-kc + SUBDIR += bogofilter-lmdb SUBDIR += bogofilter-sqlite SUBDIR += bogofilter-tc SUBDIR += bsfilter diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile new file mode 100644 index 00000000000..d6c1a023555 --- /dev/null +++ b/mail/bogofilter-kc/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= bogofilter +PORTREVISION= 0 +CATEGORIES= mail +PKGNAMESUFFIX= -kc + +MAINTAINER= mandree@FreeBSD.org + +LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet + +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* + +CONFIGURE_ARGS= --with-database=kyotocabinet +BF_CPPFLAGS= -I${LOCALBASE}/include +BF_LIBS= +DESCR= ${PKGDIR}/pkg-descr + +MASTERDIR= ${.CURDIR}/../bogofilter + +.include "${MASTERDIR}/Makefile" diff --git a/mail/bogofilter-lmdb/Makefile b/mail/bogofilter-lmdb/Makefile new file mode 100644 index 00000000000..1c0068bd367 --- /dev/null +++ b/mail/bogofilter-lmdb/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= bogofilter +PORTREVISION= 0 +CATEGORIES= mail +PKGNAMESUFFIX= -lmdb + +MAINTAINER= mandree@FreeBSD.org + +LIB_DEPENDS= liblmdb.so:databases/lmdb + +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-kc-[0-9]* bogofilter-sqlite-[0-9]* *bogofilter-tc-[0-9]* + +CONFIGURE_ARGS= --with-database=lmdb +BF_CPPFLAGS= -I${LOCALBASE}/include +BF_LIBS= +DESCR= ${PKGDIR}/pkg-descr + +MASTERDIR= ${.CURDIR}/../bogofilter + +.include "${MASTERDIR}/Makefile" diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile index 963813e95b3..07f2a58c2b1 100644 --- a/mail/bogofilter-sqlite/Makefile +++ b/mail/bogofilter-sqlite/Makefile @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 4 CATEGORIES= mail PKGNAMESUFFIX= -sqlite MAINTAINER= mandree@FreeBSD.org USES= sqlite -CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]* +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-kc-[0-9]* bogofilter-tc-[0-9]* CONFIGURE_ARGS= --with-database=sqlite BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter-tc/Makefile b/mail/bogofilter-tc/Makefile index f1a672b5b86..9e03b3e6eb9 100644 --- a/mail/bogofilter-tc/Makefile +++ b/mail/bogofilter-tc/Makefile @@ -2,16 +2,18 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 3 CATEGORIES= mail PKGNAMESUFFIX= -tc +DEPRECATED= TokyoCabinet is being phased out in favor of KyotoCabinet. +EXPIRATION_DATE=2020-12-31 + MAINTAINER= mandree@FreeBSD.org # Blanket approval for changes by Zach Thompson (address above) LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet -CONFLICTS_INSTALL= bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-sqlite-[0-9]* bogofilter-kc-[0-9]* bogofilter-lmdb-[0-9]* CONFIGURE_ARGS= --with-database=tokyocabinet BF_CPPFLAGS= -I${LOCALBASE}/include diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index a244c05ba56..a07141515ce 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTVERSION= 1.2.4 -PORTREVISION?= 8 +DISTVERSION= 1.2.5.rc1 +PORTREVISION?= 0 CATEGORIES?= mail -MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION} +MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-1.2.5/ MAINTAINER?= mandree@FreeBSD.org COMMENT= Fast, teachable, learning spam detector @@ -22,9 +22,13 @@ OPTIONS_DEFAULT= GSL UNICODE GSL_DESC= Link with system-wide GSL dynamically (recommended) UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended) -CONFLICTS_INSTALL?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]* +CONFLICTS_INSTALL?= bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* bogofilter-lmdb-[0-9]* \ + bogofilter-kc-[0-9]* -USES+= cpe perl5 shebangfix tar:bzip2 +# XXX FIXME: autoreconf:build should not be required, +# but something hoses timestamps on src/tests/Makefile.am +# but not src/tests/Makefile.in. +USES+= autoreconf:build cpe perl5 shebangfix tar:xz SHEBANG_FILES= contrib/randomtrain.sh contrib/scramble.sh \ src/tests/unsort.pl contrib/*.pl USE_PERL5= run @@ -59,16 +63,16 @@ post-patch: -e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \ ${WRKSRC}/src/tests/Makefile.am -# XXX: disable self-tests until issue with automake-1.13 is sorted out -# post-build:: -# cd ${WRKSRC}/src && make check SHELL=${SH} +post-build: + cd ${WRKSRC}/src && ${SETENV} SHELL=${SH} ${MAKE_CMD} ${TEST_TARGET} ${_MAKE_JOBS} SHELL=${SH} \ + || { r=$$? ; head -n30000 ${WRKSRC}/src/tests/test-suite.log ; exit $$r ; } -post-install:: +post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib .for i in html programmer xml @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} .endfor -.for i in AUTHORS COPYING INSTALL NEWS README README.svn \ +.for i in AUTHORS COPYING INSTALL NEWS README README.git \ doc/README.validation TODO GETTING.STARTED \ RELEASE.NOTES doc/README.db doc/README.sqlite \ doc/integrating-with-postfix doc/integrating-with-qmail \ diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo index edf94524a2e..18176c8f62d 100644 --- a/mail/bogofilter/distinfo +++ b/mail/bogofilter/distinfo @@ -1,2 +1,3 @@ -SHA256 (bogofilter-1.2.4.tar.bz2) = e10287a58d135feaea26880ce7d4b9fa2841fb114a2154bf7da8da98aab0a6b4 -SIZE (bogofilter-1.2.4.tar.bz2) = 887848 +TIMESTAMP = 1567975270 +SHA256 (bogofilter-1.2.5.rc1.tar.xz) = 62a9a00ca575b1253bafd5ae308049cbf388816e5ef0a9a18ee8167cf6c42680 +SIZE (bogofilter-1.2.5.rc1.tar.xz) = 802008 diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile index 5e4e5787a17..e68b744d8fc 100644 --- a/mail/crm114/Makefile +++ b/mail/crm114/Makefile @@ -3,7 +3,7 @@ PORTNAME= crm114 PORTVERSION= 20100106 -PORTREVISION= 2 +PORTREVISION= 3 # WARNING change versionname in CRM114RELEASENAME too. # portlint didn't like this variable at this place. # So I have to put it down in this file. @@ -14,7 +14,7 @@ MASTER_SITES= http://crm114.sourceforge.net/tarballs/ # .css extention. DISTNAME= ${PORTNAME}-${PORTVERSION}-${CRM114RELEASENAME}.src -MAINTAINER= chalpin@cs.wisc.edu +MAINTAINER= ports@FreeBSD.org COMMENT= Markov based SpamFilter LICENSE= GPLv2 @@ -23,7 +23,7 @@ LIB_DEPENDS= libtre.so:textproc/libtre CRM114RELEASENAME=BlameMichelson -USES= gettext iconv +USES= gettext-runtime USE_CSTD=gnu89 OPTIONS_DEFINE= NORMALIZEMIME DOCS EXAMPLES @@ -35,7 +35,7 @@ MAKE_ARGS= CC="${CC}" prefix="${STAGEDIR}${PREFIX}" \ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lintl +LIBS+= -L${LOCALBASE}/lib -lintl CFLAGS+= -DVERSION='\"${PORTVERSION}-${CRM114RELEASENAME}\"' CFLAGS+= -DNO_LOGL @@ -57,6 +57,12 @@ post-patch: # Peter Jeremy recommended the use of b64decode and md5 20040302 post-install: + ${STRIP_CMD} \ + ${STAGEDIR}${PREFIX}/bin/crm \ + ${STAGEDIR}${PREFIX}/bin/cssdiff \ + ${STAGEDIR}${PREFIX}/bin/cssutil \ + ${STAGEDIR}${PREFIX}/bin/osbf-util \ + ${STAGEDIR}${PREFIX}/bin/cssmerge @${REINPLACE_CMD} -Ee 's|^(.*/openssl base64 -d/)|#\1|' \ -e 's|/mewdecode/|/b64decode -pr/|' ${WRKSRC}/mailfilter.cf @${REINPLACE_CMD} -e 's|/md5sum/|/md5 -r/|' \ diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 74643dd016f..6311d5ac840 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -97,7 +97,7 @@ MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif -EXIM_VERSION= 4.92.1 +EXIM_VERSION= 4.92.2 SA_EXIM_VERSION=4.2 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 573d2952c7c..e32b546c0a2 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1564053474 -SHA256 (exim/exim-4.92.1.tar.bz2) = b755658ab08cdabca7aaeab25f64cfe4f8d1a0e1998d9750e4bd8cff5faf5f8c -SIZE (exim/exim-4.92.1.tar.bz2) = 1927542 +TIMESTAMP = 1567765470 +SHA256 (exim/exim-4.92.2.tar.bz2) = 557f97c3f75c19a2e7da8511a8b94c28b39a5d5206948be5ceac96c75a2eccf6 +SIZE (exim/exim-4.92.2.tar.bz2) = 1933063 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 diff --git a/mail/p5-Sisimai/Makefile b/mail/p5-Sisimai/Makefile index dd0a03422e9..f2ef5c30d3d 100644 --- a/mail/p5-Sisimai/Makefile +++ b/mail/p5-Sisimai/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Sisimai -PORTVERSION= 4.25.2 +PORTVERSION= 4.25.3 DISTVERSIONPREFIX= v CATEGORIES= mail perl5 MASTER_SITES= CPAN diff --git a/mail/p5-Sisimai/distinfo b/mail/p5-Sisimai/distinfo index 2f2a394a52e..b62aad78274 100644 --- a/mail/p5-Sisimai/distinfo +++ b/mail/p5-Sisimai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564837264 -SHA256 (Sisimai-v4.25.2.tar.gz) = 308b52fa07e153b2940df45d0d2a8a09b8e0660698943dfca5c0e108e64c9649 -SIZE (Sisimai-v4.25.2.tar.gz) = 1202287 +TIMESTAMP = 1567842516 +SHA256 (Sisimai-v4.25.3.tar.gz) = 102936c7f345b0266fbd4408af981c17a3bd988768e59fb99da03119cb27b8ce +SIZE (Sisimai-v4.25.3.tar.gz) = 1204149 diff --git a/mail/smtprelay/Makefile b/mail/smtprelay/Makefile index 2b6c93f5549..18e0979611c 100644 --- a/mail/smtprelay/Makefile +++ b/mail/smtprelay/Makefile @@ -2,7 +2,7 @@ PORTNAME= smtprelay DISTVERSIONPREFIX=v -DISTVERSION= 1.2.0 +DISTVERSION= 1.3.0 CATEGORIES= mail MASTER_SITES= https://code.bluelife.at/decke/smtprelay/archive/ \ LOCAL/decke/smtprelay/ @@ -15,15 +15,13 @@ COMMENT= Simple Go SMTP relay/proxy server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go +USES= go:modules USE_RC_SUBR= smtprelay USE_GITHUB= nodefault GH_TUPLE= chrj:smtpd:v0.1.2:smtpd/vendor/github.com/chrj/smtpd \ vharitonsky:iniflags:a33cd0b5f3de:iniflags/vendor/github.com/vharitonsky/iniflags \ - golang:crypto:505ab145d0a9:golang/vendor/golang.org/x/crypto - -MAKE_ENV+= GOFLAGS=-mod=vendor + golang:crypto:9756ffdc2472:golang/vendor/golang.org/x/crypto PLIST_FILES= bin/${PORTNAME} \ "@sample ${ETCDIR}/smtprelay.ini.sample" diff --git a/mail/smtprelay/distinfo b/mail/smtprelay/distinfo index e641783f398..185ef074c6b 100644 --- a/mail/smtprelay/distinfo +++ b/mail/smtprelay/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1546979068 -SHA256 (smtprelay/v1.2.0.tar.gz) = 924864ecaeeebb52895d1b16a25a9ad7ac407b9000c2c83ec1763d106cbf145e -SIZE (smtprelay/v1.2.0.tar.gz) = 8960 +TIMESTAMP = 1567882351 +SHA256 (smtprelay/v1.3.0.tar.gz) = b5eca3889beb56b0c4632905ddde5df0ca9dd57249a3f7eabe531d5944e62f4c +SIZE (smtprelay/v1.3.0.tar.gz) = 9650 SHA256 (smtprelay/chrj-smtpd-v0.1.2_GH0.tar.gz) = f290b7233bf781222e40184f32bfa4550424f96a9d69cbb75241d744080eb8f7 SIZE (smtprelay/chrj-smtpd-v0.1.2_GH0.tar.gz) = 13676 SHA256 (smtprelay/vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = d60f3292be138071158e47e794c2ba93ea9dfc866c44e6472833e2d8566024aa SIZE (smtprelay/vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = 7498 -SHA256 (smtprelay/golang-crypto-505ab145d0a9_GH0.tar.gz) = 33a4ff7a15a69640a7ce2c65ba94680643554b744c69f3ed3623bd9557c985e7 -SIZE (smtprelay/golang-crypto-505ab145d0a9_GH0.tar.gz) = 1644681 +SHA256 (smtprelay/golang-crypto-9756ffdc2472_GH0.tar.gz) = 6af409930c3a9313b33f9b8da1a2c24da8ffa07c4fcd55356a77a2f09a0d6326 +SIZE (smtprelay/golang-crypto-9756ffdc2472_GH0.tar.gz) = 1693048 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 96b5b4d50da..74c6ef73723 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source diff --git a/mail/thunderbird/files/patch-cubeb-dlopen b/mail/thunderbird/files/patch-cubeb-dlopen new file mode 100644 index 00000000000..9314ede7925 --- /dev/null +++ b/mail/thunderbird/files/patch-cubeb-dlopen @@ -0,0 +1,793 @@ +https://github.com/kinetiknz/cubeb/pull/539 + +diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build +index 1ff0c02545251..ca364d1ef7845 100644 +--- media/libcubeb/gtest/moz.build ++++ media/libcubeb/gtest/moz.build +@@ -67,13 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': + '-framework CoreFoundation', + '-framework AudioToolbox', + ] +-elif CONFIG['OS_TARGET'] == 'OpenBSD': +- OS_LIBS += [ +- 'sndio', +- ] +-else: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +- OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS'] + + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] +diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c +index 98a735f..db294b3 100644 +--- media/libcubeb/src/cubeb.c ++++ media/libcubeb/src/cubeb.c +@@ -180,6 +180,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_JACK) + jack_init, + #endif ++#if defined(USE_SNDIO) ++ sndio_init, ++#endif + #if defined(USE_ALSA) + alsa_init, + #endif +@@ -192,9 +195,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_WINMM) + winmm_init, + #endif +-#if defined(USE_SNDIO) +- sndio_init, +-#endif + #if defined(USE_OPENSL) + opensl_init, + #endif +diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index bfd4d8f..a29eed0 100644 +--- media/libcubeb/src/cubeb_alsa.c ++++ media/libcubeb/src/cubeb_alsa.c +@@ -14,10 +14,58 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" + ++#ifdef DISABLE_LIBASOUND_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBASOUND_API_VISIT(X) \ ++ X(snd_config) \ ++ X(snd_config_add) \ ++ X(snd_config_copy) \ ++ X(snd_config_delete) \ ++ X(snd_config_get_id) \ ++ X(snd_config_get_string) \ ++ X(snd_config_imake_integer) \ ++ X(snd_config_search) \ ++ X(snd_config_search_definition) \ ++ X(snd_lib_error_set_handler) \ ++ X(snd_pcm_avail_update) \ ++ X(snd_pcm_close) \ ++ X(snd_pcm_delay) \ ++ X(snd_pcm_drain) \ ++ X(snd_pcm_frames_to_bytes) \ ++ X(snd_pcm_get_params) \ ++ X(snd_pcm_hw_params_any) \ ++ X(snd_pcm_hw_params_get_channels_max) \ ++ X(snd_pcm_hw_params_get_rate) \ ++ X(snd_pcm_hw_params_set_rate_near) \ ++ X(snd_pcm_hw_params_sizeof) \ ++ X(snd_pcm_nonblock) \ ++ X(snd_pcm_open) \ ++ X(snd_pcm_open_lconf) \ ++ X(snd_pcm_pause) \ ++ X(snd_pcm_poll_descriptors) \ ++ X(snd_pcm_poll_descriptors_count) \ ++ X(snd_pcm_poll_descriptors_revents) \ ++ X(snd_pcm_readi) \ ++ X(snd_pcm_recover) \ ++ X(snd_pcm_set_params) \ ++ X(snd_pcm_start) \ ++ X(snd_pcm_state) \ ++ X(snd_pcm_writei) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBASOUND_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++/* snd_pcm_hw_params_alloca is actually a macro */ ++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof ++#endif ++ + #define CUBEB_STREAM_MAX 16 + #define CUBEB_WATCHDOG_MS 10000 + +@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libasound; + + pthread_t thread; + +@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) + static void + stream_buffer_decrement(cubeb_stream * stm, long count) + { +- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); +- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); ++ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); ++ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); + stm->bufframes -= count; + } + +@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) + /* Call _poll_descriptors_revents() even if we don't use it + to let underlying plugins clear null events. Otherwise poll() + may wake up again and again, producing unnecessary CPU usage. */ +- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); ++ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); + +- avail = snd_pcm_avail_update(stm->pcm); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + + /* Got null event? Bail and wait for another wakeup. */ + if (avail == 0) { +@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) + // TODO: should it be marked as DRAINING? + } + +- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); ++ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); + + if (got < 0) { + avail = got; // the error handler below will recover us +@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) + (!stm->other_stream || stm->other_stream->bufframes > 0)) { + long got = avail - stm->bufframes; + void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); + + /* Correct read size to the other stream available frames */ + if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { +@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) + long drain_frames = avail - stm->bufframes; + double drain_time = (double) drain_frames / stm->params.rate; + +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); +- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); ++ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); + stm->bufframes = avail; + + /* Mark as draining, unless we're waiting for capture */ +@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) + } + } + +- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); + if (wrote < 0) { + avail = wrote; // the error handler below will recover us + } else { +@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) + + /* Got some error? Let's try to recover the stream. */ + if (avail < 0) { +- avail = snd_pcm_recover(stm->pcm, avail, 0); ++ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); + + /* Capture pcm must be started after initial setup/recover */ + if (avail >= 0 && + stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- avail = snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ avail = WRAP(snd_pcm_start)(stm->pcm); + } + } + +@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + + slave_def = NULL; + +- r = snd_config_search(root_pcm, "slave", &slave_pcm); ++ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); + if (r < 0) { + return NULL; + } + +- r = snd_config_get_string(slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_pcm, &string); + if (r >= 0) { +- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); + if (r < 0) { + return NULL; + } + } + + do { +- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); ++ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); + if (r < 0) { + break; + } + +- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); + if (r < 0) { + break; + } +@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm); + if (r < 0) { + break; + } +@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + } while (0); + + if (slave_def) { +- snd_config_delete(slave_def); ++ WRAP(snd_config_delete)(slave_def); + } + + return NULL; +@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) + + lconf = NULL; + +- if (snd_config == NULL) { ++ if (*WRAP(snd_config) == NULL) { + return NULL; + } + +- r = snd_config_copy(&lconf, snd_config); ++ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); + if (r < 0) { + return NULL; + } + + do { +- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); + if (r < 0) { + break; + } + +- r = snd_config_get_id(pcm_node, &string); ++ r = WRAP(snd_config_get_id)(pcm_node, &string); + if (r < 0) { + break; + } +@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm_node); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); + if (r < 0) { + break; + } +@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) + } + + /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ +- r = snd_config_search(pcm_node, "type", &node); ++ r = WRAP(snd_config_search)(pcm_node, "type", &node); + if (r < 0) { + break; + } + +- r = snd_config_get_string(node, &string); ++ r = WRAP(snd_config_get_string)(node, &string); + if (r < 0) { + break; + } +@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) + + /* Don't clobber an explicit existing handle_underrun value, set it only + if it doesn't already exist. */ +- r = snd_config_search(pcm_node, "handle_underrun", &node); ++ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); + if (r != -ENOENT) { + break; + } + + /* Disable pcm_pulse's asynchronous underrun handling. */ +- r = snd_config_imake_integer(&node, "handle_underrun", 0); ++ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); + if (r < 0) { + break; + } + +- r = snd_config_add(pcm_node, node); ++ r = WRAP(snd_config_add)(pcm_node, node); + if (r < 0) { + break; + } +@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) + return lconf; + } while (0); + +- snd_config_delete(lconf); ++ WRAP(snd_config_delete)(lconf); + + return NULL; + } +@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (local_config) { +- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); ++ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); + } else { +- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); ++ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); + } + pthread_mutex_unlock(&cubeb_alsa_mutex); + +@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) + int r; + + pthread_mutex_lock(&cubeb_alsa_mutex); +- r = snd_pcm_close(pcm); ++ r = WRAP(snd_pcm_close)(pcm); + pthread_mutex_unlock(&cubeb_alsa_mutex); + + return r; +@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function, + alsa_init(cubeb ** context, char const * context_name) + { + (void)context_name; ++ void * libasound = NULL; + cubeb * ctx; + int r; + int i; +@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name) + assert(context); + *context = NULL; + ++#ifndef DISABLE_LIBASOUND_DLOPEN ++ libasound = dlopen("libasound.so", RTLD_LAZY); ++ if (!libasound) { ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libasound, #x); \ ++ if (!cubeb_##x) { \ ++ dlclose(libasound); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBASOUND_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + pthread_mutex_lock(&cubeb_alsa_mutex); + if (!cubeb_alsa_error_handler_set) { +- snd_lib_error_set_handler(silent_error_handler); ++ WRAP(snd_lib_error_set_handler)(silent_error_handler); + cubeb_alsa_error_handler_set = 1; + } + pthread_mutex_unlock(&cubeb_alsa_mutex); +@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name) + assert(ctx); + + ctx->ops = &alsa_ops; ++ ctx->libasound = libasound; + + r = pthread_mutex_init(&ctx->mutex, NULL); + assert(r == 0); +@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name) + config fails with EINVAL, the PA PCM is too old for this workaround. */ + if (r == -EINVAL) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + ctx->local_config = NULL; + } else if (r >= 0) { +@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx) + + if (ctx->local_config) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + } + ++ if (ctx->libasound) { ++ dlclose(ctx->libasound); ++ } ++ + free(ctx); + } + +@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR; + } + +- r = snd_pcm_nonblock(stm->pcm, 1); ++ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); + assert(r == 0); + + latency_us = latency_frames * 1e6 / stm->params.rate; +@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + latency_us = latency_us < min_latency ? min_latency: latency_us; + } + +- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, ++ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, + stm->params.channels, stm->params.rate, 1, + latency_us); + if (r < 0) { +@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR_INVALID_FORMAT; + } + +- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); ++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); + assert(r == 0); + + /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ + stm->buffer_size *= 2; +- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); ++ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); + assert(stm->buffer); + +- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); ++ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); + assert(stm->nfds > 0); + + stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); + assert(stm->saved_fds); +- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); ++ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); + assert((nfds_t) r == stm->nfds); + + if (alsa_register_stream(ctx, stm) != 0) { +@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + if (stm->pcm) { + if (stm->state == DRAINING) { +- snd_pcm_drain(stm->pcm); ++ WRAP(snd_pcm_drain)(stm->pcm); + } + alsa_locked_pcm_close(stm->pcm); + stm->pcm = NULL; +@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) + + assert(stm); + +- r = snd_pcm_hw_params_any(stm->pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); ++ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); + if (r < 0) { + return CUBEB_ERROR; + } +@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { + + /* get a pcm, disabling resampling, so we get a rate the + * hardware/dmix/pulse/etc. supports. */ +- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); ++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_any(pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); ++ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); + if (r >= 0) { + /* There is a default rate: use it. */ +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_OK; + } + + /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ + *rate = 44100; + +- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); ++ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + + return CUBEB_OK; + } +@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + /* Capture pcm must be started after initial setup/recover */ + if (stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ WRAP(snd_pcm_start)(stm->pcm); + } +- snd_pcm_pause(stm->pcm, 0); ++ WRAP(snd_pcm_pause)(stm->pcm, 0); + gettimeofday(&stm->last_activity, NULL); + pthread_mutex_unlock(&stm->mutex); + +@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm) + pthread_mutex_unlock(&ctx->mutex); + + pthread_mutex_lock(&stm->mutex); +- snd_pcm_pause(stm->pcm, 1); ++ WRAP(snd_pcm_pause)(stm->pcm, 1); + pthread_mutex_unlock(&stm->mutex); + + return CUBEB_OK; +@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) + pthread_mutex_lock(&stm->mutex); + + delay = -1; +- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || +- snd_pcm_delay(stm->pcm, &delay) != 0) { ++ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || ++ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { + *position = stm->last_position; + pthread_mutex_unlock(&stm->mutex); + return CUBEB_OK; +@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) + snd_pcm_sframes_t delay; + /* This function returns the delay in frames until a frame written using + snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ +- if (snd_pcm_delay(stm->pcm, &delay)) { ++ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { + return CUBEB_ERROR; + } + +diff --git media/libcubeb/src/cubeb_sndio.c media/libcubeb/src/cubeb_sndio.c +index 9e99b2c..0559af4 100644 +--- media/libcubeb/src/cubeb_sndio.c ++++ media/libcubeb/src/cubeb_sndio.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" +@@ -22,10 +23,35 @@ + #define DPR(...) do {} while(0) + #endif + ++#ifdef DISABLE_LIBSNDIO_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBSNDIO_API_VISIT(X) \ ++ X(sio_close) \ ++ X(sio_eof) \ ++ X(sio_getpar) \ ++ X(sio_initpar) \ ++ X(sio_onmove) \ ++ X(sio_open) \ ++ X(sio_pollfd) \ ++ X(sio_read) \ ++ X(sio_revents) \ ++ X(sio_setpar) \ ++ X(sio_start) \ ++ X(sio_stop) \ ++ X(sio_write) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBSNDIO_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++#endif ++ + static struct cubeb_ops const sndio_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libsndio; + }; + + struct cubeb_stream { +@@ -119,7 +145,7 @@ sndio_mainloop(void *arg) + DPR("sndio_mainloop()\n"); + s->state_cb(s, s->arg, CUBEB_STATE_STARTED); + pthread_mutex_lock(&s->mtx); +- if (!sio_start(s->hdl)) { ++ if (!WRAP(sio_start)(s->hdl)) { + pthread_mutex_unlock(&s->mtx); + return NULL; + } +@@ -203,7 +229,7 @@ sndio_mainloop(void *arg) + events |= POLLIN; + if ((s->mode & SIO_PLAY) && pstart < pend) + events |= POLLOUT; +- nfds = sio_pollfd(s->hdl, pfds, events); ++ nfds = WRAP(sio_pollfd)(s->hdl, pfds, events); + + if (nfds > 0) { + pthread_mutex_unlock(&s->mtx); +@@ -213,7 +239,7 @@ sndio_mainloop(void *arg) + continue; + } + +- revents = sio_revents(s->hdl, pfds); ++ revents = WRAP(sio_revents)(s->hdl, pfds); + + if (revents & POLLHUP) { + state = CUBEB_STATE_ERROR; +@@ -221,8 +247,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLOUT) { +- n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() werr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -231,8 +257,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLIN) { +- n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() rerr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -244,7 +270,7 @@ sndio_mainloop(void *arg) + if (prime > 0 && (s->mode & SIO_REC)) + rstart = rend; + } +- sio_stop(s->hdl); ++ WRAP(sio_stop)(s->hdl); + s->hwpos = s->swpos; + pthread_mutex_unlock(&s->mtx); + s->state_cb(s, s->arg, state); +@@ -254,8 +280,31 @@ sndio_mainloop(void *arg) + /*static*/ int + sndio_init(cubeb **context, char const *context_name) + { ++ void * libsndio = NULL; ++ ++#ifndef DISABLE_LIBSNDIO_DLOPEN ++ libsndio = dlopen("libsndio.so", RTLD_LAZY); ++ if (!libsndio) { ++ DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name); ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libsndio, #x); \ ++ if (!cubeb_##x) { \ ++ DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \ ++ dlclose(libsndio); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBSNDIO_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + DPR("sndio_init(%s)\n", context_name); + *context = malloc(sizeof(*context)); ++ (*context)->libsndio = libsndio; + (*context)->ops = &sndio_ops; + (void)context_name; + return CUBEB_OK; +@@ -271,6 +320,8 @@ static void + sndio_destroy(cubeb *context) + { + DPR("sndio_destroy()\n"); ++ if (context->libsndio) ++ dlclose(context->libsndio); + free(context); + } + +@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context, + goto err; + } + s->context = context; +- s->hdl = sio_open(NULL, s->mode, 1); ++ s->hdl = WRAP(sio_open)(NULL, s->mode, 1); + if (s->hdl == NULL) { + DPR("sndio_stream_init(), sio_open() failed\n"); + goto err; + } +- sio_initpar(&wpar); ++ WRAP(sio_initpar)(&wpar); + wpar.sig = 1; + wpar.bits = 16; + switch (format) { +@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context, + if (s->mode & SIO_PLAY) + wpar.pchan = output_stream_params->channels; + wpar.appbufsz = latency_frames; +- if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) { ++ if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) { + DPR("sndio_stream_init(), sio_setpar() failed\n"); + goto err; + } +@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context, + DPR("sndio_stream_init() unsupported params\n"); + goto err; + } +- sio_onmove(s->hdl, sndio_onmove, s); ++ WRAP(sio_onmove)(s->hdl, sndio_onmove, s); + s->active = 0; + s->nfr = rpar.round; + s->rbpf = rpar.bps * rpar.rchan; +@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context, + return CUBEB_OK; + err: + if (s->hdl) +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->pbuf) + free(s->pbuf); + if (s->rbuf) +@@ -446,7 +497,7 @@ static void + sndio_stream_destroy(cubeb_stream *s) + { + DPR("sndio_stream_destroy()\n"); +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->mode & SIO_PLAY) + free(s->pbuf); + if (s->mode & SIO_REC) +diff --git toolkit/library/moz.build toolkit/library/moz.build +index 8ce595ff96bff..c318e96a1fdfc 100644 +--- toolkit/library/moz.build ++++ toolkit/library/moz.build +@@ -231,9 +231,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +- + if CONFIG['HAVE_CLOCK_MONOTONIC']: + OS_LIBS += CONFIG['REALTIME_LIBS'] + +@@ -242,11 +239,6 @@ OS_LIBS += CONFIG['ICONV_LIBS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'): + OS_LIBS += CONFIG['TK_LIBS'] + +-if CONFIG['OS_ARCH'] == 'OpenBSD': +- OS_LIBS += [ +- 'sndio', +- ] +- + if CONFIG['MOZ_ENABLE_DBUS']: + OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS'] + diff --git a/math/Makefile b/math/Makefile index c8e420fe312..fa5486f981e 100644 --- a/math/Makefile +++ b/math/Makefile @@ -784,6 +784,7 @@ SUBDIR += py-uncertainties SUBDIR += py-vincenty SUBDIR += py-viper + SUBDIR += py-yt SUBDIR += py-z3-solver SUBDIR += qalculate SUBDIR += qd diff --git a/math/R-cran-forecast/Makefile b/math/R-cran-forecast/Makefile index 8b897651cab..836464e98cc 100644 --- a/math/R-cran-forecast/Makefile +++ b/math/R-cran-forecast/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= forecast -PORTVERSION= 8.8 +PORTVERSION= 8.9 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -15,6 +15,7 @@ CRAN_DEPENDS= R-cran-colorspace>0:graphics/R-cran-colorspace \ R-cran-fracdiff>0:math/R-cran-fracdiff \ R-cran-ggplot2>=2.2.1:graphics/R-cran-ggplot2 \ R-cran-lmtest>0:finance/R-cran-lmtest \ + R-cran-magrittr>0:devel/R-cran-magrittr \ R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp \ R-cran-timeDate>0:finance/R-cran-timeDate \ R-cran-tseries>0:finance/R-cran-tseries \ diff --git a/math/R-cran-forecast/distinfo b/math/R-cran-forecast/distinfo index 94cd7587b56..25651d72ea4 100644 --- a/math/R-cran-forecast/distinfo +++ b/math/R-cran-forecast/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564835304 -SHA256 (forecast_8.8.tar.gz) = d077074d77d3ea00e9215c828b3689a8c841a16af1e6859bb2dfdede081c2c1d -SIZE (forecast_8.8.tar.gz) = 826615 +TIMESTAMP = 1567916702 +SHA256 (forecast_8.9.tar.gz) = ade3ec37f16c374b85f605780337a7a6349bfc8352caef319f927d36e4b57d04 +SIZE (forecast_8.9.tar.gz) = 829958 diff --git a/math/R-cran-units/Makefile b/math/R-cran-units/Makefile index 663b26f2109..fa0373b8635 100644 --- a/math/R-cran-units/Makefile +++ b/math/R-cran-units/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= units -DISTVERSION= 0.6-3 -PORTREVISION= 1 +DISTVERSION= 0.6-4 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/math/R-cran-units/distinfo b/math/R-cran-units/distinfo index 47920133de5..6d130a492f4 100644 --- a/math/R-cran-units/distinfo +++ b/math/R-cran-units/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562486936 -SHA256 (units_0.6-3.tar.gz) = 03de88d9dcfe80d22dd3813413f33657c576aed24a8091dbfc7f68602020a64f -SIZE (units_0.6-3.tar.gz) = 961803 +TIMESTAMP = 1567915837 +SHA256 (units_0.6-4.tar.gz) = 25720a06d7b68cbfa50f2396a2a0981256084a9481008ee1ecae6974daafe0cb +SIZE (units_0.6-4.tar.gz) = 959885 diff --git a/math/ess/Makefile b/math/ess/Makefile index bfed6febca9..9ecc961ff68 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ess -DISTVERSION= 17.11 -PORTREVISION= 6 +DISTVERSION= 18.10.2 CATEGORIES= math MASTER_SITES= http://ess.r-project.org/downloads/ess/ \ http://stat.ethz.ch/ESS/downloads/ess/ @@ -17,11 +16,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= R:math/R -NO_ARCH= yes - USES= emacs gmake makeinfo perl5 tar:tgz USE_PERL5= build +NO_ARCH= yes + INFO= ess OPTIONS_DEFINE= DOCS @@ -30,9 +29,12 @@ post-patch: @${REINPLACE_CMD} -e \ 's|^DESTDIR|#DESTDIR| ; \ s|^PREFIX|#PREFIX| ; \ - s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)|' \ - ${WRKSRC}/Makeconf + s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)| ; \ + s|share/info|${INFO_PATH}|' ${WRKSRC}/Makeconf @${REINPLACE_CMD} -e \ '/^PDFs/s|=.*|=|' ${WRKSRC}/doc/Makefile +post-install: + @${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/ + .include diff --git a/math/ess/distinfo b/math/ess/distinfo index a00c0f35679..735340bd028 100644 --- a/math/ess/distinfo +++ b/math/ess/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516644885 -SHA256 (ess-17.11.tgz) = 484773fcfa2463fbbb9470cbdcf8e628500ca6cf97fb751ac72eed198d5fa715 -SIZE (ess-17.11.tgz) = 3275703 +TIMESTAMP = 1542041727 +SHA256 (ess-18.10.2.tgz) = f77b42283c698da091aabca9ccd14a648c3240f00898b93128490feefa04e9d6 +SIZE (ess-18.10.2.tgz) = 2939425 diff --git a/math/ess/pkg-plist b/math/ess/pkg-plist index 42e9f2dfe3b..551a79ab92f 100644 --- a/math/ess/pkg-plist +++ b/math/ess/pkg-plist @@ -16,10 +16,7 @@ %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/pkg.R %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/VERSION %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-julia.jl -%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-s4.S %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sas-sh-command -%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sp3.S -%%EMACS_LIBDIR%%/%%ETCDIR%%/function-outline.S %%EMACS_LIBDIR%%/%%ETCDIR%%/git-ref %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rbuffer.xpm %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rfunction.xpm @@ -32,25 +29,17 @@ %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switch_ess.xpm %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchr.xpm %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchs.xpm -%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.doc -%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.ps -%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.rtf -%%EMACS_SITE_LISPDIR%%/ess/ChangeLog %%EMACS_SITE_LISPDIR%%/ess/ess-arc-d.el %%EMACS_SITE_LISPDIR%%/ess/ess-arc-d.elc +%%EMACS_SITE_LISPDIR%%/ess/ess-autoloads.el %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.el %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.elc %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-l.el %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-l.elc -%%EMACS_SITE_LISPDIR%%/ess/ess-comp.el -%%EMACS_SITE_LISPDIR%%/ess/ess-comp.elc -%%EMACS_SITE_LISPDIR%%/ess/ess-compat.el -%%EMACS_SITE_LISPDIR%%/ess/ess-compat.elc %%EMACS_SITE_LISPDIR%%/ess/ess-custom.el %%EMACS_SITE_LISPDIR%%/ess/ess-custom.elc %%EMACS_SITE_LISPDIR%%/ess/ess-dde.el %%EMACS_SITE_LISPDIR%%/ess/ess-dde.elc -%%EMACS_SITE_LISPDIR%%/ess/ess-eldoc.el %%EMACS_SITE_LISPDIR%%/ess/ess-eldoc.elc %%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.el %%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.elc @@ -82,10 +71,13 @@ %%EMACS_SITE_LISPDIR%%/ess/ess-omg-d.elc %%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.el %%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.elc -%%EMACS_SITE_LISPDIR%%/ess/ess-r-args.el +%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.el +%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.elc %%EMACS_SITE_LISPDIR%%/ess/ess-r-args.elc %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.el %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.elc +%%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.el +%%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.elc %%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.el %%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.elc %%EMACS_SITE_LISPDIR%%/ess/ess-r-mode.el @@ -94,6 +86,8 @@ %%EMACS_SITE_LISPDIR%%/ess/ess-r-package.elc %%EMACS_SITE_LISPDIR%%/ess/ess-r-syntax.el %%EMACS_SITE_LISPDIR%%/ess/ess-r-syntax.elc +%%EMACS_SITE_LISPDIR%%/ess/ess-r-xref.el +%%EMACS_SITE_LISPDIR%%/ess/ess-r-xref.elc %%EMACS_SITE_LISPDIR%%/ess/ess-rd.el %%EMACS_SITE_LISPDIR%%/ess/ess-rd.elc %%EMACS_SITE_LISPDIR%%/ess/ess-rdired.el @@ -154,5 +148,4 @@ %%EMACS_SITE_LISPDIR%%/ess/make-regexp.elc %%EMACS_SITE_LISPDIR%%/ess/mouseme.el %%EMACS_SITE_LISPDIR%%/ess/mouseme.elc -%%EMACS_SITE_LISPDIR%%/ess/msdos.el %%EMACS_SITE_LISPDIR%%/ess/msdos.elc diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile index 09cda3a35c3..69395ef9357 100644 --- a/math/py-pandas/Makefile +++ b/math/py-pandas/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pandas -DISTVERSION= 0.24.2 -PORTREVISION= 1 +DISTVERSION= 0.25.1 CATEGORIES= math devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,12 +13,12 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.1:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>2017.2:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -# Official support for 2.7, 3.5, 3.6, and 3.7 -USES= python +# Official support for >=3.5.3 +USES= python:3.5+ OPTIONS_DEFINE= MPL SCIPY OPTIONS_GROUP= ACCEL STORAGE HTML EXCEL @@ -28,7 +27,7 @@ OPTIONS_GROUP_ACCEL= BTLNCK NUMEXPR OPTIONS_GROUP_STORAGE= BOTO TABLES OPTIONS_GROUP_HTML= LXML HTML5LIB JINJA2 OPTIONS_GROUP_EXCEL= XLRD XLWT OPENPYXL XLSX -OPTIONS_RADIO_SQL= ALCHEMY10 ALCHEMY11 ALCHEMY12 ALCHEMY13 +OPTIONS_RADIO_SQL= ALCHEMY11 ALCHEMY12 ALCHEMY13 OPTIONS_DEFAULT= BTLNCK NUMEXPR # Note: we cannot include the following ports in *_DEPENDS because they depend @@ -49,7 +48,6 @@ OPENPYXL_DESC= Write MS Excel 2007+ with textproc/py-openpyxl XLRD_DESC= Read MS Excel with textproc/py-xlrd XLWT_DESC= Write MS Excel with textproc/py-xlwt XLSX_DESC= Write MS Excel with textproc/py-xlsxwriter -ALCHEMY10_DESC= Support SQL databases via databases/py-sqlalchemy10 ALCHEMY11_DESC= Support SQL databases via databases/py-sqlalchemy11 ALCHEMY12_DESC= Support SQL databases via databases/py-sqlalchemy12 ALCHEMY13_DESC= Support SQL databases via databases/py-sqlalchemy13 @@ -59,24 +57,23 @@ SQL_DESC= SQLAlchemy ORM Add-ons HTML_DESC= HTML Parsing/Generation Add-ons EXCEL_DESC= MS Excel I/O Add-ons -MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR} -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=1.1:science/py-scipy@${PY_FLAVOR} -BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>=1.2.0:math/py-bottleneck@${PY_FLAVOR} -NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.6.1:math/py-numexpr@${PY_FLAVOR} +MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.2:math/py-matplotlib@${PY_FLAVOR} +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.19:science/py-scipy@${PY_FLAVOR} +BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>=1.2.1:math/py-bottleneck@${PY_FLAVOR} +NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.6.2:math/py-numexpr@${PY_FLAVOR} BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.4.2:devel/py-tables@${PY_FLAVOR} -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} -HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \ +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.6.0:www/py-beautifulsoup@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>3.8.0:devel/py-lxml@${PY_FLAVOR} +HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.6.0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} -OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.4.0:textproc/py-openpyxl@${PY_FLAVOR} -XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=1.0.0:textproc/py-xlrd@${PY_FLAVOR} -XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${PY_FLAVOR} -XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} +OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.4.8:textproc/py-openpyxl@${PY_FLAVOR} +XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=1.1.0:textproc/py-xlrd@${PY_FLAVOR} +XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>1.2.0:textproc/py-xlwt@${PY_FLAVOR} +XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0.9.8:textproc/py-xlsxwriter@${PY_FLAVOR} -ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} -ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${PY_FLAVOR} +ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>1.1.4:databases/py-sqlalchemy11@${PY_FLAVOR} ALCHEMY12_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${PY_FLAVOR} ALCHEMY13_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>0:databases/py-sqlalchemy13@${PY_FLAVOR} diff --git a/math/py-pandas/distinfo b/math/py-pandas/distinfo index 627bdb58b32..49942793318 100644 --- a/math/py-pandas/distinfo +++ b/math/py-pandas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553016144 -SHA256 (pandas-0.24.2.tar.gz) = 4f919f409c433577a501e023943e582c57355d50a724c589e78bc1d551a535a2 -SIZE (pandas-0.24.2.tar.gz) = 11837693 +TIMESTAMP = 1566526972 +SHA256 (pandas-0.25.1.tar.gz) = cb2e197b7b0687becb026b84d3c242482f20cbb29a9981e43604eb67576da9f6 +SIZE (pandas-0.25.1.tar.gz) = 12626560 diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile new file mode 100644 index 00000000000..a8307fed88b --- /dev/null +++ b/math/py-yt/Makefile @@ -0,0 +1,39 @@ +# Created by: Yuri Victorovich +# $FreeBSD$ + +PORTNAME= yt +DISTVERSION= 3.5.0 +PORTREVISION= 3 +CATEGORIES= math astro python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Analysis and visualization toolkit for volumetric data + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING.txt + +BUILD_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR} +LIB_DEPENDS= libembree.so:graphics/embree \ + libomp.so:devel/openmp +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=1.0:math/py-sympy@${PY_FLAVOR} \ + ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython5>=1.0:devel/ipython5@${PY_FLAVOR} + +USES= dos2unix localbase python +USE_PYTHON= distutils cython autoplist concurrent + +post-patch: + @${REINPLACE_CMD} -e "s|check_for_pyembree() is not None|True|; s|check_for_openmp() is True|True|" \ + ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e "s|\['-fopenmp', filename\]|['-I${LOCALBASE}/include', '-L${LOCALBASE}/lib', '-lm', '-fopenmp', filename]|" \ + ${WRKSRC}/setupext.py + +post-install: + @${STRIP_CMD} $$(${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so") + +.include diff --git a/math/py-yt/distinfo b/math/py-yt/distinfo new file mode 100644 index 00000000000..e3cfab5cd2e --- /dev/null +++ b/math/py-yt/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1539846194 +SHA256 (yt-3.5.0.tar.gz) = ee4bf8349f02ce21f571654c26d85c1f69d9678fc8f5c7cfe5d1686c7ed2e3ca +SIZE (yt-3.5.0.tar.gz) = 10417638 diff --git a/math/py-yt/files/patch-yt_extern_tqdm___utils.py b/math/py-yt/files/patch-yt_extern_tqdm___utils.py new file mode 100644 index 00000000000..42900ea8907 --- /dev/null +++ b/math/py-yt/files/patch-yt_extern_tqdm___utils.py @@ -0,0 +1,11 @@ +--- yt/extern/tqdm/_utils.py.orig 2017-01-01 20:57:19 UTC ++++ yt/extern/tqdm/_utils.py +@@ -40,7 +40,7 @@ def _environ_cols_wrapper(): # pragma: + _environ_cols = _environ_cols_windows + if _environ_cols is None: + _environ_cols = _environ_cols_tput +- if current_os in ['Linux', 'Darwin'] or current_os.startswith('CYGWIN'): ++ if current_os in ['FreeBSD', 'Linux', 'Darwin'] or current_os.startswith('CYGWIN'): + _environ_cols = _environ_cols_linux + return _environ_cols + diff --git a/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h b/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h new file mode 100644 index 00000000000..4bf2fcc821d --- /dev/null +++ b/math/py-yt/files/patch-yt_utilities_lib_platform__dep.h @@ -0,0 +1,11 @@ +--- yt/utilities/lib/platform_dep.h.orig 2017-01-01 20:57:35 UTC ++++ yt/utilities/lib/platform_dep.h +@@ -57,7 +57,7 @@ double erf(double x) + + #else + #include +-#include "alloca.h" ++#include + #include + #endif + diff --git a/math/py-yt/pkg-descr b/math/py-yt/pkg-descr new file mode 100644 index 00000000000..164d85c3123 --- /dev/null +++ b/math/py-yt/pkg-descr @@ -0,0 +1,7 @@ +yt supports structured, variable-resolution meshes, unstructured meshes, +and discrete or sampled data such as particles. Focused on driving +physically-meaningful inquiry, yt has been applied in domains such as +astrophysics, seismology, nuclear engineering, molecular dynamics, and +oceanography. + +WWW: http://yt-project.org diff --git a/misc/R-cran-xfun/Makefile b/misc/R-cran-xfun/Makefile index 7457e25292b..53e212ee686 100644 --- a/misc/R-cran-xfun/Makefile +++ b/misc/R-cran-xfun/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xfun -PORTVERSION= 0.8 -PORTREVISION= 1 +PORTVERSION= 0.9 CATEGORIES= misc DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/misc/R-cran-xfun/distinfo b/misc/R-cran-xfun/distinfo index 4c4a6582167..7f6db4d2256 100644 --- a/misc/R-cran-xfun/distinfo +++ b/misc/R-cran-xfun/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562498136 -SHA256 (xfun_0.8.tar.gz) = c2f8ecf8b57ddec02f9be7f417d9e22fc1ae2c7db8d70aa703fc62bf4a5c5416 -SIZE (xfun_0.8.tar.gz) = 54885 +TIMESTAMP = 1567915095 +SHA256 (xfun_0.9.tar.gz) = d453fe89ee39bc20f05b3bde4529182f8cd6197a221eca6b106832a28daf7cb0 +SIZE (xfun_0.9.tar.gz) = 55965 diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile index 36ce74e85f9..7fc7752bd86 100644 --- a/misc/adios2/Makefile +++ b/misc/adios2/Makefile @@ -11,6 +11,8 @@ COMMENT= Next generation of ADIOS developed in the Exascale Computing Program LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to package + BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libepoll-shim.so:devel/libepoll-shim \ diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile index 589d2b92c84..4b4d366ba93 100644 --- a/misc/findutils/Makefile +++ b/misc/findutils/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= findutils -PORTVERSION= 4.6.0 -PORTREVISION= 1 +PORTVERSION= 4.7.0 CATEGORIES= misc MASTER_SITES= GNU DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig @@ -15,7 +14,8 @@ COMMENT= GNU find utilities LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES+= charsetfix cpe gmake +USES= charsetfix cpe gmake tar:xz + SIG_FILES= ${DISTNAME}${EXTRACT_SUFX}.sig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/misc/findutils/distinfo b/misc/findutils/distinfo index 47d6ab72578..4187ea69ed7 100644 --- a/misc/findutils/distinfo +++ b/misc/findutils/distinfo @@ -1,4 +1,5 @@ -SHA256 (findutils-4.6.0.tar.gz) = ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d -SIZE (findutils-4.6.0.tar.gz) = 3780154 -SHA256 (findutils-4.6.0.tar.gz.sig) = d6a77e6889f31571eb2f0446ac4d1cc16acbaf684f5e5d4e0feb88f2cc1d5b52 -SIZE (findutils-4.6.0.tar.gz.sig) = 152 +TIMESTAMP = 1567957854 +SHA256 (findutils-4.7.0.tar.xz) = c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a +SIZE (findutils-4.7.0.tar.xz) = 1895048 +SHA256 (findutils-4.7.0.tar.xz.sig) = 2f620e6d941e241fac52344a89149ab1ffeefb0fb9e42174e17a508d59a31d0f +SIZE (findutils-4.7.0.tar.xz.sig) = 488 diff --git a/misc/findutils/files/patch-locate__updatedb.sh b/misc/findutils/files/patch-locate__updatedb.sh index 4795680cbf4..83563cf164d 100644 --- a/misc/findutils/files/patch-locate__updatedb.sh +++ b/misc/findutils/files/patch-locate__updatedb.sh @@ -1,6 +1,6 @@ ---- locate/updatedb.sh.orig 2011-04-03 23:53:12.000000000 +0100 -+++ locate/updatedb.sh 2011-05-17 18:20:29.000000000 +0100 -@@ -250,7 +250,7 @@ +--- locate/updatedb.sh.orig 2019-06-23 09:00:40 UTC ++++ locate/updatedb.sh +@@ -292,7 +292,7 @@ cd "$changeto" if test -n "$SEARCHPATHS"; then if [ "$LOCALUSER" != "" ]; then # : A1 @@ -9,7 +9,7 @@ "$find $SEARCHPATHS $FINDOPTIONS \ \\( $prunefs_exp \ -type d -regex '$PRUNEREGEX' \\) -prune -o $print_option" -@@ -266,7 +266,7 @@ +@@ -308,7 +308,7 @@ if test -n "$NETPATHS"; then myuid=`getuid` if [ "$myuid" = 0 ]; then # : A3 @@ -18,21 +18,3 @@ "$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o $print_option" || exit $? else -@@ -319,7 +319,7 @@ - if test -n "$SEARCHPATHS"; then - if [ "$LOCALUSER" != "" ]; then - # : A5 -- su $LOCALUSER `select_shell $LOCALUSER` -c \ -+ su -m $LOCALUSER -c \ - "$find $SEARCHPATHS $FINDOPTIONS \ - \( $prunefs_exp \ - -type d -regex '$PRUNEREGEX' \) -prune -o $print_option" || exit $? -@@ -335,7 +335,7 @@ - myuid=`getuid` - if [ "$myuid" = 0 ]; then - # : A7 -- su $NETUSER `select_shell $NETUSER` -c \ -+ su -m $NETUSER -c \ - "$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o $print_option" || - exit $? - else diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist index 8c9bab1611e..f51735b0999 100644 --- a/misc/findutils/pkg-plist +++ b/misc/findutils/pkg-plist @@ -2,8 +2,6 @@ bin/gfind bin/glocate bin/gupdatedb bin/gxargs -libexec/gbigram -libexec/gcode libexec/gfrcode man/man1/gfind.1.gz man/man1/glocate.1.gz @@ -40,7 +38,6 @@ man/man5/glocatedb.5.gz %%NLS%%share/locale/pt_BR/LC_MESSAGES/findutils.mo %%NLS%%share/locale/ro/LC_MESSAGES/findutils.mo %%NLS%%share/locale/ru/LC_MESSAGES/findutils.mo -%%NLS%%share/locale/rw/LC_MESSAGES/findutils.mo %%NLS%%share/locale/sk/LC_MESSAGES/findutils.mo %%NLS%%share/locale/sl/LC_MESSAGES/findutils.mo %%NLS%%share/locale/sr/LC_MESSAGES/findutils.mo diff --git a/misc/osinfo-db/Makefile b/misc/osinfo-db/Makefile index b8a4587f68e..bd751d17f4a 100644 --- a/misc/osinfo-db/Makefile +++ b/misc/osinfo-db/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= osinfo-db -PORTVERSION= 20190805 +PORTVERSION= 20190905 CATEGORIES= misc MASTER_SITES= https://releases.pagure.org/libosinfo/ diff --git a/misc/osinfo-db/distinfo b/misc/osinfo-db/distinfo index 85671dfc56f..e604c2f71c9 100644 --- a/misc/osinfo-db/distinfo +++ b/misc/osinfo-db/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565407129 -SHA256 (osinfo-db-20190805.tar.xz) = 7da4477508cb2fb03da90123bafcc2ab1ff6c2d8f911a590cad9a202eb0448d1 -SIZE (osinfo-db-20190805.tar.xz) = 90228 +TIMESTAMP = 1567825369 +SHA256 (osinfo-db-20190905.tar.xz) = 7233b5a68cc0c3c231db510f342fcc78f6e7c40ca0a739bff484f66591b0bda3 +SIZE (osinfo-db-20190905.tar.xz) = 91728 diff --git a/misc/osinfo-db/pkg-plist b/misc/osinfo-db/pkg-plist index 64925812878..e377c0e4d38 100644 --- a/misc/osinfo-db/pkg-plist +++ b/misc/osinfo-db/pkg-plist @@ -217,8 +217,12 @@ share/osinfo/os/dragonflybsd.org/dragonflybsd-5.4.1.xml share/osinfo/os/dragonflybsd.org/dragonflybsd-5.4.2.xml share/osinfo/os/dragonflybsd.org/dragonflybsd-5.4.3.xml share/osinfo/os/dragonflybsd.org/dragonflybsd-5.6.xml +share/osinfo/os/endlessos.com/eos-3.1.xml +share/osinfo/os/endlessos.com/eos-3.2.xml share/osinfo/os/endlessos.com/eos-3.3.xml share/osinfo/os/endlessos.com/eos-3.4.xml +share/osinfo/os/endlessos.com/eos-3.5.xml +share/osinfo/os/endlessos.com/eos-3.6.xml share/osinfo/os/fedoraproject.org/fedora-1.xml share/osinfo/os/fedoraproject.org/fedora-10.xml share/osinfo/os/fedoraproject.org/fedora-11.xml @@ -407,6 +411,7 @@ share/osinfo/os/netbsd.org/netbsd-7.1.2.xml share/osinfo/os/netbsd.org/netbsd-7.1.xml share/osinfo/os/netbsd.org/netbsd-7.2.xml share/osinfo/os/netbsd.org/netbsd-8.0.xml +share/osinfo/os/netbsd.org/netbsd-8.1.xml share/osinfo/os/novell.com/netware-4.xml share/osinfo/os/novell.com/netware-5.xml share/osinfo/os/novell.com/netware-6.xml @@ -551,6 +556,7 @@ share/osinfo/os/redhat.com/rhel-7.3.xml share/osinfo/os/redhat.com/rhel-7.4.xml share/osinfo/os/redhat.com/rhel-7.5.xml share/osinfo/os/redhat.com/rhel-7.6.xml +share/osinfo/os/redhat.com/rhel-7.7.xml share/osinfo/os/redhat.com/rhel-8-unknown.xml share/osinfo/os/redhat.com/rhel-8.0.xml share/osinfo/os/redhat.com/rhel-atomic-7.0.xml diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index 42fe86d2350..fe7f36b8268 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-2316 -DISTVERSIONSUFFIX= -g05b33047c +DISTVERSION= 1.0.0-2345 +DISTVERSIONSUFFIX= -g44a573b8c CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index 23d809e144a..321e8fdf239 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567204380 -SHA256 (jbeich-aom-v1.0.0-2316-g05b33047c_GH0.tar.gz) = 925c49bf38d07d85ecf506372609b7d4684db27d36631115d8d28fb28f76ddc5 -SIZE (jbeich-aom-v1.0.0-2316-g05b33047c_GH0.tar.gz) = 3414134 +TIMESTAMP = 1567834311 +SHA256 (jbeich-aom-v1.0.0-2345-g44a573b8c_GH0.tar.gz) = aeee5ccaad8e63cfc443528126a74d209aaec5a33fb159ef11d583cbd83ef2a4 +SIZE (jbeich-aom-v1.0.0-2345-g44a573b8c_GH0.tar.gz) = 3414157 diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 08dff24baae..1c31f4e4a4d 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 4.2 -PORTREVISION= 2 +PORTVERSION= 4.2.1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ @@ -442,7 +441,7 @@ SRT_CONFIGURE_ENABLE= libsrt # svt-av1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 SVTAV1_CONFIGURE_ON= --enable-libsvtav1 -SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.6.0-151-gcd79924e/ffmpeg_plugin/:svtav1 +SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.6.0-277-gb7b71ce4/ffmpeg_plugin/:svtav1 SVTAV1_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 .if make(makesum) .MAKEFLAGS: WITH+=SVTAV1 diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 5c5bc49c373..edd5dd9b64e 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1565039500 -SHA256 (ffmpeg-4.2.tar.xz) = 023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5 -SIZE (ffmpeg-4.2.tar.xz) = 9088756 -SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 898dbbdb21cfafbb19381463382467fbe5c5a78ca3844f8c5583fa919b7d5a82 -SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 19723 +TIMESTAMP = 1567808306 +SHA256 (ffmpeg-4.2.1.tar.xz) = cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4 +SIZE (ffmpeg-4.2.1.tar.xz) = 9090632 +SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 4a46ec64650b3ae319021afbf969ec4e56653696089ff6cabc5c9c0e29d730e1 +SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 22632 SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = d9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554 SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 20927 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 295220f498680d893bec525321e657dc3cdb98080a7117d1f575cd0508996a0e diff --git a/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c b/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c deleted file mode 100644 index f37cb526565..00000000000 --- a/multimedia/ffmpeg/files/patch-libavformat_matroskadec.c +++ /dev/null @@ -1,13 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/299e0dff1fbc - ---- libavformat/matroskadec.c.orig 2019-08-05 20:52:21 UTC -+++ libavformat/matroskadec.c -@@ -757,7 +757,7 @@ static int matroska_reset_status(MatroskaDemuxContext - uint32_t id, int64_t position) - { - if (position >= 0) { -- int err = avio_seek(matroska->ctx->pb, position, SEEK_SET); -+ int64_t err = avio_seek(matroska->ctx->pb, position, SEEK_SET); - if (err < 0) - return err; - } diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index fa2d82b6aa8..881031dcfae 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -14,10 +14,6 @@ COMMENT= Video editing system LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to patch -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/bin/analyseplugin:audio/ladspa LIB_DEPENDS= libasound.so:audio/alsa-lib \ @@ -52,8 +48,10 @@ RUN_DEPENDS= ${LOCALBASE}/bin/analyseplugin:audio/ladspa \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= compiler:c++11-lib gettext-runtime ghostscript:run libtool \ - localbase pathfix perl5 pkgconfig python shebangfix tar:bzip2 +USES= autoreconf compiler:c++11-lib gettext-runtime gettext-tools \ + ghostscript:run gl gnome \ + libtool localbase pathfix perl5 pkgconfig python sdl \ + shebangfix tar:bzip2 xorg SHEBANG_FILES= build-lives-rfx-plugin build-lives-rfx-plugin-multi \ smogrify tools/autolives.pl lives-plugins/plugins/encoders/*_encoder \ lives-plugins/marcos-encoders/*encoder* \ @@ -75,7 +73,7 @@ DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \ lives-plugins/marcos-encoders/README.multi_encoder \ weed-docs/weedspec.txt weed-docs/weedevents.txt -OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA NLS +OPTIONS_DEFINE= DOCS DOXYGEN FREI0R MATROSKA V4L NLS OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen @@ -84,6 +82,8 @@ FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r FREI0R_CONFIGURE_ENV_OFF= ac_cv_header_frei0r_h=no MATROSKA_RUN_DEPENDS= mkvmerge:multimedia/mkvtoolnix +V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat +V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l NLS_USES= gettext-tools NLS_CONFIGURE_OFF= --disable-nls @@ -113,7 +113,7 @@ post-install-DOCS-on: ${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-DOXYGEN-on: - @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||}/html \ - ! -type d >> ${TMPPLIST}) + @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR_REL}/html \ + -not -type d >> ${TMPPLIST}) .include diff --git a/multimedia/lives/files/patch-Makefile.am b/multimedia/lives/files/patch-Makefile.am new file mode 100644 index 00000000000..1dca074cac5 --- /dev/null +++ b/multimedia/lives/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2019-04-16 07:43:04 UTC ++++ Makefile.am +@@ -35,7 +35,7 @@ endif + SUBDIRS = $(OSC_SUBDIRS) intl $(WEED_SUBDIRS) src m4 lives-plugins po resources + PACKAGE_CAPITALISED = LiVES + +-docdir = "$(prefix)/share/doc/$(PACKAGE)-$(VERSION)" ++docdir = "$(prefix)/share/doc/$(PACKAGE)" + sharedir = "$(prefix)/share" + + if HAVE_DOXYGEN diff --git a/multimedia/lives/files/patch-configure b/multimedia/lives/files/patch-configure deleted file mode 100644 index 2f1a306d454..00000000000 --- a/multimedia/lives/files/patch-configure +++ /dev/null @@ -1,42 +0,0 @@ ---- configure.orig 2015-12-23 17:59:14 UTC -+++ configure -@@ -28352,7 +28352,6 @@ if test -n "$WEED_CFLAGS"; then - test $ac_status = 0; }; then - pkg_cv_WEED_CFLAGS=`$PKG_CONFIG --cflags "libweed >= 0.8.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes --else - pkg_failed=yes - fi - else -@@ -28441,7 +28440,6 @@ if test -n "$WEED_SLICE_CFLAGS"; then - test $ac_status = 0; }; then - pkg_cv_WEED_SLICE_CFLAGS=`$PKG_CONFIG --cflags "libweed_slice >= 0.8.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes --else - pkg_failed=yes - fi - else -@@ -28531,7 +28529,6 @@ if test -n "$WEED_UTILS_CFLAGS"; then - test $ac_status = 0; }; then - pkg_cv_WEED_UTILS_CFLAGS=`$PKG_CONFIG --cflags "libweed-utils >= 0.8.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes --else - pkg_failed=yes - fi - else -@@ -28620,7 +28617,6 @@ if test -n "$WEED_COMPAT_CFLAGS"; then - test $ac_status = 0; }; then - pkg_cv_WEED_COMPAT_CFLAGS=`$PKG_CONFIG --cflags "libweed-compat >= 0.9.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes --else - pkg_failed=yes - fi - else -@@ -28709,7 +28705,6 @@ if test -n "$WEED_PLUGIN_CFLAGS"; then - test $ac_status = 0; }; then - pkg_cv_WEED_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "libweed-plugin >= 0.13.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes --else - pkg_failed=yes - fi - else diff --git a/multimedia/lives/files/patch-configure.ac b/multimedia/lives/files/patch-configure.ac new file mode 100644 index 00000000000..d6e315d2192 --- /dev/null +++ b/multimedia/lives/files/patch-configure.ac @@ -0,0 +1,22 @@ +--- configure.ac.orig 2019-01-08 13:49:30 UTC ++++ configure.ac +@@ -520,14 +520,16 @@ HAVE_OPENCV=false + + dnl check for opencv + +-PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false) ++PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false) + +-if test "HAVE_OPENCV" = "true" ; then +-OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L` ++if test "$HAVE_OPENCV" = "true" ; then ++OPENCV_LIBS_ONLY_L=`$PKG_CONFIG opencv --libs-only-L` ++OPENCV_LIBS_ONLY_OTHER=`$PKG_CONFIG opencv --libs-only-other` + fi + + AC_SUBST(OPENCV_CFLAGS) + AC_SUBST(OPENCV_LIBS_ONLY_L) ++AC_SUBST(OPENCV_LIBS_ONLY_OTHER) + + AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV) + diff --git a/multimedia/lives/files/patch-ffmpeg4 b/multimedia/lives/files/patch-ffmpeg4 deleted file mode 100644 index dea84678f63..00000000000 --- a/multimedia/lives/files/patch-ffmpeg4 +++ /dev/null @@ -1,343 +0,0 @@ -https://sourceforge.net/p/lives/code/2742/ -https://sourceforge.net/p/lives/code/2745/ - ---- configure.orig 2017-06-29 01:44:43 UTC -+++ configure -@@ -787,6 +787,8 @@ HAVE_AVFORMAT_NEW_STREAM_FALSE - HAVE_AVFORMAT_NEW_STREAM_TRUE - HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE - HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE -+HAVE_AVCODEC_GET_NAME_FALSE -+HAVE_AVCODEC_GET_NAME_TRUE - HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE - HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE - HAVE_AVCODEC_OPEN2_FALSE -@@ -26007,6 +26009,7 @@ fi - - HAVE_AVCODEC_OPEN2=false - HAVE_AVCODEC_ALLOC_CONTEXT3=false -+HAVE_AVCODEC_GET_NAME=false - HAVE_AV_CODEC_SET_PKT_TIMEBASE=false - HAVE_AVFORMAT_NEW_STREAM=false - HAVE_AVFORMAT_FIND_STREAM_INFO=false -@@ -26103,6 +26106,48 @@ else - HAVE_AVCODEC_ALLOC_COBTEXT3=false - fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_get_name in -lavcodec" >&5 -+$as_echo_n "checking for avcodec_get_name in -lavcodec... " >&6; } -+if ${ac_cv_lib_avcodec_avcodec_get_name+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lavcodec $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char avcodec_get_name (); -+int -+main () -+{ -+return avcodec_get_name (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_avcodec_avcodec_get_name=yes -+else -+ ac_cv_lib_avcodec_avcodec_get_name=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_get_name" >&5 -+$as_echo "$ac_cv_lib_avcodec_avcodec_get_name" >&6; } -+if test "x$ac_cv_lib_avcodec_avcodec_get_name" = xyes; then : -+ HAVE_AVCODEC_GET_NAME=true -+else -+ HAVE_AVCODEC_GET_NAME=false -+fi -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_codec_set_pkt_timebase in -lavcodec" >&5 - $as_echo_n "checking for av_codec_set_pkt_timebase in -lavcodec... " >&6; } - if ${ac_cv_lib_avcodec_av_codec_set_pkt_timebase+:} false; then : -@@ -26525,6 +26570,14 @@ else - HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE= - fi - -+ if $HAVE_AVCODEC_GET_NAME; then -+ HAVE_AVCODEC_GET_NAME_TRUE= -+ HAVE_AVCODEC_GET_NAME_FALSE='#' -+else -+ HAVE_AVCODEC_GET_NAME_TRUE='#' -+ HAVE_AVCODEC_GET_NAME_FALSE= -+fi -+ - if $HAVE_AV_CODEC_SET_PKT_TIMEBASE; then - HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE= - HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE='#' -@@ -29545,6 +29598,10 @@ Usually this means the macro was only invoked conditio - fi - if test -z "${HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE}" && test -z "${HAVE_AVCODEC_ALLOC_CONTEXT3_FALSE}"; then - as_fn_error $? "conditional \"HAVE_AVCODEC_ALLOC_CONTEXT3\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi -+if test -z "${HAVE_AVCODEC_GET_NAME_TRUE}" && test -z "${HAVE_AVCODEC_GET_NAME_FALSE}"; then -+ as_fn_error $? "conditional \"HAVE_AVCODEC_GET_NAME\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE}" && test -z "${HAVE_AV_CODEC_SET_PKT_TIMEBASE_FALSE}"; then ---- lives-plugins/plugins/decoders/asf_decoder.c.orig 2017-05-24 02:07:10 UTC -+++ lives-plugins/plugins/decoders/asf_decoder.c -@@ -439,7 +439,7 @@ static int get_next_video_packet(const lives_clip_data - - - if (tdts == -1) { -- priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE; -+ priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE; - priv->avpkt.data = malloc(priv->avpkt.size); - memset(priv->avpkt.data, 0, priv->avpkt.size); - } -@@ -714,10 +714,10 @@ static int get_next_video_packet(const lives_clip_data - fprintf(stderr, "asf_decoder: buffer overflow reading vid packet (%d + %d > %d),\n increasing buffer size\n", - asf->packet_frag_offset, asf->packet_frag_size, priv->avpkt.size); - -- priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + FF_INPUT_BUFFER_PADDING_SIZE); -+ priv->avpkt.data = realloc(priv->avpkt.data, priv->def_packet_size * 2 + AV_INPUT_BUFFER_PADDING_SIZE); - memset(priv->avpkt.data + priv->avpkt.size, 0, priv->def_packet_size); - priv->def_packet_size *= 2; -- priv->avpkt.size = priv->def_packet_size + FF_INPUT_BUFFER_PADDING_SIZE; -+ priv->avpkt.size = priv->def_packet_size + AV_INPUT_BUFFER_PADDING_SIZE; - } - - if (read(priv->fd, priv->avpkt.data + asf->packet_frag_offset, asf->packet_frag_size) -@@ -1436,8 +1436,8 @@ seek_skip: - if (!got_vidst) { - priv->st->codec->extradata_size = size - 40; - -- priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -- memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); -+ memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - - if (read(priv->fd, priv->st->codec->extradata, - priv->st->codec->extradata_size) < priv->st->codec->extradata_size) { ---- lives-plugins/plugins/decoders/avformat_decoder.c.orig 2017-05-12 12:35:30 UTC -+++ lives-plugins/plugins/decoders/avformat_decoder.c -@@ -368,8 +368,12 @@ skip_init: - - get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned); - -- sprintf(cdata->audio_name, "%s", cc->codec_name); -- -+#ifdef HAVE_AVCODEC_GET_NAME -+ sprintf(cdata->audio_name, "%s", avcodec_get_name(cc->codec_id)); -+#else -+ sprintf(cdata->audio_name, "%s", cc->codec->name); -+#endif -+ - priv->astream = i; - break; - -@@ -408,7 +412,11 @@ skip_init: - return FALSE; - } - -- sprintf(cdata->video_name, "%s", cc->codec_name); -+#ifdef HAVE_AVCODEC_GET_NAME -+ sprintf(cdata->video_name, "%s", avcodec_get_name(cc->codec_id)); -+#else -+ sprintf(cdata->video_name, "%s", cc->codec->name); -+#endif - - cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den; - if (cdata->par == 0) cdata->par = 1; ---- lives-plugins/plugins/decoders/flv_decoder.c.orig 2017-05-11 22:46:57 UTC -+++ lives-plugins/plugins/decoders/flv_decoder.c -@@ -465,7 +465,7 @@ static int flv_get_extradata(lives_clip_data_t *cdata, - lives_flv_priv_t *priv = cdata->priv; - - av_free(priv->ctx->extradata); -- priv->ctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); -+ priv->ctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (priv->ctx->extradata == NULL) return AVERROR(ENOMEM); - priv->ctx->extradata_size = size; - dummy = read(priv->fd, priv->ctx->extradata, priv->ctx->extradata_size); -@@ -1143,12 +1143,12 @@ static boolean attach_stream(lives_clip_data_t *cdata, - - if (isclone) return TRUE; - -- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE); -+ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE); - - av_init_packet(&priv->avpkt); - - priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset); -- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); -+ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - priv->input_position += pack.size + 4; - priv->avpkt.data = pack.data; - priv->avpkt.dts = priv->avpkt.pts = pack.dts; -@@ -1206,10 +1206,10 @@ static boolean attach_stream(lives_clip_data_t *cdata, - continue; - } - -- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE); -+ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE); - if (priv->pack_offset != 5) lseek(priv->fd, priv->pack_offset - 5, SEEK_CUR); - priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset); -- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); -+ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - priv->avpkt.data = pack.data; - break; - } -@@ -1709,12 +1709,12 @@ boolean get_frame(const lives_clip_data_t *cdata, int6 - continue; - } - -- pack.data = malloc(pack.size - priv->pack_offset + FF_INPUT_BUFFER_PADDING_SIZE); -+ pack.data = malloc(pack.size - priv->pack_offset + AV_INPUT_BUFFER_PADDING_SIZE); - - if (priv->pack_offset != 1) lseek(priv->fd, priv->pack_offset - 1, SEEK_CUR); - - priv->avpkt.size = read(priv->fd, pack.data, pack.size - priv->pack_offset); -- memset(pack.data + priv->avpkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); -+ memset(pack.data + priv->avpkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - priv->avpkt.data = pack.data; - priv->avpkt.dts = priv->avpkt.pts = pack.dts; - ---- lives-plugins/plugins/decoders/libav_helper.h.orig 2017-05-12 05:48:30 UTC -+++ lives-plugins/plugins/decoders/libav_helper.h -@@ -117,6 +117,21 @@ static UNUSED void av_set_pts_info(AVStream *s, int pt - #define av_get_bits_per_sample(a) (av_get_bytes_per_sample(a) * 8) - #endif - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) -+#ifndef FF_INPUT_BUFFER_PADDING_SIZE -+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_MIN_SIZE -+#else -+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE -+#endif -+#else -+#ifndef AV_INPUT_BUFFER_PADDING_SIZE -+#define AV_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_MIN_SIZE -+#endif -+#endif -+ -+#ifndef AV_CODEC_FLAG_GLOBAL_HEADER -+#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER -+#endif - - - #endif // HAVE_LIBAV_LIBS ---- lives-plugins/plugins/decoders/mkv_decoder.c.orig 2017-05-12 08:39:45 UTC -+++ lives-plugins/plugins/decoders/mkv_decoder.c -@@ -883,7 +883,7 @@ static void matroska_fix_ass_packet(MatroskaDemuxConte - es = ec / 100; - ec -= 100 * es; - *ptr++ = '\0'; -- len = 50 + end - ptr + FF_INPUT_BUFFER_PADDING_SIZE; -+ len = 50 + end - ptr + AV_INPUT_BUFFER_PADDING_SIZE; - if (!(line = malloc(len))) - return; - snprintf(line, len, "Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n", -@@ -1544,7 +1544,7 @@ static int lives_mkv_read_header(lives_clip_data_t *cd - st->codec->extradata_size = extradata_size; - } else if (track->codec_priv.data && track->codec_priv.size > 0) { - st->codec->extradata = calloc(track->codec_priv.size + -- FF_INPUT_BUFFER_PADDING_SIZE, 1); -+ AV_INPUT_BUFFER_PADDING_SIZE, 1); - if (st->codec->extradata == NULL) { - fprintf(stderr, - "mkv_decoder: Out of memory\n"); ---- lives-plugins/plugins/decoders/mpegts_decoder.c.orig 2017-05-12 12:37:42 UTC -+++ lives-plugins/plugins/decoders/mpegts_decoder.c -@@ -125,7 +125,7 @@ static inline void skip_bits(GetBitContext *s, int n) - - /** - * init GetBitContext. -- * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits -+ * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits - * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end - * @param bit_size the size of the buffer in bits - * -@@ -337,6 +337,7 @@ struct MpegTSContext { - MpegTSFilter *pids[NB_PID_MAX]; - }; - -+/* - static const AVOption options[] = { - { - "compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT, -@@ -344,6 +345,7 @@ static const AVOption options[] = { - }, - { NULL }, - }; -+*/ - - /* TS stream handling */ - -@@ -1035,7 +1037,7 @@ static void new_pes_packet(PESContext *pes, AVPacket * - fprintf(stderr, "mpegts_decoder: PES packet size mismatch\n"); - //pes->flags |= AV_PKT_FLAG_CORRUPT; - } -- memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); -+ memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - - // Separate out the AC3 substream from an HDMV combined TrueHD/AC3 PID - if (pes->sub_st && pes->stream_type == 0x83 && pes->extended_stream_id == 0x76) -@@ -1192,7 +1194,7 @@ static int mpegts_push_data(lives_clip_data_t *cdata, - pes->total_size = MAX_PES_PAYLOAD; - - /* allocate pes buffer */ -- pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!pes->buffer) - return AVERROR(ENOMEM); - -@@ -1289,7 +1291,7 @@ skip: - if (pes->data_index > 0 && pes->data_index + buf_size > pes->total_size) { - new_pes_packet(pes, ts->pkt); - pes->total_size = MAX_PES_PAYLOAD; -- pes->buffer = av_malloc(pes->total_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ pes->buffer = av_malloc(pes->total_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!pes->buffer) - return AVERROR(ENOMEM); - ts->stop_parse = 1; -@@ -1454,7 +1456,7 @@ int ff_mp4_read_dec_config_descr(lives_clip_data_t *cd - if (!len || (uint64_t)len > (1 << 30)) - return -1; - av_free(st->codec->extradata); -- st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); -+ st->codec->extradata = av_mallocz(len + AV_INPUT_BUFFER_PADDING_SIZE); - if (!st->codec->extradata) - return AVERROR(ENOMEM); - memcpy(st->codec->extradata, p, len); -@@ -1802,7 +1804,7 @@ int ff_parse_mpeg2_descriptor(lives_clip_data_t *cdata - //if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4)) - //av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n"); - //} else { -- st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE); -+ st->codec->extradata = av_malloc(4 + AV_INPUT_BUFFER_PADDING_SIZE); - if (st->codec->extradata) { - st->codec->extradata_size = 4; - memcpy(st->codec->extradata, *pp, 4); -@@ -3141,8 +3143,8 @@ skip_det: - - priv->codec = codec; - -- if (codec->capabilities & CODEC_CAP_TRUNCATED) -- ctx->flags |= CODEC_FLAG_TRUNCATED; -+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) -+ ctx->flags |= AV_CODEC_FLAG_TRUNCATED; - - // re-scan with avcodec; priv->data_start holds video data start position - diff --git a/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am b/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am new file mode 100644 index 00000000000..de60be50c6f --- /dev/null +++ b/multimedia/lives/files/patch-lives-plugins_weed-plugins_Makefile.am @@ -0,0 +1,12 @@ +--- lives-plugins/weed-plugins/Makefile.am.orig 2019-04-14 20:00:14 UTC ++++ lives-plugins/weed-plugins/Makefile.am +@@ -85,7 +85,8 @@ endif + + if HAVE_OPENCV + farneback_analyser_libs = farneback_analyser.la +-farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video ++farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS_ONLY_OTHER) -lopencv_core -lopencv_video ++farneback_analyser_la_CXXFLAGS = $(OPENCV_CFLAGS) + farneback_analyser_la_CPPFLAGS = $(AM_CPPFLAGS) + farneback_analyser_la_SOURCES = farneback_analyser.cpp + diff --git a/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am b/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am new file mode 100644 index 00000000000..36402bed045 --- /dev/null +++ b/multimedia/lives/files/patch-lives-plugins_weed-plugins_gdk_Makefile.am @@ -0,0 +1,13 @@ +--- lives-plugins/weed-plugins/gdk/Makefile.am.orig 2019-04-15 10:55:37 UTC ++++ lives-plugins/weed-plugins/gdk/Makefile.am +@@ -59,8 +59,8 @@ EXTRA_DIST=data icons + + install-data-local: + mkdir -p "$(DESTDIR)$(fxpluginslibdir)" +- cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data/" +- cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons/" ++ cp -rf data "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data" ++ cp -rf icons "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons" + $(MAKE) -i install-data-local-remove-vcs-files + + install-data-local-remove-vcs-files: diff --git a/multimedia/lives/pkg-plist b/multimedia/lives/pkg-plist index 39bb88b783f..0279b634115 100644 --- a/multimedia/lives/pkg-plist +++ b/multimedia/lives/pkg-plist @@ -76,11 +76,6 @@ lib/lives/plugins/effects/realtime/weed/ccorrect.so lib/lives/plugins/effects/realtime/weed/colorkey.so lib/lives/plugins/effects/realtime/weed/comic.so lib/lives/plugins/effects/realtime/weed/compositor.so -lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/examples.txt -lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/modulations.txt -lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/newlives.txt -lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/regrlives.txt -lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/roselives.txt lib/lives/plugins/effects/realtime/weed/data_processor.so lib/lives/plugins/effects/realtime/weed/data_unpacker.so lib/lives/plugins/effects/realtime/weed/deinterlace.so @@ -88,8 +83,13 @@ lib/lives/plugins/effects/realtime/weed/edge.so lib/lives/plugins/effects/realtime/weed/farneback_analyser.so lib/lives/plugins/effects/realtime/weed/fg_bg_removal.so lib/lives/plugins/effects/realtime/weed/fireTV.so -lib/lives/plugins/effects/realtime/weed/fourKlives.so %%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.so +lib/lives/plugins/effects/realtime/weed/fourKlives.so +lib/lives/plugins/effects/realtime/weed/fourKlives/songs/examples.txt +lib/lives/plugins/effects/realtime/weed/fourKlives/songs/modulations.txt +lib/lives/plugins/effects/realtime/weed/fourKlives/songs/newlives.txt +lib/lives/plugins/effects/realtime/weed/fourKlives/songs/regrlives.txt +lib/lives/plugins/effects/realtime/weed/fourKlives/songs/roselives.txt lib/lives/plugins/effects/realtime/weed/gdk_fast_resize.so lib/lives/plugins/effects/realtime/weed/haar_analyser.so lib/lives/plugins/effects/realtime/weed/haip.so @@ -200,12 +200,12 @@ lib/lives/plugins/encoders/x264_encoder lib/lives/plugins/playback/audiostream/audiostreamer.pl lib/lives/plugins/playback/video/SDL.so lib/lives/plugins/playback/video/icecast_output.so -lib/lives/plugins/playback/video/lives2lives_stream.so lib/lives/plugins/playback/video/libav_stream.so +lib/lives/plugins/playback/video/lives2lives_stream.so lib/lives/plugins/playback/video/oggstream.so lib/lives/plugins/playback/video/openGL.so lib/lives/plugins/playback/video/vloopback.so -lib/lives/plugins/playback/video/vloopback2.so +%%V4L%%lib/lives/plugins/playback/video/vloopback2.so lib/lives/plugins/playback/video/yuv4mpeg_stream.so libdata/pkgconfig/libweed-compat.pc libdata/pkgconfig/libweed-plugin.pc @@ -214,13 +214,6 @@ libdata/pkgconfig/libweed.pc libdata/pkgconfig/libweed_slice.pc share/app-install/icons/lives.png share/applications/LiVES.desktop -share/icons/hicolor/128x128/apps/lives.png -share/icons/hicolor/16x16/apps/lives.png -share/icons/hicolor/22x22/apps/lives.png -share/icons/hicolor/256x256/apps/lives.png -share/icons/hicolor/32x32/apps/lives.png -share/icons/hicolor/64x64/apps/lives.png -share/pixmaps/lives.png %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -231,11 +224,18 @@ share/pixmaps/lives.png %%PORTDOCS%%%%DOCSDIR%%/README.multi_encoder %%PORTDOCS%%%%DOCSDIR%%/RFX.spec %%PORTDOCS%%%%DOCSDIR%%/clip_format.txt +%%PORTDOCS%%%%DOCSDIR%%/c++-bindings.odt %%PORTDOCS%%%%DOCSDIR%%/lives-OMC.txt %%PORTDOCS%%%%DOCSDIR%%/rfxbuilder.odt %%PORTDOCS%%%%DOCSDIR%%/weedevents.txt %%PORTDOCS%%%%DOCSDIR%%/weedspec.txt +share/icons/hicolor/128x128/apps/lives.png +share/icons/hicolor/16x16/apps/lives.png +share/icons/hicolor/22x22/apps/lives.png +share/icons/hicolor/256x256/apps/lives.png +share/icons/hicolor/32x32/apps/lives.png share/icons/hicolor/48x48/apps/lives.png +share/icons/hicolor/64x64/apps/lives.png %%DATADIR%%/default.keymap %%DATADIR%%/icons/audio.png %%DATADIR%%/icons/fullscreen.png @@ -372,6 +372,8 @@ share/icons/hicolor/48x48/apps/lives.png %%NLS%%share/locale/uk/LC_MESSAGES/lives.mo %%NLS%%share/locale/uz/LC_MESSAGES/lives.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/lives.mo +share/pixmaps/lives.png share/pixmaps/lives.xpm -@dir %%DATADIR%%/devicemaps +@dir lib/lives/plugins/effects/realtime/weed/data @dir lib/lives/plugins/effects/realtime/weed/icons +@dir %%DATADIR%%/devicemaps diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index ce185fdb45d..17552d6f052 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -4,7 +4,7 @@ PORTNAME= mythtv DISTVERSIONPREFIX= v DISTVERSION= 30.0 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH= 1 CATEGORIES= multimedia @@ -101,8 +101,8 @@ DATADIR= ${PREFIX}/share/mythtv SUB_FILES= pkg-message .endif -OPTIONS_DEFINE= BINDINGS JACK LIRC MYSQL PULSEAUDIO VDPAU -OPTIONS_DEFAULT= BINDINGS VDPAU +OPTIONS_DEFINE= BINDINGS HDHOMERUN JACK LIRC MYSQL PULSEAUDIO VDPAU +OPTIONS_DEFAULT= BINDINGS HDHOMERUN VDPAU OPTIONS_SUB= yes BINDINGS_DESC= Perl and Python bindings @@ -133,6 +133,10 @@ BINDINGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb BINDINGS_CONFIGURE_ON= --python=${PYTHON_CMD} BINDINGS_CONFIGURE_OFF= --without-bindings=perl,python +HDHOMERUN_DESC= Native support for HDHomeRun network tuners +HDHOMERUN_LIB_DEPENDS= libhdhomerun.so:multimedia/libhdhomerun +HDHOMERUN_CONFIGURE_OFF= --disable-hdhomerun + JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ON= --enable-audio-jack --enable-indev=jack JACK_CONFIGURE_OFF= --disable-audio-jack --disable-indev=jack diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile index ea7d7ef57d4..578c2a1a2c0 100644 --- a/multimedia/rav1e/Makefile +++ b/multimedia/rav1e/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rav1e -PORTVERSION= s20190902 +PORTVERSION= s20190906 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -16,19 +16,20 @@ BUILD_DEPENDS_amd64= nasm:devel/nasm USES= cargo USE_GITHUB= yes GH_ACCOUNT= xiph -GH_TAGNAME= b9975f82 +GH_TAGNAME= f39b1d75 PLIST_FILES= bin/${PORTNAME} CARGO_CRATES= adler32-1.0.3 \ aho-corasick-0.7.6 \ ansi_term-0.11.0 \ aom-sys-0.1.2 \ + arbitrary-0.2.0 \ arc-swap-0.4.2 \ arg_enum_proc_macro-0.3.0 \ arrayvec-0.4.11 \ atty-0.2.13 \ autocfg-0.1.6 \ - backtrace-0.3.35 \ + backtrace-0.3.37 \ backtrace-sys-0.1.31 \ better-panic-0.1.2 \ bincode-1.1.4 \ @@ -36,14 +37,13 @@ CARGO_CRATES= adler32-1.0.3 \ bitflags-1.1.0 \ bitstream-io-0.8.4 \ bstr-0.2.8 \ - bumpalo-2.6.0 \ byteorder-1.3.2 \ c2-chacha-0.2.2 \ cast-0.2.2 \ - cc-1.0.41 \ + cc-1.0.42 \ cexpr-0.3.5 \ cfg-if-0.1.9 \ - chrono-0.4.8 \ + chrono-0.4.9 \ clang-sys-0.28.1 \ clap-2.33.0 \ clicolors-control-1.0.1 \ @@ -72,7 +72,7 @@ CARGO_CRATES= adler32-1.0.3 \ failure_derive-0.1.5 \ fuchsia-cprng-0.1.1 \ fxhash-0.2.1 \ - getrandom-0.1.11 \ + getrandom-0.1.12 \ gif-0.10.2 \ glob-0.3.0 \ humantime-1.2.0 \ @@ -82,7 +82,6 @@ CARGO_CRATES= adler32-1.0.3 \ itertools-0.8.0 \ itoa-0.4.4 \ jpeg-decoder-0.1.16 \ - js-sys-0.3.27 \ lazy_static-1.4.0 \ libc-0.2.62 \ libloading-0.5.2 \ @@ -131,7 +130,7 @@ CARGO_CRATES= adler32-1.0.3 \ redox_syscall-0.1.56 \ regex-1.1.9 \ regex-automata-0.1.8 \ - regex-syntax-0.6.11 \ + regex-syntax-0.6.12 \ rustc-demangle-0.1.16 \ rustc_version-0.2.3 \ ryu-1.0.0 \ @@ -168,12 +167,7 @@ CARGO_CRATES= adler32-1.0.3 \ vergen-3.0.4 \ version_check-0.1.5 \ walkdir-2.2.9 \ - wasi-0.5.0 \ - wasm-bindgen-0.2.50 \ - wasm-bindgen-backend-0.2.50 \ - wasm-bindgen-macro-0.2.50 \ - wasm-bindgen-macro-support-0.2.50 \ - wasm-bindgen-shared-0.2.50 \ + wasi-0.7.0 \ which-2.0.1 \ winapi-0.3.8 \ winapi-i686-pc-windows-gnu-0.4.0 \ diff --git a/multimedia/rav1e/distinfo b/multimedia/rav1e/distinfo index 0b155a19692..121f48bd8a9 100644 --- a/multimedia/rav1e/distinfo +++ b/multimedia/rav1e/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1567139421 +TIMESTAMP = 1567800181 SHA256 (rust/crates/adler32-1.0.3.tar.gz) = 7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c SIZE (rust/crates/adler32-1.0.3.tar.gz) = 5734 SHA256 (rust/crates/aho-corasick-0.7.6.tar.gz) = 58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d @@ -7,6 +7,8 @@ SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db238 SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 SHA256 (rust/crates/aom-sys-0.1.2.tar.gz) = 9d12f80222f2f70f5d16c8c0986f393f4638feba82af2a9700c9616fc9ea2a31 SIZE (rust/crates/aom-sys-0.1.2.tar.gz) = 3047 +SHA256 (rust/crates/arbitrary-0.2.0.tar.gz) = 64cf76cb6e2222ed0ea86b2b0ee2f71c96ec6edd5af42e84d59160e91b836ec4 +SIZE (rust/crates/arbitrary-0.2.0.tar.gz) = 4743 SHA256 (rust/crates/arc-swap-0.4.2.tar.gz) = 854ede29f7a0ce90519fb2439d030320c6201119b87dab0ee96044603e1130b9 SIZE (rust/crates/arc-swap-0.4.2.tar.gz) = 48148 SHA256 (rust/crates/arg_enum_proc_macro-0.3.0.tar.gz) = 9bc19845baa31d32d189d8020bc8d76bf735e4587c9eba9cf561003ba4c93908 @@ -17,8 +19,8 @@ SHA256 (rust/crates/atty-0.2.13.tar.gz) = 1803c647a3ec87095e7ae7acfca019e98de5ec SIZE (rust/crates/atty-0.2.13.tar.gz) = 4764 SHA256 (rust/crates/autocfg-0.1.6.tar.gz) = b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875 SIZE (rust/crates/autocfg-0.1.6.tar.gz) = 11439 -SHA256 (rust/crates/backtrace-0.3.35.tar.gz) = 1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55 -SIZE (rust/crates/backtrace-0.3.35.tar.gz) = 60047 +SHA256 (rust/crates/backtrace-0.3.37.tar.gz) = 5180c5a20655b14a819b652fd2378fa5f1697b6c9ddad3e695c2f9cedf6df4e2 +SIZE (rust/crates/backtrace-0.3.37.tar.gz) = 67955 SHA256 (rust/crates/backtrace-sys-0.1.31.tar.gz) = 82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b SIZE (rust/crates/backtrace-sys-0.1.31.tar.gz) = 518877 SHA256 (rust/crates/better-panic-0.1.2.tar.gz) = 64714970eb2081691f85a923b78a490fd7c3e256dcc83c7a5177314586563356 @@ -33,22 +35,20 @@ SHA256 (rust/crates/bitstream-io-0.8.4.tar.gz) = 395bab683d996399e6046dbea0f7e61 SIZE (rust/crates/bitstream-io-0.8.4.tar.gz) = 22256 SHA256 (rust/crates/bstr-0.2.8.tar.gz) = 8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245 SIZE (rust/crates/bstr-0.2.8.tar.gz) = 337654 -SHA256 (rust/crates/bumpalo-2.6.0.tar.gz) = ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708 -SIZE (rust/crates/bumpalo-2.6.0.tar.gz) = 124915 SHA256 (rust/crates/byteorder-1.3.2.tar.gz) = a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5 SIZE (rust/crates/byteorder-1.3.2.tar.gz) = 21596 SHA256 (rust/crates/c2-chacha-0.2.2.tar.gz) = 7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101 SIZE (rust/crates/c2-chacha-0.2.2.tar.gz) = 13766 SHA256 (rust/crates/cast-0.2.2.tar.gz) = 926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427 SIZE (rust/crates/cast-0.2.2.tar.gz) = 10318 -SHA256 (rust/crates/cc-1.0.41.tar.gz) = 8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff -SIZE (rust/crates/cc-1.0.41.tar.gz) = 48185 +SHA256 (rust/crates/cc-1.0.42.tar.gz) = a61c7bce55cd2fae6ec8cb935ebd76256c2959a1f95790f6118a441c2cd5b406 +SIZE (rust/crates/cc-1.0.42.tar.gz) = 49868 SHA256 (rust/crates/cexpr-0.3.5.tar.gz) = a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af SIZE (rust/crates/cexpr-0.3.5.tar.gz) = 16938 SHA256 (rust/crates/cfg-if-0.1.9.tar.gz) = b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33 SIZE (rust/crates/cfg-if-0.1.9.tar.gz) = 7353 -SHA256 (rust/crates/chrono-0.4.8.tar.gz) = 27429a03ca54100bf6bdc726c09adc46a74187ac93f9ce96dc7aaa9594ebf707 -SIZE (rust/crates/chrono-0.4.8.tar.gz) = 133542 +SHA256 (rust/crates/chrono-0.4.9.tar.gz) = e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68 +SIZE (rust/crates/chrono-0.4.9.tar.gz) = 133671 SHA256 (rust/crates/clang-sys-0.28.1.tar.gz) = 81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853 SIZE (rust/crates/clang-sys-0.28.1.tar.gz) = 34180 SHA256 (rust/crates/clap-2.33.0.tar.gz) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9 @@ -105,8 +105,8 @@ SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5 SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950 SHA256 (rust/crates/fxhash-0.2.1.tar.gz) = c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c SIZE (rust/crates/fxhash-0.2.1.tar.gz) = 4102 -SHA256 (rust/crates/getrandom-0.1.11.tar.gz) = fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872 -SIZE (rust/crates/getrandom-0.1.11.tar.gz) = 23699 +SHA256 (rust/crates/getrandom-0.1.12.tar.gz) = 473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571 +SIZE (rust/crates/getrandom-0.1.12.tar.gz) = 23809 SHA256 (rust/crates/gif-0.10.2.tar.gz) = 86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568 SIZE (rust/crates/gif-0.10.2.tar.gz) = 25307 SHA256 (rust/crates/glob-0.3.0.tar.gz) = 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574 @@ -125,8 +125,6 @@ SHA256 (rust/crates/itoa-0.4.4.tar.gz) = 501266b7edd0174f8530248f87f99c88fbe60ca SIZE (rust/crates/itoa-0.4.4.tar.gz) = 11147 SHA256 (rust/crates/jpeg-decoder-0.1.16.tar.gz) = c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba SIZE (rust/crates/jpeg-decoder-0.1.16.tar.gz) = 32542 -SHA256 (rust/crates/js-sys-0.3.27.tar.gz) = 1efc4f2a556c58e79c5500912e221dd826bec64ff4aabd8ce71ccef6da02d7d4 -SIZE (rust/crates/js-sys-0.3.27.tar.gz) = 59423 SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443 SHA256 (rust/crates/libc-0.2.62.tar.gz) = 34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba @@ -223,8 +221,8 @@ SHA256 (rust/crates/regex-1.1.9.tar.gz) = d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56 SIZE (rust/crates/regex-1.1.9.tar.gz) = 246517 SHA256 (rust/crates/regex-automata-0.1.8.tar.gz) = 92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9 SIZE (rust/crates/regex-automata-0.1.8.tar.gz) = 92234 -SHA256 (rust/crates/regex-syntax-0.6.11.tar.gz) = b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f -SIZE (rust/crates/regex-syntax-0.6.11.tar.gz) = 283238 +SHA256 (rust/crates/regex-syntax-0.6.12.tar.gz) = 11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716 +SIZE (rust/crates/regex-syntax-0.6.12.tar.gz) = 289531 SHA256 (rust/crates/rustc-demangle-0.1.16.tar.gz) = 4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783 SIZE (rust/crates/rustc-demangle-0.1.16.tar.gz) = 19137 SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a @@ -297,18 +295,8 @@ SHA256 (rust/crates/version_check-0.1.5.tar.gz) = 914b1a6776c4c929a602fafd8bc742 SIZE (rust/crates/version_check-0.1.5.tar.gz) = 8173 SHA256 (rust/crates/walkdir-2.2.9.tar.gz) = 9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e SIZE (rust/crates/walkdir-2.2.9.tar.gz) = 22423 -SHA256 (rust/crates/wasi-0.5.0.tar.gz) = fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7 -SIZE (rust/crates/wasi-0.5.0.tar.gz) = 31104 -SHA256 (rust/crates/wasm-bindgen-0.2.50.tar.gz) = dcddca308b16cd93c2b67b126c688e5467e4ef2e28200dc7dfe4ae284f2faefc -SIZE (rust/crates/wasm-bindgen-0.2.50.tar.gz) = 144511 -SHA256 (rust/crates/wasm-bindgen-backend-0.2.50.tar.gz) = f805d9328b5fc7e5c6399960fd1889271b9b58ae17bdb2417472156cc9fafdd0 -SIZE (rust/crates/wasm-bindgen-backend-0.2.50.tar.gz) = 21115 -SHA256 (rust/crates/wasm-bindgen-macro-0.2.50.tar.gz) = 3ff88201a482abfc63921621f6cb18eb1efd74f136b05e5841e7f8ca434539e9 -SIZE (rust/crates/wasm-bindgen-macro-0.2.50.tar.gz) = 10849 -SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.50.tar.gz) = 6a433d89ecdb9f77d46fcf00c8cf9f3467b7de9954d8710c175f61e2e245bb0e -SIZE (rust/crates/wasm-bindgen-macro-support-0.2.50.tar.gz) = 16461 -SHA256 (rust/crates/wasm-bindgen-shared-0.2.50.tar.gz) = d41fc1bc3570cdf8d108c15e014045fd45a95bb5eb36605f96a90461fc34027d -SIZE (rust/crates/wasm-bindgen-shared-0.2.50.tar.gz) = 6727 +SHA256 (rust/crates/wasi-0.7.0.tar.gz) = b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d +SIZE (rust/crates/wasi-0.7.0.tar.gz) = 33941 SHA256 (rust/crates/which-2.0.1.tar.gz) = b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164 SIZE (rust/crates/which-2.0.1.tar.gz) = 6953 SHA256 (rust/crates/winapi-0.3.8.tar.gz) = 8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6 @@ -323,5 +311,5 @@ SHA256 (rust/crates/wincolor-1.0.2.tar.gz) = 96f5016b18804d24db43cebf3c77269e756 SIZE (rust/crates/wincolor-1.0.2.tar.gz) = 4821 SHA256 (rust/crates/y4m-0.3.5.tar.gz) = a2dde68bbd66d90675870b548cf0932cd06222b994223d89b49257feb4fdea05 SIZE (rust/crates/y4m-0.3.5.tar.gz) = 11339 -SHA256 (xiph-rav1e-s20190902-b9975f82_GH0.tar.gz) = 69a797282baf6a9765cf1b05b1971aef17ce2c2d8080d1e86b79e134ae6c7445 -SIZE (xiph-rav1e-s20190902-b9975f82_GH0.tar.gz) = 479192 +SHA256 (xiph-rav1e-s20190906-f39b1d75_GH0.tar.gz) = 84bb15ab7320bfd7e79c3211fd989a514202d3e1fb8189a33e58bbc38b2f1b67 +SIZE (xiph-rav1e-s20190906-f39b1d75_GH0.tar.gz) = 485884 diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile index 64002c10948..19e97225caf 100644 --- a/multimedia/svt-av1/Makefile +++ b/multimedia/svt-av1/Makefile @@ -2,8 +2,8 @@ PORTNAME= svt-av1 DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0-226 -DISTVERSIONSUFFIX= -g9a15408f +DISTVERSION= 0.6.0-277 +DISTVERSIONSUFFIX= -gb7b71ce4 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/svt-av1/distinfo b/multimedia/svt-av1/distinfo index 47d33a84ecf..f4f7cdb7fd8 100644 --- a/multimedia/svt-av1/distinfo +++ b/multimedia/svt-av1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567321367 -SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-226-g9a15408f_GH0.tar.gz) = b7c0ace66049bc42f3785049b4915cf595421c86f63e63b4314918f20ed2ab83 -SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-226-g9a15408f_GH0.tar.gz) = 2766371 +TIMESTAMP = 1567806257 +SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-277-gb7b71ce4_GH0.tar.gz) = 129ee744e8d5fd93acc7fbd229340ba6963e180e3dd1458e6e8dfda9be522fa8 +SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-277-gb7b71ce4_GH0.tar.gz) = 2796053 diff --git a/net-im/telegram-purple/Makefile b/net-im/telegram-purple/Makefile index 41a12bec213..97e8ef3256a 100644 --- a/net-im/telegram-purple/Makefile +++ b/net-im/telegram-purple/Makefile @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_armv6= fails to link: undefined reference to 'backtrace' BROKEN_sparc64= fails to compile: assertion fails -BUILD_DEPENDS= pidgin:net-im/pidgin -RUN_DEPENDS= pidgin:net-im/pidgin LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libwebp.so:graphics/webp \ libpurple.so:net-im/libpurple \ diff --git a/net-mgmt/check_mk_agent/Makefile b/net-mgmt/check_mk_agent/Makefile index 7863f372c41..62e003f54ce 100644 --- a/net-mgmt/check_mk_agent/Makefile +++ b/net-mgmt/check_mk_agent/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= check_mk_agent -DISTVERSION= 1.5.0p20 +DISTVERSION= 1.5.0p21 CATEGORIES= net-mgmt MASTER_SITES= https://mathias-kettner.de/support/${DISTVERSION}/ DISTNAME= check-mk-raw-${DISTVERSION}.cre @@ -16,7 +16,7 @@ RUN_DEPENDS= bash>0:shells/bash USES= shebangfix -SHEBANG_FILES= agents/${PORTNAME}.freebsd +SHEBANG_FILES= agents/${CHECKMK_AGENT} NO_ARCH= yes NO_BUILD= yes @@ -30,16 +30,27 @@ PORTDOCS= README.FreeBSD OPTIONS_DEFINE= DOCS +CHECKMK_AGENT= ${PORTNAME}.freebsd +CHECKMK_LIBDIR= ${LOCALBASE}/lib/check_mk_agent +CHECKMK_CONFDIR=${LOCALBASE}/etc/check_mk +CHECKMK_TMPDIR= /var/run/check_mk + post-patch: - ${REINPLACE_CMD} -E -e 's|^(export MK_CONFDIR=")|\1${PREFIX}|' \ - -e 's|/usr/local/bin/bash|${LOCALBASE}/bin/bash|g' \ - ${WRKSRC}/agents/${PORTNAME}.freebsd + @${REINPLACE_CMD} \ + -e 's|%%CHECKMK_LIBDIR%%|${CHECKMK_LIBDIR}|' \ + -e 's|%%CHECKMK_CONFDIR%%|${CHECKMK_CONFDIR}|' \ + -e 's|%%CHECKMK_TMPDIR%%|${CHECKMK_TMPDIR}|' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|%%BASH%%|${LOCALBASE}/bin/bash|' \ + ${WRKSRC}/agents/${CHECKMK_AGENT} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/agents/${PORTNAME}.freebsd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/agents/${CHECKMK_AGENT} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/agents/README.FreeBSD ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/agents/README.FreeBSD \ + ${STAGEDIR}${DOCSDIR} .include diff --git a/net-mgmt/check_mk_agent/distinfo b/net-mgmt/check_mk_agent/distinfo index 5ae51bd6076..bcd925f27af 100644 --- a/net-mgmt/check_mk_agent/distinfo +++ b/net-mgmt/check_mk_agent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564401961 -SHA256 (check-mk-raw-1.5.0p20.cre.tar.gz) = b8c4e93cb2ae8cb7040082e929adfd6f7c6f9ad95644f3a1c0f102cdbc0d1994 -SIZE (check-mk-raw-1.5.0p20.cre.tar.gz) = 386024878 +TIMESTAMP = 1567764056 +SHA256 (check-mk-raw-1.5.0p21.cre.tar.gz) = 270f5422adbbda151edf102bdd8665ff1b5ee96b2aec04a899114a5238381869 +SIZE (check-mk-raw-1.5.0p21.cre.tar.gz) = 386037040 diff --git a/net-mgmt/check_mk_agent/files/patch-agents_check__mk__agent.freebsd b/net-mgmt/check_mk_agent/files/patch-agents_check__mk__agent.freebsd new file mode 100644 index 00000000000..2dab8dfb0fb --- /dev/null +++ b/net-mgmt/check_mk_agent/files/patch-agents_check__mk__agent.freebsd @@ -0,0 +1,31 @@ +--- agents/check_mk_agent.freebsd.orig 2019-09-06 10:22:12 UTC ++++ agents/check_mk_agent.freebsd +@@ -41,15 +41,15 @@ + export LC_ALL=C + unset LANG + +-export MK_LIBDIR="/usr/local/lib/check_mk_agent" +-export MK_CONFDIR="/etc/check_mk" +-export MK_TMPDIR="/var/run/check_mk" ++export MK_LIBDIR="%%CHECKMK_LIBDIR%%" ++export MK_CONFDIR="%%CHECKMK_CONFDIR%%" ++export MK_TMPDIR="%%CHECKMK_TMPDIR%%" + + # Optionally set a tempdir for all subsequent calls + #export TMPDIR= + + # Make sure, locally installed binaries are found +-PATH=$PATH:/usr/local/bin:/usr/local/sbin ++PATH=$PATH:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin + + # All executables in PLUGINSDIR will simply be executed and their + # ouput appended to the output of the agent. Plugins define their own +@@ -102,7 +102,7 @@ function run_cached() { + + # Cache file outdated and new job not yet running? Start it + if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then +- echo "$CMDLINE" | daemon /usr/local/bin/bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & ++ echo "$CMDLINE" | daemon %%BASH%% -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & + fi + } + diff --git a/net-mgmt/check_mk_agent/files/pkg-message.in b/net-mgmt/check_mk_agent/files/pkg-message.in index a3864983d4f..e09f614b1b4 100644 --- a/net-mgmt/check_mk_agent/files/pkg-message.in +++ b/net-mgmt/check_mk_agent/files/pkg-message.in @@ -1,7 +1,7 @@ [ { type: install message: </etc/nagiosql|>${ETCDIR}|g" \ -e "s|>/etc/nagios/|>${LOCALBASE}/etc/nagios/|g" \ - ${WRKSRC}-${PORTVERSION}/install/sql/nagiosQL_v32_db_mysql.sql + ${WRKSRC}/install/sql/nagiosQL_v32_db_mysql.sql ${REINPLACE_CMD} -e "s|\"/etc/|\"${LOCALBASE}/etc/|" \ - ${WRKSRC}-${PORTVERSION}/install/install.php + ${WRKSRC}/install/install.php do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} @@ -65,6 +67,6 @@ do-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/hosts @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/services @${MKDIR} ${STAGEDIR}${ETCDIR}/backup/ssh - (cd ${WRKSRC}-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.orig -o -name *\.bak )") + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.orig -o -name *\.bak )") .include diff --git a/net-mgmt/nagiosql/distinfo b/net-mgmt/nagiosql/distinfo index a7aba7cc630..db39312cf47 100644 --- a/net-mgmt/nagiosql/distinfo +++ b/net-mgmt/nagiosql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539089848 -SHA256 (nagiosql-3.4.0.tar.bz2) = b03a8ef59785cf52ec9cce152c49198a7ae2ac14c54120740d53df834156d403 -SIZE (nagiosql-3.4.0.tar.bz2) = 1032592 +TIMESTAMP = 1567783899 +SHA256 (wizonet-nagiosql-0f1c063740b4d3dae98d74f293c53234f341b06e_GL0.tar.gz) = 6de025f9cf79c199e0a6e37df76c82f0318e11f141f1dde603a74d9b1ba0ceea +SIZE (wizonet-nagiosql-0f1c063740b4d3dae98d74f293c53234f341b06e_GL0.tar.gz) = 1466412 diff --git a/net-mgmt/nagiosql/pkg-descr b/net-mgmt/nagiosql/pkg-descr index 123218aa42b..2b95c3e41f9 100644 --- a/net-mgmt/nagiosql/pkg-descr +++ b/net-mgmt/nagiosql/pkg-descr @@ -3,4 +3,4 @@ It helps you to easily build a complex configuration with all options, manage and use them. NagiosQL is based on a webserver with PHP, MySQL and file access to the Nagios configuration files. -WWW: https://sourceforge.net/projects/nagiosql/ +WWW: https://gitlab.com/wizonet/nagiosql diff --git a/net-mgmt/nagiosql/pkg-plist b/net-mgmt/nagiosql/pkg-plist index 30dfb479ef5..dc237f1519f 100644 --- a/net-mgmt/nagiosql/pkg-plist +++ b/net-mgmt/nagiosql/pkg-plist @@ -1,3 +1,4 @@ +%%WWWDIR%%/LICENSE %%WWWDIR%%/admin.php %%WWWDIR%%/admin/administration.php %%WWWDIR%%/admin/alarming.php @@ -106,7 +107,6 @@ %%WWWDIR%%/doc/CHANGELOG %%WWWDIR%%/doc/INSTALLATION_deDE.txt %%WWWDIR%%/doc/INSTALLATION_enGB.txt -%%WWWDIR%%/doc/LICENSE %%WWWDIR%%/doc/README_SSH_KEY %%WWWDIR%%/favicon.ico %%WWWDIR%%/functions/Autoloader.php diff --git a/net-mgmt/py-ciscoconfparse/Makefile b/net-mgmt/py-ciscoconfparse/Makefile index 45a2d1e7824..4fca1648a37 100644 --- a/net-mgmt/py-ciscoconfparse/Makefile +++ b/net-mgmt/py-ciscoconfparse/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ciscoconfparse -DISTVERSION= 1.4.3 +DISTVERSION= 1.4.5 CATEGORIES= net-mgmt python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-mgmt/py-ciscoconfparse/distinfo b/net-mgmt/py-ciscoconfparse/distinfo index f53d722ebef..c59da964c62 100644 --- a/net-mgmt/py-ciscoconfparse/distinfo +++ b/net-mgmt/py-ciscoconfparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566645333 -SHA256 (ciscoconfparse-1.4.3.tar.gz) = 1ce7a137eefab4e3b69a650df6fde8b027fabacc272e201a08f57f6d0860256b -SIZE (ciscoconfparse-1.4.3.tar.gz) = 127472 +TIMESTAMP = 1567933659 +SHA256 (ciscoconfparse-1.4.5.tar.gz) = 7c72b749830858b8b5a6c7424ce48e21bd5d9e504330a96593b682d3db4d2cbe +SIZE (ciscoconfparse-1.4.5.tar.gz) = 127507 diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index d62117a7a5b..9d6b0a467de 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= xymon -PORTVERSION= 4.3.28 -PORTREVISION= 1 +PORTVERSION= 4.3.29 +PORTREVISION= 0 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo index 876a584cc45..2359623f2f9 100644 --- a/net-mgmt/xymon-server/distinfo +++ b/net-mgmt/xymon-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487036734 -SHA256 (repacked/xymon-4.3.28.tar.gz) = 68cb33eb48d1bb212a1bbafd9fdea8c682ae1b69077cd5fb03676e0af39cbf80 -SIZE (repacked/xymon-4.3.28.tar.gz) = 3966200 +TIMESTAMP = 1565901233 +SHA256 (repacked/xymon-4.3.29.tar.gz) = 89bcb6c7a4325c8bcaa5c1f3de238c444f2731b04b0cb0348b88add89396c659 +SIZE (repacked/xymon-4.3.29.tar.gz) = 3548283 diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile index 032f8735262..c51e21b2922 100644 --- a/net/asterisk13/Makefile +++ b/net/asterisk13/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.28.0 -PORTREVISION= 1 +PORTVERSION= 13.28.1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo index 27b30a5c9a3..9b876aabe8d 100644 --- a/net/asterisk13/distinfo +++ b/net/asterisk13/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1564063394 -SHA256 (asterisk/asterisk-13.28.0.tar.gz) = 3f4fdfe00fd2fe179db6bd85502e97b75403a2570d1b05674b855bfa2046c709 -SIZE (asterisk/asterisk-13.28.0.tar.gz) = 33042129 +TIMESTAMP = 1567756426 +SHA256 (asterisk/asterisk-13.28.1.tar.gz) = 54b461dcbe3d2423ea7f579a1b3d0033d59fae11e5b3ae3926ec3851e12464f5 +SIZE (asterisk/asterisk-13.28.1.tar.gz) = 33039131 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 diff --git a/net/asterisk15/Makefile b/net/asterisk15/Makefile index 7c6ea617e6f..5edd2aa02ef 100644 --- a/net/asterisk15/Makefile +++ b/net/asterisk15/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 15.7.3 -PORTREVISION= 1 +PORTVERSION= 15.7.4 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ diff --git a/net/asterisk15/distinfo b/net/asterisk15/distinfo index 9d2c06c9414..70821293030 100644 --- a/net/asterisk15/distinfo +++ b/net/asterisk15/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1562918569 -SHA256 (asterisk/asterisk-15.7.3.tar.gz) = 6f9a9a9d218acc092be13b5980803d4f0832a3704f4e18c413097c11c3c1815c -SIZE (asterisk/asterisk-15.7.3.tar.gz) = 27592110 +TIMESTAMP = 1567756640 +SHA256 (asterisk/asterisk-15.7.4.tar.gz) = fd5415bde9e58874f52fbd7fde5cbcbdbdff1626f415a10220478396873b435f +SIZE (asterisk/asterisk-15.7.4.tar.gz) = 27592178 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 diff --git a/net/drive/Makefile b/net/drive/Makefile index 8f0a966cee5..6e7a56ed088 100644 --- a/net/drive/Makefile +++ b/net/drive/Makefile @@ -4,7 +4,7 @@ PORTNAME= drive PORTVERSION= 0.3.9.1 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MAINTAINER= sunpoet@FreeBSD.org @@ -21,24 +21,28 @@ GO_TARGET= ${GO_PKGNAME}/cmd/${GH_PROJECT} PLIST_FILES= bin/drive GH_ACCOUNT= odeke-em +GH_TAGNAME= b868c96 GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/../src/github.com/boltdb/bolt \ - census-instrumentation:opencensus-go:v0.21.0:census_instrumentation_opencensus/../src/go.opencensus.io \ + census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/../src/go.opencensus.io \ cheggaaa:pb:v1.0.28:cheggaaa_pb/../src/github.com/cheggaaa/pb \ fatih:color:v1.7.0:fatih_color/../src/github.com/fatih/color \ - golang:crypto:22d7a77:golang_crypto/../src/golang.org/x/crypto \ - golang:net:3ec1911:golang_net/../src/golang.org/x/net \ - golang:oauth2:950ef44:golang_oauth2/../src/golang.org/x/oauth2 \ - golang:protobuf:v1.3.1:golang_protobuf/../src/github.com/golang/protobuf \ - golang:sys:61b9204:golang_sys/../src/golang.org/x/sys \ - golang:text:342b2e1:golang_text/../src/golang.org/x/text \ - google:go-genproto:bb713bd:google_go_genproto/../src/google.golang.org/genproto \ - google:google-api-go-client:v0.5.0:google_googleapigoclient/../src/google.golang.org/api \ - googleapis:google-cloud-go:v0.39.0:googleapis_googlecloudgo/../src/cloud.google.com/go \ - grpc:grpc-go:v1.20.1:grpc_grpc_go/../src/google.golang.org/grpc \ - hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/../src/github.com/hashicorp/golang-lru \ - mattn:go-colorable:v0.1.1:mattn_gocolorable/../src/github.com/mattn/go-colorable \ - mattn:go-isatty:v0.0.7:mattn_goisatty/../src/github.com/mattn/go-isatty \ + golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \ + golang:groupcache:869f871:golang_groupcache/../src/github.com/golang/groupcache \ + golang:net:ba9fcec:golang_net/../src/golang.org/x/net \ + golang:oauth2:0f29369:golang_oauth2/../src/golang.org/x/oauth2 \ + golang:protobuf:v1.3.2:golang_protobuf/../src/github.com/golang/protobuf \ + golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \ + golang:text:3d0f797:golang_text/../src/golang.org/x/text \ + google:go-genproto:92dd089:google_go_genproto/../src/google.golang.org/genproto \ + google:google-api-go-client:v0.10.0:google_googleapigoclient/../src/google.golang.org/api \ + googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/../src/cloud.google.com/go \ + googleapis:gax-go:v2.0.5:googleapis_gaxgo/../src/github.com/googleapis/gax-go \ + grpc:grpc-go:v1.23.0:grpc_grpc_go/../src/google.golang.org/grpc \ + hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/../src/github.com/hashicorp/golang-lru \ + mattn:go-colorable:v0.1.2:mattn_gocolorable/../src/github.com/mattn/go-colorable \ + mattn:go-isatty:v0.0.9:mattn_goisatty/../src/github.com/mattn/go-isatty \ mattn:go-runewidth:v0.0.4:mattn_gorunewidth/../src/github.com/mattn/go-runewidth \ + mxk:go-flowrate:cca7078:mxk_goflowrate/../src/github.com/mxk/go-flowrate \ odeke-em:cache:baf8e43:odekeem_cache/../src/github.com/odeke-em/cache \ odeke-em:cli-spinner:610063b:odekeem_clispinner/../src/github.com/odeke-em/cli-spinner \ odeke-em:command:91ca5ec:odekeem_command/../src/github.com/odeke-em/command \ diff --git a/net/drive/distinfo b/net/drive/distinfo index d3010c75928..a9b88bf93dc 100644 --- a/net/drive/distinfo +++ b/net/drive/distinfo @@ -1,42 +1,48 @@ -TIMESTAMP = 1558169627 -SHA256 (odeke-em-drive-v0.3.9.1_GH0.tar.gz) = 562958e336d2f52a34443fc8fbf59d9d2a2467b2bf4592a1d78dc009ade661a7 -SIZE (odeke-em-drive-v0.3.9.1_GH0.tar.gz) = 333217 +TIMESTAMP = 1567842452 +SHA256 (odeke-em-drive-v0.3.9.1-b868c96_GH0.tar.gz) = 9eb1434411d33499ead89be136678d5bdffc83589c9c2aa7ad21399c79f1f65e +SIZE (odeke-em-drive-v0.3.9.1-b868c96_GH0.tar.gz) = 336998 SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8 SIZE (boltdb-bolt-v1.3.1_GH0.tar.gz) = 83437 -SHA256 (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = e7129aebb9bcb590f01b4fb773b6cf0b10109211cb38cfbaf1f097d191043251 -SIZE (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = 161522 +SHA256 (census-instrumentation-opencensus-go-v0.22.1_GH0.tar.gz) = b6d9b5921b69f34812a466bfa871b456ae8d59d061f6ef29d14909725dc3816d +SIZE (census-instrumentation-opencensus-go-v0.22.1_GH0.tar.gz) = 163042 SHA256 (cheggaaa-pb-v1.0.28_GH0.tar.gz) = f745c5636d3fb59bffab5f9d2a745a94a9608166c20c90936fc66848a5e816e6 SIZE (cheggaaa-pb-v1.0.28_GH0.tar.gz) = 11788 SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755 SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449 -SHA256 (golang-crypto-22d7a77_GH0.tar.gz) = f4841ec4826e71e428a300f2c4990382a68e5a9890876b18f360b3c47404198d -SIZE (golang-crypto-22d7a77_GH0.tar.gz) = 1685051 -SHA256 (golang-net-3ec1911_GH0.tar.gz) = ad1bbf37e8a125a3f989e9f1fbf7f7561a3f275f04baacd9f336367d9fc999c6 -SIZE (golang-net-3ec1911_GH0.tar.gz) = 1096221 -SHA256 (golang-oauth2-950ef44_GH0.tar.gz) = 1b8de4d4502640b84ecc10dc477c281fd3df09609c93a6b9f86693eea9844b8a -SIZE (golang-oauth2-950ef44_GH0.tar.gz) = 45310 -SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf -SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884 -SHA256 (golang-sys-61b9204_GH0.tar.gz) = a73df35a8c64cf371fda32e00519f15614f4dd5f26cd85d7a4598fa80d51d052 -SIZE (golang-sys-61b9204_GH0.tar.gz) = 1418673 -SHA256 (golang-text-342b2e1_GH0.tar.gz) = ee7a5a3208158692a6fb5b6a54c920cc167da399223a335b3bc2141a43b61a82 -SIZE (golang-text-342b2e1_GH0.tar.gz) = 7168276 -SHA256 (google-go-genproto-bb713bd_GH0.tar.gz) = c924b642e5d971aa1376091a8ec4ac54419b0fda793df0185d970722cf18d680 -SIZE (google-go-genproto-bb713bd_GH0.tar.gz) = 4027286 -SHA256 (google-google-api-go-client-v0.5.0_GH0.tar.gz) = 518691b284fc806ae4fda9dc2d8eb2ce6f9d26bbb5e512b3e0e09604e5b4e0db -SIZE (google-google-api-go-client-v0.5.0_GH0.tar.gz) = 11905507 -SHA256 (googleapis-google-cloud-go-v0.39.0_GH0.tar.gz) = f88613524248130c58c30ddbcc6605d234abae02d96e896f9a683a16431776c7 -SIZE (googleapis-google-cloud-go-v0.39.0_GH0.tar.gz) = 2058540 -SHA256 (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 109f4389cb22f2293a9640a3dd8d3a6d837985615353025c33c7d2923409c8ac -SIZE (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 707599 -SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e -SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982 -SHA256 (mattn-go-colorable-v0.1.1_GH0.tar.gz) = 41773345d2a1037a37942b96e04a8ed5248f19a8f43a7ba26aa16a7b74132647 -SIZE (mattn-go-colorable-v0.1.1_GH0.tar.gz) = 8518 -SHA256 (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 80b6b3e4fee3b15864f23d622129c17ba222786f8c93bb01f8805f3cb91dfefe -SIZE (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 3559 +SHA256 (golang-crypto-71b5226_GH0.tar.gz) = 7ab66566a1792bf53b26474bf023d0607e59158af6a1321d94c56de433cb083b +SIZE (golang-crypto-71b5226_GH0.tar.gz) = 1693011 +SHA256 (golang-groupcache-869f871_GH0.tar.gz) = 8bc5d766826b73623d030cc6b263e371ca6ba58a9a6d7b24f66bee9438d6f6f3 +SIZE (golang-groupcache-869f871_GH0.tar.gz) = 26040 +SHA256 (golang-net-ba9fcec_GH0.tar.gz) = fa35ccfabf7e364a85bfe7ba6e8cb9f5a928e1018ba50a814fa61d6209e02c95 +SIZE (golang-net-ba9fcec_GH0.tar.gz) = 1099861 +SHA256 (golang-oauth2-0f29369_GH0.tar.gz) = 0b2093495f3f8e2938b829c07e768918004b92f8a4d2b5c23fe7de0069821652 +SIZE (golang-oauth2-0f29369_GH0.tar.gz) = 45469 +SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 +SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 +SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8 +SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012 +SHA256 (golang-text-3d0f797_GH0.tar.gz) = d5cbfc9ac93211708e336c9129947b1f4146ed402b6cd624732e36838e1df4e9 +SIZE (golang-text-3d0f797_GH0.tar.gz) = 7168341 +SHA256 (google-go-genproto-92dd089_GH0.tar.gz) = ef461a9e28ad218157df21cb2c45cede4f33bc941e981b0231525a785a9ffac0 +SIZE (google-go-genproto-92dd089_GH0.tar.gz) = 5337280 +SHA256 (google-google-api-go-client-v0.10.0_GH0.tar.gz) = b867beedfc2eaa7623f620c15976adea1413f759149be122a07619d230131c78 +SIZE (google-google-api-go-client-v0.10.0_GH0.tar.gz) = 12432495 +SHA256 (googleapis-google-cloud-go-v0.45.1_GH0.tar.gz) = c9dc5b89e9b9a337e65f48887e35769f34759ea923f8ca6abc7b0a2c0d61eb08 +SIZE (googleapis-google-cloud-go-v0.45.1_GH0.tar.gz) = 2254762 +SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c +SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328 +SHA256 (grpc-grpc-go-v1.23.0_GH0.tar.gz) = 2dc453fc20178f196ac5853040d3838df741a50461f29c3e2c429bd92f739568 +SIZE (grpc-grpc-go-v1.23.0_GH0.tar.gz) = 747448 +SHA256 (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = dd98197fc84fbf636b6811ff3c14ef1ea0fe732fe782b8034cf082b3ff274af3 +SIZE (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = 13348 +SHA256 (mattn-go-colorable-v0.1.2_GH0.tar.gz) = a7189bd9005c571303b117261955ce53b0e2aa89fe415e2289659be343fe1651 +SIZE (mattn-go-colorable-v0.1.2_GH0.tar.gz) = 8518 +SHA256 (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 71d57a3fb3f990a5a5d1e190ae5112a8aca2fcdda9eb42770bd524076e8f371f +SIZE (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 3904 SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827 +SHA256 (mxk-go-flowrate-cca7078_GH0.tar.gz) = 84e6a0e300ec4c76c7d67cb9a72d1cdd13c7a6e48902cb41c29554bcd4ef0362 +SIZE (mxk-go-flowrate-cca7078_GH0.tar.gz) = 6978 SHA256 (odeke-em-cache-baf8e43_GH0.tar.gz) = d7c03cde117153c8f28b495167cfbef88f5878e6e477841f54040d6848d6be87 SIZE (odeke-em-cache-baf8e43_GH0.tar.gz) = 3520 SHA256 (odeke-em-cli-spinner-610063b_GH0.tar.gz) = f0c410d12412653e8faa98589241567cebf4ba36bbab82d7a754e691e5622c22 diff --git a/net/madonctl/Makefile b/net/madonctl/Makefile index 2998df57eb3..4585b4a8517 100644 --- a/net/madonctl/Makefile +++ b/net/madonctl/Makefile @@ -4,7 +4,7 @@ PORTNAME= madonctl PORTVERSION= 2.3.1 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MAINTAINER= sunpoet@FreeBSD.org @@ -13,39 +13,40 @@ COMMENT= CLI client for the Mastodon social network API LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go +USES= go:modules -GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} +#GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} PLIST_FILES= bin/madonctl GH_ACCOUNT= McKael -GH_TUPLE= McKael:madon:v2.3.0:McKael_madon/../src/github.com/McKael/madon \ - fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/../src/github.com/fsnotify/fsnotify \ - ghodss:yaml:v1.0.0:ghodss_yaml/../src/github.com/ghodss/yaml \ - go-yaml:yaml:v2.2.2:goyaml_yaml/../src/gopkg.in/yaml.v2 \ - golang:net:3ec1911:golang_net/../src/golang.org/x/net \ - golang:oauth2:950ef44:golang_oauth2/../src/golang.org/x/oauth2 \ - golang:sys:61b9204:golang_sys/../src/golang.org/x/sys \ - golang:text:342b2e1:golang_text/../src/golang.org/x/text \ - gorilla:websocket:v1.4.0:gorilla_websocket/../src/github.com/gorilla/websocket \ - hashicorp:hcl:v1.0.0:hashicorp_hcl/../src/github.com/hashicorp/hcl \ - kr:text:v0.1.0:kr_text/../src/github.com/kr/text \ - magiconair:properties:v1.8.1:magiconair_properties/../src/github.com/magiconair/properties \ - mattn:go:go1.9.1:imattn_go/../src/github.com/mattn/go \ - mattn:go-isatty:v0.0.7:mattn_goisatty/../src/github.com/mattn/go-isatty \ - mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/../src/github.com/mitchellh/mapstructure \ - pelletier:go-toml:v1.4.0:pelletier_gotoml/../src/github.com/pelletier/go-toml \ - pkg:errors:v0.8.1:pkg_errors/../src/github.com/pkg/errors \ - sendgrid:rest:v2.4.1:sendgrid_rest/../src/github.com/sendgrid/rest \ - sgoertzen:html2text:491ddf8:sgoertzen_html2text/../src/github.com/sgoertzen/html2text \ - spf13:afero:v1.2.2:spf13_afero/../src/github.com/spf13/afero \ - spf13:cast:v1.3.0:spf13_cast/../src/github.com/spf13/cast \ - spf13:cobra:v0.0.3:spf13_cobra/../src/github.com/spf13/cobra \ - spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/../src/github.com/spf13/jwalterweatherman \ - spf13:pflag:v1.0.3:spf13_pflag/../src/github.com/spf13/pflag \ - spf13:viper:v1.3.2:spf13_viper/../src/github.com/spf13/viper \ - stretchr:testify:v1.3.0:stretchr_testify/../src/github.com/stretchr/testify +GH_TAGNAME= b936445 +GH_TUPLE= McKael:madon:v2.3.0:McKael_madon/vendor/github.com/McKael/madon/v2 \ + fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \ + ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \ + go-yaml:yaml:v2.2.2:goyaml_yaml/vendor/gopkg.in/yaml.v2 \ + golang:net:ba9fcec:golang_net/vendor/golang.org/x/net \ + golang:oauth2:0f29369:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \ + golang:text:3d0f797:golang_text/vendor/golang.org/x/text \ + gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \ + hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ + kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \ + magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \ + mattn:go:go1.9.1:imattn_go/vendor/github.com/mattn/go \ + mattn:go-isatty:v0.0.9:mattn_goisatty/vendor/github.com/mattn/go-isatty \ + mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ + pelletier:go-toml:v1.4.0:pelletier_gotoml/vendor/github.com/pelletier/go-toml \ + pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ + sendgrid:rest:v2.4.1:sendgrid_rest/vendor/github.com/sendgrid/rest \ + sgoertzen:html2text:491ddf8:sgoertzen_html2text/vendor/github.com/sgoertzen/html2text \ + spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \ + spf13:cast:v1.3.0:spf13_cast/vendor/github.com/spf13/cast \ + spf13:cobra:v0.0.5:spf13_cobra/vendor/github.com/spf13/cobra \ + spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \ + spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \ + spf13:viper:v1.4.0:spf13_viper/vendor/github.com/spf13/viper \ + stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify USE_GITHUB= yes do-install: diff --git a/net/madonctl/distinfo b/net/madonctl/distinfo index 1ba2c0f499c..4c40b49e721 100644 --- a/net/madonctl/distinfo +++ b/net/madonctl/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1558168986 -SHA256 (McKael-madonctl-v2.3.1_GH0.tar.gz) = f97707a4f96b15a8331a0b3725a43c7717bf068bf9e6c5e885a13dd3016d5cf6 -SIZE (McKael-madonctl-v2.3.1_GH0.tar.gz) = 43395 +TIMESTAMP = 1567842454 +SHA256 (McKael-madonctl-v2.3.1-b936445_GH0.tar.gz) = ec57f582f8de486d277e4f8ccf08e4e10a4649030076e4cae3b79ec3f5f810f8 +SIZE (McKael-madonctl-v2.3.1-b936445_GH0.tar.gz) = 1830510 SHA256 (McKael-madon-v2.3.0_GH0.tar.gz) = c970cb350b3da734399906e6da4b333d300dbaa820af921cb2c72cc6e533c600 SIZE (McKael-madon-v2.3.0_GH0.tar.gz) = 17197 SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd @@ -9,16 +9,16 @@ SHA256 (ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec SIZE (ghodss-yaml-v1.0.0_GH0.tar.gz) = 11772 SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656 -SHA256 (golang-net-3ec1911_GH0.tar.gz) = ad1bbf37e8a125a3f989e9f1fbf7f7561a3f275f04baacd9f336367d9fc999c6 -SIZE (golang-net-3ec1911_GH0.tar.gz) = 1096221 -SHA256 (golang-oauth2-950ef44_GH0.tar.gz) = 1b8de4d4502640b84ecc10dc477c281fd3df09609c93a6b9f86693eea9844b8a -SIZE (golang-oauth2-950ef44_GH0.tar.gz) = 45310 -SHA256 (golang-sys-61b9204_GH0.tar.gz) = a73df35a8c64cf371fda32e00519f15614f4dd5f26cd85d7a4598fa80d51d052 -SIZE (golang-sys-61b9204_GH0.tar.gz) = 1418673 -SHA256 (golang-text-342b2e1_GH0.tar.gz) = ee7a5a3208158692a6fb5b6a54c920cc167da399223a335b3bc2141a43b61a82 -SIZE (golang-text-342b2e1_GH0.tar.gz) = 7168276 -SHA256 (gorilla-websocket-v1.4.0_GH0.tar.gz) = 2b5743c72bd0930c5a80e49c0138b5b7d27fa7c085efd0c86805cccfa7220c9d -SIZE (gorilla-websocket-v1.4.0_GH0.tar.gz) = 50228 +SHA256 (golang-net-ba9fcec_GH0.tar.gz) = fa35ccfabf7e364a85bfe7ba6e8cb9f5a928e1018ba50a814fa61d6209e02c95 +SIZE (golang-net-ba9fcec_GH0.tar.gz) = 1099861 +SHA256 (golang-oauth2-0f29369_GH0.tar.gz) = 0b2093495f3f8e2938b829c07e768918004b92f8a4d2b5c23fe7de0069821652 +SIZE (golang-oauth2-0f29369_GH0.tar.gz) = 45469 +SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8 +SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012 +SHA256 (golang-text-3d0f797_GH0.tar.gz) = d5cbfc9ac93211708e336c9129947b1f4146ed402b6cd624732e36838e1df4e9 +SIZE (golang-text-3d0f797_GH0.tar.gz) = 7168341 +SHA256 (gorilla-websocket-v1.4.1_GH0.tar.gz) = 9e5bd337d58a978bf4072767252ddb394b53e2b459697633794abd96e8eb3fa6 +SIZE (gorilla-websocket-v1.4.1_GH0.tar.gz) = 54218 SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2 SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658 SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e @@ -27,8 +27,8 @@ SHA256 (magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f SIZE (magiconair-properties-v1.8.1_GH0.tar.gz) = 29735 SHA256 (mattn-go-go1.9.1_GH0.tar.gz) = cffb270091d61263254a130543ec7de30e4c3d847d394ea6fb71e09ce22f63fb SIZE (mattn-go-go1.9.1_GH0.tar.gz) = 16355327 -SHA256 (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 80b6b3e4fee3b15864f23d622129c17ba222786f8c93bb01f8805f3cb91dfefe -SIZE (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 3559 +SHA256 (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 71d57a3fb3f990a5a5d1e190ae5112a8aca2fcdda9eb42770bd524076e8f371f +SIZE (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 3904 SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980 SHA256 (pelletier-go-toml-v1.4.0_GH0.tar.gz) = 04fb4855a64495c0c055c83b8a3446cabc6bfa4830eb458816370db38c0e67b0 @@ -43,13 +43,13 @@ SHA256 (spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b7 SIZE (spf13-afero-v1.2.2_GH0.tar.gz) = 46157 SHA256 (spf13-cast-v1.3.0_GH0.tar.gz) = e685282ea33f89e9354d148ad1886f532bcebe86b0b60a167988f7c6d081085f SIZE (spf13-cast-v1.3.0_GH0.tar.gz) = 11085 -SHA256 (spf13-cobra-v0.0.3_GH0.tar.gz) = 7eafb953b58fdd738c4db5202d94a0b6ac0de4f07718fc85a80450c2347c2f9c -SIZE (spf13-cobra-v0.0.3_GH0.tar.gz) = 101526 +SHA256 (spf13-cobra-v0.0.5_GH0.tar.gz) = 79226ce00e2b91306277e679d024eea6d17d0c02fc671555fd25df0c3ea07423 +SIZE (spf13-cobra-v0.0.5_GH0.tar.gz) = 111126 SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871 SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124 SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002 -SHA256 (spf13-viper-v1.3.2_GH0.tar.gz) = 3eb6e09dc9de3d46ad659b97774afa3f27b560b642ca025bee04d14b5aad3b16 -SIZE (spf13-viper-v1.3.2_GH0.tar.gz) = 36932 -SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5 -SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859 +SHA256 (spf13-viper-v1.4.0_GH0.tar.gz) = ee522a00960a36db8f83c820a85fce99a177db2b022697e5c1881cd852d9c4c0 +SIZE (spf13-viper-v1.4.0_GH0.tar.gz) = 44183 +SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698 +SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085 diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile index dc222279d78..a9d6ab1ab6f 100644 --- a/net/nats-streaming-server/Makefile +++ b/net/nats-streaming-server/Makefile @@ -11,6 +11,8 @@ COMMENT= Streaming system server for NATS LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to build + USES= go GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} USE_GITHUB= yes diff --git a/net/py-sshtunnel/Makefile b/net/py-sshtunnel/Makefile index 66b09d3197e..2789aa795be 100644 --- a/net/py-sshtunnel/Makefile +++ b/net/py-sshtunnel/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sshtunnel -PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTVERSION= 0.1.5 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-sshtunnel/distinfo b/net/py-sshtunnel/distinfo index 70d41fbc069..61828a91377 100644 --- a/net/py-sshtunnel/distinfo +++ b/net/py-sshtunnel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545950236 -SHA256 (sshtunnel-0.1.4.tar.gz) = f29ae41a1bd3afa64e9a31029bece2966e4be9a9641e8262372741e691c40d76 -SIZE (sshtunnel-0.1.4.tar.gz) = 48330 +TIMESTAMP = 1567948002 +SHA256 (sshtunnel-0.1.5.tar.gz) = c813fdcda8e81c3936ffeac47cb69cfb2d1f5e77ad0de656c6dab56aeebd9249 +SIZE (sshtunnel-0.1.5.tar.gz) = 49345 diff --git a/net/rubygem-octopress-deploy/Makefile b/net/rubygem-octopress-deploy/Makefile index d1d45912d00..bc310a29b53 100644 --- a/net/rubygem-octopress-deploy/Makefile +++ b/net/rubygem-octopress-deploy/Makefile @@ -13,8 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-colorator>=0:textproc/rubygem-colorator -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/net/v2ray/Makefile b/net/v2ray/Makefile index fecf05fb314..21f0b5ecd8f 100644 --- a/net/v2ray/Makefile +++ b/net/v2ray/Makefile @@ -11,13 +11,12 @@ COMMENT= Platform for building proxies to bypass network restrictions LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go +USES= go:modules USE_GITHUB= yes USE_RC_SUBR= v2ray GH_ACCOUNT= v2ray GH_PROJECT= v2ray-core -GH_SUBDIR= src/v2ray.com/core GH_TUPLE= golang:crypto:193df9c0f06f:golang_crypto/vendor/golang.org/x/crypto \ golang:mock:v1.2.0:golang_mock/vendor/github.com/golang/mock \ golang:net:65e2d4e15006:golang_net/vendor/golang.org/x/net \ @@ -32,7 +31,7 @@ GH_TUPLE= golang:crypto:193df9c0f06f:golang_crypto/vendor/golang.org/x/crypto \ h12w:socks:v1.0.0:h12w_socks/vendor/h12.io/socks \ miekg:dns:v1.1.4:miekg_dns/vendor/github.com/miekg/dns -GO_BUILDFLAGS= --ldflags '-s -w' +GO_BUILDFLAGS= -ldflags='-s -w' USERS= v2ray GROUPS= v2ray @@ -41,7 +40,7 @@ SUB_LIST= USER="${USERS}" \ GROUP="${GROUPS}" do-build: - @cd ${GO_WRKSRC} && \ + cd ${GO_WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ray v2ray.com/core/main && \ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ctl v2ray.com/core/infra/control/main diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 4f643e416b4..a6d0debf654 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.11.99.2 +DISTVERSION= 1.11.99.3 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 09641ddd +GH_TAGNAME= 45b5d943 WITH_DEBUG= yes CFLAGS+= -O0 -g -Wno-error diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo index aaea85b9d79..553762b9cad 100644 --- a/ports-mgmt/pkg-devel/distinfo +++ b/ports-mgmt/pkg-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566813750 -SHA256 (freebsd-pkg-1.11.99.2-09641ddd_GH0.tar.gz) = 143f2a2ef2e4b9c1b35dbbc036dc4421557abbe047f7b144ae5f2a3e472004ca -SIZE (freebsd-pkg-1.11.99.2-09641ddd_GH0.tar.gz) = 3866682 +TIMESTAMP = 1567799551 +SHA256 (freebsd-pkg-1.11.99.3-45b5d943_GH0.tar.gz) = 0d91d5329385bb3a87446cc0535acd5ed97c7859a31f883f3b7fadfc3099479c +SIZE (freebsd-pkg-1.11.99.3-45b5d943_GH0.tar.gz) = 3867433 diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index d119a38d799..6c724d38dde 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fontforge -PORTVERSION= 20190413 +PORTVERSION= 20190801 CATEGORIES= print MAINTAINER= cyberbotx@cyberbotx.com @@ -11,30 +11,15 @@ COMMENT= Type 1/TrueType/OpenType/bitmap font editor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash \ - ${LOCALBASE}/bin/gnulib-tool:devel/gnulib -LIB_DEPENDS= libuninameslist.so:textproc/libuninameslist \ - libtiff.so:graphics/tiff \ - libpng.so:graphics/png \ - libgif.so:graphics/giflib \ - libspiro.so:graphics/libspiro \ - libfreetype.so:print/freetype2 \ - libltdl.so:devel/libltdl \ - libfontconfig.so:x11-fonts/fontconfig +LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= autoreconf:build compiler desktop-file-utils gettext \ - gmake gnome iconv jpeg libtool pkgconfig python \ - readline:port shared-mime-info shebangfix +USES= autoreconf compiler gettext gmake gnome iconv:wchar_t libtool \ + localbase pkgconfig USE_GITHUB= yes -USE_XORG= ice sm x11 xi xkbui xft -USE_GNOME= cairo glib20 gtk20 libxml2 pango +USE_GNOME= glib20 libxml2 -SHEBANG_FILES= pycontrib/gdraw/__init__.py \ - pycontrib/gdraw/gdraw.py - -CONFIGURE_ARGS= --enable-tile-path --enable-gtk2-use -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +# It seems that iconv is required regardless of this setting, so forcing it on +CONFIGURE_ARGS= --with-iconv USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -43,29 +28,78 @@ INSTALLS_ICONS= yes PORTDOCS= * .htaccess -OPTIONS_DEFINE= DOCS FREETYPE CAIRO PYTHON +OPTIONS_DEFINE= CAIRO DOCS FREETYPE GIF JPEG PNG PYTHON READLINE SPIRO TIFF \ + TILEPATH UNINAMESLIST WOFF2 WRITEPFM +OPTIONS_GROUP= GUI +OPTIONS_GROUP_GUI= GTK3 X11 +OPTIONS_SINGLE= THEME +OPTIONS_SINGLE_THEME= TANGO 2012 +OPTIONS_DEFAULT=CAIRO GIF GTK3 JPEG PNG PYTHON READLINE SPIRO TANGO TIFF \ + TILEPATH UNINAMESLIST WOFF2 OPTIONS_SUB= yes -FREETYPE_DESC= Include freetype's internal debugger +2012_DESC= Old theme that was used until 2012 +2012_CONFIGURE_ENABLE= theme-2012 + +CAIRO_USE= gnome=cairo,pango +CAIRO_CONFIGURE_WITH= cairo +CAIRO_IMPLIES= PNG + +FREETYPE_DESC= Include freetype's internal debugger FREETYPE_PATCH_DEPENDS= ${NONEXISTENT}:print/freetype2:extract FREETYPE_CONFIGURE_ENABLE= freetype-debugger=${WRKSRC}/freetype -CAIRO_CONFIGURE_WITH= cairo +GIF_LIB_DEPENDS= libgif.so:graphics/giflib +GIF_CONFIGURE_WITH= giflib +GTK3_USE= gnome=gtk30 +GTK3_CONFIGURE_ENABLE= gdk +GTK3_IMPLIES= CAIRO X11 + +JPEG_USES= jpeg +JPEG_CONFIGURE_WITH= libjpeg + +PNG_LIB_DEPENDS=libpng.so:graphics/png +PNG_CONFIGURE_WITH= libpng + +PYTHON_USES= python:3.5-3.7 +PYTHON_USES_OFF=python:3.5-3.7,build PYTHON_CONFIGURE_ENABLE= python-scripting python-extension +READLINE_USES= readline:port +READLINE_CONFIGURE_WITH= libreadline + +SPIRO_DESC= Use libspiro to edit with clothoid splines +SPIRO_LIB_DEPENDS= libspiro.so:graphics/libspiro +SPIRO_CONFIGURE_WITH= libspiro + +TANGO_DESC= Default theme based on the Tango Desktop Project + +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_CONFIGURE_WITH= libtiff + +TILEPATH_DESC= Enable a 'tile path' command (a variant of 'expand stroke') +TILEPATH_CONFIGURE_ENABLE= tile-path + +UNINAMESLIST_DESC= Use libuninameslist for Unicode attribute data +UNINAMESLIST_LIB_DEPENDS= libuninameslist.so:textproc/libuninameslist +UNINAMESLIST_CONFIGURE_WITH= libuninameslist + +WOFF2_DESC= WOFF2 web font support +WOFF2_LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ + libwoff2dec.so:devel/woff2 +WOFF2_CONFIGURE_ENABLE= woff2 + +WRITEPFM_DESC= Add ability to save PFM file w/o creating associated font file +WRITEPFM_CONFIGURE_ENABLE= write-pfm + +X11_USES= desktop-file-utils shared-mime-info xorg +X11_USE= gnome=pango xorg=ice,sm,x11,xft,xi +X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig +X11_RUN_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont +X11_CONFIGURE_WITH= x + post-patch-FREETYPE-on: @${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) ${WRKSRC}/freetype -# This is to get around calling fontforge's bootstrap script, as that script fails -# if git isn't installed on a system DESPITE there being a --skip-git argument that -# can be passed into it. autoreconf is called here because I want to run it without -# libtoolize being run along with it. -pre-configure: - (cd ${WRKSRC} && \ - ${SH} -c '. ./bootstrap.conf ; \ - ${LOCALBASE}/bin/libtoolize -i -c -q ; \ - ${LOCALBASE}/bin/gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \ - export LIBTOOLIZE=true ; ${AUTORECONF} -f -i) - .include diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo index 9c353d84e69..a12da1c21ed 100644 --- a/print/fontforge/distinfo +++ b/print/fontforge/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1558768709 -SHA256 (fontforge-fontforge-20190413_GH0.tar.gz) = d3b60f22d7a52fc2b11e1bd515ab7ba3176f8a3228330d2aea4d076896fe025d -SIZE (fontforge-fontforge-20190413_GH0.tar.gz) = 24380527 +TIMESTAMP = 1567124778 +SHA256 (fontforge-fontforge-20190801_GH0.tar.gz) = e4501de5bd8e7f6c68fe7d3abd4667bf44a07b981d342ffa00e8f42e155ce633 +SIZE (fontforge-fontforge-20190801_GH0.tar.gz) = 21082347 diff --git a/print/fontforge/files/patch-Makefile.am b/print/fontforge/files/patch-Makefile.am deleted file mode 100644 index d999a24c20b..00000000000 --- a/print/fontforge/files/patch-Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.am.orig 2019-04-13 07:38:39 UTC -+++ Makefile.am -@@ -46,7 +46,7 @@ GITIGNOREFILES = \ - AM_CPPFLAGS = - AM_LDFLAGS = - --BUILT_SOURCES = uthash/src -+BUILT_SOURCES = - EXTRA_DIST = - CLEANFILES = - MOSTLYCLEANFILES = -@@ -116,7 +116,6 @@ EXTRA_DIST += \ - Packaging/FontForge.spec \ - Packaging/FontForge.static.spec \ - README \ -- uthash/src \ - $(NULL) - - #-------------------------------------------------------------------------- -@@ -132,11 +131,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-theme-2012 --enab - - - #-------------------------------------------------------------------------- --uthash/src: -- if [ ! -e uthash/src ]; then \ -- if [ -e uthash ] ; then rm -r uthash ; fi ; \ -- git clone https://github.com/troydhanson/uthash ; \ -- fi ; - - # We import a selection of targets from Frank's standard packaging Makefile. - diff --git a/print/fontforge/files/patch-fontforge_cvexport.c b/print/fontforge/files/patch-fontforge_cvexport.c deleted file mode 100644 index 28ebe318255..00000000000 --- a/print/fontforge/files/patch-fontforge_cvexport.c +++ /dev/null @@ -1,23 +0,0 @@ ---- fontforge/cvexport.c.orig 2019-04-13 07:38:39 UTC -+++ fontforge/cvexport.c -@@ -232,20 +232,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,int layer) { - fprintf( pdf, " /CreationDate (D:%04d%02d%02d%02d%02d%02d", - 1900+tm->tm_year, tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec ); --#ifdef _NO_TZSET - fprintf( pdf, "Z)\n" ); --#else -- tzset(); -- if ( timezone==0 || getenv("SOURCE_DATE_EPOCH") ) -- fprintf( pdf, "Z)\n" ); -- else { -- if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */ -- fprintf( pdf, "-" ); -- else -- fprintf( pdf, "+" ); -- fprintf( pdf, "%02d'%02d')\n", (int)(timezone/3600),(int)(timezone/60-(timezone/3600)*60) ); -- } --#endif - fprintf( pdf, " /Title (%s from %s)\n", sc->name, sc->parent->fontname ); - if ( author!=NULL ) - fprintf( pdf, " /Author (%s)\n", author ); diff --git a/print/fontforge/files/patch-fontforge_print.c b/print/fontforge/files/patch-fontforge_print.c deleted file mode 100644 index 6a532995975..00000000000 --- a/print/fontforge/files/patch-fontforge_print.c +++ /dev/null @@ -1,22 +0,0 @@ ---- fontforge/print.c.orig 2019-04-13 07:38:39 UTC -+++ fontforge/print.c -@@ -1164,19 +1164,7 @@ static void dump_pdfprologue(PI *pi) { - } - fprintf( pi->out, " /CreationDate (D:%04d%02d%02d%02d%02d%02d", - tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec ); --#ifdef _NO_TZSET - fprintf( pi->out, "Z)\n" ); --#else -- if ( timezone==0 || getenv("SOURCE_DATE_EPOCH") ) -- fprintf( pi->out, "Z)\n" ); -- else { -- if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */ -- fprintf( pi->out, "-" ); -- else -- fprintf( pi->out, "+" ); -- fprintf( pi->out, "%02d'%02d')\n", (int)(timezone/3600),(int)(timezone/60-(timezone/3600)*60) ); -- } --#endif - if ( author!=NULL ) - fprintf( pi->out, " /Author (%s)\n", author ); - fprintf( pi->out, ">>\n" ); diff --git a/print/fontforge/files/patch-fontforge_splinefont.h b/print/fontforge/files/patch-fontforge_splinefont.h deleted file mode 100644 index 7fc41a7ecec..00000000000 --- a/print/fontforge/files/patch-fontforge_splinefont.h +++ /dev/null @@ -1,15 +0,0 @@ ---- fontforge/splinefont.h.orig 2015-08-20 03:39:10 UTC -+++ fontforge/splinefont.h -@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input, - - #include "ustring.h" - --#ifdef _WIN32 -+#ifdef __FreeBSD__ -+#include -+#endif -+ -+#if defined(_WIN32) || (defined(__FreeBSD__) && __FreeBSD_version < 900506) - #define BAD_LOCALE_HACK - typedef char* locale_t; - #define LC_GLOBAL_LOCALE ((locale_t)-1) diff --git a/print/fontforge/files/patch-m4_fontforge__arg__enable.m4 b/print/fontforge/files/patch-m4_fontforge__arg__enable.m4 new file mode 100644 index 00000000000..b9eba9a9f39 --- /dev/null +++ b/print/fontforge/files/patch-m4_fontforge__arg__enable.m4 @@ -0,0 +1,11 @@ +--- m4/fontforge_arg_enable.m4.orig 2019-08-01 08:28:36 UTC ++++ m4/fontforge_arg_enable.m4 +@@ -232,7 +232,7 @@ AC_DEFUN([FONTFORGE_ARG_ENABLE_WOFF2], + AC_ARG_ENABLE([woff2], + [AS_HELP_STRING([--enable-woff2], + [Enable WOFF2 support.])], +- [use_woff2=yes]) ++ [use_woff2="${enableval}"]) + if test x$use_woff2 = xyes ; then + PKG_CHECK_MODULES([WOFF2],[libwoff2enc,libwoff2dec], + [ diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist index 711bff28788..fc48e75da9a 100644 --- a/print/fontforge/pkg-plist +++ b/print/fontforge/pkg-plist @@ -12,11 +12,8 @@ include/fontforge/bitmapcontrol.h include/fontforge/carbon.h include/fontforge/chardata.h include/fontforge/charset.h -include/fontforge/configure-fontforge.h -include/fontforge/cvruler.h include/fontforge/delta.h include/fontforge/dlist.h -include/fontforge/dynamic.h include/fontforge/edgelist.h include/fontforge/edgelist2.h include/fontforge/encoding.h @@ -25,8 +22,8 @@ include/fontforge/ffgdk.h include/fontforge/ffglib.h include/fontforge/ffpython.h include/fontforge/flaglist.h -include/fontforge/fileutil.h include/fontforge/fontforge-config.h +include/fontforge/fontforge-version-extras.h include/fontforge/fontforge.h include/fontforge/fontforgevw.h include/fontforge/fvmetrics.h @@ -39,7 +36,6 @@ include/fontforge/gio.h include/fontforge/gkeysym.h include/fontforge/glif_name_hash.h include/fontforge/glyphcomp.h -include/fontforge/gnetwork.h include/fontforge/gprogress.h include/fontforge/gresedit.h include/fontforge/gresource.h @@ -47,14 +43,15 @@ include/fontforge/groups.h include/fontforge/gutils.h include/fontforge/gwidget.h include/fontforge/gwwiconv.h +include/fontforge/hotkeys.h include/fontforge/intl.h -include/fontforge/libffstamp.h include/fontforge/lookups.h include/fontforge/mem.h include/fontforge/mm.h include/fontforge/namehash.h include/fontforge/nonlineartrans.h include/fontforge/ofl.h +include/fontforge/prefs.h include/fontforge/print.h include/fontforge/psfont.h include/fontforge/savefont.h @@ -69,8 +66,8 @@ include/fontforge/stemdb.h include/fontforge/ttf.h include/fontforge/ttfinstrs.h include/fontforge/uiinterface.h +include/fontforge/unicodelibinfo.h include/fontforge/unicoderange.h -include/fontforge/usermenu.h include/fontforge/ustring.h include/fontforge/utype.h include/fontforge/views.h @@ -82,10 +79,10 @@ lib/libfontforgeexe.a lib/libfontforgeexe.so lib/libfontforgeexe.so.3 lib/libfontforgeexe.so.3.0.0 -lib/libgdraw.a -lib/libgdraw.so -lib/libgdraw.so.6 -lib/libgdraw.so.6.0.0 +%%X11%%lib/libgdraw.a +%%X11%%lib/libgdraw.so +%%X11%%lib/libgdraw.so.6 +%%X11%%lib/libgdraw.so.6.0.0 lib/libgunicode.a lib/libgunicode.so lib/libgunicode.so.5 @@ -102,37 +99,22 @@ man/man1/fontforge.1.gz man/man1/fontimage.1.gz man/man1/fontlint.1.gz man/man1/sfddiff.1.gz -share/appdata/org.fontforge.FontForge.appdata.xml -share/applications/org.fontforge.FontForge.desktop +%%X11%%share/appdata/org.fontforge.FontForge.appdata.xml +%%X11%%share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/hotkeys/default -%%DATADIR%%/nodejs/collabwebview/client.html -%%DATADIR%%/nodejs/collabwebview/css/print.css -%%DATADIR%%/nodejs/collabwebview/css/styles.css -%%DATADIR%%/nodejs/collabwebview/index.html -%%DATADIR%%/nodejs/collabwebview/js/constants.js -%%DATADIR%%/nodejs/collabwebview/js/contentEditable/component.json -%%DATADIR%%/nodejs/collabwebview/js/contentEditable/contenteditable.jquery.json -%%DATADIR%%/nodejs/collabwebview/js/contentEditable/example.html -%%DATADIR%%/nodejs/collabwebview/js/contentEditable/jquery.contenteditable.js -%%DATADIR%%/nodejs/collabwebview/js/fontdrag.js -%%DATADIR%%/nodejs/collabwebview/js/jquery-1.9.1.min.js -%%DATADIR%%/nodejs/collabwebview/js/jquery.masonry.min.js -%%DATADIR%%/nodejs/collabwebview/js/otfeatures.js -%%DATADIR%%/nodejs/collabwebview/package.json -%%DATADIR%%/nodejs/collabwebview/server.js -%%DATADIR%%/pixmaps/Cantarell-Bold.ttf -%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf -%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf -%%DATADIR%%/pixmaps/Cantarell-Regular.ttf -%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf -%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf -%%DATADIR%%/pixmaps/OFL.txt +%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Bold.ttf +%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf +%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf +%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Regular.ttf +%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf +%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf +%%TANGO%%%%DATADIR%%/pixmaps/OFL.txt %%DATADIR%%/pixmaps/changeweight.png %%DATADIR%%/pixmaps/charviewicon.xbm -%%DATADIR%%/pixmaps/check_off_disabled.png -%%DATADIR%%/pixmaps/check_off.png -%%DATADIR%%/pixmaps/check_on_disabled.png -%%DATADIR%%/pixmaps/check_on.png +%%TANGO%%%%DATADIR%%/pixmaps/check_off.png +%%TANGO%%%%DATADIR%%/pixmaps/check_off_disabled.png +%%TANGO%%%%DATADIR%%/pixmaps/check_on.png +%%TANGO%%%%DATADIR%%/pixmaps/check_on_disabled.png %%DATADIR%%/pixmaps/chooseraudio.png %%DATADIR%%/pixmaps/chooserback.png %%DATADIR%%/pixmaps/chooserbookmark.png @@ -148,7 +130,7 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/choosermacttf.png %%DATADIR%%/pixmaps/choosernobookmark.png %%DATADIR%%/pixmaps/chooserobject.png -%%DATADIR%%/pixmaps/choosersfdir.png +%%TANGO%%%%DATADIR%%/pixmaps/choosersfdir.png %%DATADIR%%/pixmaps/choosertar.png %%DATADIR%%/pixmaps/choosertextbdf.png %%DATADIR%%/pixmaps/choosertextc.png @@ -166,7 +148,7 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/chooserupdir.png %%DATADIR%%/pixmaps/chooservideo.png %%DATADIR%%/pixmaps/colorwheel.png -%%DATADIR%%/pixmaps/downarrow.png +%%TANGO%%%%DATADIR%%/pixmaps/downarrow.png %%DATADIR%%/pixmaps/editclear.png %%DATADIR%%/pixmaps/editclearback.png %%DATADIR%%/pixmaps/editcopy.png @@ -182,7 +164,7 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/editfind.png %%DATADIR%%/pixmaps/editjoin.png %%DATADIR%%/pixmaps/editmerge.png -%%DATADIR%%/pixmaps/editmergetoline.png +%%TANGO%%%%DATADIR%%/pixmaps/editmergetoline.png %%DATADIR%%/pixmaps/editpaste.png %%DATADIR%%/pixmaps/editpasteafter.png %%DATADIR%%/pixmaps/editpasteinto.png @@ -230,7 +212,14 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/elementvbaselines.png %%DATADIR%%/pixmaps/exclude.png %%DATADIR%%/pixmaps/extendcondense.png +%%DATADIR%%/pixmaps/fflogo.png +%%DATADIR%%/pixmaps/fflogo13.png +%%DATADIR%%/pixmaps/ffsplash1.png +%%DATADIR%%/pixmaps/ffsplash2.png +%%DATADIR%%/pixmaps/ffsplash3.png %%DATADIR%%/pixmaps/fileclose.png +%%TANGO%%%%DATADIR%%/pixmaps/fileclose2.png +%%DATADIR%%/pixmaps/filedisplay.png %%DATADIR%%/pixmaps/fileexecute.png %%DATADIR%%/pixmaps/fileexport.png %%DATADIR%%/pixmaps/filegenerate.png @@ -249,13 +238,6 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/filesave.png %%DATADIR%%/pixmaps/filesaveall.png %%DATADIR%%/pixmaps/filesaveas.png -%%DATADIR%%/pixmaps/fflogo.png -%%DATADIR%%/pixmaps/fflogo13.png -%%DATADIR%%/pixmaps/ffsplash1.png -%%DATADIR%%/pixmaps/ffsplash2.png -%%DATADIR%%/pixmaps/ffsplash3.png -%%DATADIR%%/pixmaps/fileclose2.png -%%DATADIR%%/pixmaps/filedisplay.png %%DATADIR%%/pixmaps/findinter.png %%DATADIR%%/pixmaps/fliphor.png %%DATADIR%%/pixmaps/flipvert.png @@ -287,48 +269,48 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/overlapfindinter.png %%DATADIR%%/pixmaps/overlapintersection.png %%DATADIR%%/pixmaps/overlaprm.png +%%TANGO%%%%DATADIR%%/pixmaps/palette3drotate-selected.png %%DATADIR%%/pixmaps/palette3drotate.png -%%DATADIR%%/pixmaps/palette3drotate-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettecorner-selected.png %%DATADIR%%/pixmaps/palettecorner.png -%%DATADIR%%/pixmaps/palettecorner-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettecurve-selected.png %%DATADIR%%/pixmaps/palettecurve.png -%%DATADIR%%/pixmaps/palettecurve-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/paletteelipse-selected.png %%DATADIR%%/pixmaps/paletteelipse.png -%%DATADIR%%/pixmaps/paletteelipse-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/paletteflip-selected.png %%DATADIR%%/pixmaps/paletteflip.png -%%DATADIR%%/pixmaps/paletteflip-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettefreehand-selected.png %%DATADIR%%/pixmaps/palettefreehand.png -%%DATADIR%%/pixmaps/palettefreehand-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettehand-selected.png %%DATADIR%%/pixmaps/palettehand.png -%%DATADIR%%/pixmaps/palettehand-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettehvcurve-selected.png %%DATADIR%%/pixmaps/palettehvcurve.png -%%DATADIR%%/pixmaps/palettehvcurve-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/paletteknife-selected.png %%DATADIR%%/pixmaps/paletteknife.png -%%DATADIR%%/pixmaps/paletteknife-selected.png %%DATADIR%%/pixmaps/paletteline.png +%%TANGO%%%%DATADIR%%/pixmaps/palettemagnify-selected.png %%DATADIR%%/pixmaps/palettemagnify.png -%%DATADIR%%/pixmaps/palettemagnify-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettepen-selected.png %%DATADIR%%/pixmaps/palettepen.png -%%DATADIR%%/pixmaps/palettepen-selected.png %%DATADIR%%/pixmaps/palettepencil.png +%%TANGO%%%%DATADIR%%/pixmaps/paletteperspective-selected.png %%DATADIR%%/pixmaps/paletteperspective.png -%%DATADIR%%/pixmaps/paletteperspective-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettepointer-selected.png %%DATADIR%%/pixmaps/palettepointer.png -%%DATADIR%%/pixmaps/palettepointer-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettepoly-selected.png %%DATADIR%%/pixmaps/palettepoly.png -%%DATADIR%%/pixmaps/palettepoly-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/paletterect-selected.png %%DATADIR%%/pixmaps/paletterect.png -%%DATADIR%%/pixmaps/paletterect-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/paletterotate-selected.png %%DATADIR%%/pixmaps/paletterotate.png -%%DATADIR%%/pixmaps/paletterotate-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/paletteruler-selected.png %%DATADIR%%/pixmaps/paletteruler.png -%%DATADIR%%/pixmaps/paletteruler-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettescale-selected.png %%DATADIR%%/pixmaps/palettescale.png -%%DATADIR%%/pixmaps/palettescale-selected.png -%%DATADIR%%/pixmaps/paletteselectedbg.png +%%TANGO%%%%DATADIR%%/pixmaps/paletteselectedbg.png %%DATADIR%%/pixmaps/paletteshift.png +%%TANGO%%%%DATADIR%%/pixmaps/paletteskew-selected.png %%DATADIR%%/pixmaps/paletteskew.png -%%DATADIR%%/pixmaps/paletteskew-selected.png %%DATADIR%%/pixmaps/palettesmall3drotate.png %%DATADIR%%/pixmaps/palettesmallcorner.png %%DATADIR%%/pixmaps/palettesmallcurve.png @@ -355,24 +337,24 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/palettesmallspiroright.png %%DATADIR%%/pixmaps/palettesmallstar.png %%DATADIR%%/pixmaps/palettesmalltangent.png +%%TANGO%%%%DATADIR%%/pixmaps/palettespirocorner-selected.png %%DATADIR%%/pixmaps/palettespirocorner.png -%%DATADIR%%/pixmaps/palettespirocorner-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettespirocurve-selected.png %%DATADIR%%/pixmaps/palettespirocurve.png -%%DATADIR%%/pixmaps/palettespirocurve-selected.png %%DATADIR%%/pixmaps/palettespirodisabled.png %%DATADIR%%/pixmaps/palettespirodown.png +%%TANGO%%%%DATADIR%%/pixmaps/palettespirog2curve-selected.png %%DATADIR%%/pixmaps/palettespirog2curve.png -%%DATADIR%%/pixmaps/palettespirog2curve-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettespiroleft-selected.png %%DATADIR%%/pixmaps/palettespiroleft.png -%%DATADIR%%/pixmaps/palettespiroleft-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettespiroright-selected.png %%DATADIR%%/pixmaps/palettespiroright.png -%%DATADIR%%/pixmaps/palettespiroright-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettespiroup-selected.png %%DATADIR%%/pixmaps/palettespiroup.png -%%DATADIR%%/pixmaps/palettespiroup-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettestar-selected.png %%DATADIR%%/pixmaps/palettestar.png -%%DATADIR%%/pixmaps/palettestar-selected.png +%%TANGO%%%%DATADIR%%/pixmaps/palettetangent-selected.png %%DATADIR%%/pixmaps/palettetangent.png -%%DATADIR%%/pixmaps/palettetangent-selected.png %%DATADIR%%/pixmaps/pointsG2curve.png %%DATADIR%%/pixmaps/pointsaddanchor.png %%DATADIR%%/pixmaps/pointscorner.png @@ -390,11 +372,11 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/ptinfohvcurve.png %%DATADIR%%/pixmaps/ptinfotangent.png %%DATADIR%%/pixmaps/python.png -%%DATADIR%%/pixmaps/radio_off_disabled.png -%%DATADIR%%/pixmaps/radio_off.png -%%DATADIR%%/pixmaps/radio_on_disabled.png -%%DATADIR%%/pixmaps/radio_on.png -%%DATADIR%%/pixmaps/resources +%%TANGO%%%%DATADIR%%/pixmaps/radio_off.png +%%TANGO%%%%DATADIR%%/pixmaps/radio_off_disabled.png +%%TANGO%%%%DATADIR%%/pixmaps/radio_on.png +%%TANGO%%%%DATADIR%%/pixmaps/radio_on_disabled.png +%%TANGO%%%%DATADIR%%/pixmaps/resources %%DATADIR%%/pixmaps/rmoverlap.png %%DATADIR%%/pixmaps/rotate180.png %%DATADIR%%/pixmaps/rotateccw.png @@ -420,7 +402,7 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/stylessmallcaps.png %%DATADIR%%/pixmaps/stylessubsuper.png %%DATADIR%%/pixmaps/styleswireframe.png -%%DATADIR%%/pixmaps/text12210.png +%%TANGO%%%%DATADIR%%/pixmaps/text12210.png %%DATADIR%%/pixmaps/tools3drotate.png %%DATADIR%%/pixmaps/toolselipse.png %%DATADIR%%/pixmaps/toolsflip.png @@ -473,36 +455,27 @@ share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/pixmaps/viewzoomout.png %%DATADIR%%/pixmaps/wireframe.png %%DATADIR%%/prefs -%%PYTHON%%%%DATADIR%%/python/collab/sessionjoin-and-change-c.py -%%PYTHON%%%%DATADIR%%/python/collab/sessionjoin-and-save-to-out.sfd.py -%%PYTHON%%%%DATADIR%%/python/collab/sessionstart.py -%%PYTHON%%%%DATADIR%%/python/collab/web-test-collab.py %%PYTHON%%%%DATADIR%%/python/excepthook.py -%%DATADIR%%/python/gdraw/README -%%DATADIR%%/python/gdraw/__init__.py -%%DATADIR%%/python/gdraw/_gdraw.py -%%DATADIR%%/python/gdraw/gdraw.html -%%DATADIR%%/python/gdraw/gdraw.py -%%DATADIR%%/python/webcollab.py %%PYTHON%%%%DATADIR%%/python/simple/expand-a.py %%PYTHON%%%%DATADIR%%/python/simple/load-font-and-show-name.py %%PYTHON%%%%DATADIR%%/python/test.sfd -share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png -share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png -share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png -share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png -share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png -share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png -share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png -share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png -share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png -share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg +%%X11%%share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png +%%X11%%share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg share/locale/ca/LC_MESSAGES/FontForge.mo share/locale/de/LC_MESSAGES/FontForge.mo share/locale/el/LC_MESSAGES/FontForge.mo share/locale/en_GB/LC_MESSAGES/FontForge.mo share/locale/es/LC_MESSAGES/FontForge.mo share/locale/fr/LC_MESSAGES/FontForge.mo +share/locale/hr/LC_MESSAGES/FontForge.mo share/locale/it/LC_MESSAGES/FontForge.mo share/locale/ja/LC_MESSAGES/FontForge.mo share/locale/ko/LC_MESSAGES/FontForge.mo @@ -514,8 +487,9 @@ share/locale/uk/LC_MESSAGES/FontForge.mo share/locale/vi/LC_MESSAGES/FontForge.mo share/locale/zh_CN/LC_MESSAGES/FontForge.mo share/locale/zh_TW/LC_MESSAGES/FontForge.mo -share/metainfo/org.fontforge.FontForge.appdata.xml -share/metainfo/org.fontforge.FontForge.metainfo.xml -share/mime/packages/fontforge.xml -share/pixmaps/org.fontforge.FontForge.png -share/pixmaps/org.fontforge.FontForge.xpm +%%X11%%share/metainfo/org.fontforge.FontForge.appdata.xml +%%X11%%share/metainfo/org.fontforge.FontForge.metainfo.xml +%%X11%%share/mime/packages/fontforge.xml +%%X11%%share/pixmaps/org.fontforge.FontForge.png +%%X11%%share/pixmaps/org.fontforge.FontForge.xpm +%%NO_PYTHON%%@dir %%DATADIR%%/python diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 1ae8f0c8e86..73a44422ae9 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -13,6 +13,8 @@ COMMENT= GNU music typesetter LICENSE= GPLv3 +BROKEN= fails to configure + BUILD_DEPENDS= pdftexi2dvi:print/texinfo \ t1ascii:print/t1utils \ bash:shells/bash \ diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 68d7e1d3bad..9e7b6e38d48 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -13,6 +13,8 @@ COMMENT= GNU music typesetter LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN= fails to configure + BUILD_DEPENDS= pdftexi2dvi:print/texinfo \ t1ascii:print/t1utils \ bash:shells/bash \ diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile index 27f23c73efe..f57f0857474 100644 --- a/print/photoprint/Makefile +++ b/print/photoprint/Makefile @@ -11,6 +11,8 @@ COMMENT= Utility to print multiple images per sheet LICENSE= GPLv2 +BROKEN= fails to build + LIB_DEPENDS= libcups.so:print/cups \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ diff --git a/russian/stardict-bars/Makefile b/russian/stardict-bars/Makefile index 70688badb6d..9d9af890473 100644 --- a/russian/stardict-bars/Makefile +++ b/russian/stardict-bars/Makefile @@ -3,14 +3,12 @@ PORTNAME= stardict-bars PORTVERSION= 2.4.2 CATEGORIES= russian -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/ru/ +MASTER_SITES= http://download.huzheng.org/ru/ DISTNAME= stardict-en-ru-bars-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= New Comprehensive English-Russian dictionary -BROKEN= unfetchable - USES= tar:bzip2 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common" diff --git a/russian/stardict-computer/Makefile b/russian/stardict-computer/Makefile index 45bfde1eae9..c7f4d28ff1a 100644 --- a/russian/stardict-computer/Makefile +++ b/russian/stardict-computer/Makefile @@ -4,14 +4,12 @@ PORTNAME= stardict-computer PORTVERSION= 2.4.2 CATEGORIES= russian -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/ru/ +MASTER_SITES= http://download.huzheng.org/ru/ DISTNAME= ${PORTNAME}-ru-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= English-Russian Computer dictionary -BROKEN= unfetchable - USES= tar:bzip2 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common" diff --git a/russian/stardict-dal/Makefile b/russian/stardict-dal/Makefile index 3b11e7d9a79..390e89aaab8 100644 --- a/russian/stardict-dal/Makefile +++ b/russian/stardict-dal/Makefile @@ -3,14 +3,12 @@ PORTNAME= stardict-dal PORTVERSION= 2.4.2 CATEGORIES= russian -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/ru/ +MASTER_SITES= http://download.huzheng.org/ru/ DISTNAME= ${PORTNAME}-ru-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Dal's Explanatory Dictionary -BROKEN= unfetchable - USES= tar:bzip2 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common" diff --git a/russian/stardict-engcom/Makefile b/russian/stardict-engcom/Makefile index 376ad76766c..a6ab308844d 100644 --- a/russian/stardict-engcom/Makefile +++ b/russian/stardict-engcom/Makefile @@ -4,14 +4,12 @@ PORTNAME= stardict-engcom PORTVERSION= 2.4.2 CATEGORIES= russian -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/ru/ +MASTER_SITES= http://download.huzheng.org/ru/ DISTNAME= ${PORTNAME}-ru-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= English-Russian Dictionary of Computer Terms -BROKEN= unfetchable - USES= tar:bzip2 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common" diff --git a/russian/stardict-mueller7/Makefile b/russian/stardict-mueller7/Makefile index 7b5bef8068c..0694bca4d6b 100644 --- a/russian/stardict-mueller7/Makefile +++ b/russian/stardict-mueller7/Makefile @@ -3,13 +3,11 @@ PORTNAME= stardict-mueller7 PORTVERSION= 2.4.2 CATEGORIES= russian -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/ru/ +MASTER_SITES= http://download.huzheng.org/ru/ MAINTAINER= ports@FreeBSD.org COMMENT= Mueller English-Russian dictionary -BROKEN= unfetchable - USES= tar:bzip2 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common" diff --git a/russian/stardict-mueller7/files/Makefile.common b/russian/stardict-mueller7/files/Makefile.common index 7c418c15da7..c14aa635c2e 100644 --- a/russian/stardict-mueller7/files/Makefile.common +++ b/russian/stardict-mueller7/files/Makefile.common @@ -1,5 +1,6 @@ DIST_SUBDIR= stardict +NO_ARCH= yes NO_BUILD= yes PKGMESSAGE?= ${.CURDIR}/../../russian/stardict-mueller7/files/pkg-message diff --git a/russian/stardict-mueller7/files/pkg-message b/russian/stardict-mueller7/files/pkg-message index dd306adbb80..8c00e413b93 100644 --- a/russian/stardict-mueller7/files/pkg-message +++ b/russian/stardict-mueller7/files/pkg-message @@ -4,8 +4,8 @@ This dictionary can be used with any of the following dictionary programs (consider to install one of them): -textproc/goldendict Goldendict (Qt4) -textproc/qstardict StarDict clone (Qt4) +textproc/goldendict Goldendict (Qt5) +textproc/qstardict StarDict clone (Qt5) textproc/stardict3 StarDict 3.x (GTK2) EOM } diff --git a/russian/stardict-mueller7accent/Makefile b/russian/stardict-mueller7accent/Makefile index 745ff4d442e..7ba831cefe6 100644 --- a/russian/stardict-mueller7accent/Makefile +++ b/russian/stardict-mueller7accent/Makefile @@ -3,14 +3,12 @@ PORTNAME= stardict-mueller7accent PORTVERSION= 2.4.2 CATEGORIES= russian -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/ru/ +MASTER_SITES= http://download.huzheng.org/ru/ DISTNAME= stardict-Mueller7accentGPL-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Mueller English-Russian dictionary with accents -BROKEN= unfetchable - USES= tar:bzip2 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common" diff --git a/russian/stardict-pc/Makefile b/russian/stardict-pc/Makefile index 92839142235..21af3ecfad0 100644 --- a/russian/stardict-pc/Makefile +++ b/russian/stardict-pc/Makefile @@ -4,14 +4,12 @@ PORTNAME= stardict-pc PORTVERSION= 2.4.2 CATEGORIES= russian -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/ru/ +MASTER_SITES= http://download.huzheng.org/ru/ DISTNAME= ${PORTNAME}-user-ru-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= English-Russian PC-user dictionary -BROKEN= unfetchable - USES= tar:bzip2 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common" diff --git a/russian/wordpress/Makefile b/russian/wordpress/Makefile index dd1552f2bf4..5319afd2571 100644 --- a/russian/wordpress/Makefile +++ b/russian/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.2 +DISTVERSION= 5.2.3 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ diff --git a/russian/wordpress/distinfo b/russian/wordpress/distinfo index f7458b51f4b..dc3c24b7ab2 100644 --- a/russian/wordpress/distinfo +++ b/russian/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561104294 -SHA256 (wordpress-5.2.2-ru_RU.tar.gz) = ed5fa4f1e0a2f8afda1a6d1d81cc94e4bf9c3b30444333cb1d8c1b6a6333368d -SIZE (wordpress-5.2.2-ru_RU.tar.gz) = 11912362 +TIMESTAMP = 1567785131 +SHA256 (wordpress-5.2.3-ru_RU.tar.gz) = ab6a1cb042ac3c966e7bf17a824d71543de99d4e3459c8a0cb703f8513139de0 +SIZE (wordpress-5.2.3-ru_RU.tar.gz) = 11904034 diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile index 78485dfe565..2268df7e20c 100644 --- a/science/py-h5py/Makefile +++ b/science/py-h5py/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= h5py -PORTVERSION= 2.9.0 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +19,7 @@ LIB_DEPENDS= libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} -USES= python +USES= pkgconfig python USE_PYTHON= autoplist concurrent cython distutils OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/science/py-h5py/distinfo b/science/py-h5py/distinfo index 9b69845488c..c9cab68008b 100644 --- a/science/py-h5py/distinfo +++ b/science/py-h5py/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546268499 -SHA256 (h5py-2.9.0.tar.gz) = 9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002 -SIZE (h5py-2.9.0.tar.gz) = 287853 +TIMESTAMP = 1567842470 +SHA256 (h5py-2.10.0.tar.gz) = 84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d +SIZE (h5py-2.10.0.tar.gz) = 301057 diff --git a/science/py-h5py/pkg-plist b/science/py-h5py/pkg-plist index 18387219faf..f2c0c725145 100644 --- a/science/py-h5py/pkg-plist +++ b/science/py-h5py/pkg-plist @@ -1,5 +1,5 @@ -%%PORTDOCS%%%%DOCSDIR%%/README.rst %%PORTDOCS%%%%DOCSDIR%%/Makefile +%%PORTDOCS%%%%DOCSDIR%%/README.rst %%PORTDOCS%%%%DOCSDIR%%/build.rst %%PORTDOCS%%%%DOCSDIR%%/conf.py %%PORTDOCS%%%%DOCSDIR%%/config.rst @@ -21,6 +21,7 @@ %%PORTDOCS%%%%DOCSDIR%%/vds.rst %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.0.rst %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.1.rst +%%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.10.0.rst %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.2.rst %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.3.rst %%PORTDOCS%%%%DOCSDIR%%/whatsnew/2.4.rst diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile index b1701240fe4..816af76c22e 100644 --- a/science/py-tensorflow/Makefile +++ b/science/py-tensorflow/Makefile @@ -14,6 +14,7 @@ COMMENT= Computation using data flow graphs for scalable machine learning LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to build ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= ${RUN_DEPENDS} \ diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile index e498bedf99f..a1924734015 100644 --- a/science/xmakemol/Makefile +++ b/science/xmakemol/Makefile @@ -10,6 +10,9 @@ MASTER_SITES= SAVANNAH MAINTAINER= ports@FreeBSD.org COMMENT= Molecule Viewer Program Based on Motif Widget +DEPRECATED= Depends on expiring graphics/libGLw +EXPIRATION_DATE= 2019-11-01 + USES= gmake motif shebangfix USE_XORG= xpm USE_GL= glut glw diff --git a/security/Makefile b/security/Makefile index 96f031482f6..746e7e7b314 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1262,6 +1262,7 @@ SUBDIR += sudoscript SUBDIR += super SUBDIR += suricata + SUBDIR += suricata5 SUBDIR += swatch SUBDIR += switzerland SUBDIR += symbion-sslproxy diff --git a/security/clamav-unofficial-sigs/Makefile b/security/clamav-unofficial-sigs/Makefile index cae84ba97d9..9d90d296337 100644 --- a/security/clamav-unofficial-sigs/Makefile +++ b/security/clamav-unofficial-sigs/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= clamav-unofficial-sigs -PORTVERSION= 5.6.2 -PORTREVISION= 1 +PORTVERSION= 6.1.1 CATEGORIES= security -MAINTAINER= sf@maxempire.com +MAINTAINER= ports@FreeBSD.org COMMENT= Update script for third-party ClamAV databases LICENSE= BSD3CLAUSE @@ -45,10 +44,10 @@ do-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/master.conf ${STAGEDIR}${ETCDIR}/master.conf.sample - ${INSTALL_DATA} ${WRKSRC}/config/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample + ${INSTALL_DATA} ${WRKSRC}/config/os/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample ${INSTALL_DATA} ${WRKSRC}/config/user.conf ${STAGEDIR}${ETCDIR}/user.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} INSTALL LICENSE README.md ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} INSTALL.md LICENSE README.md ${STAGEDIR}${DOCSDIR}) .include diff --git a/security/clamav-unofficial-sigs/distinfo b/security/clamav-unofficial-sigs/distinfo index ae4f0d303ae..6556f6e14c8 100644 --- a/security/clamav-unofficial-sigs/distinfo +++ b/security/clamav-unofficial-sigs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522164679 -SHA256 (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 233404d767fcb7d2b82defef831d584cbbcc7105f6bbc586d69a0a960bc0d4df -SIZE (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 50931 +TIMESTAMP = 1567631464 +SHA256 (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = bac14809c8106ebae6c13f4db1c330a75f0a284924b3ab3668c49e30619b299f +SIZE (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = 55340 diff --git a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh index d83a38beb03..ef1b00671ea 100644 --- a/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh +++ b/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh @@ -1,24 +1,50 @@ ---- clamav-unofficial-sigs.sh.orig 2018-11-24 16:35:07 UTC +--- clamav-unofficial-sigs.sh.orig 2019-09-02 22:41:48 UTC +++ clamav-unofficial-sigs.sh -@@ -1290,7 +1290,7 @@ minimum_required_config_version="72" - minimum_yara_clamav_version="0.99" - - # Default config files --config_dir="/etc/clamav-unofficial-sigs" -+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs" - config_files=( "$config_dir/master.conf" "$config_dir/os.conf" "$config_dir/user.conf" ) - - # Initialise -@@ -1302,6 +1302,8 @@ force_updates="no" +@@ -1422,25 +1422,14 @@ force_wget="no" enable_log="no" custom_config="no" we_have_a_config="0" +pkg_mgr="FreeBSD ports" +pkg_rm="pkg delete" - # Solaris which function returns garbage when the program is not found - # only define the new which function if running under Solaris -@@ -1455,7 +1457,7 @@ for config_file in "${config_files[@]}" +- +-# Attempt to scan for a valid config dir +-if [ -f "/etc/clamav-unofficial-sigs/master.conf" ] ; then +- config_dir="/etc/clamav-unofficial-sigs" +-elif [ -f "/usr/local/etc/clamav-unofficial-sigs/master.conf" ] ; then +- config_dir="/usr/local/etc/clamav-unofficial-sigs/" +-elif [ -f "/opt/zimbra/config/clamav-unofficial-sigs/master.conf" ] ; then +- config_dir="/opt/zimbra/config/clamav-unofficial-sigs/" +-else +- xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found" +- exit 1 +-fi + # Default config files ++config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs" + config_files=("${config_dir}/master.conf") +-#find the a suitable os.conf or os.*.conf file +-config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)" +-if [ -r "${config_file}" ]; then +- config_files+=( "${config_file}" ) ++if [ -r "${config_dir}/os.conf" ] ; then ++ config_files+=( "${config_dir}/os.conf" ) + fi + if [ -r "${config_dir}/user.conf" ] ; then + config_files+=( "${config_dir}/user.conf" ) +@@ -1576,10 +1565,8 @@ if [ "$custom_config" != "no" ] ; then + else + xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found" + fi +- #find the a suitable os.conf or os.*.conf file +- config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)" +- if [ -r "${config_file}" ] ; then +- config_files+=( "${config_file}" ) ++ if [ -r "${config_dir}/os.conf" ] ; then ++ config_files+=( "${config_dir}/os.conf" ) + else + xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found" + fi +@@ -1625,7 +1612,7 @@ for config_file in "${config_files[@]}" ; do # Delete both trailing and leading whitespace # Delete all trailing whitespace # Delete all empty lines @@ -27,7 +53,7 @@ fi #fix eval of | -@@ -1470,7 +1472,7 @@ for config_file in "${config_files[@]}" +@@ -1640,7 +1627,7 @@ for config_file in "${config_files[@]}" ; do fi # Check there is an = for every set of "" optional whitespace \s* between = and " @@ -35,27 +61,32 @@ + config_check_vars="$(echo "$clean_config" | $grep_bin -c '=[[:space:]]*\"' )" if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then - xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\"" "=" -@@ -2131,20 +2133,11 @@ if [ "$sanesecurity_enabled" == "yes" ] + xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\"" +@@ -2316,24 +2303,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then + echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt" xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "=" xshok_pretty_echo_and_log "Checking for Sanesecurity updates..." - -- sanesecurity_mirror_ips="$(dig +ignore +short "$sanesecurity_url")" +- # shellcheck disable=SC2086 +- sanesecurity_mirror_ips="$(dig $dig_proxy +ignore +short "$sanesecurity_url")" - # Add fallback to host if dig returns no records - if [ ${#sanesecurity_mirror_ips} -lt 1 ] ; then -- sanesecurity_mirror_ips="$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')" +- # shellcheck disable=SC2086 +- sanesecurity_mirror_ips="$(host $host_proxy -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')" - fi -+ sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//') ++ sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//') ++ if [ ${#sanesecurity_mirror_ips} -ge 1 ] ; then for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do - sanesecurity_mirror_name="" -- sanesecurity_mirror_name="$(dig +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')" +- # shellcheck disable=SC2086 +- sanesecurity_mirror_name="$(dig $dig_proxy +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')" - # Add fallback to host if dig returns no records - if [ -z "$sanesecurity_mirror_name" ] ; then -- sanesecurity_mirror_name="$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')" +- # shellcheck disable=SC2086 +- sanesecurity_mirror_name="$(host $host_proxy "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')" - fi + sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | sed 's/\.$//') sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip" - xshok_pretty_echo_and_log "Sanesecurity mirror site used: $sanesecurity_mirror_site_info" + xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}" # shellcheck disable=SC2086 diff --git a/security/clamav-unofficial-sigs/files/patch-config_master.conf b/security/clamav-unofficial-sigs/files/patch-config_master.conf index a4cc571eed8..8da0aa55749 100644 --- a/security/clamav-unofficial-sigs/files/patch-config_master.conf +++ b/security/clamav-unofficial-sigs/files/patch-config_master.conf @@ -1,4 +1,4 @@ ---- config/master.conf.orig 2017-03-18 11:57:29 UTC +--- config/master.conf.orig 2019-09-02 22:41:48 UTC +++ config/master.conf @@ -63,8 +63,8 @@ clamd_reload_opt="clamdscan --reload" work_dir="/var/lib/clamav-unofficial-sigs" #Top level working directory @@ -9,14 +9,14 @@ +logging_enabled="no" +log_file_path="/var/log" log_file_name="clamav-unofficial-sigs.log" + ## Use a program to log messages + #log_pipe_cmd="/usr/bin/logger -it 'clamav-unofficial-sigs'" +@@ -487,8 +487,6 @@ selinux_fixes="no" # Default is "no" ignore ssl errors + #rsync_proxy="username:password@proxy_host:proxy_port" + #curl_proxy="--proxy http://username:password@proxy_host:proxy_port" + #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port" +-#dig_proxy="@proxy_host -p proxy_host:proxy_port" +-#host_proxy="@proxy_host" #does not support port - -@@ -125,7 +125,7 @@ yararulesproject_enabled="yes" # Yara- - additional_enabled="yes" # Additional Databases - - ## Disabling this will also cause the yararulesproject to be disabled. --enable_yararules="yes" #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99 -+enable_yararules="no" #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99 - - # ======================== - # eXtremeSHOK Database format + # Custom Cron install settings, these are detected and only used if you want to override + # the automatic detection and generation of the values when not set, this is mainly to aid package maintainers diff --git a/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf b/security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf similarity index 72% rename from security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf rename to security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf index e2f6d5b49a0..5f210076bc9 100644 --- a/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf +++ b/security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf @@ -1,5 +1,5 @@ ---- config/os.freebsd.conf.orig 2017-03-18 11:57:29 UTC -+++ config/os.freebsd.conf +--- config/os/os.freebsd.conf.orig 2019-09-02 22:41:48 UTC ++++ config/os/os.freebsd.conf @@ -29,8 +29,6 @@ clamd_pid="/var/run/clamav/clamd.pid" work_dir="/var/db/clamav-unofficial-sigs" diff --git a/security/clamav-unofficial-sigs/files/patch-config_user.conf b/security/clamav-unofficial-sigs/files/patch-config_user.conf new file mode 100644 index 00000000000..0d9405cd957 --- /dev/null +++ b/security/clamav-unofficial-sigs/files/patch-config_user.conf @@ -0,0 +1,18 @@ +--- config/user.conf.orig 2019-09-02 22:41:48 UTC ++++ config/user.conf +@@ -49,14 +49,12 @@ + #) #END ADDITIONAL DATABASES + + # Uncomment the following line to enable the script +-user_configuration_complete="yes" ++#user_configuration_complete="yes" + + # Proxy Support + # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here. + #rsync_proxy="username:password@proxy_host:proxy_port" + #curl_proxy="--proxy http://username:password@proxy_host:proxy_port" + #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port" +-#dig_proxy="@proxy_host -p proxy_host:proxy_port" +-#host_proxy="@proxy_host" #does not support port + + # https://eXtremeSHOK.com ###################################################### diff --git a/security/clamav-unofficial-sigs/pkg-plist b/security/clamav-unofficial-sigs/pkg-plist index 25033b83c06..1c0aced7726 100644 --- a/security/clamav-unofficial-sigs/pkg-plist +++ b/security/clamav-unofficial-sigs/pkg-plist @@ -3,6 +3,6 @@ bin/clamav-unofficial-sigs.sh @sample %%ETCDIR%%/os.conf.sample @sample %%ETCDIR%%/user.conf.sample man/man8/clamav-unofficial-sigs.8.gz -%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/security/fsh/files/patch-Makefile.in b/security/fsh/files/patch-Makefile.in new file mode 100644 index 00000000000..bff959202cb --- /dev/null +++ b/security/fsh/files/patch-Makefile.in @@ -0,0 +1,71 @@ +--- Makefile.in.orig 2001-12-23 11:10:13 UTC ++++ Makefile.in +@@ -40,7 +40,7 @@ exec_prefix = @exec_prefix@ + + bindir = @bindir@ + sbindir = @sbindir@ +-libexecdir = @libexecdir@ ++libexecdir = @ac_libexecdir@ + datadir = @datadir@ + sysconfdir = @sysconfdir@ + sharedstatedir = @sharedstatedir@ +@@ -81,7 +81,7 @@ EXEEXT = @EXEEXT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +-PYTHON = @PYTHON@ ++PYTHON = @PYTHON_CMD@ + VERSION = @VERSION@ + am__include = @am__include@ + am__quote = @am__quote@ +@@ -576,16 +576,16 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am \ + + starter: Makefile $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE) + rm -f $@ $@.tmp +- sed -e 's%@\PYTHON@%$(PYTHON)%' \ +- -e 's%@\pkgdatadir@%$(pkgdatadir)%' \ ++ sed -e 's%@PYTHON@%$(PYTHON)%' \ ++ -e 's%@pkgdatadir@%$(pkgdatadir)%' \ + < $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE) > $@.tmp + mv $@.tmp $@ + + fsh: fsh.in Makefile starter + rm -f $@ $@.tmp + cat starter > $@.tmp +- sed -e 's%@\PYTHON@%$(PYTHON)%' \ +- -e 's%@\pkgdatadir@%$(pkgdatadir)%' \ ++ sed -e 's%@PYTHON@%$(PYTHON)%' \ ++ -e 's%@pkgdatadir@%$(pkgdatadir)%' \ + < $(srcdir)/fsh.in >> $@.tmp + chmod +x $@.tmp + mv $@.tmp $@ +@@ -593,8 +593,8 @@ fsh: fsh.in Makefile starter + fshd: fshd.in Makefile starter + rm -f $@ $@.tmp + cat starter > $@.tmp +- sed -e 's%@\PYTHON@%$(PYTHON)%' \ +- -e 's%@\pkgdatadir@%$(pkgdatadir)%' \ ++ sed -e 's%@PYTHON@%$(PYTHON)%' \ ++ -e 's%@pkgdatadir@%$(pkgdatadir)%' \ + < $(srcdir)/fshd.in >> $@.tmp + chmod +x $@.tmp + mv $@.tmp $@ +@@ -602,15 +602,15 @@ fshd: fshd.in Makefile starter + in.fshd: in.fshd.in Makefile starter + rm -f $@ $@.tmp + cat starter > $@.tmp +- sed -e 's%@\PYTHON@%$(PYTHON)%' \ +- -e 's%@\pkgdatadir@%$(pkgdatadir)%' \ ++ sed -e 's%@PYTHON@%$(PYTHON)%' \ ++ -e 's%@pkgdatadir@%$(pkgdatadir)%' \ + < $(srcdir)/in.fshd.in >> $@.tmp + chmod +x $@.tmp + mv $@.tmp $@ + + fcp: fcp.sh Makefile + rm -f $@ $@.tmp +- sed -e 's%@\libexecdir@%$(libexecdir)%g' \ ++ sed -e 's%@libexecdir@%$(libexecdir)%g' \ + < $(srcdir)/fcp.sh > $@.tmp + chmod +x $@.tmp + mv $@.tmp $@ diff --git a/security/fsh/files/patch-configure b/security/fsh/files/patch-configure new file mode 100644 index 00000000000..97c9c2f829b --- /dev/null +++ b/security/fsh/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig 2001-12-23 11:10:13 UTC ++++ configure +@@ -2732,7 +2732,7 @@ s,@prefix@,$prefix,;t t + s,@program_transform_name@,$program_transform_name,;t t + s,@bindir@,$bindir,;t t + s,@sbindir@,$sbindir,;t t +-s,@libexecdir@,$libexecdir,;t t ++s,@ac_libexecdir@,$libexecdir,;t t + s,@datadir@,$datadir,;t t + s,@sysconfdir@,$sysconfdir,;t t + s,@sharedstatedir@,$sharedstatedir,;t t +@@ -2778,7 +2778,7 @@ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t + s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t + s,@DEPDIR@,$DEPDIR,;t t + s,@DEFAULT_FSHD_TIMEOUT@,$DEFAULT_FSHD_TIMEOUT,;t t +-s,@PYTHON@,$PYTHON,;t t ++s,@PYTHON_CMD@,$PYTHON,;t t + s,@PYTHON_SCRIPT_TEMPLATE@,$PYTHON_SCRIPT_TEMPLATE,;t t + s,@CC@,$CC,;t t + s,@CFLAGS@,$CFLAGS,;t t diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index bc89487807c..b0313667460 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -2,18 +2,22 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 201907 +DISTVERSION= 201935 CATEGORIES= security net net-vpn MASTER_SITES= https://secure-computing.net/files/openvpn/ \ ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/ PKGNAMESUFFIX= -devel MAINTAINER= ecrist@secure-computing.net +# let's use ?= in spite of portlint WARNings because this might become +# security/openvpn one day which would then have a slave port: COMMENT?= Secure IP/Ethernet tunnel daemon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYRIGHT.GPL +IGNORE_SSL= libressl libressl-devel + USES= cpe libtool pkgconfig shebangfix tar:xz CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* @@ -41,7 +45,7 @@ OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL MBEDTLS PKCS11_DESC= Use security/pkcs11-helper EASYRSA_DESC= Install security/easy-rsa RSA helper package -MBEDTLS_DESC= SSL/TLS via mbedTLS +MBEDTLS_DESC= SSL/TLS via mbedTLS (lacks TLS v1.3) TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) SMALL_DESC= Build a smaller executable with fewer features @@ -71,7 +75,6 @@ MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MBEDTLS_CONFIGURE_ON= --with-crypto-library=mbedtls USE_RC_SUBR= openvpn -USE_LDCONFIG= ${PREFIX}/lib SUB_FILES= pkg-message openvpn-client @@ -115,22 +118,11 @@ _tlslibs=libmbedtls libmbedx509 libmbedcrypto _tlslibs=libssl libcrypto .endif -.if ${SSL_DEFAULT:Mlibressl*} && empty(PORT_OPTIONS:MMBEDTLS) -pre-everything:: - @${ECHO_CMD} "WARNING: OpenVPN does not officially support LibreSSL." - @${ECHO_CMD} "If things break, rebuild with OpenSSL or mbedTLS." - @${ECHO_CMD} "You may wish to change your default SSL library" - @${ECHO_CMD} "and press Ctrl+C within the next 10 seconds to abort." -. if !(defined(PACKAGE_BUILDING) || defined(BATCH)) - @sleep 10 -. endif -.endif - # sanity check that we don't inherit incompatible SSL libs through, # for instance, pkcs11-helper: post-build: - @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ - | ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\ + @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \ + | ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\ if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi post-install: diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo index 54ac2c92d6c..62ae5f2d271 100644 --- a/security/openvpn-devel/distinfo +++ b/security/openvpn-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1550580278 -SHA256 (openvpn-201907.tar.xz) = 1e2394ca6582877c90fc3d9948cfb1b1c1aaa2383c02af62410d5a51f812ff68 -SIZE (openvpn-201907.tar.xz) = 995288 +TIMESTAMP = 1567798649 +SHA256 (openvpn-201935.tar.xz) = a34dc87188ae38f148e99cc129db2ed05e33c7b41237373b34b5d711481cfc5f +SIZE (openvpn-201935.tar.xz) = 1002220 diff --git a/security/openvpn-devel/files/patch-configure b/security/openvpn-devel/files/patch-configure deleted file mode 100644 index 22643631427..00000000000 --- a/security/openvpn-devel/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2016-08-23 14:19:07 UTC -+++ configure -@@ -17160,8 +17160,6 @@ fi - $as_echo "!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed." >&6; } - fi - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: !! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&5 --$as_echo "!! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&6; } - if false; then - CMOCKA_INITIALIZED_TRUE= - CMOCKA_INITIALIZED_FALSE='#' diff --git a/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h b/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h new file mode 100644 index 00000000000..4f72e79ef42 --- /dev/null +++ b/security/openvpn-devel/files/patch-src_openvpn_openssl__compat.h @@ -0,0 +1,20 @@ +--- src/openvpn/openssl_compat.h.orig 2019-02-20 12:28:23 UTC ++++ src/openvpn/openssl_compat.h +@@ -735,7 +735,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) + } + #endif /* SSL_CTX_get_max_proto_version */ + +-#ifndef SSL_CTX_set_min_proto_version ++#if !defined(SSL_CTX_set_min_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) + /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */ + static inline int + SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) +@@ -764,7 +764,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v + } + #endif /* SSL_CTX_set_min_proto_version */ + +-#ifndef SSL_CTX_set_max_proto_version ++#if !defined(SSL_CTX_set_max_proto_version) && !defined(LIBRESSL_VERSION_NUMBER) + /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */ + static inline int + SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max) diff --git a/security/openvpn-devel/files/patch-tests_t__lpback.sh b/security/openvpn-devel/files/patch-tests_t__lpback.sh new file mode 100644 index 00000000000..c92fb42135f --- /dev/null +++ b/security/openvpn-devel/files/patch-tests_t__lpback.sh @@ -0,0 +1,11 @@ +--- tests/t_lpback.sh.orig 2019-09-03 13:22:50 UTC ++++ tests/t_lpback.sh +@@ -26,7 +26,7 @@ trap "rm -f key.$$ tc-server-key.$$ tc-client-key.$$ l + + # Get list of supported ciphers from openvpn --show-ciphers output + CIPHERS=$(${top_builddir}/src/openvpn/openvpn --show-ciphers | \ +- sed -e '/The following/,/^$/d' -e s'/ .*//' -e '/^\s*$/d') ++ sed -e '/The following/,/^$/d' -e s'/ .*//' -e '/^[[:space:]]*$/d') + + # SK, 2014-06-04: currently the DES-EDE3-CFB1 implementation of OpenSSL is + # broken (see http://rt.openssl.org/Ticket/Display.html?id=2867), so exclude diff --git a/security/openvpn-devel/pkg-descr b/security/openvpn-devel/pkg-descr index 6c45b3e18a4..983b0a980f5 100644 --- a/security/openvpn-devel/pkg-descr +++ b/security/openvpn-devel/pkg-descr @@ -10,4 +10,4 @@ there is a good chance this program will not run. DO NOT USE IN PRODUCTION WITHOUT CAUTION -WWW: http://openvpn.net/ +WWW: http://openvpn.net/index.php/open-source.html diff --git a/security/openvpn-devel/pkg-help b/security/openvpn-devel/pkg-help new file mode 100644 index 00000000000..9fd1cd9567b --- /dev/null +++ b/security/openvpn-devel/pkg-help @@ -0,0 +1,10 @@ +Note that "Tunnelblick" is a controversial option. +It is included for compatibility, not enabled by default, +and should only be used with due consideration, and it should not +replace proper cryptography use in OpenVPN. + +Note that this patch does NOT add documentation for the new --scramble +option, neither to the --help output, nor the manual page. + +Please see this website for a more detailed discussion: +https://tunnelblick.net/cOpenvpn_xorpatch.html diff --git a/security/py-netmiko/Makefile b/security/py-netmiko/Makefile index 4bda2390310..ca78feb9b60 100644 --- a/security/py-netmiko/Makefile +++ b/security/py-netmiko/Makefile @@ -2,7 +2,7 @@ PORTNAME= netmiko DISTVERSIONPREFIX= v -DISTVERSION= 2.4.1 +DISTVERSION= 2.4.2 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-netmiko/distinfo b/security/py-netmiko/distinfo index a81ef6d5678..199a00b3a17 100644 --- a/security/py-netmiko/distinfo +++ b/security/py-netmiko/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564514350 -SHA256 (ktbyers-netmiko-v2.4.1_GH0.tar.gz) = 6e42d7aed9ad3f9a766b3a389e9f22b7f3e85f2920f03cea6e6180cffb5cff6a -SIZE (ktbyers-netmiko-v2.4.1_GH0.tar.gz) = 562838 +TIMESTAMP = 1567932822 +SHA256 (ktbyers-netmiko-v2.4.2_GH0.tar.gz) = 02f6d1eafa5588ae89a7ba01f9a0c65089aded8cfedef7bd8d61a1255bf2b4f7 +SIZE (ktbyers-netmiko-v2.4.2_GH0.tar.gz) = 574322 diff --git a/security/suricata5/Makefile b/security/suricata5/Makefile new file mode 100644 index 00000000000..aae5fc7edf0 --- /dev/null +++ b/security/suricata5/Makefile @@ -0,0 +1,121 @@ +# Created by: Muhammad Moinur Rahman +# $FreeBSD$ + +PORTNAME= suricata +DISTVERSION= 5.0.0-beta1 +CATEGORIES= security +MASTER_SITES= https://www.openinfosecfoundation.org/download/ +PKGNAMESUFFIX= 5 + +MAINTAINER= bofh@FreeBSD.org +COMMENT= High Performance Network IDS, IPS and Security Monitoring engine(v5) + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} +LIB_DEPENDS= libjansson.so:devel/jansson \ + liblz4.so:archivers/liblz4 \ + libnet.so:net/libnet \ + libpcre.so:devel/pcre \ + libyaml.so:textproc/libyaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} + +USES= autoreconf cpe libtool pkgconfig python +USE_LDCONFIG= yes +USE_PYTHON= py3kplist +USE_RC_SUBR= ${PORTNAME} + +CONFLICTS_INSTALL=libhtp + +GNU_CONFIGURE= yes + +CPE_VENDOR= openinfosecfoundation + +INSTALL_TARGET= install-strip +TEST_TARGET= check + +OPTIONS_DEFINE= GEOIP IPFW NSS PORTS_PCAP PRELUDE REDIS TESTS +OPTIONS_DEFINE_amd64= HYPERSCAN +OPTIONS_DEFAULT= IPFW HYPERSCAN +OPTIONS_SUB= yes + +OPTIONS_RADIO= SCRIPTS +OPTIONS_RADIO_SCRIPTS= LUA LUAJIT + +SCRIPTS_DESC= Scripting +HYPERSCAN_DESC= Hyperscan support +IPFW_DESC= IPFW and IP Divert support for inline IDP +LUAJIT_DESC= LuaJIT scripting support +LUA_DESC= LUA scripting support +NSS_DESC= File checksums and SSL/TLS fingerprinting +PORTS_PCAP_DESC= Use libpcap from ports +PRELUDE_DESC= Prelude support for NIDS alerts +REDIS_DESC= Redis output support +TESTS_DESC= Unit tests in suricata binary + +GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb +GEOIP_CONFIGURE_ENABLE= geoip +HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan +IPFW_CONFIGURE_ON= --enable-ipfw +LUA_USES= lua:51 +LUA_CONFIGURE_ENABLE= lua +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_CONFIGURE_ENABLE=luajit +NSS_LIB_DEPENDS= libnss3.so:security/nss \ + libnspr4.so:devel/nspr +NSS_CONFIGURE_ENABLE= nss nspr +PORTS_PCAP_LIB_DEPENDS= libpcap.so.1:net/libpcap +PORTS_PCAP_CONFIGURE_ON= --with-libpcap-includes=${LOCALBASE}/include \ + --with-libpcap-libraries=${LOCALBASE}/lib +PORTS_PCAP_CONFIGURE_OFF= --with-libpcap-includes=/usr/include \ + --with-libpcap-libraries=/usr/lib +PRELUDE_LIB_DEPENDS= libprelude.so:security/libprelude \ + libgnutls.so:security/gnutls \ + libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error \ + libltdl.so:devel/libltdl +PRELUDE_CONFIGURE_ENABLE= prelude +REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis +REDIS_CONFIGURE_ENABLE= hiredis +TESTS_CONFIGURE_ENABLE= unittests + +SUB_FILES= pkg-message + +CONFIGURE_ARGS+=--enable-gccprotect \ + --enable-bundled-htp \ + --disable-gccmarch-native \ + --enable-netmap \ + --disable-af-packet \ + --disable-nflog \ + --disable-nfqueue \ + --disable-pfring \ + --disable-windivert \ + --disable-ebpf-build \ + --disable-ebpf + +CONFIG_DIR?= ${ETCDIR} +CONFIG_FILES= suricata.yaml classification.config reference.config threshold.config +LOGS_DIR?= /var/log/${PORTNAME} + +pre-patch: + @${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4 + +post-patch: + @${REINPLACE_CMD} -e "/AC_PATH_PROGS.*HAVE_PYTHON/ s/python[^,]*,/${PYTHON_VERSION},/g" \ + ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e "s|GeoIP.h|maxminddb.h|g" \ + ${WRKSRC}/configure.ac + +post-install: + @${MKDIR} ${STAGEDIR}${CONFIG_DIR} + @${MKDIR} ${STAGEDIR}${LOGS_DIR} +.for f in ${CONFIG_FILES} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample +.endfor + (cd ${STAGEDIR}${PREFIX} \ + && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) + +.include diff --git a/security/suricata5/distinfo b/security/suricata5/distinfo new file mode 100644 index 00000000000..c0527b5be1a --- /dev/null +++ b/security/suricata5/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567633319 +SHA256 (suricata-5.0.0-beta1.tar.gz) = 5b8398676a598caf003dd2d8573d276385594277f4c5f09e26059a8252d993d5 +SIZE (suricata-5.0.0-beta1.tar.gz) = 15649004 diff --git a/security/suricata5/files/ax_check_compile_flag.m4 b/security/suricata5/files/ax_check_compile_flag.m4 new file mode 100644 index 00000000000..51df0c09a7a --- /dev/null +++ b/security/suricata5/files/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff --git a/security/suricata5/files/patch-configure.ac b/security/suricata5/files/patch-configure.ac new file mode 100644 index 00000000000..6469c5417da --- /dev/null +++ b/security/suricata5/files/patch-configure.ac @@ -0,0 +1,15 @@ +--- configure.ac.orig 2017-02-15 07:54:17 UTC ++++ configure.ac +@@ -935,8 +935,10 @@ + AS_HELP_STRING([--enable-prelude], [Enable Prelude support for alerts]),,[enable_prelude=no]) + # Prelude doesn't work with -Werror + STORECFLAGS="${CFLAGS}" +- CFLAGS="${CFLAGS} -Wno-error=unused-result" +- ++ AX_CHECK_COMPILE_FLAG([-Wno-error=unused-result], ++ [CFLAGS="${CFLAGS} -Wno-error=unused-result"], ++ []) ++ + AS_IF([test "x$enable_prelude" = "xyes"], [ + AM_PATH_LIBPRELUDE(0.9.9, , AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?), no) + if test "x${LIBPRELUDE_CFLAGS}" != "x"; then diff --git a/security/suricata5/files/pkg-message.in b/security/suricata5/files/pkg-message.in new file mode 100644 index 00000000000..60c8ede0684 --- /dev/null +++ b/security/suricata5/files/pkg-message.in @@ -0,0 +1,46 @@ +[ +{ type: install + message: < /dev/null; then + rm -f "$pidfile" + fi +} + +run_rc_command "$1" diff --git a/security/suricata5/pkg-descr b/security/suricata5/pkg-descr new file mode 100644 index 00000000000..9bab4ae33cf --- /dev/null +++ b/security/suricata5/pkg-descr @@ -0,0 +1,17 @@ +The Suricata Engine is an Open Source Next Generation Intrusion Detection and +Prevention Engine developed by the Open Information Security Foundation (OISF). + +This engine is not intended to just replace or emulate the existing tools in +the industry, but will bring new ideas and technologies to the field. + +OISF is part of and funded by the Department of Homeland Security's Directorate +for Science and Technology HOST program (Homeland Open Security Technology), +by the Navy's Space and Naval Warfare Systems Command (SPAWAR), as well as +through the very generous support of the members of the OISF Consortium. + +More information about the Consortium is available, as well as a list of our +current Consortium Members. + +This is upcoming version 5. + +WWW: https://suricata-ids.org diff --git a/security/suricata5/pkg-plist b/security/suricata5/pkg-plist new file mode 100644 index 00000000000..acf5f604edc --- /dev/null +++ b/security/suricata5/pkg-plist @@ -0,0 +1,154 @@ +bin/suricata +bin/suricata-update +bin/suricatactl +bin/suricatasc +include/htp/bstr.h +include/htp/bstr_builder.h +include/htp/htp.h +include/htp/htp_base64.h +include/htp/htp_config.h +include/htp/htp_connection_parser.h +include/htp/htp_core.h +include/htp/htp_decompressors.h +include/htp/htp_hooks.h +include/htp/htp_list.h +include/htp/htp_multipart.h +include/htp/htp_table.h +include/htp/htp_transaction.h +include/htp/htp_urlencoded.h +include/htp/htp_utf8_decoder.h +include/htp/htp_version.h +lib/libhtp.a +lib/libhtp.so +lib/libhtp.so.2 +lib/libhtp.so.2.0.0 +libdata/pkgconfig/htp.pc +man/man1/suricata.1.gz +%%DOCSDIR%%/AUTHORS +%%DOCSDIR%%/Basic_Setup.txt +%%DOCSDIR%%/GITGUIDE +%%DOCSDIR%%/INSTALL +%%DOCSDIR%%/INSTALL.PF_RING +%%DOCSDIR%%/INSTALL.WINDOWS +%%DOCSDIR%%/NEWS +%%DOCSDIR%%/README +%%DOCSDIR%%/Setting_up_IPSinline_for_Linux.txt +%%DOCSDIR%%/TODO +%%DOCSDIR%%/Third_Party_Installation_Guides.txt +%%PYTHON_SITELIBDIR%%/suricata-5.0.0_beta1-py%%PYTHON_VER%%.egg-info +%%PYTHON_SITELIBDIR%%/suricata/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/config/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/config/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/config/defaults.py +%%PYTHON_SITELIBDIR%%/suricata/config/defaults.pyc +%%PYTHON_SITELIBDIR%%/suricata/ctl/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/ctl/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/ctl/filestore.py +%%PYTHON_SITELIBDIR%%/suricata/ctl/filestore.pyc +%%PYTHON_SITELIBDIR%%/suricata/ctl/loghandler.py +%%PYTHON_SITELIBDIR%%/suricata/ctl/loghandler.pyc +%%PYTHON_SITELIBDIR%%/suricata/ctl/main.py +%%PYTHON_SITELIBDIR%%/suricata/ctl/main.pyc +%%PYTHON_SITELIBDIR%%/suricata/ctl/test_filestore.py +%%PYTHON_SITELIBDIR%%/suricata/ctl/test_filestore.pyc +%%PYTHON_SITELIBDIR%%/suricata/sc/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/sc/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/sc/__pycache__/specs.cpython-36.pyc +%%PYTHON_SITELIBDIR%%/suricata/sc/specs.py +%%PYTHON_SITELIBDIR%%/suricata/sc/suricatasc.py +%%PYTHON_SITELIBDIR%%/suricata/sc/suricatasc.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/update/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/addsource.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/addsource.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/disablesource.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/enablesource.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/listenabledsources.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/listsources.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/removesource.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/commands/updatesources.py +%%PYTHON_SITELIBDIR%%/suricata/update/commands/updatesources.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/compat/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/update/compat/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/argparse.py +%%PYTHON_SITELIBDIR%%/suricata/update/compat/argparse/argparse.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/compat/ordereddict.py +%%PYTHON_SITELIBDIR%%/suricata/update/compat/ordereddict.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/config.py +%%PYTHON_SITELIBDIR%%/suricata/update/config.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/configs/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/update/configs/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/configs/disable.conf +%%PYTHON_SITELIBDIR%%/suricata/update/configs/drop.conf +%%PYTHON_SITELIBDIR%%/suricata/update/configs/enable.conf +%%PYTHON_SITELIBDIR%%/suricata/update/configs/modify.conf +%%PYTHON_SITELIBDIR%%/suricata/update/configs/threshold.in +%%PYTHON_SITELIBDIR%%/suricata/update/configs/update.yaml +%%PYTHON_SITELIBDIR%%/suricata/update/data/__init__.py +%%PYTHON_SITELIBDIR%%/suricata/update/data/__init__.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/data/index.py +%%PYTHON_SITELIBDIR%%/suricata/update/data/index.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/data/update.py +%%PYTHON_SITELIBDIR%%/suricata/update/data/update.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/engine.py +%%PYTHON_SITELIBDIR%%/suricata/update/engine.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/exceptions.py +%%PYTHON_SITELIBDIR%%/suricata/update/exceptions.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/extract.py +%%PYTHON_SITELIBDIR%%/suricata/update/extract.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/loghandler.py +%%PYTHON_SITELIBDIR%%/suricata/update/loghandler.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/main.py +%%PYTHON_SITELIBDIR%%/suricata/update/main.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/maps.py +%%PYTHON_SITELIBDIR%%/suricata/update/maps.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/net.py +%%PYTHON_SITELIBDIR%%/suricata/update/net.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/notes.py +%%PYTHON_SITELIBDIR%%/suricata/update/notes.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/rule.py +%%PYTHON_SITELIBDIR%%/suricata/update/rule.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/sources.py +%%PYTHON_SITELIBDIR%%/suricata/update/sources.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/util.py +%%PYTHON_SITELIBDIR%%/suricata/update/util.pyc +%%PYTHON_SITELIBDIR%%/suricata/update/version.py +%%PYTHON_SITELIBDIR%%/suricata/update/version.pyc +%%PYTHON_SITELIBDIR%%/suricata_update-1.0.5-py%%PYTHON_VER%%.egg-info +%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py +%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc +@sample %%ETCDIR%%/classification.config.sample +@sample %%ETCDIR%%/reference.config.sample +@sample %%ETCDIR%%/suricata.yaml.sample +@sample %%ETCDIR%%/threshold.config.sample +%%DATADIR%%/rules/app-layer-events.rules +%%DATADIR%%/rules/decoder-events.rules +%%DATADIR%%/rules/dnp3-events.rules +%%DATADIR%%/rules/dns-events.rules +%%DATADIR%%/rules/files.rules +%%DATADIR%%/rules/http-events.rules +%%DATADIR%%/rules/ipsec-events.rules +%%DATADIR%%/rules/kerberos-events.rules +%%DATADIR%%/rules/modbus-events.rules +%%DATADIR%%/rules/nfs-events.rules +%%DATADIR%%/rules/ntp-events.rules +%%DATADIR%%/rules/smb-events.rules +%%DATADIR%%/rules/smtp-events.rules +%%DATADIR%%/rules/stream-events.rules +%%DATADIR%%/rules/tls-events.rules +@dir %%DATADIR%% +@dir %%ETCDIR%% +@dir include/htp +@dir(root,wheel,0700) /var/log/suricata +@postunexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, run ``rm -rf ${PKG_PREFIX}/%%ETCDIR%%`` to remove configuration files."; fi +@dir %%DOCSDIR%% diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile index 5ee487488d5..c947ebfca9a 100644 --- a/sysutils/backuppc-devel/Makefile +++ b/sysutils/backuppc-devel/Makefile @@ -18,13 +18,14 @@ RUN_DEPENDS= p5-CGI>0:www/p5-CGI \ p5-File-Listing>=0:sysutils/p5-File-Listing \ p5-BackupPC-XS>=0.57:sysutils/p5-BackupPC-XS +USES= perl5 + .if defined(QEMU_EMULATING) && "${QEMU_EMULATING}" == "1" BROKEN= fails to build under qemu: uncaught target signal 11 (Segmetation fault) - core dumped .endif -CONFLICTS= backuppc backuppc4 +CONFLICTS_INSTALL= backuppc backuppc4 -USES= perl5 USE_GITHUB= yes GH_TAGNAME= 3990160 USE_PERL5= extract diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile index a20d19a6f6b..9bf3fda9cc9 100644 --- a/sysutils/backuppc/Makefile +++ b/sysutils/backuppc/Makefile @@ -18,11 +18,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= p5-CGI>0:www/p5-CGI \ p5-File-Listing>=0:sysutils/p5-File-Listing -CONFLICTS= backuppc-devel-[0-9]* +USES= cpe perl5 + +CONFLICTS_INSTALL= backuppc4 backuppc-devel USE_RC_SUBR= backuppc - -USES= cpe perl5 CPE_VENDOR= craig_barratt NO_ARCH= yes NO_BUILD= yes diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile index e18aa707f0b..0f324f514da 100644 --- a/sysutils/bsdisks/Makefile +++ b/sysutils/bsdisks/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bsdisks -DISTVERSION= 0.8 -PORTREVISION= 1 +DISTVERSION= 0.9 CATEGORIES= sysutils MASTER_SITES= https://bitbucket.org/arrowd/bsdisks/downloads/ diff --git a/sysutils/bsdisks/distinfo b/sysutils/bsdisks/distinfo index e86e577f12a..b8746f973bd 100644 --- a/sysutils/bsdisks/distinfo +++ b/sysutils/bsdisks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555260849 -SHA256 (bsdisks-0.8.tar.gz) = 85212f3e88a52691ddb1059eb620416035eec409e302237a1f518b13025743b1 -SIZE (bsdisks-0.8.tar.gz) = 94925 +TIMESTAMP = 1567954257 +SHA256 (bsdisks-0.9.tar.gz) = 273ea0ca76570575786e13167f9c41afe68d611083e943c795db1a989efe800b +SIZE (bsdisks-0.9.tar.gz) = 101181 diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile index e99337db15b..68b315d16aa 100644 --- a/sysutils/cinnamon-settings-daemon/Makefile +++ b/sysutils/cinnamon-settings-daemon/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinnamon-settings-daemon PORTVERSION= 2.4.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome DIST_SUBDIR= gnome3 @@ -33,7 +33,6 @@ USE_GNOME= gnomeprefix intlhack libgnomekbd \ libxslt:build USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_XORG= xxf86misc GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/sysutils/cmdwatch/Makefile b/sysutils/cmdwatch/Makefile index 806af86faad..3aed4cedde9 100644 --- a/sysutils/cmdwatch/Makefile +++ b/sysutils/cmdwatch/Makefile @@ -10,6 +10,8 @@ MASTER_SITES= http://www.chruetertee.ch/files/download/ MAINTAINER= beat@FreeBSD.org COMMENT= Watches the output from a command at specified intervals +LICENSE= GPLv2+ + USE_HARDENING= pie:off USES= ncurses diff --git a/sysutils/consul-replicate/Makefile b/sysutils/consul-replicate/Makefile index e8a7e549c2b..bb881fc72ce 100644 --- a/sysutils/consul-replicate/Makefile +++ b/sysutils/consul-replicate/Makefile @@ -11,11 +11,17 @@ COMMENT= Consul cross-DC KV replication daemon LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= compiler go +USES= go USE_GITHUB= yes GH_ACCOUNT= hashicorp -GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} + +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_BUILDFLAGS= -ldflags="\ + -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION} \ + -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2 \ + -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \ + " USE_RC_SUBR= consul-replicate @@ -24,29 +30,4 @@ PLIST_FILES= bin/${PORTNAME} USERS= consul GROUPS= consul -post-extract: - @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ - -do-build: - @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \ - ${SETENV} CGO_ENABLED=0 ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} \ - go build -v -x -ldflags "\ - -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${PORTVERSION} \ - -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=675a2c2 \ - -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitDescribe=v${PORTVERSION} \ - " -o bin/${PORTNAME} - -do-install: - ${INSTALL_PROGRAM} \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - -.include - -# golang assumes that if clang is in use, it is called "clang" and not "cc". If -# it's called "cc", go fails. -.if ${COMPILER_TYPE} == clang -BUILD_ENV= CC=clang -.endif - -.include +.include diff --git a/sysutils/eksctl/Makefile b/sysutils/eksctl/Makefile index 7b17c493fb2..37597f9684d 100644 --- a/sysutils/eksctl/Makefile +++ b/sysutils/eksctl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= eksctl -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.2 CATEGORIES= sysutils MAINTAINER= danilo@FreeBSD.org @@ -35,6 +35,7 @@ GH_TUPLE= \ alecthomas:template:a0175ee3bccc:alecthomas_template/vendor/github.com/alecthomas/template \ alecthomas:units:2efee857e7cf:alecthomas_units/vendor/github.com/alecthomas/units \ apex:log:v1.1.0:apex_log/vendor/github.com/apex/log \ + aws:aws-sdk-go:v1.23.15:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \ bep:debounce:v1.2.0:bep_debounce/vendor/github.com/bep/debounce \ bep:gitmap:v1.0.0:bep_gitmap/vendor/github.com/bep/gitmap \ @@ -69,7 +70,6 @@ GH_TUPLE= \ docker:spdystream:6480d4af844c:docker_spdystream/vendor/github.com/docker/spdystream \ dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ eknkc:amber:cdade1c07385:eknkc_amber/vendor/github.com/eknkc/amber \ - errordeveloper:aws-sdk-go:v1.21.99:errordeveloper_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ errordeveloper:goformation:a31eae35e596:errordeveloper_goformation/vendor/github.com/awslabs/goformation \ evanphx:json-patch:v4.2.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \ fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \ diff --git a/sysutils/eksctl/distinfo b/sysutils/eksctl/distinfo index 43def55a275..56bc315f90c 100644 --- a/sysutils/eksctl/distinfo +++ b/sysutils/eksctl/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1567630286 -SHA256 (weaveworks-eksctl-0.5.0_GH0.tar.gz) = 7e3c5d6cd0dcaa92f6d0dc8d37dac375536ab0ffe68ddcba549f501521a7d3b2 -SIZE (weaveworks-eksctl-0.5.0_GH0.tar.gz) = 10079436 +TIMESTAMP = 1567942453 +SHA256 (weaveworks-eksctl-0.5.2_GH0.tar.gz) = 507e8614781b4c05f98b48c0bc2f350455e7d14497b1ea3fbb3c3a17e8cb0408 +SIZE (weaveworks-eksctl-0.5.2_GH0.tar.gz) = 10085600 SHA256 (Azure-azure-pipeline-go-v0.1.8_GH0.tar.gz) = b06a891cf8efc3f65ce2b447dc42c7814c23af9c3ea1390135b1a998b4c6ba25 SIZE (Azure-azure-pipeline-go-v0.1.8_GH0.tar.gz) = 15319 SHA256 (Azure-azure-storage-blob-go-45d0c5e3638e_GH0.tar.gz) = f926e4803dbcfdc95171e7bd410437b276aa43763559df49e5a0681a109b2848 @@ -29,6 +29,8 @@ SHA256 (alecthomas-units-2efee857e7cf_GH0.tar.gz) = 1e8ded84579a751d732db65a6dc6 SIZE (alecthomas-units-2efee857e7cf_GH0.tar.gz) = 3442 SHA256 (apex-log-v1.1.0_GH0.tar.gz) = 167b8a054c047bb868666fa4d231ffb5429eca8de3f463182cbdf7432352d2a1 SIZE (apex-log-v1.1.0_GH0.tar.gz) = 23983 +SHA256 (aws-aws-sdk-go-v1.23.15_GH0.tar.gz) = 0226da150dcd41d1fac03e6e9b137cc605da8ac11e6a9cbea290588ef9bcfd31 +SIZE (aws-aws-sdk-go-v1.23.15_GH0.tar.gz) = 11855236 SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866 SHA256 (bep-debounce-v1.2.0_GH0.tar.gz) = 89da4947e4e83af6037ca961d64bdf055a4ae811c4057c16b4c4b354c098862d @@ -97,8 +99,6 @@ SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260 SHA256 (eknkc-amber-cdade1c07385_GH0.tar.gz) = b7a732710c5483f5e899346b173cd178d090a0a06b6eb40c70bd195e33b62653 SIZE (eknkc-amber-cdade1c07385_GH0.tar.gz) = 22598 -SHA256 (errordeveloper-aws-sdk-go-v1.21.99_GH0.tar.gz) = d07966defc9311d3939d9d4f9d1325218c815ea3514ce5b94d42f942381a6866 -SIZE (errordeveloper-aws-sdk-go-v1.21.99_GH0.tar.gz) = 11647260 SHA256 (errordeveloper-goformation-a31eae35e596_GH0.tar.gz) = 0924e9b3910582a38474c66bb6023c185512c67c8324980d157294985aa0b412 SIZE (errordeveloper-goformation-a31eae35e596_GH0.tar.gz) = 2446380 SHA256 (evanphx-json-patch-v4.2.0_GH0.tar.gz) = 256711ab08b342be5d7ea7e2d84bf498110641f8fdc0f81806d3e3bb868c2813 diff --git a/sysutils/exfat-utils/Makefile b/sysutils/exfat-utils/Makefile index 475ab80caff..43b4c6f4d10 100644 --- a/sysutils/exfat-utils/Makefile +++ b/sysutils/exfat-utils/Makefile @@ -3,7 +3,7 @@ PORTNAME= exfat DISTVERSIONPREFIX= v -DISTVERSION= 1.2.8 +DISTVERSION= 1.3.0 CATEGORIES= sysutils PKGNAMESUFFIX= -utils @@ -12,13 +12,13 @@ COMMENT= Utilities to create, check, label and dump exFAT filesystem LICENSE= GPLv2+ MSPAT LICENSE_COMB= multi -LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_NAME_MSPAT= Microsoft exFAT Patent License LICENSE_TEXT_MSPAT= It is important to note that open source and other publicly \ available implementations of exFAT do not include a patent \ license from Microsoft. A license is required in order to \ implement exFAT and use it in a product or device. \ https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_PERMS_MSPAT= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell LIB_DEPENDS= libublio.so:devel/libublio diff --git a/sysutils/exfat-utils/distinfo b/sysutils/exfat-utils/distinfo index 81e96cf8792..f7ef348d5b5 100644 --- a/sysutils/exfat-utils/distinfo +++ b/sysutils/exfat-utils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521383513 -SHA256 (relan-exfat-v1.2.8_GH0.tar.gz) = 778474bfbcd92e35bba5b88bd7ad3f6400328256636abb9031bfcc1ce15ed887 -SIZE (relan-exfat-v1.2.8_GH0.tar.gz) = 55911 +TIMESTAMP = 1566154695 +SHA256 (relan-exfat-v1.3.0_GH0.tar.gz) = 689bcb4a639acd2d45e6fa0ff455f7f18edb2421d4f4f42909943775adc0e375 +SIZE (relan-exfat-v1.3.0_GH0.tar.gz) = 57846 diff --git a/sysutils/exfat-utils/files/patch-libexfat_platform.h b/sysutils/exfat-utils/files/patch-libexfat_platform.h deleted file mode 100644 index 0d0b85daf7c..00000000000 --- a/sysutils/exfat-utils/files/patch-libexfat_platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libexfat/platform.h.orig 2016-06-03 05:30:35 UTC -+++ libexfat/platform.h -@@ -46,7 +46,7 @@ - #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN - #define EXFAT_BIG_ENDIAN BIG_ENDIAN - --#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) - - #include - #define exfat_bswap16(x) bswap16(x) diff --git a/sysutils/exfat-utils/files/patch-ublio b/sysutils/exfat-utils/files/patch-ublio deleted file mode 100644 index 65d36a69bf5..00000000000 --- a/sysutils/exfat-utils/files/patch-ublio +++ /dev/null @@ -1,176 +0,0 @@ -# Revert 3959f7d to restore ublio support and add autoconf glue. - -diff --git README.md README.md -index 60d5c71..81446a6 100644 ---- README.md -+++ README.md -@@ -7,6 +7,7 @@ Supported operating systems: - - * GNU/Linux - * Mac OS X 10.5 or later -+* FreeBSD - * OpenBSD - - Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source. -diff --git configure.ac configure.ac -index b45db3f..2bcda4b 100644 ---- configure.ac -+++ configure.ac -@@ -31,6 +31,12 @@ AC_PROG_CC_C99 - AC_PROG_RANLIB - AM_PROG_AR - AC_SYS_LARGEFILE -+PKG_CHECK_MODULES([UBLIO], [libublio], [ -+ CFLAGS="$CFLAGS $UBLIO_CFLAGS" -+ LIBS="$LIBS $UBLIO_LIBS" -+ AC_DEFINE([USE_UBLIO], [1], -+ [Define if block devices are not supported.]) -+], [:]) - PKG_CHECK_MODULES([FUSE], [fuse]) - AC_CONFIG_HEADERS([libexfat/config.h]) - AC_CONFIG_FILES([ -diff --git libexfat/io.c libexfat/io.c -index 60f28e2..14c0151 100644 ---- libexfat/io.c 2018-02-03 09:01:42.000000000 +0100 -+++ libexfat/io.c 2018-03-18 15:45:43.573290677 +0100 -@@ -38,12 +38,20 @@ - #elif __linux__ - #include - #endif -+#ifdef USE_UBLIO -+#include -+#include -+#endif - - struct exfat_dev - { - int fd; - enum exfat_mode mode; - off_t size; /* in bytes */ -+#ifdef USE_UBLIO -+ off_t pos; -+ ublio_filehandle_t ufh; -+#endif - }; - - static bool is_open(int fd) -@@ -80,6 +88,9 @@ - { - struct exfat_dev* dev; - struct stat stbuf; -+#ifdef USE_UBLIO -+ struct ublio_param up; -+#endif - - /* The system allocates file descriptors sequentially. If we have been - started with stdin (0), stdout (1) or stderr (2) closed, the system -@@ -235,6 +246,24 @@ - } - } - -+#ifdef USE_UBLIO -+ memset(&up, 0, sizeof(struct ublio_param)); -+ up.up_blocksize = 256 * 1024; -+ up.up_items = 64; -+ up.up_grace = 32; -+ up.up_priv = &dev->fd; -+ -+ dev->pos = 0; -+ dev->ufh = ublio_open(&up); -+ if (dev->ufh == NULL) -+ { -+ close(dev->fd); -+ free(dev); -+ exfat_error("failed to initialize ublio"); -+ return NULL; -+ } -+#endif -+ - return dev; - } - -@@ -242,6 +271,13 @@ - { - int rc = 0; - -+#ifdef USE_UBLIO -+ if (ublio_close(dev->ufh) != 0) -+ { -+ exfat_error("failed to close ublio"); -+ rc = -EIO; -+ } -+#endif - if (close(dev->fd) != 0) - { - exfat_error("failed to close device: %s", strerror(errno)); -@@ -255,6 +291,13 @@ - { - int rc = 0; - -+#ifdef USE_UBLIO -+ if (ublio_fsync(dev->ufh) != 0) -+ { -+ exfat_error("ublio fsync failed"); -+ rc = -EIO; -+ } -+#endif - if (fsync(dev->fd) != 0) - { - exfat_error("fsync failed: %s", strerror(errno)); -@@ -275,29 +318,56 @@ - - off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence) - { -+#ifdef USE_UBLIO -+ /* XXX SEEK_CUR will be handled incorrectly */ -+ return dev->pos = lseek(dev->fd, offset, whence); -+#else - return lseek(dev->fd, offset, whence); -+#endif - } - - ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size) - { -+#ifdef USE_UBLIO -+ ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos); -+ if (result >= 0) -+ dev->pos += size; -+ return result; -+#else - return read(dev->fd, buffer, size); -+#endif - } - - ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size) - { -+#ifdef USE_UBLIO -+ ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos); -+ if (result >= 0) -+ dev->pos += size; -+ return result; -+#else - return write(dev->fd, buffer, size); -+#endif - } - - ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size, - off_t offset) - { -+#ifdef USE_UBLIO -+ return ublio_pread(dev->ufh, buffer, size, offset); -+#else - return pread(dev->fd, buffer, size, offset); -+#endif - } - - ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size, - off_t offset) - { -+#ifdef USE_UBLIO -+ return ublio_pwrite(dev->ufh, buffer, size, offset); -+#else - return pwrite(dev->fd, buffer, size, offset); -+#endif - } - - ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile index 63519b7e09f..ad8b83d5a03 100644 --- a/sysutils/fusefs-exfat/Makefile +++ b/sysutils/fusefs-exfat/Makefile @@ -3,7 +3,7 @@ PORTNAME= exfat DISTVERSIONPREFIX= v -DISTVERSION= 1.2.8 +DISTVERSION= 1.3.0 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- @@ -12,13 +12,13 @@ COMMENT= Full-featured exFAT FS implementation as a FUSE module LICENSE= GPLv2+ MSPAT LICENSE_COMB= multi -LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_NAME_MSPAT= Microsoft exFAT Patent License LICENSE_TEXT_MSPAT= It is important to note that open source and other publicly \ available implementations of exFAT do not include a patent \ license from Microsoft. A license is required in order to \ implement exFAT and use it in a product or device. \ https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_PERMS_MSPAT= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell LIB_DEPENDS= libublio.so:devel/libublio diff --git a/sysutils/fusefs-exfat/distinfo b/sysutils/fusefs-exfat/distinfo index f91a3e0b187..9cca7d02e16 100644 --- a/sysutils/fusefs-exfat/distinfo +++ b/sysutils/fusefs-exfat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521383763 -SHA256 (relan-exfat-v1.2.8_GH0.tar.gz) = 778474bfbcd92e35bba5b88bd7ad3f6400328256636abb9031bfcc1ce15ed887 -SIZE (relan-exfat-v1.2.8_GH0.tar.gz) = 55911 +TIMESTAMP = 1566155165 +SHA256 (relan-exfat-v1.3.0_GH0.tar.gz) = 689bcb4a639acd2d45e6fa0ff455f7f18edb2421d4f4f42909943775adc0e375 +SIZE (relan-exfat-v1.3.0_GH0.tar.gz) = 57846 diff --git a/sysutils/fusefs-exfat/files/patch-libexfat_platform.h b/sysutils/fusefs-exfat/files/patch-libexfat_platform.h deleted file mode 100644 index 0d0b85daf7c..00000000000 --- a/sysutils/fusefs-exfat/files/patch-libexfat_platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libexfat/platform.h.orig 2016-06-03 05:30:35 UTC -+++ libexfat/platform.h -@@ -46,7 +46,7 @@ - #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN - #define EXFAT_BIG_ENDIAN BIG_ENDIAN - --#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) - - #include - #define exfat_bswap16(x) bswap16(x) diff --git a/sysutils/fusefs-exfat/files/patch-ublio b/sysutils/fusefs-exfat/files/patch-ublio deleted file mode 100644 index 65d36a69bf5..00000000000 --- a/sysutils/fusefs-exfat/files/patch-ublio +++ /dev/null @@ -1,176 +0,0 @@ -# Revert 3959f7d to restore ublio support and add autoconf glue. - -diff --git README.md README.md -index 60d5c71..81446a6 100644 ---- README.md -+++ README.md -@@ -7,6 +7,7 @@ Supported operating systems: - - * GNU/Linux - * Mac OS X 10.5 or later -+* FreeBSD - * OpenBSD - - Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source. -diff --git configure.ac configure.ac -index b45db3f..2bcda4b 100644 ---- configure.ac -+++ configure.ac -@@ -31,6 +31,12 @@ AC_PROG_CC_C99 - AC_PROG_RANLIB - AM_PROG_AR - AC_SYS_LARGEFILE -+PKG_CHECK_MODULES([UBLIO], [libublio], [ -+ CFLAGS="$CFLAGS $UBLIO_CFLAGS" -+ LIBS="$LIBS $UBLIO_LIBS" -+ AC_DEFINE([USE_UBLIO], [1], -+ [Define if block devices are not supported.]) -+], [:]) - PKG_CHECK_MODULES([FUSE], [fuse]) - AC_CONFIG_HEADERS([libexfat/config.h]) - AC_CONFIG_FILES([ -diff --git libexfat/io.c libexfat/io.c -index 60f28e2..14c0151 100644 ---- libexfat/io.c 2018-02-03 09:01:42.000000000 +0100 -+++ libexfat/io.c 2018-03-18 15:45:43.573290677 +0100 -@@ -38,12 +38,20 @@ - #elif __linux__ - #include - #endif -+#ifdef USE_UBLIO -+#include -+#include -+#endif - - struct exfat_dev - { - int fd; - enum exfat_mode mode; - off_t size; /* in bytes */ -+#ifdef USE_UBLIO -+ off_t pos; -+ ublio_filehandle_t ufh; -+#endif - }; - - static bool is_open(int fd) -@@ -80,6 +88,9 @@ - { - struct exfat_dev* dev; - struct stat stbuf; -+#ifdef USE_UBLIO -+ struct ublio_param up; -+#endif - - /* The system allocates file descriptors sequentially. If we have been - started with stdin (0), stdout (1) or stderr (2) closed, the system -@@ -235,6 +246,24 @@ - } - } - -+#ifdef USE_UBLIO -+ memset(&up, 0, sizeof(struct ublio_param)); -+ up.up_blocksize = 256 * 1024; -+ up.up_items = 64; -+ up.up_grace = 32; -+ up.up_priv = &dev->fd; -+ -+ dev->pos = 0; -+ dev->ufh = ublio_open(&up); -+ if (dev->ufh == NULL) -+ { -+ close(dev->fd); -+ free(dev); -+ exfat_error("failed to initialize ublio"); -+ return NULL; -+ } -+#endif -+ - return dev; - } - -@@ -242,6 +271,13 @@ - { - int rc = 0; - -+#ifdef USE_UBLIO -+ if (ublio_close(dev->ufh) != 0) -+ { -+ exfat_error("failed to close ublio"); -+ rc = -EIO; -+ } -+#endif - if (close(dev->fd) != 0) - { - exfat_error("failed to close device: %s", strerror(errno)); -@@ -255,6 +291,13 @@ - { - int rc = 0; - -+#ifdef USE_UBLIO -+ if (ublio_fsync(dev->ufh) != 0) -+ { -+ exfat_error("ublio fsync failed"); -+ rc = -EIO; -+ } -+#endif - if (fsync(dev->fd) != 0) - { - exfat_error("fsync failed: %s", strerror(errno)); -@@ -275,29 +318,56 @@ - - off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence) - { -+#ifdef USE_UBLIO -+ /* XXX SEEK_CUR will be handled incorrectly */ -+ return dev->pos = lseek(dev->fd, offset, whence); -+#else - return lseek(dev->fd, offset, whence); -+#endif - } - - ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size) - { -+#ifdef USE_UBLIO -+ ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos); -+ if (result >= 0) -+ dev->pos += size; -+ return result; -+#else - return read(dev->fd, buffer, size); -+#endif - } - - ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size) - { -+#ifdef USE_UBLIO -+ ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos); -+ if (result >= 0) -+ dev->pos += size; -+ return result; -+#else - return write(dev->fd, buffer, size); -+#endif - } - - ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size, - off_t offset) - { -+#ifdef USE_UBLIO -+ return ublio_pread(dev->ufh, buffer, size, offset); -+#else - return pread(dev->fd, buffer, size, offset); -+#endif - } - - ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size, - off_t offset) - { -+#ifdef USE_UBLIO -+ return ublio_pwrite(dev->ufh, buffer, size, offset); -+#else - return pwrite(dev->fd, buffer, size, offset); -+#endif - } - - ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, diff --git a/sysutils/go-wtf/Makefile b/sysutils/go-wtf/Makefile index 73824a94ccf..ad9b35c2f73 100644 --- a/sysutils/go-wtf/Makefile +++ b/sysutils/go-wtf/Makefile @@ -18,84 +18,6 @@ CONFLICTS= wtf USE_GITHUB= yes GH_ACCOUNT= wtfutil -GH_TUPLE= \ - PagerDuty:go-pagerduty:cf1437c7c8d6:pagerduty_go_pagerduty/vendor/github.com/PagerDuty/go-pagerduty \ - PuerkitoBio:goquery:v1.5.0:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \ - StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \ - adlio:trello:v1.0.0:adlio_trello/vendor/github.com/adlio/trello \ - alecthomas:chroma:v0.6.3:alecthomas_chroma/vendor/github.com/alecthomas/chroma \ - andybalholm:cascadia:v1.0.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \ - andygrunwald:go-gerrit:64931d233c2d:andygrunwald_go_gerrit/vendor/github.com/andygrunwald/go-gerrit \ - briandowns:openweathermap:5f41b7c9d92d:briandowns_openweathermap/vendor/github.com/briandowns/openweathermap \ - cenkalti:backoff:v2.2.0:cenkalti_backoff/vendor/github.com/cenkalti/backoff \ - census-instrumentation:opencensus-go:v0.22.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ - danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \ - darkSasori:todoist:ec6b38b374ab:darksasori_todoist/vendor/github.com/darkSasori/todoist \ - davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ - dlclark:regexp2:v1.1.6:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \ - dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ - gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \ - gdamore:tcell:v1.1.4:gdamore_tcell/vendor/github.com/gdamore/tcell \ - go-ole:go-ole:v1.2.4:go_ole_go_ole/vendor/github.com/go-ole/go-ole \ - go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - go-inf:inf:v0.9.0:go_yaml_yaml/vendor/gopkg.in/inf.v0 \ - godbus:dbus:v5.0.1:godbus_dbus/vendor/github.com/godbus/dbus \ - gogo:protobuf:65acae22fc9d:gogo_protobuf/vendor/github.com/gogo/protobuf \ - golang:appengine:v1.6.1:golang_appengine/vendor/google.golang.org/appengine \ - golang:crypto:4def268fd1a4:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:da137c7871d7:golang_net/vendor/golang.org/x/net \ - golang:oauth2:0f29369cfe45:golang_oauth2/vendor/golang.org/x/oauth2 \ - golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:6a60838ec25:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ - golang:time:85acf8d2951c:golang_time/vendor/golang.org/x/time \ - google:go-genproto:eb59cef1c072:google_go_genproto/vendor/google.golang.org/genproto \ - google:go-github:v26.0.9:google_go_github/vendor/github.com/google/go-github/v26 \ - google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \ - google:gofuzz:v1.0.0:google_gofuzz/vendor/github.com/google/gofuzz \ - googleapis:gnostic:0c5108395e2d:googleapis_gnostic/vendor/github.com/googleapis/gnostic \ - googleapis:google-api-go-client:v0.7.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ - googleapis:google-cloud-go:v0.40.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ - grpc:grpc-go:v1.21.1:grpc_grpc_go/vendor/google.golang.org/grpc \ - hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \ - hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ - hekmon:cunits:v2.0.1:hekmon_cunits/vendor/github.com/hekmon/cunits \ - hekmon:transmissionrpc:1d589625bacd:hekmon_transmissionrpc/vendor/github.com/hekmon/transmissionrpc \ - imdario:mergo:v0.3.5:imdario_mergo//vendor/github.com/imdario/mergo \ - json-iterator:go:v1.1.6:json_iterator_go/vendor/github.com/json-iterator/go \ - jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \ - kubernetes:api:7cf5895f2711:k8s_io_api/vendor/k8s.io/api \ - kubernetes:apimachinery:6fa4771c83b3:k8s_io_apimachinery/vendor/k8s.io/apimachinery \ - kubernetes:client-go:v12.0.0:k8s_io_client_go/vendor/k8s.io/client-go \ - kubernetes:gengo:0689ccc1d7d6:k8s_io_gengo/vendor/k8s.io/gengo \ - kubernetes:klog:v0.3.1:k8s_io_klog/vendor/k8s.io/klog \ - kubernetes:kube-openapi:b3a7cee44a30:k8s_io_kube_openapi/vendor/k8s.io/kube-openapi \ - kubernetes:utils:c2654d5206da:k8s_io_utils/vendor/k8s.io/utils \ - kubernetes-sigs:yaml:v1.1.0:sigs_k8s_io_yaml/vendor/sigs.k8s.io/yaml \ - logrusorgru:aurora:cea283e61946:logrusorgru_aurora/vendor/github.com/logrusorgru/aurora \ - lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ - mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ - mmcdole:gofeed:0e68beaf6fdf:mmcdole_gofeed/vendor/github.com/mmcdole/gofeed \ - mmcdole:goxpp:0068e33feabf:mmcdole_goxpp/vendor/github.com/mmcdole/goxpp \ - modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \ - modern-go:reflect2:v1.0.1:modern_go_reflect/vendor/github.com/modern-go/reflect2 \ - olebedev:config:364964f3a8e4:olebedev_config/vendor/github.com/olebedev/config \ - pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ - pkg:profile:v1.3.0:pkg_profile/vendor/github.com/pkg/profile \ - pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ - radovskyb:watcher:v1.0.6:radovskyb_watcher/vendor/github.com/radovskyb/watcher \ - rivo:tview:2e907d29e475:rivo_tview/vendor/github.com/rivo/tview \ - rivo:uniseg:v0.1.0:rivo_uniseg/vendor/github.com/rivo/uniseg \ - shirou:gopsutil:v2.18.12:shirou_gopsutil/vendor/github.com/shirou/gopsutil \ - spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \ - sticreations:spotigopher:98632f6f94b0:sticreations_spotigopher/vendor/github.com/sticreations/spotigopher \ - stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify \ - xanzy:go-gitlab:v0.18.0:xanzy_go_gitlab/vendor/github.com/xanzy/go-gitlab \ - zmb3:spotify:158b1863f5b5:zmb3_spotify/vendor/github.com/zmb3/spotify \ - zorkian:go-datadog-api:v2.21.0:zorkian_go_datadog_api/vendor/github.com/zorkian/go-datadog-api - -# this is missing, so use the local vendor copy -# yfronto:newrelic:7c9c2852e8f9:yfronto_newrelic/vendor/github.com/yfronto/newrelic GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSION}" diff --git a/sysutils/go-wtf/distinfo b/sysutils/go-wtf/distinfo index e12e8085dfc..5bd5f4a4022 100644 --- a/sysutils/go-wtf/distinfo +++ b/sysutils/go-wtf/distinfo @@ -1,149 +1,3 @@ -TIMESTAMP = 1567399058 +TIMESTAMP = 1567513605 SHA256 (wtfutil-wtf-v0.21.0_GH0.tar.gz) = f1a5267f5b534026d7ae75ee2c13b4d3e08643b8f5b52637b41fb6c4fea1838d SIZE (wtfutil-wtf-v0.21.0_GH0.tar.gz) = 11162170 -SHA256 (PagerDuty-go-pagerduty-cf1437c7c8d6_GH0.tar.gz) = fc022e2ffdddf610a29a657382c7d4b4dc8227eb521693801988889e2d206b13 -SIZE (PagerDuty-go-pagerduty-cf1437c7c8d6_GH0.tar.gz) = 27616 -SHA256 (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 0307341d56ae12648584b3990fb1e84f465870247e46aff00381c98c5ad231c7 -SIZE (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 100975 -SHA256 (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 14dbc4af6952acdb1b941d002cd36fd2299aa6b3144cbcbddbb032c47f816da5 -SIZE (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 11279 -SHA256 (adlio-trello-v1.0.0_GH0.tar.gz) = bf1b7fd57502754858264684e42189dbd0e844826e2c64982404088f4122fb22 -SIZE (adlio-trello-v1.0.0_GH0.tar.gz) = 124693 -SHA256 (alecthomas-chroma-v0.6.3_GH0.tar.gz) = 4f60270c67a7e5327075b909f2fb0a0f3a8479941ef4257f346b6b2db9f38175 -SIZE (alecthomas-chroma-v0.6.3_GH0.tar.gz) = 359394 -SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52 -SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232 -SHA256 (andygrunwald-go-gerrit-64931d233c2d_GH0.tar.gz) = bdd89141d5e9c06d0b2cbc4f601660bd899d83221784f184d86fc46939eb0384 -SIZE (andygrunwald-go-gerrit-64931d233c2d_GH0.tar.gz) = 77358 -SHA256 (briandowns-openweathermap-5f41b7c9d92d_GH0.tar.gz) = 9181d7c24cdc7561fa69233a0625255f1a40efb98950d72c88b417ea85af7816 -SIZE (briandowns-openweathermap-5f41b7c9d92d_GH0.tar.gz) = 23744 -SHA256 (cenkalti-backoff-v2.2.0_GH0.tar.gz) = 6bbccd84a9a9a750cbed930e38a96fd10b6a3116c588b8f8ca97acd92c87a760 -SIZE (cenkalti-backoff-v2.2.0_GH0.tar.gz) = 8677 -SHA256 (census-instrumentation-opencensus-go-v0.22.0_GH0.tar.gz) = 4213d120fd3b7f9c39470babed3cfe5770d6d16be252cdcf4c62a747f19b8ca9 -SIZE (census-instrumentation-opencensus-go-v0.22.0_GH0.tar.gz) = 162290 -SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f -SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955 -SHA256 (darkSasori-todoist-ec6b38b374ab_GH0.tar.gz) = 58a66fe57a76414b2ef064dda2010e703d5b91277caf65d1c63a0f465bdff381 -SIZE (darkSasori-todoist-ec6b38b374ab_GH0.tar.gz) = 6185 -SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e -SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 -SHA256 (dlclark-regexp2-v1.1.6_GH0.tar.gz) = 81ede5b49ff46bd1c686416c52605aa4698b9dce07d011581c49a1d35b8a5239 -SIZE (dlclark-regexp2-v1.1.6_GH0.tar.gz) = 203691 -SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba -SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260 -SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013 -SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886 -SHA256 (gdamore-tcell-v1.1.4_GH0.tar.gz) = 76db686196f24b20f11a0091e5300197cc8f7792fd6d0eb0e0f2aaad27ba8444 -SIZE (gdamore-tcell-v1.1.4_GH0.tar.gz) = 747882 -SHA256 (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 1f30df494ffc50c133c5f276f64c94820046b1a3a660c0cca49a5c3a8106db11 -SIZE (go-ole-go-ole-v1.2.4_GH0.tar.gz) = 51655 -SHA256 (go-inf-inf-v0.9.0_GH0.tar.gz) = baa5f86ae50e08e0b88b8da3891c6d2071ce47cafe0e4ed99f9c45bc49cf5aab -SIZE (go-inf-inf-v0.9.0_GH0.tar.gz) = 13075 -SHA256 (godbus-dbus-v5.0.1_GH0.tar.gz) = d5ea4142fe51b852185e8022edea673467a41295654a59dca377cff84bd22cb9 -SIZE (godbus-dbus-v5.0.1_GH0.tar.gz) = 59417 -SHA256 (gogo-protobuf-65acae22fc9d_GH0.tar.gz) = 75d042b916d4508afd65e383e0a95951bdbf009db5d5350eea948aac068a790b -SIZE (gogo-protobuf-65acae22fc9d_GH0.tar.gz) = 2045290 -SHA256 (golang-appengine-v1.6.1_GH0.tar.gz) = 1755aaf4c6246579337bf1bc4f834ef00c56216da87b20456863ca91985b5afa -SIZE (golang-appengine-v1.6.1_GH0.tar.gz) = 333353 -SHA256 (golang-crypto-4def268fd1a4_GH0.tar.gz) = eaf2ba9df95911f41a340478d1fbb540d7bc21939e4688273995dabf58e8c7b0 -SIZE (golang-crypto-4def268fd1a4_GH0.tar.gz) = 1693117 -SHA256 (golang-net-da137c7871d7_GH0.tar.gz) = 543c21f0d8b70fbfadb8b629e74ed620daf8514f94d7c0bf743e68ab9252d4ab -SIZE (golang-net-da137c7871d7_GH0.tar.gz) = 1099325 -SHA256 (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 468421ddfe905216454006b309ebda6e97aa6089265b995bce4259d6a9efd141 -SIZE (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 45498 -SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf -SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884 -SHA256 (golang-sys-6a60838ec25_GH0.tar.gz) = dfb58293a96bc2b659b96826dc4af810068d31ab3dd49ff63cee2f1c3e0ddde7 -SIZE (golang-sys-6a60838ec25_GH0.tar.gz) = 1424751 -SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 -SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 -SHA256 (golang-time-85acf8d2951c_GH0.tar.gz) = 96c2a33d1f1409b7db0a71ca73748e7cbac8b8878430de82c76e408a08f76fd1 -SIZE (golang-time-85acf8d2951c_GH0.tar.gz) = 9266 -SHA256 (google-go-genproto-eb59cef1c072_GH0.tar.gz) = 1ab1070fa98a1eef2b21ba4b20e9748645f6cc6767583e032957c94d30f5f867 -SIZE (google-go-genproto-eb59cef1c072_GH0.tar.gz) = 4173505 -SHA256 (google-go-github-v26.0.9_GH0.tar.gz) = 22e9d7f226f2230580807ec5e4ed86dc89f8adde3ecd14384c731e3aba6ed151 -SIZE (google-go-github-v26.0.9_GH0.tar.gz) = 251484 -SHA256 (google-go-querystring-v1.0.0_GH0.tar.gz) = 59fdfd4d740c85c60c35d3e09b587cfa2b435e78178ac4a23950afbece7118ed -SIZE (google-go-querystring-v1.0.0_GH0.tar.gz) = 7529 -SHA256 (google-gofuzz-v1.0.0_GH0.tar.gz) = c614b23263110dcf0881f13e9cac482ca01b222cd4a2664827574867a5437c66 -SIZE (google-gofuzz-v1.0.0_GH0.tar.gz) = 13201 -SHA256 (googleapis-gnostic-0c5108395e2d_GH0.tar.gz) = e43de452b39ce224dae1547787297fc9a1ab2c977d92cde87939b99f0adb68d2 -SIZE (googleapis-gnostic-0c5108395e2d_GH0.tar.gz) = 300472 -SHA256 (googleapis-google-api-go-client-v0.7.0_GH0.tar.gz) = cb0cd7649e80342940800f2f1e9cc8018c178e840e291589e24cbb65c1c73ac6 -SIZE (googleapis-google-api-go-client-v0.7.0_GH0.tar.gz) = 12103399 -SHA256 (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 0d071f37137e1fdf75ca39cf19ce3fd966a1e2e28091e01c4ecd4e6437c2cd72 -SIZE (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 2090665 -SHA256 (grpc-grpc-go-v1.21.1_GH0.tar.gz) = b2fee68665f5874a812ef1987fbe5e758279e225cf8d0352c2fa56531c99d602 -SIZE (grpc-grpc-go-v1.21.1_GH0.tar.gz) = 730964 -SHA256 (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 24dedefe5edc4698dfa7e15a472369078a3447e8096e6d856549341c873c4a0b -SIZE (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 8069 -SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e -SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982 -SHA256 (hekmon-cunits-v2.0.1_GH0.tar.gz) = ac4208c2fc6d80db15bcaad1da1495f694f4583b277937ac6eb454d227894ca6 -SIZE (hekmon-cunits-v2.0.1_GH0.tar.gz) = 4903 -SHA256 (hekmon-transmissionrpc-1d589625bacd_GH0.tar.gz) = 9129abac3a5da37f06cc3614b6ae8086d945ee352bcdf8085e53ff739e535e34 -SIZE (hekmon-transmissionrpc-1d589625bacd_GH0.tar.gz) = 18306 -SHA256 (imdario-mergo-v0.3.5_GH0.tar.gz) = 0e39c5cb0ee73c1f759d9b9260f3c82cc4ca7757c9f07713e9487c4b126da205 -SIZE (imdario-mergo-v0.3.5_GH0.tar.gz) = 15920 -SHA256 (json-iterator-go-v1.1.6_GH0.tar.gz) = fc04b16a3d3798aca44e644d85c1cf5a10faf294ed69a9f44ca57c6dfa6856e2 -SIZE (json-iterator-go-v1.1.6_GH0.tar.gz) = 76814 -SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611 -SIZE (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 55452 -SHA256 (kubernetes-api-7cf5895f2711_GH0.tar.gz) = 6d64bc0712959949d1f8f0c6c640611f59cb1d303c1c259fe6350384bc3a0322 -SIZE (kubernetes-api-7cf5895f2711_GH0.tar.gz) = 1445747 -SHA256 (kubernetes-apimachinery-6fa4771c83b3_GH0.tar.gz) = ce0cb040bcc3b08c8d956a220a2c885e5f363803d0e0f118097f488b21655ffc -SIZE (kubernetes-apimachinery-6fa4771c83b3_GH0.tar.gz) = 496564 -SHA256 (kubernetes-client-go-v12.0.0_GH0.tar.gz) = adba207eef3032491d3c6c22deb4353bebd670172970cfd1023fcc8bf9309c57 -SIZE (kubernetes-client-go-v12.0.0_GH0.tar.gz) = 560672 -SHA256 (kubernetes-gengo-0689ccc1d7d6_GH0.tar.gz) = c01d149698c36f361eada6a47c6c09b64d7635d61c5cd5fefd0b894d0d1aa7d1 -SIZE (kubernetes-gengo-0689ccc1d7d6_GH0.tar.gz) = 79468 -SHA256 (kubernetes-klog-v0.3.1_GH0.tar.gz) = fa64aad2df750ca2938188883109d83ef6183039f3a8b19bdf0993b10cd604e6 -SIZE (kubernetes-klog-v0.3.1_GH0.tar.gz) = 28851 -SHA256 (kubernetes-kube-openapi-b3a7cee44a30_GH0.tar.gz) = d7bd1631cfcb0efbfa26e96cc246aa816accf3353986108b682256a456daf253 -SIZE (kubernetes-kube-openapi-b3a7cee44a30_GH0.tar.gz) = 728810 -SHA256 (kubernetes-utils-c2654d5206da_GH0.tar.gz) = 8b33978b2ef98b36ad153aee99e3da1d5f81871df965d8a37d68cae547beeb75 -SIZE (kubernetes-utils-c2654d5206da_GH0.tar.gz) = 41745 -SHA256 (kubernetes-sigs-yaml-v1.1.0_GH0.tar.gz) = 0ee3cfa6e0c3178df07213443ebac0d6ecc1178147f43f848ea7114acf621953 -SIZE (kubernetes-sigs-yaml-v1.1.0_GH0.tar.gz) = 14890 -SHA256 (logrusorgru-aurora-cea283e61946_GH0.tar.gz) = f0e72328579f38ab9bf60267c94305ef0646a3345566de05d4c4a17d31d59dbf -SIZE (logrusorgru-aurora-cea283e61946_GH0.tar.gz) = 133110 -SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140 -SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545 -SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe -SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827 -SHA256 (mmcdole-gofeed-0e68beaf6fdf_GH0.tar.gz) = 3ba8dad2b0ac79d439dc4e78ac7d0fee27f1cc7eccd1a442899c99ea9ed0e2d7 -SIZE (mmcdole-gofeed-0e68beaf6fdf_GH0.tar.gz) = 110479 -SHA256 (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 432aadb22bc36d15d405c8b08a2c44dfd6f73508c49971e5a773cb6683f124ab -SIZE (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 5167 -SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f -SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526 -SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd -SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394 -SHA256 (olebedev-config-364964f3a8e4_GH0.tar.gz) = d2b01cca2284cede5ba34ee56d19a1c705f7b2a1db35b44541354f0460fde765 -SIZE (olebedev-config-364964f3a8e4_GH0.tar.gz) = 9093 -SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 -SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009 -SHA256 (pkg-profile-v1.3.0_GH0.tar.gz) = 6af6c06236d24dbabe7d943e08b1bbf24da3ce74985dbb1579ce494548973006 -SIZE (pkg-profile-v1.3.0_GH0.tar.gz) = 5822 -SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda -SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (radovskyb-watcher-v1.0.6_GH0.tar.gz) = 7469dfb353fccd7f6f7bdbf57104e5f58892fcafe01d79481771ad253ca31d6e -SIZE (radovskyb-watcher-v1.0.6_GH0.tar.gz) = 12561 -SHA256 (rivo-tview-2e907d29e475_GH0.tar.gz) = e8c23abb8ed6f98ccace925c819257057f9b1f34c0e128206c49124daf74f887 -SIZE (rivo-tview-2e907d29e475_GH0.tar.gz) = 2853227 -SHA256 (rivo-uniseg-v0.1.0_GH0.tar.gz) = b80dffa6c757687cc997b77efbd32435361829cb085b913424b9b2bfebc19655 -SIZE (rivo-uniseg-v0.1.0_GH0.tar.gz) = 43971 -SHA256 (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 70e291291c1e2363c1b8d7656c394cbfc8a67c93eb95a861abdcd7644562afba -SIZE (shirou-gopsutil-v2.18.12_GH0.tar.gz) = 117507 -SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124 -SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002 -SHA256 (sticreations-spotigopher-98632f6f94b0_GH0.tar.gz) = 43b4d99993ca6427e339b1109e26a8a76dfc40ad359b7f17ed60afe12cc1f2ba -SIZE (sticreations-spotigopher-98632f6f94b0_GH0.tar.gz) = 14201 -SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5 -SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859 -SHA256 (xanzy-go-gitlab-v0.18.0_GH0.tar.gz) = c6f8a75b954e89deef98b5a1cf04b4beee2302f1a79b5925209d8ba93488139c -SIZE (xanzy-go-gitlab-v0.18.0_GH0.tar.gz) = 129904 -SHA256 (zmb3-spotify-158b1863f5b5_GH0.tar.gz) = 3b8c1ea9f696112204f1e8fb2f635b84e1f8bfe73ff2f95e3bea1e0b7d66ae2c -SIZE (zmb3-spotify-158b1863f5b5_GH0.tar.gz) = 111025 -SHA256 (zorkian-go-datadog-api-v2.21.0_GH0.tar.gz) = 02781384fbc28e781c9b9d21fb2e790a4056652c5dc3e04e58182ced684a995f -SIZE (zorkian-go-datadog-api-v2.21.0_GH0.tar.gz) = 145772 diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile index 8dc7223b97f..0e91ce2d59d 100644 --- a/sysutils/hfm/Makefile +++ b/sysutils/hfm/Makefile @@ -11,6 +11,8 @@ COMMENT= Run tests in parallel at high frequency LICENSE= BSD2CLAUSE +BROKEN= fails to build + # gb 0.4 includes FreeBSD-specific fixes that this port requires # https://github.com/constabulary/gb/issues/506 BUILD_DEPENDS= gb>=0.4:devel/gb \ diff --git a/sysutils/ipfs-go/Makefile b/sysutils/ipfs-go/Makefile index 878f934bef5..c942c029353 100644 --- a/sysutils/ipfs-go/Makefile +++ b/sysutils/ipfs-go/Makefile @@ -16,6 +16,7 @@ LICENSE_COMB= dual LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT LICENSE_FILE_APACHE= ${WRKSRC}/LICENSE-APACHE +BROKEN= fails to build ONLY_FOR_ARCHS= amd64 i386 USES= go diff --git a/sysutils/mate-control-center/Makefile b/sysutils/mate-control-center/Makefile index 0f61965aa1c..4150e50e2e0 100644 --- a/sysutils/mate-control-center/Makefile +++ b/sysutils/mate-control-center/Makefile @@ -3,6 +3,7 @@ PORTNAME= mate-control-center PORTVERSION= 1.22.1 +PORTREVISION= 1 CATEGORIES= sysutils mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -28,9 +29,9 @@ LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \ PORTSCOUT= limitw:1,even USES= desktop-file-utils gettext gmake libtool localbase \ - pathfix pkgconfig shared-mime-info tar:xz + pathfix pkgconfig shared-mime-info tar:xz xorg USE_MATE= desktop libmatekbd marco menus settingsdaemon -USE_XORG= ice sm x11 xcursor xext xxf86misc xft xi xrandr xscrnsaver +USE_XORG= ice sm x11 xcursor xext xft xi xrandr xscrnsaver USE_GNOME= cairo dconf glib20 gtk30 intlhack libxml2 librsvg2 pango USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile index 7e26dcf68e1..ac421b5c01b 100644 --- a/sysutils/mate-settings-daemon/Makefile +++ b/sysutils/mate-settings-daemon/Makefile @@ -3,6 +3,7 @@ PORTNAME= mate-settings-daemon PORTVERSION= 1.22.0 +PORTREVISION= 1 CATEGORIES= sysutils mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -27,9 +28,9 @@ RUN_DEPENDS= xrdb:x11/xrdb PORTSCOUT= limitw:1,even USES= gettext gmake libtool localbase pathfix \ - pkgconfig tar:xz + pkgconfig tar:xz xorg USE_MATE= desktop libmatekbd mixer -USE_XORG= ice sm x11 xext xi xxf86misc +USE_XORG= ice sm x11 xext xi USE_GNOME= cairo dconf gtk30 intlhack USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/sysutils/mdf2iso/Makefile b/sysutils/mdf2iso/Makefile index ceae53477ce..4dd99f090db 100644 --- a/sysutils/mdf2iso/Makefile +++ b/sysutils/mdf2iso/Makefile @@ -2,24 +2,27 @@ # $FreeBSD$ PORTNAME= mdf2iso -PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTVERSION= 0.3.1 CATEGORIES= sysutils -MASTER_SITES= http://BSDforge.com/projects/source/sysutils/mdf2iso/ +MASTER_SITES= ${MASTER_SITE_DEBIAN} +MASTER_SITE_SUBDIR= pool/main/m/${PORTNAME} +DISTFILES= ${PORTNAME}_${PORTVERSION}.orig.tar.gz ${PORTNAME}_${PORTVERSION}-${DEBIANVERSION}.debian.tar.xz MAINTAINER= portmaster@BSDforge.com COMMENT= Alcohol 120% to ISO converter LICENSE= GPLv2+ -USES= tar:xz - -WRKSRC= ${WRKDIR}/${PORTNAME} +DEBIANVERSION= 2 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes -PLIST_FILES= bin/mdf2iso +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz INSTALL_TARGET= install-strip +post-install: + ${INSTALL_MAN} ${WRKDIR}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + .include diff --git a/sysutils/mdf2iso/distinfo b/sysutils/mdf2iso/distinfo index 0ab45270599..22f9a1d8833 100644 --- a/sysutils/mdf2iso/distinfo +++ b/sysutils/mdf2iso/distinfo @@ -1,2 +1,5 @@ -SHA256 (mdf2iso-0.3.0.tar.xz) = a4244f7de0a68497fd34c064959ae79f5e461c9b64ab59aeb9eb9de5d54b05ea -SIZE (mdf2iso-0.3.0.tar.xz) = 75020 +TIMESTAMP = 1565641242 +SHA256 (mdf2iso_0.3.1.orig.tar.gz) = 906f0583cb3d36c4d862da23837eebaaaa74033c6b0b6961f2475b946a71feb7 +SIZE (mdf2iso_0.3.1.orig.tar.gz) = 193860 +SHA256 (mdf2iso_0.3.1-2.debian.tar.xz) = 0cff242ef665c512c03999504e88f0fae77313ef6fd5e99c6a74f5060f2683f4 +SIZE (mdf2iso_0.3.1-2.debian.tar.xz) = 2392 diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile index 212715d544f..068d2ba120d 100644 --- a/sysutils/packer/Makefile +++ b/sysutils/packer/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= packer -PORTVERSION= 1.4.2 +PORTVERSION= 1.4.3 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -13,11 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PLIST_FILES= bin/${PORTNAME} -USES= go +USES= go:modules USE_GITHUB= yes GH_ACCOUNT= hashicorp -GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} - .include diff --git a/sysutils/packer/distinfo b/sysutils/packer/distinfo index 608ccb38c39..df3cddfdede 100644 --- a/sysutils/packer/distinfo +++ b/sysutils/packer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562454502 -SHA256 (hashicorp-packer-v1.4.2_GH0.tar.gz) = c35f46bcacd93ca8b99291701df351bfec935fac804839a5f8cf4f491367d0c1 -SIZE (hashicorp-packer-v1.4.2_GH0.tar.gz) = 11421439 +TIMESTAMP = 1567781682 +SHA256 (hashicorp-packer-v1.4.3_GH0.tar.gz) = 99254a29411cdf5619dfbcf0ea00959449a4baa831aa41796b054317a4e20bc4 +SIZE (hashicorp-packer-v1.4.3_GH0.tar.gz) = 11968931 diff --git a/sysutils/py-azure-cli-acs/Makefile b/sysutils/py-azure-cli-acs/Makefile index 98acc002cd0..586d3e631ae 100644 --- a/sysutils/py-azure-cli-acs/Makefile +++ b/sysutils/py-azure-cli-acs/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools ACS Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=5.0.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerservice>=5.2.0:devel/py-azure-mgmt-containerservice@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-advisor/Makefile b/sysutils/py-azure-cli-advisor/Makefile index 915f5128915..ab5f28d6cab 100644 --- a/sysutils/py-azure-cli-advisor/Makefile +++ b/sysutils/py-azure-cli-advisor/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Advisor Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-advisor>=2.0.1:devel/py-azure-mgmt-advisor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-ams/Makefile b/sysutils/py-azure-cli-ams/Makefile index cfbd36c0eed..3c001b21a93 100644 --- a/sysutils/py-azure-cli-ams/Makefile +++ b/sysutils/py-azure-cli-ams/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools AMS Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-media>=1.1.1:devel/py-azure-mgmt-media@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-appservice/Makefile b/sysutils/py-azure-cli-appservice/Makefile index 514759ebc02..73243a35955 100644 --- a/sysutils/py-azure-cli-appservice/Makefile +++ b/sysutils/py-azure-cli-appservice/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools AppService Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.1.1:devel/py-azure-mgmt-storage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.40.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=2.7.0:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-backup/Makefile b/sysutils/py-azure-cli-backup/Makefile index f0140ff0d8d..18f79dcfbd8 100644 --- a/sysutils/py-azure-cli-backup/Makefile +++ b/sysutils/py-azure-cli-backup/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Recovery Services Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservices>=0.1.1:devel/py-azure-mgmt-recoveryservices@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservicesbackup>=0.1.2:devel/py-azure-mgmt-recoveryservicesbackup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-batch/Makefile b/sysutils/py-azure-cli-batch/Makefile index 44aa8625fec..65fd895f8f9 100644 --- a/sysutils/py-azure-cli-batch/Makefile +++ b/sysutils/py-azure-cli-batch/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Batch Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-batch>=6.0.0:devel/py-azure-mgmt-batch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-batch>=6.0.0:devel/py-azure-batch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-batchai/Makefile b/sysutils/py-azure-cli-batchai/Makefile index 6cbbae41a84..5fae23f5ce7 100644 --- a/sysutils/py-azure-cli-batchai/Makefile +++ b/sysutils/py-azure-cli-batchai/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Batch AI Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-batchai>=2.0.0:devel/py-azure-mgmt-batchai@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-billing/Makefile b/sysutils/py-azure-cli-billing/Makefile index 7383216918a..4a35ae3b8c7 100644 --- a/sysutils/py-azure-cli-billing/Makefile +++ b/sysutils/py-azure-cli-billing/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Billing Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-billing>=0.2.0:devel/py-azure-mgmt-billing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-botservice/Makefile b/sysutils/py-azure-cli-botservice/Makefile index 50211e20685..d62fb0e6e71 100644 --- a/sysutils/py-azure-cli-botservice/Makefile +++ b/sysutils/py-azure-cli-botservice/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Bot Services Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-botservice>=0:devel/py-azure-mgmt-botservice@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.42.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-cdn/Makefile b/sysutils/py-azure-cli-cdn/Makefile index 7ddc1bfc829..5993c62c9a1 100644 --- a/sysutils/py-azure-cli-cdn/Makefile +++ b/sysutils/py-azure-cli-cdn/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools CDN Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-cdn>=3.1.0:devel/py-azure-mgmt-cdn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-cloud/Makefile b/sysutils/py-azure-cli-cloud/Makefile index b40a7c7c600..80586dc8136 100644 --- a/sysutils/py-azure-cli-cloud/Makefile +++ b/sysutils/py-azure-cli-cloud/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Cloud Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} USES= azurepy python diff --git a/sysutils/py-azure-cli-cognitiveservices/Makefile b/sysutils/py-azure-cli-cognitiveservices/Makefile index 7b8f07ae949..08c492405ac 100644 --- a/sysutils/py-azure-cli-cognitiveservices/Makefile +++ b/sysutils/py-azure-cli-cognitiveservices/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Cognitive Services Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-cognitiveservices>=3.0.0:devel/py-azure-mgmt-cognitiveservices@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-configure/Makefile b/sysutils/py-azure-cli-configure/Makefile index cd6e9fe7dab..16f7f1c5a46 100644 --- a/sysutils/py-azure-cli-configure/Makefile +++ b/sysutils/py-azure-cli-configure/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Configure Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} USES= azurepy python diff --git a/sysutils/py-azure-cli-consumption/Makefile b/sysutils/py-azure-cli-consumption/Makefile index 768af22839f..28dc85c9183 100644 --- a/sysutils/py-azure-cli-consumption/Makefile +++ b/sysutils/py-azure-cli-consumption/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Consumption Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-consumption>=2.0.0:devel/py-azure-mgmt-consumption@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-container/Makefile b/sysutils/py-azure-cli-container/Makefile index 4a156074830..03c0c88f911 100644 --- a/sysutils/py-azure-cli-container/Makefile +++ b/sysutils/py-azure-cli-container/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools container Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerinstance>=1.4.0:devel/py-azure-mgmt-containerinstance@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-loganalytics>=0.2.0:devel/py-azure-mgmt-loganalytics@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.0.0:devel/py-azure-mgmt-resource@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile index 54d24294598..68cd4f387dc 100644 --- a/sysutils/py-azure-cli-core/Makefile +++ b/sysutils/py-azure-cli-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-cli-core -PORTVERSION= 2.0.67 +PORTVERSION= 2.0.72 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,8 +11,8 @@ COMMENT= Microsoft Azure Command-Line Tools Core Module LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}adal>=1.2.0:net-mgmt/py-adal@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.8.0:devel/py-argcomplete@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}adal>=1.2:net-mgmt/py-adal@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.8:devel/py-argcomplete@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=0:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}humanfriendly>=4.7:textproc/py-humanfriendly@${PY_FLAVOR} \ @@ -21,18 +21,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}adal>=1.2.0:net-mgmt/py-adal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msrest>=0.4.4:net-mgmt/py-msrest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.25:net-mgmt/py-msrestazure@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8:security/py-paramiko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.7:devel/py-tabulate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.1.0:devel/py-azure-mgmt-resource@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.7.0:devel/py-pyperclip@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psutil>=5.6.1:sysutils/py-psutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.1:devel/py-azure-mgmt-resource@${PY_FLAVOR} \ ${PY_ENUM34} \ ${PY_FUTURES} diff --git a/sysutils/py-azure-cli-core/distinfo b/sysutils/py-azure-cli-core/distinfo index 7e79d613535..45c2bcecad0 100644 --- a/sysutils/py-azure-cli-core/distinfo +++ b/sysutils/py-azure-cli-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561042044 -SHA256 (azure-cli-core-2.0.67.tar.gz) = af52a0af876ca1153ff71d2d320234e681c35a8cbdcf14336edd55e57b9ab565 -SIZE (azure-cli-core-2.0.67.tar.gz) = 109441 +TIMESTAMP = 1567854676 +SHA256 (azure-cli-core-2.0.72.tar.gz) = edd016e34f94c5e69164c3248cb4299e81735fe9d8fbb2993d2e57c509ba9e94 +SIZE (azure-cli-core-2.0.72.tar.gz) = 110778 diff --git a/sysutils/py-azure-cli-cosmosdb/Makefile b/sysutils/py-azure-cli-cosmosdb/Makefile index da2e9a3b2b8..d448ddf028c 100644 --- a/sysutils/py-azure-cli-cosmosdb/Makefile +++ b/sysutils/py-azure-cli-cosmosdb/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Cosmos DB Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-cosmosdb>=0.6.1:devel/py-azure-mgmt-cosmosdb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cosmos>=3.0.2:devel/py-azure-cosmos@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-dla/Makefile b/sysutils/py-azure-cli-dla/Makefile index dbd68a1aaf9..be866906d71 100644 --- a/sysutils/py-azure-cli-dla/Makefile +++ b/sysutils/py-azure-cli-dla/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Data Lake Analytics Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-analytics>=0.2.1:devel/py-azure-mgmt-datalake-analytics@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-dls/Makefile b/sysutils/py-azure-cli-dls/Makefile index 78ed1f5bb77..c165c3232c4 100644 --- a/sysutils/py-azure-cli-dls/Makefile +++ b/sysutils/py-azure-cli-dls/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Data Lake Store Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.39:devel/py-azure-datalake-store@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-dms/Makefile b/sysutils/py-azure-cli-dms/Makefile index 13cf0231cbc..c318baf446f 100644 --- a/sysutils/py-azure-cli-dms/Makefile +++ b/sysutils/py-azure-cli-dms/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools for the Data Migration Service (DMS) LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-datamigration>=0.1.0:devel/py-azure-mgmt-datamigration@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-eventgrid/Makefile b/sysutils/py-azure-cli-eventgrid/Makefile index d2f17b098b4..af6161a684d 100644 --- a/sysutils/py-azure-cli-eventgrid/Makefile +++ b/sysutils/py-azure-cli-eventgrid/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools EventGrid Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventgrid>=2.2.0:devel/py-azure-mgmt-eventgrid@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-eventhubs/Makefile b/sysutils/py-azure-cli-eventhubs/Makefile index c1f89f02315..194d51af66f 100644 --- a/sysutils/py-azure-cli-eventhubs/Makefile +++ b/sysutils/py-azure-cli-eventhubs/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Event Hubs Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventhub>=2.6.0:devel/py-azure-mgmt-eventhub@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-extension/Makefile b/sysutils/py-azure-cli-extension/Makefile index 44e08d26d49..59783b69629 100644 --- a/sysutils/py-azure-cli-extension/Makefile +++ b/sysutils/py-azure-cli-extension/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Extension Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} USES= azurepy python diff --git a/sysutils/py-azure-cli-feedback/Makefile b/sysutils/py-azure-cli-feedback/Makefile index 2aad2ca7e11..2b389704b7d 100644 --- a/sysutils/py-azure-cli-feedback/Makefile +++ b/sysutils/py-azure-cli-feedback/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Feedback Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} USES= azurepy python diff --git a/sysutils/py-azure-cli-find/Makefile b/sysutils/py-azure-cli-find/Makefile index 4b3bc36590e..695fc283548 100644 --- a/sysutils/py-azure-cli-find/Makefile +++ b/sysutils/py-azure-cli-find/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Find Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} USES= azurepy python diff --git a/sysutils/py-azure-cli-hdinsight/Makefile b/sysutils/py-azure-cli-hdinsight/Makefile index 8dc78237cf6..2e3dcfbb798 100644 --- a/sysutils/py-azure-cli-hdinsight/Makefile +++ b/sysutils/py-azure-cli-hdinsight/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools HDInsight Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-hdinsight>=0.2.1:devel/py-azure-mgmt-hdinsight@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-interactive/Makefile b/sysutils/py-azure-cli-interactive/Makefile index 5af2266a338..9148b0895b7 100644 --- a/sysutils/py-azure-cli-interactive/Makefile +++ b/sysutils/py-azure-cli-interactive/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Interactive Shell LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit1>=1.0.15:devel/py-prompt_toolkit1@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-iot/Makefile b/sysutils/py-azure-cli-iot/Makefile index 335f6efdeca..c82ef377494 100644 --- a/sysutils/py-azure-cli-iot/Makefile +++ b/sysutils/py-azure-cli-iot/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools IoT Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothub>=0.8.2:devel/py-azure-mgmt-iothub@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothubprovisioningservices>=0.2.0:devel/py-azure-mgmt-iothubprovisioningservices@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-iotcentral/Makefile b/sysutils/py-azure-cli-iotcentral/Makefile index 86d16001ac1..573c75a917a 100644 --- a/sysutils/py-azure-cli-iotcentral/Makefile +++ b/sysutils/py-azure-cli-iotcentral/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools IoT Central Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-iotcentral>=1.0.0:devel/py-azure-mgmt-iotcentral@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-keyvault/Makefile b/sysutils/py-azure-cli-keyvault/Makefile index 56e57173176..1d9c38bb669 100644 --- a/sysutils/py-azure-cli-keyvault/Makefile +++ b/sysutils/py-azure-cli-keyvault/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Keyvault Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-keyvault>=1.1.0:devel/py-azure-mgmt-keyvault@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1.0:devel/py-azure-keyvault@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-kusto/Makefile b/sysutils/py-azure-cli-kusto/Makefile index 14c17924260..8664122c871 100644 --- a/sysutils/py-azure-cli-kusto/Makefile +++ b/sysutils/py-azure-cli-kusto/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools KUSTO Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-kusto>=0.3.0:devel/py-azure-mgmt-kusto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-lab/Makefile b/sysutils/py-azure-cli-lab/Makefile index b769e9488e6..f0c16595675 100644 --- a/sysutils/py-azure-cli-lab/Makefile +++ b/sysutils/py-azure-cli-lab/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools DevTestLabs Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-devtestlabs>=2.2.0:devel/py-azure-mgmt-devtestlabs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-maps/Makefile b/sysutils/py-azure-cli-maps/Makefile index 243e75075bd..4fa61937281 100644 --- a/sysutils/py-azure-cli-maps/Makefile +++ b/sysutils/py-azure-cli-maps/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Maps Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-maps>=0.1.0:devel/py-azure-mgmt-maps@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-monitor/Makefile b/sysutils/py-azure-cli-monitor/Makefile index 1b31a1822cf..5581de4f532 100644 --- a/sysutils/py-azure-cli-monitor/Makefile +++ b/sysutils/py-azure-cli-monitor/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Monitor Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-network/Makefile b/sysutils/py-azure-cli-network/Makefile index 0463fa2e381..8992811edc4 100644 --- a/sysutils/py-azure-cli-network/Makefile +++ b/sysutils/py-azure-cli-network/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Network Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-trafficmanager>=0.51.0:devel/py-azure-mgmt-trafficmanager@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-dns>=2.1.0:devel/py-azure-mgmt-dns@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-policyinsights/Makefile b/sysutils/py-azure-cli-policyinsights/Makefile index e614cc504fc..0d78dd2c027 100644 --- a/sysutils/py-azure-cli-policyinsights/Makefile +++ b/sysutils/py-azure-cli-policyinsights/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Policy Insights Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-policyinsights>=0.3.1:devel/py-azure-mgmt-policyinsights@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-profile/Makefile b/sysutils/py-azure-cli-profile/Makefile index 61bfc733a66..eddfd3d3615 100644 --- a/sysutils/py-azure-cli-profile/Makefile +++ b/sysutils/py-azure-cli-profile/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Profile Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} USES= azurepy python diff --git a/sysutils/py-azure-cli-rdbms/Makefile b/sysutils/py-azure-cli-rdbms/Makefile index 4e8f4881759..6172eb4dc24 100644 --- a/sysutils/py-azure-cli-rdbms/Makefile +++ b/sysutils/py-azure-cli-rdbms/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools MySQL and PostgreSQL Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-rdbms>=1.8.0:devel/py-azure-mgmt-rdbms@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-redis/Makefile b/sysutils/py-azure-cli-redis/Makefile index 3e150571f1f..32d5fc8a9fa 100644 --- a/sysutils/py-azure-cli-redis/Makefile +++ b/sysutils/py-azure-cli-redis/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Redis Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-redis>=6.0.0:devel/py-azure-mgmt-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-relay/Makefile b/sysutils/py-azure-cli-relay/Makefile index 693407fc180..f7931be9a1f 100644 --- a/sysutils/py-azure-cli-relay/Makefile +++ b/sysutils/py-azure-cli-relay/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Relay Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-relay>=0.1.0:devel/py-azure-mgmt-relay@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-reservations/Makefile b/sysutils/py-azure-cli-reservations/Makefile index b5033795351..1bf960d93b9 100644 --- a/sysutils/py-azure-cli-reservations/Makefile +++ b/sysutils/py-azure-cli-reservations/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Reservations Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-reservations>=0.3.1:devel/py-azure-mgmt-reservations@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-resource/Makefile b/sysutils/py-azure-cli-resource/Makefile index a6acbeb967c..31ee400a693 100644 --- a/sysutils/py-azure-cli-resource/Makefile +++ b/sysutils/py-azure-cli-resource/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Resource Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-managementgroups>=0.1.0:devel/py-azure-mgmt-managementgroups@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-role/Makefile b/sysutils/py-azure-cli-role/Makefile index 7f2d3ba9277..0239df2de24 100644 --- a/sysutils/py-azure-cli-role/Makefile +++ b/sysutils/py-azure-cli-role/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Role Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-search/Makefile b/sysutils/py-azure-cli-search/Makefile index b74c3dc43e0..289faa05f13 100644 --- a/sysutils/py-azure-cli-search/Makefile +++ b/sysutils/py-azure-cli-search/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Search Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-search>=2.0.0:devel/py-azure-mgmt-search@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-security/Makefile b/sysutils/py-azure-cli-security/Makefile index 08adb959cd9..ca172143d51 100644 --- a/sysutils/py-azure-cli-security/Makefile +++ b/sysutils/py-azure-cli-security/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Azure Security Center LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-security>=0.1.0:devel/py-azure-mgmt-security@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-servicebus/Makefile b/sysutils/py-azure-cli-servicebus/Makefile index 3e3d4f27c78..bcf9706dbbc 100644 --- a/sysutils/py-azure-cli-servicebus/Makefile +++ b/sysutils/py-azure-cli-servicebus/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Service Bus Command-Line Tools LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicebus>=0.6.0:devel/py-azure-mgmt-servicebus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-servicefabric/Makefile b/sysutils/py-azure-cli-servicefabric/Makefile index 2df37a1cd8f..9b7aa127289 100644 --- a/sysutils/py-azure-cli-servicefabric/Makefile +++ b/sysutils/py-azure-cli-servicefabric/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Service Fabric Command-Line Tools LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1.0:devel/py-azure-keyvault@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=3.0.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-signalr/Makefile b/sysutils/py-azure-cli-signalr/Makefile index 38fe4541de6..1c078fe8a0f 100644 --- a/sysutils/py-azure-cli-signalr/Makefile +++ b/sysutils/py-azure-cli-signalr/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools SignalR Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-signalr>=0.1.1:devel/py-azure-mgmt-signalr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-sql/Makefile b/sysutils/py-azure-cli-sql/Makefile index 45f2cd496cc..cb0c9b39390 100644 --- a/sysutils/py-azure-cli-sql/Makefile +++ b/sysutils/py-azure-cli-sql/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools SQL Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-sql>=0.12.0:devel/py-azure-mgmt-sql@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli-sqlvm/Makefile b/sysutils/py-azure-cli-sqlvm/Makefile index ad83a5d944c..81d327d1183 100644 --- a/sysutils/py-azure-cli-sqlvm/Makefile +++ b/sysutils/py-azure-cli-sqlvm/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools SQL virtual machine Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-sqlvirtualmachine>=0.3.0:devel/py-azure-mgmt-sqlvirtualmachine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-storage/Makefile b/sysutils/py-azure-cli-storage/Makefile index 8e173db9db5..2720440805c 100644 --- a/sysutils/py-azure-cli-storage/Makefile +++ b/sysutils/py-azure-cli-storage/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools Storage Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=3.3.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-multiapi-storage>=0.2.3:devel/py-azure-multiapi-storage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=0:sysutils/py-azure-cli-core@${PY_FLAVOR} diff --git a/sysutils/py-azure-cli-telemetry/Makefile b/sysutils/py-azure-cli-telemetry/Makefile index 76f612c61af..dc2daac7669 100644 --- a/sysutils/py-azure-cli-telemetry/Makefile +++ b/sysutils/py-azure-cli-telemetry/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-cli-telemetry -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ COMMENT= Microsoft Azure CLI Telemetry Package LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}applicationinsights>=0.11.1:devel/py-applicationinsights@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}portalocker>=1.2.1:devel/py-portalocker@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}portalocker>=1.2:devel/py-portalocker@${PY_FLAVOR} USES= azurepy python USE_PYTHON= autoplist concurrent distutils diff --git a/sysutils/py-azure-cli-telemetry/distinfo b/sysutils/py-azure-cli-telemetry/distinfo index 8404be58b71..a77bcf17095 100644 --- a/sysutils/py-azure-cli-telemetry/distinfo +++ b/sysutils/py-azure-cli-telemetry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553900854 -SHA256 (azure-cli-telemetry-1.0.2.tar.gz) = c0141ddeed1319bcc3179617f74859e5f17477ce676051a4ead1d29c75eb9593 -SIZE (azure-cli-telemetry-1.0.2.tar.gz) = 8252 +TIMESTAMP = 1567880508 +SHA256 (azure-cli-telemetry-1.0.3.tar.gz) = d4e6948f49768b28edc22a05405de214431a9bb5873cdd2d037014f3d93dc269 +SIZE (azure-cli-telemetry-1.0.3.tar.gz) = 8318 diff --git a/sysutils/py-azure-cli-vm/Makefile b/sysutils/py-azure-cli-vm/Makefile index 505c3105cc6..5c987fd97cb 100644 --- a/sysutils/py-azure-cli-vm/Makefile +++ b/sysutils/py-azure-cli-vm/Makefile @@ -11,6 +11,9 @@ COMMENT= Microsoft Azure Command-Line Tools VM Command Module LICENSE= MIT +DEPRECATED= Incorporated into azure-cli package +EXPIRATION_DATE=2019-09-30 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-mgmt-msi>=0.2.0:devel/py-azure-mgmt-msi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.50.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=5.0.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \ diff --git a/sysutils/py-azure-cli/Makefile b/sysutils/py-azure-cli/Makefile index 4226d1088ce..967d1ce5c47 100644 --- a/sysutils/py-azure-cli/Makefile +++ b/sysutils/py-azure-cli/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-cli -PORTVERSION= 2.0.67 +PORTVERSION= 2.0.72 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,60 +12,97 @@ COMMENT= Microsoft Azure Command-Line Tools LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=2.0.67:sysutils/py-azure-cli-core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-profile>=2.1.5:sysutils/py-azure-cli-profile@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-resource>=2.1.16:sysutils/py-azure-cli-resource@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-monitor>=0.2.15:sysutils/py-azure-cli-monitor@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-vm>=2.2.23:sysutils/py-azure-cli-vm@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-batch>=7.0:devel/py-azure-batch@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-cli-core>=2.0.72:sysutils/py-azure-cli-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=1.0.2:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-storage>=2.4.3:sysutils/py-azure-cli-storage@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-sql>=2.2.5:sysutils/py-azure-cli-sql@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-sqlvm>=0.2.0:sysutils/py-azure-cli-sqlvm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-signalr>=1.0.1:sysutils/py-azure-cli-signalr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-servicefabric>=0.1.20:sysutils/py-azure-cli-servicefabric@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-servicebus>=0.3.6:sysutils/py-azure-cli-servicebus@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-security>=0.1.2:sysutils/py-azure-cli-security@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-search>=0.1.2:sysutils/py-azure-cli-search@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-role>=2.6.4:sysutils/py-azure-cli-role@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-reservations>=0.4.3:sysutils/py-azure-cli-reservations@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-relay>=0.1.5:sysutils/py-azure-cli-relay@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-redis>=0.4.4:sysutils/py-azure-cli-redis@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-rdbms>=0.3.12:sysutils/py-azure-cli-rdbms@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-policyinsights>=0.1.4:sysutils/py-azure-cli-policyinsights@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-network>=2.5.2:sysutils/py-azure-cli-network@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-maps>=0.3.5:sysutils/py-azure-cli-maps@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-lab>=0.1.8:sysutils/py-azure-cli-lab@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-kusto>=0.2.3:sysutils/py-azure-cli-kusto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-keyvault>=2.2.16:sysutils/py-azure-cli-keyvault@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-iotcentral>=0.1.7:sysutils/py-azure-cli-iotcentral@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-iot>=0.3.11:sysutils/py-azure-cli-iot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-interactive>=0.4.5:sysutils/py-azure-cli-interactive@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-hdinsight>=0.3.5:sysutils/py-azure-cli-hdinsight@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-find>=0.3.4:sysutils/py-azure-cli-find@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-feedback>=2.2.1:sysutils/py-azure-cli-feedback@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-extension>=0.2.5:sysutils/py-azure-cli-extension@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-eventhubs>=0.3.7:sysutils/py-azure-cli-eventhubs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-eventgrid>=0.2.4:sysutils/py-azure-cli-eventgrid@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-dms>=0.1.4:sysutils/py-azure-cli-dms@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-dls>=0.1.10:sysutils/py-azure-cli-dls@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-dla>=0.2.6:sysutils/py-azure-cli-dla@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-cosmosdb>=0.2.11:sysutils/py-azure-cli-cosmosdb@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-container>=0.3.18:sysutils/py-azure-cli-container@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-consumption>=0.4.4:sysutils/py-azure-cli-consumption@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-configure>=2.0.24:sysutils/py-azure-cli-configure@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-cognitiveservices>=0.2.6:sysutils/py-azure-cli-cognitiveservices@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-cloud>=2.1.1:sysutils/py-azure-cli-cloud@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-cdn>=0.2.4:sysutils/py-azure-cli-cdn@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-botservice>=0.2.2:sysutils/py-azure-cli-botservice@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-billing>=0.2.2:sysutils/py-azure-cli-billing@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-batchai>=0.4.10:sysutils/py-azure-cli-batchai@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-batch>=4.0.3:sysutils/py-azure-cli-batch@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-backup>=1.2.5:sysutils/py-azure-cli-backup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-ams>=0.4.7:sysutils/py-azure-cli-ams@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-advisor>=2.0.1:sysutils/py-azure-cli-advisor@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-acs>=2.4.4:sysutils/py-azure-cli-acs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}azure-cli-acr>=2.2.9:sysutils/py-azure-cli-acr@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}azure-cosmos>=3.0.2:devel/py-azure-cosmos@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.45:devel/py-azure-datalake-store@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-functions-devops-build>=0.0.22:devel/py-azure-functions-devops-build@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-keyvault>=1.1:devel/py-azure-keyvault@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-advisor>=2.0.1:devel/py-azure-mgmt-advisor@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-applicationinsights>=0.1.1:devel/py-azure-mgmt-applicationinsights@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-appconfiguration>=0.1.0:devel/py-azure-mgmt-appconfiguration@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=0.52.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-batch>=6.0:devel/py-azure-mgmt-batch@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-batchai>=2.0:devel/py-azure-mgmt-batchai@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-billing>=0.2:devel/py-azure-mgmt-billing@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-botservice>=0.2.0:devel/py-azure-mgmt-botservice@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-cdn>=3.1:devel/py-azure-mgmt-cdn@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-cognitiveservices>=5.0.0:devel/py-azure-mgmt-cognitiveservices@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=6.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-consumption>=2.0:devel/py-azure-mgmt-consumption@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerinstance>=1.4:devel/py-azure-mgmt-containerinstance@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=3.0.0.r5:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerservice>=5.2:devel/py-azure-mgmt-containerservice@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-cosmosdb>=0.7.0:devel/py-azure-mgmt-cosmosdb@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-analytics>=0.2.1:devel/py-azure-mgmt-datalake-analytics@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-datamigration>=0.1.0:devel/py-azure-mgmt-datamigration@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-deploymentmanager>=0.1.0:devel/py-azure-mgmt-deploymentmanager@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-devtestlabs>=2.2:devel/py-azure-mgmt-devtestlabs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-dns>=2.1:devel/py-azure-mgmt-dns@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventgrid>=2.2:devel/py-azure-mgmt-eventgrid@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventhub>=2.6:devel/py-azure-mgmt-eventhub@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-hdinsight>=1.1.0:devel/py-azure-mgmt-hdinsight@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-imagebuilder>=0.2.1:devel/py-azure-mgmt-imagebuilder@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-iotcentral>=1.0:devel/py-azure-mgmt-iotcentral@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothub>=0.8.2:devel/py-azure-mgmt-iothub@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothubprovisioningservices>=0.2.0:devel/py-azure-mgmt-iothubprovisioningservices@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-keyvault>=1.1:devel/py-azure-mgmt-keyvault@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-kusto>=0.3.0:devel/py-azure-mgmt-kusto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-loganalytics>=0.2:devel/py-azure-mgmt-loganalytics@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-managedservices>=1.0:devel/py-azure-mgmt-managedservices@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-managementgroups>=0.1:devel/py-azure-mgmt-managementgroups@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-maps>=0.1.0:devel/py-azure-mgmt-maps@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-marketplaceordering>=0.1:devel/py-azure-mgmt-marketplaceordering@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-media>=1.1:devel/py-azure-mgmt-media@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=0.5.2:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-msi>=0.2:devel/py-azure-mgmt-msi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-network>=4.0:devel/py-azure-mgmt-network@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-netapp>=0.5.0:devel/py-azure-mgmt-netapp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-policyinsights>=0.3.1:devel/py-azure-mgmt-policyinsights@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-privatedns>=0.1.0:devel/py-azure-mgmt-privatedns@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-rdbms>=1.8:devel/py-azure-mgmt-rdbms@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservices>=0.4.0:devel/py-azure-mgmt-recoveryservices@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservicesbackup>=0.4.0:devel/py-azure-mgmt-recoveryservicesbackup@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-redis>=6.0:devel/py-azure-mgmt-redis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-relay>=0.1.0:devel/py-azure-mgmt-relay@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-reservations>=0.3.1:devel/py-azure-mgmt-reservations@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=2.1:devel/py-azure-mgmt-resource@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-search>=2.0:devel/py-azure-mgmt-search@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-security>=0.1.0:devel/py-azure-mgmt-security@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicebus>=0.6.0:devel/py-azure-mgmt-servicebus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicefabric>=0.2.0:devel/py-azure-mgmt-servicefabric@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-signalr>=0.3.0:devel/py-azure-mgmt-signalr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-sql>=0.12:devel/py-azure-mgmt-sql@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-sqlvirtualmachine>=0.4.0:devel/py-azure-mgmt-sqlvirtualmachine@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=4.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-trafficmanager>=0.51.0:devel/py-azure-mgmt-trafficmanager@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=0.42.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-multiapi-storage>=0.2.4:devel/py-azure-multiapi-storage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=1.3.1:devel/py-azure-storage-blob@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.4.1:devel/py-colorama@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=2.3.1:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fabric>=2.4:devel/py-fabric@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}knack>=0.6.3:devel/py-knack@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8:security/py-paramiko@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.4:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=5.6:sysutils/py-psutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scp>=0.13.2:security/py-scp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sshtunnel>=0.1.4:net/py-sshtunnel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.18:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vsts-cd-manager>=1.0.0:devel/py-vsts-cd-manager@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.56.0:www/py-websocket-client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.12:devel/py-xmltodict@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}javaproperties>=0.5.1:devel/py-javaproperties@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsondiff>=1.2.0:devel/py-jsondiff@${PY_FLAVOR} USES= azurepy python USE_PYTHON= autoplist concurrent distutils diff --git a/sysutils/py-azure-cli/distinfo b/sysutils/py-azure-cli/distinfo index a301985811b..396ecf1a66b 100644 --- a/sysutils/py-azure-cli/distinfo +++ b/sysutils/py-azure-cli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561042718 -SHA256 (azure-cli-2.0.67.tar.gz) = 4c7e87f8bb6f6143f5a2c2bc9c2e7e7d56f6836dbb658cca00452cfd09194ec5 -SIZE (azure-cli-2.0.67.tar.gz) = 8603 +TIMESTAMP = 1567853924 +SHA256 (azure-cli-2.0.72.tar.gz) = d40fbadeff0957f4776df3dd50a6b7563927c74c3115111b086d1709d9cd9585 +SIZE (azure-cli-2.0.72.tar.gz) = 1018576 diff --git a/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___help.py b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___help.py new file mode 100644 index 00000000000..f3fd7d00e43 --- /dev/null +++ b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___help.py @@ -0,0 +1,24 @@ +# Part of +# https://github.com/Azure/azure-cli/commit/b33944353f474a35cae113b1496e90822d2eb8c6 +--- azure/cli/command_modules/resource/_help.py.orig 2019-09-07 20:28:46 UTC ++++ azure/cli/command_modules/resource/_help.py +@@ -799,6 +799,19 @@ examples: + "effect": "deny" + } + }' ++ - name: Create a policy definition with mode. The mode 'Indexed' indicates the policy should be evaluated only for resource types that support tags and location. ++ text: | ++ az policy definition create --name TagsPolicyDefinition --subscription 'MySubscription' --mode Indexed --rules '{ ++ "if": ++ { ++ "field": "tags", ++ "exists": "false" ++ }, ++ "then": ++ { ++ "effect": "deny" ++ } ++ }' + """ + + helps['policy definition delete'] = """ diff --git a/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___params.py b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___params.py new file mode 100644 index 00000000000..4d83465381a --- /dev/null +++ b/sysutils/py-azure-cli/files/patch-azure_cli_command__modules_resource___params.py @@ -0,0 +1,21 @@ +# Part of +# https://github.com/Azure/azure-cli/commit/b33944353f474a35cae113b1496e90822d2eb8c6 +--- azure/cli/command_modules/resource/_params.py.orig 2019-09-07 20:29:39 UTC ++++ azure/cli/command_modules/resource/_params.py +@@ -102,7 +102,6 @@ def load_arguments(self, _): + c.argument('resource_group_name', arg_type=resource_group_name_type, help='the resource group where the policy will be applied') + + with self.argument_context('policy definition', resource_type=ResourceType.MGMT_RESOURCE_POLICY) as c: +- from azure.mgmt.resource.policy.models import PolicyMode + c.argument('policy_definition_name', arg_type=existing_policy_definition_name_type) + c.argument('rules', help='JSON formatted string or a path to a file with such content', type=file_type, completer=FilesCompleter()) + c.argument('display_name', help='Display name of policy definition.') +@@ -110,7 +109,7 @@ def load_arguments(self, _): + c.argument('params', help='JSON formatted string or a path to a file or uri with parameter definitions.', type=file_type, completer=FilesCompleter(), min_api='2016-12-01') + c.argument('metadata', min_api='2017-06-01-preview', nargs='+', validator=validate_metadata, help='Metadata in space-separated key=value pairs.') + c.argument('management_group', arg_type=management_group_name_type) +- c.argument('mode', arg_type=get_enum_type(PolicyMode), options_list=['--mode', '-m'], help='Mode of the policy definition.', min_api='2016-12-01') ++ c.argument('mode', options_list=['--mode', '-m'], help='Mode of the policy definition, e.g. All, Indexed. Please visit https://aka.ms/azure-policy-mode for more information.', min_api='2016-12-01') + c.argument('subscription', arg_type=subscription_type) + c.ignore('_subscription') # disable global subscription + diff --git a/sysutils/py-azure-cli/pkg-message b/sysutils/py-azure-cli/pkg-message index 9d3c309ac66..8fbcf6d5658 100644 --- a/sysutils/py-azure-cli/pkg-message +++ b/sysutils/py-azure-cli/pkg-message @@ -1,8 +1,6 @@ [ { message: <0:devel/py-fabric@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}fabric1>0:devel/py-fabric1@${PY_FLAVOR} + +USES= python:2.7 +USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= tomster GH_PROJECT= ezjail-remote -USES= python:2.7 -USE_PYTHON= distutils autoplist +NO_ARCH= yes .include diff --git a/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile index da8846515f7..bf36305fc44 100644 --- a/sysutils/py-ploy_fabric/Makefile +++ b/sysutils/py-ploy_fabric/Makefile @@ -3,6 +3,7 @@ PORTNAME= ploy_fabric DISTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,9 +15,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}fabric1>=1.4.0,1:devel/py-fabric1@${PY_FLAVOR} USES= python:-2.7 zip USE_PYTHON= autoplist distutils +NO_ARCH= yes + .include diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile index c9e899ffbd7..ecdf538ff03 100644 --- a/sysutils/terraform/Makefile +++ b/sysutils/terraform/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= terraform -PORTVERSION= 0.12.6 +PORTVERSION= 0.12.8 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -16,9 +16,7 @@ GH_ACCOUNT= hashicorp PLIST_FILES= bin/${PORTNAME} -USES= go - -GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +USES= go:modules post-patch: ${REINPLACE_CMD} 's|Prerelease = "dev"|Prerelease = ""|' \ diff --git a/sysutils/terraform/distinfo b/sysutils/terraform/distinfo index d0d0d0910c6..5be196a2ced 100644 --- a/sysutils/terraform/distinfo +++ b/sysutils/terraform/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565566051 -SHA256 (hashicorp-terraform-v0.12.6_GH0.tar.gz) = df108a45f5ba2658eed844c3a6647117324c99770e06cbd549b26dd7c20ee623 -SIZE (hashicorp-terraform-v0.12.6_GH0.tar.gz) = 9728742 +TIMESTAMP = 1567781888 +SHA256 (hashicorp-terraform-v0.12.8_GH0.tar.gz) = f1c69a264c76de20afbca92943419668f02a46005111347959d25ea285c2f5cc +SIZE (hashicorp-terraform-v0.12.8_GH0.tar.gz) = 9945904 diff --git a/textproc/Makefile b/textproc/Makefile index 9b9d165d221..62365e3a6d5 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1283,6 +1283,7 @@ SUBDIR += py-hypua2jamo SUBDIR += py-jaxml SUBDIR += py-jsonslicer + SUBDIR += py-jsx-lexer SUBDIR += py-jtextfsm SUBDIR += py-junit-xml SUBDIR += py-langdetect @@ -1298,6 +1299,7 @@ SUBDIR += py-markdown-math SUBDIR += py-markdown2 SUBDIR += py-markups + SUBDIR += py-misaka SUBDIR += py-mistune SUBDIR += py-mkdocs SUBDIR += py-mkdocs-nature @@ -1556,11 +1558,14 @@ SUBDIR += rubygem-jekyll-paginate SUBDIR += rubygem-jekyll-redirect-from SUBDIR += rubygem-jekyll-sass-converter + SUBDIR += rubygem-jekyll-sass-converter1 SUBDIR += rubygem-jekyll-sitemap SUBDIR += rubygem-jemoji SUBDIR += rubygem-js_regex SUBDIR += rubygem-jsmin SUBDIR += rubygem-kramdown + SUBDIR += rubygem-kramdown-parser-gfm + SUBDIR += rubygem-kramdown1 SUBDIR += rubygem-kwalify SUBDIR += rubygem-libxml-ruby SUBDIR += rubygem-linguistics diff --git a/textproc/R-cran-rmarkdown/Makefile b/textproc/R-cran-rmarkdown/Makefile index b64891fd69a..59aeea33dd5 100644 --- a/textproc/R-cran-rmarkdown/Makefile +++ b/textproc/R-cran-rmarkdown/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rmarkdown -PORTVERSION= 1.14 -PORTREVISION= 1 +PORTVERSION= 1.15 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/textproc/R-cran-rmarkdown/distinfo b/textproc/R-cran-rmarkdown/distinfo index c0fa9b0e831..a4c29f0d5b4 100644 --- a/textproc/R-cran-rmarkdown/distinfo +++ b/textproc/R-cran-rmarkdown/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563082717 -SHA256 (rmarkdown_1.14.tar.gz) = f636b1048c5be56e06aa0b2b4342ad5c8192734f1e9b27468fef62be672edc61 -SIZE (rmarkdown_1.14.tar.gz) = 3163022 +TIMESTAMP = 1567915316 +SHA256 (rmarkdown_1.15.tar.gz) = bcb2193dea04621fa1f530ea986ac0c839676bd7a753a1c35a864db567ff6e3a +SIZE (rmarkdown_1.15.tar.gz) = 3174782 diff --git a/textproc/minify/Makefile b/textproc/minify/Makefile index 41299c15323..c062d395e62 100644 --- a/textproc/minify/Makefile +++ b/textproc/minify/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= minify -PORTVERSION= 2.5.1 +PORTVERSION= 2.5.2 DISTVERSIONPREFIX= v CATEGORIES= textproc www @@ -21,10 +21,11 @@ PLIST_FILES= bin/minify GH_ACCOUNT= tdewolff GH_TUPLE= dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \ - golang:sys:61b9204:golang_sys/vendor/golang.org/x/sys \ - matryer:try:v1:matryer_try/vendor/github.com/matryer/try \ + golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \ + matryer:try:9ac251b:matryer_try/vendor/github.com/matryer/try \ spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \ - tdewolff:parse:v2.3.7:tdewolff_parse/vendor/github.com/tdewolff/parse/v2 + tdewolff:parse:v2.3.9:tdewolff_parse/vendor/github.com/tdewolff/parse/v2 \ + tdewolff:test:v1.0.4:tdewolff_test/vendor/github.com/tdewolff/test USE_GITHUB= yes do-install: diff --git a/textproc/minify/distinfo b/textproc/minify/distinfo index 82cabbdb142..6c165cba107 100644 --- a/textproc/minify/distinfo +++ b/textproc/minify/distinfo @@ -1,15 +1,17 @@ -TIMESTAMP = 1563640686 -SHA256 (tdewolff-minify-v2.5.1_GH0.tar.gz) = 7ddbf32e2d032cfd615d271b088767ca2f27fedcd33c478338dc784f48698aee -SIZE (tdewolff-minify-v2.5.1_GH0.tar.gz) = 2239057 +TIMESTAMP = 1567789355 +SHA256 (tdewolff-minify-v2.5.2_GH0.tar.gz) = cf9518548e16bfe546d03fbb004e665006888205ef58367b3240d1fd402b1025 +SIZE (tdewolff-minify-v2.5.2_GH0.tar.gz) = 2262365 SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260 SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139 -SHA256 (golang-sys-61b9204_GH0.tar.gz) = a73df35a8c64cf371fda32e00519f15614f4dd5f26cd85d7a4598fa80d51d052 -SIZE (golang-sys-61b9204_GH0.tar.gz) = 1418673 -SHA256 (matryer-try-v1_GH0.tar.gz) = a01c6644fc2e1403a4489306a4fbca52dd3b2e1b6374e6a2f86f57fd430104be -SIZE (matryer-try-v1_GH0.tar.gz) = 2924 +SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8 +SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012 +SHA256 (matryer-try-9ac251b_GH0.tar.gz) = 6eec844ce4fc732db6fc59a12a9bbdc75448945816eef948ce738b524ecde9ac +SIZE (matryer-try-9ac251b_GH0.tar.gz) = 3039 SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124 SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002 -SHA256 (tdewolff-parse-v2.3.7_GH0.tar.gz) = 3155686d93acd56f10236bf07b73cf693331f3bdb80f75fed6faf2bba7eddcaf -SIZE (tdewolff-parse-v2.3.7_GH0.tar.gz) = 76224 +SHA256 (tdewolff-parse-v2.3.9_GH0.tar.gz) = c4fa45656d625aeca9b367e95d9ca03ac45d0411a3e05b294806dc9652364b50 +SIZE (tdewolff-parse-v2.3.9_GH0.tar.gz) = 76371 +SHA256 (tdewolff-test-v1.0.4_GH0.tar.gz) = dc6756bc047d9b2c246d3e7b79d8e6956b3bf9799111189ef812621c249d9b56 +SIZE (tdewolff-test-v1.0.4_GH0.tar.gz) = 2809 diff --git a/textproc/py-jsx-lexer/Makefile b/textproc/py-jsx-lexer/Makefile new file mode 100644 index 00000000000..b931dfc54c4 --- /dev/null +++ b/textproc/py-jsx-lexer/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= jsx-lexer +PORTVERSION= 0.0.7 +DISTVERSIONPREFIX=v +CATEGORIES= textproc python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= koobs@FreeBSD.org +COMMENT= JSX lexer for Pygments + +LICENSE= MIT +#LICENSE_FILE= Not packaged yet in sdist + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments@${PY_FLAVOR} + +USES= python +USE_GITHUB= yes # tests not in sdist +USE_PYTHON= autoplist distutils + +GH_ACCOUNT= fcurella + +NO_ARCH= yes + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + +.include diff --git a/textproc/py-jsx-lexer/distinfo b/textproc/py-jsx-lexer/distinfo new file mode 100644 index 00000000000..2a6087072a0 --- /dev/null +++ b/textproc/py-jsx-lexer/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567760207 +SHA256 (fcurella-jsx-lexer-v0.0.7_GH0.tar.gz) = 0ee40ef9d210056b6e2d834bd57d5cf90f338b1ced2222f5b30a1b5ba71acd21 +SIZE (fcurella-jsx-lexer-v0.0.7_GH0.tar.gz) = 5437 diff --git a/textproc/py-jsx-lexer/pkg-descr b/textproc/py-jsx-lexer/pkg-descr new file mode 100644 index 00000000000..375224f8cf3 --- /dev/null +++ b/textproc/py-jsx-lexer/pkg-descr @@ -0,0 +1,6 @@ +A JSX lexer for Pygments. Supports: + + * Sphinx + * mkdocs + +WWW: https://github.com/fcurella/jsx-lexer diff --git a/textproc/py-misaka/Makefile b/textproc/py-misaka/Makefile new file mode 100644 index 00000000000..ffc24b91fe7 --- /dev/null +++ b/textproc/py-misaka/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= misaka +PORTVERSION= 2.1.1 +CATEGORIES= textproc python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= koobs@FreeBSD.org +COMMENT= CFFI binding for Hoedown, a markdown parsing library + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} +TEST_DEPENDS= tidy5:www/tidy-html5 + +# Actually 2.7,3.4+ +USES= python +USE_PYTHON= autoplist concurrent distutils + +PYDISTUTILS_BUILDARGS= build_ext -i + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/misaka/*.so + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} tests/run_tests.py + +.include diff --git a/textproc/py-misaka/distinfo b/textproc/py-misaka/distinfo new file mode 100644 index 00000000000..6b34d9c1517 --- /dev/null +++ b/textproc/py-misaka/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567764366 +SHA256 (misaka-2.1.1.tar.gz) = 62f35254550095d899fc2ab8b33e156fc5e674176f074959cbca43cf7912ecd7 +SIZE (misaka-2.1.1.tar.gz) = 125187 diff --git a/textproc/py-misaka/files/patch-tests_utils.py b/textproc/py-misaka/files/patch-tests_utils.py new file mode 100644 index 00000000000..a9c9d5209ca --- /dev/null +++ b/textproc/py-misaka/files/patch-tests_utils.py @@ -0,0 +1,15 @@ +# textproc/html5-tidy doesn't provide a 'tidy' binary +# and BINARY_ALIAS doesn't work at test: time +# TODO: Ask upstream to support a TIDY_BIN variable + +--- tests/utils.py.orig 2019-09-06 11:18:46 UTC ++++ tests/utils.py +@@ -5,7 +5,7 @@ from subprocess import Popen, PIPE, STDOUT + + def clean_html(dirty_html): + input_html = dirty_html.encode('utf-8') +- p = Popen(['tidy', '--show-body-only', '1', '--quiet', '1', '--show-warnings', '0', '-utf8'], ++ p = Popen(['tidy5', '--show-body-only', '1', '--quiet', '1', '--show-warnings', '0', '-utf8'], + stdout=PIPE, stdin=PIPE, stderr=STDOUT) + stdout, stderr = p.communicate(input=input_html) + diff --git a/textproc/py-misaka/pkg-descr b/textproc/py-misaka/pkg-descr new file mode 100644 index 00000000000..508f3ba6728 --- /dev/null +++ b/textproc/py-misaka/pkg-descr @@ -0,0 +1,5 @@ +Misaka is a CFFI-based binding for Hoedown, a fast markdown processing +library written in C. It features a fast HTML renderer and functionality +to make custom renderers (e.g. man pages or LaTeX). + +WWW: https://github.com/FSX/misaka diff --git a/textproc/ruby-htree/Makefile b/textproc/ruby-htree/Makefile index 2254cff3967..a23b00e4067 100644 --- a/textproc/ruby-htree/Makefile +++ b/textproc/ruby-htree/Makefile @@ -3,6 +3,7 @@ PORTNAME= htree PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= textproc www ruby MASTER_SITES= http://www.a-k-r.org/htree/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -11,6 +12,8 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby library to manipulate HTML/XML tree data structure +BUILD_DEPENDS= rubygem-rdoc>=0.a:devel/rubygem-rdoc + OPTIONS_DEFINE= DOCS USE_RUBY= yes diff --git a/textproc/rubygem-colorator/Makefile b/textproc/rubygem-colorator/Makefile index 9f5e50d4cfb..c2542b21273 100644 --- a/textproc/rubygem-colorator/Makefile +++ b/textproc/rubygem-colorator/Makefile @@ -6,14 +6,15 @@ PORTVERSION= 1.1.0 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org -COMMENT= Colorize your text in a terminal with a simple API +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Colorize your text in the terminal LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/textproc/rubygem-jekyll-assets/Makefile b/textproc/rubygem-jekyll-assets/Makefile index c33eb1318cb..8b26278ac02 100644 --- a/textproc/rubygem-jekyll-assets/Makefile +++ b/textproc/rubygem-jekyll-assets/Makefile @@ -3,6 +3,7 @@ PORTNAME= jekyll-assets PORTVERSION= 3.0.12 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -16,7 +17,7 @@ RUN_DEPENDS= rubygem-activesupport5>=5.0:devel/rubygem-activesupport5 \ rubygem-execjs>=2.7:devel/rubygem-execjs \ rubygem-extras>=0.2:devel/rubygem-extras \ rubygem-fastimage>=2.0:graphics/rubygem-fastimage \ - rubygem-jekyll>=3.5:www/rubygem-jekyll \ + rubygem-jekyll3>=3.5:www/rubygem-jekyll3 \ rubygem-jekyll-sanity>=1.2:www/rubygem-jekyll-sanity \ rubygem-liquid-tag-parser>=1.0:textproc/rubygem-liquid-tag-parser \ rubygem-nokogiri>=1.8:textproc/rubygem-nokogiri \ diff --git a/textproc/rubygem-jekyll-feed/Makefile b/textproc/rubygem-jekyll-feed/Makefile index 7f3ca754232..3e9e2511b10 100644 --- a/textproc/rubygem-jekyll-feed/Makefile +++ b/textproc/rubygem-jekyll-feed/Makefile @@ -1,17 +1,17 @@ # $FreeBSD$ PORTNAME= jekyll-feed -PORTVERSION= 0.11.0 +PORTVERSION= 0.12.1 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Generates an Atom feed from Jekyll posts LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-jekyll>=3.3:www/rubygem-jekyll +RUN_DEPENDS= rubygem-jekyll>=3.7<5.0:www/rubygem-jekyll USES= gem shebangfix USE_RUBY= yes diff --git a/textproc/rubygem-jekyll-feed/distinfo b/textproc/rubygem-jekyll-feed/distinfo index 201d7cac9c0..3b1dd96e1a5 100644 --- a/textproc/rubygem-jekyll-feed/distinfo +++ b/textproc/rubygem-jekyll-feed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536592004 -SHA256 (rubygem/jekyll-feed-0.11.0.gem) = 97c52f737f6ff7c442277c1f2e525c6b1c76b699654bd711f4b6b53a17c6b486 -SIZE (rubygem/jekyll-feed-0.11.0.gem) = 18944 +TIMESTAMP = 1567842494 +SHA256 (rubygem/jekyll-feed-0.12.1.gem) = e3514d6fb1529a685f36d3260dcfa2f51f1fd53592229b604b0c8fdce48ec005 +SIZE (rubygem/jekyll-feed-0.12.1.gem) = 19456 diff --git a/textproc/rubygem-jekyll-gist/Makefile b/textproc/rubygem-jekyll-gist/Makefile index 05b3923c67b..57f65d8b7e1 100644 --- a/textproc/rubygem-jekyll-gist/Makefile +++ b/textproc/rubygem-jekyll-gist/Makefile @@ -12,11 +12,12 @@ COMMENT= Liquid tag for displaying GitHub Gists in Jekyll sites LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-octokit>=4.2:net/rubygem-octokit +RUN_DEPENDS= rubygem-octokit>=4.2<5:net/rubygem-octokit + +USES= gem shebangfix +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem shebangfix SHEBANG_FILES= script/* diff --git a/textproc/rubygem-jekyll-mentions/Makefile b/textproc/rubygem-jekyll-mentions/Makefile index 1e51f5792c1..97bcc95025e 100644 --- a/textproc/rubygem-jekyll-mentions/Makefile +++ b/textproc/rubygem-jekyll-mentions/Makefile @@ -1,20 +1,21 @@ # $FreeBSD$ PORTNAME= jekyll-mentions -PORTVERSION= 1.4.1 +PORTVERSION= 1.5.1 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= At-mention support for Jekyll sites LICENSE= MIT -RUN_DEPENDS= rubygem-html-pipeline>=2.3:textproc/rubygem-html-pipeline \ - rubygem-jekyll>=3.0:www/rubygem-jekyll +RUN_DEPENDS= rubygem-html-pipeline>=2.3<3:textproc/rubygem-html-pipeline \ + rubygem-jekyll>=3.7<5.0:www/rubygem-jekyll + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem .include diff --git a/textproc/rubygem-jekyll-mentions/distinfo b/textproc/rubygem-jekyll-mentions/distinfo index d3b1f8ec7f7..35f9aee06cf 100644 --- a/textproc/rubygem-jekyll-mentions/distinfo +++ b/textproc/rubygem-jekyll-mentions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533819589 -SHA256 (rubygem/jekyll-mentions-1.4.1.gem) = 0ef3689f762629312b4a9b4d6848089fc54129cd84565fbe30358aa032cde141 -SIZE (rubygem/jekyll-mentions-1.4.1.gem) = 6144 +TIMESTAMP = 1567842496 +SHA256 (rubygem/jekyll-mentions-1.5.1.gem) = fb98cb0e7a5c035c831ab6ddd972e0e110c567f277ddab654144a354f8b201e5 +SIZE (rubygem/jekyll-mentions-1.5.1.gem) = 6144 diff --git a/textproc/rubygem-jekyll-paginate/Makefile b/textproc/rubygem-jekyll-paginate/Makefile index 7bbd9ef03c9..4f6c09e71cd 100644 --- a/textproc/rubygem-jekyll-paginate/Makefile +++ b/textproc/rubygem-jekyll-paginate/Makefile @@ -13,12 +13,11 @@ COMMENT= Built-in Pagination Generator for Jekyll LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt +USES= gem shebangfix +USE_RUBY= yes + NO_ARCH= yes -USE_RUBY= yes -USES= gem shebangfix -SHEBANG_FILES= script/bootstrap \ - script/cibuild \ - script/unbundle +SHEBANG_FILES= script/* .include diff --git a/textproc/rubygem-jekyll-redirect-from/Makefile b/textproc/rubygem-jekyll-redirect-from/Makefile index 768b159ad4a..efb25f6ebc5 100644 --- a/textproc/rubygem-jekyll-redirect-from/Makefile +++ b/textproc/rubygem-jekyll-redirect-from/Makefile @@ -1,21 +1,22 @@ # $FreeBSD$ PORTNAME= jekyll-redirect-from -PORTVERSION= 0.14.0 +PORTVERSION= 0.15.0 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Handles redirection URLs for jekyll pages and posts LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-jekyll>=3.3:www/rubygem-jekyll +RUN_DEPENDS= rubygem-jekyll>=3.3<5.0:www/rubygem-jekyll + +USES= gem shebangfix +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem shebangfix SHEBANG_FILES= script/* diff --git a/textproc/rubygem-jekyll-redirect-from/distinfo b/textproc/rubygem-jekyll-redirect-from/distinfo index fa807ef4829..9d17c4ab3a1 100644 --- a/textproc/rubygem-jekyll-redirect-from/distinfo +++ b/textproc/rubygem-jekyll-redirect-from/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532976161 -SHA256 (rubygem/jekyll-redirect-from-0.14.0.gem) = 44f5077b292cfff47938144e98bcd09c589c8169c4eabefcd40633bcdd69ae23 -SIZE (rubygem/jekyll-redirect-from-0.14.0.gem) = 15872 +TIMESTAMP = 1567842498 +SHA256 (rubygem/jekyll-redirect-from-0.15.0.gem) = 4bcb490d362cc6792c28bab70bbb40ac29ee11ddf902536d4059e5787ec897b3 +SIZE (rubygem/jekyll-redirect-from-0.15.0.gem) = 16896 diff --git a/textproc/rubygem-jekyll-sass-converter/Makefile b/textproc/rubygem-jekyll-sass-converter/Makefile index 5da055d1224..a771c3fedd8 100644 --- a/textproc/rubygem-jekyll-sass-converter/Makefile +++ b/textproc/rubygem-jekyll-sass-converter/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jekyll-sass-converter -PORTVERSION= 1.5.2 +PORTVERSION= 2.0.0 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,10 +11,11 @@ COMMENT= Basic Sass converter for Jekyll LICENSE= MIT -RUN_DEPENDS= rubygem-sass>=3.4:textproc/rubygem-sass +RUN_DEPENDS= rubygem-sassc>=2.1.0<3.0:textproc/rubygem-sassc + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem .include diff --git a/textproc/rubygem-jekyll-sass-converter/distinfo b/textproc/rubygem-jekyll-sass-converter/distinfo index a12a4501bf6..dd89a6000f1 100644 --- a/textproc/rubygem-jekyll-sass-converter/distinfo +++ b/textproc/rubygem-jekyll-sass-converter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517741492 -SHA256 (rubygem/jekyll-sass-converter-1.5.2.gem) = 53773669e414dc3bb070113befacb808576025a28cfa4a4accc682e90a9c1101 -SIZE (rubygem/jekyll-sass-converter-1.5.2.gem) = 5632 +TIMESTAMP = 1567842500 +SHA256 (rubygem/jekyll-sass-converter-2.0.0.gem) = a229262039933d3f482dc4a73f4dce508e392566ead5cbd1abdfe38d6e116c39 +SIZE (rubygem/jekyll-sass-converter-2.0.0.gem) = 7680 diff --git a/textproc/rubygem-jekyll-sass-converter1/Makefile b/textproc/rubygem-jekyll-sass-converter1/Makefile new file mode 100644 index 00000000000..26aa3da0748 --- /dev/null +++ b/textproc/rubygem-jekyll-sass-converter1/Makefile @@ -0,0 +1,24 @@ +# Created by: Sunpoet Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= jekyll-sass-converter +PORTVERSION= 1.5.2 +CATEGORIES= textproc rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 1 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Basic Sass converter for Jekyll + +LICENSE= MIT + +RUN_DEPENDS= rubygem-sass>=3.4<4:textproc/rubygem-sass + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +PORTSCOUT= limit:^1\. + +.include diff --git a/textproc/rubygem-jekyll-sass-converter1/distinfo b/textproc/rubygem-jekyll-sass-converter1/distinfo new file mode 100644 index 00000000000..a12a4501bf6 --- /dev/null +++ b/textproc/rubygem-jekyll-sass-converter1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1517741492 +SHA256 (rubygem/jekyll-sass-converter-1.5.2.gem) = 53773669e414dc3bb070113befacb808576025a28cfa4a4accc682e90a9c1101 +SIZE (rubygem/jekyll-sass-converter-1.5.2.gem) = 5632 diff --git a/textproc/rubygem-jekyll-sass-converter1/pkg-descr b/textproc/rubygem-jekyll-sass-converter1/pkg-descr new file mode 100644 index 00000000000..e3efa3e0397 --- /dev/null +++ b/textproc/rubygem-jekyll-sass-converter1/pkg-descr @@ -0,0 +1,3 @@ +rubygem-jekyll-sass-converter is a basic Sass converter for Jekyll. + +WWW: https://github.com/jekyll/jekyll-sass-converter diff --git a/textproc/rubygem-jekyll-sitemap/Makefile b/textproc/rubygem-jekyll-sitemap/Makefile index bec6a844c6e..f812366e36c 100644 --- a/textproc/rubygem-jekyll-sitemap/Makefile +++ b/textproc/rubygem-jekyll-sitemap/Makefile @@ -1,21 +1,22 @@ # $FreeBSD$ PORTNAME= jekyll-sitemap -PORTVERSION= 1.2.0 +PORTVERSION= 1.3.1 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Automatically generate a sitemap.xml for Jekyll sites LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-jekyll>=3.3:www/rubygem-jekyll +RUN_DEPENDS= rubygem-jekyll>=3.7<5.0:www/rubygem-jekyll + +USES= gem shebangfix +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem shebangfix SHEBANG_FILES= script/* diff --git a/textproc/rubygem-jekyll-sitemap/distinfo b/textproc/rubygem-jekyll-sitemap/distinfo index 244c186e4ca..8ad0cd8949c 100644 --- a/textproc/rubygem-jekyll-sitemap/distinfo +++ b/textproc/rubygem-jekyll-sitemap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516969900 -SHA256 (rubygem/jekyll-sitemap-1.2.0.gem) = 3621d68ef09a4f6f65a0577c01a76e4049aaf566de39bb602719e140b51fc977 -SIZE (rubygem/jekyll-sitemap-1.2.0.gem) = 71680 +TIMESTAMP = 1567842502 +SHA256 (rubygem/jekyll-sitemap-1.3.1.gem) = b528e0bbd6eb3d4906b9df5fc3ad33d4710b615990f5309e22629d61d7c67c34 +SIZE (rubygem/jekyll-sitemap-1.3.1.gem) = 72192 diff --git a/textproc/rubygem-jemoji/Makefile b/textproc/rubygem-jemoji/Makefile index 81bf061f3cc..9ef0d6c8a6e 100644 --- a/textproc/rubygem-jemoji/Makefile +++ b/textproc/rubygem-jemoji/Makefile @@ -1,18 +1,18 @@ # $FreeBSD$ PORTNAME= jemoji -PORTVERSION= 0.11.0 +PORTVERSION= 0.11.1 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= GitHub-flavored emoji plugin for Jekyll LICENSE= MIT -RUN_DEPENDS= rubygem-gemoji>=3.0:textproc/rubygem-gemoji \ - rubygem-html-pipeline>=2.2:textproc/rubygem-html-pipeline \ - rubygem-jekyll>=3.0:www/rubygem-jekyll +RUN_DEPENDS= rubygem-gemoji>=3.0<4:textproc/rubygem-gemoji \ + rubygem-html-pipeline>=2.2<3:textproc/rubygem-html-pipeline \ + rubygem-jekyll>=3.0<5.0:www/rubygem-jekyll USES= gem USE_RUBY= yes diff --git a/textproc/rubygem-jemoji/distinfo b/textproc/rubygem-jemoji/distinfo index b9438a0fd6b..58e9412614f 100644 --- a/textproc/rubygem-jemoji/distinfo +++ b/textproc/rubygem-jemoji/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556384326 -SHA256 (rubygem/jemoji-0.11.0.gem) = 3325badd68342c2793d4aa4df34ce9936ef7087c0d5cf5af716a46a40c1d8674 -SIZE (rubygem/jemoji-0.11.0.gem) = 5632 +TIMESTAMP = 1567842506 +SHA256 (rubygem/jemoji-0.11.1.gem) = 061a0de9977de055290cdb9eac832dd703f2de30df5c868b832cc12d4b3ea7f9 +SIZE (rubygem/jemoji-0.11.1.gem) = 5632 diff --git a/textproc/rubygem-kramdown-parser-gfm/Makefile b/textproc/rubygem-kramdown-parser-gfm/Makefile new file mode 100644 index 00000000000..59603d96c92 --- /dev/null +++ b/textproc/rubygem-kramdown-parser-gfm/Makefile @@ -0,0 +1,22 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= kramdown-parser-gfm +PORTVERSION= 1.1.0 +CATEGORIES= textproc rubygems +MASTER_SITES= RG + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Kramdown parser for the GFM dialect of Markdown + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + +RUN_DEPENDS= rubygem-kramdown>=2.0<3:textproc/rubygem-kramdown + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/textproc/rubygem-kramdown-parser-gfm/distinfo b/textproc/rubygem-kramdown-parser-gfm/distinfo new file mode 100644 index 00000000000..41dcbef3ee6 --- /dev/null +++ b/textproc/rubygem-kramdown-parser-gfm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567842450 +SHA256 (rubygem/kramdown-parser-gfm-1.1.0.gem) = fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729 +SIZE (rubygem/kramdown-parser-gfm-1.1.0.gem) = 11776 diff --git a/textproc/rubygem-kramdown-parser-gfm/pkg-descr b/textproc/rubygem-kramdown-parser-gfm/pkg-descr new file mode 100644 index 00000000000..bd84ee03290 --- /dev/null +++ b/textproc/rubygem-kramdown-parser-gfm/pkg-descr @@ -0,0 +1,4 @@ +This is a parser for kramdown that converts Markdown documents in the GFM +dialect to HTML. + +WWW: https://github.com/kramdown/parser-gfm diff --git a/textproc/rubygem-kramdown/Makefile b/textproc/rubygem-kramdown/Makefile index 5badced6e99..54c81a29041 100644 --- a/textproc/rubygem-kramdown/Makefile +++ b/textproc/rubygem-kramdown/Makefile @@ -2,22 +2,21 @@ # $FreeBSD$ PORTNAME= kramdown -PORTVERSION= 1.17.0 +PORTVERSION= 2.1.0 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Yet-another-markdown-parser but fast, pure Ruby LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -NO_ARCH= yes +USES= gem USE_RUBY= yes -USES= gem shebangfix + +NO_ARCH= yes PLIST_FILES= bin/kramdown -SHEBANG_FILES= benchmark/*.sh - .include diff --git a/textproc/rubygem-kramdown/distinfo b/textproc/rubygem-kramdown/distinfo index b5c4697261f..6a3bc384773 100644 --- a/textproc/rubygem-kramdown/distinfo +++ b/textproc/rubygem-kramdown/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527784979 -SHA256 (rubygem/kramdown-1.17.0.gem) = 5862410a2c1692fde2fcc86d78d2265777c22bd101f11c76442f1698ab242cd8 -SIZE (rubygem/kramdown-1.17.0.gem) = 260608 +TIMESTAMP = 1567842508 +SHA256 (rubygem/kramdown-2.1.0.gem) = 089956b32ef77cf85136553b392635d9e2b8b6c7bd8e470db6a9a1be172088b6 +SIZE (rubygem/kramdown-2.1.0.gem) = 119808 diff --git a/textproc/rubygem-kramdown1/Makefile b/textproc/rubygem-kramdown1/Makefile new file mode 100644 index 00000000000..b3dc91ff4fa --- /dev/null +++ b/textproc/rubygem-kramdown1/Makefile @@ -0,0 +1,28 @@ +# Created by: Steve Wills +# $FreeBSD$ + +PORTNAME= kramdown +PORTVERSION= 1.17.0 +CATEGORIES= textproc rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 1 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Yet-another-markdown-parser but fast, pure Ruby + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= gem shebangfix +USE_RUBY= yes + +NO_ARCH= yes + +PORTSCOUT= limit:^1\. + +SHEBANG_FILES= benchmark/*.sh + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/kramdown + +.include diff --git a/textproc/rubygem-kramdown1/distinfo b/textproc/rubygem-kramdown1/distinfo new file mode 100644 index 00000000000..b5c4697261f --- /dev/null +++ b/textproc/rubygem-kramdown1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1527784979 +SHA256 (rubygem/kramdown-1.17.0.gem) = 5862410a2c1692fde2fcc86d78d2265777c22bd101f11c76442f1698ab242cd8 +SIZE (rubygem/kramdown-1.17.0.gem) = 260608 diff --git a/textproc/rubygem-kramdown1/pkg-descr b/textproc/rubygem-kramdown1/pkg-descr new file mode 100644 index 00000000000..76a5411a058 --- /dev/null +++ b/textproc/rubygem-kramdown1/pkg-descr @@ -0,0 +1,4 @@ +kramdown is yet-another-markdown-parser but fast, pure Ruby, using a strict +syntax definition and supporting several common extensions. + +WWW: https://kramdown.gettalong.org/ diff --git a/textproc/rubygem-liquid-tag-parser/Makefile b/textproc/rubygem-liquid-tag-parser/Makefile index eb064ae916c..9957374c5f2 100644 --- a/textproc/rubygem-liquid-tag-parser/Makefile +++ b/textproc/rubygem-liquid-tag-parser/Makefile @@ -12,12 +12,13 @@ COMMENT= Parse liquid tags easily LICENSE= MIT -RUN_DEPENDS= rubygem-extras>=0.3:devel/rubygem-extras \ - rubygem-liquid>=3.0:textproc/rubygem-liquid +RUN_DEPENDS= rubygem-extras>=0.3<1:devel/rubygem-extras \ + rubygem-liquid>=3.0<5.0:textproc/rubygem-liquid + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USES= compiler:c++11-lang gem -USE_RUBY= yes # Disable rdoc OPTIONS_EXCLUDE=DOCS diff --git a/textproc/rubygem-liquid/Makefile b/textproc/rubygem-liquid/Makefile index e0cdb597977..23d3d418ed4 100644 --- a/textproc/rubygem-liquid/Makefile +++ b/textproc/rubygem-liquid/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= liquid -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= textproc rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library for rendering safe templates LICENSE= MIT diff --git a/textproc/rubygem-liquid/distinfo b/textproc/rubygem-liquid/distinfo index 6cce4be2ef8..0475b11a35f 100644 --- a/textproc/rubygem-liquid/distinfo +++ b/textproc/rubygem-liquid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539426292 -SHA256 (rubygem/liquid-4.0.1.gem) = dc9eb4519c913b4914f621ce9f2ac76534588f4b40ba6fce243a09f97ad5492f -SIZE (rubygem/liquid-4.0.1.gem) = 72704 +TIMESTAMP = 1567842510 +SHA256 (rubygem/liquid-4.0.3.gem) = 7e15a957fbeb424dec15b52311880524954ce6e384ba9171e21ff98f142c0f7e +SIZE (rubygem/liquid-4.0.3.gem) = 76288 diff --git a/textproc/rubygem-liquid/pkg-descr b/textproc/rubygem-liquid/pkg-descr index 2ef98bfeef3..23220761243 100644 --- a/textproc/rubygem-liquid/pkg-descr +++ b/textproc/rubygem-liquid/pkg-descr @@ -1,4 +1,8 @@ -Ruby library for rendering safe templates which cannot affect the -security of the server they are rendered on. +Liquid is an open-source template language created by Shopify and written in +Ruby. It is the backbone of Shopify themes and is used to load dynamic content +on storefronts. -WWW: http://www.liquidmarkup.org +Liquid has been in production use at Shopify since 2006 and is now used by many +other hosted web applications. + +WWW: https://shopify.github.io/liquid/ diff --git a/textproc/rubygem-octopress-escape-code/Makefile b/textproc/rubygem-octopress-escape-code/Makefile index 483f620834e..2424e7923c1 100644 --- a/textproc/rubygem-octopress-escape-code/Makefile +++ b/textproc/rubygem-octopress-escape-code/Makefile @@ -2,6 +2,7 @@ PORTNAME= octopress-escape-code PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,10 +12,11 @@ COMMENT= Adds escape sequences for code blocks in Jekyll LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-jekyll>=3.0:www/rubygem-jekyll +RUN_DEPENDS= rubygem-jekyll3>=3.0:www/rubygem-jekyll3 + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem .include diff --git a/textproc/rubygem-sassc/Makefile b/textproc/rubygem-sassc/Makefile index 6fa203befa9..a0c7c585634 100644 --- a/textproc/rubygem-sassc/Makefile +++ b/textproc/rubygem-sassc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sassc -PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -13,17 +12,13 @@ COMMENT= Use libsass with Ruby LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake -RUN_DEPENDS= rubygem-ffi>=1.9.6:devel/rubygem-ffi \ - rubygem-rake>=0:devel/rubygem-rake LIB_DEPENDS= libsass.so:textproc/libsass +RUN_DEPENDS= rubygem-ffi>=1.9<2:devel/rubygem-ffi USES= gem gmake USE_RUBY= yes -NO_ARCH= yes - post-patch: - @${REINPLACE_CMD} -e 's|#{gem_root}/ext/libsass|${LOCALBASE}|g' ${WRKSRC}/lib/sassc/native.rb + @${REINPLACE_CMD} -e '/ffi_lib/ s|__dir__|"${LOCALBASE}/lib"|' ${WRKSRC}/lib/sassc/native.rb .include diff --git a/textproc/rubygem-sassc/distinfo b/textproc/rubygem-sassc/distinfo index 550d9862aa7..27f67c40f03 100644 --- a/textproc/rubygem-sassc/distinfo +++ b/textproc/rubygem-sassc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557684430 -SHA256 (rubygem/sassc-2.0.1.gem) = 047e9391863429d7f188ab9912c97dbfb8cba87a1a549dfba159739a8b4024eb -SIZE (rubygem/sassc-2.0.1.gem) = 357888 +TIMESTAMP = 1567842399 +SHA256 (rubygem/sassc-2.1.0.gem) = da119e3a122d4d80b5f26db4f26110070f4bcb4b34ecb5e76663387e37767c1a +SIZE (rubygem/sassc-2.1.0.gem) = 302080 diff --git a/textproc/rubygem-sassc/files/patch-ext-extconf.rb b/textproc/rubygem-sassc/files/patch-ext-extconf.rb new file mode 100644 index 00000000000..16ed910acb9 --- /dev/null +++ b/textproc/rubygem-sassc/files/patch-ext-extconf.rb @@ -0,0 +1,11 @@ +--- ext/extconf.rb.orig 2019-09-07 21:32:44 UTC ++++ ext/extconf.rb +@@ -28,7 +28,7 @@ end + if enable_config('lto', true) + $CFLAGS << ' -flto' + $CXXFLAGS << ' -flto' +- $LDFLAGS << ' -flto' ++ $LDFLAGS << ' -flto -fuse-ld=lld' + end + + # Disable noisy compilation warnings. diff --git a/textproc/rubygem-terminal-table/Makefile b/textproc/rubygem-terminal-table/Makefile index 3aa562fc7e8..f632664770c 100644 --- a/textproc/rubygem-terminal-table/Makefile +++ b/textproc/rubygem-terminal-table/Makefile @@ -10,11 +10,13 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= Simple, feature rich ASCII table generation library LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-unicode-display_width>=1.1.1:devel/rubygem-unicode-display_width +RUN_DEPENDS= rubygem-unicode-display_width>=1.1.1<2:devel/rubygem-unicode-display_width + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem .include diff --git a/textproc/rubygem-terminal-table/pkg-descr b/textproc/rubygem-terminal-table/pkg-descr index 02dd6fbadaa..1de9b1f77ee 100644 --- a/textproc/rubygem-terminal-table/pkg-descr +++ b/textproc/rubygem-terminal-table/pkg-descr @@ -1,8 +1,10 @@ -Simple, feature rich ascii table generation library. +Terminal Table is a fast and simple, yet feature rich ASCII table generator +written in Ruby. - - Optional headings - - Alignment of columns, headings, or cells - - Supports column span - - Easy modification of table strings (+, -, |) +Features: +- Optional headings +- Alignment of columns, headings, or cells +- Supports column span +- Easy modification of table strings (+, -, |) WWW: https://github.com/tj/terminal-table diff --git a/textproc/sift/Makefile b/textproc/sift/Makefile index 259d70e5448..5279964378d 100644 --- a/textproc/sift/Makefile +++ b/textproc/sift/Makefile @@ -4,7 +4,7 @@ PORTNAME= sift PORTVERSION= 0.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= sunpoet@FreeBSD.org @@ -20,8 +20,8 @@ GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} PLIST_FILES= bin/sift GH_ACCOUNT= svent -GH_TUPLE= golang:crypto:22d7a77:golang_crypto/../src/golang.org/x/crypto \ - golang:sys:61b9204:golang_sys/../src/golang.org/x/sys \ +GH_TUPLE= golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \ + golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \ svent:go-flags:4bcbad3:svent_goflags/../src/github.com/svent/go-flags \ svent:go-nbreader:7cef48d:svent_gonbreader/../src/github.com/svent/go-nbreader USE_GITHUB= yes diff --git a/textproc/sift/distinfo b/textproc/sift/distinfo index 18ad917dc8f..e7efb8cb7ab 100644 --- a/textproc/sift/distinfo +++ b/textproc/sift/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1555712791 +TIMESTAMP = 1567842456 SHA256 (svent-sift-v0.9.0_GH0.tar.gz) = bbbd5c472c36b78896cd7ae673749d3943621a6d5523d47973ed2fc6800ae4c8 SIZE (svent-sift-v0.9.0_GH0.tar.gz) = 37442 -SHA256 (golang-crypto-22d7a77_GH0.tar.gz) = f4841ec4826e71e428a300f2c4990382a68e5a9890876b18f360b3c47404198d -SIZE (golang-crypto-22d7a77_GH0.tar.gz) = 1685051 -SHA256 (golang-sys-61b9204_GH0.tar.gz) = a73df35a8c64cf371fda32e00519f15614f4dd5f26cd85d7a4598fa80d51d052 -SIZE (golang-sys-61b9204_GH0.tar.gz) = 1418673 +SHA256 (golang-crypto-71b5226_GH0.tar.gz) = 7ab66566a1792bf53b26474bf023d0607e59158af6a1321d94c56de433cb083b +SIZE (golang-crypto-71b5226_GH0.tar.gz) = 1693011 +SHA256 (golang-sys-749cb33_GH0.tar.gz) = 14cd0776aff1de547c3d2501e985917d5843fbbab11c9f8c2ad7bb2c7a1279a8 +SIZE (golang-sys-749cb33_GH0.tar.gz) = 1468012 SHA256 (svent-go-flags-4bcbad3_GH0.tar.gz) = 8fb342e5d1ad220c7040a6f185f39a38679f9c88e24716fcc6f2fef2ee09825a SIZE (svent-go-flags-4bcbad3_GH0.tar.gz) = 45988 SHA256 (svent-go-nbreader-7cef48d_GH0.tar.gz) = 62e0248ba434aa54461f554afc532cd5a4393ce55c35fdf750175fa14f997448 diff --git a/textproc/stardict-dictd_mova/Makefile b/textproc/stardict-dictd_mova/Makefile index 8924e1b5b3c..87cc4c5feb5 100644 --- a/textproc/stardict-dictd_mova/Makefile +++ b/textproc/stardict-dictd_mova/Makefile @@ -5,14 +5,12 @@ PORTNAME= stardict-dictd_mova PORTVERSION= 2.4.2 PORTREVISION= 8 CATEGORIES= textproc -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/mova.org/ +MASTER_SITES= http://download.huzheng.org/mova.org/ DIST_SUBDIR= stardict MAINTAINER= ports@FreeBSD.org COMMENT= Dictionaries from www.mova.org for StarDict -BROKEN= unfetchable - NO_BUILD= yes NO_ARCH= yes USES= tar:bzip2 diff --git a/textproc/stardict-quick/Makefile b/textproc/stardict-quick/Makefile index 43b73163ad6..21ada15864c 100644 --- a/textproc/stardict-quick/Makefile +++ b/textproc/stardict-quick/Makefile @@ -5,14 +5,12 @@ PORTNAME= stardict-quick PORTVERSION= 2.4.2 PORTREVISION= 9 CATEGORIES= textproc -MASTER_SITES= http://abloz.com/huzheng/stardict-dic/Quick/ +MASTER_SITES= http://download.huzheng.org/Quick/ DIST_SUBDIR= stardict MAINTAINER= ports@FreeBSD.org COMMENT= Dictionaries from Quick for StarDict -BROKEN= unfetchable - NO_BUILD= yes NO_ARCH= yes USES= tar:bzip2 diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile index 86c8df760a8..256903bcf39 100644 --- a/textproc/xml2rfc/Makefile +++ b/textproc/xml2rfc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xml2rfc -PORTVERSION= 2.23.0 +PORTVERSION= 2.26.0 CATEGORIES= textproc MASTER_SITES= http://tools.ietf.org/tools/xml2rfc2/cli/ @@ -19,7 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.1:devel/py-intervaltree@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-i18n-address>=2.3.2:devel/py-google-i18n-address@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.6:devel/py-kitchen@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist concurrent optsuffix diff --git a/textproc/xml2rfc/distinfo b/textproc/xml2rfc/distinfo index 6273dc1f04b..b2c79e39d42 100644 --- a/textproc/xml2rfc/distinfo +++ b/textproc/xml2rfc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561911063 -SHA256 (xml2rfc-2.23.0.tar.gz) = ce528fbc87facaafa70ff8d95b45f18a4d3819eada16325bbae3808bc625bb26 -SIZE (xml2rfc-2.23.0.tar.gz) = 3920108 +TIMESTAMP = 1567785453 +SHA256 (xml2rfc-2.26.0.tar.gz) = 89bd9baea8d9c1c4f0a9c4eaf12b9fbe1b1996e1923254d140cbe595b56d9559 +SIZE (xml2rfc-2.26.0.tar.gz) = 3910653 diff --git a/textproc/xml2rfc/files/patch-requirements.txt b/textproc/xml2rfc/files/patch-requirements.txt index 664365d045c..10c82259021 100644 --- a/textproc/xml2rfc/files/patch-requirements.txt +++ b/textproc/xml2rfc/files/patch-requirements.txt @@ -1,11 +1,11 @@ ---- requirements.txt.orig 2019-02-14 14:17:04 UTC +--- requirements.txt.orig 2019-08-26 12:39:42 UTC +++ requirements.txt -@@ -1,7 +1,7 @@ - google-i18n-address>=2.3.2 +@@ -2,7 +2,7 @@ google-i18n-address>=2.3.2 html5lib>=1.0.1 intervaltree>=2.1.0,!=3.0.0 --lxml>=2.2.8,!=4.3.1 + kitchen>=1.2.6 +-lxml>=2.2.8,!=4.3.1 +lxml>=2.2.8 - pycountry>=1.8 + pycountry>=1.8,!=19.7.15 pyflakes>=0.8.1 requests>=2.5.0 diff --git a/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt b/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt index 9f6a0434b27..e7a0256aafd 100644 --- a/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt +++ b/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt @@ -1,11 +1,11 @@ ---- xml2rfc.egg-info/requires.txt.orig 2019-04-08 11:17:38 UTC +--- xml2rfc.egg-info/requires.txt.orig 2019-09-03 19:57:24 UTC +++ xml2rfc.egg-info/requires.txt -@@ -1,7 +1,7 @@ - google-i18n-address>=2.3.2 +@@ -2,7 +2,7 @@ google-i18n-address>=2.3.2 html5lib>=1.0.1 intervaltree!=3.0.0,>=2.1.0 + kitchen>=1.2.6 -lxml!=4.3.1,>=2.2.8 -+lxml>=2.2.8 - pycountry>=1.8 ++lxml!=4.3.1 + pycountry!=19.7.15,>=1.8 pyflakes>=0.8.1 requests>=2.5.0 diff --git a/vietnamese/vnconvert/Makefile b/vietnamese/vnconvert/Makefile index 2f30b414f4e..3b0813e9d23 100644 --- a/vietnamese/vnconvert/Makefile +++ b/vietnamese/vnconvert/Makefile @@ -3,6 +3,7 @@ PORTNAME= vnconvert PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= vietnamese MASTER_SITES= LOCAL/obrien DISTNAME= convert diff --git a/vietnamese/vnconvert/files/patch-vnconvert.c b/vietnamese/vnconvert/files/patch-vnconvert.c new file mode 100644 index 00000000000..eb99f9e5324 --- /dev/null +++ b/vietnamese/vnconvert/files/patch-vnconvert.c @@ -0,0 +1,45 @@ +--- vnconvert.c.orig 1994-05-20 20:36:17 UTC ++++ vnconvert.c +@@ -91,7 +91,7 @@ main() + printf("\t6 - VN Thin-Art (Mac)\n\n"); + + printf("Input-file name (or Enter to quit): "); +- gets(bufline); ++ gets_s(bufline, 255); + if (strlen(bufline) == 0) + break; + sscanf(bufline, "%s", input_file); +@@ -99,21 +99,21 @@ main() + printf("currently in the format number: "); + *bufline = '\0'; + while (strlen(bufline)==0) { +- gets(bufline); ++ gets_s(bufline, 255); + sscanf(bufline, "%d", &from); + } + + printf("\nOutput-file name: "); + *bufline = '\0'; + while (strlen(bufline)==0) { +- gets(bufline); ++ gets_s(bufline, 255); + sscanf(bufline, "%s", output_file); + } + + printf("to the format number: "); + *bufline = '\0'; + while (strlen(bufline)==0) { +- gets(bufline); ++ gets_s(bufline, 255); + sscanf(bufline, "%d", &to); + } + +@@ -152,7 +152,7 @@ main() + } + else { + fprintf(stderr, "\"%s\" already exists. Overwrite it (y/n)? ", output_file); +- gets(buf); ++ gets_s(buf, BUFSIZ); + if (toupper(buf[0]) != 'Y') + icontinue = 1; + } diff --git a/www/Makefile b/www/Makefile index 324143f0c76..803c462d9e5 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1518,6 +1518,7 @@ SUBDIR += py-django-assets SUBDIR += py-django-auth-ldap SUBDIR += py-django-babel + SUBDIR += py-django-bakery SUBDIR += py-django-bitfield SUBDIR += py-django-bootstrap-form SUBDIR += py-django-bootstrap3 @@ -1597,6 +1598,7 @@ SUBDIR += py-django-sortedm2m SUBDIR += py-django-star-ratings SUBDIR += py-django-statici18n + SUBDIR += py-django-staticinline SUBDIR += py-django-storages SUBDIR += py-django-subdomains SUBDIR += py-django-sudo @@ -2059,6 +2061,7 @@ SUBDIR += rubygem-jekyll SUBDIR += rubygem-jekyll-sanity SUBDIR += rubygem-jekyll-watch + SUBDIR += rubygem-jekyll3 SUBDIR += rubygem-journey SUBDIR += rubygem-jquery-atwho-rails SUBDIR += rubygem-jquery-rails diff --git a/www/cplanet/Makefile b/www/cplanet/Makefile index 92e4f9b320c..0707484b86f 100644 --- a/www/cplanet/Makefile +++ b/www/cplanet/Makefile @@ -9,6 +9,9 @@ MASTER_SITES= http://files.etoilebsd.net/cplanet/ MAINTAINER= bapt@FreeBSD.org COMMENT= RSS Feed Aggregator that generate static html +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= ${LOCALBASE}/lib/libneo_cs.a:www/clearsilver LIB_DEPENDS= libexpat.so:textproc/expat2 \ libcurl.so:ftp/curl diff --git a/www/cplanet/pkg-descr b/www/cplanet/pkg-descr index 103d9468b9f..6397286897f 100644 --- a/www/cplanet/pkg-descr +++ b/www/cplanet/pkg-descr @@ -1,4 +1,4 @@ cplanet is a RSS/ATOM feed aggregator written in C that generate static html files. -WWW: http://fossil.etoilebsd.net/cplanet +WWW: https://fossil.etoilebsd.net/cplanet/ diff --git a/www/ddgr/Makefile b/www/ddgr/Makefile index 2b45cd42ddd..e15675450ae 100644 --- a/www/ddgr/Makefile +++ b/www/ddgr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ddgr -PORTVERSION= 1.6 +PORTVERSION= 1.7 DISTVERSIONPREFIX= v CATEGORIES= www @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= jarun -USES= python:3.4+ shebangfix +USES= python:3.5+ shebangfix SHEBANG_FILES= ${PORTNAME} NO_ARCH= yes NO_BUILD= yes diff --git a/www/ddgr/distinfo b/www/ddgr/distinfo index f92116604e8..d03b03002e4 100644 --- a/www/ddgr/distinfo +++ b/www/ddgr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542460000 -SHA256 (jarun-ddgr-v1.6_GH0.tar.gz) = eae7ff1ab44dfda168a8bbe46593e80ca4a26ab45a9efbab13e6f466349e0e5c -SIZE (jarun-ddgr-v1.6_GH0.tar.gz) = 42933 +TIMESTAMP = 1567801297 +SHA256 (jarun-ddgr-v1.7_GH0.tar.gz) = 1e3d01dc71337b2a59b96ab89ee422a7ef9e6ddcd42813ac08d57db194bc4fea +SIZE (jarun-ddgr-v1.7_GH0.tar.gz) = 43838 diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 050f2eb9317..34881c1328d 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 68.1.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/files/patch-cubeb-dlopen b/www/firefox-esr/files/patch-cubeb-dlopen new file mode 100644 index 00000000000..9314ede7925 --- /dev/null +++ b/www/firefox-esr/files/patch-cubeb-dlopen @@ -0,0 +1,793 @@ +https://github.com/kinetiknz/cubeb/pull/539 + +diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build +index 1ff0c02545251..ca364d1ef7845 100644 +--- media/libcubeb/gtest/moz.build ++++ media/libcubeb/gtest/moz.build +@@ -67,13 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': + '-framework CoreFoundation', + '-framework AudioToolbox', + ] +-elif CONFIG['OS_TARGET'] == 'OpenBSD': +- OS_LIBS += [ +- 'sndio', +- ] +-else: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +- OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS'] + + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] +diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c +index 98a735f..db294b3 100644 +--- media/libcubeb/src/cubeb.c ++++ media/libcubeb/src/cubeb.c +@@ -180,6 +180,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_JACK) + jack_init, + #endif ++#if defined(USE_SNDIO) ++ sndio_init, ++#endif + #if defined(USE_ALSA) + alsa_init, + #endif +@@ -192,9 +195,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_WINMM) + winmm_init, + #endif +-#if defined(USE_SNDIO) +- sndio_init, +-#endif + #if defined(USE_OPENSL) + opensl_init, + #endif +diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index bfd4d8f..a29eed0 100644 +--- media/libcubeb/src/cubeb_alsa.c ++++ media/libcubeb/src/cubeb_alsa.c +@@ -14,10 +14,58 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" + ++#ifdef DISABLE_LIBASOUND_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBASOUND_API_VISIT(X) \ ++ X(snd_config) \ ++ X(snd_config_add) \ ++ X(snd_config_copy) \ ++ X(snd_config_delete) \ ++ X(snd_config_get_id) \ ++ X(snd_config_get_string) \ ++ X(snd_config_imake_integer) \ ++ X(snd_config_search) \ ++ X(snd_config_search_definition) \ ++ X(snd_lib_error_set_handler) \ ++ X(snd_pcm_avail_update) \ ++ X(snd_pcm_close) \ ++ X(snd_pcm_delay) \ ++ X(snd_pcm_drain) \ ++ X(snd_pcm_frames_to_bytes) \ ++ X(snd_pcm_get_params) \ ++ X(snd_pcm_hw_params_any) \ ++ X(snd_pcm_hw_params_get_channels_max) \ ++ X(snd_pcm_hw_params_get_rate) \ ++ X(snd_pcm_hw_params_set_rate_near) \ ++ X(snd_pcm_hw_params_sizeof) \ ++ X(snd_pcm_nonblock) \ ++ X(snd_pcm_open) \ ++ X(snd_pcm_open_lconf) \ ++ X(snd_pcm_pause) \ ++ X(snd_pcm_poll_descriptors) \ ++ X(snd_pcm_poll_descriptors_count) \ ++ X(snd_pcm_poll_descriptors_revents) \ ++ X(snd_pcm_readi) \ ++ X(snd_pcm_recover) \ ++ X(snd_pcm_set_params) \ ++ X(snd_pcm_start) \ ++ X(snd_pcm_state) \ ++ X(snd_pcm_writei) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBASOUND_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++/* snd_pcm_hw_params_alloca is actually a macro */ ++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof ++#endif ++ + #define CUBEB_STREAM_MAX 16 + #define CUBEB_WATCHDOG_MS 10000 + +@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libasound; + + pthread_t thread; + +@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) + static void + stream_buffer_decrement(cubeb_stream * stm, long count) + { +- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); +- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); ++ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); ++ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); + stm->bufframes -= count; + } + +@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) + /* Call _poll_descriptors_revents() even if we don't use it + to let underlying plugins clear null events. Otherwise poll() + may wake up again and again, producing unnecessary CPU usage. */ +- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); ++ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); + +- avail = snd_pcm_avail_update(stm->pcm); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + + /* Got null event? Bail and wait for another wakeup. */ + if (avail == 0) { +@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) + // TODO: should it be marked as DRAINING? + } + +- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); ++ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); + + if (got < 0) { + avail = got; // the error handler below will recover us +@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) + (!stm->other_stream || stm->other_stream->bufframes > 0)) { + long got = avail - stm->bufframes; + void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); + + /* Correct read size to the other stream available frames */ + if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { +@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) + long drain_frames = avail - stm->bufframes; + double drain_time = (double) drain_frames / stm->params.rate; + +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); +- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); ++ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); + stm->bufframes = avail; + + /* Mark as draining, unless we're waiting for capture */ +@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) + } + } + +- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); + if (wrote < 0) { + avail = wrote; // the error handler below will recover us + } else { +@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) + + /* Got some error? Let's try to recover the stream. */ + if (avail < 0) { +- avail = snd_pcm_recover(stm->pcm, avail, 0); ++ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); + + /* Capture pcm must be started after initial setup/recover */ + if (avail >= 0 && + stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- avail = snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ avail = WRAP(snd_pcm_start)(stm->pcm); + } + } + +@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + + slave_def = NULL; + +- r = snd_config_search(root_pcm, "slave", &slave_pcm); ++ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); + if (r < 0) { + return NULL; + } + +- r = snd_config_get_string(slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_pcm, &string); + if (r >= 0) { +- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); + if (r < 0) { + return NULL; + } + } + + do { +- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); ++ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); + if (r < 0) { + break; + } + +- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); + if (r < 0) { + break; + } +@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm); + if (r < 0) { + break; + } +@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + } while (0); + + if (slave_def) { +- snd_config_delete(slave_def); ++ WRAP(snd_config_delete)(slave_def); + } + + return NULL; +@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) + + lconf = NULL; + +- if (snd_config == NULL) { ++ if (*WRAP(snd_config) == NULL) { + return NULL; + } + +- r = snd_config_copy(&lconf, snd_config); ++ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); + if (r < 0) { + return NULL; + } + + do { +- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); + if (r < 0) { + break; + } + +- r = snd_config_get_id(pcm_node, &string); ++ r = WRAP(snd_config_get_id)(pcm_node, &string); + if (r < 0) { + break; + } +@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm_node); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); + if (r < 0) { + break; + } +@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) + } + + /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ +- r = snd_config_search(pcm_node, "type", &node); ++ r = WRAP(snd_config_search)(pcm_node, "type", &node); + if (r < 0) { + break; + } + +- r = snd_config_get_string(node, &string); ++ r = WRAP(snd_config_get_string)(node, &string); + if (r < 0) { + break; + } +@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) + + /* Don't clobber an explicit existing handle_underrun value, set it only + if it doesn't already exist. */ +- r = snd_config_search(pcm_node, "handle_underrun", &node); ++ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); + if (r != -ENOENT) { + break; + } + + /* Disable pcm_pulse's asynchronous underrun handling. */ +- r = snd_config_imake_integer(&node, "handle_underrun", 0); ++ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); + if (r < 0) { + break; + } + +- r = snd_config_add(pcm_node, node); ++ r = WRAP(snd_config_add)(pcm_node, node); + if (r < 0) { + break; + } +@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) + return lconf; + } while (0); + +- snd_config_delete(lconf); ++ WRAP(snd_config_delete)(lconf); + + return NULL; + } +@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (local_config) { +- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); ++ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); + } else { +- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); ++ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); + } + pthread_mutex_unlock(&cubeb_alsa_mutex); + +@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) + int r; + + pthread_mutex_lock(&cubeb_alsa_mutex); +- r = snd_pcm_close(pcm); ++ r = WRAP(snd_pcm_close)(pcm); + pthread_mutex_unlock(&cubeb_alsa_mutex); + + return r; +@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function, + alsa_init(cubeb ** context, char const * context_name) + { + (void)context_name; ++ void * libasound = NULL; + cubeb * ctx; + int r; + int i; +@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name) + assert(context); + *context = NULL; + ++#ifndef DISABLE_LIBASOUND_DLOPEN ++ libasound = dlopen("libasound.so", RTLD_LAZY); ++ if (!libasound) { ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libasound, #x); \ ++ if (!cubeb_##x) { \ ++ dlclose(libasound); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBASOUND_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + pthread_mutex_lock(&cubeb_alsa_mutex); + if (!cubeb_alsa_error_handler_set) { +- snd_lib_error_set_handler(silent_error_handler); ++ WRAP(snd_lib_error_set_handler)(silent_error_handler); + cubeb_alsa_error_handler_set = 1; + } + pthread_mutex_unlock(&cubeb_alsa_mutex); +@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name) + assert(ctx); + + ctx->ops = &alsa_ops; ++ ctx->libasound = libasound; + + r = pthread_mutex_init(&ctx->mutex, NULL); + assert(r == 0); +@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name) + config fails with EINVAL, the PA PCM is too old for this workaround. */ + if (r == -EINVAL) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + ctx->local_config = NULL; + } else if (r >= 0) { +@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx) + + if (ctx->local_config) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + } + ++ if (ctx->libasound) { ++ dlclose(ctx->libasound); ++ } ++ + free(ctx); + } + +@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR; + } + +- r = snd_pcm_nonblock(stm->pcm, 1); ++ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); + assert(r == 0); + + latency_us = latency_frames * 1e6 / stm->params.rate; +@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + latency_us = latency_us < min_latency ? min_latency: latency_us; + } + +- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, ++ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, + stm->params.channels, stm->params.rate, 1, + latency_us); + if (r < 0) { +@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR_INVALID_FORMAT; + } + +- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); ++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); + assert(r == 0); + + /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ + stm->buffer_size *= 2; +- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); ++ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); + assert(stm->buffer); + +- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); ++ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); + assert(stm->nfds > 0); + + stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); + assert(stm->saved_fds); +- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); ++ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); + assert((nfds_t) r == stm->nfds); + + if (alsa_register_stream(ctx, stm) != 0) { +@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + if (stm->pcm) { + if (stm->state == DRAINING) { +- snd_pcm_drain(stm->pcm); ++ WRAP(snd_pcm_drain)(stm->pcm); + } + alsa_locked_pcm_close(stm->pcm); + stm->pcm = NULL; +@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) + + assert(stm); + +- r = snd_pcm_hw_params_any(stm->pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); ++ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); + if (r < 0) { + return CUBEB_ERROR; + } +@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { + + /* get a pcm, disabling resampling, so we get a rate the + * hardware/dmix/pulse/etc. supports. */ +- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); ++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_any(pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); ++ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); + if (r >= 0) { + /* There is a default rate: use it. */ +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_OK; + } + + /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ + *rate = 44100; + +- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); ++ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + + return CUBEB_OK; + } +@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + /* Capture pcm must be started after initial setup/recover */ + if (stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ WRAP(snd_pcm_start)(stm->pcm); + } +- snd_pcm_pause(stm->pcm, 0); ++ WRAP(snd_pcm_pause)(stm->pcm, 0); + gettimeofday(&stm->last_activity, NULL); + pthread_mutex_unlock(&stm->mutex); + +@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm) + pthread_mutex_unlock(&ctx->mutex); + + pthread_mutex_lock(&stm->mutex); +- snd_pcm_pause(stm->pcm, 1); ++ WRAP(snd_pcm_pause)(stm->pcm, 1); + pthread_mutex_unlock(&stm->mutex); + + return CUBEB_OK; +@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) + pthread_mutex_lock(&stm->mutex); + + delay = -1; +- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || +- snd_pcm_delay(stm->pcm, &delay) != 0) { ++ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || ++ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { + *position = stm->last_position; + pthread_mutex_unlock(&stm->mutex); + return CUBEB_OK; +@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) + snd_pcm_sframes_t delay; + /* This function returns the delay in frames until a frame written using + snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ +- if (snd_pcm_delay(stm->pcm, &delay)) { ++ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { + return CUBEB_ERROR; + } + +diff --git media/libcubeb/src/cubeb_sndio.c media/libcubeb/src/cubeb_sndio.c +index 9e99b2c..0559af4 100644 +--- media/libcubeb/src/cubeb_sndio.c ++++ media/libcubeb/src/cubeb_sndio.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" +@@ -22,10 +23,35 @@ + #define DPR(...) do {} while(0) + #endif + ++#ifdef DISABLE_LIBSNDIO_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBSNDIO_API_VISIT(X) \ ++ X(sio_close) \ ++ X(sio_eof) \ ++ X(sio_getpar) \ ++ X(sio_initpar) \ ++ X(sio_onmove) \ ++ X(sio_open) \ ++ X(sio_pollfd) \ ++ X(sio_read) \ ++ X(sio_revents) \ ++ X(sio_setpar) \ ++ X(sio_start) \ ++ X(sio_stop) \ ++ X(sio_write) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBSNDIO_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++#endif ++ + static struct cubeb_ops const sndio_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libsndio; + }; + + struct cubeb_stream { +@@ -119,7 +145,7 @@ sndio_mainloop(void *arg) + DPR("sndio_mainloop()\n"); + s->state_cb(s, s->arg, CUBEB_STATE_STARTED); + pthread_mutex_lock(&s->mtx); +- if (!sio_start(s->hdl)) { ++ if (!WRAP(sio_start)(s->hdl)) { + pthread_mutex_unlock(&s->mtx); + return NULL; + } +@@ -203,7 +229,7 @@ sndio_mainloop(void *arg) + events |= POLLIN; + if ((s->mode & SIO_PLAY) && pstart < pend) + events |= POLLOUT; +- nfds = sio_pollfd(s->hdl, pfds, events); ++ nfds = WRAP(sio_pollfd)(s->hdl, pfds, events); + + if (nfds > 0) { + pthread_mutex_unlock(&s->mtx); +@@ -213,7 +239,7 @@ sndio_mainloop(void *arg) + continue; + } + +- revents = sio_revents(s->hdl, pfds); ++ revents = WRAP(sio_revents)(s->hdl, pfds); + + if (revents & POLLHUP) { + state = CUBEB_STATE_ERROR; +@@ -221,8 +247,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLOUT) { +- n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() werr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -231,8 +257,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLIN) { +- n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() rerr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -244,7 +270,7 @@ sndio_mainloop(void *arg) + if (prime > 0 && (s->mode & SIO_REC)) + rstart = rend; + } +- sio_stop(s->hdl); ++ WRAP(sio_stop)(s->hdl); + s->hwpos = s->swpos; + pthread_mutex_unlock(&s->mtx); + s->state_cb(s, s->arg, state); +@@ -254,8 +280,31 @@ sndio_mainloop(void *arg) + /*static*/ int + sndio_init(cubeb **context, char const *context_name) + { ++ void * libsndio = NULL; ++ ++#ifndef DISABLE_LIBSNDIO_DLOPEN ++ libsndio = dlopen("libsndio.so", RTLD_LAZY); ++ if (!libsndio) { ++ DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name); ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libsndio, #x); \ ++ if (!cubeb_##x) { \ ++ DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \ ++ dlclose(libsndio); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBSNDIO_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + DPR("sndio_init(%s)\n", context_name); + *context = malloc(sizeof(*context)); ++ (*context)->libsndio = libsndio; + (*context)->ops = &sndio_ops; + (void)context_name; + return CUBEB_OK; +@@ -271,6 +320,8 @@ static void + sndio_destroy(cubeb *context) + { + DPR("sndio_destroy()\n"); ++ if (context->libsndio) ++ dlclose(context->libsndio); + free(context); + } + +@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context, + goto err; + } + s->context = context; +- s->hdl = sio_open(NULL, s->mode, 1); ++ s->hdl = WRAP(sio_open)(NULL, s->mode, 1); + if (s->hdl == NULL) { + DPR("sndio_stream_init(), sio_open() failed\n"); + goto err; + } +- sio_initpar(&wpar); ++ WRAP(sio_initpar)(&wpar); + wpar.sig = 1; + wpar.bits = 16; + switch (format) { +@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context, + if (s->mode & SIO_PLAY) + wpar.pchan = output_stream_params->channels; + wpar.appbufsz = latency_frames; +- if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) { ++ if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) { + DPR("sndio_stream_init(), sio_setpar() failed\n"); + goto err; + } +@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context, + DPR("sndio_stream_init() unsupported params\n"); + goto err; + } +- sio_onmove(s->hdl, sndio_onmove, s); ++ WRAP(sio_onmove)(s->hdl, sndio_onmove, s); + s->active = 0; + s->nfr = rpar.round; + s->rbpf = rpar.bps * rpar.rchan; +@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context, + return CUBEB_OK; + err: + if (s->hdl) +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->pbuf) + free(s->pbuf); + if (s->rbuf) +@@ -446,7 +497,7 @@ static void + sndio_stream_destroy(cubeb_stream *s) + { + DPR("sndio_stream_destroy()\n"); +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->mode & SIO_PLAY) + free(s->pbuf); + if (s->mode & SIO_REC) +diff --git toolkit/library/moz.build toolkit/library/moz.build +index 8ce595ff96bff..c318e96a1fdfc 100644 +--- toolkit/library/moz.build ++++ toolkit/library/moz.build +@@ -231,9 +231,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +- + if CONFIG['HAVE_CLOCK_MONOTONIC']: + OS_LIBS += CONFIG['REALTIME_LIBS'] + +@@ -242,11 +239,6 @@ OS_LIBS += CONFIG['ICONV_LIBS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'): + OS_LIBS += CONFIG['TK_LIBS'] + +-if CONFIG['OS_ARCH'] == 'OpenBSD': +- OS_LIBS += [ +- 'sndio', +- ] +- + if CONFIG['MOZ_ENABLE_DBUS']: + OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS'] + diff --git a/www/firefox/Makefile b/www/firefox/Makefile index bbebd5046f3..dcfef1de663 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 69.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index cbb4e78f5a7..bdf91ec17c4 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -4,13 +4,10 @@ OPTIONS_DEFINE+= CANBERRA DBUS DEBUG FFMPEG GCONF \ LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST OPTIONS_DEFAULT+= DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \ - ${OPTIONS_MULTI_AUDIO:NSNDIO} + ${OPTIONS_GROUP_AUDIO} -OPTIONS_MULTI+= AUDIO -OPTIONS_MULTI_AUDIO= ALSA JACK PULSEAUDIO SNDIO - -# WebRTC legacy audio library only supports ALSA and PulseAudio -JACK_IMPLIES= ALSA +OPTIONS_GROUP+= AUDIO +OPTIONS_GROUP_AUDIO= ALSA JACK PULSEAUDIO SNDIO CANBERRA_DESC?= Sound theme alerts LIBPROXY_DESC?= Proxy support via libproxy diff --git a/www/firefox/files/patch-cubeb-dlopen b/www/firefox/files/patch-cubeb-dlopen new file mode 100644 index 00000000000..cdf25e43380 --- /dev/null +++ b/www/firefox/files/patch-cubeb-dlopen @@ -0,0 +1,793 @@ +https://github.com/kinetiknz/cubeb/pull/539 + +diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build +index 1ff0c02545251..ca364d1ef7845 100644 +--- media/libcubeb/gtest/moz.build ++++ media/libcubeb/gtest/moz.build +@@ -67,13 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': + '-framework CoreFoundation', + '-framework AudioToolbox', + ] +-elif CONFIG['OS_TARGET'] == 'OpenBSD': +- OS_LIBS += [ +- 'sndio', +- ] +-else: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +- OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS'] + + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] +diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c +index 422f7c6..caac869 100644 +--- media/libcubeb/src/cubeb.c ++++ media/libcubeb/src/cubeb.c +@@ -194,6 +194,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_JACK) + jack_init, + #endif ++#if defined(USE_SNDIO) ++ sndio_init, ++#endif + #if defined(USE_ALSA) + alsa_init, + #endif +@@ -209,9 +212,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam + #if defined(USE_WINMM) + winmm_init, + #endif +-#if defined(USE_SNDIO) +- sndio_init, +-#endif + #if defined(USE_SUN) + sun_init, + #endif +diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index bfd4d8f..a29eed0 100644 +--- media/libcubeb/src/cubeb_alsa.c ++++ media/libcubeb/src/cubeb_alsa.c +@@ -14,10 +14,58 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" + ++#ifdef DISABLE_LIBASOUND_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBASOUND_API_VISIT(X) \ ++ X(snd_config) \ ++ X(snd_config_add) \ ++ X(snd_config_copy) \ ++ X(snd_config_delete) \ ++ X(snd_config_get_id) \ ++ X(snd_config_get_string) \ ++ X(snd_config_imake_integer) \ ++ X(snd_config_search) \ ++ X(snd_config_search_definition) \ ++ X(snd_lib_error_set_handler) \ ++ X(snd_pcm_avail_update) \ ++ X(snd_pcm_close) \ ++ X(snd_pcm_delay) \ ++ X(snd_pcm_drain) \ ++ X(snd_pcm_frames_to_bytes) \ ++ X(snd_pcm_get_params) \ ++ X(snd_pcm_hw_params_any) \ ++ X(snd_pcm_hw_params_get_channels_max) \ ++ X(snd_pcm_hw_params_get_rate) \ ++ X(snd_pcm_hw_params_set_rate_near) \ ++ X(snd_pcm_hw_params_sizeof) \ ++ X(snd_pcm_nonblock) \ ++ X(snd_pcm_open) \ ++ X(snd_pcm_open_lconf) \ ++ X(snd_pcm_pause) \ ++ X(snd_pcm_poll_descriptors) \ ++ X(snd_pcm_poll_descriptors_count) \ ++ X(snd_pcm_poll_descriptors_revents) \ ++ X(snd_pcm_readi) \ ++ X(snd_pcm_recover) \ ++ X(snd_pcm_set_params) \ ++ X(snd_pcm_start) \ ++ X(snd_pcm_state) \ ++ X(snd_pcm_writei) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBASOUND_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++/* snd_pcm_hw_params_alloca is actually a macro */ ++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof ++#endif ++ + #define CUBEB_STREAM_MAX 16 + #define CUBEB_WATCHDOG_MS 10000 + +@@ -36,6 +84,7 @@ static struct cubeb_ops const alsa_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libasound; + + pthread_t thread; + +@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) + static void + stream_buffer_decrement(cubeb_stream * stm, long count) + { +- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); +- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); ++ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); ++ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); + stm->bufframes -= count; + } + +@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) + /* Call _poll_descriptors_revents() even if we don't use it + to let underlying plugins clear null events. Otherwise poll() + may wake up again and again, producing unnecessary CPU usage. */ +- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); ++ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); + +- avail = snd_pcm_avail_update(stm->pcm); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + + /* Got null event? Bail and wait for another wakeup. */ + if (avail == 0) { +@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) + // TODO: should it be marked as DRAINING? + } + +- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); ++ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); + + if (got < 0) { + avail = got; // the error handler below will recover us +@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) + (!stm->other_stream || stm->other_stream->bufframes > 0)) { + long got = avail - stm->bufframes; + void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); + + /* Correct read size to the other stream available frames */ + if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { +@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) + long drain_frames = avail - stm->bufframes; + double drain_time = (double) drain_frames / stm->params.rate; + +- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); +- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); ++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); ++ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); + stm->bufframes = avail; + + /* Mark as draining, unless we're waiting for capture */ +@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) + } + } + +- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); + if (wrote < 0) { + avail = wrote; // the error handler below will recover us + } else { +@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) + + /* Got some error? Let's try to recover the stream. */ + if (avail < 0) { +- avail = snd_pcm_recover(stm->pcm, avail, 0); ++ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); + + /* Capture pcm must be started after initial setup/recover */ + if (avail >= 0 && + stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- avail = snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ avail = WRAP(snd_pcm_start)(stm->pcm); + } + } + +@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + + slave_def = NULL; + +- r = snd_config_search(root_pcm, "slave", &slave_pcm); ++ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); + if (r < 0) { + return NULL; + } + +- r = snd_config_get_string(slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_pcm, &string); + if (r >= 0) { +- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); + if (r < 0) { + return NULL; + } + } + + do { +- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); ++ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); + if (r < 0) { + break; + } + +- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); + if (r < 0) { + break; + } +@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm); + if (r < 0) { + break; + } +@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + } while (0); + + if (slave_def) { +- snd_config_delete(slave_def); ++ WRAP(snd_config_delete)(slave_def); + } + + return NULL; +@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) + + lconf = NULL; + +- if (snd_config == NULL) { ++ if (*WRAP(snd_config) == NULL) { + return NULL; + } + +- r = snd_config_copy(&lconf, snd_config); ++ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); + if (r < 0) { + return NULL; + } + + do { +- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); + if (r < 0) { + break; + } + +- r = snd_config_get_id(pcm_node, &string); ++ r = WRAP(snd_config_get_id)(pcm_node, &string); + if (r < 0) { + break; + } +@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm_node); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); + if (r < 0) { + break; + } +@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) + } + + /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ +- r = snd_config_search(pcm_node, "type", &node); ++ r = WRAP(snd_config_search)(pcm_node, "type", &node); + if (r < 0) { + break; + } + +- r = snd_config_get_string(node, &string); ++ r = WRAP(snd_config_get_string)(node, &string); + if (r < 0) { + break; + } +@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) + + /* Don't clobber an explicit existing handle_underrun value, set it only + if it doesn't already exist. */ +- r = snd_config_search(pcm_node, "handle_underrun", &node); ++ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); + if (r != -ENOENT) { + break; + } + + /* Disable pcm_pulse's asynchronous underrun handling. */ +- r = snd_config_imake_integer(&node, "handle_underrun", 0); ++ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); + if (r < 0) { + break; + } + +- r = snd_config_add(pcm_node, node); ++ r = WRAP(snd_config_add)(pcm_node, node); + if (r < 0) { + break; + } +@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) + return lconf; + } while (0); + +- snd_config_delete(lconf); ++ WRAP(snd_config_delete)(lconf); + + return NULL; + } +@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (local_config) { +- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); ++ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); + } else { +- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); ++ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); + } + pthread_mutex_unlock(&cubeb_alsa_mutex); + +@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) + int r; + + pthread_mutex_lock(&cubeb_alsa_mutex); +- r = snd_pcm_close(pcm); ++ r = WRAP(snd_pcm_close)(pcm); + pthread_mutex_unlock(&cubeb_alsa_mutex); + + return r; +@@ -750,6 +799,7 @@ silent_error_handler(char const * file, int line, char const * function, + alsa_init(cubeb ** context, char const * context_name) + { + (void)context_name; ++ void * libasound = NULL; + cubeb * ctx; + int r; + int i; +@@ -760,9 +810,27 @@ alsa_init(cubeb ** context, char const * context_name) + assert(context); + *context = NULL; + ++#ifndef DISABLE_LIBASOUND_DLOPEN ++ libasound = dlopen("libasound.so", RTLD_LAZY); ++ if (!libasound) { ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libasound, #x); \ ++ if (!cubeb_##x) { \ ++ dlclose(libasound); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBASOUND_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + pthread_mutex_lock(&cubeb_alsa_mutex); + if (!cubeb_alsa_error_handler_set) { +- snd_lib_error_set_handler(silent_error_handler); ++ WRAP(snd_lib_error_set_handler)(silent_error_handler); + cubeb_alsa_error_handler_set = 1; + } + pthread_mutex_unlock(&cubeb_alsa_mutex); +@@ -771,6 +839,7 @@ alsa_init(cubeb ** context, char const * context_name) + assert(ctx); + + ctx->ops = &alsa_ops; ++ ctx->libasound = libasound; + + r = pthread_mutex_init(&ctx->mutex, NULL); + assert(r == 0); +@@ -819,7 +888,7 @@ alsa_init(cubeb ** context, char const * context_name) + config fails with EINVAL, the PA PCM is too old for this workaround. */ + if (r == -EINVAL) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + ctx->local_config = NULL; + } else if (r >= 0) { +@@ -861,10 +930,14 @@ alsa_destroy(cubeb * ctx) + + if (ctx->local_config) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + } + ++ if (ctx->libasound) { ++ dlclose(ctx->libasound); ++ } ++ + free(ctx); + } + +@@ -948,7 +1021,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR; + } + +- r = snd_pcm_nonblock(stm->pcm, 1); ++ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); + assert(r == 0); + + latency_us = latency_frames * 1e6 / stm->params.rate; +@@ -961,7 +1034,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + latency_us = latency_us < min_latency ? min_latency: latency_us; + } + +- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, ++ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, + stm->params.channels, stm->params.rate, 1, + latency_us); + if (r < 0) { +@@ -969,20 +1042,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream + return CUBEB_ERROR_INVALID_FORMAT; + } + +- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); ++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); + assert(r == 0); + + /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ + stm->buffer_size *= 2; +- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); ++ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); + assert(stm->buffer); + +- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); ++ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); + assert(stm->nfds > 0); + + stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); + assert(stm->saved_fds); +- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); ++ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); + assert((nfds_t) r == stm->nfds); + + if (alsa_register_stream(ctx, stm) != 0) { +@@ -1054,7 +1127,7 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + if (stm->pcm) { + if (stm->state == DRAINING) { +- snd_pcm_drain(stm->pcm); ++ WRAP(snd_pcm_drain)(stm->pcm); + } + alsa_locked_pcm_close(stm->pcm); + stm->pcm = NULL; +@@ -1100,12 +1173,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) + + assert(stm); + +- r = snd_pcm_hw_params_any(stm->pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); ++ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); + if (r < 0) { + return CUBEB_ERROR; + } +@@ -1126,34 +1199,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { + + /* get a pcm, disabling resampling, so we get a rate the + * hardware/dmix/pulse/etc. supports. */ +- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); ++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); + if (r < 0) { + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_any(pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); ++ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); + if (r >= 0) { + /* There is a default rate: use it. */ +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_OK; + } + + /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ + *rate = 44100; + +- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); ++ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); + if (r < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + + return CUBEB_OK; + } +@@ -1186,10 +1259,10 @@ alsa_stream_start(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + /* Capture pcm must be started after initial setup/recover */ + if (stm->stream_type == SND_PCM_STREAM_CAPTURE && +- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { +- snd_pcm_start(stm->pcm); ++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { ++ WRAP(snd_pcm_start)(stm->pcm); + } +- snd_pcm_pause(stm->pcm, 0); ++ WRAP(snd_pcm_pause)(stm->pcm, 0); + gettimeofday(&stm->last_activity, NULL); + pthread_mutex_unlock(&stm->mutex); + +@@ -1229,7 +1302,7 @@ alsa_stream_stop(cubeb_stream * stm) + pthread_mutex_unlock(&ctx->mutex); + + pthread_mutex_lock(&stm->mutex); +- snd_pcm_pause(stm->pcm, 1); ++ WRAP(snd_pcm_pause)(stm->pcm, 1); + pthread_mutex_unlock(&stm->mutex); + + return CUBEB_OK; +@@ -1245,8 +1318,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) + pthread_mutex_lock(&stm->mutex); + + delay = -1; +- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || +- snd_pcm_delay(stm->pcm, &delay) != 0) { ++ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || ++ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { + *position = stm->last_position; + pthread_mutex_unlock(&stm->mutex); + return CUBEB_OK; +@@ -1271,7 +1344,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) + snd_pcm_sframes_t delay; + /* This function returns the delay in frames until a frame written using + snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ +- if (snd_pcm_delay(stm->pcm, &delay)) { ++ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { + return CUBEB_ERROR; + } + +diff --git media/libcubeb/src/cubeb_sndio.c media/libcubeb/src/cubeb_sndio.c +index 9e99b2c..0559af4 100644 +--- media/libcubeb/src/cubeb_sndio.c ++++ media/libcubeb/src/cubeb_sndio.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include "cubeb/cubeb.h" + #include "cubeb-internal.h" +@@ -22,10 +23,35 @@ + #define DPR(...) do {} while(0) + #endif + ++#ifdef DISABLE_LIBSNDIO_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define LIBSNDIO_API_VISIT(X) \ ++ X(sio_close) \ ++ X(sio_eof) \ ++ X(sio_getpar) \ ++ X(sio_initpar) \ ++ X(sio_onmove) \ ++ X(sio_open) \ ++ X(sio_pollfd) \ ++ X(sio_read) \ ++ X(sio_revents) \ ++ X(sio_setpar) \ ++ X(sio_start) \ ++ X(sio_stop) \ ++ X(sio_write) \ ++ ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x; ++LIBSNDIO_API_VISIT(MAKE_TYPEDEF); ++#undef MAKE_TYPEDEF ++#endif ++ + static struct cubeb_ops const sndio_ops; + + struct cubeb { + struct cubeb_ops const * ops; ++ void * libsndio; + }; + + struct cubeb_stream { +@@ -119,7 +145,7 @@ sndio_mainloop(void *arg) + DPR("sndio_mainloop()\n"); + s->state_cb(s, s->arg, CUBEB_STATE_STARTED); + pthread_mutex_lock(&s->mtx); +- if (!sio_start(s->hdl)) { ++ if (!WRAP(sio_start)(s->hdl)) { + pthread_mutex_unlock(&s->mtx); + return NULL; + } +@@ -203,7 +229,7 @@ sndio_mainloop(void *arg) + events |= POLLIN; + if ((s->mode & SIO_PLAY) && pstart < pend) + events |= POLLOUT; +- nfds = sio_pollfd(s->hdl, pfds, events); ++ nfds = WRAP(sio_pollfd)(s->hdl, pfds, events); + + if (nfds > 0) { + pthread_mutex_unlock(&s->mtx); +@@ -213,7 +239,7 @@ sndio_mainloop(void *arg) + continue; + } + +- revents = sio_revents(s->hdl, pfds); ++ revents = WRAP(sio_revents)(s->hdl, pfds); + + if (revents & POLLHUP) { + state = CUBEB_STATE_ERROR; +@@ -221,8 +247,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLOUT) { +- n = sio_write(s->hdl, s->pbuf + pstart, pend - pstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_write)(s->hdl, s->pbuf + pstart, pend - pstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() werr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -231,8 +257,8 @@ sndio_mainloop(void *arg) + } + + if (revents & POLLIN) { +- n = sio_read(s->hdl, s->rbuf + rstart, rend - rstart); +- if (n == 0 && sio_eof(s->hdl)) { ++ n = WRAP(sio_read)(s->hdl, s->rbuf + rstart, rend - rstart); ++ if (n == 0 && WRAP(sio_eof)(s->hdl)) { + DPR("sndio_mainloop() rerr\n"); + state = CUBEB_STATE_ERROR; + break; +@@ -244,7 +270,7 @@ sndio_mainloop(void *arg) + if (prime > 0 && (s->mode & SIO_REC)) + rstart = rend; + } +- sio_stop(s->hdl); ++ WRAP(sio_stop)(s->hdl); + s->hwpos = s->swpos; + pthread_mutex_unlock(&s->mtx); + s->state_cb(s, s->arg, state); +@@ -254,8 +280,31 @@ sndio_mainloop(void *arg) + /*static*/ int + sndio_init(cubeb **context, char const *context_name) + { ++ void * libsndio = NULL; ++ ++#ifndef DISABLE_LIBSNDIO_DLOPEN ++ libsndio = dlopen("libsndio.so", RTLD_LAZY); ++ if (!libsndio) { ++ DPR("sndio_init(%s) failed dlopen(libsndio.so)\n", context_name); ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) { \ ++ cubeb_##x = dlsym(libsndio, #x); \ ++ if (!cubeb_##x) { \ ++ DPR("sndio_init(%s) failed dlsym(%s)\n", context_name, #x); \ ++ dlclose(libsndio); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } ++ ++ LIBSNDIO_API_VISIT(LOAD); ++#undef LOAD ++#endif ++ + DPR("sndio_init(%s)\n", context_name); + *context = malloc(sizeof(*context)); ++ (*context)->libsndio = libsndio; + (*context)->ops = &sndio_ops; + (void)context_name; + return CUBEB_OK; +@@ -271,6 +320,8 @@ static void + sndio_destroy(cubeb *context) + { + DPR("sndio_destroy()\n"); ++ if (context->libsndio) ++ dlclose(context->libsndio); + free(context); + } + +@@ -323,12 +374,12 @@ sndio_stream_init(cubeb * context, + goto err; + } + s->context = context; +- s->hdl = sio_open(NULL, s->mode, 1); ++ s->hdl = WRAP(sio_open)(NULL, s->mode, 1); + if (s->hdl == NULL) { + DPR("sndio_stream_init(), sio_open() failed\n"); + goto err; + } +- sio_initpar(&wpar); ++ WRAP(sio_initpar)(&wpar); + wpar.sig = 1; + wpar.bits = 16; + switch (format) { +@@ -351,7 +402,7 @@ sndio_stream_init(cubeb * context, + if (s->mode & SIO_PLAY) + wpar.pchan = output_stream_params->channels; + wpar.appbufsz = latency_frames; +- if (!sio_setpar(s->hdl, &wpar) || !sio_getpar(s->hdl, &rpar)) { ++ if (!WRAP(sio_setpar)(s->hdl, &wpar) || !WRAP(sio_getpar)(s->hdl, &rpar)) { + DPR("sndio_stream_init(), sio_setpar() failed\n"); + goto err; + } +@@ -362,7 +413,7 @@ sndio_stream_init(cubeb * context, + DPR("sndio_stream_init() unsupported params\n"); + goto err; + } +- sio_onmove(s->hdl, sndio_onmove, s); ++ WRAP(sio_onmove)(s->hdl, sndio_onmove, s); + s->active = 0; + s->nfr = rpar.round; + s->rbpf = rpar.bps * rpar.rchan; +@@ -400,7 +451,7 @@ sndio_stream_init(cubeb * context, + return CUBEB_OK; + err: + if (s->hdl) +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->pbuf) + free(s->pbuf); + if (s->rbuf) +@@ -446,7 +497,7 @@ static void + sndio_stream_destroy(cubeb_stream *s) + { + DPR("sndio_stream_destroy()\n"); +- sio_close(s->hdl); ++ WRAP(sio_close)(s->hdl); + if (s->mode & SIO_PLAY) + free(s->pbuf); + if (s->mode & SIO_REC) +diff --git toolkit/library/moz.build toolkit/library/moz.build +index 8ce595ff96bff..c318e96a1fdfc 100644 +--- toolkit/library/moz.build ++++ toolkit/library/moz.build +@@ -231,9 +231,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +- + if CONFIG['HAVE_CLOCK_MONOTONIC']: + OS_LIBS += CONFIG['REALTIME_LIBS'] + +@@ -242,11 +239,6 @@ OS_LIBS += CONFIG['ICONV_LIBS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'): + OS_LIBS += CONFIG['TK_LIBS'] + +-if CONFIG['OS_ARCH'] == 'OpenBSD': +- OS_LIBS += [ +- 'sndio', +- ] +- + if CONFIG['MOZ_ENABLE_DBUS']: + OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS'] + diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 556458a3c66..4f48cd6e649 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -3,7 +3,7 @@ PORTNAME= gitlab-ce PORTVERSION= 12.1.8 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -208,7 +208,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \ rubygem-flipper-active_record013>=0.13.0:databases/rubygem-flipper-active_record013 \ rubygem-flipper-active_support_cache_store013>=0.13.0:devel/rubygem-flipper-active_support_cache_store013 \ rubygem-lograge-rails52>=0.5:www/rubygem-lograge-rails52 \ - rubygem-grape_logging>=1.7:devel/rubygem-grape_logging + rubygem-grape_logging181=1.8.1:devel/rubygem-grape_logging181 BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} diff --git a/www/grafana6/Makefile b/www/grafana6/Makefile index 936fb64549e..196071b25c3 100644 --- a/www/grafana6/Makefile +++ b/www/grafana6/Makefile @@ -18,13 +18,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 -USES= compiler go +USES= go:modules USE_RC_SUBR= grafana USE_GITHUB= yes -GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} TAG= 9504db8 +GO_TARGET= ./pkg/cmd/grafana-server \ + ./pkg/cmd/grafana-cli +GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" + GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana @@ -51,19 +54,20 @@ SUB_LIST+= GRAFANA_USER=${GRAFANA_USER} \ PLIST_SUB+= GRAFANAHOMEDIR=${GRAFANAHOMEDIR} post-extract: - @${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public + @${RM} -r ${WRKSRC}/public @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public) -do-build: - @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server - @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli +# unbreak vendored golang.org/x/xerrors with go1.13 +# can be removed after vendor/golang.org/x/xerrors is updated to a985d3407aa7 or later +post-patch: + @${RM} ${WRKSRC}/vendor/golang.org/x/xerrors/adaptor_go1_13.go + @${RM} ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_13.go + @${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/adaptor_go1_12.go + @${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_12.go + @${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/frame_go1_12.go -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \ - ${STAGEDIR}${PREFIX}/bin/grafana-server - ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-cli \ - ${STAGEDIR}${PREFIX}/bin/grafana-cli - cd ${WRKSRC}/src/github.com/grafana/grafana && \ +post-install: + cd ${WRKSRC} && \ ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana ${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR} ${MKDIR} ${STAGEDIR}${GRAFANALOGDIR} @@ -74,14 +78,8 @@ do-install: ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log - ${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \ + ${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \ ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini ${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample -.include - -.if ${COMPILER_TYPE} == clang -BUILD_ENV= CC=clang -.endif - -.include +.include diff --git a/www/p5-CGI-Simple/Makefile b/www/p5-CGI-Simple/Makefile index 74020b2b61b..83281718b46 100644 --- a/www/p5-CGI-Simple/Makefile +++ b/www/p5-CGI-Simple/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= CGI-Simple -PORTVERSION= 1.210 +PORTVERSION= 1.220 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -DISTNAME= ${PORTNAME}-${PORTVERSION:C|0$||} +DISTNAME= ${PORTNAME}-${PORTVERSION:S|0$||} -MAINTAINER= perl@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Simple totally OO CGI interface that is CGI.pm compliant LICENSE= ART10 GPLv1+ @@ -18,8 +18,9 @@ TEST_DEPENDS= p5-IO-stringy>=0:devel/p5-IO-stringy \ p5-Test-Exception>=0:devel/p5-Test-Exception \ p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings -NO_ARCH= yes USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include diff --git a/www/p5-CGI-Simple/distinfo b/www/p5-CGI-Simple/distinfo index 208a6c8e5e9..7cff6ac20d1 100644 --- a/www/p5-CGI-Simple/distinfo +++ b/www/p5-CGI-Simple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538984375 -SHA256 (CGI-Simple-1.21.tar.gz) = 4f1b2f7a1fa5c7e8e3f61a426c21d2335d22d8417a43e5fe91154ea25f14ecf3 -SIZE (CGI-Simple-1.21.tar.gz) = 87306 +TIMESTAMP = 1567842464 +SHA256 (CGI-Simple-1.22.tar.gz) = f611a6a35bf0eb637d3d72c30cf400f0e2199844f11eb414087e6e652d8f878d +SIZE (CGI-Simple-1.22.tar.gz) = 87400 diff --git a/www/p5-CGI-Simple/pkg-descr b/www/p5-CGI-Simple/pkg-descr index be5c59fb73f..b999c36642b 100644 --- a/www/p5-CGI-Simple/pkg-descr +++ b/www/p5-CGI-Simple/pkg-descr @@ -1,7 +1,15 @@ -CGI::Simple provides a relatively lightweight drop in replacement -for CGI.pm. It shares an identical OO interface to CGI.pm for -parameter parsing, file upload, cookie handling and header generation. -This module is entirely object oriented, however a complete functional -interface is available by using the CGI::Simple::Standard module. +CGI::Simple provides a relatively lightweight drop in replacement for CGI.pm. It +shares an identical OO interface to CGI.pm for parameter parsing, file upload, +cookie handling and header generation. This module is entirely object oriented, +however a complete functional interface is available by using the +CGI::Simple::Standard module. + +Essentially everything in CGI.pm that relates to the CGI (not HTML) side of +things is available. There are even a few new methods and additions to old ones! +If you are interested in what has gone on under the hood see the Compatibility +with CGI.pm section at the end. + +In practical testing this module loads and runs about twice as fast as CGI.pm +depending on the precise task. WWW: https://metacpan.org/release/CGI-Simple diff --git a/www/p5-PocketIO/Makefile b/www/p5-PocketIO/Makefile index a9e120843ca..4b2765fd174 100644 --- a/www/p5-PocketIO/Makefile +++ b/www/p5-PocketIO/Makefile @@ -23,8 +23,9 @@ RUN_DEPENDS= p5-AnyEvent>=0:devel/p5-AnyEvent \ TEST_DEPENDS= p5-Plack>=0:www/p5-Plack \ p5-Twiggy>=0:www/p5-Twiggy -NO_ARCH= yes -USE_PERL5= modbuild USES= perl5 +USE_PERL5= modbuild + +NO_ARCH= yes .include diff --git a/www/p5-WebService-Linode/Makefile b/www/p5-WebService-Linode/Makefile index ea446cb2a72..8ec29a31500 100644 --- a/www/p5-WebService-Linode/Makefile +++ b/www/p5-WebService-Linode/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= WebService-Linode -PORTVERSION= 0.28 +PORTVERSION= 0.29 CATEGORIES= www MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,14 +14,14 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \ - p5-JSON>=0:converters/p5-JSON \ - p5-Mozilla-CA>=0:www/p5-Mozilla-CA \ +RUN_DEPENDS= p5-JSON>=2.00:converters/p5-JSON \ + p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \ p5-libwww>=0:www/p5-libwww TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject -NO_ARCH= yes USES= perl5 USE_PERL5= modbuildtiny +NO_ARCH= yes + .include diff --git a/www/p5-WebService-Linode/distinfo b/www/p5-WebService-Linode/distinfo index 6df3d2a6cbf..fda03221d38 100644 --- a/www/p5-WebService-Linode/distinfo +++ b/www/p5-WebService-Linode/distinfo @@ -1,2 +1,3 @@ -SHA256 (WebService-Linode-0.28.tar.gz) = 66a315016999c0d2043caae86e664dad10c6613708f33a2f56aae8030326c509 -SIZE (WebService-Linode-0.28.tar.gz) = 33775 +TIMESTAMP = 1567842518 +SHA256 (WebService-Linode-0.29.tar.gz) = 103aab245304f08e9e87ac7bc884ddb44a630de6bac077dc921f716d71154922 +SIZE (WebService-Linode-0.29.tar.gz) = 32855 diff --git a/www/py-azure-common/Makefile b/www/py-azure-common/Makefile index e85033f0c0b..07d78b7f15d 100644 --- a/www/py-azure-common/Makefile +++ b/www/py-azure-common/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= azure-common -PORTVERSION= 1.1.22 +PORTVERSION= 1.1.23 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-azure-common/distinfo b/www/py-azure-common/distinfo index 3067ae3a2aa..4c2e5641dfe 100644 --- a/www/py-azure-common/distinfo +++ b/www/py-azure-common/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561043381 -SHA256 (azure-common-1.1.22.zip) = c8e4a7bf15f139f779a415d2d3c371738b1e9f5e14abd9c18af6b9bed3babf35 -SIZE (azure-common-1.1.22.zip) = 17065 +TIMESTAMP = 1567881102 +SHA256 (azure-common-1.1.23.zip) = 53b1195b8f20943ccc0e71a17849258f7781bc6db1c72edc7d6c055f79bd54e3 +SIZE (azure-common-1.1.23.zip) = 17297 diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile index 8437218252e..65c7a5f4ed0 100644 --- a/www/py-beautifulsoup/Makefile +++ b/www/py-beautifulsoup/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= beautifulsoup -PORTVERSION= 4.7.1 -PORTREVISION= 1 +PORTVERSION= 4.8.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-beautifulsoup/distinfo b/www/py-beautifulsoup/distinfo index d66c64ff13d..49104f6c516 100644 --- a/www/py-beautifulsoup/distinfo +++ b/www/py-beautifulsoup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1554433166 -SHA256 (beautifulsoup4-4.7.1.tar.gz) = 945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348 -SIZE (beautifulsoup4-4.7.1.tar.gz) = 167065 +TIMESTAMP = 1567929824 +SHA256 (beautifulsoup4-4.8.0.tar.gz) = 25288c9e176f354bf277c0a10aa96c782a6a18a17122dba2e8cec4a97e03343b +SIZE (beautifulsoup4-4.8.0.tar.gz) = 170919 diff --git a/www/py-dj21-drf-yasg/Makefile b/www/py-dj21-drf-yasg/Makefile index cae1f6bbe42..3241a6f8429 100644 --- a/www/py-dj21-drf-yasg/Makefile +++ b/www/py-dj21-drf-yasg/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= drf-yasg -DISTVERSION= 1.16.0 +DISTVERSION= 1.16.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj21- @@ -21,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django21>=1.11.7:www/py-django21@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.34:devel/py-ruamel.yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= distutils autoplist diff --git a/www/py-dj21-drf-yasg/distinfo b/www/py-dj21-drf-yasg/distinfo index 7b95aa7a7d9..983b7a3c1ac 100644 --- a/www/py-dj21-drf-yasg/distinfo +++ b/www/py-dj21-drf-yasg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561074540 -SHA256 (drf-yasg-1.16.0.tar.gz) = 82b535a22fc13e0a202217df4c6470c40b54d21f742e69798f53c69afccbfdac -SIZE (drf-yasg-1.16.0.tar.gz) = 1288698 +TIMESTAMP = 1567915504 +SHA256 (drf-yasg-1.16.1.tar.gz) = 68fded2ffdf46e03f33e766184b7d8f1e1a5236f94acfd0c4ba932a57b812566 +SIZE (drf-yasg-1.16.1.tar.gz) = 1289575 diff --git a/www/py-dj22-drf-yasg/Makefile b/www/py-dj22-drf-yasg/Makefile index c046b2fb9b1..866cac325f2 100644 --- a/www/py-dj22-drf-yasg/Makefile +++ b/www/py-dj22-drf-yasg/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= drf-yasg -DISTVERSION= 1.16.0 +DISTVERSION= 1.16.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj22- @@ -21,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11.7:www/py-django22@${PY_FLAVOR ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.34:devel/py-ruamel.yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= distutils autoplist diff --git a/www/py-dj22-drf-yasg/distinfo b/www/py-dj22-drf-yasg/distinfo index 7b95aa7a7d9..6f7939ff8b3 100644 --- a/www/py-dj22-drf-yasg/distinfo +++ b/www/py-dj22-drf-yasg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561074540 -SHA256 (drf-yasg-1.16.0.tar.gz) = 82b535a22fc13e0a202217df4c6470c40b54d21f742e69798f53c69afccbfdac -SIZE (drf-yasg-1.16.0.tar.gz) = 1288698 +TIMESTAMP = 1567914984 +SHA256 (drf-yasg-1.16.1.tar.gz) = 68fded2ffdf46e03f33e766184b7d8f1e1a5236f94acfd0c4ba932a57b812566 +SIZE (drf-yasg-1.16.1.tar.gz) = 1289575 diff --git a/www/py-django-bakery/Makefile b/www/py-django-bakery/Makefile new file mode 100644 index 00000000000..cb48ac81bda --- /dev/null +++ b/www/py-django-bakery/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= django-bakery +PORTVERSION= 0.12.7 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= alex@xanderio.de +COMMENT= Set of helpers for baking your Django site out as flat files + +LICENSE= MIT +#LICENSE_FILE= Not yet packaged in sdist + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1.5.2:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto3>=1.4.4:www/py-boto3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fs2>=2.0.17:devel/py-fs2@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +.include diff --git a/www/py-django-bakery/distinfo b/www/py-django-bakery/distinfo new file mode 100644 index 00000000000..3b1da1dc107 --- /dev/null +++ b/www/py-django-bakery/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1562663577 +SHA256 (django-bakery-0.12.7.tar.gz) = 48156dbd9ddb762bef4352350a5f43744740529148fd70598120d8d2ae5e273c +SIZE (django-bakery-0.12.7.tar.gz) = 28374 diff --git a/www/py-django-bakery/pkg-descr b/www/py-django-bakery/pkg-descr new file mode 100644 index 00000000000..c73ffc80414 --- /dev/null +++ b/www/py-django-bakery/pkg-descr @@ -0,0 +1,11 @@ +Provides a set of helper for baking your Django site out as flat files. + +Features: + +- Models, views and management commands that will build your site as flat + files. +- Management commands to sync your flat files with a bucket on Amazon S3. +- Optional integration of a Celery job queue to automatically build and publish + model objects when they are saved + +WWW: https://github.com/datadesk/django-bakery/ diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile index 895e677d40e..92f2ec330cd 100644 --- a/www/py-django-dpaste/Makefile +++ b/www/py-django-dpaste/Makefile @@ -2,32 +2,32 @@ # $FreeBSD$ PORTNAME= dpaste -PORTVERSION= 2.13 +PORTVERSION= 3.3.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}django- MAINTAINER= koobs@FreeBSD.org -COMMENT= Django based pastebin +COMMENT= Django based pastebin for text and code LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj22-django_csp>=3.3:www/py-dj22-django_csp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-staticinline>=1.0:www/py-django-staticinline@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsx-lexer=0.0.7:textproc/py-jsx-lexer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}misaka>=2.1.0:textproc/py-misaka@${PY_FLAVOR} -OPTIONS_DEFINE= MIGRATIONS - -MIGRATIONS_DESC= Schema and data migration support (via south) - -MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south@${PY_FLAVOR} - -USES= python +USES= python:3.4+ USE_PYTHON= distutils autoplist NO_ARCH= yes do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + @cd ${WRKSRC} && ${PYTHON_CMD} runtests.py .include diff --git a/www/py-django-dpaste/distinfo b/www/py-django-dpaste/distinfo index a411eb1d17d..ed0d0cde46b 100644 --- a/www/py-django-dpaste/distinfo +++ b/www/py-django-dpaste/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524057868 -SHA256 (dpaste-2.13.tar.gz) = 983271f34e0c62f93f1c6d23a10e12853383d8d2d58bed6648c9244a258636d8 -SIZE (dpaste-2.13.tar.gz) = 131994 +TIMESTAMP = 1567751862 +SHA256 (dpaste-3.3.1.tar.gz) = 398bd5522fbaf7dde93ebaa224e033d0c7e5ecd70d3f32b275d80a978db0196a +SIZE (dpaste-3.3.1.tar.gz) = 218357 diff --git a/www/py-django-dpaste/files/patch-runtests.py b/www/py-django-dpaste/files/patch-runtests.py deleted file mode 100644 index e675cbbb404..00000000000 --- a/www/py-django-dpaste/files/patch-runtests.py +++ /dev/null @@ -1,12 +0,0 @@ ---- runtests.py.orig 2016-08-15 03:40:49 UTC -+++ runtests.py -@@ -63,8 +63,7 @@ def runtests(*test_args): - - test_runner = TestRunner(verbosity=1) - failures = test_runner.run_tests(['dpaste']) -- if failures: -- sys.exit(failures) -+ sys.exit(failures) - - if __name__ == '__main__': - runtests(*sys.argv[1:]) diff --git a/www/py-django-dpaste/files/patch-setup.py b/www/py-django-dpaste/files/patch-setup.py deleted file mode 100644 index afd0a390047..00000000000 --- a/www/py-django-dpaste/files/patch-setup.py +++ /dev/null @@ -1,34 +0,0 @@ ---- setup.py.orig 2016-08-15 03:37:55 UTC -+++ setup.py -@@ -4,19 +4,6 @@ from sys import exit - from setuptools import find_packages, setup - from setuptools.command.test import test as TestCommand - -- --class Tox(TestCommand): -- def finalize_options(self): -- TestCommand.finalize_options(self) -- self.test_args = [] -- self.test_suite = True -- -- def run_tests(self): -- #import here, cause outside the eggs aren't loaded -- import tox -- errno = tox.cmdline(self.test_args) -- exit(errno) -- - long_description = u'\n\n'.join(( - open('README.rst').read(), - open('CHANGELOG').read() -@@ -54,10 +41,5 @@ setup( - 'pygments>=1.6', - 'requests>=2.0.0', - ], -- tests_require=[ -- 'tox>=1.6.1' -- ], -- cmdclass={ -- 'test': Tox -- }, -+ test_suite='runtests.runtests', - ) diff --git a/www/py-django-staticinline/Makefile b/www/py-django-staticinline/Makefile new file mode 100644 index 00000000000..1563a7c07c6 --- /dev/null +++ b/www/py-django-staticinline/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= django-staticinline +PORTVERSION= 1.3.1 +CATEGORIES= www python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= koobs@FreeBSD.org +COMMENT= Django template tag to load static files inline with your template + +LICENSE= MIT +#LICENSE_FILE= Not yet packaged in sdist + +USES= python +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +.include diff --git a/www/py-django-staticinline/distinfo b/www/py-django-staticinline/distinfo new file mode 100644 index 00000000000..65c304f133d --- /dev/null +++ b/www/py-django-staticinline/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1567752527 +SHA256 (django-staticinline-1.3.1.tar.gz) = 4d936460e8173d3b131379e3af419c42eb3f956efba34ec00eb7972e904d45ce +SIZE (django-staticinline-1.3.1.tar.gz) = 20843 diff --git a/www/py-django-staticinline/pkg-descr b/www/py-django-staticinline/pkg-descr new file mode 100644 index 00000000000..8a1ad6eb1bb --- /dev/null +++ b/www/py-django-staticinline/pkg-descr @@ -0,0 +1,4 @@ +Similiar to Django's native static templatetag, but this includes the file +directly in the template, rather than a link to it. + +WWW: https://github.com/bartTC/django-staticinline diff --git a/www/py-drf-yasg/Makefile b/www/py-drf-yasg/Makefile index f9e2c79f983..483bc0e530c 100644 --- a/www/py-drf-yasg/Makefile +++ b/www/py-drf-yasg/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= drf-yasg -DISTVERSION= 1.16.0 +DISTVERSION= 1.16.1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,7 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11.7:www/py-django111@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.34:devel/py-ruamel.yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/www/py-drf-yasg/distinfo b/www/py-drf-yasg/distinfo index 7b95aa7a7d9..adfbc70698b 100644 --- a/www/py-drf-yasg/distinfo +++ b/www/py-drf-yasg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561074540 -SHA256 (drf-yasg-1.16.0.tar.gz) = 82b535a22fc13e0a202217df4c6470c40b54d21f742e69798f53c69afccbfdac -SIZE (drf-yasg-1.16.0.tar.gz) = 1288698 +TIMESTAMP = 1567914095 +SHA256 (drf-yasg-1.16.1.tar.gz) = 68fded2ffdf46e03f33e766184b7d8f1e1a5236f94acfd0c4ba932a57b812566 +SIZE (drf-yasg-1.16.1.tar.gz) = 1289575 diff --git a/www/py-google-resumable-media/Makefile b/www/py-google-resumable-media/Makefile index 1c723044f47..2b5b6070656 100644 --- a/www/py-google-resumable-media/Makefile +++ b/www/py-google-resumable-media/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= google-resumable-media -PORTVERSION= 0.3.3 +PORTVERSION= 0.4.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-google-resumable-media/distinfo b/www/py-google-resumable-media/distinfo index d10b3a159fa..bda0045d7a8 100644 --- a/www/py-google-resumable-media/distinfo +++ b/www/py-google-resumable-media/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567016151 -SHA256 (google-resumable-media-0.3.3.tar.gz) = 49493999cf046b5a02f648e201f0c2fc718c5969c53326b4d2c0693b01bdc8bb -SIZE (google-resumable-media-0.3.3.tar.gz) = 2114537 +TIMESTAMP = 1567842472 +SHA256 (google-resumable-media-0.4.0.tar.gz) = 46ee131e55d16e350cf9dc7de6fc0653b55314e8645e2deb0633394adcd7e9c0 +SIZE (google-resumable-media-0.4.0.tar.gz) = 2112552 diff --git a/www/py-instabot/Makefile b/www/py-instabot/Makefile index 76aef5703dd..ff8e167962d 100644 --- a/www/py-instabot/Makefile +++ b/www/py-instabot/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= instabot -PORTVERSION= 0.55.0 +PORTVERSION= 0.56.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-instabot/distinfo b/www/py-instabot/distinfo index 8f1886225f3..90504915ca0 100644 --- a/www/py-instabot/distinfo +++ b/www/py-instabot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567611072 -SHA256 (instabot-0.55.0.tar.gz) = 43ee7210d557a3629bf580c188a0f16931d80a3944420d91a6967e20c9ce58f0 -SIZE (instabot-0.55.0.tar.gz) = 75876 +TIMESTAMP = 1567940875 +SHA256 (instabot-0.56.0.tar.gz) = 286fa5457bc67bc039604f7a8b66c1a25322e203bc823b700f36c1482df2a863 +SIZE (instabot-0.56.0.tar.gz) = 75875 diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile index 0ec856ca2cd..1125e7e329e 100644 --- a/www/rubygem-gollum/Makefile +++ b/www/rubygem-gollum/Makefile @@ -3,6 +3,7 @@ PORTNAME= gollum PORTVERSION= 4.1.4 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git \ rubygem-gemojione>=3.2:graphics/rubygem-gemojione \ rubygem-gollum-lib>=4.2.10:www/rubygem-gollum-lib \ - rubygem-kramdown>=1.9.0:textproc/rubygem-kramdown \ + rubygem-kramdown1>=1.9.0:textproc/rubygem-kramdown1 \ rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \ rubygem-sinatra1>=1.4.4:www/rubygem-sinatra1 \ rubygem-useragent>=0.16.2:devel/rubygem-useragent diff --git a/www/rubygem-jekyll-sanity/Makefile b/www/rubygem-jekyll-sanity/Makefile index 2d9ccaad9cf..13b2b1d02c8 100644 --- a/www/rubygem-jekyll-sanity/Makefile +++ b/www/rubygem-jekyll-sanity/Makefile @@ -3,6 +3,7 @@ PORTNAME= jekyll-sanity PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -11,10 +12,11 @@ COMMENT= Patches to make Jekyll less insane and easier LICENSE= MIT -RUN_DEPENDS= rubygem-jekyll>=3.1:www/rubygem-jekyll +RUN_DEPENDS= rubygem-jekyll3>=3.1:www/rubygem-jekyll3 + +USES= gem +USE_RUBY= yes NO_ARCH= yes -USE_RUBY= yes -USES= gem .include diff --git a/www/rubygem-jekyll-watch/Makefile b/www/rubygem-jekyll-watch/Makefile index a84cd9d91ee..af453633c3a 100644 --- a/www/rubygem-jekyll-watch/Makefile +++ b/www/rubygem-jekyll-watch/Makefile @@ -2,16 +2,16 @@ # $FreeBSD$ PORTNAME= jekyll-watch -PORTVERSION= 2.1.2 +PORTVERSION= 2.2.1 CATEGORIES= www rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Handles rebuilding of Jekyll sites when a file changes LICENSE= MIT -RUN_DEPENDS= rubygem-listen>=3.0:devel/rubygem-listen +RUN_DEPENDS= rubygem-listen>=3.0<4:devel/rubygem-listen USES= gem USE_RUBY= yes diff --git a/www/rubygem-jekyll-watch/distinfo b/www/rubygem-jekyll-watch/distinfo index 967e0446603..e99c071a7c6 100644 --- a/www/rubygem-jekyll-watch/distinfo +++ b/www/rubygem-jekyll-watch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540041703 -SHA256 (rubygem/jekyll-watch-2.1.2.gem) = fbb72f0bbadb8b593f255039f14da5a8750285ef2238d7de5e54a1ab07f234e9 -SIZE (rubygem/jekyll-watch-2.1.2.gem) = 6144 +TIMESTAMP = 1567842504 +SHA256 (rubygem/jekyll-watch-2.2.1.gem) = bc44ed43f5e0a552836245a54dbff3ea7421ecc2856707e8a1ee203a8387a7e1 +SIZE (rubygem/jekyll-watch-2.2.1.gem) = 6144 diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile index 8539898f2b0..dfec6544c4f 100644 --- a/www/rubygem-jekyll/Makefile +++ b/www/rubygem-jekyll/Makefile @@ -2,28 +2,30 @@ # $FreeBSD$ PORTNAME= jekyll -PORTVERSION= 3.8.5 +PORTVERSION= 4.0.0 CATEGORIES= www rubygems MASTER_SITES= RG -MAINTAINER= ruby@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Simple, blog aware, static site generator LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-addressable>=2.4:www/rubygem-addressable \ - rubygem-colorator>=0.1:textproc/rubygem-colorator \ - rubygem-em-websocket>=0.5:www/rubygem-em-websocket \ - rubygem-i18n>=0.7:devel/rubygem-i18n \ - rubygem-jekyll-sass-converter>=1.0:textproc/rubygem-jekyll-sass-converter \ - rubygem-jekyll-watch>=2.0:www/rubygem-jekyll-watch \ - rubygem-kramdown>=1.14:textproc/rubygem-kramdown \ - rubygem-liquid>=4.0:textproc/rubygem-liquid \ - rubygem-mercenary>=0.3.3:devel/rubygem-mercenary \ - rubygem-pathutil>=0.9:devel/rubygem-pathutil \ - rubygem-rouge>=1.7:textproc/rubygem-rouge \ - rubygem-safe_yaml>=1.0:devel/rubygem-safe_yaml +RUN_DEPENDS= rubygem-addressable>=2.4<3:www/rubygem-addressable \ + rubygem-colorator>=1.0<2:textproc/rubygem-colorator \ + rubygem-em-websocket>=0.5<1:www/rubygem-em-websocket \ + rubygem-i18n>=0.9.5,2<2,2:devel/rubygem-i18n \ + rubygem-jekyll-sass-converter>=2.0<3:textproc/rubygem-jekyll-sass-converter \ + rubygem-jekyll-watch>=2.0<3:www/rubygem-jekyll-watch \ + rubygem-kramdown>=2.1<3:textproc/rubygem-kramdown \ + rubygem-kramdown-parser-gfm>=1.0<2:textproc/rubygem-kramdown-parser-gfm \ + rubygem-liquid>=4.0<5:textproc/rubygem-liquid \ + rubygem-mercenary>=0.3.3<0.4:devel/rubygem-mercenary \ + rubygem-pathutil>=0.9<1:devel/rubygem-pathutil \ + rubygem-rouge>=3.0<4:textproc/rubygem-rouge \ + rubygem-safe_yaml>=1.0<2:devel/rubygem-safe_yaml \ + rubygem-terminal-table>=1.8<2:textproc/rubygem-terminal-table USES= gem USE_RUBY= yes diff --git a/www/rubygem-jekyll/distinfo b/www/rubygem-jekyll/distinfo index fad8171b933..45b17cfeb13 100644 --- a/www/rubygem-jekyll/distinfo +++ b/www/rubygem-jekyll/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541431019 -SHA256 (rubygem/jekyll-3.8.5.gem) = 6316459a4524a971e2553f794d2e3ec66f4341ca8452153df855500406d3c2da -SIZE (rubygem/jekyll-3.8.5.gem) = 112640 +TIMESTAMP = 1567842512 +SHA256 (rubygem/jekyll-4.0.0.gem) = 4a1dc48895d525bfb98cd562bf03ab6dd2727b5795360877c90e12670b9fec3a +SIZE (rubygem/jekyll-4.0.0.gem) = 119808 diff --git a/www/rubygem-jekyll3/Makefile b/www/rubygem-jekyll3/Makefile new file mode 100644 index 00000000000..205e9c2f608 --- /dev/null +++ b/www/rubygem-jekyll3/Makefile @@ -0,0 +1,38 @@ +# Created by: Peter Schuller +# $FreeBSD$ + +PORTNAME= jekyll +PORTVERSION= 3.8.5 +CATEGORIES= www rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 3 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Simple, blog aware, static site generator + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-addressable>=2.4:www/rubygem-addressable \ + rubygem-colorator>=0.1:textproc/rubygem-colorator \ + rubygem-em-websocket>=0.5:www/rubygem-em-websocket \ + rubygem-i18n>=0.7:devel/rubygem-i18n \ + rubygem-jekyll-sass-converter1>=1.0:textproc/rubygem-jekyll-sass-converter1 \ + rubygem-jekyll-watch>=2.0:www/rubygem-jekyll-watch \ + rubygem-kramdown1>=1.14:textproc/rubygem-kramdown1 \ + rubygem-liquid>=4.0:textproc/rubygem-liquid \ + rubygem-mercenary>=0.3.3:devel/rubygem-mercenary \ + rubygem-pathutil>=0.9:devel/rubygem-pathutil \ + rubygem-rouge>=1.7:textproc/rubygem-rouge \ + rubygem-safe_yaml>=1.0:devel/rubygem-safe_yaml + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +PLIST_FILES= bin/jekyll + +PORTSCOUT= limit:^3\. + +.include diff --git a/www/rubygem-jekyll3/distinfo b/www/rubygem-jekyll3/distinfo new file mode 100644 index 00000000000..fad8171b933 --- /dev/null +++ b/www/rubygem-jekyll3/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1541431019 +SHA256 (rubygem/jekyll-3.8.5.gem) = 6316459a4524a971e2553f794d2e3ec66f4341ca8452153df855500406d3c2da +SIZE (rubygem/jekyll-3.8.5.gem) = 112640 diff --git a/www/rubygem-jekyll/files/patch-gemspec b/www/rubygem-jekyll3/files/patch-gemspec similarity index 100% rename from www/rubygem-jekyll/files/patch-gemspec rename to www/rubygem-jekyll3/files/patch-gemspec diff --git a/www/rubygem-jekyll3/pkg-descr b/www/rubygem-jekyll3/pkg-descr new file mode 100644 index 00000000000..ffca117c37b --- /dev/null +++ b/www/rubygem-jekyll3/pkg-descr @@ -0,0 +1,8 @@ +Jekyll is a simple, blog aware, static site generator. It takes a +template directory (representing the raw form of a website), runs it +through Textile or Markdown and Liquid converters, and spits out a +complete, static website suitable for serving with Apache or your +favorite web server. This is also the engine behind GitHub Pages, +which you can use to host your project's page or blog on GitHub. + +WWW: https://jekyllrb.com/ diff --git a/www/rubygem-octopress/Makefile b/www/rubygem-octopress/Makefile index 5756c20eb83..e3377f68c73 100644 --- a/www/rubygem-octopress/Makefile +++ b/www/rubygem-octopress/Makefile @@ -12,17 +12,18 @@ COMMENT= Static blogging framework leveraging Jekyll LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-jekyll>=2.0:www/rubygem-jekyll \ - rubygem-mercenary>=0.3.2:devel/rubygem-mercenary \ +RUN_DEPENDS= rubygem-jekyll3>=2.0:www/rubygem-jekyll3 \ + rubygem-mercenary>=0.3.2<0.4:devel/rubygem-mercenary \ rubygem-octopress-deploy>=0:net/rubygem-octopress-deploy \ - rubygem-octopress-escape-code>=2.0:textproc/rubygem-octopress-escape-code \ - rubygem-octopress-hooks>=2.0:devel/rubygem-octopress-hooks \ - rubygem-redcarpet>=3.0:textproc/rubygem-redcarpet \ + rubygem-octopress-escape-code>=2.0<3:textproc/rubygem-octopress-escape-code \ + rubygem-octopress-hooks>=2.0<3:devel/rubygem-octopress-hooks \ + rubygem-redcarpet>=3.0<4:textproc/rubygem-redcarpet \ rubygem-titlecase>=0:devel/rubygem-titlecase -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes PLIST_FILES= bin/octopress diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile index 860d18c2c0b..3cca8dd7d0d 100644 --- a/www/wordpress/Makefile +++ b/www/wordpress/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -DISTVERSION= 5.2.2 +DISTVERSION= 5.2.3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo index ae68714dd5b..e49c6f34daf 100644 --- a/www/wordpress/distinfo +++ b/www/wordpress/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561104334 -SHA256 (wordpress-5.2.2.tar.gz) = 783fc929a64d37e4ad4e8eea0a5f7ca2d9469f430a48a6aa1555bde0f6a23122 -SIZE (wordpress-5.2.2.tar.gz) = 11200591 +TIMESTAMP = 1567785174 +SHA256 (wordpress-5.2.3.tar.gz) = 990f93815160ef75850f515608d812337982d2f79c1a34a0727e476ce16ff81d +SIZE (wordpress-5.2.3.tar.gz) = 11198223 diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index b2827c00a18..7021f9df8e2 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org acecad input driver +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= driver .include diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile index 9a288bce478..6531d25d372 100644 --- a/x11-drivers/xf86-input-fpit/Makefile +++ b/x11-drivers/xf86-input-fpit/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org fpit input driver +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= driver USE_XORG= xrandr diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index d3cea4ef85a..90c8f431b04 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org hyperpen input driver +DEPRECATED=Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= driver .include diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index adf83e01ac0..649ca917166 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mutouch input driver +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= driver .include diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index 04a1a124241..b9bb0216a06 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org penmount input driver +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= driver .include diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile index 9bfbfac7557..d823c2a8861 100644 --- a/x11-fonts/font-bitstream-speedo/Makefile +++ b/x11-fonts/font-bitstream-speedo/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bitstream Vera Speedo font +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= font .include diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile index 9df0489504f..d58f9043992 100644 --- a/x11-fonts/libXfontcache/Makefile +++ b/x11-fonts/libXfontcache/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= The Xfontcache library +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= lib USE_XORG= x11 xext xorgproto diff --git a/x11-fonts/spleen/Makefile b/x11-fonts/spleen/Makefile index 24474639c61..4593d7fa964 100644 --- a/x11-fonts/spleen/Makefile +++ b/x11-fonts/spleen/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= spleen -DISTVERSION= 1.1.0 +DISTVERSION= 1.2.0 CATEGORIES= x11-fonts MASTER_SITES= https://github.com/fcambus/spleen/releases/download/${DISTVERSION}/ PKGNAMESUFFIX= -font diff --git a/x11-fonts/spleen/distinfo b/x11-fonts/spleen/distinfo index 44c559f4a7c..ed9ff125b9c 100644 --- a/x11-fonts/spleen/distinfo +++ b/x11-fonts/spleen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567090156 -SHA256 (spleen-1.1.0.tar.gz) = e09618c307c2f9fea1e7d396bd4ab52646ee9b8575f91a1060ff3642e904f874 -SIZE (spleen-1.1.0.tar.gz) = 175797 +TIMESTAMP = 1567798198 +SHA256 (spleen-1.2.0.tar.gz) = 209bd3c2e2e7891520b099163b9a430f7ece766361b86c69799dc3aa235db49a +SIZE (spleen-1.2.0.tar.gz) = 217668 diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 66b06fd7025..012b590e16e 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -169,7 +169,6 @@ SUBDIR += p5-Tk-TableMatrix SUBDIR += p5-Tk-ToolBar SUBDIR += p5-Tk-WaitBox - SUBDIR += p5-Wx SUBDIR += pango SUBDIR += pangomm SUBDIR += pangox-compat diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile index 4838713dc3d..3afab0bfc83 100644 --- a/x11-toolkits/granite/Makefile +++ b/x11-toolkits/granite/Makefile @@ -1,9 +1,8 @@ # Created by: Olivier Duchateau # $FreeBSD$ -# PORTNAME= granite -DISTVERSION= 5.2.4 +DISTVERSION= 5.2.5 CATEGORIES= x11-toolkits MAINTAINER= tobik@FreeBSD.org @@ -25,6 +24,6 @@ INSTALLS_ICONS= yes USE_LDCONFIG= yes BINARY_ALIAS= python3=${PYTHON_CMD} -CFLAGS+= -Wno-return-type +PLIST_SUB= DISTVERSION=${DISTVERSION} .include diff --git a/x11-toolkits/granite/distinfo b/x11-toolkits/granite/distinfo index 3b35a4aaba4..81061f50c7a 100644 --- a/x11-toolkits/granite/distinfo +++ b/x11-toolkits/granite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562513151 -SHA256 (elementary-granite-5.2.4_GH0.tar.gz) = 45349b24f3f5e9216354894f5598104e08d72992d81a41dadc373602853419fb -SIZE (elementary-granite-5.2.4_GH0.tar.gz) = 390145 +TIMESTAMP = 1567753235 +SHA256 (elementary-granite-5.2.5_GH0.tar.gz) = 1c1cbe94b18a3ba2e3a099206906827d1ecf0c9572c349059fee23b6b0738966 +SIZE (elementary-granite-5.2.5_GH0.tar.gz) = 392987 diff --git a/x11-toolkits/granite/pkg-plist b/x11-toolkits/granite/pkg-plist index 8eca9fda3eb..cf8fe4d0bd9 100644 --- a/x11-toolkits/granite/pkg-plist +++ b/x11-toolkits/granite/pkg-plist @@ -4,9 +4,9 @@ include/granite/widgets-utils.h lib/girepository-1.0/Granite-1.0.typelib lib/libgranite.so lib/libgranite.so.5 -lib/libgranite.so.5.2.4 +lib/libgranite.so.%%DISTVERSION%% libdata/pkgconfig/granite.pc -share/applications/granite-demo.desktop +share/applications/io.elementary.granite.demo.desktop share/gir-1.0/Granite-1.0.gir share/icons/hicolor/16x16/actions/appointment.svg share/icons/hicolor/16x16/actions/open-menu.svg diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile deleted file mode 100644 index 3f864b1bb8f..00000000000 --- a/x11-toolkits/p5-Wx/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# Created by: Cezary Morga -# $FreeBSD$ - -PORTNAME= Wx -PORTVERSION= 0.9932 -PORTREVISION= 5 -CATEGORIES= x11-toolkits perl5 -MASTER_SITES= CPAN -PKGNAMEPREFIX= p5- - -MAINTAINER= perl@FreeBSD.org -COMMENT= Perl5 interface to the wxWidgets cross-platform GUI toolkit - -LICENSE= ART10 GPLv1+ -LICENSE_COMB= dual - -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-09-04 - -BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-ExtUtils-XSpp>=0.16.03:devel/p5-ExtUtils-XSpp \ - p5-Alien-wxWidgets>=0.25:x11-toolkits/p5-Alien-wxWidgets - -USES= compiler:c++11-lib perl5 -USE_CXXSTD= c++11 -USE_PERL5= configure -USE_WX= 3.0 -CONFIGURE_ENV= CXX="${CXX}" - -CFLAGS+= -pthread -Wno-write-strings - -post-configure: - @${FIND} ${WRKSRC} -name "Makefile" -type f | ${XARGS} \ - ${REINPLACE_CMD} -e \ - 's|$$(CC)|$$(CXX)|g ; \ - s|$$(CCFLAGS)|$$(CXXFLAGS)|g' - -pre-build: - @(cd ${WRKSRC} && ${DO_MAKE_BUILD} generated) - -post-install: - @${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} -name "*.so" -type f \ - | ${XARGS} ${STRIP_CMD} - -.include diff --git a/x11-toolkits/p5-Wx/distinfo b/x11-toolkits/p5-Wx/distinfo deleted file mode 100644 index a504233171c..00000000000 --- a/x11-toolkits/p5-Wx/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1492523811 -SHA256 (Wx-0.9932.tar.gz) = 1cfdb6535a0f4676e6f1aab2c9d8e16d577be3eb3b7cc04c8074d685e6651b70 -SIZE (Wx-0.9932.tar.gz) = 486326 diff --git a/x11-toolkits/p5-Wx/files/patch-build_Wx_build_MakeMaker_Any__wx__config.pm b/x11-toolkits/p5-Wx/files/patch-build_Wx_build_MakeMaker_Any__wx__config.pm deleted file mode 100644 index 7b815f5bfc2..00000000000 --- a/x11-toolkits/p5-Wx/files/patch-build_Wx_build_MakeMaker_Any__wx__config.pm +++ /dev/null @@ -1,18 +0,0 @@ ---- build/Wx/build/MakeMaker/Any_wx_config.pm.orig 2014-03-08 13:01:15 UTC -+++ build/Wx/build/MakeMaker/Any_wx_config.pm -@@ -39,15 +39,6 @@ sub get_flags { - return %config; - } - --sub const_config { -- my $text = shift->SUPER::const_config( @_ ); -- -- $text =~ s{^(LD(?:DL)?FLAGS\s*=.*?)-L/usr/local/lib64/?}{$1}mg; -- $text =~ s{^(LD(?:DL)?FLAGS\s*=.*?)-L/usr/local/lib/?}{$1}mg; -- -- return $text; --} -- - 1; - - # local variables: diff --git a/x11-toolkits/p5-Wx/pkg-descr b/x11-toolkits/p5-Wx/pkg-descr deleted file mode 100644 index 4539eee86b8..00000000000 --- a/x11-toolkits/p5-Wx/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -wxPerl is an extension module allowing the creation of GUI (Graphical -User Interface) from Perl; it is built as a wrapper for the wxWidgets -C++ GUI toolkit. - -WWW: http://www.wxperl.it/ diff --git a/x11-toolkits/p5-Wx/pkg-plist b/x11-toolkits/p5-Wx/pkg-plist deleted file mode 100644 index 3024b32a506..00000000000 --- a/x11-toolkits/p5-Wx/pkg-plist +++ /dev/null @@ -1,110 +0,0 @@ -bin/wxperl_overload -%%SITE_ARCH%%/Wx.pm -%%SITE_ARCH%%/Wx/AUI.pm -%%SITE_ARCH%%/Wx/Api.pod -%%SITE_ARCH%%/Wx/App.pm -%%SITE_ARCH%%/Wx/ArtProvider.pm -%%SITE_ARCH%%/Wx/Calendar.pm -%%SITE_ARCH%%/Wx/DND.pm -%%SITE_ARCH%%/Wx/DataView.pm -%%SITE_ARCH%%/Wx/DateTime.pm -%%SITE_ARCH%%/Wx/DocView.pm -%%SITE_ARCH%%/Wx/DropSource.pm -%%SITE_ARCH%%/Wx/Event.pm -%%SITE_ARCH%%/Wx/FS.pm -%%SITE_ARCH%%/Wx/Grid.pm -%%SITE_ARCH%%/Wx/Help.pm -%%SITE_ARCH%%/Wx/Html.pm -%%SITE_ARCH%%/Wx/IPC.pm -%%SITE_ARCH%%/Wx/Loader.pod -%%SITE_ARCH%%/Wx/Locale.pm -%%SITE_ARCH%%/Wx/MDI.pm -%%SITE_ARCH%%/Wx/Media.pm -%%SITE_ARCH%%/Wx/Menu.pm -%%SITE_ARCH%%/Wx/Mini.pm -%%SITE_ARCH%%/Wx/NewClass.pod -%%SITE_ARCH%%/Wx/Overload/Driver.pm -%%SITE_ARCH%%/Wx/Overload/Handle.pm -%%SITE_ARCH%%/Wx/Perl/Carp.pm -%%SITE_ARCH%%/Wx/Perl/SplashFast.pm -%%SITE_ARCH%%/Wx/Perl/TextValidator.pm -%%SITE_ARCH%%/Wx/PerlTest.pm -%%SITE_ARCH%%/Wx/Print.pm -%%SITE_ARCH%%/Wx/PropertyGrid.pm -%%SITE_ARCH%%/Wx/RadioBox.pm -%%SITE_ARCH%%/Wx/Ribbon.pm -%%SITE_ARCH%%/Wx/RichText.pm -%%SITE_ARCH%%/Wx/STC.pm -%%SITE_ARCH%%/Wx/Socket.pm -%%SITE_ARCH%%/Wx/Thread.pod -%%SITE_ARCH%%/Wx/Timer.pm -%%SITE_ARCH%%/Wx/WebView.pm -%%SITE_ARCH%%/Wx/Wx_Exp.pm -%%SITE_ARCH%%/Wx/XRC.pm -%%SITE_ARCH%%/Wx/XSP/Enum.pm -%%SITE_ARCH%%/Wx/XSP/Event.pm -%%SITE_ARCH%%/Wx/XSP/Overload.pm -%%SITE_ARCH%%/Wx/XSP/Virtual.pm -%%SITE_ARCH%%/Wx/build/MakeMaker.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/Any_OS.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/Any_wx_config.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/Core.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/Hacks.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/MacOSX_GCC.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/Win32.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MSVC.pm -%%SITE_ARCH%%/Wx/build/MakeMaker/Win32_MinGW.pm -%%SITE_ARCH%%/Wx/build/Opt.pm -%%SITE_ARCH%%/Wx/build/Options.pm -%%SITE_ARCH%%/Wx/build/Utils.pm -%%SITE_ARCH%%/Wx/cpp/chkconfig.h -%%SITE_ARCH%%/Wx/cpp/compat.h -%%SITE_ARCH%%/Wx/cpp/constants.h -%%SITE_ARCH%%/Wx/cpp/e_cback.h -%%SITE_ARCH%%/Wx/cpp/event.h -%%SITE_ARCH%%/Wx/cpp/helpers.h -%%SITE_ARCH%%/Wx/cpp/overload.h -%%SITE_ARCH%%/Wx/cpp/setup.h -%%SITE_ARCH%%/Wx/cpp/streams.h -%%SITE_ARCH%%/Wx/cpp/v_cback.h -%%SITE_ARCH%%/Wx/cpp/v_cback_def.h -%%SITE_ARCH%%/Wx/cpp/wxapi.h -%%SITE_ARCH%%/Wx/typemap -%%SITE_ARCH%%/auto/Wx/AUI/AUI.so -%%SITE_ARCH%%/auto/Wx/Calendar/Calendar.so -%%SITE_ARCH%%/auto/Wx/DND/DND.so -%%SITE_ARCH%%/auto/Wx/DataView/DataView.so -%%SITE_ARCH%%/auto/Wx/DateTime/DateTime.so -%%SITE_ARCH%%/auto/Wx/DocView/DocView.so -%%SITE_ARCH%%/auto/Wx/FS/FS.so -%%SITE_ARCH%%/auto/Wx/Grid/Grid.so -%%SITE_ARCH%%/auto/Wx/Help/Help.so -%%SITE_ARCH%%/auto/Wx/Html/Html.so -%%SITE_ARCH%%/auto/Wx/IPC/IPC.so -%%SITE_ARCH%%/auto/Wx/MDI/MDI.so -%%SITE_ARCH%%/auto/Wx/Media/Media.so -%%SITE_ARCH%%/auto/Wx/PerlTest/PerlTest.so -%%SITE_ARCH%%/auto/Wx/Print/Print.so -%%SITE_ARCH%%/auto/Wx/PropertyGrid/PropertyGrid.so -%%SITE_ARCH%%/auto/Wx/Ribbon/Ribbon.so -%%SITE_ARCH%%/auto/Wx/RichText/RichText.so -%%SITE_ARCH%%/auto/Wx/STC/STC.so -%%SITE_ARCH%%/auto/Wx/Socket/Socket.so -%%SITE_ARCH%%/auto/Wx/WebView/WebView.so -%%SITE_ARCH%%/auto/Wx/Wx.so -%%SITE_ARCH%%/auto/Wx/XRC/XRC.so -%%PERL5_MAN1%%/wxperl_overload.1.gz -%%PERL5_MAN3%%/Wx.3.gz -%%PERL5_MAN3%%/Wx::Api.3.gz -%%PERL5_MAN3%%/Wx::Loader.3.gz -%%PERL5_MAN3%%/Wx::NewClass.3.gz -%%PERL5_MAN3%%/Wx::Perl::Carp.3.gz -%%PERL5_MAN3%%/Wx::Perl::SplashFast.3.gz -%%PERL5_MAN3%%/Wx::Perl::TextValidator.3.gz -%%PERL5_MAN3%%/Wx::Socket.3.gz -%%PERL5_MAN3%%/Wx::Thread.3.gz -%%PERL5_MAN3%%/Wx::XSP::Overload.3.gz -%%PERL5_MAN3%%/Wx::build::MakeMaker.3.gz -%%PERL5_MAN3%%/Wx::build::MakeMaker::Win32_MSVC.3.gz -%%PERL5_MAN3%%/Wx::build::Options.3.gz -%%PERL5_MAN3%%/Wx::build::Utils.3.gz diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile index 10b57561310..db93fd6ade8 100644 --- a/x11-wm/ede/Makefile +++ b/x11-wm/ede/Makefile @@ -19,6 +19,7 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL20+ = ${EDELIB_WRKSRC}/COPYING BUILD_DEPENDS= doxygen:devel/doxygen \ + gsed:textproc/gsed \ jam:devel/jam LIB_DEPENDS= libdbus-1.so:devel/dbus \ libcurl.so:ftp/curl \ @@ -27,6 +28,8 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ USES= fam gettext iconv:translit localbase:ldflags pathfix \ pkgconfig python:2.7 shared-mime-info shebangfix + +BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed SHEBANG_FILES= doc/asciidoc/asciidoc.py USE_XORG= xcomposite xft xinerama xkbfile xpm xrandr USE_CSTD= gnu89 diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile index dbd6e744b52..a7efde4684d 100644 --- a/x11/cinnamon-screensaver/Makefile +++ b/x11/cinnamon-screensaver/Makefile @@ -3,6 +3,7 @@ PORTNAME= cinnamon-screensaver PORTVERSION= 2.4.1 +PORTREVISIOn= 1 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 @@ -21,10 +22,10 @@ RUN_DEPENDS= pam_helper:security/pam_helper \ gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \ gnome-keyring>=0:security/gnome-keyring -USES= autoreconf:build gettext gmake libtool pathfix pkgconfig +USES= autoreconf:build gettext gmake libtool pathfix pkgconfig xorg USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_XORG= x11 xext xxf86vm xxf86misc xscrnsaver +USE_XORG= x11 xext xxf86vm xscrnsaver USE_GNOME= gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile index 5544eb56847..90d06a59281 100644 --- a/x11/libXevie/Makefile +++ b/x11/libXevie/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= The Xevie library +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + LICENSE= MIT XORG_CAT= lib diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile index f350a389ed1..2456791546c 100644 --- a/x11/libXxf86misc/Makefile +++ b/x11/libXxf86misc/Makefile @@ -9,6 +9,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X XF86-Misc Extension +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-11-01 + LICENSE= MIT XORG_CAT= lib diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile index e2a140c6087..ddb40c13bcf 100644 --- a/x11/liboldX/Makefile +++ b/x11/liboldX/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Old X library +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= lib USE_XORG= x11 diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile index 1d851199d29..fd573fea73e 100644 --- a/x11/libxkbui/Makefile +++ b/x11/libxkbui/Makefile @@ -9,6 +9,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= The xkbui library +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= lib USE_XORG= x11 xt xkbfile xorgproto .include diff --git a/x11/luit/Makefile b/x11/luit/Makefile index c0aa9926465..f6f7c163824 100644 --- a/x11/luit/Makefile +++ b/x11/luit/Makefile @@ -1,17 +1,28 @@ # $FreeBSD$ PORTNAME= luit -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 20190106 CATEGORIES= x11 +MASTER_SITES= ftp://ftp.invisible-island.net/luit/ MAINTAINER= x11@FreeBSD.org COMMENT= Locale and ISO 2022 support for Unicode terminals -XORG_CAT= app -USE_XORG= x11 fontenc +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING -CONFIGURE_ARGS= --datadir=${LOCALBASE}/lib +BUILD_DEPENDS= ${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings + +USES= iconv localbase:ldflags tar:tgz pkgconfig xorg +USE_XORG= ice x11 xt + +GNU_CONFIGURE= yes + +CONFIGURE_ARGS= --x-libraries=${LOCALBASE}/lib \ + --x-includes=${LOCALBASE}/include \ + --with-encodings-dir=${LOCALBASE}/share/fonts/encodings/encodings.dir \ + --with-locale-alias=${LOCALBASE}/lib/X11/locale/locale.alias \ + --with-pkg-config=${LOCALBASE}/bin/pkg-config \ PLIST_FILES= bin/luit man/man1/luit.1.gz diff --git a/x11/luit/distinfo b/x11/luit/distinfo index 2fe6e1fdd51..a08a290439f 100644 --- a/x11/luit/distinfo +++ b/x11/luit/distinfo @@ -1,2 +1,3 @@ -SHA256 (xorg/app/luit-1.1.1.tar.bz2) = 30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636 -SIZE (xorg/app/luit-1.1.1.tar.bz2) = 140044 +TIMESTAMP = 1567812011 +SHA256 (luit-20190106.tgz) = 2b900f65ccdc38f8bfc11c6020069d055ba63fce6f90baefe8efc222a5ca3920 +SIZE (luit-20190106.tgz) = 190866 diff --git a/x11/luit/files/patch-sys.c b/x11/luit/files/patch-sys.c deleted file mode 100644 index ed1d2541fb8..00000000000 --- a/x11/luit/files/patch-sys.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sys.c.orig 2012-03-23 04:23:07 UTC -+++ sys.c -@@ -256,7 +256,7 @@ setRawTermios(void) - rc = tcgetattr(0, &tio); - if (rc < 0) - return rc; -- tio.c_lflag &= (unsigned) ~(ECHO | ICANON | ISIG); -+ tio.c_lflag &= (unsigned) ~(ECHO | ICANON | IEXTEN | ISIG); - tio.c_iflag &= (unsigned) ~(ICRNL | IXOFF | IXON | ISTRIP); - #ifdef ONLCR - tio.c_oflag &= (unsigned) ~ONLCR; diff --git a/x11/luit/pkg-descr b/x11/luit/pkg-descr index c6c4c4cbc65..c6d50b64d51 100644 --- a/x11/luit/pkg-descr +++ b/x11/luit/pkg-descr @@ -1,2 +1,4 @@ This package contains luit, a filter than can be run between an arbitrary application and a UTF-8 terminal emulator. + +WWW: https://invisible-island.net/luit/ diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile index 3ec030f0d2e..cbcc5789353 100644 --- a/x11/mate-screensaver/Makefile +++ b/x11/mate-screensaver/Makefile @@ -3,6 +3,7 @@ PORTNAME= mate-screensaver PORTVERSION= 1.22.1 +PORTREVISION= 1 CATEGORIES= x11 mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -22,10 +23,10 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ PORTSCOUT= limitw:1,even -USES= gettext gmake localbase pathfix pkgconfig tar:xz +USES= gettext gmake localbase pathfix pkgconfig tar:xz xorg USE_GL= gl USE_MATE= desktop libmatekbd menus session:run -USE_XORG= ice sm x11 xext xscrnsaver xxf86misc xxf86vm +USE_XORG= ice sm x11 xext xscrnsaver xxf86vm USE_GNOME= cairo gdkpixbuf2 gtk30 intltool GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xscreensaverdir=${XSCREENSAVER_DIR} \ diff --git a/x11/virtboard/distinfo b/x11/virtboard/distinfo index 80aabaec84d..0b7dda3e1ee 100644 --- a/x11/virtboard/distinfo +++ b/x11/virtboard/distinfo @@ -1,7 +1,7 @@ TIMESTAMP = 1543864393 SHA256 (Librem5-virtboard-576fffc61bcfa8e24f9dcf10d8bf3b32240cc36d_GL0.tar.gz) = 34d15918ea9e788f4b311dc34a9c5aecafad7ef466b2158ca9fa603bb936da9c SIZE (Librem5-virtboard-576fffc61bcfa8e24f9dcf10d8bf3b32240cc36d_GL0.tar.gz) = 128500 -SHA256 (42e698964e42.patch) = 20eda9ca7c6359bff8b8202e29f958735839fa9258da944b7d2a7459dd5c4ab7 +SHA256 (42e698964e42.patch) = a05ca593552ba1bf27ed01e42b06b7d995fabf32fa24b7f58a4729e96c775e43 SIZE (42e698964e42.patch) = 832 -SHA256 (86e6915d4920.patch) = f97bf3f30f84d973056ba1f6d59bc6519310637cbbc65d3677fca0da881c5b39 +SHA256 (86e6915d4920.patch) = 7cfd1cf85ed208dd3d36f7a86f2ac35e10eb39b2848504f356657945dfdf8692 SIZE (86e6915d4920.patch) = 1696 diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile index d9f3d5dee64..52c0a044fc8 100644 --- a/x11/xdpyinfo/Makefile +++ b/x11/xdpyinfo/Makefile @@ -2,7 +2,7 @@ PORTNAME= xdpyinfo PORTVERSION= 1.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -12,9 +12,11 @@ USE_HARDENING= safestack LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= dmx x11 xcb xcomposite xext xinerama xorgproto xrender \ - xtst xxf86dga xxf86misc xxf86vm + xtst xxf86dga xxf86vm + +CONFIGURE_ARGS= --without-xf86misc PLIST_FILES= bin/xdpyinfo man/man1/xdpyinfo.1.gz diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index b491ca55fd6..bb60e365f42 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -2,19 +2,19 @@ PORTNAME= xorg-apps PORTVERSION= 7.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X.org apps meta-port -COMPONENTS= appres bitmap xf86dga:dga iceauth luit \ +COMPONENTS= appres bitmap xf86dga:dga iceauth \ x11-fonts/mkfontscale:mkfontscale sessreg \ setxkbmap smproxy x11perf xauth xbacklight xcalc \ xcmsdb xconsole xcursorgen xdpyinfo xdriinfo xev xgamma xgc \ xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \ xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \ - xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \ + xrefresh xset xsetroot xvinfo xwd xwininfo \ xwud xmessage # These three are added for convenience purposes only. diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index d4364057408..080dae29f54 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -3,7 +3,7 @@ PORTNAME= xorg-libraries PORTVERSION= 7.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -13,7 +13,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx \ ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc \ ${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE \ ${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS \ - ${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX \ ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:x11/pixman \ ${LOCALBASE}/libdata/pkgconfig/sm.pc:x11/libSM \ ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 \ @@ -23,16 +22,13 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx \ ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor \ ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:x11/libXdamage \ ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:x11/libXdmcp \ - ${LOCALBASE}/libdata/pkgconfig/xevie.pc:x11/libXevie \ ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext \ ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:x11/libXfixes \ ${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont \ - ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:x11-fonts/libXfontcache \ ${LOCALBASE}/libdata/pkgconfig/xft.pc:x11-fonts/libXft \ ${LOCALBASE}/libdata/pkgconfig/xi.pc:x11/libXi \ ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama \ ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:x11/libxkbfile \ - ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:x11/libxkbui \ ${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu \ ${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp \ ${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm \ @@ -47,7 +43,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx \ ${LOCALBASE}/libdata/pkgconfig/xv.pc:x11/libXv \ ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:x11/libXvMC \ ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86dga \ - ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc \ ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm USES= metaport diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile index c7fb4902a6b..24e0a43b127 100644 --- a/x11/xprehashprinterlist/Makefile +++ b/x11/xprehashprinterlist/Makefile @@ -7,6 +7,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Recomputes the list of available printers +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= app USE_XORG= xp x11 diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index 797ed49a69c..3f6059ca102 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -8,6 +8,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= RX helper program +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= app USE_XORG= x11 xt xext xtrans xorgproto xau xaw ice USES= libtool diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 24ffdea624b..f97d8c26a57 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -3,6 +3,7 @@ PORTNAME= xscreensaver PORTVERSION= 5.43 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -20,12 +21,11 @@ LIB_DEPENDS= libgle.so:graphics/gle \ CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* USES= autoreconf gettext gl gmake gnome jpeg localbase:ldflags perl5 \ - pkgconfig + pkgconfig xorg USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2 USE_PERL5= run -USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xpm xt \ - xxf86misc xxf86vm +USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xpm xt xxf86vm USE_CSTD= gnu99 GNU_CONFIGURE= yes diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist index 283e115bb12..b0dabce5f1a 100644 --- a/x11/xscreensaver/pkg-plist +++ b/x11/xscreensaver/pkg-plist @@ -55,6 +55,7 @@ bin/xscreensaver-hacks/cynosure bin/xscreensaver-hacks/dangerball bin/xscreensaver-hacks/decayscreen bin/xscreensaver-hacks/deco +bin/xscreensaver-hacks/deepstars bin/xscreensaver-hacks/deluxe bin/xscreensaver-hacks/demon bin/xscreensaver-hacks/discoball @@ -103,6 +104,7 @@ bin/xscreensaver-hacks/glsnake bin/xscreensaver-hacks/gltext bin/xscreensaver-hacks/goop bin/xscreensaver-hacks/grav +bin/xscreensaver-hacks/gravitywell bin/xscreensaver-hacks/greynetic bin/xscreensaver-hacks/halftone bin/xscreensaver-hacks/halo @@ -249,6 +251,7 @@ man/man1/xscreensaver-demo.1.gz man/man1/xscreensaver-getimage-file.1.gz man/man1/xscreensaver-getimage-video.1.gz man/man1/xscreensaver-getimage.1.gz +man/man1/xscreensaver-systemd.1.gz man/man1/xscreensaver-text.1.gz man/man1/xscreensaver.1.gz man/man6/abstractile.6.gz @@ -301,6 +304,7 @@ man/man6/cynosure.6.gz man/man6/dangerball.6.gz man/man6/decayscreen.6.gz man/man6/deco.6.gz +man/man6/deepstars.6.gz man/man6/deluxe.6.gz man/man6/demon.6.gz man/man6/discoball.6.gz @@ -349,6 +353,7 @@ man/man6/glsnake.6.gz man/man6/gltext.6.gz man/man6/goop.6.gz man/man6/grav.6.gz +man/man6/gravitywell.6.gz man/man6/greynetic.6.gz man/man6/halftone.6.gz man/man6/halo.6.gz @@ -562,6 +567,7 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/dangerball.xml %%DATADIR%%/config/decayscreen.xml %%DATADIR%%/config/deco.xml +%%DATADIR%%/config/deepstars.xml %%DATADIR%%/config/deluxe.xml %%DATADIR%%/config/demon.xml %%DATADIR%%/config/discoball.xml @@ -610,6 +616,7 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/gltext.xml %%DATADIR%%/config/goop.xml %%DATADIR%%/config/grav.xml +%%DATADIR%%/config/gravitywell.xml %%DATADIR%%/config/greynetic.xml %%DATADIR%%/config/halftone.xml %%DATADIR%%/config/halo.xml diff --git a/x11/xset/Makefile b/x11/xset/Makefile index ae32c360cfd..f9cf6a05b7a 100644 --- a/x11/xset/Makefile +++ b/x11/xset/Makefile @@ -2,14 +2,18 @@ PORTNAME= xset PORTVERSION= 1.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= User preference utility for X -XORG_CAT= app -USE_XORG= xmuu xorgproto x11 xext xfontcache +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= xorg xorg-cat:app + +USE_XORG= xmuu x11 xext CONFIGURE_ARGS= --without-xf86misc PLIST_FILES= bin/xset man/man1/xset.1.gz diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile index 19b457a96a6..368421b3bed 100644 --- a/x11/xsetmode/Makefile +++ b/x11/xsetmode/Makefile @@ -7,6 +7,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Set the mode for an X Input Device +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= app USE_XORG= xi x11 diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile index 06667e8400a..592fd6dca77 100644 --- a/x11/xsetpointer/Makefile +++ b/x11/xsetpointer/Makefile @@ -7,6 +7,9 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Set an X Input device as the main pointer +DEPRECATED= Deprecated upstream +EXPIRATION_DATE=2019-10-15 + XORG_CAT= app USE_XORG= xi x11