From 2afa682dfaff5aacfa000d819c170a88d58ebd00 Mon Sep 17 00:00:00 2001
From: sobomax <sobomax@FreeBSD.org>
Date: Thu, 14 Mar 2002 11:16:45 +0000
Subject: Adjust in accordance with the new location of freetype1 includes
 (${PREFIX}/include/freetype1/freetype, not ${PREFIX}/include/freetype).

---
 print/gfontview/Makefile                | 3 ++-
 print/perlftlib/files/patch-ac          | 2 +-
 print/py-freetype/files/patch-Setup.w32 | 2 +-
 print/ttftot42/Makefile                 | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'print')

diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index 74b08eaa9654..a48edf0b00c8 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -21,7 +21,8 @@ USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
+			  -I${LOCALBASE}/include" \
 		SPOOLER="/usr/bin/lpr" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \
diff --git a/print/perlftlib/files/patch-ac b/print/perlftlib/files/patch-ac
index 293d170b8567..9ff7ad62040c 100644
--- a/print/perlftlib/files/patch-ac
+++ b/print/perlftlib/files/patch-ac
@@ -5,6 +5,6 @@
      'LIBS'	=> ['-L/usr/local/lib -lttf'],   # e.g., '-lm' 
      'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
 -    'INC'	=> '-I/usr/local/include',     # e.g., '-I/usr/include/other' 
-+    'INC'	=> '-I/usr/local/include/freetype',     # e.g., '-I/usr/include/other' 
++    'INC'	=> '-I/usr/local/include/freetype1/freetype',     # e.g., '-I/usr/include/other' 
  );
 
diff --git a/print/py-freetype/files/patch-Setup.w32 b/print/py-freetype/files/patch-Setup.w32
index 1aab0ed61418..dc2126f30f9f 100644
--- a/print/py-freetype/files/patch-Setup.w32
+++ b/print/py-freetype/files/patch-Setup.w32
@@ -7,4 +7,4 @@ $FreeBSD$
  #[MGW32]swig_options.extend(['-shadow', '-docstring'])
 -freetypec freetype_wrap.c -I../../lib -I../../lib/extend -L../../lib -lttf.dll
 +*shared*
-+freetypec freetype_wrap.c -I${LOCALBASE}/include/freetype -L${LOCALBASE}/lib -lttf
++freetypec freetype_wrap.c -I${LOCALBASE}/include/freetype1/freetype -L${LOCALBASE}/lib -lttf
diff --git a/print/ttftot42/Makefile b/print/ttftot42/Makefile
index 06400acfc811..d5b19f96eca8 100644
--- a/print/ttftot42/Makefile
+++ b/print/ttftot42/Makefile
@@ -14,6 +14,6 @@ MAINTAINER=	nakai@FreeBSD.org
 
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	"CFLAGS=-I${LOCALBASE}/include/freetype"
+CONFIGURE_ENV=	"CFLAGS=-I${LOCALBASE}/include/freetype1/freetype"
 
 .include <bsd.port.mk>
-- 
cgit