Move ttf2pk patches to the original sources, i.e. freetype-lib.

6 files changed, 110 insertions, 1 deletions

diff --git a/graphics/freetype-lib/distinfo b/graphics/freetype-lib/distinfo
index 7e07d3febd0..45bbee587e7 100644
--- a/graphics/freetype-lib/distinfo
+++ b/graphics/freetype-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/09/16 11:56:59 adam Exp $
+$NetBSD: distinfo,v 1.4 2004/11/06 14:22:22 hubertf Exp $
 
 SHA1 (freetype-1.3.1.tar.gz) = a398fb4d6dd756826e459058d8075759086f8ca4
 Size (freetype-1.3.1.tar.gz) = 1427072 bytes
@@ -6,3 +6,8 @@ SHA1 (patch-aa) = b75fc2d414c2bab0c4abf2bc84c370c9298c1664
 SHA1 (patch-ab) = 8bea35dceffa399cf0f17065e2d1f9aafabf56e3
 SHA1 (patch-ac) = b27f18b5f84c4d1451376295cf3b7caf08d2d56f
 SHA1 (patch-ad) = 136577ca779ddb205440bec01f2b6a4ee61932f8
+SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac
+SHA1 (patch-ttf2pk-ab) = 8e205eb52c02d43ba0970971df1261e88ec1f7e4
+SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74
+SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae
+SHA1 (patch-ttf2pk-ae) = 477bed5f17a8991359ec99dcf036785c31ea7304
diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-aa b/graphics/freetype-lib/patches/patch-ttf2pk-aa
new file mode 100644
index 00000000000..02758b7ef89
--- /dev/null
+++ b/graphics/freetype-lib/patches/patch-ttf2pk-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-ttf2pk-aa,v 1.1 2004/11/06 14:22:22 hubertf Exp $
+
+--- contrib/ttf2pk/Makefile.in.orig	Thu Sep  3 07:12:57 1998
++++ contrib/ttf2pk/Makefile.in
+@@ -17,7 +17,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ CC = @CC@
+ CPP = @CPP@
+ 
+-LIBTOOL = ../../libtool
+ MKINSTALLDIRS = $(srcdir)/../../mkinstalldirs
+ 
+ include MakeSub
+@@ -26,7 +25,7 @@ CFLAGS = @CFLAGS@ @XX_CFLAGS@
+ CPPFLAGS = @CPPFLAGS@ @DEFS@
+ FT_CFLAGS = $(CFLAGS) $(CPPFLAGS)
+ LDFLAGS = @LDFLAGS@ @LIBS@
+-LIBDIR = ../../lib
++LIBDIR = ${prefix}/lib
+ 
+ SRC = $(srcdir)/case.c     \
+       $(srcdir)/errormsg.c \
diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-ab b/graphics/freetype-lib/patches/patch-ttf2pk-ab
new file mode 100644
index 00000000000..126465f382c
--- /dev/null
+++ b/graphics/freetype-lib/patches/patch-ttf2pk-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ttf2pk-ab,v 1.1 2004/11/06 14:22:22 hubertf 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
+ dnl FreeType library successfully.
+ 
+-AC_INIT(../../lib/freetype.h)
++AC_INIT(ttf2pk.c)
+ 
+ AC_CANONICAL_SYSTEM
+ 
+@@ -47,12 +47,10 @@ fi
+ AC_CHECK_LIB(m, floor)
+ AC_CHECK_LIB(intl, gettext)
+ 
+-OLDLIBS=$LIBS
+-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
+ 
+ dnl get Compiler flags right.
+ 
diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-ac b/graphics/freetype-lib/patches/patch-ttf2pk-ac
new file mode 100644
index 00000000000..a70d6c6d075
--- /dev/null
+++ b/graphics/freetype-lib/patches/patch-ttf2pk-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ttf2pk-ac,v 1.1 2004/11/06 14:22:22 hubertf Exp $
+
+--- contrib/ttf2pk/ttfaux.c.orig	Thu Sep  2 01:31:17 1999
++++ contrib/ttf2pk/ttfaux.c
+@@ -13,9 +13,9 @@
+ #include <stdlib.h>
+ 
+ #include "freetype.h"
+-#include "extend/ftxkern.h"     /* we are in the FreeType package tree */
+-#include "extend/ftxpost.h"
+-#include "extend/ftxopen.h"
++#include "ftxkern.h"     /* we are in the FreeType package tree */
++#include "ftxpost.h"
++#include "ftxopen.h"
+ 
+ #include "ttf2tfm.h"
+ #include "newobj.h"
diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-ad b/graphics/freetype-lib/patches/patch-ttf2pk-ad
new file mode 100644
index 00000000000..2242eaa47bc
--- /dev/null
+++ b/graphics/freetype-lib/patches/patch-ttf2pk-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ttf2pk-ad,v 1.1 2004/11/06 14:22:22 hubertf Exp $
+
+--- contrib/ttf2pk/ttflib.c.orig	Thu Sep  2 01:31:17 1999
++++ contrib/ttf2pk/ttflib.c
+@@ -22,8 +22,8 @@
+ #include "newobj.h"
+ #include "ttf2tfm.h"
+ 
+-#include "extend/ftxpost.h"
+-#include "extend/ftxopen.h"
++#include "ftxpost.h"
++#include "ftxopen.h"
+ 
+ 
+ #define Macintosh_platform 1
diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-ae b/graphics/freetype-lib/patches/patch-ttf2pk-ae
new file mode 100644
index 00000000000..45f5938aae2
--- /dev/null
+++ b/graphics/freetype-lib/patches/patch-ttf2pk-ae
@@ -0,0 +1,23 @@
+$NetBSD: patch-ttf2pk-ae,v 1.1 2004/11/06 14:22:22 hubertf Exp $
+
+--- contrib/ttf2pk/data/UBig5.sfd.orig   Thu Dec 10 22:40:10 1998
++++ contrib/ttf2pk/data/UBig5.sfd        Fri Jan 21 23:38:41 2000
+@@ -1746,12 +1746,12 @@
+    0x6207 0x6B1E 0x7227 0x864C 0x8EA8 0x9482 0x9480 0x9481 \
+    0x9A69 0x9A68 0x9B2E 0x9E19 0x7229 0x864B 0x8B9F 0x9483 \
+    0x9C79 0x9EB7 0x7675 0x9A6B 0x9C7A 0x9E1D 0x7069 0x706A \
+-   0x9EA4 0x9F7E 0x9F49 0x9F98 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+-   0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
++   0x9EA4 0x9F7E 0x9F49 0x9F98 0x7881 0x92B9 0x88CF 0x58BB \
++   0x6052 0x7CA7 0x5AFA 0x2554 0x2566 0x2557 0x2560 0x256C \
++   0x2563 0x255A 0x2569 0x255D 0x2552 0x2564 0x2555 0x255E \
++   0x256A 0x2561 0x2558 0x2567 0x255B 0x2553 0x2565 0x2556 \
++   0x255F 0x256B 0x2562 0x2559 0x2568 0x255C 0x2551 0x2550 \
++   0x256D 0x256E 0x2570 0x256F 0x25A0 0xFFFE 0xFFFE 0xFFFE \
+    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \
+    0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \