Date: Mon, 9 Jan 2012 10:30:18 +0100 (CET) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Kevin Lo <kevlo@FreeBSD.org> Subject: ports/163950: [PATCH] enable STL support in textproc/tinyxml Message-ID: <20120109093018.3DED31923@megatron.madpilot.net> Resent-Message-ID: <201201090940.q099eDxd058092@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163950
>Category: ports
>Synopsis: [PATCH] enable STL support in textproc/tinyxml
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 09 09:40:13 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 9.0-RC1 amd64
>Organization:
none
>Environment:
System: FreeBSD megatron.madpilot.net 9.0-RC1 FreeBSD 9.0-RC1 #1: Mon Oct 31 13:48:49 CET 2011 root@megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64
>Description:
This patch adds an option to textproc/tinyxml to enable STL support,
default to being active.
Due to this change in default PORTREVISION is bumped.
This change is required because the new version of pokerth(I'll
file a PR about that shortly) requires this option to be enabled
to compile. I tested dependant port with no ill effects.
Maintainer is CCed.
Added file:
files/stl-patch-tinyxml.h
>How-To-Repeat:
>Fix:
diff -ruN tinyxml.old/Makefile tinyxml/Makefile
--- tinyxml.old/Makefile 2012-01-08 11:50:22.820442208 +0100
+++ tinyxml/Makefile 2012-01-08 11:50:32.914439150 +0100
@@ -7,6 +7,7 @@
PORTNAME= tinyxml
PORTVERSION= 2.6.2
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
@@ -20,6 +21,10 @@
SHLIB_MAJOR= 3
PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
+OPTIONS= STL "Use STL" on
+
+.include <bsd.port.options.mk>
+
.if defined(NOPROFILE) || defined(NO_PROFILE)
PLIST_SUB+= PROFILE="@comment "
.else
@@ -30,6 +35,9 @@
${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.prev
@${SED} -e "s=%%SHLIB_MAJOR%%=${SHLIB_MAJOR}=g" \
${FILESDIR}/Makefile > ${WRKSRC}/Makefile
+.if defined(WITH_STL)
+ ${PATCH} --quiet --forward -d ${WRKSRC} <${PATCHDIR}/stl-patch-tinyxml.h
+.endif
post-install:
.ifndef(NOPORTDOCS)
diff -ruN tinyxml.old/files/stl-patch-tinyxml.h tinyxml/files/stl-patch-tinyxml.h
--- tinyxml.old/files/stl-patch-tinyxml.h 1970-01-01 01:00:00.000000000 +0100
+++ tinyxml/files/stl-patch-tinyxml.h 2012-01-08 11:50:32.912443292 +0100
@@ -0,0 +1,11 @@
+--- tinyxml.h.orig 2012-01-07 23:11:37.561366901 +0100
++++ tinyxml.h 2012-01-07 23:11:58.085366340 +0100
+@@ -26,6 +26,8 @@
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+
++#define TIXML_USE_STL
++
+ #ifdef _MSC_VER
+ #pragma warning( push )
+ #pragma warning( disable : 4530 )
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120109093018.3DED31923>