svn commit: r327651 - head/print/freetype2

[Koop Mast]

Author: kwm
Date: Thu Sep 19 21:49:50 2013
New Revision: 327651
URL: http://svnweb.freebsd.org/changeset/ports/327651

Log:
  Update to 2.5.0.1.
  
  Adobe's CFF engine is now the default.
  
  USE_GMAKE -> USES=gmake
  Remove leading article from COMMENTS

Modified:
  head/print/freetype2/Makefile
  head/print/freetype2/distinfo
  head/print/freetype2/pkg-plist

Modified: head/print/freetype2/Makefile
==============================================================================
--- head/print/freetype2/Makefile	Thu Sep 19 21:42:51 2013	(r327650)
+++ head/print/freetype2/Makefile	Thu Sep 19 21:49:50 2013	(r327651)
@@ -3,10 +3,9 @@
 #   $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $
 
 PORTNAME=	freetype2
-PORTVERSION=	2.4.12
-PORTREVISION=	1
+PORTVERSION=	2.5.0.1
 CATEGORIES=	print
-MASTER_SITES=	SF/freetype/${PORTNAME}/${PORTVERSION} \
+MASTER_SITES=	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/ \
@@ -15,11 +14,11 @@ MASTER_SITES=	SF/freetype/${PORTNAME}/${
 DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 
 MAINTAINER=	gnome at FreeBSD.org
-COMMENT=	A free and portable TrueType font rendering engine
+COMMENT=	Free and portable TrueType font rendering engine
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 MAKE_ENV=	TOP=""
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -27,9 +26,9 @@ USE_GNOME=	ltverhack:9
 LIBTOOLFILES=	builds/unix/configure
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
-OPTIONS_DEFINE=		LCD_FILTERING CFF_HINTING_ADOBE
+OPTIONS_DEFINE=		LCD_FILTERING PNG
 LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
-CFF_HINTING_ADOBE_DESC=	CFF parsing and hinting engine by Adobe and Google
+PNG_DESC=		Png compressed OpenType embedded bitmaps support
 
 .include <bsd.port.options.mk>
 
@@ -37,13 +36,15 @@ CFF_HINTING_ADOBE_DESC=	CFF parsing and 
 CFLAGS+=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 .endif
 
+.if ${PORT_OPTIONS:MPNG}
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
+.else
+CONFIGURE_ARGS+=--without-png
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/builds/unix/install.mk
-.if ${PORT_OPTIONS:MCFF_HINTING_ADOBE}
-	@${REINPLACE_CMD} -e 's|FT_CFF_HINTING_FREETYPE|FT_CFF_HINTING_ADOBE|g' \
-		${WRKSRC}/src/cff/cffobjs.c
-.endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \

Modified: head/print/freetype2/distinfo
==============================================================================
--- head/print/freetype2/distinfo	Thu Sep 19 21:42:51 2013	(r327650)
+++ head/print/freetype2/distinfo	Thu Sep 19 21:49:50 2013	(r327651)
@@ -1,2 +1,2 @@
-SHA256 (freetype-2.4.12.tar.bz2) = a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381
-SIZE (freetype-2.4.12.tar.bz2) = 1597205
+SHA256 (freetype-2.5.0.1.tar.bz2) = 57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5
+SIZE (freetype-2.5.0.1.tar.bz2) = 1607037

Modified: head/print/freetype2/pkg-plist
==============================================================================
--- head/print/freetype2/pkg-plist	Thu Sep 19 21:42:51 2013	(r327650)
+++ head/print/freetype2/pkg-plist	Thu Sep 19 21:49:50 2013	(r327651)
@@ -39,6 +39,7 @@ include/freetype2/freetype/ftsnames.h
 include/freetype2/freetype/ftstroke.h
 include/freetype2/freetype/ftsynth.h
 include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/ftttdrv.h
 include/freetype2/freetype/fttrigon.h
 include/freetype2/freetype/fttypes.h
 include/freetype2/freetype/ftwinfnt.h