Index: textproc/tinyxml2/Makefile
===================================================================
--- textproc/tinyxml2/Makefile	(revision 377396)
+++ textproc/tinyxml2/Makefile	(working copy)
@@ -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 @@
 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 @@
 	@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>
Index: textproc/tinyxml2/distinfo
===================================================================
--- textproc/tinyxml2/distinfo	(revision 377396)
+++ textproc/tinyxml2/distinfo	(working copy)
@@ -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