diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile index d56ba1253e7e..b418fd8f6e07 100644 --- a/graphics/agg/Makefile +++ b/graphics/agg/Makefile @@ -1,34 +1,34 @@ PORTNAME= agg -PORTVERSION= 2.5 -PORTREVISION= 11 +DISTVERSION= 2.7.0 +PORTREVISION= 0 CATEGORIES= graphics -MASTER_SITES= http://distfiles.alpinelinux.org/distfiles/ \ - http://distfiles.lesslinux.org/ \ - http://gentoo.netnitco.net/distfiles/ MAINTAINER= dinoex@FreeBSD.org COMMENT= High Quality Rendering Engine for C++ -WWW= https://agg.sourceforge.net/antigrain.com/ +WWW= https://github.com/clausecker/agg LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/copying LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= autoreconf cpe gmake libtool pathfix pkgconfig sdl xorg +USES= cpe localbase gmake libtool pkgconfig \ + autoreconf pathfix xorg sdl +CONFLICTS= agg-2.* CPE_VENDOR= antigrain +USE_GITHUB= yes +GH_ACCOUNT= clausecker +GH_TAGNAME= b064760 # 2024-09-28 USE_CXXSTD= c++14 USE_LDCONFIG= yes USE_SDL= sdl USE_XORG= x11 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -CONFLICTS= agg26-2.* - post-patch: - @${REINPLACE_CMD} 's/_LDFLAGS/_LDADD/' ${WRKSRC}/examples/Makefile.am + ${REINPLACE_CMD} 's|_LDFLAGS|_LDADD|' ${WRKSRC}/examples/Makefile.am .include diff --git a/graphics/agg/distinfo b/graphics/agg/distinfo index c7756e2b5bb7..4c23499ba194 100644 --- a/graphics/agg/distinfo +++ b/graphics/agg/distinfo @@ -1,2 +1,3 @@ -SHA256 (agg-2.5.tar.gz) = ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f -SIZE (agg-2.5.tar.gz) = 564313 +TIMESTAMP = 1746091363 +SHA256 (clausecker-agg-2.7.0-b064760_GH0.tar.gz) = 771e1a68ec5b2924dc8e0c859b6cdd59aa5914c0b62d27f58bb693247897aacb +SIZE (clausecker-agg-2.7.0-b064760_GH0.tar.gz) = 1580108 diff --git a/graphics/agg/files/patch-configure.in b/graphics/agg/files/patch-configure.in deleted file mode 100644 index cc46fd046c22..000000000000 --- a/graphics/agg/files/patch-configure.in +++ /dev/null @@ -1,9 +0,0 @@ ---- configure.in.orig 2006-10-08 21:06:36.000000000 -0700 -+++ configure.in 2012-05-03 17:23:22.000000000 -0700 -@@ -10,6 +10,2 @@ - AC_ISC_POSIX --AM_C_PROTOTYPES --if test "x$U" != "x"; then -- AC_MSG_ERROR(Compiler not ANSI compliant) --fi - AM_PROG_LIBTOOL diff --git a/graphics/agg/files/patch-font_freetype__agg_font_freetype.cpp b/graphics/agg/files/patch-font_freetype__agg_font_freetype.cpp deleted file mode 100644 index 2bae296c0829..000000000000 --- a/graphics/agg/files/patch-font_freetype__agg_font_freetype.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- font_freetype/agg_font_freetype.cpp.orig 2023-08-21 15:51:12 UTC -+++ font_freetype/agg_font_freetype.cpp -@@ -158,7 +158,7 @@ namespace agg - - FT_Vector* point; - FT_Vector* limit; -- char* tags; -+ unsigned char *tags; - - int n; // index of contour in outline - int first; // index of first point in contour diff --git a/graphics/agg/files/patch-include__agg_renderer_outline_aa.h b/graphics/agg/files/patch-include__agg_renderer_outline_aa.h index 35a87bf191f7..86553f5d7370 100644 --- a/graphics/agg/files/patch-include__agg_renderer_outline_aa.h +++ b/graphics/agg/files/patch-include__agg_renderer_outline_aa.h @@ -1,11 +1,11 @@ ---- include/agg_renderer_outline_aa.h.orig 2006-10-09 13:07:08.000000000 +0900 -+++ include/agg_renderer_outline_aa.h 2012-10-13 05:25:48.000000000 +0900 -@@ -1375,7 +1375,7 @@ +--- include/agg_renderer_outline_aa.h.orig 2023-08-21 15:51:12 UTC ++++ include/agg_renderer_outline_aa.h +@@ -1366,7 +1366,7 @@ namespace agg //--------------------------------------------------------------------- - void profile(const line_profile_aa& prof) { m_profile = &prof; } + void profile(line_profile_aa& prof) { m_profile = &prof; } const line_profile_aa& profile() const { return *m_profile; } - line_profile_aa& profile() { return *m_profile; } + const line_profile_aa& profile() { return *m_profile; } //--------------------------------------------------------------------- int subpixel_width() const { return m_profile->subpixel_width(); } diff --git a/graphics/agg/pkg-plist b/graphics/agg/pkg-plist index ee90b5912eb5..0989b6fe2d00 100644 --- a/graphics/agg/pkg-plist +++ b/graphics/agg/pkg-plist @@ -1,155 +1,160 @@ include/agg2/agg_alpha_mask_u8.h include/agg2/agg_arc.h include/agg2/agg_array.h include/agg2/agg_arrowhead.h include/agg2/agg_basics.h include/agg2/agg_bezier_arc.h include/agg2/agg_bitset_iterator.h include/agg2/agg_blur.h include/agg2/agg_bounding_rect.h include/agg2/agg_bspline.h include/agg2/agg_clip_liang_barsky.h include/agg2/agg_color_gray.h include/agg2/agg_color_rgba.h include/agg2/agg_config.h include/agg2/agg_conv_adaptor_vcgen.h include/agg2/agg_conv_adaptor_vpgen.h include/agg2/agg_conv_bspline.h include/agg2/agg_conv_clip_polygon.h include/agg2/agg_conv_clip_polyline.h include/agg2/agg_conv_close_polygon.h include/agg2/agg_conv_concat.h include/agg2/agg_conv_contour.h include/agg2/agg_conv_curve.h include/agg2/agg_conv_dash.h include/agg2/agg_conv_gpc.h include/agg2/agg_conv_marker.h include/agg2/agg_conv_marker_adaptor.h include/agg2/agg_conv_segmentator.h include/agg2/agg_conv_shorten_path.h include/agg2/agg_conv_smooth_poly1.h include/agg2/agg_conv_stroke.h include/agg2/agg_conv_transform.h include/agg2/agg_conv_unclose_polygon.h include/agg2/agg_curves.h include/agg2/agg_dda_line.h include/agg2/agg_ellipse.h include/agg2/agg_ellipse_bresenham.h include/agg2/agg_embedded_raster_fonts.h include/agg2/agg_font_cache_manager.h +include/agg2/agg_font_cache_manager2.h include/agg2/agg_font_freetype.h include/agg2/agg_gamma_functions.h include/agg2/agg_gamma_lut.h include/agg2/agg_glyph_raster_bin.h include/agg2/agg_gradient_lut.h include/agg2/agg_gsv_text.h include/agg2/agg_image_accessors.h include/agg2/agg_image_filters.h include/agg2/agg_line_aa_basics.h include/agg2/agg_math.h include/agg2/agg_math_stroke.h include/agg2/agg_path_length.h include/agg2/agg_path_storage.h include/agg2/agg_path_storage_integer.h include/agg2/agg_pattern_filters_rgba.h include/agg2/agg_pixfmt_amask_adaptor.h +include/agg2/agg_pixfmt_base.h include/agg2/agg_pixfmt_gray.h include/agg2/agg_pixfmt_rgb.h include/agg2/agg_pixfmt_rgb_packed.h include/agg2/agg_pixfmt_rgba.h include/agg2/agg_pixfmt_transposer.h include/agg2/agg_rasterizer_cells_aa.h include/agg2/agg_rasterizer_compound_aa.h include/agg2/agg_rasterizer_outline.h include/agg2/agg_rasterizer_outline_aa.h include/agg2/agg_rasterizer_scanline_aa.h +include/agg2/agg_rasterizer_scanline_aa_nogamma.h include/agg2/agg_rasterizer_sl_clip.h include/agg2/agg_renderer_base.h include/agg2/agg_renderer_markers.h include/agg2/agg_renderer_mclip.h include/agg2/agg_renderer_outline_aa.h include/agg2/agg_renderer_outline_image.h include/agg2/agg_renderer_primitives.h include/agg2/agg_renderer_raster_text.h include/agg2/agg_renderer_scanline.h include/agg2/agg_rendering_buffer.h include/agg2/agg_rendering_buffer_dynarow.h include/agg2/agg_rounded_rect.h include/agg2/agg_scanline_bin.h include/agg2/agg_scanline_boolean_algebra.h include/agg2/agg_scanline_p.h include/agg2/agg_scanline_storage_aa.h include/agg2/agg_scanline_storage_bin.h include/agg2/agg_scanline_u.h include/agg2/agg_shorten_path.h include/agg2/agg_simul_eq.h include/agg2/agg_span_allocator.h include/agg2/agg_span_converter.h include/agg2/agg_span_gouraud.h include/agg2/agg_span_gouraud_gray.h include/agg2/agg_span_gouraud_rgba.h include/agg2/agg_span_gradient.h include/agg2/agg_span_gradient_alpha.h +include/agg2/agg_span_gradient_contour.h +include/agg2/agg_span_gradient_image.h include/agg2/agg_span_image_filter.h include/agg2/agg_span_image_filter_gray.h include/agg2/agg_span_image_filter_rgb.h include/agg2/agg_span_image_filter_rgba.h include/agg2/agg_span_interpolator_adaptor.h include/agg2/agg_span_interpolator_linear.h include/agg2/agg_span_interpolator_persp.h include/agg2/agg_span_interpolator_trans.h include/agg2/agg_span_pattern_gray.h include/agg2/agg_span_pattern_rgb.h include/agg2/agg_span_pattern_rgba.h include/agg2/agg_span_solid.h include/agg2/agg_span_subdiv_adaptor.h include/agg2/agg_trans_affine.h include/agg2/agg_trans_bilinear.h include/agg2/agg_trans_double_path.h include/agg2/agg_trans_perspective.h include/agg2/agg_trans_single_path.h include/agg2/agg_trans_viewport.h include/agg2/agg_trans_warp_magnifier.h include/agg2/agg_vcgen_bspline.h include/agg2/agg_vcgen_contour.h include/agg2/agg_vcgen_dash.h include/agg2/agg_vcgen_markers_term.h include/agg2/agg_vcgen_smooth_poly1.h include/agg2/agg_vcgen_stroke.h include/agg2/agg_vcgen_vertex_sequence.h include/agg2/agg_vertex_sequence.h include/agg2/agg_vpgen_clip_polygon.h include/agg2/agg_vpgen_clip_polyline.h include/agg2/agg_vpgen_segmentator.h include/agg2/ctrl/agg_bezier_ctrl.h include/agg2/ctrl/agg_cbox_ctrl.h include/agg2/ctrl/agg_ctrl.h include/agg2/ctrl/agg_gamma_ctrl.h include/agg2/ctrl/agg_gamma_spline.h include/agg2/ctrl/agg_polygon_ctrl.h include/agg2/ctrl/agg_rbox_ctrl.h include/agg2/ctrl/agg_scale_ctrl.h include/agg2/ctrl/agg_slider_ctrl.h include/agg2/ctrl/agg_spline_ctrl.h include/agg2/platform/agg_platform_support.h include/agg2/util/agg_color_conv.h include/agg2/util/agg_color_conv_rgb16.h include/agg2/util/agg_color_conv_rgb8.h lib/libagg.a lib/libagg.so lib/libagg.so.2 -lib/libagg.so.2.0.4 +lib/libagg.so.2.0.7 lib/libaggfontfreetype.a lib/libaggfontfreetype.so lib/libaggfontfreetype.so.2 -lib/libaggfontfreetype.so.2.0.4 +lib/libaggfontfreetype.so.2.0.7 lib/libaggplatformX11.a lib/libaggplatformX11.so lib/libaggplatformX11.so.2 -lib/libaggplatformX11.so.2.0.4 +lib/libaggplatformX11.so.2.0.7 lib/libaggplatformsdl.a lib/libaggplatformsdl.so lib/libaggplatformsdl.so.2 -lib/libaggplatformsdl.so.2.0.4 +lib/libaggplatformsdl.so.2.0.7 libdata/pkgconfig/libagg.pc share/aclocal/libagg.m4 diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 2fe384daa10e..5c21f3c9b428 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -1,129 +1,129 @@ PORTNAME= plplot DISTVERSION= 5.15.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source MAINTAINER= ports@FreeBSD.org COMMENT= Scientific plotting package WWW= https://plplot.sourceforge.net/ LICENSE= LGPL21+ BUILD_DEPENDS= bash:shells/bash \ ${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf LIB_DEPENDS= libLASi.so:devel/lasi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libltdl.so:devel/libltdl RUN_DEPENDS= bash:shells/bash \ ${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf USES= compiler:c11 cmake gettext-runtime ghostscript gnome \ localbase perl5 pathfix pkgconfig shebangfix USE_GNOME= cairo pango USE_PERL5= build SHEBANG_FILES= ${WRKSRC}/examples/python/* \ ${WRKSRC}/examples/tcl/* \ ${WRKSRC}/examples/tk/* SHEBANG_LANG= sh xtk01 xtk02 xtk04 sh_OLD_CMD= @SH_EXECUTABLE@ sh_CMD= ${SH} xtk01_OLD_CMD= @xtk01_LOCATION@ xtk01_CMD= ${DATADIR}/examples/tk/xtk01 xtk02_OLD_CMD= @xtk02_LOCATION@ xtk02_CMD= ${DATADIR}/examples/tk/xtk02 xtk04_OLD_CMD= @xtk04_LOCATION@ xtk04_CMD= ${DATADIR}/examples/tk/xtk04 CMAKE_ARGS= -DENABLE_java:BOOL=OFF \ -DENABLE_octave:BOOL=OFF \ -DENABLE_pdl:BOOL=OFF \ -DENABLE_ada:BOOL=OFF \ -DENABLE_d:BOOL=OFF \ -DENABLE_ocaml:BOOL=OFF \ -DENABLE_python:BOOL=OFF \ -DENABLE_pyqt4:BOOL=OFF \ -DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \ -DCMAKE_INSTALL_PKG_CONFIG_DIR:PATH="${PREFIX}/libdata/pkgconfig" \ -DPLD_plmeta:BOOL=OFF CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_ -DSHAPELIB_INCLUDE_DIR=/nonexistent USE_LDCONFIG= yes CMAKE_OFF= DEFAULT_NO_QT_DEVICES LDFLAGS+= -pthread DATADIR= ${PREFIX}/share/${PORTNAME}${PORTVERSION} PLIST_SUB= PLPLOT_VERSION=${PORTVERSION} FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf OPTIONS_DEFINE= DOCS FORTRAN GD LUA QHULL2020 QT5 TCLTK THREADS WXGTK X11 OPTIONS_DEFAULT= QHULL2020 THREADS WXGTK X11 OPTIONS_SUB= yes FORTRAN_USES= fortran FORTRAN_CMAKE_BOOL= ENABLE_fortran FORTRAN_CONFIGURE_ENV= CMAKE_Fortran_COMPILER="${FC}" GD_LIB_DEPENDS= libgd.so:graphics/gd \ libpng.so:graphics/png GD_USES= jpeg GD_CMAKE_BOOL= PLD_png LUA_USES= lua LUA_BUILD_DEPENDS= swig:devel/swig LUA_CMAKE_BOOL= ENABLE_lua LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" QHULL2020_DESC= Latest Qhull support QHULL2020_LIB_DEPENDS= libqhull_r.so:math/qhull QHULL2020_CMAKE_BOOL= PL_HAVE_QHULL HAS_LIBQHULL_INCLUDE QHULL2020_CMAKE_ON= -DQHULL_RPATH=:FILEPATH="${LOCALBASE}/lib/libqhull_r.so" TCLTK_LIB_DEPENDS= libitk.so:x11-toolkits/itk TCLTK_RUN_DEPENDS= iwidgets>0:x11-toolkits/iwidgets TCLTK_USES= tk TCLTK_CMAKE_BOOL= ENABLE_itcl ENABLE_itk ENABLE_tcl ENABLE_tk TCLTK_IMPLIES= X11 ITCL_VER= 3.4.1 ITK_VER= 3.3 IWIDGETS_VER= 4.0.1 TCLTK_CMAKE_ON= -DPLPLOT_TK_VERSION:STRING="${TK_VER}" \ -DPLPLOT_ITCL_VERSION:STRING="${ITCL_VER}" \ -DPLPLOT_ITK_VERSION:STRING="${ITK_VER}" \ -DIWIDGETS_VERSIONS_LIST:STRING="${IWIDGETS_VER};${ITK_VER};${ITCL_VER}" \ -DTCL_TCLSH:FILEPATH="${TCLSH}" \ -DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \ -DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl${ITCL_VER}" \ -DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \ -DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \ -DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk${ITK_VER}" \ -DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so" THREADS_CMAKE_BOOL= THREADS_HAVE_PTHREAD_ARG QT5_USES= qt:5 QT5_USE= QT=core,gui,printsupport,svg,xml,widgets,buildtools:build,qmake:build QT5_CMAKE_BOOL= ENABLE_qt WXGTK_LIB_DEPENDS= libagg.so:graphics/agg WXGTK_USE= WX=3.0+ WXGTK_CMAKE_BOOL= ENABLE_wxwidgets WXGTK_CMAKE_ON= -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}" X11_USES= xorg X11_USE= XORG=ice,sm,x11,xext X11_CMAKE_BOOL= PLD_xcairo PLD_xwin pre-configure: ${REINPLACE_CMD} -e \ 's|dl dlopen|c dlopen|' \ ${WRKSRC}/cmake/modules/FindLTDL.cmake ${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${REINPLACE_CMD} -e \ 's|shapefil.h|do_not_want_shapefil.h|' \ ${WRKSRC}/cmake/modules/FindShapelib.cmake .include