From 9977149e7df65ae54060cbaa0915c8d3a3b09b87 Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Thu, 19 Feb 2015 20:07:32 +0000
Subject: [PATCH] - Update to 2.2.0 - Simplify Makefile - Bump PORTREVISION for
 textproc/tinyxml2 shlib change

Changes:	https://github.com/leethomason/tinyxml2/commits/master
PR:		196884
Submitted by:	sunpoet (myself)
Approved by:	maintainer (timeout, 1 month)
---
 devel/cppcheck/Makefile          |  1 +
 multimedia/libmediainfo/Makefile |  1 +
 textproc/tinyxml2/Makefile       | 19 ++++++-------------
 textproc/tinyxml2/distinfo       |  4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index b97f60aa6ce3..7211e51172d7 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cppcheck
 PORTVERSION=	1.63
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index 2178aa50e825..bdeae80524ac 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmediainfo
 PORTVERSION=	0.7.72
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile
index 49be305e2a95..880bac7c6e7e 100644
--- a/textproc/tinyxml2/Makefile
+++ b/textproc/tinyxml2/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tinyxml2
-PORTVERSION=	20140124
+PORTVERSION=	2.2.0
+PORTEPOCH=	1
 CATEGORIES=	textproc
-MASTER_SITES=	LOCAL/bf GH
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Small C++ XML Parser
@@ -16,20 +16,18 @@ USE_LDCONFIG=	yes
 USES=		cmake dos2unix
 
 GH_ACCOUNT=	leethomason
-GH_COMMIT=	5bb2d80
-GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	5321a0e
 
 PLIST_FILES=	include/tinyxml2.h \
 		lib/libtinyxml2.a \
 		lib/libtinyxml2.so \
-		lib/libtinyxml2.so.1 \
-		lib/libtinyxml2.so.1.0.14 \
+		lib/libtinyxml2.so.2 \
+		lib/libtinyxml2.so.2.2.0 \
 		libdata/pkgconfig/tinyxml2.pc
+PORTEXAMPLES=	xmltest.cpp resources
 
 OPTIONS_DEFINE=	EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's@(DESTINATION )(.*)(/pkgconfig)@\1${PREFIX}/libdata\3@' \
@@ -39,13 +37,8 @@ check regression-test test: build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test ; \
 	./test
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-PORTEXAMPLES=	xmltest.cpp resources
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}; ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}
 
-.endif
-
 .include <bsd.port.mk>
diff --git a/textproc/tinyxml2/distinfo b/textproc/tinyxml2/distinfo
index ddeae5b3d2b0..46230d396b6f 100644
--- a/textproc/tinyxml2/distinfo
+++ b/textproc/tinyxml2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tinyxml2-20140124.tar.gz) = 571bcf2d08954fd8d28b849fe73c20ee2c4670d738786bc568ebfbcab6c29ebb
-SIZE (tinyxml2-20140124.tar.gz) = 451789
+SHA256 (tinyxml2-2.2.0.tar.gz) = ef38f6fa292c922ede197fa1e115b0b1a7eda79ee3fba795e3ea4f0b4646aa06
+SIZE (tinyxml2-2.2.0.tar.gz) = 455286