diff --git a/net/tcpflow/Portfile b/net/tcpflow/Portfile index 5e153e337d45a..6f5e8d5f4eeb1 100644 --- a/net/tcpflow/Portfile +++ b/net/tcpflow/Portfile @@ -11,8 +11,8 @@ revision 2 conflicts ${name}-devel subport ${name}-devel { - github.setup simsong tcpflow 5ca444e3b872f10f927d5d3673a4c4caa412a23e - version 20230726 + github.setup simsong tcpflow 467b380642e8e126d1ef5ddf30638deffb6fb2ad + version 20240919 revision 0 conflicts ${name} @@ -58,7 +58,16 @@ post-fetch { system -W ${worksrcpath} "git submodule update --init" } -patchfiles patch-configure.ac.diff +patchfiles + +if {${subport} eq "${name}"} { + patchfiles-append \ + patch-configure.ac.diff \ + patch-fix-includes.diff +} else { + patchfiles-append \ + patch-configure.ac-devel.diff +} compiler.cxx_standard 2017 diff --git a/net/tcpflow/files/patch-configure.ac-devel.diff b/net/tcpflow/files/patch-configure.ac-devel.diff new file mode 100644 index 0000000000000..4e8ebdff55ac8 --- /dev/null +++ b/net/tcpflow/files/patch-configure.ac-devel.diff @@ -0,0 +1,20 @@ +--- configure.ac ++++ configure.ac 2024-12-18 18:09:12.000000000 +0800 +@@ -75,17 +75,6 @@ + esac + + if test x"${mingw}" == "xno" ; then +- # Bring additional directories where things might be found into our +- # search path. I don't know why autoconf doesn't do this by default +- for spfx in /usr/local /opt/local /sw /usr/local/ssl /usr/boost/include /usr/X11R6 ; do +- AC_MSG_NOTICE([checking ${spfx}/include]) +- if test -d ${spfx}/include; then +- CPPFLAGS="-I${spfx}/include $CPPFLAGS" +- LDFLAGS="-L${spfx}/lib $LDFLAGS" +- AC_MSG_NOTICE([ *** ADDING ${spfx}/include to CPPFLAGS *** ]) +- AC_MSG_NOTICE([ *** ADDING ${spfx}/lib to LDFLAGS *** ]) +- fi +- done + AC_MSG_NOTICE([ CPPFLAGS = ${CPPFLAGS} ]) + AC_MSG_NOTICE([ LDFLAGS = ${LDFLAGS} ]) + fi diff --git a/net/tcpflow/files/patch-fix-includes.diff b/net/tcpflow/files/patch-fix-includes.diff new file mode 100644 index 0000000000000..35a6f32ccb6a0 --- /dev/null +++ b/net/tcpflow/files/patch-fix-includes.diff @@ -0,0 +1,25 @@ +From b1479db14b1604e00d35c2d39566c54e8b1785d0 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 15 Apr 2023 12:36:51 +0100 +Subject: [PATCH] Fix build with GCC 13 (#252) + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. +Bug: https://bugs.gentoo.org/895282 +--- + src/netviz/plot_view.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/netviz/plot_view.h b/src/netviz/plot_view.h +index 21be05cf..ba8b49e7 100644 +--- src/netviz/plot_view.h ++++ src/netviz/plot_view.h +@@ -23,6 +23,7 @@ + #include + #endif + ++#include + #include + #include + #include