Index: branches/2015Q3/graphics/libwmf/Makefile
===================================================================
--- branches/2015Q3/graphics/libwmf/Makefile	(revision 396262)
+++ branches/2015Q3/graphics/libwmf/Makefile	(revision 396263)
@@ -1,56 +1,56 @@
 # Created by: Chris Piazza <cpiazza@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libwmf
 PORTVERSION=	0.2.8.4
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	graphics
 MASTER_SITES=	SF/wvware/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	jason.unovitch@gmail.com
+MAINTAINER=	junovitch@FreeBSD.org
 COMMENT=	Tools and library for converting Microsoft WMF (windows metafile)
 
 LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 CONFLICTS?=	libwmf-nox11-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sys-gd=no \
 		--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
 		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
 INSTALL_TARGET=	install-strip
 USES=		jpeg libtool
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	X11 DOCS
 OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
 X11_USE=	XORG=x11
 X11_CONFIGURE_OFF=--with-x=no
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \
 		 s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \
 		 s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
 		${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -
 .endif
 
 .include <bsd.port.mk>
Index: branches/2015Q3/graphics/libwmf/files/patch-deb784192-CVE-2015-4696
===================================================================
--- branches/2015Q3/graphics/libwmf/files/patch-deb784192-CVE-2015-4696	(revision 396262)
+++ branches/2015Q3/graphics/libwmf/files/patch-deb784192-CVE-2015-4696	(revision 396263)
@@ -1,20 +1,23 @@
 --- src/player/meta.h
 +++ src/player/meta.h
+@@ -2585,6 +2585,8 @@
+ 			polyrect.BR[i] = clip->rects[i].BR;
+ 		}
  
 +		if (FR->region_clip) FR->region_clip (API,&polyrect);
 +
  		wmf_free (API,polyrect.TL);
  		wmf_free (API,polyrect.BR);
  	}
 @@ -2593,9 +2595,10 @@
  		polyrect.BR = 0;
  
  		polyrect.count = 0;
 +	
 +		if (FR->region_clip) FR->region_clip (API,&polyrect);
  	}
  
 -	if (FR->region_clip) FR->region_clip (API,&polyrect);
  
  	return (changed);
  }
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 396262)
+++ branches/2015Q3	(revision 396263)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r396262