From 0b3fa9b88fc71e220f07670922cf2e7a9f0040eb Mon Sep 17 00:00:00 2001
From: spz <spz>
Date: Tue, 20 Jul 2010 19:46:39 +0000
Subject: Pullup ticket 3173 - requested by drochner security update

Revisions pulled up:
- pkgsrc/graphics/freetype2/Makefile	1.73
- pkgsrc/graphics/freetype2/distinfo	1.35

-------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Jul 20 11:44:15 UTC 2010

   Modified Files:
           pkgsrc/graphics/freetype2: Makefile distinfo

   Log Message:
   update to 2.4.1
   changes:
   - Since May  2010, all  patents  regarding  the TrueType  bytecode
     interpreter have expired worldwide.  Consequently, we now define
     TT_CONFIG_OPTION_BYTECODE_INTERPRETER by  default (and  undefine
     TT_CONFIG_OPTION_UNPATENTED_HINTING).
   - A new function `FT_Library_SetLcdFilterWeights' is available  to
     adjust the filter weights set by `FT_Library_SetLcdFilter'.
   -increased robustness, bugfixes

   pkgsrc note: the "truetype" option was removed, the bytecode interpreter
   is now always enabled

   To generate a diff of this commit:
   cvs rdiff -u -r1.72 -r1.73 pkgsrc/graphics/freetype2/Makefile
   cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/freetype2/distinfo
---
 graphics/freetype2/Makefile | 19 ++++---------------
 graphics/freetype2/distinfo |  8 ++++----
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index adb0dea46b5..83936f5561c 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2010/02/18 21:28:45 drochner Exp $
+# $NetBSD: Makefile,v 1.72.4.1 2010/07/20 19:46:39 spz Exp $
 
-DISTNAME=	freetype-2.3.12
+DISTNAME=	freetype-2.4.1
 PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/} \
@@ -33,22 +33,11 @@ PKGCONFIG_OVERRIDE=	builds/unix/freetype2.in
 .include "../../mk/compiler.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.freetype2
-PKG_SUPPORTED_OPTIONS=	truetype subpixel
+PKG_SUPPORTED_OPTIONS=	subpixel
 
 .include "../../mk/bsd.options.mk"
 
-###
-### This builds freetype2 with the TrueType bytecode interpreter.  Note
-### that there are important patent issues related to the use of the
-### interpreter:
-###
-###	http://www.freetype.org/patents.html
-###
-.if !empty(PKG_OPTIONS:Mtruetype)
-CFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
-.endif
-
-# subpixel (lcd) rendering, also patent issues
+# subpixel (lcd) rendering, patent issues
 .if !empty(PKG_OPTIONS:Msubpixel)
 CFLAGS+=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 .endif
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index 34f902e5793..663a6f1214a 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34 2010/02/18 21:28:45 drochner Exp $
+$NetBSD: distinfo,v 1.34.4.1 2010/07/20 19:46:39 spz Exp $
 
-SHA1 (freetype-2.3.12.tar.bz2) = ebf0438429c0bedd310059326d91646c3c91016b
-RMD160 (freetype-2.3.12.tar.bz2) = 57437a2bc0d85859cff2ca1253b36e64629397a1
-Size (freetype-2.3.12.tar.bz2) = 1453034 bytes
+SHA1 (freetype-2.4.1.tar.bz2) = 1870cc142be52a721031fcf16c4f8110dfb84fdb
+RMD160 (freetype-2.4.1.tar.bz2) = 8e0dc7fb031c900984fac338bfc117cdb1c2055d
+Size (freetype-2.4.1.tar.bz2) = 1432560 bytes
 SHA1 (patch-aa) = 85bf9979802e04345a9f5ac3ada2cac9520dabcb
-- 
cgit v1.2.3