svn commit: r318349 - in head/print/freetype2: . files

[Jeremy Messenger]

Author: mezz
Date: Fri May 17 01:31:51 2013
New Revision: 318349
URL: http://svnweb.freebsd.org/changeset/ports/318349

Log:
  Update to 2.4.12 and add a new option, CFF_HINTING_ADOBE. The
  CFF_HINTING_ADOBE is a CFF parsing and hinting engine by Adobe
  and Google. It is disable by default.
  
  PR:		ports/178552
  Submitted by:	pfg

Modified:
  head/print/freetype2/Makefile
  head/print/freetype2/distinfo
  head/print/freetype2/files/patch-aa   (contents, props changed)
  head/print/freetype2/pkg-plist

Modified: head/print/freetype2/Makefile
==============================================================================
--- head/print/freetype2/Makefile	Fri May 17 01:02:37 2013	(r318348)
+++ head/print/freetype2/Makefile	Fri May 17 01:31:51 2013	(r318349)
@@ -3,7 +3,7 @@
 #   $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $
 
 PORTNAME=	freetype2
-PORTVERSION=	2.4.11
+PORTVERSION=	2.4.12
 CATEGORIES=	print
 MASTER_SITES=	SF/freetype/${PORTNAME}/${PORTVERSION} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
@@ -27,8 +27,9 @@ USE_GNOME=	ltverhack:9
 LIBTOOLFILES=	builds/unix/configure
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
-OPTIONS_DEFINE=		LCD_FILTERING
+OPTIONS_DEFINE=		LCD_FILTERING CFF_HINTING_ADOBE
 LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
+CFF_HINTING_ADOBE_DESC=	CFF parsing and hinting engine by Adobe and Google
 
 .include <bsd.port.options.mk>
 
@@ -39,6 +40,10 @@ CFLAGS+=	-DFT_CONFIG_OPTION_SUBPIXEL_REN
 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	Fri May 17 01:02:37 2013	(r318348)
+++ head/print/freetype2/distinfo	Fri May 17 01:31:51 2013	(r318349)
@@ -1,2 +1,2 @@
-SHA256 (freetype-2.4.11.tar.bz2) = ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f
-SIZE (freetype-2.4.11.tar.bz2) = 1546087
+SHA256 (freetype-2.4.12.tar.bz2) = a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381
+SIZE (freetype-2.4.12.tar.bz2) = 1597205

Modified: head/print/freetype2/files/patch-aa
==============================================================================
--- head/print/freetype2/files/patch-aa	Fri May 17 01:02:37 2013	(r318348)
+++ head/print/freetype2/files/patch-aa	Fri May 17 01:31:51 2013	(r318349)
@@ -1,8 +1,8 @@
---- builds/unix/detect.mk.orig	2006-12-09 13:51:54.000000000 -0500
-+++ builds/unix/detect.mk	2007-07-06 12:55:05.000000000 -0400
-@@ -21,6 +21,9 @@ ifeq ($(PLATFORM),ansi)
-   is_unix := $(strip $(wildcard /sbin/init) \
+--- builds/unix/detect.mk.orig	2013-03-21 13:55:46.000000000 -0500
++++ builds/unix/detect.mk	2013-05-12 17:58:34.000000000 -0500
+@@ -22,6 +22,9 @@
                       $(wildcard /usr/sbin/init) \
+                      $(wildcard /dev/null) \
                       $(wildcard /hurd/auth))
 +  # FreeBSD is "unix" so just mandate this to fix the build in
 +  # jails that do not have init (see PR#113470).
@@ -10,15 +10,15 @@
    ifneq ($(is_unix),)
  
      PLATFORM := unix
-@@ -79,9 +82,9 @@ ifeq ($(PLATFORM),unix)
+@@ -81,9 +84,9 @@
    ifdef must_configure
      ifneq ($(have_Makefile),)
        # we are building FT2 not in the src tree
--	      $(TOP_DIR)/builds/unix/configure $(value CFG)
-+#	      $(TOP_DIR)/builds/unix/configure $(value CFG)
+-	      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
++      #      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
      else
--	      cd builds/unix; ./configure $(value CFG)
-+#	      cd builds/unix; ./configure $(value CFG)
+-	      cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
++      #     cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
      endif
    endif
  

Modified: head/print/freetype2/pkg-plist
==============================================================================
--- head/print/freetype2/pkg-plist	Fri May 17 01:02:37 2013	(r318348)
+++ head/print/freetype2/pkg-plist	Fri May 17 01:31:51 2013	(r318349)
@@ -12,6 +12,7 @@ include/freetype2/freetype/ftbdf.h
 include/freetype2/freetype/ftbitmap.h
 include/freetype2/freetype/ftbzip2.h
 include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/ftcffdrv.h
 include/freetype2/freetype/ftchapters.h
 include/freetype2/freetype/ftcid.h
 include/freetype2/freetype/fterrdef.h