From 97b2bcbc1439acf57f03e11e61ab01c58101a322 Mon Sep 17 00:00:00 2001 From: minskim Date: Sat, 17 Jun 2006 19:41:32 +0000 Subject: [PATCH] Update freetype1 packages to 1.5, the final version. Changes: - apiref.txt has been again revised. - apirefx.txt has been extended to document the GPOS interface. - TODO has been dropped (since we consider there will be no further development). - TT_Char_Index() now uses TT_ULong for character codes. It now supports cmap tables in format 8 and 12. - New error code (TT_Err_Too_Many_FDefs) when a font defines too many functions. - Support files for BeOS have been contributed by Chris Herborth. - The EXPORT_DEF/EXPORT_FUNC/etc. stuff has been replaced with a more elaborate scheme. - Cleaning up of the ft_conf.h files to remove obsolete stuff. - TT_GSUB_Add_String() has two additional parameters needed for GPOS support. - TT_CharMap_Next() of the ftxcmap extension now uses `TT_ULong' as the second parameter. - A long-lived bug in ftxpost.c. --- graphics/freetype-lib/Makefile | 3 +- graphics/freetype-lib/Makefile.common | 9 ++-- graphics/freetype-lib/distinfo | 24 +++++++---- graphics/freetype-lib/patches/patch-ad | 22 ---------- graphics/freetype-lib/patches/patch-ttf2pk-ab | 19 ++++----- graphics/freetype-lib/patches/patch-ttf2pk-af | 41 +++++++++++++++++++ graphics/freetype-utils/Makefile | 3 +- graphics/freetype/Makefile | 9 ++-- 8 files changed, 76 insertions(+), 54 deletions(-) delete mode 100644 graphics/freetype-lib/patches/patch-ad create mode 100644 graphics/freetype-lib/patches/patch-ttf2pk-af diff --git a/graphics/freetype-lib/Makefile b/graphics/freetype-lib/Makefile index d897d46c3135..662246cbefa7 100644 --- a/graphics/freetype-lib/Makefile +++ b/graphics/freetype-lib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:30 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/06/17 19:41:32 minskim Exp $ .include "Makefile.common" PKGNAME= freetype-lib-${FT_VERS} -PKGREVISION= 3 COMMENT= TrueType font rendering engine and library API CONFIGURE_ARGS+= --without-x diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index cee217ce7255..bbe837010b2d 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.33 2006/04/13 18:23:33 jlam Exp $ +# $NetBSD: Makefile.common,v 1.34 2006/06/17 19:41:32 minskim Exp $ -DISTNAME= freetype-${FT_VERS} -FT_VERS= 1.3.1 +DISTNAME= freetype1_1.4pre.20030402.orig +FT_VERS= 1.5 CATEGORIES= graphics textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} +MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/f/freetype1/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://freetype.sourceforge.net/ @@ -12,6 +12,7 @@ CONFLICTS= freetype-1.[12]* PKG_INSTALLATION_TYPES= overwrite pkgviews +WRKSRC= ${WRKDIR}/${DISTNAME:S/.orig//:S/_/-/} USE_TOOLS+= msgfmt USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes diff --git a/graphics/freetype-lib/distinfo b/graphics/freetype-lib/distinfo index 62d5d936486e..27565c2669ef 100644 --- a/graphics/freetype-lib/distinfo +++ b/graphics/freetype-lib/distinfo @@ -1,14 +1,20 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 08:45:05 agc Exp $ +$NetBSD: distinfo,v 1.9 2006/06/17 19:41:32 minskim Exp $ -SHA1 (freetype-1.3.1.tar.gz) = a398fb4d6dd756826e459058d8075759086f8ca4 -RMD160 (freetype-1.3.1.tar.gz) = 43993a667b536b4f85d32318dec32eb3f3b66454 -Size (freetype-1.3.1.tar.gz) = 1427072 bytes -SHA1 (patch-aa) = b75fc2d414c2bab0c4abf2bc84c370c9298c1664 -SHA1 (patch-ab) = 8bea35dceffa399cf0f17065e2d1f9aafabf56e3 -SHA1 (patch-ac) = b27f18b5f84c4d1451376295cf3b7caf08d2d56f -SHA1 (patch-ad) = 136577ca779ddb205440bec01f2b6a4ee61932f8 +SHA1 (freetype1_1.4pre.20030402.orig.tar.gz) = 595d526813e63400b56a5993caa3e2ea18f2f92c +RMD160 (freetype1_1.4pre.20030402.orig.tar.gz) = 9db8891cfb348faeb5387fba0b92dcae54cfed7c +Size (freetype1_1.4pre.20030402.orig.tar.gz) = 1402735 bytes SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac -SHA1 (patch-ttf2pk-ab) = 8e205eb52c02d43ba0970971df1261e88ec1f7e4 +SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3 SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74 SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91 +SHA1 (patch-ttf2pk-af) = 8a47cd019ad3ae3c503f20818e0a06c91312e858 +SHA1 (patch-aa) = b75fc2d414c2bab0c4abf2bc84c370c9298c1664 +SHA1 (patch-ab) = 8bea35dceffa399cf0f17065e2d1f9aafabf56e3 +SHA1 (patch-ac) = b27f18b5f84c4d1451376295cf3b7caf08d2d56f +SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac +SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3 +SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74 +SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae +SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91 +SHA1 (patch-ttf2pk-af) = 8a47cd019ad3ae3c503f20818e0a06c91312e858 diff --git a/graphics/freetype-lib/patches/patch-ad b/graphics/freetype-lib/patches/patch-ad deleted file mode 100644 index b71ea63bf667..000000000000 --- a/graphics/freetype-lib/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2003/09/16 11:56:59 adam Exp $ - ---- test/ftdump.c.orig 2003-09-16 13:35:23.000000000 +0200 -+++ test/ftdump.c -@@ -140,7 +140,7 @@ - old_memory += *var; - } - --#define FOOTPRINT( field ) Save_Memory( &memory_footprint.##field ) -+#define FOOTPRINT( field ) Save_Memory( &memory_footprint.field ) - - - static void -@@ -153,7 +153,7 @@ - } - - #define PRINT_MEM( field, string ) \ -- Print_Mem( memory_footprint.##field, string ) -+ Print_Mem( memory_footprint.field, string ) - - - /* Print the memory footprint */ diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-ab b/graphics/freetype-lib/patches/patch-ttf2pk-ab index 126465f382c6..79699ba7a701 100644 --- a/graphics/freetype-lib/patches/patch-ttf2pk-ab +++ b/graphics/freetype-lib/patches/patch-ttf2pk-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ttf2pk-ab,v 1.1 2004/11/06 14:22:22 hubertf Exp $ +$NetBSD: patch-ttf2pk-ab,v 1.2 2006/06/17 19:41:32 minskim Exp $ ---- contrib/ttf2pk/configure.in.orig Thu Jun 10 23:51:36 1999 -+++ contrib/ttf2pk/configure.in -@@ -5,7 +5,7 @@ dnl Process this file with autoconf to p - dnl Some tests are omitted since we assume that you've built the +--- contrib/ttf2pk/configure.ac.orig 2002-06-20 10:34:37.000000000 -0700 ++++ contrib/ttf2pk/configure.ac +@@ -6,7 +6,7 @@ dnl Some tests are omitted since we assu dnl FreeType library successfully. --AC_INIT(../../lib/freetype.h) -+AC_INIT(ttf2pk.c) + AC_INIT +-AC_CONFIG_SRCDIR([../../lib/freetype.h]) ++AC_CONFIG_SRCDIR([ttf2pk.c]) - AC_CANONICAL_SYSTEM + AC_CANONICAL_TARGET([]) -@@ -47,12 +47,10 @@ fi +@@ -66,12 +66,9 @@ fi AC_CHECK_LIB(m, floor) AC_CHECK_LIB(intl, gettext) @@ -19,7 +19,6 @@ $NetBSD: patch-ttf2pk-ab,v 1.1 2004/11/06 14:22:22 hubertf Exp $ -LIBS="$LIBS -L../../lib/.libs" -CPPFLAGS="-I$srcdir/../../lib $CPPFLAGS" +CPPFLAGS="$CPPFLAGS -I$prefix/include/freetype" -+ AC_CHECK_LIB(ttf, TT_Init_FreeType, LIBS="$LIBS -lttf",[ AC_MSG_ERROR([Can't find ttf library! Compile FreeType first.])]) -LIBS=$OLDLIBS diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-af b/graphics/freetype-lib/patches/patch-ttf2pk-af new file mode 100644 index 000000000000..74ceccc8aa38 --- /dev/null +++ b/graphics/freetype-lib/patches/patch-ttf2pk-af @@ -0,0 +1,41 @@ +$NetBSD: patch-ttf2pk-af,v 1.1 2006/06/17 19:41:32 minskim Exp $ + +--- contrib/ttf2pk/configure.orig 2002-11-15 01:41:24.000000000 -0800 ++++ contrib/ttf2pk/configure +@@ -267,7 +267,7 @@ PACKAGE_VERSION= + PACKAGE_STRING= + PACKAGE_BUGREPORT= + +-ac_unique_file="../../lib/freetype.h" ++ac_unique_file="ttf2pk.c" + # Factoring default headers for most tests. + ac_includes_default="\ + #include +@@ -3089,9 +3089,7 @@ _ACEOF + fi + + +-OLDLIBS=$LIBS +-LIBS="$LIBS -L../../lib/.libs" +-CPPFLAGS="-I$srcdir/../../lib $CPPFLAGS" ++CPPFLAGS="$CPPFLAGS -I$prefix/include/freetype" + echo "$as_me:$LINENO: checking for TT_Init_FreeType in -lttf" >&5 + echo $ECHO_N "checking for TT_Init_FreeType in -lttf... $ECHO_C" >&6 + if test "${ac_cv_lib_ttf_TT_Init_FreeType+set}" = set; then +@@ -3150,7 +3148,6 @@ echo "$as_me: error: Can't find ttf libr + { (exit 1); exit 1; }; } + fi + +-LIBS=$OLDLIBS + + + if test "x$CC" = xgcc; then +@@ -3812,6 +3809,8 @@ do + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ # Avoid regenerating for rechecks on pkgsrc ++ exit 0 + echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" + exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; + _ACEOF diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile index 336879032d3c..db18bc48a4a0 100644 --- a/graphics/freetype-utils/Makefile +++ b/graphics/freetype-utils/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:02 reed Exp $ +# $NetBSD: Makefile,v 1.20 2006/06/17 19:41:33 minskim Exp $ .include "../../graphics/freetype-lib/Makefile.common" PKGNAME= freetype-utils-${FT_VERS} -PKGREVISION= 2 COMMENT= Utilities for manipulating TrueType fonts BUILDLINK_API_DEPENDS.freetype= freetype-lib>=${FT_VERS} diff --git a/graphics/freetype/Makefile b/graphics/freetype/Makefile index 9d54a1bb76f8..6de8c3cbcb61 100644 --- a/graphics/freetype/Makefile +++ b/graphics/freetype/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2006/03/04 21:29:47 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/06/17 19:41:33 minskim Exp $ DISTNAME= freetype-${FT_VERS} -FT_VERS= 1.3.1 -PKGREVISION= 3 +FT_VERS= 1.5 CATEGORIES= graphics meta-pkgs textproc MASTER_SITES= # DISTFILES= # @@ -11,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.freetype.org/ COMMENT= FreeType libraries and utilities -DEPENDS+= freetype-lib-${FT_VERS}nb3:../../graphics/freetype-lib -DEPENDS+= freetype-utils-${FT_VERS}nb2:../../graphics/freetype-utils +DEPENDS+= freetype-lib-${FT_VERS}:../../graphics/freetype-lib +DEPENDS+= freetype-utils-${FT_VERS}:../../graphics/freetype-utils EXTRACT_ONLY= # empty NO_CHECKSUM= yes