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-ad was initially added on branch stable_1_2.
@
text
@@


1.1.2.1
log
@Some patches of pike for FreeBSD ports
@
text
@a0 20
--- run_autoconfig.orig	Fri Mar 29 00:04:22 2002
+++ run_autoconfig	Fri Mar 29 00:04:52 2002
@@@@ -31,7 +31,7 @@@@
   fi
 fi
 
-autoconf_version="`autoconf --version|head -1|awk '{ print $NF }'`"
+autoconf_version="`autoconf213 --version|head -1|awk '{ print $NF }'`"
 
 if [ "`echo $autoconf_version|awk -F. '{ print $1 }'`" -ne "2" -o \
      "`echo $autoconf_version|awk -F. '{ print $2 }'`" -ge "50" ]; then
@@@@ -62,7 +62,7 @@@@
   if [ -f $dir/configure.in ]; then
     if grep AC_INIT $dir/configure.in >/dev/null; then
       echo "Running autoconf in $dir"
-      ( cd $dir ; autoconf --localdir=$localdir )
+      ( cd $dir ; autoconf213 --localdir=$localdir )
     else
       echo "$dir seems to use Cygnus-configure."
     fi
@


1.1.2.2
log
@Backout to old version...
@
text
@@


1.1.2.3
log
@Update to 7.2.354 and fix for _Image_TTF with new location of freetype1 includes.
@
text
@d1 5
a5 4
--- 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: patch-ac,v 1.1.2.1 2002/03/28 23:56:55 kiwi Exp $");
d7 2
a8 9
 #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)
d10 11
a20 9
 #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.4
log
@Special Guru meditation for Pike and Freebsd support...
@
text
@d4 1
a4 1
 RCSID("$Id: patch-ad,v 1.1.2.3 2002/05/03 22:56:38 kiwi Exp $");
@


