Follow new FreeType2 build rules

11 files changed, 110 insertions, 12 deletions

diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo
index f05db989088..03453d633ef 100644
--- a/graphics/librsvg/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/08/14 07:56:44 rh Exp $
+$NetBSD: distinfo,v 1.3 2004/04/27 15:19:53 adam Exp $
 
 SHA1 (librsvg-1.0.1.tar.bz2) = 7c650c18ef8f0f942a27e0eacdd17159ee6a2cd3
 Size (librsvg-1.0.1.tar.bz2) = 151745 bytes
-SHA1 (patch-aa) = 6f10dfc22c8f5b67b0445cc1b0a57cad471a486c
+SHA1 (patch-aa) = 4add2b7c599a456c67ca807c294380c79c777d82
 SHA1 (patch-ab) = 653ab30ce9a0d5ed0f36ba1c271a877f79fb4390
 SHA1 (patch-ac) = 291ca6407261ea6e28bce7fca3f539b16a6636dd
 SHA1 (patch-ad) = c4b5f9d211d18e1b71451e7ba8e24caca9079027
diff --git a/graphics/librsvg/patches/patch-aa b/graphics/librsvg/patches/patch-aa
index 21597082196..f668b947982 100644
--- a/graphics/librsvg/patches/patch-aa
+++ b/graphics/librsvg/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/27 15:19:53 adam Exp $
 
---- configure.orig	Tue May  8 01:13:07 2001
+--- configure.orig	2001-07-05 22:00:47.000000000 +0000
 +++ configure
-@@ -1744,14 +1744,14 @@
+@@ -1744,14 +1744,14 @@ exec 5>>./config.log
  
  
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
  cat > conftest.$ac_ext <<EOF
  #line 1757 "configure"
  #include "confdefs.h"
-@@ -1779,7 +1779,7 @@
+@@ -1779,7 +1779,7 @@ LIBS="$ac_save_LIBS"
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -29,3 +29,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
  else
    echo "$ac_t""no" 1>&6
  fi
+@@ -2352,6 +2352,7 @@ else
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ 
+ char*
diff --git a/graphics/librsvg/patches/patch-ab b/graphics/librsvg/patches/patch-ab
index 0bcdd7d083a..cb1c66e808b 100644
--- a/graphics/librsvg/patches/patch-ab
+++ b/graphics/librsvg/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/27 15:19:53 adam Exp $
 
---- test-ft-gtk.c.orig	Wed Mar 28 20:44:42 2001
+--- test-ft-gtk.c.orig	2001-03-28 18:44:42.000000000 +0000
 +++ test-ft-gtk.c
 @@ -25,7 +25,7 @@
  #include <stdio.h>
@@ -11,3 +11,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
  #include <math.h>
  #include <sys/time.h>
  #include <unistd.h>
+@@ -34,6 +34,7 @@
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ 
+ #include <libart_lgpl/art_misc.h>
diff --git a/graphics/librsvg/patches/patch-ac b/graphics/librsvg/patches/patch-ac
index a87b74d6509..87675454f3f 100644
--- a/graphics/librsvg/patches/patch-ac
+++ b/graphics/librsvg/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/27 15:19:53 adam Exp $
 
---- test-ft.c.orig	Wed May  9 23:27:41 2001
+--- test-ft.c.orig	2001-03-28 18:44:42.000000000 +0000
 +++ test-ft.c
-@@ -25,7 +25,7 @@
+@@ -25,11 +25,12 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <png.h>
@@ -11,3 +11,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/05/14 17:47:27 rh Exp $
  #include <math.h>
  
  #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ 
+ #include <libart_lgpl/art_misc.h>
diff --git a/graphics/librsvg/patches/patch-ae b/graphics/librsvg/patches/patch-ae
new file mode 100644
index 00000000000..da85b5d02cb
--- /dev/null
+++ b/graphics/librsvg/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2004/04/27 15:19:53 adam Exp $
+
+--- rsvg-ft.c.orig	2004-04-27 12:02:07.000000000 +0000
++++ rsvg-ft.c
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+ 
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ 
+ #include <libart_lgpl/art_misc.h>
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index 21d9ce5c449..555dc555839 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.7 2002/09/26 18:39:41 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/04/27 15:21:15 adam Exp $
 
 SHA1 (gnome-print-0.36.tar.gz) = a1b2ada6b8ce432731233607ac2e3567ccae675e
 Size (gnome-print-0.36.tar.gz) = 1003090 bytes
+SHA1 (patch-aa) = 50ae2e216931e5b49ecd737cc5e3f621c9eca611
+SHA1 (patch-ab) = fac04fb71ccdc1a639c3b23b118ea32f0263ca00
 SHA1 (patch-ac) = 8a9e69c00e4c9440d7a57d86c3ee28d914a9f3ce
+SHA1 (patch-ad) = 1484232e28d37923bd41d96e2b90816f2ba5501f
+SHA1 (patch-ae) = b4ace016c4cf99b217a77987a46c5b9c885455c8
+SHA1 (patch-af) = bc7f4ea0be2e0954bc976f65329bff7d25c8a61c
diff --git a/print/gnome-print/patches/patch-aa b/print/gnome-print/patches/patch-aa
new file mode 100644
index 00000000000..4d60aa50b99
--- /dev/null
+++ b/print/gnome-print/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.16 2004/04/27 15:21:15 adam Exp $
+
+--- libgnomeprint/gnome-font-private.h.orig	2004-04-27 10:25:31.000000000 +0000
++++ libgnomeprint/gnome-font-private.h
+@@ -22,6 +22,7 @@
+ 
+ BEGIN_GNOME_DECLS
+ 
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <libgnomeprint/gp-character-block.h>
+ #include <libgnomeprint/gp-fontmap.h>
diff --git a/print/gnome-print/patches/patch-ab b/print/gnome-print/patches/patch-ab
new file mode 100644
index 00000000000..4507f064dea
--- /dev/null
+++ b/print/gnome-print/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.7 2004/04/27 15:21:15 adam Exp $
+
+--- libgnomeprint/parseTT.h.orig	2004-04-27 10:27:00.000000000 +0000
++++ libgnomeprint/parseTT.h
+@@ -22,6 +22,7 @@
+ BEGIN_GNOME_DECLS
+ 
+ #include <glib.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ 
+ /*
diff --git a/print/gnome-print/patches/patch-ad b/print/gnome-print/patches/patch-ad
new file mode 100644
index 00000000000..1e48b3a4a61
--- /dev/null
+++ b/print/gnome-print/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2004/04/27 15:21:15 adam Exp $
+
+--- installer/gnome-font-install.c.orig	2004-04-27 10:33:08.000000000 +0000
++++ installer/gnome-font-install.c
+@@ -26,6 +26,7 @@
+ #include <parser.h>
+ #include <xmlmemory.h>
+ /* End of ugly thing */
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <libgnome/gnome-defs.h>
+ #include <libgnome/gnome-util.h>
diff --git a/print/gnome-print/patches/patch-ae b/print/gnome-print/patches/patch-ae
new file mode 100644
index 00000000000..dfd05f69860
--- /dev/null
+++ b/print/gnome-print/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2004/04/27 15:21:15 adam Exp $
+
+--- installer/gf-pfb.c.orig	2004-04-27 10:33:58.000000000 +0000
++++ installer/gf-pfb.c
+@@ -12,6 +12,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include "gf-pfb.h"
+ 
diff --git a/print/gnome-print/patches/patch-af b/print/gnome-print/patches/patch-af
new file mode 100644
index 00000000000..188607d7d5a
--- /dev/null
+++ b/print/gnome-print/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2004/04/27 15:21:15 adam Exp $
+
+--- installer/gf-ttf.c.orig	2004-04-27 10:34:48.000000000 +0000
++++ installer/gf-ttf.c
+@@ -32,6 +32,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ 
+ #include "gf-ttf.h"