$NetBSD: patch-ai,v 1.1 2006/06/19 21:16:19 joerg Exp $

--- src/generic/dcpsg.cpp.orig	2006-06-19 20:01:50.000000000 +0000
+++ src/generic/dcpsg.cpp
@@ -1146,8 +1146,13 @@ struct _OutlineInfo {
   FILE *file;
 };
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_move_to( const FT_Vector* to,
+			 void *user_data)
+#else
 static int paps_move_to( FT_Vector* to,
 			 void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file, "%d %d moveto\n",
@@ -1156,8 +1161,13 @@ static int paps_move_to( FT_Vector* to,
   return 0;
 }
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_line_to( const FT_Vector*  to,
+			 void *user_data)
+#else
 static int paps_line_to( FT_Vector*  to,
 			 void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file, "%d %d lineto\n",
@@ -1166,9 +1176,15 @@ static int paps_line_to( FT_Vector*  to,
   return 0;
 }
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_conic_to( const FT_Vector*  control,
+			  const FT_Vector*  to,
+			  void *user_data)
+#else
 static int paps_conic_to( FT_Vector*  control,
 			  FT_Vector*  to,
 			  void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file, "%d %d %d %d conicto\n",
@@ -1179,10 +1195,17 @@ static int paps_conic_to( FT_Vector*  co
   return 0;
 }
 
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR >= 2
+static int paps_cubic_to( const FT_Vector*  control1,
+			  const FT_Vector*  control2,
+			  const FT_Vector*  to,
+			  void *user_data)
+#else
 static int paps_cubic_to( FT_Vector*  control1,
 			  FT_Vector*  control2,
 			  FT_Vector*  to,
 			  void *user_data)
+#endif
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
   fprintf(outline_info->file,