Browse Source

Merge remote-tracking branch 'upstream/master'

pull/9/head
Shawn Webb 4 months ago
parent
commit
c6d64caf27
Signed by: shawn.webb <shawn.webb@hardenedbsd.org> GPG Key ID: FF2E67A277F8E1FA
100 changed files with 625 additions and 146 deletions
  1. +1
    -2
      MOVED
  2. +4
    -2
      Mk/bsd.sites.mk
  3. +4
    -3
      archivers/lib1541img/Makefile
  4. +2
    -2
      archivers/lib1541img/distinfo
  5. +3
    -3
      archivers/snappy-java/Makefile
  6. +4
    -3
      archivers/v1541commander/Makefile
  7. +2
    -2
      archivers/v1541commander/distinfo
  8. +10
    -0
      astro/merkaartor/files/patch-src_Features_Feature.h
  9. +10
    -0
      astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp
  10. +10
    -0
      astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp
  11. +10
    -0
      astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp
  12. +10
    -0
      astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp
  13. +10
    -0
      astro/qmapshack/files/patch-src_qmaptool_helpers_CDraw.cpp
  14. +11
    -0
      astro/qmapshack/files/patch-src_qmaptool_overlay_COverlayCutMap.cpp
  15. +10
    -0
      audio/clementine-player/files/patch-src_widgets_freespacebar.cpp
  16. +10
    -0
      audio/clementine-player/files/patch-src_widgets_osdpretty.cpp
  17. +10
    -0
      audio/clementine-player/files/patch-src_widgets_sliderwidget.cpp
  18. +2
    -0
      audio/libaudec/Makefile
  19. +13
    -2
      audio/libaudec/files/patch-meson.build
  20. +10
    -0
      audio/lmms/files/patch-plugins_Eq_EqSpectrumView.h
  21. +10
    -0
      audio/lmms/files/patch-src_gui_AutomationPatternView.cpp
  22. +10
    -0
      audio/lmms/files/patch-src_gui_LmmsStyle.cpp
  23. +10
    -0
      audio/lmms/files/patch-src_gui_editors_AutomationEditor.cpp
  24. +3
    -1
      audio/polyphone/Makefile
  25. +10
    -0
      audio/polyphone/files/patch-editor_graphics_graphiquefourier.cpp
  26. +10
    -0
      audio/polyphone/files/patch-editor_tree_treeitemdelegate.cpp
  27. +10
    -0
      audio/sayonara/files/patch-src_Gui_Utils_Widgets_Slider.cpp
  28. +10
    -0
      audio/sonic-visualiser/files/patch-svgui_view_Overview.cpp
  29. +1
    -1
      benchmarks/rubygem-benchmark-ips/Makefile
  30. +3
    -3
      benchmarks/rubygem-benchmark-ips/distinfo
  31. +6
    -3
      benchmarks/rubygem-derailed_benchmarks/Makefile
  32. +3
    -3
      benchmarks/rubygem-derailed_benchmarks/distinfo
  33. +10
    -0
      biology/ugene/files/patch-src_corelibs_U2Designer_src_WorkflowGUIUtils.cpp
  34. +10
    -0
      biology/ugene/files/patch-src_corelibs_U2Gui_src_util_GUIUtils.cpp
  35. +10
    -0
      biology/ugene/files/patch-src_corelibs_U2View_src_ov__sequence_Overview.cpp
  36. +10
    -0
      biology/ugene/files/patch-src_corelibs_U2View_src_ov__sequence_view__rendering_SequenceViewAnnotatedRenderer.cpp
  37. +3
    -4
      cad/PrusaSlicer/Makefile
  38. +2
    -2
      cad/PrusaSlicer/distinfo
  39. +10
    -0
      cad/librecad/files/patch-librecad_src_lib_engine_lc__splinepoints.cpp
  40. +10
    -0
      cad/librecad/files/patch-librecad_src_lib_gui_rs__painterqt.cpp
  41. +10
    -0
      comms/cutecom/files/patch-ctrlcharacterspopup.cpp
  42. +10
    -0
      comms/inspectrum/files/patch-traceplot.cpp
  43. +2
    -1
      converters/p5-JSON-MaybeXS/Makefile
  44. +3
    -3
      converters/p5-JSON-MaybeXS/distinfo
  45. +1
    -1
      databases/erlfdb/Makefile
  46. +3
    -3
      databases/erlfdb/distinfo
  47. +10
    -0
      databases/opendbviewer/files/patch-src_Widget_QDropAreaWidget.cpp
  48. +1
    -1
      databases/pspg/Makefile
  49. +3
    -3
      databases/pspg/distinfo
  50. +1
    -1
      databases/py-tiledb/Makefile
  51. +3
    -3
      databases/py-tiledb/distinfo
  52. +1
    -1
      databases/rubygem-activemodel52/Makefile
  53. +3
    -3
      databases/rubygem-activemodel52/distinfo
  54. +1
    -1
      databases/rubygem-activemodel60/Makefile
  55. +3
    -3
      databases/rubygem-activemodel60/distinfo
  56. +2
    -3
      databases/rubygem-activerecord-import/Makefile
  57. +3
    -3
      databases/rubygem-activerecord-import/distinfo
  58. +1
    -1
      databases/rubygem-activerecord52/Makefile
  59. +3
    -3
      databases/rubygem-activerecord52/distinfo
  60. +1
    -1
      databases/rubygem-activerecord60/Makefile
  61. +3
    -3
      databases/rubygem-activerecord60/distinfo
  62. +1
    -2
      databases/tiledb/Makefile
  63. +3
    -3
      databases/tiledb/distinfo
  64. +10
    -0
      deskutils/flameshot/files/patch-src_third-party_Qt-Color-Widgets_src_color__wheel.cpp
  65. +10
    -0
      deskutils/flameshot/files/patch-src_tools_arrow_arrowtool.h
  66. +10
    -0
      deskutils/nextcloudclient/files/patch-src_libsync_networkjobs.cpp
  67. +3
    -1
      devel/Makefile
  68. +3
    -3
      devel/R-cran-tidyr/Makefile
  69. +3
    -3
      devel/R-cran-tidyr/distinfo
  70. +20
    -2
      devel/arcanist-lib/Makefile
  71. +11
    -0
      devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php
  72. +11
    -0
      devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
  73. +11
    -0
      devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php
  74. +11
    -0
      devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
  75. +11
    -0
      devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php
  76. +16
    -0
      devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php
  77. +11
    -0
      devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
  78. +15
    -0
      devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh
  79. +1
    -1
      devel/electron6/Makefile
  80. +1
    -1
      devel/electron6/Makefile.version
  81. +5
    -5
      devel/electron6/distinfo
  82. +1
    -1
      devel/electron6/files/package.json
  83. +1
    -1
      devel/etcd34/Makefile
  84. +3
    -3
      devel/etcd34/distinfo
  85. +1
    -1
      devel/git-lfs/Makefile
  86. +3
    -3
      devel/git-lfs/distinfo
  87. +1
    -0
      devel/git-lfs/pkg-plist
  88. +12
    -10
      devel/gitaly/Makefile
  89. +9
    -7
      devel/gitaly/distinfo
  90. +2
    -2
      devel/gitaly/files/patch-__support_Makefile.template
  91. +2
    -2
      devel/gitaly/files/patch-__support_makegen.go
  92. +12
    -8
      devel/gitaly/files/patch-ruby_Gemfile
  93. +2
    -3
      devel/gitaly/pkg-plist
  94. +3
    -3
      devel/gitlab-shell/Makefile
  95. +3
    -3
      devel/gitlab-shell/distinfo
  96. +1
    -0
      devel/gitlab-shell/pkg-plist
  97. +1
    -0
      devel/gmake/Makefile
  98. +32
    -0
      devel/gmake/files/patch-10-4c1009ec
  99. +1
    -1
      devel/gnu-efi/Makefile
  100. +3
    -3
      devel/gnu-efi/distinfo

+ 1
- 2
MOVED View File

@@ -14818,9 +14818,7 @@ print/pmw||2020-05-05|Has expired: Broken for more than 6 months
print/rprint||2020-05-05|Has expired: Broken for more than 6 months
russian/p5-cyrillic||2020-05-05|Has expired: Broken for more than 6 months
russian/tidyup-mail||2020-05-05|Has expired: Broken for more than 6 months
science/abinit||2020-05-05|Has expired: Broken for more than 6 months
science/atom||2020-05-05|Has expired: Broken for more than 6 months
science/cp2k||2020-05-05|Has expired: Broken for more than 6 months
science/esys-particle||2020-05-05|Has expired: Broken for more than 6 months
science/openmx||2020-05-05|Has expired: Broken for more than 6 months
science/p5-Geo-ReadGRIB||2020-05-05|Has expired: Broken for more than 6 months
@@ -15014,3 +15012,4 @@ sysutils/rdiff-backup|sysutils/py-rdiff-backup@py37|2020-05-16|Renamed comply wi
www/py-django-happenings|www/py-django-happenings-update|2020-05-17|Has expired: Doesn't work with Django 2.2+, please use www/py-django-happenings-update instead
devel/py-django-tastypie-mongoengine||2020-05-17|Has expired: Not necessary anymore, and project unmaintained
sysutils/py-cpuinfo|sysutils/py-py-cpuinfo|2020-05-18|Rename to match PyPI name
devel/py-jupyterlab_server|devel/py-jupyterlab-server|2020-05-19|Rename to match upstream naming

+ 4
- 2
Mk/bsd.sites.mk View File

@@ -454,8 +454,10 @@ DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
. else
DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
. endif
DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
DISTFILES+= ${DISTNAME}${_GITHUB_EXTRACT_SUFX}
DISTNAME_DEFAULT:= ${DISTNAME}_GH${_GITHUB_REV}
DISTFILE_DEFAULT= ${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX}
DISTNAME:= ${DISTNAME_DEFAULT}
DISTFILES+= ${DISTFILE_DEFAULT}
git-clone: git-clone-DEFAULT
git-clone-DEFAULT: ${_GITHUB_CLONE_DIR}
@git clone https://github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT}.git ${_GITHUB_CLONE_DIR}/${GH_PROJECT_DEFAULT}


+ 4
- 3
archivers/lib1541img/Makefile View File

@@ -3,6 +3,7 @@

PORTNAME= lib1541img
PORTVERSION= 1.1
DISTVERSIONPREFIX= v
CATEGORIES= archivers devel emulators

MAINTAINER= felix@palmen-it.de
@@ -13,9 +14,9 @@ LICENSE= BSD2CLAUSE
USES= compiler:c11 gmake

USE_GITHUB= yes
GH_PROJECT= ${PORTNAME} zimk:zimk
GH_PROJECT= zimk:zimk
GH_ACCOUNT= excess-c64 Zirias:zimk
GH_TAGNAME= v${PORTVERSION} 31500ca:zimk
GH_TAGNAME= 31500ca:zimk

USE_LDCONFIG= yes
MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
@@ -30,6 +31,6 @@ DOXYGEN_BUILD_DEPENDS= doxygen>0:devel/doxygen
DOXYGEN_ALL_TARGET= html

post-extract:
@${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/
@${MV} ${WRKSRC_zimk}/* ${WRKSRC}/zimk/

.include <bsd.port.mk>

+ 2
- 2
archivers/lib1541img/distinfo View File

@@ -1,5 +1,5 @@
TIMESTAMP = 1581093812
SHA256 (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 360976364c98d64485f8f7aa5630aa7f6f4907e9128bd293c94fbcd2471c0bef
SIZE (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 73253
SHA256 (excess-c64-lib1541img-v1.1_GH0.tar.gz) = 360976364c98d64485f8f7aa5630aa7f6f4907e9128bd293c94fbcd2471c0bef
SIZE (excess-c64-lib1541img-v1.1_GH0.tar.gz) = 73253
SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea
SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137

+ 3
- 3
archivers/snappy-java/Makefile View File

@@ -10,7 +10,7 @@ CATEGORIES= archivers java
MASTER_SITES= LOCAL/pi:repo
PKGNAMESUFFIX= java
DISTFILES+= ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo
EXTRACT_ONLY= xerial-${PORTNAME}-${PKGNAMESUFFIX}-${PORTVERSION}_GH0${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTFILE_DEFAULT} \
${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}

MAINTAINER= language.devel@gmail.com
@@ -48,8 +48,8 @@ PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so
post-extract:
@${MKDIR} ${WRKSRC}/target
@${RM} ${WRKSRC}/sbt
@${CP} ${DISTDIR}/google-snappy-${PORTVERSION:R}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
@${CP} ${DISTDIR}/kiyo-masui-bitshuffle-${BITSHUFFLE_V}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}
@${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
@${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}

do-build:
cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \


+ 4
- 3
archivers/v1541commander/Makefile View File

@@ -3,6 +3,7 @@

PORTNAME= v1541commander
PORTVERSION= 1.1
DISTVERSIONPREFIX= v
CATEGORIES= archivers emulators

MAINTAINER= felix@palmen-it.de
@@ -22,9 +23,9 @@ USES= compiler:c++11-lang gmake pkgconfig qt:5 shared-mime-info
USE_QT= core gui network widgets buildtools_build linguisttools_build

USE_GITHUB= yes
GH_PROJECT= ${PORTNAME} zimk:zimk
GH_PROJECT= zimk:zimk
GH_ACCOUNT= excess-c64 Zirias:zimk
GH_TAGNAME= v${PORTVERSION} 31500ca:zimk
GH_TAGNAME= 31500ca:zimk

OPTIONS_DEFINE= DOCS

@@ -33,6 +34,6 @@ MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
ALL_TARGET= strip

post-extract:
@${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/
@${MV} ${WRKSRC_zimk}/* ${WRKSRC}/zimk/

.include <bsd.port.mk>

+ 2
- 2
archivers/v1541commander/distinfo View File

@@ -1,5 +1,5 @@
TIMESTAMP = 1581095322
SHA256 (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = a8cbe7136923ce186b53718a5910a008420c7762e3741a2efd46cb1d8e927db7
SIZE (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = 407212
SHA256 (excess-c64-v1541commander-v1.1_GH0.tar.gz) = a8cbe7136923ce186b53718a5910a008420c7762e3741a2efd46cb1d8e927db7
SIZE (excess-c64-v1541commander-v1.1_GH0.tar.gz) = 407212
SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea
SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137

+ 10
- 0
astro/merkaartor/files/patch-src_Features_Feature.h View File

@@ -0,0 +1,10 @@
--- src/Features/Feature.h.orig 2020-05-21 10:34:19 UTC
+++ src/Features/Feature.h
@@ -10,6 +10,7 @@ class Feature;
#include <QtCore/QString>
#include <QList>
+#include <QPainterPath>
#define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
#define CAST_NODE(x) (dynamic_cast<Node*>(x))

+ 10
- 0
astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp View File

@@ -0,0 +1,10 @@
--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/gis/wpt/CGisItemWpt.cpp
@@ -38,6 +38,7 @@
#include <QtWidgets>
#include <QtXml>
+#include <QPainterPath>
IGisItem::key_t CGisItemWpt::keyUserFocus;
QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap;

+ 10
- 0
astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp View File

@@ -0,0 +1,10 @@
--- src/qmapshack/helpers/CDraw.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/helpers/CDraw.cpp
@@ -24,6 +24,7 @@
#include <QImage>
#include <QPointF>
#include <QtMath>
+#include <QPainterPath>
QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
QPen CDraw::penBorderGray(Qt::lightGray, 2);

+ 10
- 0
astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp View File

@@ -0,0 +1,10 @@
--- src/qmapshack/map/CMapIMG.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/map/CMapIMG.cpp
@@ -33,6 +33,7 @@
#include "units/IUnit.h"
#include <QtWidgets>
+#include <QPainterPath>
#undef DEBUG_SHOW_SECT_DESC
#undef DEBUG_SHOW_TRE_DATA

+ 10
- 0
astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp View File

@@ -0,0 +1,10 @@
--- src/qmapshack/mouse/IMouseSelect.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/mouse/IMouseSelect.cpp
@@ -23,6 +23,7 @@
#include "mouse/IScrOpt.h"
#include <QtWidgets>
+#include <QPainterPath>
IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
: IMouse(gis, canvas, mouse)

+ 10
- 0
astro/qmapshack/files/patch-src_qmaptool_helpers_CDraw.cpp View File

@@ -0,0 +1,10 @@
--- src/qmaptool/helpers/CDraw.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmaptool/helpers/CDraw.cpp
@@ -24,6 +24,7 @@
#include <QImage>
#include <QPointF>
#include <QtMath>
+#include <QPainterPath>
QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
QPen CDraw::penBorderGray(Qt::lightGray,2);

+ 11
- 0
astro/qmapshack/files/patch-src_qmaptool_overlay_COverlayCutMap.cpp View File

@@ -0,0 +1,11 @@
--- src/qmaptool/overlay/COverlayCutMap.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmaptool/overlay/COverlayCutMap.cpp
@@ -24,6 +24,8 @@
#include <functional>
#include <QtWidgets>
+#include <QPainterPath>
+
using std::bind;
static inline qreal sqr(qreal a)

+ 10
- 0
audio/clementine-player/files/patch-src_widgets_freespacebar.cpp View File

@@ -0,0 +1,10 @@
--- src/widgets/freespacebar.cpp.orig 2020-05-19 17:40:21 UTC
+++ src/widgets/freespacebar.cpp
@@ -20,6 +20,7 @@
#include <QLinearGradient>
#include <QPainter>
+#include <QPainterPath>
const int FreeSpaceBar::kBarHeight = 20;
const int FreeSpaceBar::kBarBorderRadius = 8;

+ 10
- 0
audio/clementine-player/files/patch-src_widgets_osdpretty.cpp View File

@@ -0,0 +1,10 @@
--- src/widgets/osdpretty.cpp.orig 2020-05-19 17:43:09 UTC
+++ src/widgets/osdpretty.cpp
@@ -26,6 +26,7 @@
#include <QLayout>
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QSettings>
#include <QTimer>
#include <QTimeLine>

+ 10
- 0
audio/clementine-player/files/patch-src_widgets_sliderwidget.cpp View File

@@ -0,0 +1,10 @@
--- src/widgets/sliderwidget.cpp.orig 2020-05-19 17:48:49 UTC
+++ src/widgets/sliderwidget.cpp
@@ -24,6 +24,7 @@
#include <QBrush>
#include <QImage>
#include <QPainter>
+#include <QPainterPath>
#include <QSize>
#include <QTimer>
#include <QStyle>

+ 2
- 0
audio/libaudec/Makefile View File

@@ -19,6 +19,8 @@ USE_GITHUB= yes
GH_ACCOUNT= alex-tee
USE_LDCONFIG= yes

MESON_ARGS= -Dbuild-tests=false

PLIST_FILES= bin/audec \
include/audec/audec.h \
lib/libaudec.so \


+ 13
- 2
audio/libaudec/files/patch-meson.build View File

@@ -1,6 +1,6 @@
--- meson.build.orig 2020-01-06 04:43:34 UTC
--- meson.build.orig 2020-05-16 11:50:13 UTC
+++ meson.build
@@ -160,7 +160,7 @@ config_h_dep = declare_dependency (
@@ -177,7 +177,7 @@ config_h_dep = declare_dependency (
)
audec_deps += config_h_dep
@@ -9,3 +9,14 @@
'audec',
sources: srcs,
dependencies: [
@@ -212,7 +212,9 @@ audec_exe = executable (
install: not meson.is_subproject(),
)
-subdir('tests')
+if get_variable('build-tests', true)
+ subdir('tests')
+endif
summary = [
'',

+ 10
- 0
audio/lmms/files/patch-plugins_Eq_EqSpectrumView.h View File

@@ -0,0 +1,10 @@
--- plugins/Eq/EqSpectrumView.h.orig 2020-05-21 10:45:40 UTC
+++ plugins/Eq/EqSpectrumView.h
@@ -24,6 +24,7 @@
#define EQSPECTRUMVIEW_H
#include <QPainter>
+#include <QPainterPath>
#include <QWidget>
#include "fft_helpers.h"

+ 10
- 0
audio/lmms/files/patch-src_gui_AutomationPatternView.cpp View File

@@ -0,0 +1,10 @@
--- src/gui/AutomationPatternView.cpp.orig 2020-05-21 10:43:44 UTC
+++ src/gui/AutomationPatternView.cpp
@@ -25,6 +25,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QMenu>
#include "AutomationEditor.h"

+ 10
- 0
audio/lmms/files/patch-src_gui_LmmsStyle.cpp View File

@@ -0,0 +1,10 @@
--- src/gui/LmmsStyle.cpp.orig 2020-05-21 10:47:28 UTC
+++ src/gui/LmmsStyle.cpp
@@ -28,6 +28,7 @@
#include <QApplication>
#include <QFrame>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleFactory>
#include <QStyleOption>

+ 10
- 0
audio/lmms/files/patch-src_gui_editors_AutomationEditor.cpp View File

@@ -0,0 +1,10 @@
--- src/gui/editors/AutomationEditor.cpp.orig 2020-05-21 10:49:08 UTC
+++ src/gui/editors/AutomationEditor.cpp
@@ -35,6 +35,7 @@
#include <QLayout>
#include <QMdiArea>
#include <QPainter>
+#include <QPainterPath>
#include <QScrollBar>
#include <QStyleOption>
#include <QToolTip>

+ 3
- 1
audio/polyphone/Makefile View File

@@ -21,7 +21,9 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
USES= compiler:c++11-lang desktop-file-utils dos2unix gl gnome pkgconfig qmake:outsource qt:5 shared-mime-info ssl xorg
USE_GITHUB= yes
GH_ACCOUNT= davy7125
DOS2UNIX_FILES= polyphone.pro
DOS2UNIX_FILES= polyphone.pro \
editor/graphics/graphiquefourier.cpp \
editor/tree/treeitemdelegate.cpp
USE_GL= gl
USE_QT= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
USE_GNOME= glib20


+ 10
- 0
audio/polyphone/files/patch-editor_graphics_graphiquefourier.cpp View File

@@ -0,0 +1,10 @@
--- editor/graphics/graphiquefourier.cpp.orig 2020-05-21 08:02:47 UTC
+++ editor/graphics/graphiquefourier.cpp
@@ -30,6 +30,7 @@
#include <QMenu>
#include <QFileDialog>
#include <QPainter>
+#include <QPainterPath>
GraphiqueFourier::GraphiqueFourier(QWidget * parent) : QCustomPlot(parent),
_fixedTickerX(new QCPAxisTickerFixed()),

+ 10
- 0
audio/polyphone/files/patch-editor_tree_treeitemdelegate.cpp View File

@@ -0,0 +1,10 @@
--- editor/tree/treeitemdelegate.cpp.orig 2020-05-21 08:02:47 UTC
+++ editor/tree/treeitemdelegate.cpp
@@ -29,6 +29,7 @@
#include "basetypes.h"
#include <QToolTip>
#include <QHelpEvent>
+#include <QPainterPath>
TreeItemDelegate::Icons * TreeItemDelegate::s_icons = nullptr;
TreeItemDelegate::Colors * TreeItemDelegate::s_colors = nullptr;

+ 10
- 0
audio/sayonara/files/patch-src_Gui_Utils_Widgets_Slider.cpp View File

@@ -0,0 +1,10 @@
--- src/Gui/Utils/Widgets/Slider.cpp.orig 2020-05-21 10:59:45 UTC
+++ src/Gui/Utils/Widgets/Slider.cpp
@@ -22,6 +22,7 @@
#include "Gui/Utils/Style.h"
#include <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
using Gui::Slider;

+ 10
- 0
audio/sonic-visualiser/files/patch-svgui_view_Overview.cpp View File

@@ -0,0 +1,10 @@
--- svgui/view/Overview.cpp.orig 2020-05-21 09:47:47 UTC
+++ svgui/view/Overview.cpp
@@ -20,6 +20,7 @@
#include <QPaintEvent>
#include <QPainter>
+#include <QPainterPath>
#include <iostream>
//#define DEBUG_OVERVIEW 1

+ 1
- 1
benchmarks/rubygem-benchmark-ips/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= benchmark-ips
PORTVERSION= 2.8.0
PORTVERSION= 2.8.2
CATEGORIES= benchmarks rubygems
MASTER_SITES= RG



+ 3
- 3
benchmarks/rubygem-benchmark-ips/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1588450808
SHA256 (rubygem/benchmark-ips-2.8.0.gem) = 0bd1c2e70f854e677d858619b9fe2f73590c30583e7255dfd0ea9dd901976240
SIZE (rubygem/benchmark-ips-2.8.0.gem) = 20480
TIMESTAMP = 1589908798
SHA256 (rubygem/benchmark-ips-2.8.2.gem) = bc4de4d4c061d2d1150425d31ad3314ccf878f21c15ae566dc9bc079e44923d9
SIZE (rubygem/benchmark-ips-2.8.2.gem) = 20480

+ 6
- 3
benchmarks/rubygem-derailed_benchmarks/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= derailed_benchmarks
PORTVERSION= 1.3.6
PORTVERSION= 1.7.0
CATEGORIES= benchmarks rubygems
MASTER_SITES= RG

@@ -15,9 +15,12 @@ RUN_DEPENDS= rubygem-benchmark-ips>=2.0.0:benchmarks/rubygem-benchmark-ips \
rubygem-get_process_mem>=0:devel/rubygem-get_process_mem \
rubygem-heapy>=0:devel/rubygem-heapy \
rubygem-memory_profiler>=0:devel/rubygem-memory_profiler \
rubygem-mini_histogram>=0:devel/rubygem-mini_histogram\
rubygem-rack>=1:www/rubygem-rack \
rubygem-rake>=10:devel/rubygem-rake \
rubygem-thor>=0.19:devel/rubygem-thor
rubygem-rake>=10<14:devel/rubygem-rake \
rubygem-ruby-statistics>=2.1:devel/rubygem-ruby-statistics \
rubygem-thor>=0.19:devel/rubygem-thor \
rubygem-unicode_plot>=0.0.4<1.0.0:textproc/rubygem-unicode_plot

USES= gem
USE_RUBY= yes


+ 3
- 3
benchmarks/rubygem-derailed_benchmarks/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1564248323
SHA256 (rubygem/derailed_benchmarks-1.3.6.gem) = 319850ba0df81bd4e2919a4e64f72619c4c8903c30f27a9911b1b7deccaf5967
SIZE (rubygem/derailed_benchmarks-1.3.6.gem) = 100864
TIMESTAMP = 1587531991
SHA256 (rubygem/derailed_benchmarks-1.7.0.gem) = f94a63c53287926ae4450532c52c35162e992cb687dbb16cf6dc78d9f6df990e
SIZE (rubygem/derailed_benchmarks-1.7.0.gem) = 112640

+ 10
- 0
biology/ugene/files/patch-src_corelibs_U2Designer_src_WorkflowGUIUtils.cpp View File

@@ -0,0 +1,10 @@
--- src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp.orig 2020-05-18 19:09:47 UTC
+++ src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
@@ -24,6 +24,7 @@
#include <U2Lang/Descriptor.h>
#include <QPainter>
+#include <QPainterPath>
#include <QPalette>
#include <QTextDocument>
#include <QAbstractTextDocumentLayout>

+ 10
- 0
biology/ugene/files/patch-src_corelibs_U2Gui_src_util_GUIUtils.cpp View File

@@ -0,0 +1,10 @@
--- src/corelibs/U2Gui/src/util/GUIUtils.cpp.orig 2020-05-18 18:51:22 UTC
+++ src/corelibs/U2Gui/src/util/GUIUtils.cpp
@@ -25,6 +25,7 @@
#include <QFile>
#include <QMessageBox>
#include <QPainter>
+#include <QPainterPath>
#include <QProcess>
#include <QUrl>

+ 10
- 0
biology/ugene/files/patch-src_corelibs_U2View_src_ov__sequence_Overview.cpp View File

@@ -0,0 +1,10 @@
--- src/corelibs/U2View/src/ov_sequence/Overview.cpp.orig 2020-05-18 18:59:02 UTC
+++ src/corelibs/U2View/src/ov_sequence/Overview.cpp
@@ -38,6 +38,7 @@
#include <QVBoxLayout>
#include <QToolTip>
+#include <QPainterPath>
namespace U2 {

+ 10
- 0
biology/ugene/files/patch-src_corelibs_U2View_src_ov__sequence_view__rendering_SequenceViewAnnotatedRenderer.cpp View File

@@ -0,0 +1,10 @@
--- src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp.orig 2020-05-18 19:03:19 UTC
+++ src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
@@ -31,6 +31,7 @@
#include <U2View/ADVSequenceObjectContext.h>
#include <U2View/SequenceObjectContext.h>
+#include <QPainterPath>
namespace U2 {

+ 3
- 4
cad/PrusaSlicer/Makefile View File

@@ -5,8 +5,6 @@ DISTVERSIONPREFIX= version_
DISTVERSION= 2.2.0
PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES=https://github.com/CGAL/cgal/archive/releases/:cgal
DISTFILES=CGAL-5.0.2.tar.gz:cgal

MAINTAINER= teodorsigaev@gmail.com
COMMENT= Slicing application for 3D printers
@@ -43,15 +41,16 @@ CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.1-config \
CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME}

USE_GITHUB= yes
USE_GL= gl glu glew
GH_ACCOUNT= prusa3d
GH_TUPLE= CGAL:cgal:releases/CGAL-5.0.2:cgal
USE_GL= gl glu glew

post-patch:
${REINPLACE_CMD} -e 's,%%WRKSRC%%,${WRKSRC},' \
${WRKSRC}/CMakeLists.txt

pre-configure:
cd ${WRKDIR}/cgal-releases-CGAL-5.0.2 && \
cd ${WRKSRC_cgal} && \
${CMAKE_BIN} -E remove CGALConfig-installation-dirs.cmake && \
${MKDIR} build && cd build && \
${CMAKE_BIN} -DCMAKE_INSTALL_PREFIX=${WRKSRC}/CGAL \


+ 2
- 2
cad/PrusaSlicer/distinfo View File

@@ -1,5 +1,5 @@
TIMESTAMP = 1585766317
SHA256 (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0
SIZE (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = 30811929
SHA256 (CGAL-5.0.2.tar.gz) = 7d824efce318fe901fd9d6f233a1f27e2d956d787602621df035a759b587c40c
SIZE (CGAL-5.0.2.tar.gz) = 146441795
SHA256 (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 7d824efce318fe901fd9d6f233a1f27e2d956d787602621df035a759b587c40c
SIZE (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 146441795

+ 10
- 0
cad/librecad/files/patch-librecad_src_lib_engine_lc__splinepoints.cpp View File

@@ -0,0 +1,10 @@
--- librecad/src/lib/engine/lc_splinepoints.cpp.orig 2020-05-21 10:23:28 UTC
+++ librecad/src/lib/engine/lc_splinepoints.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
**********************************************************************/
#include <QPolygonF>
+#include <QPainterPath>
#include "lc_splinepoints.h"
#include "rs_circle.h"

+ 10
- 0
cad/librecad/files/patch-librecad_src_lib_gui_rs__painterqt.cpp View File

@@ -0,0 +1,10 @@
--- librecad/src/lib/gui/rs_painterqt.cpp.orig 2020-05-21 10:23:28 UTC
+++ librecad/src/lib/gui/rs_painterqt.cpp
@@ -25,6 +25,7 @@
**********************************************************************/
#include<cmath>
+#include<QPainterPath>
#include "rs_painterqt.h"
#include "rs_math.h"
#include "rs_debug.h"

+ 10
- 0
comms/cutecom/files/patch-ctrlcharacterspopup.cpp View File

@@ -0,0 +1,10 @@
--- ctrlcharacterspopup.cpp.orig 2020-05-19 17:54:37 UTC
+++ ctrlcharacterspopup.cpp
@@ -23,6 +23,7 @@
#include <QApplication>
#include <QKeyEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QPoint>
#include <QPushButton>
#include <QSignalMapper>

+ 10
- 0
comms/inspectrum/files/patch-traceplot.cpp View File

@@ -0,0 +1,10 @@
--- traceplot.cpp.orig 2020-05-21 09:59:50 UTC
+++ traceplot.cpp
@@ -20,6 +20,7 @@
#include <QPixmapCache>
#include <QTextStream>
#include <QtConcurrent>
+#include <QPainterPath>
#include "samplesource.h"
#include "traceplot.h"

+ 2
- 1
converters/p5-JSON-MaybeXS/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= JSON-MaybeXS
PORTVERSION= 1.004001
PORTVERSION= 1.004002
CATEGORIES= converters perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -16,6 +16,7 @@ LICENSE_COMB= dual
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-Cpanel-JSON-XS>=2.3310:converters/p5-Cpanel-JSON-XS
TEST_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS \
p5-Test-Needs>=0.002006:devel/p5-Test-Needs \
p5-Test-Without-Module>=0.17:devel/p5-Test-Without-Module

USES= perl5


+ 3
- 3
converters/p5-JSON-MaybeXS/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1588450798
SHA256 (JSON-MaybeXS-1.004001.tar.gz) = ca3ac5021ec95b3c2105960238cc2ed136e6572fe746a48f57c2e33d287a0c9a
SIZE (JSON-MaybeXS-1.004001.tar.gz) = 22485
TIMESTAMP = 1589908768
SHA256 (JSON-MaybeXS-1.004002.tar.gz) = 3b8e2fdc3b36d0c5edbc78121840dced63798ad49cabcf875d5c5e32336d77b5
SIZE (JSON-MaybeXS-1.004002.tar.gz) = 22555

+ 1
- 1
databases/erlfdb/Makefile View File

@@ -2,7 +2,7 @@

PORTNAME= erlfdb
DISTVERSIONPREFIX= v
DISTVERSION= 1.1.0
DISTVERSION= 1.2.1
CATEGORIES= databases

MAINTAINER= dch@FreeBSD.org


+ 3
- 3
databases/erlfdb/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1588426054
SHA256 (apache-couchdb-erlfdb-v1.1.0_GH0.tar.gz) = b62909b46a5c95b30cc0f117e34db07c25ccc7c61ec12781f7ac888ad949eaca
SIZE (apache-couchdb-erlfdb-v1.1.0_GH0.tar.gz) = 69908
TIMESTAMP = 1589961559
SHA256 (apache-couchdb-erlfdb-v1.2.1_GH0.tar.gz) = 27f51a0b2deec83244de6e771c66fd501bbbf1b2a108a9227f73037e0da762e0
SIZE (apache-couchdb-erlfdb-v1.2.1_GH0.tar.gz) = 69973

+ 10
- 0
databases/opendbviewer/files/patch-src_Widget_QDropAreaWidget.cpp View File

@@ -0,0 +1,10 @@
--- src/Widget/QDropAreaWidget.cpp.orig 2020-05-21 08:16:02 UTC
+++ src/Widget/QDropAreaWidget.cpp
@@ -6,6 +6,7 @@
*/
#include <QPainter>
+#include <QPainterPath>
#include "QDropAreaWidget.h"

+ 1
- 1
databases/pspg/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pspg
DISTVERSION= 3.0.7
DISTVERSION= 3.1.1
CATEGORIES= databases

MAINTAINER= dmgk@FreeBSD.org


+ 3
- 3
databases/pspg/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1587744115
SHA256 (okbob-pspg-3.0.7_GH0.tar.gz) = 10d82c4b0112e51d397ea8f70c973c6d085aa964381ecc950a1cd8a7b4af72da
SIZE (okbob-pspg-3.0.7_GH0.tar.gz) = 1366450
TIMESTAMP = 1590014055
SHA256 (okbob-pspg-3.1.1_GH0.tar.gz) = 891d4dcfe4e911c9666d76781f5c55b33d47e9398a44a24eaac6b03b4e6ebb05
SIZE (okbob-pspg-3.1.1_GH0.tar.gz) = 1368703

+ 1
- 1
databases/py-tiledb/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= tiledb
PORTVERSION= 0.6.0
PORTVERSION= 0.6.1
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}


+ 3
- 3
databases/py-tiledb/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1588695579
SHA256 (tiledb-0.6.0.tar.gz) = 192acf322f3117e308f7f7220ba7bcbd2af901385872041e70784aa0b9d6062e
SIZE (tiledb-0.6.0.tar.gz) = 1000601
TIMESTAMP = 1589997734
SHA256 (tiledb-0.6.1.tar.gz) = 36b3411bbe540c312aa3290ccae6a8d7b62142622d0c2c4658ae7836e81e7b58
SIZE (tiledb-0.6.1.tar.gz) = 991341

+ 1
- 1
databases/rubygem-activemodel52/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= activemodel
PORTVERSION= 5.2.4.2
PORTVERSION= 5.2.4.3
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 52


+ 3
- 3
databases/rubygem-activemodel52/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1585157262
SHA256 (rubygem/activemodel-5.2.4.2.gem) = b109119b3de473ebb24c4a85fcf9462ee052b83d647cd00c922ed609c06e8e49
SIZE (rubygem/activemodel-5.2.4.2.gem) = 56832
TIMESTAMP = 1589908834
SHA256 (rubygem/activemodel-5.2.4.3.gem) = 05618f058f01405e314baf7a8b7275d9837956053560cf2ffe6f05553a1b3e9c
SIZE (rubygem/activemodel-5.2.4.3.gem) = 56832

+ 1
- 1
databases/rubygem-activemodel60/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= activemodel
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3.1
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60


+ 3
- 3
databases/rubygem-activemodel60/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1585157998
SHA256 (rubygem/activemodel-6.0.2.2.gem) = 35559978a7641c85d47709c7c3b75fcc456b1ec882631ffeba82e8a4e12f99cd
SIZE (rubygem/activemodel-6.0.2.2.gem) = 58880
TIMESTAMP = 1589908856
SHA256 (rubygem/activemodel-6.0.3.1.gem) = db071802457c7281f7de3e261c7e2769d6ca94f01549b7af6ea0b77abfc4788a
SIZE (rubygem/activemodel-6.0.3.1.gem) = 58880

+ 2
- 3
databases/rubygem-activerecord-import/Makefile View File

@@ -1,15 +1,14 @@
# $FreeBSD$

PORTNAME= activerecord-import
PORTVERSION= 1.0.4
PORTVERSION= 1.0.5
CATEGORIES= databases rubygems
MASTER_SITES= RG

MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Bulk import many records into an ActiveRecord DB

LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE

RUN_DEPENDS= rubygem-activerecord4>=3.2:databases/rubygem-activerecord4


+ 3
- 3
databases/rubygem-activerecord-import/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1577523922
SHA256 (rubygem/activerecord-import-1.0.4.gem) = fd31ce677ebf2036dd5c6577ad228c9951eeba4e404438d0c4d34de52b5ac437
SIZE (rubygem/activerecord-import-1.0.4.gem) = 64512
TIMESTAMP = 1589997750
SHA256 (rubygem/activerecord-import-1.0.5.gem) = 414e8a3dc8171a810658a775abd7b86db0cc61f1f40b739510e2043e61ed142f
SIZE (rubygem/activerecord-import-1.0.5.gem) = 64512

+ 1
- 1
databases/rubygem-activerecord52/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= activerecord
PORTVERSION= 5.2.4.2
PORTVERSION= 5.2.4.3
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 52


+ 3
- 3
databases/rubygem-activerecord52/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1585157415
SHA256 (rubygem/activerecord-5.2.4.2.gem) = e5d6db49d48018bf54133f6155a635e4de69f73dbbef6cb8cc79223604cc58f9
SIZE (rubygem/activerecord-5.2.4.2.gem) = 358400
TIMESTAMP = 1589908836
SHA256 (rubygem/activerecord-5.2.4.3.gem) = f887b6e85a4cffceb10f674d462e7fd54d02f80e2efe17cc508fd8fd350fc7e5
SIZE (rubygem/activerecord-5.2.4.3.gem) = 358400

+ 1
- 1
databases/rubygem-activerecord60/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= activerecord
PORTVERSION= 6.0.2.2
PORTVERSION= 6.0.3.1
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 60


+ 3
- 3
databases/rubygem-activerecord60/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1585158003
SHA256 (rubygem/activerecord-6.0.2.2.gem) = 4c6aae2cfa9d19ac9901c3b2514fb1c3ccd82b61839f2b52d6711edc00013c80
SIZE (rubygem/activerecord-6.0.2.2.gem) = 406528
TIMESTAMP = 1589908858
SHA256 (rubygem/activerecord-6.0.3.1.gem) = 88b95774d2058c50e73bce6e45edb3f5e9525208a09a0bd93872df0ad69d83e7
SIZE (rubygem/activerecord-6.0.3.1.gem) = 407552

+ 1
- 2
databases/tiledb/Makefile View File

@@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= tiledb
PORTVERSION= 2.0.0
PORTREVISION= 1
PORTVERSION= 2.0.2
CATEGORIES= databases

MAINTAINER= sunpoet@FreeBSD.org


+ 3
- 3
databases/tiledb/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1588695569
SHA256 (TileDB-Inc-TileDB-2.0.0_GH0.tar.gz) = dd49a334b2ba3554d41ec0bb85617bf86246c8d702887e9a41c57a10c1418755
SIZE (TileDB-Inc-TileDB-2.0.0_GH0.tar.gz) = 17634614
TIMESTAMP = 1589997732
SHA256 (TileDB-Inc-TileDB-2.0.2_GH0.tar.gz) = 268350106368dd7231e39eddd8fb2ff9bf60549584ce410d2c36327bdcaf48ba
SIZE (TileDB-Inc-TileDB-2.0.2_GH0.tar.gz) = 17642192

+ 10
- 0
deskutils/flameshot/files/patch-src_third-party_Qt-Color-Widgets_src_color__wheel.cpp View File

@@ -0,0 +1,10 @@
--- src/third-party/Qt-Color-Widgets/src/color_wheel.cpp.orig 2020-05-20 03:49:16 UTC
+++ src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
@@ -24,6 +24,7 @@
#include <cmath>
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QLineF>
#include <QDragEnterEvent>
#include <QMimeData>

+ 10
- 0
deskutils/flameshot/files/patch-src_tools_arrow_arrowtool.h View File

@@ -0,0 +1,10 @@
--- src/tools/arrow/arrowtool.h.orig 2020-05-20 03:53:57 UTC
+++ src/tools/arrow/arrowtool.h
@@ -19,6 +19,7 @@
#include "src/tools/abstracttwopointtool.h"
#include <QPainter>
+#include <QPainterPath>
class ArrowTool : public AbstractTwoPointTool {
Q_OBJECT

+ 10
- 0
deskutils/nextcloudclient/files/patch-src_libsync_networkjobs.cpp View File

@@ -0,0 +1,10 @@
--- src/libsync/networkjobs.cpp.orig 2020-05-21 07:13:57 UTC
+++ src/libsync/networkjobs.cpp
@@ -31,6 +31,7 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QPainter>
+#include <QPainterPath>
#include "networkjobs.h"
#include "account.h"

+ 3
- 1
devel/Makefile View File

@@ -4097,6 +4097,7 @@
SUBDIR += py-azure-functions-devops-build
SUBDIR += py-azure-graphrbac
SUBDIR += py-azure-keyvault
SUBDIR += py-azure-loganalytics
SUBDIR += py-azure-mgmt-advisor
SUBDIR += py-azure-mgmt-apimanagement
SUBDIR += py-azure-mgmt-appconfiguration
@@ -4565,8 +4566,8 @@
SUBDIR += py-jupyter_console
SUBDIR += py-jupyter_core
SUBDIR += py-jupyterlab
SUBDIR += py-jupyterlab-server
SUBDIR += py-jupyterlab_launcher
SUBDIR += py-jupyterlab_server
SUBDIR += py-kaitaistruct
SUBDIR += py-kaptan
SUBDIR += py-kayako
@@ -6172,6 +6173,7 @@
SUBDIR += rubygem-micromachine
SUBDIR += rubygem-micromachine2
SUBDIR += rubygem-middleware
SUBDIR += rubygem-mini_histogram
SUBDIR += rubygem-mini_portile2
SUBDIR += rubygem-minitest
SUBDIR += rubygem-mixlib-archive


+ 3
- 3
devel/R-cran-tidyr/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= tidyr
PORTVERSION= 1.0.3
PORTVERSION= 1.1.0
CATEGORIES= devel
DISTNAME= ${PORTNAME}_${PORTVERSION}

@@ -20,8 +20,8 @@ CRAN_DEPENDS= R-cran-dplyr>=0.8.2:math/R-cran-dplyr \
R-cran-rlang>0:devel/R-cran-rlang \
R-cran-stringi>0:textproc/R-cran-stringi \
R-cran-tibble>=2.1.1:devel/R-cran-tibble \
R-cran-tidyselect>=0.2.5:devel/R-cran-tidyselect \
R-cran-vctrs>=0.2.0:devel/R-cran-vctrs \
R-cran-tidyselect>=1.1.0:devel/R-cran-tidyselect \
R-cran-vctrs>=0.3.0:devel/R-cran-vctrs \
R-cran-lifecycle>0:devel/R-cran-lifecycle
BUILD_DEPENDS= ${CRAN_DEPENDS}
RUN_DEPENDS= ${CRAN_DEPENDS}


+ 3
- 3
devel/R-cran-tidyr/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1588924093
SHA256 (tidyr_1.0.3.tar.gz) = 54b97d3236b3975f244f85a9878222f6ecf613a900a1d48a94e5ba688799d7a3
SIZE (tidyr_1.0.3.tar.gz) = 812231
TIMESTAMP = 1590056686
SHA256 (tidyr_1.1.0.tar.gz) = 002c8609580beb07e8795829b8ca12df6e13d485317b40c9eeaa8c35552b126f
SIZE (tidyr_1.1.0.tar.gz) = 836985

+ 20
- 2
devel/arcanist-lib/Makefile View File

@@ -2,6 +2,7 @@

PORTNAME?= arcanist
PORTVERSION?= 20200514
PORTREVISION?= 1
CATEGORIES?= devel
PKGNAMESUFFIX= ${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}

@@ -15,7 +16,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE

PHP_DESTDIR= lib/php/arcanist
USES= php:flavors python:env shebangfix
SHEBANG_FILES= support/arcanoid/arcanoid.py
SHEBANG_FILES= bin/arc \
bin/phage \
scripts/*.php \
scripts/hgdaemon/*.php \
src/parser/*.php \
support/arcanoid/arcanoid.py \
support/lib/*.php \
support/unit/*.php \
support/xhpast/*.php \
support/xhpast/bin/*.php

USE_PHP= curl dom hash json simplexml zlib
USE_GITHUB= yes
NO_BUILD= yes
@@ -61,10 +72,17 @@ do-install:
s|%%PKGVERSION%%|${PKGVERSION}|g; \
s|%%PKGORIGIN%%|${PKGORIGIN}|g' \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/toolset/workflow/ArcanistVersionWorkflow.php
@${REINPLACE_CMD} \
's|%%PHP_CMD%%|${PREFIX}/bin/php|g' \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/lint/linter/ArcanistPhpLinter.php \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/moduleutils/PhutilLibraryMapBuilder.php \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/phage/bootloader/PhagePHPAgentBootloader.php \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/runtime/ArcanistRuntime.php \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/utils/PhutilExecutionEnvironment.php \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistLiberateWorkflow.php
@${REINPLACE_CMD} \
's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \
${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistAnoidWorkflow.php
${RM} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/toolset/workflow/*.orig
${RLN} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh \
${STAGEDIR}${PREFIX}/share/bash-completion/completions/arc
.endif


+ 11
- 0
devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php View File

@@ -0,0 +1,11 @@
--- src/lint/linter/ArcanistPhpLinter.php.orig 2020-05-19 10:39:38 UTC
+++ src/lint/linter/ArcanistPhpLinter.php
@@ -44,7 +44,7 @@ final class ArcanistPhpLinter extends ArcanistExternal
}
public function getDefaultBinary() {
- return 'php';
+ return '%%PHP_CMD%%';
}
public function getVersion() {

+ 11
- 0
devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php View File

@@ -0,0 +1,11 @@
--- src/moduleutils/PhutilLibraryMapBuilder.php.orig 2020-05-19 10:41:00 UTC
+++ src/moduleutils/PhutilLibraryMapBuilder.php
@@ -268,7 +268,7 @@ final class PhutilLibraryMapBuilder extends Phobject {
$absolute_file = $this->getPath($file);
$bin = dirname(__FILE__).'/../../support/lib/extract-symbols.php';
- return new ExecFuture('php -f %R -- --ugly %R', $bin, $absolute_file);
+ return new ExecFuture('%%PHP_CMD%% -f %R -- --ugly %R', $bin, $absolute_file);
}

+ 11
- 0
devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php View File

@@ -0,0 +1,11 @@
--- src/phage/bootloader/PhagePHPAgentBootloader.php.orig 2020-05-19 10:37:09 UTC
+++ src/phage/bootloader/PhagePHPAgentBootloader.php
@@ -27,7 +27,7 @@ final class PhagePHPAgentBootloader extends PhageAgent
// reads and evaluates the main agent program.
return csprintf(
- 'php -r %s',
+ '%%PHP_CMD%% -r %s',
"eval(fread(\$I=fopen('php://stdin', 'r'), {$len})); /* phage! */");
}

+ 11
- 0
devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php View File

@@ -0,0 +1,11 @@
--- src/runtime/ArcanistRuntime.php.orig 2020-05-19 10:39:08 UTC
+++ src/runtime/ArcanistRuntime.php
@@ -206,7 +206,7 @@ final class ArcanistRuntime {
$bin = $arcanist_root.'/scripts/arcanist.php';
$err = phutil_passthru(
- 'php -f %R -- %Ls',
+ '%%PHP_CMD%% -f %R -- %Ls',
$bin,
array_slice($argv, 1));

+ 11
- 0
devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php View File

@@ -0,0 +1,11 @@
--- src/utils/PhutilExecutionEnvironment.php.orig 2020-05-19 10:38:43 UTC
+++ src/utils/PhutilExecutionEnvironment.php
@@ -36,7 +36,7 @@ final class PhutilExecutionEnvironment extends Phobjec
}
list($env) = execx(
- 'php -d variables_order=E -r %s',
+ '%%PHP_CMD%% -d variables_order=E -r %s',
'echo json_encode($_ENV);');
$env = phutil_json_decode($env);

+ 16
- 0
devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php View File

@@ -0,0 +1,16 @@
--- src/workflow/ArcanistAnoidWorkflow.php.orig 2020-05-14 23:31:28 UTC
+++ src/workflow/ArcanistAnoidWorkflow.php
@@ -24,11 +24,10 @@ EOTEXT
}
public function runWorkflow() {
- if (!Filesystem::binaryExists('python3')) {
+ if (!Filesystem::binaryExists('%%PYTHON_CMD%%')) {
throw new PhutilArgumentUsageException(
pht(
- 'The "arc anoid" workflow requires "python3" to be available '.
- 'in your $PATH.'));
+ 'The "arc anoid" workflow requires "%%PYTHON_CMD%%" to be available.'));
}
$support_dir = phutil_get_library_root('arcanist');

+ 11
- 0
devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php View File

@@ -0,0 +1,11 @@
--- src/workflow/ArcanistLiberateWorkflow.php.orig 2020-05-19 10:37:58 UTC
+++ src/workflow/ArcanistLiberateWorkflow.php
@@ -148,7 +148,7 @@ EOTEXT
}
return phutil_passthru(
- 'php -f %R -- %Ls %R',
+ '%%PHP_CMD%% -f %R -- %Ls %R',
$bin,
$argv,
$path);

+ 15
- 0
devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh View File

@@ -0,0 +1,15 @@
--- support/shell/hooks/bash-completion.sh.orig 2020-05-14 22:49:28 UTC
+++ support/shell/hooks/bash-completion.sh
@@ -1,9 +1,10 @@
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
-GENERATED_RULES_FILE="${SCRIPTDIR}/../rules/bash-rules.sh"
+GENERATED_RULES_FILE="%%PREFIX%%/%%PHP_DESTDIR%%/support/shell/rules/bash-rules.sh"
# Try to generate the shell completion rules if they do not yet exist.
if [ ! -f "${GENERATED_RULES_FILE}" ]; then
- arc shell-complete --generate >/dev/null 2>/dev/null
+ %%PREFIX%%/%%PHP_DESTDIR%%/bin/arc \
+ shell-complete --generate >/dev/null 2>/dev/null
fi;
# Source the shell completion rules.

+ 1
- 1
devel/electron6/Makefile View File

@@ -162,7 +162,7 @@ PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
POST_BUILD_TARGETS= licenses version
POST_BUILD_DIST_TARGETS= electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip

YARN_TIMESTAMP= 1588897710
YARN_TIMESTAMP= 1589883499

PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \
ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}


+ 1
- 1
devel/electron6/Makefile.version View File

@@ -1,4 +1,4 @@
# $FreeBSD$

ELECTRON_VER= 6.1.11
ELECTRON_VER= 6.1.12
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

+ 5
- 5
devel/electron6/distinfo View File

@@ -1,4 +1,4 @@
TIMESTAMP = 1588898584
TIMESTAMP = 1589884179
SHA256 (electron/chromium-76.0.3809.146.tar.xz) = 1538c7118fb94c1ba6b6da18f4b8f6a6d303dee855ee0e5c3f9025f17563f3cd
SIZE (electron/chromium-76.0.3809.146.tar.xz) = 1355929024
SHA256 (electron/chromium-76.0.3809.132.tar.xz) = d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241
@@ -7,9 +7,9 @@ SHA256 (electron/2dd750e768cec597fc018509009637819ae4549c) = d63b5953e3e8a0d6b7e
SIZE (electron/2dd750e768cec597fc018509009637819ae4549c) = 4182260
SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be
SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927
SHA256 (electron/electron-yarn-cache-6.1.11.tar.xz) = f8a94f772d01ba392fc57b15798422667da0b14fb874b55177072113b3c51c00
SIZE (electron/electron-yarn-cache-6.1.11.tar.xz) = 36873916
SHA256 (electron/electron-electron-v6.1.11_GH0.tar.gz) = 76cc6e8ab856f00aea936c01daf10ee8ef7fff4a50a0ac3a3b76cc37059bb154
SIZE (electron/electron-electron-v6.1.11_GH0.tar.gz) = 4197043
SHA256 (electron/electron-yarn-cache-6.1.12.tar.xz) = aa696f113e4f6a1a58621f9cc82d3980c4bc0cc7fefce5c4ea4157afea538bc4
SIZE (electron/electron-yarn-cache-6.1.12.tar.xz) = 36875692
SHA256 (electron/electron-electron-v6.1.12_GH0.tar.gz) = decf86dfc2e53f17d87b80f0922b5ce10cbd46a33fe1633743adbf65b10edf3a
SIZE (electron/electron-electron-v6.1.12_GH0.tar.gz) = 4209015
SHA256 (electron/nodejs-node-v12.4.0_GH0.tar.gz) = fc7df2a5cdb43b7a186f07a04e6b0f5c5c3b4c117f08185ffec3345613c71d94
SIZE (electron/nodejs-node-v12.4.0_GH0.tar.gz) = 70296027

+ 1
- 1
devel/electron6/files/package.json View File

@@ -1,6 +1,6 @@
{
"name": "electron",
"version": "6.1.11",
"version": "6.1.12",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {


+ 1
- 1
devel/etcd34/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= etcd
PORTVERSION= 3.4.7
PORTVERSION= 3.4.8
DISTVERSIONPREFIX= v
CATEGORIES= devel
PKGNAMEPREFIX= coreos-


+ 3
- 3
devel/etcd34/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1587219806
SHA256 (coreos-etcd-v3.4.7_GH0.tar.gz) = 858f5ad8c830a66f6bd0cd19386deea64d374185b32f40650ba979e0a70b8b97
SIZE (coreos-etcd-v3.4.7_GH0.tar.gz) = 8943976
TIMESTAMP = 1589872957
SHA256 (coreos-etcd-v3.4.8_GH0.tar.gz) = 457d01d7ce845e1068614d4c734dd189170ea5976949edbc0cf7ed30b3669fdb
SIZE (coreos-etcd-v3.4.8_GH0.tar.gz) = 8952759

+ 1
- 1
devel/git-lfs/Makefile View File

@@ -2,7 +2,7 @@

PORTNAME= git-lfs
DISTVERSIONPREFIX= v
DISTVERSION= 2.10.0
DISTVERSION= 2.11.0
CATEGORIES= devel

MAINTAINER= egypcio@FreeBSD.org


+ 3
- 3
devel/git-lfs/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1580814797
SHA256 (git-lfs-git-lfs-v2.10.0_GH0.tar.gz) = 07fd5c57a1039d5717dc192affbe3268ec2fd03accdca462cb504c0b4194cd23
SIZE (git-lfs-git-lfs-v2.10.0_GH0.tar.gz) = 2771571
TIMESTAMP = 1589872121
SHA256 (git-lfs-git-lfs-v2.11.0_GH0.tar.gz) = 8183c4cbef8cf9c2e86b0c0a9822451e2df272f89ceb357c498bfdf0ff1b36c7
SIZE (git-lfs-git-lfs-v2.11.0_GH0.tar.gz) = 2839623

+ 1
- 0
devel/git-lfs/pkg-plist View File

@@ -16,6 +16,7 @@ bin/git-lfs
%%MANPAGES%%man/man1/git-lfs-migrate.1.gz
%%MANPAGES%%man/man1/git-lfs-pointer.1.gz
%%MANPAGES%%man/man1/git-lfs-post-checkout.1.gz
%%MANPAGES%%man/man1/git-lfs-post-commit.1.gz
%%MANPAGES%%man/man1/git-lfs-post-merge.1.gz
%%MANPAGES%%man/man1/git-lfs-pre-push.1.gz
%%MANPAGES%%man/man1/git-lfs-prune.1.gz


+ 12
- 10
devel/gitaly/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= gitaly
DISTVERSION= 12.9.5
DISTVERSION= 12.10.6
PORTREVISION= 0
CATEGORIES= devel

@@ -12,23 +12,24 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE

# define dependencies that are required for build and run under MY_DEPENDS
MY_DEPENDS= git>=2.24.3:devel/git \
MY_DEPENDS= git>=2.26:devel/git \
rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \
rubygem-rugged>=0.28:devel/rubygem-rugged \
rubygem-github-linguist>=7.5<8.0:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport60>=6.0.2.2<6.0.2.3:devel/rubygem-activesupport60 \
rubygem-activesupport60>=6.0.3.1<6.0.3.2:devel/rubygem-activesupport60 \
rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.8<4.2.8.0:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
rubygem-grpc124>=1.24.0<1.25.0:net/rubygem-grpc124 \
rubygem-grpc124>=1.24.0:net/rubygem-grpc124 \
rubygem-sentry-raven29>=2.9.0<2.10.0:devel/rubygem-sentry-raven29 \
rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
rubygem-rbtrace>0:devel/rubygem-rbtrace \
rubygem-gitlab-labkit>=0.11.0<0.11.1:devel/rubygem-gitlab-labkit \
rubygem-gitlab-labkit>=0.12.0<0.12.1:devel/rubygem-gitlab-labkit \
rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38
BUILD_DEPENDS= gem:devel/ruby-gems \
bash>0:shells/bash \
${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS} \
gitlab-shell>=9.3.0:devel/gitlab-shell
@@ -41,12 +42,12 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
GL_COMMIT= 982f91e3c6f073c7c043cded0e29cd42e9a6b951
GL_COMMIT= de65813a201020830bc6da809e5349caf1dac33e

# for go dependencies
USE_GITHUB= nodefault
# generated with: make gomod-vendor
# 52dd
# 53dd
GH_TUPLE= \
BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
@@ -70,7 +71,7 @@ GH_TUPLE= \
google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \
google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \
google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
googleapis:gax-go:v2.0.5:googleapis_gax_go/vendor/github.com/googleapis/gax-go/v2 \
googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
googleapis:google-cloud-go:v0.50.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
@@ -79,9 +80,10 @@ GH_TUPLE= \
kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \
konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
libgit2:git2go:ecaeb7a21d47:libgit2_git2go/vendor/github.com/libgit2/git2go \
lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
olekukonko:tablewriter:v0.0.2:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
@@ -98,7 +100,7 @@ GH_TUPLE= \
uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib

GL_TUPLE= gitlab-org:labkit:9cb7801f7feafecc53f5a061ffeae5c11567da9b:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
GL_TUPLE= gitlab-org:labkit:fac94cb428e67efc019e7ba67429b53fa9b394c5:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit

post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example


+ 9
- 7
devel/gitaly/distinfo View File

@@ -1,4 +1,4 @@
TIMESTAMP = 1588326767
TIMESTAMP = 1589649477
SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -61,12 +61,14 @@ SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d
SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
SHA256 (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 2a7cd9579aad7f046795f26c17a92d79f6caded6a512cc37d366a6ae7e28b396
SIZE (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 72760
SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14
SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986
SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
SHA256 (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 07e3c6c6f36f6d6e5fc0aa5490f756a9d987e2f3ed20c74e1ec3805c027fd71d
SIZE (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 18831
SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df
SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067
SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
@@ -97,7 +99,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
SHA256 (gitlab-org-gitaly-982f91e3c6f073c7c043cded0e29cd42e9a6b951_GL0.tar.gz) = 04dc67e7bc74bd43385a67fff05c98c073c2936cc967755f503d3b9736530b78
SIZE (gitlab-org-gitaly-982f91e3c6f073c7c043cded0e29cd42e9a6b951_GL0.tar.gz) = 2909758
SHA256 (gitlab-org-labkit-9cb7801f7feafecc53f5a061ffeae5c11567da9b_GL0.tar.gz) = 03473dec168ecb298a1733fc8b5016f1e09f47214b5080dc4986dda73227788b
SIZE (gitlab-org-labkit-9cb7801f7feafecc53f5a061ffeae5c11567da9b_GL0.tar.gz) = 3619617
SHA256 (gitlab-org-gitaly-de65813a201020830bc6da809e5349caf1dac33e_GL0.tar.gz) = f20511fbaced6c2573b266bfe5c2929c7704bee774d5b92bc422d92b2c58c152
SIZE (gitlab-org-gitaly-de65813a201020830bc6da809e5349caf1dac33e_GL0.tar.gz) = 2958790
SHA256 (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 496439133ff65307b8ce231f1c2d1ed27359acfdea5b2826be6799590a65d2f7
SIZE (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 3619731

+ 2
- 2
devel/gitaly/files/patch-__support_Makefile.template View File

@@ -1,6 +1,6 @@
--- _support/Makefile.template.orig 2020-03-26 12:14:05 UTC
--- _support/Makefile.template.orig 2020-04-20 15:09:52 UTC
+++ _support/Makefile.template
@@ -56,8 +56,8 @@ build: ../.ruby-bundle
@@ -33,8 +33,8 @@ build: ../.ruby-bundle
# step. Both Omnibus and CNG assume it is in the Gitaly root, not in
# _build. Hence the '../' in front.
../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile


+ 2
- 2
devel/gitaly/files/patch-__support_makegen.go View File

@@ -1,6 +1,6 @@
--- _support/makegen.go.orig 2020-03-27 21:35:27 UTC
--- _support/makegen.go.orig 2020-04-20 15:09:52 UTC
+++ _support/makegen.go
@@ -339,7 +339,7 @@ func (gm *gitalyMake) BundleFlags() string {
@@ -318,7 +318,7 @@ func (gm *gitalyMake) BundleFlags() string {
return "--no-deployment"
}


+ 12
- 8
devel/gitaly/files/patch-ruby_Gemfile View File

@@ -1,30 +1,34 @@
--- ruby/Gemfile.orig 2020-03-26 12:14:05 UTC
--- ruby/Gemfile.orig 2020-04-30 14:14:13 UTC
+++ ruby/Gemfile
@@ -3,10 +3,10 @@
@@ -3,38 +3,24 @@ source 'https://rubygems.org'
# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
gem 'bundler', '>= 1.17.3'
-gem 'rugged', '~> 0.28'
+gem 'rugged', '~> 1.0'
gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
-gem 'activesupport', '6.0.2'
+gem 'activesupport', '6.0.2.2'
+gem 'activesupport', '6.0.3.1'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
@@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12'
-gem 'grpc', '~> 1.27.0'
+gem 'grpc', '~> 1.24'
gem 'sentry-raven', '~> 2.9.0', require: false
gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false
# Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.9.1'
+gem 'gitlab-labkit', '~> 0.11.0'
+gem 'gitlab-labkit', '~> 0.12.0'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
@@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0'
gem 'licensee', '~> 8.9.0'
gem 'google-protobuf', '~> 3.8.0'
-gem 'google-protobuf', '~> 3.11.2'
+gem 'google-protobuf', '~> 3.8.0'
-group :development, :test do
- gem 'rubocop', '~> 0.69', require: false


+ 2
- 3
devel/gitaly/pkg-plist View File

@@ -59,12 +59,9 @@
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-none.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/broadcast_message-ok.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/notify-post-receive.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml
%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml
@@ -228,6 +225,7 @@
%%DATADIR%%/ruby/spec/support/helpers/gitlab_shell_helper.rb
%%DATADIR%%/ruby/spec/support/helpers/integration_helper.rb
%%DATADIR%%/ruby/spec/support/helpers/seed_repo.rb
%%DATADIR%%/ruby/spec/support/helpers/testdata/home/.gitconfig
%%DATADIR%%/ruby/spec/support/sentry.rb
%%DATADIR%%/ruby/spec/test_repo_helper.rb
@(,,755) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook
@@ -235,6 +233,7 @@
@(,,755) %%DATADIR%%/ruby/gitlab-shell/hooks/pre-receive
@(,,755) %%DATADIR%%/ruby/gitlab-shell/hooks/update
@(,,555) %%DATADIR%%/bin/gitaly
@(,,555) %%DATADIR%%/bin/gitaly-blackbox
@(,,555) %%DATADIR%%/bin/gitaly-debug
@(,,555) %%DATADIR%%/bin/gitaly-hooks
@(,,555) %%DATADIR%%/bin/gitaly-ssh


+ 3
- 3
devel/gitlab-shell/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= gitlab-shell
PORTVERSION= 12.0.0
PORTVERSION= 12.2.0
CATEGORIES= devel

MAINTAINER= mfechner@FreeBSD.org
@@ -19,7 +19,7 @@ ALL_TARGET= build
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags
GL_COMMIT= b920520599142435ce06ad155099544adc923618
GL_COMMIT= 3e73101ada44b2f65ea1eb14d243fe1daf074692

BUILD_DEPENDS= rubygem-bundler1=1.17.3:sysutils/rubygem-bundler1

@@ -70,7 +70,7 @@ post-patch:
# Build the go deps, use `pkg install modules2tuple`
gomod-deps: patch
(cd ${WRKSRC} && go mod vendor)
(cd ${WRKSRC} && modules2tuple -prefix vendor vendor/modules.txt)
(cd ${WRKSRC} && modules2tuple vendor/modules.txt)

pre-build:
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build)


+ 3
- 3
devel/gitlab-shell/distinfo View File

@@ -1,4 +1,4 @@
TIMESTAMP = 1585311063
TIMESTAMP = 1587535259
SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111
SHA256 (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 3ef6b86658bc370e027304e55a8685767f7fd8a94199f4bea08c9388bf84a1b0
@@ -49,8 +49,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
SHA256 (gitlab-org-gitlab-shell-b920520599142435ce06ad155099544adc923618_GL0.tar.gz) = 4c0755d1e7b7e72537f2cfc2d41c0612a1535b4eab74265d8d0764845844f442
SIZE (gitlab-org-gitlab-shell-b920520599142435ce06ad155099544adc923618_GL0.tar.gz) = 59969
SHA256 (gitlab-org-gitlab-shell-3e73101ada44b2f65ea1eb14d243fe1daf074692_GL0.tar.gz) = 05b37dc478b228cd950366424e3032dd2de274b10786fed03c7a42e15a5ebdc1
SIZE (gitlab-org-gitlab-shell-3e73101ada44b2f65ea1eb14d243fe1daf074692_GL0.tar.gz) = 64815
SHA256 (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 717aaa0210924db6f537dbe06e6b373e687fb73ec11f1e0a9f6b12cf4dbc1ce1
SIZE (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 2773612
SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e


+ 1
- 0
devel/gitlab-shell/pkg-plist View File

@@ -24,6 +24,7 @@
%%DATADIR%%/spec/gitlab_shell_authorized_keys_check_spec.rb
%%DATADIR%%/spec/gitlab_shell_authorized_principals_check_spec.rb
%%DATADIR%%/spec/gitlab_shell_custom_git_receive_pack_spec.rb
%%DATADIR%%/spec/gitlab_shell_custom_git_upload_pack_spec.rb
%%DATADIR%%/spec/gitlab_shell_discover_spec.rb
%%DATADIR%%/spec/gitlab_shell_lfs_authentication_spec.rb
%%DATADIR%%/spec/gitlab_shell_two_factor_recovery_spec.rb


+ 1
- 0
devel/gmake/Makefile View File

@@ -3,6 +3,7 @@

PORTNAME= gmake
PORTVERSION= 4.3
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNU/make
DISTNAME= make-${PORTVERSION}


+ 32
- 0
devel/gmake/files/patch-10-4c1009ec View File

@@ -0,0 +1,32 @@
Backport of gnulib git commit 4c1009ec93e12ee34acd27f6d7e25442bedc16f2.

When the file found in a PATH element is a directory, continue searching.

--- lib/findprog-in.c.orig 2020-01-19 20:34:01 UTC
+++ lib/findprog-in.c
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
#include "filename.h"
#include "concat-filename.h"
@@ -190,6 +191,7 @@ find_in_given_path (const char *progname, const char *
dir = ".";
/* Try all platform-dependent suffixes. */
+ struct stat st;
for (i = 0; i < sizeof (suffixes) / sizeof (suffixes[0]); i++)
{
const char *suffix = suffixes[i];
@ -208,7 +210,8 @@ find_in_given_path (const char *progname, const char *
use it. On other systems, let's hope that this program
is not installed setuid or setgid, so that it is ok to
call access() despite its design flaw. */
- if (eaccess (progpathname, X_OK) == 0)
+ if (eaccess (progpathname, X_OK) == 0 &&
+ stat(progpathname, &st) == 0 && ! S_ISDIR(st.st_mode))
{
/* Found! */
if (strcmp (progpathname, progname) == 0)

+ 1
- 1
devel/gnu-efi/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= gnu-efi
PORTVERSION= 3.0.11
PORTVERSION= 3.0.12
CATEGORIES= devel
MASTER_SITES= SF/gnu-efi



+ 3
- 3
devel/gnu-efi/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1572373284
SHA256 (gnu-efi-3.0.11.tar.bz2) = f28da792a2532e91e18e0101468811739a22cde9eee5eacfd0efb9bf3a61d6b9
SIZE (gnu-efi-3.0.11.tar.bz2) = 154456
TIMESTAMP = 1589872532
SHA256 (gnu-efi-3.0.12.tar.bz2) = 0196f2e1fd3c334b66e610a608a0e59233474c7a01bec7bc53989639aa327669
SIZE (gnu-efi-3.0.12.tar.bz2) = 154575

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

Loading…
Cancel
Save