diff --git a/astro/gnuastro/Makefile b/astro/gnuastro/Makefile index 16c7c45dbe4..323b000dc8b 100644 --- a/astro/gnuastro/Makefile +++ b/astro/gnuastro/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnuastro -PORTVERSION= 0.18 +PORTVERSION= 0.19 CATEGORIES= astro MASTER_SITES= GNU @@ -31,6 +31,8 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's,cflags_add="-O3",:,' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,gcc,$(CC),' \ + ${WRKSRC}/bin/buildprog/ui.c post-install: @${FIND} ${STAGEDIR}${PREFIX}/etc -name \*.conf \ diff --git a/astro/gnuastro/distinfo b/astro/gnuastro/distinfo index 84519c771c5..79924978590 100644 --- a/astro/gnuastro/distinfo +++ b/astro/gnuastro/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658424424 -SHA256 (gnuastro-0.18.tar.lz) = fe94f155c1da67947fdbbf5fc19878574aef06b2e9c6746b0694473ea77831f9 -SIZE (gnuastro-0.18.tar.lz) = 4245420 +TIMESTAMP = 1666570568 +SHA256 (gnuastro-0.19.tar.lz) = 7f7510b3136dd8ff40c7255f7ba0d62d69ffdcb534390a1973bc3afa491c58a4 +SIZE (gnuastro-0.19.tar.lz) = 4475215 diff --git a/astro/gnuastro/pkg-plist b/astro/gnuastro/pkg-plist index 9dd2b4a02dc..70bab3b26c7 100644 --- a/astro/gnuastro/pkg-plist +++ b/astro/gnuastro/pkg-plist @@ -50,6 +50,7 @@ include/gnuastro/array.h include/gnuastro/binary.h include/gnuastro/blank.h include/gnuastro/box.h +include/gnuastro/color.h include/gnuastro/config.h include/gnuastro/convolve.h include/gnuastro/cosmology.h @@ -57,6 +58,7 @@ include/gnuastro/data.h include/gnuastro/dimension.h include/gnuastro/ds9.h include/gnuastro/eps.h +include/gnuastro/fit.h include/gnuastro/fits.h include/gnuastro/git.h include/gnuastro/interpolate.h @@ -79,11 +81,16 @@ include/gnuastro/tile.h include/gnuastro/txt.h include/gnuastro/type.h include/gnuastro/units.h +include/gnuastro/warp.h include/gnuastro/wcs.h lib/libgnuastro.a lib/libgnuastro.so -lib/libgnuastro.so.16 -lib/libgnuastro.so.16.0.0 +lib/libgnuastro.so.17 +lib/libgnuastro.so.17.0.0 +lib/libgnuastro_make.a +lib/libgnuastro_make.so +lib/libgnuastro_make.so.17 +lib/libgnuastro_make.so.17.0.0 libdata/pkgconfig/gnuastro.pc man/man1/astarithmetic.1.gz man/man1/astbuildprog.1.gz @@ -112,6 +119,10 @@ man/man1/aststatistics.1.gz man/man1/asttable.1.gz man/man1/astwarp.1.gz share/info/gnuastro-figures/README +share/info/gnuastro-figures/color-names.eps +share/info/gnuastro-figures/color-names.pdf +share/info/gnuastro-figures/color-names.png +share/info/gnuastro-figures/color-names.txt share/info/gnuastro-figures/done.txt share/info/gnuastro-figures/epicycles.eps share/info/gnuastro-figures/epicycles.png diff --git a/audio/sratom/Makefile b/audio/sratom/Makefile index 61d6545f205..02612c5031f 100644 --- a/audio/sratom/Makefile +++ b/audio/sratom/Makefile @@ -1,11 +1,11 @@ PORTNAME= sratom -PORTVERSION= 0.6.10 +DISTVERSION= 0.6.14 CATEGORIES= audio MASTER_SITES= http://download.drobilla.net/ MAINTAINER= ports@FreeBSD.org COMMENT= Library for serialising LV2 atoms to/from RDF -WWW= https://drobilla.net/software/sratom +WWW= https://drobilla.net/software/sratom.html LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING @@ -15,7 +15,7 @@ LIB_DEPENDS= libserd-0.so:devel/serd \ libsord-0.so:devel/sord RUN_DEPENDS= lv2>=1.14.0:audio/lv2 -USES= pkgconfig python:build tar:bzip2 waf +USES= meson pkgconfig python:build tar:xz USE_CSTD= c99 USE_LDCONFIG= yes diff --git a/audio/sratom/distinfo b/audio/sratom/distinfo index cb56e4c7285..f6cff202976 100644 --- a/audio/sratom/distinfo +++ b/audio/sratom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653846131 -SHA256 (sratom-0.6.10.tar.bz2) = e5951c0d7f0618672628295536a271d61c55ef0dab33ba9fc5767ed4db0a634d -SIZE (sratom-0.6.10.tar.bz2) = 327047 +TIMESTAMP = 1666640751 +SHA256 (sratom-0.6.14.tar.xz) = 9982faf40db83aedd9b3850e499fecd6852b8b4ba6dede514013655cffaca1e6 +SIZE (sratom-0.6.14.tar.xz) = 24252 diff --git a/audio/zmusic/Makefile b/audio/zmusic/Makefile index 9a54a6cfc5f..4f0b6ec18f6 100644 --- a/audio/zmusic/Makefile +++ b/audio/zmusic/Makefile @@ -1,5 +1,5 @@ PORTNAME= zmusic -PORTVERSION= 1.1.8 +PORTVERSION= 1.1.10 CATEGORIES= audio MAINTAINER= kevans@FreeBSD.org diff --git a/audio/zmusic/distinfo b/audio/zmusic/distinfo index ba6ec3c0e34..1387245a685 100644 --- a/audio/zmusic/distinfo +++ b/audio/zmusic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635738651 -SHA256 (coelckers-ZMusic-1.1.8_GH0.tar.gz) = 73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68 -SIZE (coelckers-ZMusic-1.1.8_GH0.tar.gz) = 1811039 +TIMESTAMP = 1666650759 +SHA256 (coelckers-ZMusic-1.1.10_GH0.tar.gz) = 378435b35f02a3123ee9e01b5e7990017f9bc1244b788e3bf54b37b34a2985ba +SIZE (coelckers-ZMusic-1.1.10_GH0.tar.gz) = 1812700 diff --git a/audio/zmusic/pkg-plist b/audio/zmusic/pkg-plist index e7ce2336a28..ef60bf91bdb 100644 --- a/audio/zmusic/pkg-plist +++ b/audio/zmusic/pkg-plist @@ -7,7 +7,7 @@ lib/cmake/ZMusic/ZMusicLiteTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ZMusic/ZMusicLiteTargets.cmake lib/libzmusic.so lib/libzmusic.so.1 -lib/libzmusic.so.1.1.8 +lib/libzmusic.so.1.1.10 lib/libzmusiclite.so lib/libzmusiclite.so.1 -lib/libzmusiclite.so.1.1.8 +lib/libzmusiclite.so.1.1.10 diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile index eeacd1ff5ed..5d9e2e08c5c 100644 --- a/cad/appcsxcad/Makefile +++ b/cad/appcsxcad/Makefile @@ -2,7 +2,7 @@ PORTNAME= appcsxcad DISTVERSIONPREFIX= v DISTVERSION= 0.2.2-9 DISTVERSIONSUFFIX= -g97ba30e -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -20,7 +20,7 @@ LIB_DEPENDS= libCSXCAD.so:cad/csxcad \ libQCSXCAD.so:cad/qcsxcad \ libsz.so:science/libaec \ libtiff.so:graphics/tiff \ - libvtkCommonCore-9.1.so:math/vtk9 + libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= cmake jpeg pkgconfig qt:5 xorg USE_QT= core gui sql widgets xml buildtools:build qmake:build @@ -31,7 +31,7 @@ USE_GITHUB= yes GH_ACCOUNT= thliebig GH_PROJECT= AppCSXCAD -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} PLIST_FILES= bin/AppCSXCAD @@ -40,4 +40,5 @@ post-install: # an example of file that AppCSXCAD opens (zipped): http://openems.de/forum/download/file.php?id=418&sid=6daebbb2df72b415fa2ec7031ffa6ca9 +.include <../../math/vtk9/Makefile.version> .include diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile index 4c2563b0c17..1830a6ad817 100644 --- a/cad/csxcad/Makefile +++ b/cad/csxcad/Makefile @@ -2,7 +2,7 @@ PORTNAME= csxcad DISTVERSIONPREFIX= v DISTVERSION= 0.6.2-109 DISTVERSIONSUFFIX= -gcd9decb -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -22,7 +22,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libsz.so:science/libaec \ libtiff.so:graphics/tiff \ libtinyxml.so:textproc/tinyxml \ - libvtkCommonCore-9.1.so:math/vtk9 + libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= cmake jpeg pkgconfig USE_LDCONFIG= yes @@ -32,6 +32,7 @@ GH_ACCOUNT= thliebig GH_PROJECT= ${PORTNAME:tu} CMAKE_ARGS= -DFPARSER_ROOT_DIR=${LOCALBASE} \ - -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 + -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} +.include <../../math/vtk9/Makefile.version> .include diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index 3f7a844fdeb..2fb3016bee7 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,6 +1,6 @@ PORTNAME= FreeCAD DISTVERSION= 0.20.1 -PORTREVISION= 2 +PORTREVISION= 3 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e @@ -47,7 +47,7 @@ USE_LDCONFIG= yes CPE_VENDOR= freecad_project -VTK_VER= 9.1 +VTK_VER= 9.2 DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index b9c939f64ac..16c5269f22f 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencascade PORTVERSION= 7.6.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry @@ -20,7 +20,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libpng16.so:graphics/png \ - libvtksys-${VTKVER}.so:math/vtk${VTKVER:R} + libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} RUN_DEPENDS= bash:shells/bash # Check ${WRKSRC}/dox/overview/overview.md @@ -40,8 +40,6 @@ SHEBANG_FILES= adm/templates/*.sh \ gendoc ENVSH= adm/templates/env.sh -VTKVER= 9.1 - OPTIONS_DEFINE= DOCS DOXYGEN FFMPEG VIS VIS_DESC= Build Visualizazion module (requires OpenGL, freetype, ftgl) OPTIONS_DEFAULT=FFMPEG VIS @@ -62,7 +60,7 @@ CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \ -DUSE_TBB:BOOL=OFF \ -DUSE_RAPIDJSON:BOOL=ON \ -DUSE_VTK:BOOL=ON \ - -D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER} + -D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER} CONFIGURE_ENV+= DESTDIR=${STAGEDIR} .if defined(MAINTAINER_MODE) @@ -181,4 +179,5 @@ regression-test: install DRAWEXE -f ${FILESDIR}/regtest " .endif +.include <../../math/vtk9/Makefile.version> .include diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile index 8fc56650717..6dfa29d35df 100644 --- a/cad/qcsxcad/Makefile +++ b/cad/qcsxcad/Makefile @@ -1,7 +1,7 @@ PORTNAME= qcsxcad DISTVERSIONPREFIX= v DISTVERSION= 0.6.2-9 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g3f09a8b CATEGORIES= cad @@ -18,7 +18,7 @@ LIB_DEPENDS= libCSXCAD.so:cad/csxcad \ libpng16.so:graphics/png \ libtiff.so:graphics/tiff \ libtinyxml.so:textproc/tinyxml \ - libvtkCommonCore-9.1.so:math/vtk9 + libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= cmake gl jpeg pkgconfig qt:5 xorg USE_QT= core gui opengl sql widgets xml buildtools:build qmake:build @@ -30,6 +30,7 @@ USE_GITHUB= yes GH_ACCOUNT= thliebig GH_PROJECT= ${PORTNAME:tu} -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} +.include <../../math/vtk9/Makefile.version> .include diff --git a/cad/qcsxcad/files/patch-QVTKStructure.cpp b/cad/qcsxcad/files/patch-QVTKStructure.cpp new file mode 100644 index 00000000000..4036157911b --- /dev/null +++ b/cad/qcsxcad/files/patch-QVTKStructure.cpp @@ -0,0 +1,145 @@ +- workaround for https://github.com/thliebig/QCSXCAD/issues/10 + +--- QVTKStructure.cpp.orig 2022-10-23 18:25:43 UTC ++++ QVTKStructure.cpp +@@ -113,12 +113,12 @@ QVTKStructure::QVTKStructure() + #endif + + ren = vtkRenderer::New(); +- VTKWidget->GetRenderWindow()->AddRenderer(ren); ++ VTKWidget->renderWindow()->AddRenderer(ren); + + AddAxes(); + SetBackgroundColor(255,255,255); + +- SetCallback(VTKWidget->GetRenderWindow()->GetInteractor()); ++ SetCallback(VTKWidget->renderWindow()->GetInteractor()); + } + + QVTKStructure::~QVTKStructure() +@@ -137,7 +137,7 @@ void QVTKStructure::AddAxes() + marker->SetOrientationMarker(assembly); + marker->SetViewport(0.0,0.0,0.25,0.25); + +- marker->SetInteractor(VTKWidget->GetRenderWindow()->GetInteractor()); ++ marker->SetInteractor(VTKWidget->renderWindow()->GetInteractor()); + marker->SetEnabled(1); + marker->InteractiveOff(); + +@@ -159,7 +159,7 @@ void QVTKStructure::SetBackgroundColor(int r, int g, i + { + if (ActorGridPlane[i]!=NULL) ActorGridPlane[i]->GetProperty()->SetColor(irgb); + } +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::SetGeometry(ContinuousStructure *CS) +@@ -277,20 +277,20 @@ void QVTKStructure::RenderGrid() + void QVTKStructure::RenderGridX(int plane_pos) + { + RenderGridDir(0,plane_pos); +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::RenderGridY(int plane_pos) + { + RenderGridDir(1,plane_pos); +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + + } + + void QVTKStructure::RenderGridZ(int plane_pos) + { + RenderGridDir(2,plane_pos); +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::RenderGridDir(int dir, unsigned int plane_pos) +@@ -413,13 +413,13 @@ void QVTKStructure::SetGridOpacity(int val) + { + if (ActorGridPlane[i]!=NULL) ActorGridPlane[i]->GetProperty()->SetOpacity((double)val/255.0); + } +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::ResetView() + { + ren->ResetCamera(); +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::setXY() +@@ -472,7 +472,7 @@ void QVTKStructure::SetPropOpacity(unsigned int uiID, + if (LayerPrimitives.at(i).VTKProp!=NULL) LayerPrimitives.at(i).VTKProp->SetOpacity2All((double)val/255.0); + } + } +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::RenderGeometry() +@@ -679,7 +679,7 @@ void QVTKStructure::RenderGeometry() + } + } + } +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::RenderDiscMaterialModel() +@@ -716,7 +716,7 @@ void QVTKStructure::RenderDiscMaterialModel() + delete transform; + } + } +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::SetParallelProjection(bool val, bool render) +@@ -725,18 +725,18 @@ void QVTKStructure::SetParallelProjection(bool val, bo + cam->SetParallelProjection(val); + + if (render) +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::Set2DInteractionStyle(bool val, bool render) + { + if (val) +- VTKWidget->GetRenderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleRubberBand2DPlane::New()); ++ VTKWidget->renderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleRubberBand2DPlane::New()); + else +- VTKWidget->GetRenderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleTrackballCamera::New()); ++ VTKWidget->renderWindow()->GetInteractor()->SetInteractorStyle(vtkInteractorStyleTrackballCamera::New()); + + if (render) +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + void QVTKStructure::SaveCamData() +@@ -765,7 +765,7 @@ void QVTKStructure::RestoreCamData(bool render) + Camera->Modified(); + + if (render) +- VTKWidget->GetRenderWindow()->GetInteractor()->Render(); ++ VTKWidget->renderWindow()->GetInteractor()->Render(); + } + + +@@ -777,7 +777,7 @@ void QVTKStructure::ExportView2Image() + return; + + vtkWindowToImageFilter* filter = vtkWindowToImageFilter::New(); +- filter->SetInput(VTKWidget->GetRenderWindow()); ++ filter->SetInput(VTKWidget->renderWindow()); + + vtkPNGWriter* png_writer= vtkPNGWriter::New(); + png_writer->SetInputConnection(filter->GetOutputPort()); diff --git a/comms/Makefile b/comms/Makefile index 89ee6a0f75e..80cc88dd691 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -139,6 +139,7 @@ SUBDIR += py-libimobiledevice SUBDIR += py-libscrc SUBDIR += py-pyserial + SUBDIR += py-pyserial-asyncio SUBDIR += py-xmodem SUBDIR += pyla SUBDIR += qico diff --git a/comms/py-libscrc/Makefile b/comms/py-libscrc/Makefile index e49ccb3adcf..f75ecbec6f4 100644 --- a/comms/py-libscrc/Makefile +++ b/comms/py-libscrc/Makefile @@ -1,6 +1,6 @@ PORTNAME= libscrc DISTVERSIONPREFIX= v -DISTVERSION= 1.8 +DISTVERSION= 1.8.1 CATEGORIES= comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,6 +19,9 @@ USE_PYTHON= autoplist distutils TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +post-install: + ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + + do-test: @cd ${TEST_WRKSRC} && for test in \ libscrc/test/canx.py \ diff --git a/comms/py-libscrc/distinfo b/comms/py-libscrc/distinfo index f76403599c6..2dd725ee0b5 100644 --- a/comms/py-libscrc/distinfo +++ b/comms/py-libscrc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653037949 -SHA256 (hex-in-libscrc-v1.8_GH0.tar.gz) = d4177f524d361ab7ccd26ba629dff09d4a3dfeb17079247e3a2ff8da9094bba7 -SIZE (hex-in-libscrc-v1.8_GH0.tar.gz) = 54403 +TIMESTAMP = 1666550588 +SHA256 (hex-in-libscrc-v1.8.1_GH0.tar.gz) = f73db7acf7b8aba69f61751592be2200f9c99143f0d398873fe269986ddb767f +SIZE (hex-in-libscrc-v1.8.1_GH0.tar.gz) = 54787 diff --git a/comms/py-pyserial-asyncio/Makefile b/comms/py-pyserial-asyncio/Makefile new file mode 100644 index 00000000000..aa05480f1c3 --- /dev/null +++ b/comms/py-pyserial-asyncio/Makefile @@ -0,0 +1,27 @@ +PORTNAME= pyserial-asyncio +DISTVERSIONPREFIX= v +DISTVERSION= 0.6 +CATEGORIES= comms python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= chris@chrullrich.net +COMMENT= Async I/O support for pyserial +WWW= https://github.com/pyserial/pyserial-asyncio + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=3.1.1:comms/py-pyserial@${PY_FLAVOR} + +USES= python:3.6+ shebangfix +USE_PYTHON= autoplist concurrent distutils +USE_GITHUB= yes +GH_ACCOUNT= pyserial + +NO_ARCH= yes + +do-test: + ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \ + ${PYTHON_CMD} ${WRKSRC}/test/test_asyncio.py + +.include diff --git a/comms/py-pyserial-asyncio/distinfo b/comms/py-pyserial-asyncio/distinfo new file mode 100644 index 00000000000..4d27133e552 --- /dev/null +++ b/comms/py-pyserial-asyncio/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1665660449 +SHA256 (pyserial-pyserial-asyncio-v0.6_GH0.tar.gz) = a5214d89e01c36cace80cfe917525b145f4c878273a332b6476df58edcb1eec3 +SIZE (pyserial-pyserial-asyncio-v0.6_GH0.tar.gz) = 31164 diff --git a/comms/py-pyserial-asyncio/pkg-descr b/comms/py-pyserial-asyncio/pkg-descr new file mode 100644 index 00000000000..47b7f128eae --- /dev/null +++ b/comms/py-pyserial-asyncio/pkg-descr @@ -0,0 +1,2 @@ +This module provides asynchronous I/O on serial ports, extending the +pyserial module. diff --git a/deskutils/Makefile b/deskutils/Makefile index 00e440e60b8..f505ee6e565 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -183,6 +183,7 @@ SUBDIR += nextcloudclient SUBDIR += note SUBDIR += notekit + SUBDIR += notes SUBDIR += noti SUBDIR += notification-daemon SUBDIR += notify-osd diff --git a/deskutils/notes/Makefile b/deskutils/notes/Makefile new file mode 100644 index 00000000000..aac4a8753d1 --- /dev/null +++ b/deskutils/notes/Makefile @@ -0,0 +1,43 @@ +PORTNAME= notes +PORTVERSION= 2.0.0 +DISTVERSIONPREFIX= v +CATEGORIES= deskutils + +MAINTAINER= danfe@FreeBSD.org +COMMENT= Beautiful and powerful note-taking application +WWW= https://www.get-notes.com/ + +LICENSE= MPL20 + +USES= qmake qt:5 +USE_QT= buildtools:build concurrent core gui network sql widgets + +USE_GITHUB= yes +GH_ACCOUNT= nuttyartist alex-spataru:qsu b00f:qas pbek:qmdte +GH_PROJECT= QSimpleUpdater:qsu qautostart:qas qmarkdowntextedit:qmdte +GH_TAGNAME= 62567ee:qsu 5be8fea:qas f69e622:qmdte +GH_SUBDIR= 3rdParty/QSimpleUpdater:qsu 3rdParty/qautostart:qas \ + 3rdParty/qmarkdowntextedit:qmdte + +post-patch: + @${REINPLACE_CMD} -e '/^OBJECTS_DIR = obj/d' ${WRKSRC}/src/Notes.pro + @${REINPLACE_CMD} -e 's,Q_OS_LINUX,Q_OS_UNIX,' \ + ${WRKSRC}/src/updaterwindow.cpp + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/Notes \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/packaging/linux/common/*.desktop \ + ${STAGEDIR}${PREFIX}/share/applications +.for n in 16 22 24 32 48 64 128 256 512 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps + ${INSTALL_DATA} \ + ${WRKSRC}/packaging/linux/common/icons/${n}x${n}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps +.endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} \ + ${WRKSRC}/packaging/linux/common/icons/scalable/${PORTNAME}.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + +.include diff --git a/deskutils/notes/distinfo b/deskutils/notes/distinfo new file mode 100644 index 00000000000..e85c798d8e7 --- /dev/null +++ b/deskutils/notes/distinfo @@ -0,0 +1,9 @@ +TIMESTAMP = 1662537566 +SHA256 (nuttyartist-notes-v2.0.0_GH0.tar.gz) = 0240a3b4e9f3cf9027e2a6c9d04f02c3b0dadf07de02cd0b90e7fdad0b5a8e07 +SIZE (nuttyartist-notes-v2.0.0_GH0.tar.gz) = 6285787 +SHA256 (alex-spataru-QSimpleUpdater-62567ee_GH0.tar.gz) = b99d4ae20aaa82bcc6450f69757840ba07a9e75f177037f3419abf124fcf131d +SIZE (alex-spataru-QSimpleUpdater-62567ee_GH0.tar.gz) = 455283 +SHA256 (b00f-qautostart-5be8fea_GH0.tar.gz) = 72ab1cdf4cdeeade12d7aed2a0d15994e8a1b8a59d590be0000067b0c3f8e949 +SIZE (b00f-qautostart-5be8fea_GH0.tar.gz) = 3587 +SHA256 (pbek-qmarkdowntextedit-f69e622_GH0.tar.gz) = 40e9fb63c4b65d71c97707bceb54cbd1b7a07432726e2a487ab49436136c08a7 +SIZE (pbek-qmarkdowntextedit-f69e622_GH0.tar.gz) = 300541 diff --git a/deskutils/notes/pkg-descr b/deskutils/notes/pkg-descr new file mode 100644 index 00000000000..d33bace6af4 --- /dev/null +++ b/deskutils/notes/pkg-descr @@ -0,0 +1,4 @@ +Notes is an open-source and cross-platform note-taking application that +is beautiful and sleek looking, yet still powerful. It is fast native +program (written in C++ with Qt) with a low memory footprint, supporting +markdown and not tracking users in any way. diff --git a/deskutils/notes/pkg-plist b/deskutils/notes/pkg-plist new file mode 100644 index 00000000000..ff0ef1b06b2 --- /dev/null +++ b/deskutils/notes/pkg-plist @@ -0,0 +1,12 @@ +bin/notes +share/applications/notes.desktop +share/icons/hicolor/128x128/apps/notes.png +share/icons/hicolor/16x16/apps/notes.png +share/icons/hicolor/22x22/apps/notes.png +share/icons/hicolor/24x24/apps/notes.png +share/icons/hicolor/256x256/apps/notes.png +share/icons/hicolor/32x32/apps/notes.png +share/icons/hicolor/48x48/apps/notes.png +share/icons/hicolor/512x512/apps/notes.png +share/icons/hicolor/64x64/apps/notes.png +share/icons/hicolor/scalable/apps/notes.svg diff --git a/deskutils/qownnotes/Makefile b/deskutils/qownnotes/Makefile index 94f7ed13dea..04aeb6eae9a 100644 --- a/deskutils/qownnotes/Makefile +++ b/deskutils/qownnotes/Makefile @@ -1,5 +1,5 @@ PORTNAME= qownnotes -PORTVERSION= 22.9.2 +PORTVERSION= 22.10.2 CATEGORIES= deskutils MASTER_SITES= https://download.tuxfamily.org/qownnotes/src/ diff --git a/deskutils/qownnotes/distinfo b/deskutils/qownnotes/distinfo index bf82e819222..c18a960fd2b 100644 --- a/deskutils/qownnotes/distinfo +++ b/deskutils/qownnotes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664294427 -SHA256 (qownnotes-22.9.2.tar.xz) = f5c1c215756083b7da85b42c5540318339f231fc783b8d83d6a5af7abb9ca59f -SIZE (qownnotes-22.9.2.tar.xz) = 5631176 +TIMESTAMP = 1666294488 +SHA256 (qownnotes-22.10.2.tar.xz) = 70752432b7d5add4172ab98ada370d4fa087c34f95116735b69d571ae2345dc4 +SIZE (qownnotes-22.10.2.tar.xz) = 5583880 diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index e60e7b1424d..a1c13cb46ca 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -1,7 +1,6 @@ PORTNAME= tools DISTVERSIONPREFIX= v -DISTVERSION= 0.1.12 -PORTREVISION= 3 +DISTVERSION= 0.2.0 PORTEPOCH= 1 CATEGORIES= devel PKGNAMEPREFIX= go- diff --git a/devel/go-tools/distinfo b/devel/go-tools/distinfo index b70bbf92b45..a6e1879e293 100644 --- a/devel/go-tools/distinfo +++ b/devel/go-tools/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1659036915 -SHA256 (go/devel_go-tools/tools-v0.1.12/v0.1.12.mod) = 2a8b9365898f0822face65ba089a1353e68a65d342f300ca317cceccde6421f3 -SIZE (go/devel_go-tools/tools-v0.1.12/v0.1.12.mod) = 327 -SHA256 (go/devel_go-tools/tools-v0.1.12/v0.1.12.zip) = 4b122e0e4703bc4014cb1cf8c014fcf93ea7d72f01da79499365346f54cbb851 -SIZE (go/devel_go-tools/tools-v0.1.12/v0.1.12.zip) = 3946738 +TIMESTAMP = 1666640091 +SHA256 (go/devel_go-tools/tools-v0.2.0/v0.2.0.mod) = 9c9b5e62af69f2b10029ce12944dc8834f1226a83bb243e9a0dbf37e0bb186ba +SIZE (go/devel_go-tools/tools-v0.2.0/v0.2.0.mod) = 177 +SHA256 (go/devel_go-tools/tools-v0.2.0/v0.2.0.zip) = 05da23611d775b2d3771438fa2e5e522cc948a35372cb7ad019fe484f1e91ae0 +SIZE (go/devel_go-tools/tools-v0.2.0/v0.2.0.zip) = 2935954 diff --git a/devel/go-tools/pkg-descr b/devel/go-tools/pkg-descr index 65ebf473304..28f75c9ea80 100644 --- a/devel/go-tools/pkg-descr +++ b/devel/go-tools/pkg-descr @@ -1,2 +1,20 @@ -This port holds the source for various packages and tools that support the Go -programming language. +go-tools holds the golang.org/x/tools module, comprising various tools +mostly for static analysis of Go programs, some of which are listed +below. Selected commands: + +goimports formats a Go program like go fmt and additionally inserts + import statements for any packages required by the file after it + is edited. + +callgraph prints the call graph of a Go program. + + +digraph is a utility for manipulating directed graphs in textual + notation. + + +stringer generates declarations (including a String method) for "enum" + types. + +toolstash is a utility to simplify working with multiple versions of the + Go toolchain. diff --git a/devel/goreleaser/Makefile b/devel/goreleaser/Makefile index ec7a2e137f6..fdbc0ce206f 100644 --- a/devel/goreleaser/Makefile +++ b/devel/goreleaser/Makefile @@ -1,6 +1,6 @@ PORTNAME= goreleaser DISTVERSIONPREFIX= v -DISTVERSION= 1.12.1 +DISTVERSION= 1.12.3 CATEGORIES= devel MAINTAINER= fuz@fuz.su diff --git a/devel/goreleaser/distinfo b/devel/goreleaser/distinfo index 1e160e3f965..5e82b315db8 100644 --- a/devel/goreleaser/distinfo +++ b/devel/goreleaser/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1666109671 -SHA256 (go/devel_goreleaser/goreleaser-v1.12.1/v1.12.1.mod) = 85a9f880823ace5d93b1f3c1f37c1803493157b9908dcfe10ff1b93fd37e07c3 -SIZE (go/devel_goreleaser/goreleaser-v1.12.1/v1.12.1.mod) = 8359 -SHA256 (go/devel_goreleaser/goreleaser-v1.12.1/v1.12.1.zip) = 4bd06e9ced61a5913b1672ad2df8794dc6a013ce806a3cd0226e644aaf665d17 -SIZE (go/devel_goreleaser/goreleaser-v1.12.1/v1.12.1.zip) = 1002771 +TIMESTAMP = 1666638578 +SHA256 (go/devel_goreleaser/goreleaser-v1.12.3/v1.12.3.mod) = 2841587d30da52ce3a7332c166578d098e39f115a197f9309aeef9e758c7a051 +SIZE (go/devel_goreleaser/goreleaser-v1.12.3/v1.12.3.mod) = 8272 +SHA256 (go/devel_goreleaser/goreleaser-v1.12.3/v1.12.3.zip) = a742483f73d352304e8aaf03e88e93203fb0a6be848ea202a4837c183e2d5e55 +SIZE (go/devel_goreleaser/goreleaser-v1.12.3/v1.12.3.zip) = 1002668 diff --git a/devel/got/Makefile b/devel/got/Makefile index 033d5dbe581..1308e85f4d1 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -1,5 +1,5 @@ PORTNAME= got -PORTVERSION= 0.76 +PORTVERSION= 0.77 CATEGORIES= devel MASTER_SITES= https://gameoftrees.org/releases/ diff --git a/devel/got/distinfo b/devel/got/distinfo index b7d53b32785..61943694a25 100644 --- a/devel/got/distinfo +++ b/devel/got/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663960911 -SHA256 (got-0.76.tar.gz) = a2d735cbbf4537bac728d87e345e0458d7fa45f51a7533226ac1da7879a39350 -SIZE (got-0.76.tar.gz) = 777980 +TIMESTAMP = 1666621785 +SHA256 (got-0.77.tar.gz) = de2a1361c9cac212632f140c123871c7bdb07dbfb616a685032a137936d08456 +SIZE (got-0.77.tar.gz) = 830525 diff --git a/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c b/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c index 1e2d4660eac..bc07b3bdb9b 100644 --- a/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c +++ b/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c @@ -1,14 +1,14 @@ ---- libexec/got-index-pack/got-index-pack.c.orig 2022-06-19 18:47:42 UTC +--- libexec/got-index-pack/got-index-pack.c.orig 2022-10-20 14:40:52 UTC +++ libexec/got-index-pack/got-index-pack.c @@ -15,6 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include - #include - #include -@@ -1020,6 +1021,11 @@ main(int argc, char **argv) + #include +@@ -110,6 +111,11 @@ main(int argc, char **argv) /* revoke access to most system calls */ if (pledge("stdio recvfd", NULL) == -1) { err = got_error_from_errno("pledge"); diff --git a/devel/got/files/patch-regress_cmdline_common.sh b/devel/got/files/patch-regress_cmdline_common.sh index fe56acb5f34..fd950c2005d 100644 --- a/devel/got/files/patch-regress_cmdline_common.sh +++ b/devel/got/files/patch-regress_cmdline_common.sh @@ -1,9 +1,18 @@ ---- regress/cmdline/common.sh.orig 2021-03-22 10:05:11 UTC +--- regress/cmdline/common.sh.orig 2022-08-23 09:11:50 UTC +++ regress/cmdline/common.sh -@@ -26,6 +26,20 @@ export GOT_TEST_ROOT="/tmp" +@@ -27,6 +27,29 @@ export GOT_IGNORE_GITCONFIG=1 export MALLOC_OPTIONS=S ++# work around the fix for CVE-2022-39253 in Git 2.38.1 ++git() ++( ++ if [ "$1" = submodule ]; then ++ set - -c protocol.file.allow=always "$@" ++ fi ++ exec git "$@" ++) ++ +# compat wrapper +sed() +( diff --git a/devel/jech-dht/Makefile b/devel/jech-dht/Makefile index c457db48b21..02bdfa14db8 100644 --- a/devel/jech-dht/Makefile +++ b/devel/jech-dht/Makefile @@ -1,7 +1,7 @@ PORTNAME= dht -PORTVERSION= 0.26 +DISTVERSIONPREFIX= ${PORTNAME}- +DISTVERSION= 0.27 CATEGORIES= devel -MASTER_SITES= http://www.pps.univ-paris-diderot.fr/~jch/software/files/ MAINTAINER= rigoletto@FreeBSD.org COMMENT= Mainline variant of Kademlia Distributed Hash Table (DHT) @@ -11,6 +11,9 @@ LICENSE= MIT USES= uidfix +USE_GITHUB= yes +GH_ACCOUNT= jech + USE_LDCONFIG= yes MAKE_ENV= STAGEDIR="${STAGEDIR}" diff --git a/devel/jech-dht/distinfo b/devel/jech-dht/distinfo index 286547d5ab5..c3d1ecd6f8b 100644 --- a/devel/jech-dht/distinfo +++ b/devel/jech-dht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546215463 -SHA256 (dht-0.26.tar.gz) = d2843d5d80783f2951a801020439d327f8f36d734522ca11e59bbbd3b19af8ff -SIZE (dht-0.26.tar.gz) = 29008 +TIMESTAMP = 1666651915 +SHA256 (jech-dht-dht-0.27_GH0.tar.gz) = caba469a784a5c359c084099fdc025cfe09b1faec2ba9ba257b7384351c43c0a +SIZE (jech-dht-dht-0.27_GH0.tar.gz) = 29349 diff --git a/devel/py-nbconvert/Makefile b/devel/py-nbconvert/Makefile index a153c8724ed..e7498bfa196 100644 --- a/devel/py-nbconvert/Makefile +++ b/devel/py-nbconvert/Makefile @@ -1,5 +1,5 @@ PORTNAME= nbconvert -PORTVERSION= 7.2.1 +PORTVERSION= 7.2.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -41,4 +41,8 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.6:devel/py-importlib- post-patch: @${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/jupyter/nbconvert + cd ${WRKSRC}/share && ${COPYTREE_SHARE} templates ${STAGEDIR}${PREFIX}/share/jupyter/nbconvert + .include diff --git a/devel/py-nbconvert/distinfo b/devel/py-nbconvert/distinfo index fc7e9504b5f..aefbc5d9d3f 100644 --- a/devel/py-nbconvert/distinfo +++ b/devel/py-nbconvert/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665330706 -SHA256 (nbconvert-7.2.1.tar.gz) = 1e180801205ad831b6e2480c5a03307dfb6327fa5b2f9b156d6fed45f9700686 -SIZE (nbconvert-7.2.1.tar.gz) = 731368 +TIMESTAMP = 1666626189 +SHA256 (nbconvert-7.2.2.tar.gz) = 24acfaa466d2c9b7eb524800e4a45afbed862c5d058cfb30fc7aa24d448c95eb +SIZE (nbconvert-7.2.2.tar.gz) = 818074 diff --git a/devel/py-nbconvert/pkg-plist b/devel/py-nbconvert/pkg-plist new file mode 100644 index 00000000000..58242357e36 --- /dev/null +++ b/devel/py-nbconvert/pkg-plist @@ -0,0 +1,47 @@ +share/jupyter/nbconvert/templates/asciidoc/conf.json +share/jupyter/nbconvert/templates/asciidoc/index.asciidoc.j2 +share/jupyter/nbconvert/templates/base/celltags.j2 +share/jupyter/nbconvert/templates/base/display_priority.j2 +share/jupyter/nbconvert/templates/base/jupyter_widgets.html.j2 +share/jupyter/nbconvert/templates/base/mathjax.html.j2 +share/jupyter/nbconvert/templates/base/null.j2 +share/jupyter/nbconvert/templates/basic/conf.json +share/jupyter/nbconvert/templates/basic/index.html.j2 +share/jupyter/nbconvert/templates/classic/base.html.j2 +share/jupyter/nbconvert/templates/classic/conf.json +share/jupyter/nbconvert/templates/classic/index.html.j2 +share/jupyter/nbconvert/templates/compatibility/display_priority.tpl +share/jupyter/nbconvert/templates/compatibility/full.tpl +share/jupyter/nbconvert/templates/lab/base.html.j2 +share/jupyter/nbconvert/templates/lab/conf.json +share/jupyter/nbconvert/templates/lab/index.html.j2 +share/jupyter/nbconvert/templates/lab/static/index.css +share/jupyter/nbconvert/templates/lab/static/theme-dark.css +share/jupyter/nbconvert/templates/lab/static/theme-light.css +share/jupyter/nbconvert/templates/latex/base.tex.j2 +share/jupyter/nbconvert/templates/latex/conf.json +share/jupyter/nbconvert/templates/latex/display_priority.j2 +share/jupyter/nbconvert/templates/latex/document_contents.tex.j2 +share/jupyter/nbconvert/templates/latex/index.tex.j2 +share/jupyter/nbconvert/templates/latex/null.j2 +share/jupyter/nbconvert/templates/latex/report.tex.j2 +share/jupyter/nbconvert/templates/latex/style_bw_ipython.tex.j2 +share/jupyter/nbconvert/templates/latex/style_bw_python.tex.j2 +share/jupyter/nbconvert/templates/latex/style_ipython.tex.j2 +share/jupyter/nbconvert/templates/latex/style_jupyter.tex.j2 +share/jupyter/nbconvert/templates/latex/style_python.tex.j2 +share/jupyter/nbconvert/templates/markdown/conf.json +share/jupyter/nbconvert/templates/markdown/index.md.j2 +share/jupyter/nbconvert/templates/python/conf.json +share/jupyter/nbconvert/templates/python/index.py.j2 +share/jupyter/nbconvert/templates/reveal/base.html.j2 +share/jupyter/nbconvert/templates/reveal/cellslidedata.j2 +share/jupyter/nbconvert/templates/reveal/conf.json +share/jupyter/nbconvert/templates/reveal/index.html.j2 +share/jupyter/nbconvert/templates/reveal/static/custom_reveal.css +share/jupyter/nbconvert/templates/rst/conf.json +share/jupyter/nbconvert/templates/rst/index.rst.j2 +share/jupyter/nbconvert/templates/script/conf.json +share/jupyter/nbconvert/templates/script/script.j2 +share/jupyter/nbconvert/templates/webpdf/conf.json +share/jupyter/nbconvert/templates/webpdf/index.pdf.j2 diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index cf6cc13f1d2..6e1c1f53e25 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,5 +1,5 @@ PORTNAME= ruby-build -PORTVERSION= 20221004 +PORTVERSION= 20221025 DISTVERSIONPREFIX= v CATEGORIES= devel ruby diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index 9db1b8a3e01..77025dc4c82 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664973132 -SHA256 (rbenv-ruby-build-v20221004_GH0.tar.gz) = da6cefa3f15c44683c749cd8612910768a30eefbfb8213ff3420abe0d3478704 -SIZE (rbenv-ruby-build-v20221004_GH0.tar.gz) = 78907 +TIMESTAMP = 1666656372 +SHA256 (rbenv-ruby-build-v20221025_GH0.tar.gz) = 6d8ab1c6cffbe9b16287df5cc749becd306b07bb5b35bfd0f980520458689928 +SIZE (rbenv-ruby-build-v20221025_GH0.tar.gz) = 78972 diff --git a/devel/rubygem-debug/Makefile b/devel/rubygem-debug/Makefile index c295d9fc51a..26565895611 100644 --- a/devel/rubygem-debug/Makefile +++ b/devel/rubygem-debug/Makefile @@ -1,5 +1,5 @@ PORTNAME= debug -DISTVERSION= 1.6.2 +DISTVERSION= 1.6.3 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-debug/distinfo b/devel/rubygem-debug/distinfo index 7a9c679e3d5..ffd323647cb 100644 --- a/devel/rubygem-debug/distinfo +++ b/devel/rubygem-debug/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660125027 -SHA256 (rubygem/debug-1.6.2.gem) = 098487b1166b816052a72447eeb382085b49108de19f8d3dde5c33094ce06687 -SIZE (rubygem/debug-1.6.2.gem) = 88064 +TIMESTAMP = 1666598754 +SHA256 (rubygem/debug-1.6.3.gem) = 335f109abe39c1e3465df2d2f17f5108e2934070442e73c0a14d09de54012341 +SIZE (rubygem/debug-1.6.3.gem) = 88064 diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index c916c52c512..a6885a4fb1b 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.24-14305 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g41dad58489 +DISTVERSION= 0.0.24-14335 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g90d6069a16 CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index b876fc075fa..da84aa55cf9 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1666388521 -SHA256 (RPCS3-rpcs3-v0.0.24-14305-g41dad58489_GH0.tar.gz) = 9c4db5647827496d3a52fb500c846fe7481a1bf437f7a81cde6db8e48e721240 -SIZE (RPCS3-rpcs3-v0.0.24-14305-g41dad58489_GH0.tar.gz) = 8663757 +TIMESTAMP = 1666658752 +SHA256 (RPCS3-rpcs3-v0.0.24-14335-g90d6069a16_GH0.tar.gz) = c2cccc8e849e9cef2bb85ec2d63b4e58665962908eae48653b0dcb04171d1549 +SIZE (RPCS3-rpcs3-v0.0.24-14335-g90d6069a16_GH0.tar.gz) = 8666510 SHA256 (RPCS3-hidapi-hidapi-0.12.0-2-gc2aa9dd_GH0.tar.gz) = 0670ad9e58476c51775fd3a0b9e995eab5a544b498f00e802023acd265f07a3e SIZE (RPCS3-hidapi-hidapi-0.12.0-2-gc2aa9dd_GH0.tar.gz) = 239244 SHA256 (RPCS3-llvm-mirror-9b52b6c39ae9_GH0.tar.gz) = 9df78a8282453a0e1a3653664ef11ef47b8ab4d2b86e486922770ed2240788b0 diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile index bd7b23c7299..125329bf8d9 100644 --- a/games/gzdoom/Makefile +++ b/games/gzdoom/Makefile @@ -1,6 +1,6 @@ PORTNAME= gzdoom PORTVERSION= 4.7.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= g CATEGORIES= games diff --git a/games/gzdoom/files/patch-src_common_platform_posix_sdl_sdlglvideo.cpp b/games/gzdoom/files/patch-src_common_platform_posix_sdl_sdlglvideo.cpp new file mode 100644 index 00000000000..6e001316a22 --- /dev/null +++ b/games/gzdoom/files/patch-src_common_platform_posix_sdl_sdlglvideo.cpp @@ -0,0 +1,13 @@ +--- src/common/platform/posix/sdl/sdlglvideo.cpp.orig 2021-10-20 06:18:37 UTC ++++ src/common/platform/posix/sdl/sdlglvideo.cpp +@@ -396,9 +396,7 @@ SDLVideo::SDLVideo () + } + + // Fail gracefully if we somehow reach here after linking against a SDL2 library older than 2.0.6. +- SDL_version sdlver; +- SDL_GetVersion(&sdlver); +- if (!(sdlver.patch >= 6)) ++ if (!SDL_VERSION_ATLEAST(2, 0, 6)) + { + I_FatalError("Only SDL 2.0.6 or later is supported."); + } diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile index ca1d9e58fc2..1596606bff8 100644 --- a/graphics/cloudcompare/Makefile +++ b/graphics/cloudcompare/Makefile @@ -1,7 +1,7 @@ PORTNAME= cloudcompare DISTVERSIONPREFIX= v DISTVERSION= 2.12.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= nc@FreeBSD.org @@ -75,7 +75,7 @@ PLUGINS_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkCommonCore-9.1.so:math/vtk9 + libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} PLUGINS_IMPLIES= SHAPELIB pre-configure: @@ -88,4 +88,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.png ${STAGEDIR}${PREFIX}/share/pixmaps +.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/f3d/Makefile b/graphics/f3d/Makefile index e760e0d066a..863f080022c 100644 --- a/graphics/f3d/Makefile +++ b/graphics/f3d/Makefile @@ -1,7 +1,7 @@ PORTNAME= f3d DISTVERSIONPREFIX= v DISTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -11,12 +11,16 @@ WWW= https://f3d-app.github.io/f3d/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libfreetype.so:print/freetype2 \ +LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreeimage.so:graphics/freeimage \ + libfreetype.so:print/freetype2 \ libhdf5.so:science/hdf5 \ + libImath-3_1.so:math/Imath \ libnetcdf.so:science/netcdf \ - libvtkCommonMisc-9.1.so:math/vtk9 + libvtkCommonMisc-${VTK_VER}.so:math/vtk${VTK_VER:R} -USES= cmake:testing compiler:c++17-lang desktop-file-utils gl xorg +USES= cmake:testing compiler:c++17-lang desktop-file-utils gl tcl tk xorg USE_GL= gl glu USE_XORG= ice sm x11 xt @@ -57,4 +61,5 @@ RAYTRACING_BROKEN= Requires VTK::RenderingRayTracing enabled in VTK post-install: @${RM} -r ${STAGEDIR}${DOCSDIR} +.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 17011b9460a..1a134793bf6 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= mesa -DISTVERSION= 22.2-branchpoint-3982 -DISTVERSIONSUFFIX= -g9a7e93f1f6b +DISTVERSION= 22.2-branchpoint-4095 +DISTVERSIONSUFFIX= -g977dbfc9dec +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -10,7 +11,6 @@ PATCHFILES+= 50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/- PATCHFILES+= 4356e7185193.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987 PATCHFILES+= b2a22acce617.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987 PATCHFILES+= 19eb2c30bff0.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987 -PATCHFILES+= 2be78d6ba4c7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19177 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) @@ -110,6 +110,7 @@ LTO_MESON_TRUE= b_lto VAAPI_DESC= Hardware encoding/decoding (only r600, radeonsi) VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_ENABLED= gallium-va +VAAPI_MESON_ON= -Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc VDPAU_DESC= Hardware decoding (only r600, radeonsi) (implies X11) VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index dcdf69bdeab..ea5e882de83 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1666391805 -SHA256 (mesa3d-mesa-22.2-branchpoint-3982-g9a7e93f1f6b_GH0.tar.gz) = 8592891bab7f753d68440db47a8dfea562731a615da6eeb3d89116fe82e4db31 -SIZE (mesa3d-mesa-22.2-branchpoint-3982-g9a7e93f1f6b_GH0.tar.gz) = 26227690 +TIMESTAMP = 1666658320 +SHA256 (mesa3d-mesa-22.2-branchpoint-4095-g977dbfc9dec_GH0.tar.gz) = 3219aa8861f4ab750f510f057b0a5e96c2427b25c613d8a50b2962071561e4bd +SIZE (mesa3d-mesa-22.2-branchpoint-4095-g977dbfc9dec_GH0.tar.gz) = 26230092 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 @@ -11,5 +11,3 @@ SHA256 (b2a22acce617.patch) = 9ec231cdcec3235164b0c0298d35e65225940878e75d9f972b SIZE (b2a22acce617.patch) = 2425 SHA256 (19eb2c30bff0.patch) = 238e1031e32bda8fa72bd649df857d775ffe5caec26c1d4428215cf65f564c2b SIZE (19eb2c30bff0.patch) = 1217 -SHA256 (2be78d6ba4c7.patch) = b0d2ba1c1c53a338e09849b59161a8debfa7459647944ec2e050e799fdab39ac -SIZE (2be78d6ba4c7.patch) = 1215 diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 6e5ff786334..37f83a2c516 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -12,7 +12,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 22.2.1 +MESABASEVERSION= 22.2.2 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo index a088af3f34f..da8d2f2950b 100644 --- a/graphics/mesa-dri/distinfo +++ b/graphics/mesa-dri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665746519 -SHA256 (mesa-22.2.1.tar.xz) = 0079beac0a33f45e7e0aec59e6913eafbc4268a3f1e2e330017440494f91b13c -SIZE (mesa-22.2.1.tar.xz) = 16408240 +TIMESTAMP = 1666453292 +SHA256 (mesa-22.2.2.tar.xz) = 2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9 +SIZE (mesa-22.2.2.tar.xz) = 16424508 diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile index aca22c05571..7f2fb46e491 100644 --- a/graphics/mesa-gallium-va/Makefile +++ b/graphics/mesa-gallium-va/Makefile @@ -21,6 +21,7 @@ ONLY_FOR_ARCHS= i386 amd64 aarch64 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware MESON_ARGS+= -Ddri-drivers="" \ + -Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc" \ -Dgallium-drivers="radeonsi,r600" \ -Dvulkan-drivers="" \ -Dgallium-vdpau=disabled \ diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile index 95ab382b363..c61b9cb48a2 100644 --- a/graphics/mirtk/Makefile +++ b/graphics/mirtk/Makefile @@ -1,7 +1,7 @@ PORTNAME= mirtk DISTVERSIONPREFIX= v DISTVERSION= 2.0.0-178 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONSUFFIX= -g973ce2f CATEGORIES= graphics @@ -31,7 +31,8 @@ TBB_LIB_DEPENDS= libtbb.so:devel/onetbb VTK_DESC= Build with the VTK toolkit VTK_CMAKE_BOOL= WITH_VTK -VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 \ +VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} \ libexpat.so:textproc/expat2 +.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index db1706d1ce2..a8d09526279 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencv DISTVERSION= 4.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= desktop@FreeBSD.org @@ -124,7 +124,7 @@ GTK3_CMAKE_BOOL= WITH_GTK VTK_DESC= Include VTK library support (build opencv_viz module) VTK_CMAKE_BOOL= WITH_VTK -VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 +VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} VTK_USES= qt:5 VTK_USE= QT=buildtools:build,qmake:build ### @@ -235,4 +235,5 @@ post-patch: ${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake ${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake +.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/openimageio-ociov1/Makefile b/graphics/openimageio-ociov1/Makefile index f269719643c..7545652a30f 100644 --- a/graphics/openimageio-ociov1/Makefile +++ b/graphics/openimageio-ociov1/Makefile @@ -1,7 +1,7 @@ PORTNAME= openimageio DISTVERSIONPREFIX= Release- DISTVERSION= 2.2.21.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics multimedia PKGNAMESUFFIX= -ociov1 # special port to link oiio libs with ociov1 @@ -31,6 +31,8 @@ USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio +PORTSCOUT= limit:^2\.2\. + CMAKE_ON= USE_OCIO CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ STOP_ON_WARNING USE_OPENSSL USE_QT USE_OPENGL \ diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 6bf8539792d..8161c504e3a 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -5,7 +5,7 @@ DISTVERSION= 2.4.4.2 # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index a299dd23933..e867b92e27b 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -1,7 +1,7 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v DISTVERSION= 3_5_0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= graphics MAINTAINER= FreeBSD@Shaneware.biz diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile index 00511605899..0b5962b04a6 100644 --- a/graphics/pcl-pointclouds/Makefile +++ b/graphics/pcl-pointclouds/Makefile @@ -1,6 +1,6 @@ PORTNAME= pcl DISTVERSION= 1.12.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics math MASTER_SITES= https://github.com/PointCloudLibrary/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ PKGNAMESUFFIX= -pointclouds @@ -59,7 +59,7 @@ PLIST_SUB= SHL3=${DISTVERSION} SHL2=${DISTVERSION:R} DATADIR= ${PREFIX}/share/${PORTNAME}-${DISTVERSION:R} # match the directory where the project installs .cmake files OPTIONS_DEFINE= OPENGL PNG QHULL QT5 VTK -OPTIONS_DEFAULT= PNG # QHULL is disabled due to conflicts qhull8 vs. qhull +OPTIONS_DEFAULT= PNG VTK # QHULL is disabled due to conflicts qhull8 vs. qhull OPTIONS_SUB= yes OPENGL_CMAKE_BOOL= WITH_OPENGL # it finds OpenGL, but no binaries are linked with it: https://github.com/PointCloudLibrary/pcl/issues/2641 @@ -81,7 +81,8 @@ VTK_DESC= Build VTK visualizations VTK_USES= gl qt:5 VTK_USE= GL=gl,glu QT=core,gui,opengl,widgets,buildtools:build,qmake:build VTK_CMAKE_BOOL= WITH_VTK -VTK_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 -VTK_LIB_DEPENDS= libvtkCommonCore-9.1.so:math/vtk9 +VTK_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} +VTK_LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} +.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/ptex/Makefile b/graphics/ptex/Makefile index 58911f4c572..0dcbf6578aa 100644 --- a/graphics/ptex/Makefile +++ b/graphics/ptex/Makefile @@ -1,7 +1,6 @@ PORTNAME= ptex -PORTREVISION= 2 DISTVERSIONPREFIX= v -DISTVERSION= 2.3.2 +DISTVERSION= 2.4.2 CATEGORIES?= graphics MAINTAINER= FreeBSD@Shaneware.biz @@ -18,28 +17,16 @@ USE_GITHUB= yes GH_ACCOUNT= wdas # yes really, the release tarbal doesn't know what version it is -CMAKE_ARGS+= -DPTEX_VER:STRING=${DISTVERSION} +CMAKE_ARGS+= -DPTEX_VER:STRING=${DISTVERSION} \ + -DCMAKE_INSTALL_INCLUDEDIR:STRING=${LOCALBASE}/include/ptex \ + -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= doxygen:devel/doxygen +DOCS_CMAKE_BOOL= PTEX_BUILD_DOCS -post-build-DOCS-on: - @(cd ${WRKSRC}/src/doc && doxygen Doxyfile) - -do-install: - ${INSTALL_LIB} ${BUILD_WRKSRC}/src/ptex/libPtex.so \ - ${STAGEDIR}${PREFIX}/lib - ${INSTALL_DATA} ${BUILD_WRKSRC}/src/ptex/libPtex.a \ - ${STAGEDIR}${PREFIX}/lib - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/utils/ptxinfo \ - ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}/${PREFIX}/include/ptex - ${INSTALL_DATA} ${BUILD_WRKSRC}/src/ptex/*.h ${STAGEDIR}/${PREFIX}/include/ptex - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${BUILD_WRKSRC}/src/doc/ptex/ && \ - ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR} +pre-build-DOCS-on: + @(cd ${WRKSRC}/src/doc && doxygen -u Doxyfile) .include diff --git a/graphics/ptex/distinfo b/graphics/ptex/distinfo index b811d5accaf..2e8f8483df3 100644 --- a/graphics/ptex/distinfo +++ b/graphics/ptex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557636252 -SHA256 (wdas-ptex-v2.3.2_GH0.tar.gz) = 30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b -SIZE (wdas-ptex-v2.3.2_GH0.tar.gz) = 308550 +TIMESTAMP = 1666543361 +SHA256 (wdas-ptex-v2.4.2_GH0.tar.gz) = c8235fb30c921cfb10848f4ea04d5b662ba46886c5e32ad5137c5086f3979ee1 +SIZE (wdas-ptex-v2.4.2_GH0.tar.gz) = 312942 diff --git a/graphics/ptex/files/patch-CMakeLists.txt b/graphics/ptex/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..b214fc58256 --- /dev/null +++ b/graphics/ptex/files/patch-CMakeLists.txt @@ -0,0 +1,18 @@ +--- CMakeLists.txt.orig 2022-08-05 02:02:51 UTC ++++ CMakeLists.txt +@@ -3,6 +3,7 @@ option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex sh + + option(PTEX_BUILD_STATIC_LIBS "Enable building Ptex static libraries" ON) + option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON) ++option(PTEX_BUILD_DOCS "Enable building Ptex documentation (require Doxygen)" OFF) + option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF) + + # The C++ standard can set either through the environment or by specifyign +@@ -114,5 +115,7 @@ add_subdirectory(src/tests) + add_subdirectory(src/ptex) + add_subdirectory(src/utils) + add_subdirectory(src/tests) ++if (PTEX_BUILD_DOCS) + add_subdirectory(src/doc) ++endif () + add_subdirectory(src/build) diff --git a/graphics/ptex/files/patch-ptex__PtexPlatform.h b/graphics/ptex/files/patch-src_ptex_PtexPlatform.h similarity index 55% rename from graphics/ptex/files/patch-ptex__PtexPlatform.h rename to graphics/ptex/files/patch-src_ptex_PtexPlatform.h index e03bb56b14b..999af334448 100644 --- a/graphics/ptex/files/patch-ptex__PtexPlatform.h +++ b/graphics/ptex/files/patch-src_ptex_PtexPlatform.h @@ -1,6 +1,6 @@ ---- src/ptex/PtexPlatform.h.orig 2015-02-12 16:37:58 UTC +--- src/ptex/PtexPlatform.h.orig 2022-08-05 02:02:51 UTC +++ src/ptex/PtexPlatform.h -@@ -60,7 +60,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE +@@ -70,7 +70,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O // linux/unix/posix #include @@ -9,4 +9,4 @@ +#endif #include #include - // OS for spinlock + diff --git a/graphics/ptex/files/patch-ptex__PtexWriter.cpp b/graphics/ptex/files/patch-src_ptex_PtexWriter.cpp similarity index 55% rename from graphics/ptex/files/patch-ptex__PtexWriter.cpp rename to graphics/ptex/files/patch-src_ptex_PtexWriter.cpp index 8491ab115a4..c8f9366a487 100644 --- a/graphics/ptex/files/patch-ptex__PtexWriter.cpp +++ b/graphics/ptex/files/patch-src_ptex_PtexWriter.cpp @@ -1,6 +1,6 @@ ---- src/ptex/PtexWriter.cpp.orig 2015-02-12 16:37:58 UTC +--- src/ptex/PtexWriter.cpp.orig 2022-08-05 02:02:51 UTC +++ src/ptex/PtexWriter.cpp -@@ -66,6 +66,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE +@@ -66,6 +66,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O #include #include #include diff --git a/graphics/ptex/pkg-plist b/graphics/ptex/pkg-plist index 4cc550dcf7e..fa3a8e805fa 100644 --- a/graphics/ptex/pkg-plist +++ b/graphics/ptex/pkg-plist @@ -1,28 +1,24 @@ bin/ptxinfo -lib/libPtex.a -lib/libPtex.so -include/ptex/PtexCache.h +include/ptex/PtexExports.h include/ptex/PtexHalf.h -include/ptex/PtexHalfTables.h -include/ptex/PtexHashMap.h include/ptex/PtexInt.h -include/ptex/PtexIO.h -include/ptex/PtexMutex.h include/ptex/PtexPlatform.h -include/ptex/PtexReader.h -include/ptex/PtexSeparableFilter.h -include/ptex/PtexSeparableKernel.h -include/ptex/PtexTriangleFilter.h -include/ptex/PtexTriangleKernel.h -include/ptex/Ptexture.h include/ptex/PtexUtils.h include/ptex/PtexVersion.h -include/ptex/PtexWriter.h -%%PORTDOCS%%%%DOCSDIR%%/License_8txt.html +include/ptex/Ptexture.h +lib/libPtex.a +lib/libPtex.so +lib/libPtex.so.2.4 +share/cmake/Ptex/ptex-config-version.cmake +share/cmake/Ptex/ptex-config.cmake +share/cmake/Ptex/ptex-exports-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/Ptex/ptex-exports.cmake %%PORTDOCS%%%%DOCSDIR%%/PtexCache_8cpp.html %%PORTDOCS%%%%DOCSDIR%%/PtexCache_8cpp_source.html %%PORTDOCS%%%%DOCSDIR%%/PtexCache_8h.html %%PORTDOCS%%%%DOCSDIR%%/PtexCache_8h_source.html +%%PORTDOCS%%%%DOCSDIR%%/PtexExports_8h.html +%%PORTDOCS%%%%DOCSDIR%%/PtexExports_8h_source.html %%PORTDOCS%%%%DOCSDIR%%/PtexFilters_8cpp.html %%PORTDOCS%%%%DOCSDIR%%/PtexFilters_8cpp_source.html %%PORTDOCS%%%%DOCSDIR%%/PtexHalfTableGen_8cpp.html @@ -79,6 +75,7 @@ include/ptex/PtexWriter.h %%PORTDOCS%%%%DOCSDIR%%/apiintro.html %%PORTDOCS%%%%DOCSDIR%%/apiintro_8txt.html %%PORTDOCS%%%%DOCSDIR%%/bc_s.png +%%PORTDOCS%%%%DOCSDIR%%/bc_sd.png %%PORTDOCS%%%%DOCSDIR%%/bdwn.png %%PORTDOCS%%%%DOCSDIR%%/classAutoLock-members.html %%PORTDOCS%%%%DOCSDIR%%/classAutoLock.html @@ -217,12 +214,14 @@ include/ptex/PtexWriter.h %%PORTDOCS%%%%DOCSDIR%%/dir_ae2047f671a609e8080f0f626fd72399.html %%PORTDOCS%%%%DOCSDIR%%/doc.png %%PORTDOCS%%%%DOCSDIR%%/doc_2CMakeLists_8txt.html +%%PORTDOCS%%%%DOCSDIR%%/docd.png %%PORTDOCS%%%%DOCSDIR%%/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/doxygen__log_8txt.html %%PORTDOCS%%%%DOCSDIR%%/doxygen.svg +%%PORTDOCS%%%%DOCSDIR%%/doxygen__log_8txt.html %%PORTDOCS%%%%DOCSDIR%%/dynsections.js %%PORTDOCS%%%%DOCSDIR%%/files.html %%PORTDOCS%%%%DOCSDIR%%/filterfootprint.html +%%PORTDOCS%%%%DOCSDIR%%/filterfootprint_8txt.html %%PORTDOCS%%%%DOCSDIR%%/folderclosed.png %%PORTDOCS%%%%DOCSDIR%%/folderopen.png %%PORTDOCS%%%%DOCSDIR%%/functions.html @@ -322,12 +321,15 @@ include/ptex/PtexWriter.h %%PORTDOCS%%%%DOCSDIR%%/namespacemembers_vars.html %%PORTDOCS%%%%DOCSDIR%%/namespaces.html %%PORTDOCS%%%%DOCSDIR%%/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/nav_fd.png %%PORTDOCS%%%%DOCSDIR%%/nav_g.png %%PORTDOCS%%%%DOCSDIR%%/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/nav_hd.png %%PORTDOCS%%%%DOCSDIR%%/open.png %%PORTDOCS%%%%DOCSDIR%%/pages.html %%PORTDOCS%%%%DOCSDIR%%/ptex_2CMakeLists_8txt.html %%PORTDOCS%%%%DOCSDIR%%/splitbar.png +%%PORTDOCS%%%%DOCSDIR%%/splitbard.png %%PORTDOCS%%%%DOCSDIR%%/structAtomicCompareAndSwapImpl.html %%PORTDOCS%%%%DOCSDIR%%/structAtomicCompareAndSwapImpl_3_01T_00_01sizeof_07uint32__t_08_4-members.html %%PORTDOCS%%%%DOCSDIR%%/structAtomicCompareAndSwapImpl_3_01T_00_01sizeof_07uint32__t_08_4.html @@ -383,10 +385,16 @@ include/ptex/PtexWriter.h %%PORTDOCS%%%%DOCSDIR%%/structPtex_1_1FaceInfo.html %%PORTDOCS%%%%DOCSDIR%%/structPtex_1_1Res-members.html %%PORTDOCS%%%%DOCSDIR%%/structPtex_1_1Res.html +%%PORTDOCS%%%%DOCSDIR%%/style.css %%PORTDOCS%%%%DOCSDIR%%/sync_off.png %%PORTDOCS%%%%DOCSDIR%%/sync_on.png %%PORTDOCS%%%%DOCSDIR%%/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/tab_ad.png %%PORTDOCS%%%%DOCSDIR%%/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/tab_bd.png %%PORTDOCS%%%%DOCSDIR%%/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/tab_hd.png %%PORTDOCS%%%%DOCSDIR%%/tab_s.png +%%PORTDOCS%%%%DOCSDIR%%/tab_sd.png %%PORTDOCS%%%%DOCSDIR%%/tabs.css +%%PORTDOCS%%%%DOCSDIR%%/uvellipse.png diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 3cf99e3a366..da3da21e75c 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -1,5 +1,6 @@ PORTNAME= mayavi DISTVERSION= 4.8.1 +PORTREVISION= 1 CATEGORIES= graphics science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,12 +19,11 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/image_LICENSE_OOo.txt LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE_YORICK.txt LICENSE_FILE_APACHE11= ${WRKSRC}/LICENSE_COLORBREWER.txt -BUILD_DEPENDS= vtk9>0:math/vtk9 \ - ${PYNUMPY} \ +BUILD_DEPENDS= ${PYNUMPY} \ ${PY_SPHINX} \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} -RUN_DEPENDS= vtk9>0:math/vtk9 \ - ${PYNUMPY} \ +LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} +RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}apptools>0:devel/py-apptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}envisage>0:devel/py-envisage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyface>=6.1.1:devel/py-pyface@${PY_FLAVOR} \ @@ -52,4 +52,5 @@ fix-plist: do-test: @${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${WRKSRC}/examples/mayavi/interactive/coil_design_application.py +.include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/py-pyvista/Makefile b/graphics/py-pyvista/Makefile index a21b438873d..22f6e6bbeb0 100644 --- a/graphics/py-pyvista/Makefile +++ b/graphics/py-pyvista/Makefile @@ -1,5 +1,6 @@ PORTNAME= pyvista DISTVERSION= 0.34.2 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,11 +17,12 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scooby>=0.5.1:devel/py-scooby@${PY_FLAVOR} \ - vtk9>0:math/vtk9 + vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} USES= python:3.6+ USE_PYTHON= distutils autoplist NO_ARCH= yes +.include <../../math/vtk9/Makefile.version> .include diff --git a/lang/erlang-runtime25/Makefile b/lang/erlang-runtime25/Makefile index 3c3840f0afa..169e5c82f0c 100644 --- a/lang/erlang-runtime25/Makefile +++ b/lang/erlang-runtime25/Makefile @@ -1,6 +1,6 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- -DISTVERSION= 25.1.1 +DISTVERSION= 25.1.2 PORTREVISION= 0 CATEGORIES= lang parallel java PKGNAMESUFFIX= -runtime25 diff --git a/lang/erlang-runtime25/distinfo b/lang/erlang-runtime25/distinfo index f7cb92913f1..b432a713d0f 100644 --- a/lang/erlang-runtime25/distinfo +++ b/lang/erlang-runtime25/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1664804671 -SHA256 (erlang/erlang-otp-OTP-25.1.1_GH0.tar.gz) = 3348616450868fa8b39bddf0b528030e4525afef5b30e3a4b54c375add7d3f4f -SIZE (erlang/erlang-otp-OTP-25.1.1_GH0.tar.gz) = 59974226 +TIMESTAMP = 1666615139 +SHA256 (erlang/erlang-otp-OTP-25.1.2_GH0.tar.gz) = b9ae7becd3499aeac9f94f9379e2b1b4dced4855454fe7f200a6e3e1cf4fbc53 +SIZE (erlang/erlang-otp-OTP-25.1.2_GH0.tar.gz) = 59975596 SHA256 (erlang/erlang-corba-5.1_GH0.tar.gz) = 03497d71098c474b330794dd523ef19ef20a47c0e2d441009d6cf929455c468f SIZE (erlang/erlang-corba-5.1_GH0.tar.gz) = 1392861 diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile index f7eeb62f9ea..fd4d483d836 100644 --- a/lang/gcc13-devel/Makefile +++ b/lang/gcc13-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= gcc -PORTVERSION= 13.0.0.s20221016 +PORTVERSION= 13.0.0.s20221023 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc13-devel/distinfo b/lang/gcc13-devel/distinfo index 81353978a41..130d786510e 100644 --- a/lang/gcc13-devel/distinfo +++ b/lang/gcc13-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666033981 -SHA256 (gcc-13-20221016.tar.xz) = ddac9e7c71415e67b254af3f245701b256ab457e8b7ee1491d7f079ab883b9c5 -SIZE (gcc-13-20221016.tar.xz) = 79994328 +TIMESTAMP = 1666624953 +SHA256 (gcc-13-20221023.tar.xz) = db7beb9c2c36fa96028d62337c0a1e599dae20ead34e1acebdf14fe7ee922d4e +SIZE (gcc-13-20221023.tar.xz) = 80060928 diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 0cb9119dd41..68ffc2218ba 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -1,6 +1,5 @@ PORTNAME= msmtp -PORTVERSION= 1.8.20 -PORTREVISION= 1 +PORTVERSION= 1.8.22 CATEGORIES= mail MASTER_SITES= https://marlam.de/msmtp/releases/ diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo index c2fb0f29be3..7be7584c3e3 100644 --- a/mail/msmtp/distinfo +++ b/mail/msmtp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648219861 -SHA256 (msmtp-1.8.20.tar.xz) = d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111 -SIZE (msmtp-1.8.20.tar.xz) = 385696 +TIMESTAMP = 1666633749 +SHA256 (msmtp-1.8.22.tar.xz) = 1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7 +SIZE (msmtp-1.8.22.tar.xz) = 390692 diff --git a/mail/p5-Email-Simple-FromHandle/Makefile b/mail/p5-Email-Simple-FromHandle/Makefile index 3a2ea24ddcd..b4877be2814 100644 --- a/mail/p5-Email-Simple-FromHandle/Makefile +++ b/mail/p5-Email-Simple-FromHandle/Makefile @@ -1,6 +1,5 @@ PORTNAME= Email-Simple-FromHandle -PORTVERSION= 0.054 -PORTREVISION= 1 +PORTVERSION= 0.055 CATEGORIES= mail perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/mail/p5-Email-Simple-FromHandle/distinfo b/mail/p5-Email-Simple-FromHandle/distinfo index 7ecee3d0def..be8b289e694 100644 --- a/mail/p5-Email-Simple-FromHandle/distinfo +++ b/mail/p5-Email-Simple-FromHandle/distinfo @@ -1,2 +1,3 @@ -SHA256 (Email-Simple-FromHandle-0.054.tar.gz) = b750e7599016f7825b5398f662d86c935802ba1fcef6ff75e175c401e3fd1b6a -SIZE (Email-Simple-FromHandle-0.054.tar.gz) = 23595 +TIMESTAMP = 1666631335 +SHA256 (Email-Simple-FromHandle-0.055.tar.gz) = c5a101ec4e8785d48713c657f469e9340473323ce768b981d6d37e951fcc8836 +SIZE (Email-Simple-FromHandle-0.055.tar.gz) = 26795 diff --git a/math/Makefile b/math/Makefile index b96cea6c62c..2c40d2122b7 100644 --- a/math/Makefile +++ b/math/Makefile @@ -556,6 +556,7 @@ SUBDIR += octave-forge-image SUBDIR += octave-forge-informationtheory SUBDIR += octave-forge-integration + SUBDIR += octave-forge-internal-fluid-flow SUBDIR += octave-forge-interval SUBDIR += octave-forge-io SUBDIR += octave-forge-irsa @@ -601,6 +602,7 @@ SUBDIR += octave-forge-special-matrix SUBDIR += octave-forge-splines SUBDIR += octave-forge-statistics + SUBDIR += octave-forge-statistics-bootstrap SUBDIR += octave-forge-stk SUBDIR += octave-forge-strings SUBDIR += octave-forge-struct diff --git a/math/octave-forge-internal-fluid-flow/Makefile b/math/octave-forge-internal-fluid-flow/Makefile new file mode 100644 index 00000000000..5b44a3452e2 --- /dev/null +++ b/math/octave-forge-internal-fluid-flow/Makefile @@ -0,0 +1,30 @@ +PORTNAME= octave-forge-internal-fluid-flow +DISTVERSIONPREFIX= v +DISTVERSION= 0.2.2 +CATEGORIES= math + +MAINTAINER= stephen@FreeBSD.org +COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +WWW= http://octave.sourceforge.net/ + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING + +USE_GITHUB= yes +GH_ACCOUNT= aumpierre-unb +GH_PROJECT= internal-Fluid-Flow-for-GNU-Octave + +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= Internal-Fluid-Flow-for-GNU-Octave-${DISTVERSION} + +.include "${.CURDIR}/../../Mk/bsd.octave.mk" + +do-build: + @${DO_NADA} + +post-build: + ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure + cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC} + +.include diff --git a/math/octave-forge-internal-fluid-flow/distinfo b/math/octave-forge-internal-fluid-flow/distinfo new file mode 100644 index 00000000000..044ce6564a7 --- /dev/null +++ b/math/octave-forge-internal-fluid-flow/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1666675533 +SHA256 (octave-forge/aumpierre-unb-internal-Fluid-Flow-for-GNU-Octave-v0.2.2_GH0.tar.gz) = 34c95b1900cfedba399c3edfa5b1f17c51022cbbf565ee731aa6ae8177e05b17 +SIZE (octave-forge/aumpierre-unb-internal-Fluid-Flow-for-GNU-Octave-v0.2.2_GH0.tar.gz) = 189380 diff --git a/math/octave-forge-internal-fluid-flow/pkg-descr b/math/octave-forge-internal-fluid-flow/pkg-descr new file mode 100644 index 00000000000..b14aa8e0b26 --- /dev/null +++ b/math/octave-forge-internal-fluid-flow/pkg-descr @@ -0,0 +1,8 @@ +The octave-forge package is the result of The GNU Octave Repositry project, +which is intended to be a central location for custom scripts, functions and +extensions for GNU Octave. contains the source for all the functions plus +build and install scripts. + +This is internal-fluid-flow. + + A toolbox for internal fluid flow for GNU Octave. diff --git a/math/octave-forge-statistics-bootstrap/Makefile b/math/octave-forge-statistics-bootstrap/Makefile new file mode 100644 index 00000000000..cc8ea3364cd --- /dev/null +++ b/math/octave-forge-statistics-bootstrap/Makefile @@ -0,0 +1,33 @@ +PORTNAME= octave-forge-statistics-bootstrap +DISTVERSIONPREFIX= v +DISTVERSION= 5.0.2 +PORTREVISION= 1 +CATEGORIES= math + +MAINTAINER= stephen@FreeBSD.org +COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +WWW= http://octave.sourceforge.net/ + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING + +USE_GITHUB= yes +GH_ACCOUNT= gnu-octave +GH_PROJECT= statistics-bootstrap + +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${GH_PROJECT}-${DISTVERSION} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src +ALL_TARGET= make + +RUN_DEPENDS+= ${TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics + +.include "${.CURDIR}/../../Mk/bsd.octave.mk" + +post-build: + ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure + cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC} + +.include diff --git a/math/octave-forge-statistics-bootstrap/distinfo b/math/octave-forge-statistics-bootstrap/distinfo new file mode 100644 index 00000000000..c2768131397 --- /dev/null +++ b/math/octave-forge-statistics-bootstrap/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1666673900 +SHA256 (octave-forge/gnu-octave-statistics-bootstrap-v5.0.2_GH0.tar.gz) = a08a880012e3bab62a5bb083e6096ee28cc1c91f4507b92d153200553bf9c176 +SIZE (octave-forge/gnu-octave-statistics-bootstrap-v5.0.2_GH0.tar.gz) = 986681 diff --git a/math/octave-forge-statistics-bootstrap/files/patch-DESCRIPTION b/math/octave-forge-statistics-bootstrap/files/patch-DESCRIPTION new file mode 100644 index 00000000000..fef9d32199d --- /dev/null +++ b/math/octave-forge-statistics-bootstrap/files/patch-DESCRIPTION @@ -0,0 +1,9 @@ +--- ../DESCRIPTION.orig 2022-10-25 00:32:14.447435000 -0500 ++++ ../DESCRIPTION 2022-10-25 00:32:21.641290000 -0500 +@@ -1,5 +1,5 @@ + name: statistics-bootstrap +-version: 5.0.1 ++version: 5.0.2 + date: 2022-10-10 + author: Andrew Penn + maintainer: Andrew Penn diff --git a/math/octave-forge-statistics-bootstrap/pkg-descr b/math/octave-forge-statistics-bootstrap/pkg-descr new file mode 100644 index 00000000000..cadaa3d2687 --- /dev/null +++ b/math/octave-forge-statistics-bootstrap/pkg-descr @@ -0,0 +1,9 @@ +The octave-forge package is the result of The GNU Octave Repositry project, +which is intended to be a central location for custom scripts, functions and +extensions for GNU Octave. contains the source for all the functions plus +build and install scripts. + +This is statistics-bootstrap. + + Estimate bias, uncertainty (standard errors and confidence intervals) and +test hypotheses (p-values) using bootstrap resampling methods. diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile index 4f9a41f9831..84433384bbc 100644 --- a/math/octave-forge-statistics/Makefile +++ b/math/octave-forge-statistics/Makefile @@ -1,21 +1,24 @@ PORTNAME= octave-forge-statistics -PORTVERSION= 1.4.3 -PORTREVISION= 1 +DISTVERSIONPREFIX= release- +DISTVERSION= 1.5.0 CATEGORIES= math -MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases -DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL} MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} WWW= http://octave.sourceforge.net/ +LICENSE= GPLv3 +LICENSE_FILE= ${WRKDIR}/${OCTSRC}/CONTRIBUTE.md + +USE_GITHUB= yes +GH_ACCOUNT= gnu-octave +GH_PROJECT= statistics + # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. -OCTSRC= ${DISTNAME} +OCTSRC= ${GH_PROJECT}-release-${DISTVERSION} -RUN_DEPENDS+= ${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io WRKSRC= ${WRKDIR}/${OCTSRC}/src -GNU_CONFIGURE= yes .include "${.CURDIR}/../../Mk/bsd.octave.mk" diff --git a/math/octave-forge-statistics/distinfo b/math/octave-forge-statistics/distinfo index d8a97174d7a..e3289d5606a 100644 --- a/math/octave-forge-statistics/distinfo +++ b/math/octave-forge-statistics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638848127 -SHA256 (octave-forge/statistics-1.4.3.tar.gz) = 9801b8b4feb26c58407c136a9379aba1e6a10713829701bb3959d9473a67fa05 -SIZE (octave-forge/statistics-1.4.3.tar.gz) = 394639 +TIMESTAMP = 1666674475 +SHA256 (octave-forge/gnu-octave-statistics-release-1.5.0_GH0.tar.gz) = 5f5a67b99eda8550ccc32f68f30361510bce43135c65eebf5d995fd72d4553f7 +SIZE (octave-forge/gnu-octave-statistics-release-1.5.0_GH0.tar.gz) = 588263 diff --git a/math/sundials/Makefile b/math/sundials/Makefile index ee3c9035cff..3b9ea304c77 100644 --- a/math/sundials/Makefile +++ b/math/sundials/Makefile @@ -1,11 +1,11 @@ PORTNAME= sundials DISTVERSION= 6.4.0 CATEGORIES= math -MASTER_SITES= https://github.com/LLNL/sundials/archive/v${DISTVERSION}/ +MASTER_SITES= https://github.com/LLNL/sundials/releases/download/v${DISTVERSION}/ MAINTAINER= yuri@FreeBSD.org COMMENT= SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers -WWW= https://computation.llnl.gov/projects/sundials +WWW= https://computing.llnl.gov/projects/sundials LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE @@ -13,14 +13,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing fortran localbase:ldflags python:build # 4 tests fail, see https://github.com/LLNL/sundials/issues/220 USE_LDCONFIG= yes -CMAKE_ARGS= -DENABLE_PTHREAD:BOOL=ON \ - -DBUILD_STATIC_LIBS:BOOL=OFF \ - -DCMAKE_C_STANDARD=99 -CMAKE_OFF= EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 +CMAKE_ARGS= -DCMAKE_C_STANDARD=99 +CMAKE_ON= ENABLE_PTHREAD +CMAKE_OFF= BUILD_STATIC_LIBS \ + EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 CMAKE_TESTING_ON= SUNDIALS_TEST_UNITTESTS \ EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 -FCFLAGS:= ${FFLAGS} # project checks that these flags are equal +FCFLAGS:= ${FFLAGS} # project checks that these flags are equal OPTIONS_DEFINE= BLAS EXAMPLES KLU LAPACK MPI OPENMP OPTIONS_DEFAULT= KLU LAPACK MPI OPENMP diff --git a/math/sundials/distinfo b/math/sundials/distinfo index 56a04997174..b0cc1f57eff 100644 --- a/math/sundials/distinfo +++ b/math/sundials/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666460608 -SHA256 (sundials-6.4.0.tar.gz) = 3cbf0102c3284dc550a9faf85ace030ca6d02fe70e90afa2d0d8074a098a3948 -SIZE (sundials-6.4.0.tar.gz) = 30316317 +TIMESTAMP = 1666629841 +SHA256 (sundials-6.4.0.tar.gz) = 0aff803a12c6d298d05b56839197dd09858631864017e255ed89e28b49b652f1 +SIZE (sundials-6.4.0.tar.gz) = 89259428 diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile index ab4d25021d4..b7edd31d79f 100644 --- a/math/vtk6/Makefile +++ b/math/vtk6/Makefile @@ -12,6 +12,9 @@ WWW= https://www.vtk.org LICENSE= BSD3CLAUSE +DEPRECATED= Old version not used anywhere in the ports tree +EXPIRATION_DATE= 2022-12-23 + LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index bfd29082a0a..6b6aa3281f7 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,5 @@ PORTNAME= vtk -DISTVERSION= 9.1.0 -PORTREVISION= 8 +DISTVERSION= 9.2.2 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 @@ -35,30 +34,35 @@ CMAKE_ARGS= -DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \ -DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \ -DSTAGEDIR=${STAGEDIR} # all build options are documented here: https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/build.md + # all modules can be obtailed by: find . -name vtk.module + # there's also CMake/vtkWrapSettings.cmake with options # disable finding Qt6 CMAKE_ON+= CMAKE_DISABLE_FIND_PACKAGE_Qt6 +# enable all modules +#CMAKE_ON+= VTK_BUILD_ALL_MODULES + VTK_SHORT_VER= ${PORTVERSION:R} DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options -OPTIONS_DEFINE= DESIGNER DOCS MPI OSMESA PYTHON QT5 EXAMPLES -OPTIONS_DEFAULT= MPI PYTHON QT5 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage. +OPTIONS_DEFINE= DESIGNER DOCS OMPI OSMESA PYTHON QT5 EXAMPLES +OPTIONS_DEFAULT= OMPI PYTHON QT5 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage. OSMESA_DESC= Use Mesa for off-screen rendering +OMPI_DESC= OpenMPI (Message Passing Interface) support DESIGNER_DESC= Build the Qt Designer plugin OPTIONS_SUB= yes -# Options groups -VTK_WRAPS= JAVA TCLTK -OPTIONS_GROUP= WRAPPING -OPTIONS_GROUP_WRAPPING=${VTK_WRAPS} -GROUPS_DESC= Groups -WRAPPING_DESC= Wrapping -.for w in ${VTK_WRAPS} -$w_DESC= $w wrapping +# Option groups that enable groups of modules in VTK +VTK_GROUPS= JAVA TCLTK +OPTIONS_GROUP= GROUPS +OPTIONS_GROUP_GROUPS= ${VTK_GROUPS} +GROUPS_DESC= Groups +.for w in ${VTK_GROUPS} +$w_DESC= Enable $w group .endfor PYTHON_USES= python:3.6+ @@ -68,19 +72,20 @@ PYTHON_VARS= SUB_FILES=PKG-INFO SUB_LIST=PORTVERSION=${PORTVERSION} QT5_USES= qt:5 QT5_USE= QT=core,declarative,gui,network,opengl,sql,uiplugin,widgets,x11extras,qmake:build,buildtools:build -QT5_CMAKE_ON= -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \ - -DVTK_GROUP_ENABLE_Qt:STRING=YES \ - -DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES +QT5_CMAKE_ON= -DVTK_GROUP_ENABLE_Qt:STRING=YES \ + -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 + +#QT6_USES= qt:6 +#QT6_USE= QT=base,declarative,tools:build +#QT6_CMAKE_ON= -DVTK_GROUP_ENABLE_Qt:STRING=YES \ + -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 DESIGNER_CMAKE_BOOL= QT_DESIGNER_PLUGIN DESIGNER_USE= QT=designer DESIGNER_IMPLIES= QT5 -MPI_CMAKE_BOOL= VTK_USE_MPI -#MPI_USES= mpi:openmpi # fails, needs investigation: The following options helpers are incorrectly set after bsd.port.options.mk and are ineffective: MPI_CFLAGS MPI_LIBS -MPI_BUILD_DEPENDS= openmpi>0:net/openmpi -MPI_RUN_DEPENDS= openmpi>0:net/openmpi -MPI_CMAKE_ON= -DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec +OMPI_CMAKE_BOOL= VTK_USE_MPI +OMPI_USES= mpi:openmpi OSMESA_CMAKE_ON= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ @@ -89,17 +94,15 @@ OSMESA_CMAKE_ON= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DVTK_USE_X:BOOL=OFF OSMESA_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa -# Wrapping -JAVA_CATEGORIES= java JAVA_VARS= USE_JAVA=yes -JAVA_CMAKE_BOOL= VTK_WRAP_JAVA Module_vtkWrappingJava +JAVA_CMAKE_BOOL= VTK_WRAP_JAVA JAVA_CMAKE_ON= -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \ -DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \ -DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so TCLTK_USES= tk -TCLTK_CMAKE_BOOL= VTK_WRAP_TCL VTK_Group_Tk -TCLTK_CMAKE_ON= -DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \ +TCLTK_CMAKE_ON= -DVTK_GROUP_ENABLE_Tk:STRING=YES \ + -DTCL_INCLUDE_PATH:PATH=${TCL_INCLUDEDIR} \ -DTK_INCLUDE_PATH:PATH=${TK_INCLUDEDIR} \ -DVTK_INSTALL_TCL_DIR=lib/vtk-${VTK_SHORT_VER} @@ -115,7 +118,7 @@ USES+= gl USE_GL= gl glu .endif -.if ${PORT_OPTIONS:MPYTHON} && ${PORT_OPTIONS:MMPI} +.if ${PORT_OPTIONS:MPYTHON} && ${PORT_OPTIONS:MOMPI} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} .endif diff --git a/math/vtk9/distinfo b/math/vtk9/distinfo index cfc8330ff50..8985e4d4b04 100644 --- a/math/vtk9/distinfo +++ b/math/vtk9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637434253 -SHA256 (VTK-9.1.0.tar.gz) = 8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96 -SIZE (VTK-9.1.0.tar.gz) = 47871165 +TIMESTAMP = 1665288935 +SHA256 (VTK-9.2.2.tar.gz) = 1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075 +SIZE (VTK-9.2.2.tar.gz) = 53801737 diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c deleted file mode 100644 index e52da58e387..00000000000 --- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__utils.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.orig 2022-06-22 15:58:58.543731000 +0200 -+++ ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-22 16:00:28.263448000 +0200 -@@ -1770,7 +1770,9 @@ - */ - - /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ -+#if !defined(NC_SZIP_NN) - const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ -+#endif - /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ - const int SZIP_PIXELS_PER_BLOCK = - file->compression_level == 0 ? 32 : file->compression_level; diff --git a/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c b/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c deleted file mode 100644 index bd453a0dc9c..00000000000 --- a/math/vtk9/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ThirdParty/libproj/vtklibproj/src/pj_mutex.c.orig 2020-04-25 01:23:01 UTC -+++ ThirdParty/libproj/vtklibproj/src/pj_mutex.c -@@ -124,7 +124,7 @@ void pj_acquire_lock() - pthread_mutex_lock( &pj_precreated_lock); - - pthread_mutexattr_init(&mutex_attr); --#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE -+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__) - pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE); - #else - pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP); diff --git a/net/empty/Makefile b/net/empty/Makefile index d9337db289f..cf48cddbcae 100644 --- a/net/empty/Makefile +++ b/net/empty/Makefile @@ -1,5 +1,5 @@ PORTNAME= empty -PORTVERSION= 0.6.20b +PORTVERSION= 0.6.22b CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -10,11 +10,12 @@ WWW= http://empty.sourceforge.net/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -DOCS= CHANGELOG COPYRIGHT README README.CYGWIN +USES= tar:tgz + +DOCS= CHANGELOG COPYRIGHT README.txt README.CYGWIN EXAMPLES= README em_ssh.sh em_ssh_2.sh em_sh.sh \ em_telnet.sh em_telnet_2.sh emsu.sh runtests.sh MAKE_ARGS+= CC="${CC}" -USES= tar:tgz OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/net/empty/distinfo b/net/empty/distinfo index f5d6800feaf..a4642b14895 100644 --- a/net/empty/distinfo +++ b/net/empty/distinfo @@ -1,2 +1,3 @@ -SHA256 (empty-0.6.20b.tgz) = 7e6636e400856984c4405ce7bd0843aaa3329fa3efd20c58df8400a9eaa35f09 -SIZE (empty-0.6.20b.tgz) = 16269 +TIMESTAMP = 1666604526 +SHA256 (empty-0.6.22b.tgz) = f581d560e1fa857f5304586e3c2107b5838bcf11dedcccec4a7191fa9e261b69 +SIZE (empty-0.6.22b.tgz) = 16496 diff --git a/net/empty/pkg-plist b/net/empty/pkg-plist index d47e41696e8..66bd61d28e4 100644 --- a/net/empty/pkg-plist +++ b/net/empty/pkg-plist @@ -2,7 +2,7 @@ bin/empty man/man1/empty.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/README.CYGWIN %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/em_sh.sh diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile index 6c0da25a26a..a10b44920fe 100644 --- a/net/miniupnpc/Makefile +++ b/net/miniupnpc/Makefile @@ -1,6 +1,5 @@ PORTNAME= miniupnpc -PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTVERSION= 2.2.4 CATEGORIES?= net MASTER_SITES= http://miniupnp.free.fr/files/ diff --git a/net/miniupnpc/distinfo b/net/miniupnpc/distinfo index 2a139563ebe..5ec90bd4aaf 100644 --- a/net/miniupnpc/distinfo +++ b/net/miniupnpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644226514 -SHA256 (miniupnpc-2.2.3.tar.gz) = dce41b4a4f08521c53a0ab163ad2007d18b5e1aa173ea5803bd47a1be3159c24 -SIZE (miniupnpc-2.2.3.tar.gz) = 101360 +TIMESTAMP = 1666530555 +SHA256 (miniupnpc-2.2.4.tar.gz) = 481a5e4aede64e9ef29895b218836c3608d973e77a35b4f228ab1f3629412c4b +SIZE (miniupnpc-2.2.4.tar.gz) = 102932 diff --git a/net/miniupnpc/files/patch-Makefile b/net/miniupnpc/files/patch-Makefile index 0e4fa4af58c..52eeb0a1b62 100644 --- a/net/miniupnpc/files/patch-Makefile +++ b/net/miniupnpc/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-09-28 21:11:31 UTC +--- Makefile.orig 2022-10-19 22:49:03 UTC +++ Makefile @@ -147,7 +147,6 @@ TESTIGDDESCPARSE += $(BUILD)/minissdpc.o LIBOBJS += $(BUILD)/minissdpc.o @@ -8,7 +8,7 @@ # install directories ifeq ($(strip $(PREFIX)),) INSTALLPREFIX ?= /usr -@@ -155,14 +154,14 @@ else +@@ -155,9 +154,9 @@ else INSTALLPREFIX ?= $(PREFIX) endif INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc @@ -20,12 +20,6 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) - ifeq (, $(findstring amiga, $(OS))) --FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc -+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc - endif - - @@ -242,7 +241,7 @@ distclean: clean updateversion: include/miniupnpc.h @@ -35,23 +29,3 @@ install: updateversion $(FILESTOINSTALL) $(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC) -@@ -251,15 +250,15 @@ install: updateversion $(FILESTOINSTALL) - $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB) - ifeq (, $(findstring amiga, $(OS))) - $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME) -- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY) -+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/libminiupnpc.so - $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) -- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) -+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) - endif - $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN) - ifneq (, $(findstring amiga, $(OS))) -- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc - else -- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc - endif - $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip - ifeq (, $(findstring amiga, $(OS))) diff --git a/net/serviio/Makefile b/net/serviio/Makefile index 91e69ab8bd8..3efdf9c0ba8 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -1,5 +1,5 @@ PORTNAME= serviio -PORTVERSION= 2.2.1 +PORTVERSION= 2.3 PORTREVISION= 0 CATEGORIES= net multimedia java www MASTER_SITES= https://download.serviio.org/releases/ @@ -50,8 +50,8 @@ do-install: # to be used with a non-standard PREFIX for just this port # e.g. PREFIX=/porttest -mkplist: - ${FIND} ${STAGEDIR}${PREFIX}/ -type f | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; s:share/java/classes:%%JAVAJARDIR%%:g ; s:etc/serviio:@sample %%ETCDIR%%:g" | ${GREP} -v etc/rc.d | ${SORT} >${PLIST}.new +gen-plist: + ${FIND} ${STAGEDIR}${PREFIX}/ -type f | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; s:share/java/classes:%%JAVAJARDIR%%:g ; s:etc/serviio:@sample %%ETCDIR%%:g" | ${GREP} -Ev '(etc/rc.d|licenses)' | ${SORT} >${PLIST}.new # ${FIND} ${STAGEDIR}${PREFIX}/ -type d | ${SED} -e "s:${STAGEDIR}${PREFIX}/:@dirrm :g ; s:etc/serviio:%%ETCDIR%%:g ; s:share/java/classes:%%JAVAJARDIR%%:g" | ${SORT} -r >>${PLIST}.new .include diff --git a/net/serviio/distinfo b/net/serviio/distinfo index cbd09c2f825..aaa9a20dce6 100644 --- a/net/serviio/distinfo +++ b/net/serviio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639505046 -SHA256 (serviio-2.2.1-linux.tar.gz) = b9145628cbf87f66f5c8813d3a75c3219026728ab0ffc174cf52ce7ac401b324 -SIZE (serviio-2.2.1-linux.tar.gz) = 28789070 +TIMESTAMP = 1666604910 +SHA256 (serviio-2.3-linux.tar.gz) = 9e6dd13720b8a269c6723eced7870b2486674ff5c6358fdde6a11c168c3ff627 +SIZE (serviio-2.3-linux.tar.gz) = 28885139 diff --git a/net/serviio/files/serviio.in b/net/serviio/files/serviio.in index 34632a7f0be..1a31e505498 100644 --- a/net/serviio/files/serviio.in +++ b/net/serviio/files/serviio.in @@ -17,11 +17,15 @@ command=%%PREFIX%%/sbin/serviiod load_rc_config $name : ${serviio_user="dlna"} +: ${serviio_heap="512M"} +: ${serviio_stack="20M"} if [ -n "${serviio_lang}" ]; then export LANG=${serviio_lang} fi +export SERVIIO_MEM="-Xmx${serviio_heap} -Xms${serviio_stack}" + _dirs="/var/db/serviio /var/db/serviio/home /var/log/serviio" start_precmd="mkdir -p $_dirs; chown $serviio_user $_dirs" command_args="$serviio_args &" diff --git a/net/serviio/files/serviiod.in b/net/serviio/files/serviiod.in index 19f16560c49..44864aac25b 100644 --- a/net/serviio/files/serviiod.in +++ b/net/serviio/files/serviiod.in @@ -7,6 +7,7 @@ PATH=$PATH:%%PREFIX%%/bin HOME=/var/db/serviio/home +: ${SERVIIO_MEM="-Xmx512M -Xms20M"} SERVIIO_HOME=%%JAVAJARDIR%%/serviio SERVIIO_CLASS_PATH="$SERVIIO_HOME/serviio.jar" # Setup the classpath @@ -33,4 +34,4 @@ done # Execute the JVM in the foreground export HOME PATH JAVA_VERSION -exec java -Xmx512M -Xms20M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" 2>&1 >/dev/null +exec java ${SERVIIO_MEM} -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@" 2>&1 >/dev/null diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist index 4f4638a9d45..830e850fe9a 100644 --- a/net/serviio/pkg-plist +++ b/net/serviio/pkg-plist @@ -36,7 +36,6 @@ %%JAVAJARDIR%%/serviio/rome-modules.jar %%JAVAJARDIR%%/serviio/rome.jar %%JAVAJARDIR%%/serviio/saaj-impl.jar -%%JAVAJARDIR%%/serviio/sbbi-upnp.jar %%JAVAJARDIR%%/serviio/serviio-mediabrowser-api.jar %%JAVAJARDIR%%/serviio/serviio-mediabrowser-web.jar %%JAVAJARDIR%%/serviio/serviio-web-console-api.jar @@ -47,6 +46,7 @@ %%JAVAJARDIR%%/serviio/stax-api.jar %%JAVAJARDIR%%/serviio/stax-ex.jar %%JAVAJARDIR%%/serviio/streamflyer-core.jar +%%JAVAJARDIR%%/serviio/waifupnp.jar %%JAVAJARDIR%%/serviio/winp.jar %%JAVAJARDIR%%/serviio/xstream.jar @sample %%ETCDIR%%/application-profiles.xml.sample diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile index d7d8859067e..dd2f0f21d2a 100644 --- a/science/avogadrolibs/Makefile +++ b/science/avogadrolibs/Makefile @@ -1,5 +1,6 @@ PORTNAME= avogadrolibs DISTVERSION= 1.97.0 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -65,7 +66,7 @@ VTK_DESC= Enable libraries that use VTK VTK_USES= xorg VTK_USE= QT=opengl XORG=x11 VTK_CMAKE_BOOL= USE_VTK -VTK_LIB_DEPENDS= libvtksys-9.1.so:math/vtk9 \ +VTK_LIB_DEPENDS= libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} \ libfreetype.so:print/freetype2 VTK_IMPLIES= QT5 VTK_BROKEN= Needs https://github.com/psavery/genXrdPattern, see https://github.com/OpenChemistry/avogadrolibs/issues/1186 @@ -73,4 +74,5 @@ VTK_BROKEN= Needs https://github.com/psavery/genXrdPattern, see https://github. post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/doc +.include <../../math/vtk9/Makefile.version> .include diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile index 30a7b9adef4..186720eed33 100644 --- a/science/elmerfem/Makefile +++ b/science/elmerfem/Makefile @@ -1,7 +1,7 @@ PORTNAME= elmerfem DISTVERSIONPREFIX= release- DISTVERSION= 9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science MAINTAINER= henrik@gulbra.net @@ -61,7 +61,7 @@ OCC_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \ libtiff.so:graphics/tiff \ libTKernel.so:cad/opencascade \ - libvtksys-9.1.so:math/vtk9 + libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R} OCC_USES= python OCC_CMAKE_BOOL= WITH_OCC OCC_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0 \ @@ -73,6 +73,7 @@ _QT5_LIBS= buildtools:build concurrent core declarative gui location \ network opengl printsupport qmake:build script sensors \ sql svg webchannel webkit widgets xml +.include <../../math/vtk9/Makefile.version> .include .if ${ARCH} == "amd64" diff --git a/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp index 5187c4d8599..aed35f60cee 100644 --- a/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp +++ b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp @@ -1,6 +1,6 @@ - includes workaround for https://github.com/ElmerCSC/elmerfem/issues/304 ---- ElmerGUI/Application/cad/cadview.cpp.orig 2021-11-10 14:49:01 UTC +--- ElmerGUI/Application/cad/cadview.cpp.orig 2020-11-10 19:52:44 UTC +++ ElmerGUI/Application/cad/cadview.cpp @@ -74,7 +74,7 @@ #include @@ -11,6 +11,34 @@ #include #include #include +@@ -104,7 +104,7 @@ static void pickEventHandler(vtkObject* caller, unsign + QVTKWidget* qvtkWidget = cadView->GetQVTKWidget(); + #endif + +- vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker(); ++ vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker(); + vtkPropPicker* propPicker = vtkPropPicker::SafeDownCast(picker); + vtkActor* actor = propPicker->GetActor(); + +@@ -146,15 +146,15 @@ CadView::CadView(QWidget *parent) : QMainWindow(parent + + renderer = vtkRenderer::New(); + renderer->SetBackground(1, 1, 1); +- qVTKWidget->GetRenderWindow()->AddRenderer(renderer); ++ qVTKWidget->renderWindow()->AddRenderer(renderer); + renderer->GetRenderWindow()->Render(); + + vtkPropPicker *propPicker = vtkPropPicker::New(); + vtkCallbackCommand *cbcPick = vtkCallbackCommand::New(); +- qVTKWidget->GetInteractor()->SetPicker(propPicker); ++ qVTKWidget->interactor()->SetPicker(propPicker); + cbcPick->SetClientData(this); + cbcPick->SetCallback(pickEventHandler); +- qVTKWidget->GetInteractor()->GetPicker()->AddObserver(vtkCommand::PickEvent, ++ qVTKWidget->interactor()->GetPicker()->AddObserver(vtkCommand::PickEvent, + cbcPick); + propPicker->Delete(); + cbcPick->Delete(); @@ -343,9 +343,6 @@ bool CadView::readFile(QString fileName) { const gp_Trsf &Transformation = Location.Transformation(); @@ -62,3 +90,12 @@ } partGrid->SetPoints(partPoints); +@@ -490,7 +487,7 @@ bool CadView::readFile(QString fileName) { + // Draw: + //------ + renderer->ResetCamera(); +- qVTKWidget->GetRenderWindow()->Render(); ++ qVTKWidget->renderWindow()->Render(); + + QCoreApplication::processEvents(); + diff --git a/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp b/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp new file mode 100644 index 00000000000..77962f421b0 --- /dev/null +++ b/science/elmerfem/files/patch-ElmerGUI_Application_vtkpost_vtkpost.cpp @@ -0,0 +1,53 @@ +--- ElmerGUI/Application/vtkpost/vtkpost.cpp.orig 2020-11-10 19:52:44 UTC ++++ ElmerGUI/Application/vtkpost/vtkpost.cpp +@@ -124,6 +124,8 @@ + + using namespace std; + ++#define GetRenderWindow renderWindow // renaming for VTK-9.2.2 ++ + // Custom print for QtScript: + //---------------------------- + #if QT_VERSION >= 0x040403 +@@ -171,7 +173,7 @@ static void pEventHandler(vtkObject* caller, unsigned + QVTKWidget* qvtkWidget = vtkPost->GetQVTKWidget(); + #endif + +- vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker(); ++ vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker(); + vtkPropPicker* propPicker = vtkPropPicker::SafeDownCast(picker); + + vtkActor* actor = propPicker->GetActor(); +@@ -382,14 +384,14 @@ VtkPost::VtkPost(QWidget *parent) + // Create a cell picker and set the callback & observer: + //------------------------------------------------------ + vtkPropPicker* propPicker = vtkPropPicker::New(); +- qvtkWidget->GetInteractor()->SetPicker(propPicker); ++ qvtkWidget->interactor()->SetPicker(propPicker); + propPicker->Delete(); + + vtkCallbackCommand* cbcPick = vtkCallbackCommand::New(); + cbcPick->SetClientData(this); + cbcPick->SetCallback(pEventHandler); + +- vtkAbstractPicker* picker = qvtkWidget->GetInteractor()->GetPicker(); ++ vtkAbstractPicker* picker = qvtkWidget->interactor()->GetPicker(); + picker->AddObserver(vtkCommand::EndPickEvent, cbcPick); + cbcPick->Delete(); + +@@ -402,7 +404,7 @@ VtkPost::VtkPost(QWidget *parent) + cbcPlane->SetCallback(iEventHandler); + + planeWidget = vtkImplicitPlaneWidget::New(); +- planeWidget->SetInteractor(qvtkWidget->GetInteractor()); ++ planeWidget->SetInteractor(qvtkWidget->interactor()); + planeWidget->AddObserver(vtkCommand::InteractionEvent, cbcPlane); + cbcPlane->Delete(); + +@@ -3519,4 +3521,4 @@ void VtkPost::viewZXmPlaneSlot(){ + renderer->GetActiveCamera()->SetViewUp(1,0,0); + renderer->ResetCamera(); + redrawSlot(); +-} +\ No newline at end of file ++} diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile index 67dbf51aa74..b61e17b9a04 100644 --- a/science/liggghts/Makefile +++ b/science/liggghts/Makefile @@ -1,5 +1,6 @@ PORTNAME= liggghts DISTVERSION= 3.8.0-58 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g6e28cfe3 CATEGORIES= science @@ -18,7 +19,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libnetcdf.so:science/netcdf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libvtkViewsCore-9.1.so:math/vtk9 + libvtkViewsCore-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= compiler:c++17-lang cmake fortran gl jpeg python qt:5 xorg USE_XORG= ice sm x11 xext xt @@ -30,15 +31,16 @@ USE_GITHUB= yes GH_ACCOUNT= CFDEMproject GH_PROJECT= ${PORTNAME:tu}-PUBLIC -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \ +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \ -DPython3_EXECUTABLE=${PYTHON_CMD} WRKSRC_SUBDIR= src CFLAGS+= -fPIC CXXFLAGS+= -fPIC \ - -I${LOCALBASE}/include/vtk-9.1 + -I${LOCALBASE}/include/vtk-${VTK_VER} BINARY_ALIAS= sed=gsed +.include <../../math/vtk9/Makefile.version> .include diff --git a/science/liggghts/files/patch-dump__mesh__vtm.cpp b/science/liggghts/files/patch-dump__mesh__vtm.cpp new file mode 100644 index 00000000000..6c42615cbf4 --- /dev/null +++ b/science/liggghts/files/patch-dump__mesh__vtm.cpp @@ -0,0 +1,11 @@ +--- dump_mesh_vtm.cpp.orig 2022-10-23 21:34:40 UTC ++++ dump_mesh_vtm.cpp +@@ -60,6 +60,8 @@ + #include + #include + ++#include ++ + using namespace LAMMPS_NS; + + /* ---------------------------------------------------------------------- */ diff --git a/science/liggghts/files/patch-dump__vtk.h b/science/liggghts/files/patch-dump__vtk.h new file mode 100644 index 00000000000..c56ea383b8a --- /dev/null +++ b/science/liggghts/files/patch-dump__vtk.h @@ -0,0 +1,11 @@ +--- dump_vtk.h.orig 2022-10-23 21:45:06 UTC ++++ dump_vtk.h +@@ -54,6 +54,8 @@ + #include + #include + ++#include ++ + namespace LAMMPS_NS + { + diff --git a/science/liggghts/patch-dump__vtk.cpp b/science/liggghts/patch-dump__vtk.cpp new file mode 100644 index 00000000000..96cdec71367 --- /dev/null +++ b/science/liggghts/patch-dump__vtk.cpp @@ -0,0 +1,11 @@ +--- dump_vtk.cpp.orig 2022-10-23 21:34:06 UTC ++++ dump_vtk.cpp +@@ -59,6 +59,8 @@ + #include + #include + ++#include ++ + namespace LAMMPS_NS + { + diff --git a/science/openems/Makefile b/science/openems/Makefile index 3d297459af5..67b5f0fe205 100644 --- a/science/openems/Makefile +++ b/science/openems/Makefile @@ -2,7 +2,7 @@ PORTNAME= openems DISTVERSIONPREFIX= v DISTVERSION= 0.0.35-76 DISTVERSIONSUFFIX= -gd4448fa -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -24,7 +24,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libsz.so:science/libaec \ libtiff.so:graphics/tiff \ libtinyxml.so:textproc/tinyxml \ - libvtkCommonCore-9.1.so:math/vtk9 + libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} USES= cmake jpeg pkgconfig USE_LDCONFIG= yes @@ -33,7 +33,7 @@ USE_GITHUB= yes GH_ACCOUNT= thliebig GH_PROJECT= openEMS -CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1 \ +CMAKE_ARGS= -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} \ -DLOCALBASE=${LOCALBASE} CXXFLAGS+= -I${LOCALBASE}/include/fparser # fparser.pc probably returns a wrong value @@ -43,4 +43,5 @@ DATADIR= ${PREFIX}/share/openEMS post-install: @${REINPLACE_CMD} -i '' -e 's|#!/bin/bash|#!/bin/sh|' ${STAGEDIR}${PREFIX}/bin/openEMS.sh +.include <../../math/vtk9/Makefile.version> .include diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 962bd7d1c95..e3cf79cafd7 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -1,6 +1,6 @@ PORTNAME= paraview DISTVERSION= 5.10.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/ DISTNAME= ParaView-v${PORTVERSION} @@ -56,7 +56,7 @@ LIB_DEPENDS= libhdf5.so:science/hdf5 \ libdouble-conversion.so:devel/double-conversion RUN_DEPENDS= ${PYNUMPY} \ bash:shells/bash \ - vtk9>0:math/vtk9 \ + vtk${VTK_VER:R}>0:math/vtk${VTK_VER:R} \ ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR} USES= alias cmake compiler:c11 eigen:3 fortran gl gnome jpeg localbase \ @@ -162,4 +162,5 @@ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} +.include <../../math/vtk9/Makefile.version> .include diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile index 2c9e4edb74d..32bf0c4e015 100644 --- a/www/bacula-web/Makefile +++ b/www/bacula-web/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula-web DISTVERSIONPREFIX= v -DISTVERSION= 8.6.1 +DISTVERSION= 8.6.2 PORTREVISION= 1 CATEGORIES= www sysutils PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/www/bacula-web/distinfo b/www/bacula-web/distinfo index b9b1bd9aaf8..d2ac2b86b93 100644 --- a/www/bacula-web/distinfo +++ b/www/bacula-web/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666188270 -SHA256 (bacula-web-bacula-web-v8.6.1_GH0.tar.gz) = 412c788bb7114c8bc12c77d8ab742204c6a1d94cd7f7d6d6ecf45ef1136273f1 -SIZE (bacula-web-bacula-web-v8.6.1_GH0.tar.gz) = 4568360 +TIMESTAMP = 1666633915 +SHA256 (bacula-web-bacula-web-v8.6.2_GH0.tar.gz) = b6c8e3ce8b165c24d17caac7a4c7a3ad92301a89608ff2a33736f15648e138ca +SIZE (bacula-web-bacula-web-v8.6.2_GH0.tar.gz) = 4568485 diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index d7032264240..c8ec215ed8c 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -61,6 +61,10 @@ PLIST_SUB+= EMACS28="@comment " post-patch: @${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4 +post-install: + ${RM} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/w3m/mew-shimbun.elc \ + ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/w3m/mew-w3m.elc + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist index 0a3f2722d89..d53e1d2cb39 100644 --- a/www/emacs-w3m/pkg-plist +++ b/www/emacs-w3m/pkg-plist @@ -45,7 +45,7 @@ %%EMACS_VERSION_SITE_LISPDIR%%/w3m/bookmark-w3m.elc %%EMACS_VERSION_SITE_LISPDIR%%/w3m/mew-w3m.el %%EMACS_VERSION_SITE_LISPDIR%%/w3m/mime-w3m.el -%%EMACS_VERSION_SITE_LISPDIR%%/w3m/mime-w3m.elc +%%OCTET_VIEWER%%%%EMACS_VERSION_SITE_LISPDIR%%/w3m/mime-w3m.elc %%EMACS_VERSION_SITE_LISPDIR%%/w3m/octet.el %%OCTET_VIEWER%%%%EMACS_VERSION_SITE_LISPDIR%%/w3m/octet.elc %%SHIMBUN%%%%EMACS_VERSION_SITE_LISPDIR%%/w3m/mew-shimbun.el diff --git a/www/jetty9/Makefile b/www/jetty9/Makefile index 688514470ff..75058b26fc6 100644 --- a/www/jetty9/Makefile +++ b/www/jetty9/Makefile @@ -1,8 +1,8 @@ PORTNAME= jetty -PORTVERSION= 9.4.48 +PORTVERSION= 9.4.49 CATEGORIES= www java MASTER_SITES= https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${PORTVERSION}.${JDVDATE}/ -PKGNAMESUFFIX= 9 +PKGNAMESUFFIX= 9-${FLAVOR:U} DISTNAME= jetty-distribution-${PORTVERSION}.${JDVDATE} MAINTAINER= ports@FreeBSD.org @@ -16,16 +16,17 @@ LICENSE_FILE= ${WRKSRC}/license-eplv10-aslv20.html RUN_DEPENDS= bash:shells/bash USES= cpe shebangfix +FLAVORS= openjdk8 openjdk11 +FLAVOR?= ${FLAVORS:[1]} -CONFLICTS= jetty-8.* +CONFLICTS= jetty-8.* jetty-10.* -JDVDATE= v20220622 +JDVDATE= v20220914 USE_JAVA= yes NO_ARCH= yes CPE_VENDOR= eclipse SHEBANG_FILES= bin/jetty.sh NO_BUILD= yes -JAVA_VERSION= 8+ JAVA_VENDOR= openjdk USE_RC_SUBR= ${PORTNAME} @@ -54,6 +55,12 @@ PLIST_SUB= \ PORTVERSION=${PORTVERSION} \ JDVDATE=${JDVDATE} +.if ${FLAVOR:U} == openjdk8 +JAVA_VERSION= 8+ +.elif ${FLAVOR:U} == openjdk11 +JAVA_VERSION= 11+ +.endif + do-install: ${MKDIR} ${STAGEDIR}${APP_HOME} ${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/www/jetty9/distinfo b/www/jetty9/distinfo index a6eaa4c8f64..e7b1bd96028 100644 --- a/www/jetty9/distinfo +++ b/www/jetty9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662996441 -SHA256 (jetty-distribution-9.4.48.v20220622.tar.gz) = 50d6eccd349d2e671bfea710cee833911287eb706fe1d39503eab76fc6fc1a0c -SIZE (jetty-distribution-9.4.48.v20220622.tar.gz) = 19058994 +TIMESTAMP = 1666621231 +SHA256 (jetty-distribution-9.4.49.v20220914.tar.gz) = a8c9e372f16e56fa0967ef36de72aebeeea8477ca123638420f7e866b39513fd +SIZE (jetty-distribution-9.4.49.v20220914.tar.gz) = 19061782 diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile index c2db1e973ee..761ecb48b1b 100644 --- a/www/piwigo/Makefile +++ b/www/piwigo/Makefile @@ -1,5 +1,5 @@ PORTNAME= piwigo -DISTVERSION= 13.0.0 +DISTVERSION= 13.1.0 PORTREVISION= 0 PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} CATEGORIES= www diff --git a/www/piwigo/distinfo b/www/piwigo/distinfo index 8e0c9306dbb..03be8f31ac5 100644 --- a/www/piwigo/distinfo +++ b/www/piwigo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665565359 -SHA256 (piwigo-13.0.0.zip) = ec1d90f66df08df89ffc9be80f40a01dd9dd403df1b894efb30749756e744117 -SIZE (piwigo-13.0.0.zip) = 18262546 +TIMESTAMP = 1666602202 +SHA256 (piwigo-13.1.0.zip) = 8964252a084669bd9e38eb0dcb356d6112e10b40a2717097adc664741f8cbc61 +SIZE (piwigo-13.1.0.zip) = 18264748 diff --git a/x11-toolkits/ctk/Makefile b/x11-toolkits/ctk/Makefile index f26fd05a8c5..b31eba08408 100644 --- a/x11-toolkits/ctk/Makefile +++ b/x11-toolkits/ctk/Makefile @@ -1,6 +1,6 @@ PORTNAME= CTK -DISTVERSION= 2018-10-29 -PORTREVISION= 2 +DISTVERSION= 2018-10-29-269 +DISTVERSIONSUFFIX= -g8487ec9a CATEGORIES= x11-toolkits PKGNAMESUFFIX= -widgets @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c++11-lib qt:5 USE_GITHUB= yes GH_ACCOUNT= commontk -USE_QT= concurrent core designer gui opengl sql widgets xml xmlpatterns \ +USE_QT= concurrent core designer gui multimedia opengl sql widgets xml xmlpatterns \ buildtools:build uitools:build qmake:build testlib:build # see CMake/ctkMacroSetupQt.cmake USE_LDCONFIG= yes diff --git a/x11-toolkits/ctk/distinfo b/x11-toolkits/ctk/distinfo index 1f49e730f2f..06f6e83833e 100644 --- a/x11-toolkits/ctk/distinfo +++ b/x11-toolkits/ctk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544637932 -SHA256 (commontk-CTK-2018-10-29_GH0.tar.gz) = a937515aac5465416ed47ff10852a4fe0f6de59c49332098ad90b161737e20d0 -SIZE (commontk-CTK-2018-10-29_GH0.tar.gz) = 2325602 +TIMESTAMP = 1666548725 +SHA256 (commontk-CTK-2018-10-29-269-g8487ec9a_GH0.tar.gz) = fda3e01bb2a2762a67e0ce36dbc8602ce9808e79d65b0574d49de76fbf58feb3 +SIZE (commontk-CTK-2018-10-29-269-g8487ec9a_GH0.tar.gz) = 2390450 diff --git a/x11-toolkits/ctk/pkg-plist b/x11-toolkits/ctk/pkg-plist index 684768d476a..cfcc2ec8d69 100644 --- a/x11-toolkits/ctk/pkg-plist +++ b/x11-toolkits/ctk/pkg-plist @@ -38,6 +38,7 @@ include/ctk-0.1/ctkColorDialog.h include/ctk-0.1/ctkColorPickerButton.h include/ctk-0.1/ctkComboBox.h include/ctk-0.1/ctkCommandLineParser.h +include/ctk-0.1/ctkCompatibility_p.h include/ctk-0.1/ctkCompilerDetections_p.h include/ctk-0.1/ctkCompleter.h include/ctk-0.1/ctkConfig.h @@ -49,6 +50,7 @@ include/ctk-0.1/ctkCoordinatesWidget.h include/ctk-0.1/ctkCoordinatesWidget_p.h include/ctk-0.1/ctkCoreExport.h include/ctk-0.1/ctkCorePythonQtDecorators.h +include/ctk-0.1/ctkCoreSettings.h include/ctk-0.1/ctkCoreTestingMacros.h include/ctk-0.1/ctkCoreTestingUtilities.h include/ctk-0.1/ctkCoreTestingUtilities.tpp @@ -64,6 +66,7 @@ include/ctk-0.1/ctkDoubleSpinBox.h include/ctk-0.1/ctkDoubleSpinBox_p.h include/ctk-0.1/ctkDynamicSpacer.h include/ctk-0.1/ctkErrorLogAbstractMessageHandler.h +include/ctk-0.1/ctkErrorLogAbstractModel.h include/ctk-0.1/ctkErrorLogContext.h include/ctk-0.1/ctkErrorLogFDMessageHandler.h include/ctk-0.1/ctkErrorLogFDMessageHandler_p.h @@ -191,10 +194,12 @@ lib/ctk-0.1/CMake/CTKExports.cmake lib/ctk-0.1/CMake/CTKPluginUseFile.cmake lib/ctk-0.1/CMake/UseCTK.cmake lib/ctk-0.1/CMake/ctkExport.h.in +lib/ctk-0.1/CMake/ctkFunctionAddExecutableUtf8.cmake lib/ctk-0.1/CMake/ctkFunctionAddPluginRepo.cmake lib/ctk-0.1/CMake/ctkFunctionCheckCompilerFlags.cmake lib/ctk-0.1/CMake/ctkFunctionCheckoutRepo.cmake lib/ctk-0.1/CMake/ctkFunctionCompileSnippets.cmake +lib/ctk-0.1/CMake/ctkFunctionExtractOptimizedLibrary.cmake lib/ctk-0.1/CMake/ctkFunctionExtractOptionNameAndValue.cmake lib/ctk-0.1/CMake/ctkFunctionGenerateDGraphInput.cmake lib/ctk-0.1/CMake/ctkFunctionGeneratePluginManifest.cmake diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index 13baaeb1c65..fbed3787db1 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wlroots -DISTVERSION= 0.15.0-493 +DISTVERSION= 0.15.0-495 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel @@ -30,7 +30,7 @@ USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org -GL_COMMIT= 6d90518c974e1dd959ed00c255de5b54595c4e90 +GL_COMMIT= a773231c42812e56c5966fc6a035aa9c6108175a MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index fcd52751128..bb265057bb5 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1666338738 -SHA256 (wlroots-wlroots-6d90518c974e1dd959ed00c255de5b54595c4e90_GL0.tar.gz) = e95b0eb9d9086fe50c3e0ebc23b762af9b2b965cf7480d0a7b0c54f058fe5730 -SIZE (wlroots-wlroots-6d90518c974e1dd959ed00c255de5b54595c4e90_GL0.tar.gz) = 586565 +TIMESTAMP = 1666628365 +SHA256 (wlroots-wlroots-a773231c42812e56c5966fc6a035aa9c6108175a_GL0.tar.gz) = 95d7af999f346e66ec7b953258eb4144de0cb9320298e48ce26c623cf82e213e +SIZE (wlroots-wlroots-a773231c42812e56c5966fc6a035aa9c6108175a_GL0.tar.gz) = 587096 SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e SIZE (7c0e2a271a4c.patch) = 5729 SHA256 (a5df0a02a2d9.patch) = df5deb1714001870b846501cbee1e775468ac9c61e735ee3b4ad3a2b83c5573e diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index 810ff792d7f..a594d0f3475 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sway -DISTVERSION= 1.7-140 -DISTVERSIONSUFFIX= -g5e514e647 +DISTVERSION= 1.7-141 +DISTVERSIONSUFFIX= -g9d99bb956 CATEGORIES= x11-wm wayland PKGNAMESUFFIX= -devel diff --git a/x11-wm/sway-devel/distinfo b/x11-wm/sway-devel/distinfo index d614f675c90..431f50db677 100644 --- a/x11-wm/sway-devel/distinfo +++ b/x11-wm/sway-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1666339500 -SHA256 (swaywm-sway-1.7-140-g5e514e647_GH0.tar.gz) = d71efec027cdb97d8f253e01f91f797338890f6b5be0517a8fb94bf0de640b7a -SIZE (swaywm-sway-1.7-140-g5e514e647_GH0.tar.gz) = 5574950 +TIMESTAMP = 1666518989 +SHA256 (swaywm-sway-1.7-141-g9d99bb956_GH0.tar.gz) = f88ed51b083db50f1ef8218fe6e2cce97df60553abc6a326899c077fb35f14aa +SIZE (swaywm-sway-1.7-141-g9d99bb956_GH0.tar.gz) = 5574973 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d SIZE (cd9d1038a822.patch) = 8968 SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa diff --git a/x11/nwg-launchers/Makefile b/x11/nwg-launchers/Makefile index 8f3c3adc805..489461c7682 100644 --- a/x11/nwg-launchers/Makefile +++ b/x11/nwg-launchers/Makefile @@ -1,6 +1,6 @@ PORTNAME= nwg-launchers DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0 +DISTVERSION= 0.7.1.1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11/nwg-launchers/distinfo b/x11/nwg-launchers/distinfo index e6b36adc726..afda9b1234a 100644 --- a/x11/nwg-launchers/distinfo +++ b/x11/nwg-launchers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666019185 -SHA256 (nwg-piotr-nwg-launchers-v0.7.0_GH0.tar.gz) = c0c7d9789191f8772e2e1bcc8c907342477c25b262a6636f5c60d0d4becb10be -SIZE (nwg-piotr-nwg-launchers-v0.7.0_GH0.tar.gz) = 69956 +TIMESTAMP = 1666661681 +SHA256 (nwg-piotr-nwg-launchers-v0.7.1.1_GH0.tar.gz) = 3700fe67870ecead091abe672c93ce01a6351cb1e0be1904233050c22e86a7c4 +SIZE (nwg-piotr-nwg-launchers-v0.7.1.1_GH0.tar.gz) = 69947