Browse Source

Merge remote-tracking branch 'freebsd/master'

* freebsd/master:
  emulators/dosbox: enable mouse locking with X.org newer than 1.20
  multimedia/libav: fix build on powerpc64 elfv2
  Update to 0.68.0
  sysutils/e2fsprogs: Add a note about _XOPEN_SOURCE patching vs SIGINFO
  - Add NO_ARCH - Update WWW
  graphics/dataplot: Update 20190426 -> 20200229
  - Update to 3.2.6
  textproc/re-flex: update to 1.6.5
  science/py-veusz: Add missing USE_PYQT elements; Remove the kde category
  science/py-veusz: Update 3.2 -> 3.2.1
  Update to the 20200322 snapshot of GCC 10.0.1.
  Update to 0.3.6
  Update to 1.43.1
master
HardenedBSD Sync Service 2 months ago
parent
commit
3edc48331f
24 changed files with 78 additions and 55 deletions
  1. +2
    -3
      editors/vscode/Makefile
  2. +7
    -7
      editors/vscode/distinfo
  3. +1
    -0
      editors/vscode/pkg-plist
  4. +1
    -0
      emulators/dosbox/Makefile
  5. +11
    -0
      emulators/dosbox/files/patch-src_gui_sdlmain.cpp
  6. +1
    -0
      games/flightgear-data/Makefile
  7. +1
    -1
      games/flightgear-data/pkg-descr
  8. +6
    -4
      graphics/dataplot/Makefile
  9. +3
    -5
      graphics/dataplot/distinfo
  10. +1
    -1
      lang/gcc10-devel/Makefile
  11. +3
    -3
      lang/gcc10-devel/distinfo
  12. +7
    -2
      multimedia/libav/Makefile
  13. +1
    -1
      net/py-aiohttp-socks/Makefile
  14. +3
    -3
      net/py-aiohttp-socks/distinfo
  15. +6
    -5
      science/py-veusz/Makefile
  16. +3
    -3
      science/py-veusz/distinfo
  17. +1
    -1
      science/py-veusz/pkg-descr
  18. +4
    -0
      sysutils/e2fsprogs/files/patch-e2fsck__unix.c
  19. +1
    -1
      textproc/re-flex/Makefile
  20. +3
    -3
      textproc/re-flex/distinfo
  21. +3
    -3
      www/gohugo/Makefile
  22. +5
    -5
      www/gohugo/distinfo
  23. +1
    -1
      www/py-asgiref/Makefile
  24. +3
    -3
      www/py-asgiref/distinfo

+ 2
- 3
editors/vscode/Makefile View File

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

PORTNAME= vscode
DISTVERSION= 1.43.0
PORTREVISION= 1
DISTVERSION= 1.43.1
CATEGORIES= editors
MASTER_SITES= https://nodejs.org/dist/v${NODE_VER}/:node_headers \
https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
@@ -62,7 +61,7 @@ USES= desktop-file-utils gl gmake gnome jpeg pkgconfig \
USE_GITHUB= yes
GH_ACCOUNT= microsoft

SOURCE_COMMIT_HASH= 78a4c91400152c0f27ba4d363eb56d2835f9903a
SOURCE_COMMIT_HASH= fe22a9645b44368865c0ba92e2fb881ff1afce94

BINARY_ALIAS= python=${PYTHON_CMD}


+ 7
- 7
editors/vscode/distinfo View File

@@ -1,9 +1,9 @@
TIMESTAMP = 1584069208
TIMESTAMP = 1584682973
SHA256 (vscode/node-v12.4.0-headers.tar.gz) = 3a5bbb6ad1a5f3ba912981c13910d7c617bb8fa6b6ae2026d6aee2edcd590a45
SIZE (vscode/node-v12.4.0-headers.tar.gz) = 549161
SHA256 (vscode/yarn-offline-cache-1.43.0.tar.gz) = 3f85edb1b8c8a88eba38b51a6e635f7f8c504e817b372fdc9996e5d301769e48
SIZE (vscode/yarn-offline-cache-1.43.0.tar.gz) = 122753954
SHA256 (vscode/vscode-marketplace-exts-1.43.0.tar.gz) = 95e1df6e71dcd8c6341fcc52832e88d12f39794bcd51e20a9692de5bd699966a
SIZE (vscode/vscode-marketplace-exts-1.43.0.tar.gz) = 2610437
SHA256 (vscode/microsoft-vscode-1.43.0_GH0.tar.gz) = c8a56f7f551054bbfd8b9b0ed3a741f112427764dfcaf33c82f4da3125c760fe
SIZE (vscode/microsoft-vscode-1.43.0_GH0.tar.gz) = 10169834
SHA256 (vscode/yarn-offline-cache-1.43.1.tar.gz) = 4115b89d149966f3112ac4d9ceb3cb5de2696619a9b8f46dece35ef0ba99ed4e
SIZE (vscode/yarn-offline-cache-1.43.1.tar.gz) = 123213771
SHA256 (vscode/vscode-marketplace-exts-1.43.1.tar.gz) = da339a8079fb4cd8d172d4d1b1bef5d2aa3542899c15c73485684cd8c03905bd
SIZE (vscode/vscode-marketplace-exts-1.43.1.tar.gz) = 2608580
SHA256 (vscode/microsoft-vscode-1.43.1_GH0.tar.gz) = da4e85d41cfda28bb9466f2015bf2199e6293a1d497b0516c216b996f7e4e31e
SIZE (vscode/microsoft-vscode-1.43.1_GH0.tar.gz) = 10174114

+ 1
- 0
editors/vscode/pkg-plist View File

@@ -1185,6 +1185,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/typescript-language-features/language-configuration.json
%%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/LICENSE.txt
%%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/README.md
%%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/images/inspect-tokens.png
%%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/lib/constants.d.ts
%%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/lib/constants.js
%%DATADIR%%/resources/app/extensions/typescript-language-features/node_modules/typescript-vscode-sh-plugin/lib/index.d.ts

+ 1
- 0
emulators/dosbox/Makefile View File

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

PORTNAME= dosbox
DISTVERSION= 0.74-3
PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}


+ 11
- 0
emulators/dosbox/files/patch-src_gui_sdlmain.cpp View File

@@ -0,0 +1,11 @@
--- src/gui/sdlmain.cpp.orig 2020-03-21 19:17:13 UTC
+++ src/gui/sdlmain.cpp
@@ -1433,7 +1433,7 @@ void GFX_LosingFocus(void) {
#define DB_POLLSKIP 1
#endif
-#if defined(LINUX)
+#if defined(LINUX) || defined(BSD)
#define SDL_XORG_FIX 1
#else
#define SDL_XORG_FIX 0

+ 1
- 0
games/flightgear-data/Makefile View File

@@ -17,6 +17,7 @@ BROKEN_mips64= Fails to install: runaway process
USES= tar:bzip2

NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/fgdata
DATADIR= ${PREFIX}/share/flightgear


+ 1
- 1
games/flightgear-data/pkg-descr View File

@@ -14,4 +14,4 @@ There are many exciting possibilities for an open, free flight sim.
We hope that this project will be interesting and useful to many
people in many areas.

WWW: http://www.flightgear.org/
WWW: https://www.flightgear.org/

+ 6
- 4
graphics/dataplot/Makefile View File

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

PORTNAME= dataplot
DISTVERSION= 20190426
DISTVERSION= 20200229
CATEGORIES= graphics

MAINTAINER= ports@FreeBSD.org
@@ -14,19 +14,21 @@ LIB_DEPENDS= libgd.so:graphics/gd \
libpng.so:graphics/png

USES= gmake gnome fortran jpeg readline xorg
USE_XORG= x11 xi
USE_GNOME= cairo

USE_GITHUB= yes
GH_ACCOUNT= usnistgov
GH_TAGNAME= 7236db0
GH_TAGNAME= 43df775f24e2d2eca94e250ec302d7a5876ea2b2

USE_XORG= x11 xi
USE_GNOME= cairo
WRKSRC_SUBDIR= src

MAXOBV?= 450000 # Change if you need more observations/variable

FFLAGS+= -DLINUX -fdefault-real-8 -fdefault-double-8 -std=legacy

PORTDATA= *

PLIST_FILES= bin/dataplot bin/xdataplot

OPTIONS_DEFINE= DOCS

+ 3
- 5
graphics/dataplot/distinfo View File

@@ -1,5 +1,3 @@
TIMESTAMP = 1564981897
SHA256 (dpsnapsh.pdf) = 0a42cf4d2d11b608bfad4d9fd0acf6fa17d39b401f9507e0a8341c8b02b3a0c5
SIZE (dpsnapsh.pdf) = 122886
SHA256 (usnistgov-dataplot-20190426-7236db0_GH0.tar.gz) = a09916feff921436e0362a9302dd8673a9e0f3db176e4fb1ab5396b77b14ca7f
SIZE (usnistgov-dataplot-20190426-7236db0_GH0.tar.gz) = 15253699
TIMESTAMP = 1585038375
SHA256 (usnistgov-dataplot-20200229-43df775f24e2d2eca94e250ec302d7a5876ea2b2_GH0.tar.gz) = 050437d94e94706e665ade582387de154f7ddd16293ff83e1ec518d97c63ae6c
SIZE (usnistgov-dataplot-20200229-43df775f24e2d2eca94e250ec302d7a5876ea2b2_GH0.tar.gz) = 21178437

+ 1
- 1
lang/gcc10-devel/Makefile View File

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

PORTNAME= gcc
PORTVERSION= 10.0.1.s20200315
PORTVERSION= 10.0.1.s20200322
CATEGORIES= lang
MASTER_SITES= GCC/snapshots/${DIST_VERSION}
PKGNAMESUFFIX= ${SUFFIX}-devel

+ 3
- 3
lang/gcc10-devel/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1584442103
SHA256 (gcc-10-20200315.tar.xz) = 23ba681c8ae6e92ea200b4491cac1a1f8d1d7e5d9e2c98a7e0ce9132a8c8fdb2
SIZE (gcc-10-20200315.tar.xz) = 70776052
TIMESTAMP = 1584917126
SHA256 (gcc-10-20200322.tar.xz) = 945b175238ffdace82bbce03bbd55f67919fc591a7747f51d8869a714abc437b
SIZE (gcc-10-20200322.tar.xz) = 71056356

+ 7
- 2
multimedia/libav/Makefile View File

@@ -20,8 +20,7 @@ LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \
libvdpau.so:multimedia/libvdpau \
libhogweed.so:security/nettle

USES= cpe compiler:c++11-lang gmake localbase perl5 pkgconfig tar:xz \
xorg
USES= cpe gmake localbase perl5 pkgconfig tar:xz xorg

USE_XORG= x11
USE_PERL5= build
@@ -187,6 +186,12 @@ CONFIGURE_ARGS+= --extra-cflags=-m32
LLD_UNSAFE= yes
.endif

.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
USE_GCC= yes
.else
USES+= compiler:c++11-lang
.endif

# License definitions

.if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL}

+ 1
- 1
net/py-aiohttp-socks/Makefile View File

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

PORTNAME= aiohttp-socks
PORTVERSION= 0.3.4
PORTVERSION= 0.3.6
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}


+ 3
- 3
net/py-aiohttp-socks/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1579534167
SHA256 (romis2012-aiohttp-socks-0.3.4_GH0.tar.gz) = 904412395b947aa03717f2a88fd14973b4aaef7a9b1e2d0d49495831caab8965
SIZE (romis2012-aiohttp-socks-0.3.4_GH0.tar.gz) = 1353790
TIMESTAMP = 1585032667
SHA256 (romis2012-aiohttp-socks-0.3.6_GH0.tar.gz) = ec90a409f016b36b71e79a32d24373aca2641177bfaf69c19c31e0ca29bbf66e
SIZE (romis2012-aiohttp-socks-0.3.6_GH0.tar.gz) = 1354019

+ 6
- 5
science/py-veusz/Makefile View File

@@ -3,8 +3,9 @@

PORTNAME= veusz
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 3.2
CATEGORIES= science kde
DISTVERSION= 3.2.1
PORTREVISION= 1
CATEGORIES= science
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

MAINTAINER= yuri@FreeBSD.org
@@ -13,16 +14,16 @@ COMMENT= Scientific plotting package
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

BUILD_DEPENDS= ${RUN_DEPENDS}
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY}

USES= compiler:c++11-lang python:3.5+ pyqt:5 qt:5 shebangfix
USE_GITHUB= yes
USE_PYQT= core gui svg
USE_PYQT= core gui printsupport svg widgets
USE_PYTHON= distutils concurrent autoplist
USE_QT= core gui xml widgets qmake_build
SHEBANG_FILES= examples/embedexample.py

MAKE_ENV= SIP_DIR=${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip
MAKE_ENV= SIP_DIR=${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip

.include <bsd.port.mk>

+ 3
- 3
science/py-veusz/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1583906697
SHA256 (veusz-veusz-veusz-3.2_GH0.tar.gz) = 3a1cb07b40f4414068c41894be0626a03caa0a6fdcefb96544ad31e1a2c4d6f7
SIZE (veusz-veusz-veusz-3.2_GH0.tar.gz) = 1712048
TIMESTAMP = 1585035752
SHA256 (veusz-veusz-veusz-3.2.1_GH0.tar.gz) = 8128e47bbaffff99298d5ab3ec3296c84ce1b5976dce319527acbbe6125e433e
SIZE (veusz-veusz-veusz-3.2.1_GH0.tar.gz) = 1712860

+ 1
- 1
science/py-veusz/pkg-descr View File

@@ -6,4 +6,4 @@ binaries are provided. Data can be read from text, CSV or FITS
files, and data can be manipulated or examined from within the
application.

WWW: http://home.gna.org/veusz/
WWW: https://veusz.github.io/

+ 4
- 0
sysutils/e2fsprogs/files/patch-e2fsck__unix.c View File

@@ -1,3 +1,7 @@
// SIGINFO is a Berkeley extension, so we need to
// remove the #define _XOPEN_SOURCE 600
// It would hide all non-POSIX declarations, including SIGINFO.

--- e2fsck/unix.c.orig 2020-03-21 04:24:04 UTC
+++ e2fsck/unix.c
@@ -9,8 +9,6 @@

+ 1
- 1
textproc/re-flex/Makefile View File

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

PORTNAME= re-flex
PORTVERSION= 1.6.4
PORTVERSION= 1.6.5
DISTVERSIONPREFIX= v
CATEGORIES= textproc


+ 3
- 3
textproc/re-flex/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1584956333
SHA256 (Genivia-RE-flex-v1.6.4_GH0.tar.gz) = 12373618e9e0e4081151a0d017a058a2a94f00cb31d414ee9f5b9e54847b99fa
SIZE (Genivia-RE-flex-v1.6.4_GH0.tar.gz) = 5220490
TIMESTAMP = 1585037724
SHA256 (Genivia-RE-flex-v1.6.5_GH0.tar.gz) = 5abed4fcbf978a938d9549682176a19948afde057457c5705bfff35001a8fda2
SIZE (Genivia-RE-flex-v1.6.5_GH0.tar.gz) = 5219392

+ 3
- 3
www/gohugo/Makefile View File

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

PORTNAME= hugo
DISTVERSIONPREFIX= v
DISTVERSION= 0.67.1
DISTVERSION= 0.68.0
CATEGORIES= www
PKGNAMEPREFIX= go
DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -100,7 +100,7 @@ GH_TUPLE= \
tdewolff:minify:v2.6.1:tdewolff_minify/vendor/github.com/tdewolff/minify/v2 \
tdewolff:parse:v2.3.14:tdewolff_parse/vendor/github.com/tdewolff/parse/v2 \
yuin:goldmark-highlighting:d1af22c1126f:yuin_goldmark_highlighting/vendor/github.com/yuin/goldmark-highlighting \
yuin:goldmark:v1.1.22:yuin_goldmark/vendor/github.com/yuin/goldmark
yuin:goldmark:v1.1.25:yuin_goldmark/vendor/github.com/yuin/goldmark

GO_BUILDFLAGS= -ldflags="\
-s -w \
@@ -130,7 +130,7 @@ PORTMANS= hugo-config.1 hugo-convert-toJSON.1 hugo-convert-toTOML.1 \
.include <bsd.port.pre.mk>

SOURCE_DATE_EPOCH_CMD= date -r $$(grep TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%FT%TZ%z'
COMMIT_ID= 4f44227bd8e32056d11797add3fe4da8f8c9edb0
COMMIT_ID= 1e67854b1af84716aa78396fafbc242992eb2ea1

do-build-MANPAGES-on:
@cd ${GO_WRKSRC} && ${GO_WRKDIR_BIN}/${PORTNAME} gen man --dir man/man1/

+ 5
- 5
www/gohugo/distinfo View File

@@ -1,6 +1,6 @@
TIMESTAMP = 1584350614
SHA256 (gohugo/gohugoio-hugo-v0.67.1_GH0.tar.gz) = e3f29dbe764a81eaef6d42bf95f0ab7ab3427ab83c9cced72f9ca4cf39753a90
SIZE (gohugo/gohugoio-hugo-v0.67.1_GH0.tar.gz) = 32214449
TIMESTAMP = 1584810111
SHA256 (gohugo/gohugoio-hugo-v0.68.0_GH0.tar.gz) = c90b5abf1bc3a9313439a73a00509ab1a2be3ad41d7dcdcb8ae6fe82167fe532
SIZE (gohugo/gohugoio-hugo-v0.68.0_GH0.tar.gz) = 32384275
SHA256 (gohugo/Azure-azure-pipeline-go-v0.1.9_GH0.tar.gz) = 365c183602d495e67399b5a4c42a41d3ce0e7d79348dc7c9fd04324b35333b8b
SIZE (gohugo/Azure-azure-pipeline-go-v0.1.9_GH0.tar.gz) = 15849
SHA256 (gohugo/Azure-azure-storage-blob-go-v0.6.0_GH0.tar.gz) = 69fa9d27f51ccdd9879351bc5bd4b09544ee745ec63eb473479fac73970523ef
@@ -167,5 +167,5 @@ SHA256 (gohugo/tdewolff-parse-v2.3.14_GH0.tar.gz) = 865f6166d1e481d6afe73c7ccc4d
SIZE (gohugo/tdewolff-parse-v2.3.14_GH0.tar.gz) = 83650
SHA256 (gohugo/yuin-goldmark-highlighting-d1af22c1126f_GH0.tar.gz) = 973eb3f0fcfa1ac115cb67f671145ba64559520b2d3b75c57c1019c28b1e9fec
SIZE (gohugo/yuin-goldmark-highlighting-d1af22c1126f_GH0.tar.gz) = 10649
SHA256 (gohugo/yuin-goldmark-v1.1.22_GH0.tar.gz) = 978172a45e7bea4d126b466f67b01d2585962e53416b4604ceed5a2d454715af
SIZE (gohugo/yuin-goldmark-v1.1.22_GH0.tar.gz) = 215397
SHA256 (gohugo/yuin-goldmark-v1.1.25_GH0.tar.gz) = ef63f9b8ac12ec654481cd48268efd9617064197014649294c4418789443f7d7
SIZE (gohugo/yuin-goldmark-v1.1.25_GH0.tar.gz) = 225320

+ 1
- 1
www/py-asgiref/Makefile View File

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

PORTNAME= asgiref
PORTVERSION= 3.2.5
PORTVERSION= 3.2.6
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

+ 3
- 3
www/py-asgiref/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1584072056
SHA256 (asgiref-3.2.5.tar.gz) = c8f49dd3b42edcc51d09dd2eea8a92b3cfc987ff7e6486be734b4d0cbfd5d315
SIZE (asgiref-3.2.5.tar.gz) = 25056
TIMESTAMP = 1585034310
SHA256 (asgiref-3.2.6.tar.gz) = 63007b556233381c5f22ae4c7e4292c9f1b953dc8909ae8fd268f611dc23cbd0
SIZE (asgiref-3.2.6.tar.gz) = 24760

Loading…
Cancel
Save