Index: branches/2014Q4/print/freetype2/Makefile
===================================================================
--- branches/2014Q4/print/freetype2/Makefile	(revision 374352)
+++ branches/2014Q4/print/freetype2/Makefile	(revision 374353)
@@ -1,48 +1,47 @@
 # Created by: jseger@FreeBSD.org
 # $FreeBSD$
 #   $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $
 
 PORTNAME=	freetype2
-PORTVERSION=	2.5.3
-PORTREVISION=	2
+PORTVERSION=	2.5.4
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
 		ftp://ftp.freetype.org/freetype/freetype2/
 DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Free and portable TrueType font rendering engine
 
 USES=		gmake libtool:keepla tar:bzip2
 MAKE_ENV=	TOP=""
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-harfbuzz
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
 OPTIONS_DEFINE=		LCD_FILTERING PNG
 LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
 PNG_DESC=		Png compressed OpenType embedded bitmaps support
 
 LCD_FILTERING_CFLAGS=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
 PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 PNG_CONFIGURE_OFF=	--without-png
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/builds/unix/install.mk
 
 post-configure:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.*
 
 .include <bsd.port.mk>
Index: branches/2014Q4/print/freetype2/distinfo
===================================================================
--- branches/2014Q4/print/freetype2/distinfo	(revision 374352)
+++ branches/2014Q4/print/freetype2/distinfo	(revision 374353)
@@ -1,2 +1,2 @@
-SHA256 (freetype-2.5.3.tar.bz2) = c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e
-SIZE (freetype-2.5.3.tar.bz2) = 1703842
+SHA256 (freetype-2.5.4.tar.bz2) = 3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb
+SIZE (freetype-2.5.4.tar.bz2) = 1726105
Index: branches/2014Q4/print/freetype2/pkg-plist
===================================================================
--- branches/2014Q4/print/freetype2/pkg-plist	(revision 374352)
+++ branches/2014Q4/print/freetype2/pkg-plist	(revision 374353)
@@ -1,62 +1,62 @@
 bin/freetype-config
 include/freetype2/config/ftconfig.h
 include/freetype2/config/ftheader.h
 include/freetype2/config/ftmodule.h
 include/freetype2/config/ftoption.h
 include/freetype2/config/ftstdlib.h
 include/freetype2/freetype.h
 include/freetype2/ft2build.h
 include/freetype2/ftadvanc.h
 include/freetype2/ftautoh.h
 include/freetype2/ftbbox.h
 include/freetype2/ftbdf.h
 include/freetype2/ftbitmap.h
 include/freetype2/ftbzip2.h
 include/freetype2/ftcache.h
 include/freetype2/ftcffdrv.h
 include/freetype2/ftchapters.h
 include/freetype2/ftcid.h
 include/freetype2/fterrdef.h
 include/freetype2/fterrors.h
 include/freetype2/ftgasp.h
 include/freetype2/ftglyph.h
 include/freetype2/ftgxval.h
 include/freetype2/ftgzip.h
 include/freetype2/ftimage.h
 include/freetype2/ftincrem.h
 include/freetype2/ftlcdfil.h
 include/freetype2/ftlist.h
 include/freetype2/ftlzw.h
 include/freetype2/ftmac.h
 include/freetype2/ftmm.h
 include/freetype2/ftmodapi.h
 include/freetype2/ftmoderr.h
 include/freetype2/ftotval.h
 include/freetype2/ftoutln.h
 include/freetype2/ftpfr.h
 include/freetype2/ftrender.h
 include/freetype2/ftsizes.h
 include/freetype2/ftsnames.h
 include/freetype2/ftstroke.h
 include/freetype2/ftsynth.h
 include/freetype2/ftsystem.h
 include/freetype2/ftttdrv.h
 include/freetype2/fttrigon.h
 include/freetype2/fttypes.h
 include/freetype2/ftwinfnt.h
 include/freetype2/ftxf86.h
 include/freetype2/t1tables.h
 include/freetype2/ttnameid.h
 include/freetype2/tttables.h
 include/freetype2/tttags.h
 include/freetype2/ttunpat.h
 lib/libfreetype.a
 lib/libfreetype.la
 lib/libfreetype.so
 lib/libfreetype.so.6
-lib/libfreetype.so.6.11.2
+lib/libfreetype.so.6.11.3
 libdata/pkgconfig/freetype2.pc
 man/man1/freetype-config.1.gz
 share/aclocal/freetype2.m4
 @dirrm include/freetype2/config
 @dirrm include/freetype2
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 374352)
+++ branches/2014Q4	(revision 374353)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r374190