Index: head/x11-toolkits/pango/Makefile
===================================================================
--- head/x11-toolkits/pango/Makefile	(revision 104209)
+++ head/x11-toolkits/pango/Makefile	(revision 104210)
@@ -1,61 +1,61 @@
 # New ports collection makefile for:   pango
 # Date Created:			18 July 2000
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pango
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.2/
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source framework for the layout and rendering of i18n text
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20
 CONFIGURE_ARGS=	--with-qt=no \
 		--with-html-dir=${PREFIX}/share/doc \
 		--enable-static
 PKGINSTALL=	${WRKDIR}/pkg-install
 # Hmm.. tough one.  Found this one when I had science/hdf installed
 # (which installs glist.h) which is picked up before the glib-2.0
 # stuff, with Bad Results[tm]
 #
 GLIB2_CFLAGS=	`pkg-config glib-2.0 --cflags`
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			${GLIB2_CFLAGS} -I${LOCALBASE}/include \
 			-I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 PLIST_SUB=	VERSION="1.2.0"
 
 FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
 
 post-patch:
 	@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \
 		s|TT_Err_|FT_Err_|g'
 post-install:
 	@${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
 .if !defined(PACKAGE_BUILDING)
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/x11-toolkits/pango/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.58
\ No newline at end of property
+1.59
\ No newline at end of property
Index: head/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h
===================================================================
--- head/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h	(nonexistent)
+++ head/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h	(revision 104210)
@@ -0,0 +1,12 @@
+--- modules/indic/indic-ot.h.orig	Tue Mar 16 16:23:13 2004
++++ modules/indic/indic-ot.h	Tue Mar 16 16:23:38 2004
+@@ -9,7 +9,8 @@
+ #ifndef __INDIC_OT_H__
+ #define __INDIC_OT_H__
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <pango/pango-glyph.h>
+ #include <pango/pango-types.h>
+ #include "mprefixups.h"

Property changes on: head/x11-toolkits/pango/files/patch-modules_indic_indic-ot.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h
===================================================================
--- head/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h	(nonexistent)
+++ head/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h	(revision 104210)
@@ -0,0 +1,12 @@
+--- pango/opentype/ftxopen.h.orig	Tue Mar 16 16:19:27 2004
++++ pango/opentype/ftxopen.h	Tue Mar 16 16:19:45 2004
+@@ -22,7 +22,8 @@
+ #ifndef FTXOPEN_H
+ #define FTXOPEN_H
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #ifdef __cplusplus
+ extern "C" {

Property changes on: head/x11-toolkits/pango/files/patch-pango_opentype_ftxopen.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c
===================================================================
--- head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c	(nonexistent)
+++ head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c	(revision 104210)
@@ -0,0 +1,11 @@
+--- pango/opentype/pango-ot-info.c.orig	Tue Mar 16 16:18:19 2004
++++ pango/opentype/pango-ot-info.c	Tue Mar 16 16:17:38 2004
+@@ -22,7 +22,7 @@
+ #include "pango-ot-private.h"
+ #include "fterrcompat.h"
+ #include <freetype/internal/ftobjs.h>
+-#include <freetype/ftmodule.h>
++#include <freetype/ftmodapi.h>
+ 
+ static void pango_ot_info_class_init (GObjectClass *object_class);
+ static void pango_ot_info_finalize   (GObject *object);

Property changes on: head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-info.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h
===================================================================
--- head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h	(nonexistent)
+++ head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h	(revision 104210)
@@ -0,0 +1,12 @@
+--- pango/opentype/pango-ot-private.h.orig	Tue Mar 16 16:16:35 2004
++++ pango/opentype/pango-ot-private.h	Tue Mar 16 16:18:53 2004
+@@ -22,7 +22,8 @@
+ #ifndef __PANGO_OT_PRIVATE_H__
+ #define __PANGO_OT_PRIVATE_H__
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include <glib-object.h>
+ 

Property changes on: head/x11-toolkits/pango/files/patch-pango_opentype_pango-ot-private.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-toolkits/pango/files/patch-pango_pango-ot.h
===================================================================
--- head/x11-toolkits/pango/files/patch-pango_pango-ot.h	(nonexistent)
+++ head/x11-toolkits/pango/files/patch-pango_pango-ot.h	(revision 104210)
@@ -0,0 +1,12 @@
+--- pango/pango-ot.h.orig	Tue Mar 16 16:21:00 2004
++++ pango/pango-ot.h	Tue Mar 16 16:21:18 2004
+@@ -22,7 +22,8 @@
+ #ifndef __PANGO_OT_H__
+ #define __PANGO_OT_H__
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <pango/pango-glyph.h>
+ 
+ G_BEGIN_DECLS

Property changes on: head/x11-toolkits/pango/files/patch-pango_pango-ot.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-toolkits/pango/files/patch-pango_pangoft2.c
===================================================================
--- head/x11-toolkits/pango/files/patch-pango_pangoft2.c	(nonexistent)
+++ head/x11-toolkits/pango/files/patch-pango_pangoft2.c	(revision 104210)
@@ -0,0 +1,12 @@
+--- pango/pangoft2.c.orig	Tue Mar 16 16:21:59 2004
++++ pango/pangoft2.c	Tue Mar 16 16:22:20 2004
+@@ -28,7 +28,8 @@
+ #include <glib.h>
+ #include <glib/gprintf.h>
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include "pango-utils.h"
+ #include "pangoft2.h"

Property changes on: head/x11-toolkits/pango/files/patch-pango_pangoft2.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-toolkits/pango/files/patch-pango_pangoft2.h
===================================================================
--- head/x11-toolkits/pango/files/patch-pango_pangoft2.h	(nonexistent)
+++ head/x11-toolkits/pango/files/patch-pango_pangoft2.h	(revision 104210)
@@ -0,0 +1,12 @@
+--- pango/pangoft2.h.orig	Tue Mar 16 16:14:49 2004
++++ pango/pangoft2.h	Tue Mar 16 16:15:21 2004
+@@ -23,7 +23,8 @@
+ #ifndef __PANGOFT2_H__
+ #define __PANGOFT2_H__
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include <fontconfig/fontconfig.h>
+ 

Property changes on: head/x11-toolkits/pango/files/patch-pango_pangoft2.h
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property