head	1.1;
access;
symbols
	stable_1_2:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2002.03.28.23.13.54;	author kiwi;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2002.03.28.23.13.54;	author kiwi;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2002.03.28.23.56.15;	author kiwi;	state dead;
branches;
next	1.1.2.3;

1.1.2.3
date	2002.05.03.22.56.38;	author kiwi;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2002.05.06.18.11.35;	author kiwi;	state dead;
branches;
next	;


desc
@@


1.1
log
@file patch-ac was initially added on branch stable_1_2.
@
text
@@


1.1.2.1
log
@Some patches of pike for FreeBSD ports
@
text
@a0 24
--- modules/_Image_TTF/image_ttf.c.orig	Tue Jun 12 15:21:10 2001
+++ modules/_Image_TTF/image_ttf.c	Thu Mar 28 23:54:59 2002
@@@@ -9,6 +9,13 @@@@
 RCSID("$Id: image_ttf.c,v 1.40 2001/06/12 13:21:10 grubba Exp $");
 
 #ifdef HAVE_LIBTTF
+#if defined(HAVE_FREETYPE1_FREETYPE_FREETYPE_H) && defined(HAVE_FREETYPE1_FREETYPE_FTXKERN_H)
+
+#include <freetype/freetype.h>
+#include <freetype/ftxkern.h>
+
+#else /* !HAVE_FREETYPE1_FREETYPE_FREETYPE_H || !HAVE_FREETYPE1_FREETYPE_FTXKERN_H */
+
 #if defined(HAVE_FREETYPE_FREETYPE_H) && defined(HAVE_FREETYPE_FTXKERN_H)
 
 #include <freetype/freetype.h>
@@@@ -20,6 +27,7 @@@@
 #include <ftxkern.h>
 
 #endif /* HAVE_FREETYPE_FREETYPE_H && HAVE_FREETYPE_FTXKERN_H */
+#endif /* HAVE_FREETYPE1_FREETYPE_FREETYPE_H && HAVE_FREETYPE1_FREETYPE_FTXKERN_H */
 #endif /* HAVE_LIBTTF */
 
 #include "pike_macros.h"
@


1.1.2.2
log
@Backout to old version...
@
text
@d4 1
a4 1
 RCSID("$Id: patch-ac,v 1.1.2.1 2002/03/28 23:13:54 kiwi Exp $");
@


1.1.2.3
log
@Update to 7.2.354 and fix for _Image_TTF with new location of freetype1 includes.
@
text
@d1 4
a4 5
--- modules/_Image_TTF/configure.orig	Sat May  4 02:31:30 2002
+++ modules/_Image_TTF/configure	Sat May  4 02:35:16 2002
@@@@ -963,7 +963,7 @@@@
 fi
 echo "$ac_t""$CPP" 1>&6
d6 19
a24 5
-for ac_hdr in freetype.h ftxkern.h freetype/freetype.h freetype/ftxkern.h
+for ac_hdr in freetype.h ftxkern.h freetype/freetype.h freetype/ftxkern.h freetype1/freetype/freetype.h freetype1/freetype/ftxkern.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@


1.1.2.4
log
@Special Guru meditation for Pike and Freebsd support...
@
text
@@


