From 2b0aeb16a78f77a955bc07c4da33c687a1ee1adc Mon Sep 17 00:00:00 2001 From: Dave Allured Date: Sat, 7 Feb 2026 21:27:54 -0700 Subject: [PATCH] tinyxml: fix build warnings in dependents - use `cmake 1.1` PortGroup See: https://trac.macports.org/ticket/47197 --- textproc/tinyxml/Portfile | 17 ++++++++++------- textproc/tinyxml/files/patch-tinyxml.h.diff | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/textproc/tinyxml/Portfile b/textproc/tinyxml/Portfile index 8b9c1e44d92..cdf203b5834 100644 --- a/textproc/tinyxml/Portfile +++ b/textproc/tinyxml/Portfile @@ -1,8 +1,7 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 PortSystem 1.0 -PortGroup cmake 1.0 -cmake.out_of_source yes +PortGroup cmake 1.1 name tinyxml version 2.6.2 @@ -11,14 +10,18 @@ categories textproc maintainers nomaintainer license zlib description Simple, small, C++ XML parser -long_description TinyXML is a simple, small, C++ XML parser that can be \ - easily integrating into other programs. -homepage http://www.grinninglizard.com/tinyxml/ -platforms darwin +long_description TinyXML is a simple, small, C++ XML parser that can be\ + easily integrating into other programs.\ + This is TinyXML-1, which is deprecated.\ + Please migrate to TinyXML-2 when practical. + +homepage https://sourceforge.net/projects/tinyxml/ master_sites sourceforge:project/${name}/${name}/${version} checksums rmd160 162880af0cb1a284268cc18ec582f51c55120a76 \ - sha1 a425a22ff331dafa570b2a508a37a85a4eaa4127 + sha256 ac6bb9501c6f50cc922d22f26b02fab168db47521be5e845b83d3451a3e1d512 \ + size 290881 + patchfiles patch-tinyxml.h.diff distname ${name}_[strsed ${version} {g/\./_/}] worksrcdir ${name} diff --git a/textproc/tinyxml/files/patch-tinyxml.h.diff b/textproc/tinyxml/files/patch-tinyxml.h.diff index bd64234a15a..b24d49e612f 100644 --- a/textproc/tinyxml/files/patch-tinyxml.h.diff +++ b/textproc/tinyxml/files/patch-tinyxml.h.diff @@ -1,10 +1,19 @@ ---- tinyxml.h.orig 2012-04-11 20:02:41.000000000 -0500 -+++ tinyxml.h 2012-04-11 20:04:27.000000000 -0500 -@@ -26,6 +26,8 @@ +--- tinyxml.h.orig 2011-05-14 20:24:57 ++++ tinyxml.h 2026-02-04 17:20:26 +@@ -26,6 +26,17 @@ #ifndef TINYXML_INCLUDED #define TINYXML_INCLUDED ++/* ++MacPorts patch: ++If we are going to hard code TIXML_USE_STL in the header file, ++then respect previous definitions in packages that define their own. ++Also stop floods of "macro redefined" warnings. ++*/ ++ ++#ifndef TIXML_USE_STL +#define TIXML_USE_STL ++#endif + #ifdef _MSC_VER #pragma warning( push )