--- a/open-src/lib/freetype/COPYING Tue Jul 12 17:03:49 2011 -0700
+++ b/open-src/lib/freetype/COPYING Wed Jul 13 17:24:14 2011 -0700
@@ -1,4 +1,4 @@
-Portions of this software are copyright � 1996-2010 The FreeType
+Portions of this software are copyright � 1996-2011 The FreeType
Project <http://www.freetype.org/>. All rights reserved.
Redistribution of this software is made under the terms of The
@@ -7,7 +7,7 @@
The FreeType BDF & PCF drivers are covered by the following notices:
Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
- 2009, 2010, by Francesco Zappa Nardelli
+ 2009, 2010, 2011, by Francesco Zappa Nardelli
Copyright 2000 Computing Research Labs, New Mexico State University
Permission is hereby granted, free of charge, to any person obtaining
--- a/open-src/lib/freetype/Makefile Tue Jul 12 17:03:49 2011 -0700
+++ b/open-src/lib/freetype/Makefile Wed Jul 13 17:24:14 2011 -0700
@@ -63,11 +63,11 @@
LIBNAME=freetype
# Version number (used in path names)
-MODULE_VERSION=2.4.4
+MODULE_VERSION=2.4.5
# Checksums for upstream tarball
-TARBALL_MD5 = b3e2b6e2f1c3e0dffa1fd2a0f848b671
-TARBALL_SHA1 = 1d136cbc51c67b212c91ba04dc5db797f35e64e6
+TARBALL_MD5 = 90428a6d8ec4876cd1eb94858c2a59b0
+TARBALL_SHA1 = edc5217f1a0e3bec37f9846bb5203e8d005cf470
# Download site for source
SOURCE_URL=http://download.savannah.gnu.org/releases/freetype/$(SOURCE_TARBALL_NAME)
--- a/open-src/lib/freetype/freetype-config.patch Tue Jul 12 17:03:49 2011 -0700
+++ b/open-src/lib/freetype/freetype-config.patch Wed Jul 13 17:24:14 2011 -0700
@@ -28,7 +28,7 @@
if test "$enable_shared" = "yes" ; then
eval "rpath=\"$hardcode_libdir_flag_spec\""
fi
-- libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
+- libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@"
+ libs="-lfreetype @FT2_EXTRA_LIBS@"
if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
echo -L${SYSROOT}$libdir $libs
--- a/open-src/lib/freetype/unix-cc.in.9.patch Tue Jul 12 17:03:49 2011 -0700
+++ b/open-src/lib/freetype/unix-cc.in.9.patch Wed Jul 13 17:24:14 2011 -0700
@@ -22,9 +22,11 @@
Call compiler directly to build & link, avoiding libtool, so we can pass
the compiler & linker flags we want.
---- freetype-2.4.1/builds/unix/unix-cc.in 2009-03-14 06:45:26.000000000 -0700
-+++ freetype-2.4.1/builds/unix/unix-cc.in 2010-08-05 19:38:02.381773781 -0700
-@@ -21,7 +21,7 @@ LIBTOOL ?= $(BUILD_DIR)/libtool
+diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
+index b84bc5d..d6c19bc 100644
+--- a/builds/unix/unix-cc.in
++++ b/builds/unix/unix-cc.in
+@@ -22,7 +22,7 @@ LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
#
@@ -33,7 +35,7 @@
SO := o
-@@ -35,7 +35,7 @@ E := @EXEEXT@
+@@ -36,7 +36,7 @@ E := @EXEEXT@
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
@@ -42,7 +44,7 @@
SA := a
-@@ -84,11 +84,11 @@ CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ -DFT
+@@ -85,11 +85,11 @@ CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
#
ANSIFLAGS := @XX_ANSIFLAGS@
@@ -56,7 +58,7 @@
# Linker flags.
#
-@@ -105,9 +105,8 @@ CCexe := $(CCraw_build) # used to
+@@ -106,9 +106,8 @@ CCexe := $(CCraw_build) # used to compile `apinames' only
# Library linking
#
--- a/pkg/manifests/system-library-freetype-2.p5m Tue Jul 12 17:03:49 2011 -0700
+++ b/pkg/manifests/system-library-freetype-2.p5m Wed Jul 13 17:24:14 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -50,6 +50,7 @@
file path=usr/include/freetype2/freetype/ftbbox.h
file path=usr/include/freetype2/freetype/ftbdf.h
file path=usr/include/freetype2/freetype/ftbitmap.h
+file path=usr/include/freetype2/freetype/ftbzip2.h
file path=usr/include/freetype2/freetype/ftcache.h
file path=usr/include/freetype2/freetype/ftchapters.h
file path=usr/include/freetype2/freetype/ftcid.h
@@ -98,6 +99,7 @@
file path=usr/share/doc/freetype/ft2-basic_types.html
file path=usr/share/doc/freetype/ft2-bdf_fonts.html
file path=usr/share/doc/freetype/ft2-bitmap_handling.html
+file path=usr/share/doc/freetype/ft2-bzip2.html
file path=usr/share/doc/freetype/ft2-cache_subsystem.html
file path=usr/share/doc/freetype/ft2-cid_fonts.html
file path=usr/share/doc/freetype/ft2-computations.html