On Sat, 30 Aug 2025 15:13:16 +0200, Theo Buehler wrote:
> On Sat, Aug 30, 2025 at 02:28:58PM +0200, Antoine Jacoutot wrote:
> > On Fri, 2025-08-29 at 16:54 -0600, Pascal Stumpf wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: pas...@cvs.openbsd.org 2025/08/29 16:54:07
> > >
> > > Modified files:
> > > multimedia/sfml/patches:
> > > patch-cmake_SFMLConfigDependencies_cmake_in
> > > multimedia/sfml/pkg: PLIST
> > > Added files:
> > > multimedia/sfml/patches: patch-include_SFML_System_String_hpp
> > > Removed files:
> > > multimedia/sfml/patches: patch-cmake_Config_cmake
> > > patch-src_SFML_Window_Unix_WindowImplX11_cpp
> > >
> > > Log message:
> > > Update to SFML 2.6.2.
> > >
> > > This unbreaks the port with libc++19, while avoiding the incompatibilities
> > > of SFML >= 3.
> > >
> > > Includes a patch from FreeBSD.
> > >
> > > ok phessler@
> >
> > Does not package for me.
>
> This part of the diff on ports was lost in pascal's commit somehow.
> I committed it just before I saw this mail:
I hadn't noticed this file had been previously removed; thanks for
fixing!
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-CMakeLists_txt 29 Aug 2025 18:53:39 -0000
> @@ -0,0 +1,16 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -292,7 +292,11 @@ if(SFML_INSTALL_PKGCONFIG_FILES)
> + # this could be e.g. macports on mac or msys2 on windows etc.
> + set(SFML_PKGCONFIG_DIR "/${SFML_RELATIVE_INSTALL_LIBDIR}/pkgconfig")
> +
> +- if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
> ++ if(SFML_OS_OPENBSD)
> ++ set(SFML_PKGCONFIG_DIR "/lib/pkgconfig")
> ++ endif()
> ++
> ++ if(SFML_OS_FREEBSD OR SFML_OS_NETBSD)
> + set(SFML_PKGCONFIG_DIR "/libdata/pkgconfig")
> + endif()
> +
